Merge pull request #1051 from filecoin-project/feat/self-deal-no-sig

don't require signatures for self deals

chain/actors/actor_storagemarket.go

@@ -122,15 +122,21 @@ func (sdp *StorageDealProposal) Cid() (cid.Cid, error) {
 	return nd.Cid(), nil
 }
 
-func (sdp *StorageDealProposal) Verify() error {
-	unsigned := *sdp
-	unsigned.ProposerSignature = nil
-	var buf bytes.Buffer
-	if err := unsigned.MarshalCBOR(&buf); err != nil {
-		return err
+func (sdp *StorageDealProposal) Verify(worker address.Address) error {
+	if sdp.Client != worker || worker == address.Undef {
+		unsigned := *sdp
+		unsigned.ProposerSignature = nil
+		var buf bytes.Buffer
+		if err := unsigned.MarshalCBOR(&buf); err != nil {
+			return err
+		}
+
+		if err := sdp.ProposerSignature.Verify(sdp.Client, buf.Bytes()); err != nil {
+			return err
+		}
 	}
 
-	return sdp.ProposerSignature.Verify(sdp.Client, buf.Bytes())
+	return nil
 }
 
 type OnChainDeal struct {
@@ -396,7 +402,7 @@ func (st *StorageMarketState) validateDeal(vmctx types.VMContext, deal StorageDe
 		return aerrors.New(2, "Deals must be submitted by the miner worker")
 	}
 
-	if err := deal.Verify(); err != nil {
+	if err := deal.Verify(providerWorker); err != nil {
 		return aerrors.Absorb(err, 3, "verifying proposer signature")
 	}
 

chain/deals/provider_utils.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"runtime"
 
-	"github.com/filecoin-project/go-data-transfer"
+	datatransfer "github.com/filecoin-project/go-data-transfer"
 	"github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
 	"github.com/ipld/go-ipld-prime"
@@ -56,7 +56,11 @@ func (p *Provider) readProposal(s inet.Stream) (proposal Proposal, err error) {
 		return proposal, err
 	}
 
-	if err := proposal.DealProposal.Verify(); err != nil {
+	if proposal.DealProposal.ProposerSignature == nil {
+		return proposal, xerrors.Errorf("incoming deal proposal has no signature")
+	}
+
+	if err := proposal.DealProposal.Verify(address.Undef); err != nil {
 		return proposal, xerrors.Errorf("verifying StorageDealProposal: %w", err)
 	}
 

storage/garbage.go

@@ -10,7 +10,6 @@ import (
 	sectorbuilder "github.com/filecoin-project/go-sectorbuilder"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/types"
 )
@@ -39,11 +38,7 @@ func (m *Miner) pledgeSector(ctx context.Context, sectorID uint64, existingPiece
 			Duration:             math.MaxUint64 / 2, // /2 because overflows
 			StoragePricePerEpoch: types.NewInt(0),
 			StorageCollateral:    types.NewInt(0),
-			ProposerSignature:    nil,
-		}
-
-		if err := api.SignWith(ctx, m.api.WalletSign, m.worker, &sdp); err != nil {
-			return nil, xerrors.Errorf("signing storage deal failed: ", err)
+			ProposerSignature:    nil, // nil because self dealing
 		}
 
 		deals[i] = sdp