fix tsnonce preventing multisignature bug (#2453)

dydxprotocol · Oct 3, 2024 · 77cef30 · 77cef30
1 parent dbd45b2
commit 77cef30
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/protocol/x/accountplus/ante/timestampnonce.go b/protocol/x/accountplus/ante/timestampnonce.go
@@ -20,9 +20,14 @@ func IsTimestampNonceTx(ctx sdk.Context, tx sdk.Tx) (bool, error) {
 		return false, err
 	}
 
-	if len(signatures) != 1 {
-		return false, errorsmod.Wrap(sdkerrors.ErrTxDecode, "more than one signature")
+	// multi signature cannot contain timestamp nonce
+	if len(signatures) > 1 {
+		for _, sig := range signatures {
+			if accountpluskeeper.IsTimestampNonce(sig.Sequence) {
+				return false, errorsmod.Wrap(sdkerrors.ErrTxDecode, "multi signature contains timestampnonce")
+			}
+		}
 	}
 
-	return accountpluskeeper.IsTimestampNonce(signatures[0].Sequence), nil
+	return len(signatures) == 1 && accountpluskeeper.IsTimestampNonce(signatures[0].Sequence), nil
 }
diff --git a/protocol/x/accountplus/ante/timestampnonce_test.go b/protocol/x/accountplus/ante/timestampnonce_test.go
@@ -32,7 +32,12 @@ func TestIsTimestampNonceTx(t *testing.T) {
 			expectedResult: true,
 			expectedErr:    false,
 		},
-		"Returns error for more than one signature": {
+		"Returns false with no error if multisignature with regular seq number": {
+			seqs:           []uint64{1, 1},
+			expectedResult: false,
+			expectedErr:    false,
+		},
+		"Returns error for multisignature with timestamp nonce": {
 			seqs:           []uint64{keeper.TimestampNonceSequenceCutoff, keeper.TimestampNonceSequenceCutoff},
 			expectedResult: false,
 			expectedErr:    true,