fix: message signer - always compare with mpool nonce

chain/messagesigner/messagesigner.go

@@ -4,21 +4,22 @@ import (
 	"bytes"
 	"context"
 
-	"github.com/filecoin-project/lotus/chain/wallet"
-
-	"github.com/filecoin-project/lotus/chain/messagepool"
-
 	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/lotus/chain/messagepool"
 	"github.com/filecoin-project/lotus/chain/types"
+	"github.com/filecoin-project/lotus/chain/wallet"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
 	"github.com/ipfs/go-datastore"
 	"github.com/ipfs/go-datastore/namespace"
+	logging "github.com/ipfs/go-log/v2"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 )
 
 const dsKeyActorNonce = "ActorNonce"
 
+var log = logging.Logger("messagesigner")
+
 type mpoolAPI interface {
 	GetNonce(address.Address) (uint64, error)
 }
@@ -67,38 +68,45 @@ func (ms *MessageSigner) SignMessage(ctx context.Context, msg *types.Message) (*
 // nextNonce increments the nonce.
 // If there is no nonce in the datastore, gets the nonce from the message pool.
 func (ms *MessageSigner) nextNonce(addr address.Address) (uint64, error) {
-	addrNonceKey := datastore.KeyWithNamespaces([]string{dsKeyActorNonce, addr.String()})
+	// Nonces used to be created by the mempool and we need to support nodes
+	// that have mempool nonces, so first check the mempool for a nonce for
+	// this address. Note that the mempool returns the actor state's nonce
+	// by default.
+	nonce, err := ms.mpool.GetNonce(addr)
+	if err != nil {
+		return 0, xerrors.Errorf("failed to get nonce from mempool: %w", err)
+	}
 
 	// Get the nonce for this address from the datastore
-	nonceBytes, err := ms.ds.Get(addrNonceKey)
+	addrNonceKey := datastore.KeyWithNamespaces([]string{dsKeyActorNonce, addr.String()})
+	dsNonceBytes, err := ms.ds.Get(addrNonceKey)
 
-	var nonce uint64
 	switch {
 	case xerrors.Is(err, datastore.ErrNotFound):
 		// If a nonce for this address hasn't yet been created in the
-		// datastore, check the mempool - nonces used to be created by
-		// the mempool so we need to support nodes that still have mempool
-		// nonces. Note that the mempool returns the actor state's nonce by
-		// default.
-		nonce, err = ms.mpool.GetNonce(addr)
-		if err != nil {
-			return 0, xerrors.Errorf("failed to get nonce from mempool: %w", err)
-		}
+		// datastore, just use the nonce from the mempool
 
 	case err != nil:
 		return 0, xerrors.Errorf("failed to get nonce from datastore: %w", err)
 
 	default:
-		// There is a nonce in the mempool, so unmarshall and increment it
-		maj, val, err := cbg.CborReadHeader(bytes.NewReader(nonceBytes))
+		// There is a nonce in the datastore, so unmarshall and increment it
+		maj, val, err := cbg.CborReadHeader(bytes.NewReader(dsNonceBytes))
 		if err != nil {
 			return 0, xerrors.Errorf("failed to parse nonce from datastore: %w", err)
 		}
 		if maj != cbg.MajUnsignedInt {
 			return 0, xerrors.Errorf("bad cbor type parsing nonce from datastore")
 		}
 
-		nonce = val + 1
+		dsNonce := val + 1
+
+		// The message pool nonce should be <= than the datastore nonce
+		if nonce <= dsNonce {
+			nonce = dsNonce
+		} else {
+			log.Warnf("mempool nonce was larger than datastore nonce (%d > %d)", nonce, dsNonce)
+		}
 	}
 
 	// Write the nonce for this address to the datastore

chain/messagesigner/messagesigner_test.go

@@ -98,10 +98,9 @@ func TestMessageSignerSignMessage(t *testing.T) {
 				To:   to1,
 				From: from1,
 			},
-			// Should ignore mpool nonce because after the first message nonce
-			// will come from the datastore
+			// Should adjust datastore nonce because mpool nonce is higher
 			mpoolNonce: [1]uint64{10},
-			expNonce:   6,
+			expNonce:   10,
 		}},
 	}, {
 		// Nonce should increment independently for each address

node/builder.go

@@ -6,8 +6,6 @@ import (
 	"os"
 	"time"
 
-	"github.com/filecoin-project/lotus/chain/messagesigner"
-
 	logging "github.com/ipfs/go-log"
 	ci "github.com/libp2p/go-libp2p-core/crypto"
 	"github.com/libp2p/go-libp2p-core/host"
@@ -37,6 +35,7 @@ import (
 	"github.com/filecoin-project/lotus/chain/gen/slashfilter"
 	"github.com/filecoin-project/lotus/chain/market"
 	"github.com/filecoin-project/lotus/chain/messagepool"
+	"github.com/filecoin-project/lotus/chain/messagesigner"
 	"github.com/filecoin-project/lotus/chain/metrics"
 	"github.com/filecoin-project/lotus/chain/stmgr"
 	"github.com/filecoin-project/lotus/chain/store"

node/impl/full/mpool.go

@@ -4,14 +4,13 @@ import (
 	"context"
 	"encoding/json"
 
-	"github.com/filecoin-project/lotus/chain/messagesigner"
-
 	"github.com/filecoin-project/go-address"
 	"github.com/ipfs/go-cid"
 	"go.uber.org/fx"
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lotus/api"
+	"github.com/filecoin-project/lotus/chain/messagesigner"
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
 )