Revert "Seqno config disable (#354)" (#364)

This reverts commit 5f04ca7. We will not go with this approach as it is hacky (even for testing) ## Describe your changes and provide context ## Testing performed to validate your change
sei-protocol · Nov 27, 2023 · 1c5a372 · 1c5a372
1 parent 5f04ca7
commit 1c5a372
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 167 deletions.
diff --git a/baseapp/block_gas_test.go b/baseapp/block_gas_test.go
@@ -125,7 +125,7 @@ func TestBaseApp_BlockGas(t *testing.T) {
 			}
 			// check block gas is always consumed - this value may change if we update the logic for
 			// how gas is consumed
-			baseGas := uint64(62766) // baseGas is the gas consumed before tx msg
+			baseGas := uint64(58406) // baseGas is the gas consumed before tx msg
 			expGasConsumed := addUint64Saturating(tc.gasToConsume, baseGas)
 			if expGasConsumed > txtypes.MaxGasWanted {
 				// capped by gasLimit

diff --git a/proto/cosmos/auth/v1beta1/auth.proto b/proto/cosmos/auth/v1beta1/auth.proto
@@ -47,5 +47,4 @@ message Params {
       [(gogoproto.customname) = "SigVerifyCostED25519", (gogoproto.moretags) = "yaml:\"sig_verify_cost_ed25519\""];
   uint64 sig_verify_cost_secp256k1 = 5
       [(gogoproto.customname) = "SigVerifyCostSecp256k1", (gogoproto.moretags) = "yaml:\"sig_verify_cost_secp256k1\""];
-  bool   disable_seqno_check       = 6;
 }
diff --git a/x/auth/ante/ante_test.go b/x/auth/ante/ante_test.go
@@ -1152,61 +1152,3 @@ func (suite *AnteTestSuite) TestAnteHandlerReCheck() {
 	_, err = suite.anteHandler(suite.ctx, tx, false)
 	suite.Require().NotNil(err, "antehandler on recheck did not fail once feePayer no longer has sufficient funds")
 }
-
-func (suite *AnteTestSuite) TestDisableSeqNo() {
-	suite.SetupTest(false) // setup
-	authParams := types.Params{
-		MaxMemoCharacters:      types.DefaultMaxMemoCharacters,
-		TxSigLimit:             types.DefaultTxSigLimit,
-		TxSizeCostPerByte:      types.DefaultTxSizeCostPerByte,
-		SigVerifyCostED25519:   types.DefaultSigVerifyCostED25519,
-		SigVerifyCostSecp256k1: types.DefaultSigVerifyCostSecp256k1,
-		DisableSeqnoCheck:      true,
-	}
-	suite.app.AccountKeeper.SetParams(suite.ctx, authParams)
-
-	// Same data for every test cases
-	accounts := suite.CreateTestAccounts(1)
-	feeAmount := testdata.NewTestFeeAmount()
-	gasLimit := testdata.NewTestGasLimit()
-
-	// Variable data per test case
-	var (
-		accNums []uint64
-		msgs    []sdk.Msg
-		privs   []cryptotypes.PrivKey
-		accSeqs []uint64
-	)
-
-	testCases := []TestCase{
-		{
-			"good tx from one signer",
-			func() {
-				msg := testdata.NewTestMsg(accounts[0].acc.GetAddress())
-				msgs = []sdk.Msg{msg}
-
-				privs, accNums, accSeqs = []cryptotypes.PrivKey{accounts[0].priv}, []uint64{0}, []uint64{0}
-			},
-			false,
-			true,
-			nil,
-		},
-		{
-			"test sending it again succeeds (disable seqno check is true)",
-			func() {
-				privs, accNums, accSeqs = []cryptotypes.PrivKey{accounts[0].priv}, []uint64{0}, []uint64{0}
-			},
-			false,
-			true,
-			nil,
-		},
-	}
-	for _, tc := range testCases {
-		suite.Run(fmt.Sprintf("Case %s", tc.desc), func() {
-			suite.txBuilder = suite.clientCtx.TxConfig.NewTxBuilder()
-			tc.malleate()
-
-			suite.RunTestCase(privs, msgs, feeAmount, gasLimit, accNums, accSeqs, suite.ctx.ChainID(), tc)
-		})
-	}
-}
diff --git a/x/auth/ante/batch_sigverify.go b/x/auth/ante/batch_sigverify.go
@@ -132,14 +132,11 @@ func (v *SR25519BatchVerifier) VerifyTxs(ctx sdk.Context, txs []sdk.Tx) {
 
 			sig := sigsList[i][j]
 			if sig.Sequence != seqNum {
-				params := v.ak.GetParams(ctx)
-				if !params.GetDisableSeqnoCheck() {
-					v.errors[i] = sdkerrors.Wrapf(
-						sdkerrors.ErrWrongSequence,
-						"account sequence mismatch, expected %d, got %d", acc.GetSequence(), sig.Sequence,
-					)
-					continue
-				}
+				v.errors[i] = sdkerrors.Wrapf(
+					sdkerrors.ErrWrongSequence,
+					"account sequence mismatch, expected %d, got %d", acc.GetSequence(), sig.Sequence,
+				)
+				continue
 			}
 
 			switch data := sig.Data.(type) {

diff --git a/x/auth/ante/sigverify.go b/x/auth/ante/sigverify.go
@@ -268,13 +268,10 @@ func (svd SigVerificationDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simul
 
 		// Check account sequence number.
 		if sig.Sequence != acc.GetSequence() {
-			params := svd.ak.GetParams(ctx)
-			if !params.GetDisableSeqnoCheck() {
-				return ctx, sdkerrors.Wrapf(
-					sdkerrors.ErrWrongSequence,
-					"account sequence mismatch, expected %d, got %d", acc.GetSequence(), sig.Sequence,
-				)
-			}
+			return ctx, sdkerrors.Wrapf(
+				sdkerrors.ErrWrongSequence,
+				"account sequence mismatch, expected %d, got %d", acc.GetSequence(), sig.Sequence,
+			)
 		}
 
 		// retrieve signer data

diff --git a/x/auth/legacy/v040/migrate_test.go b/x/auth/legacy/v040/migrate_test.go
@@ -241,7 +241,6 @@ func TestMigrate(t *testing.T) {
     }
   ],
   "params": {
-    "disable_seqno_check": false,
     "max_memo_characters": "10",
     "sig_verify_cost_ed25519": "40",
     "sig_verify_cost_secp256k1": "50",

diff --git a/x/auth/types/auth.pb.go b/x/auth/types/auth.pb.go
diff --git a/x/auth/types/params.go b/x/auth/types/params.go
@@ -24,7 +24,6 @@ var (
 	KeyTxSizeCostPerByte      = []byte("TxSizeCostPerByte")
 	KeySigVerifyCostED25519   = []byte("SigVerifyCostED25519")
 	KeySigVerifyCostSecp256k1 = []byte("SigVerifyCostSecp256k1")
-	KeyDisableSeqnoCheck      = []byte("KeyDisableSeqnoCheck")
 )
 
 var _ paramtypes.ParamSet = &Params{}
@@ -56,7 +55,6 @@ func (p *Params) ParamSetPairs() paramtypes.ParamSetPairs {
 		paramtypes.NewParamSetPair(KeyTxSizeCostPerByte, &p.TxSizeCostPerByte, validateTxSizeCostPerByte),
 		paramtypes.NewParamSetPair(KeySigVerifyCostED25519, &p.SigVerifyCostED25519, validateSigVerifyCostED25519),
 		paramtypes.NewParamSetPair(KeySigVerifyCostSecp256k1, &p.SigVerifyCostSecp256k1, validateSigVerifyCostSecp256k1),
-		paramtypes.NewParamSetPair(KeyDisableSeqnoCheck, &p.DisableSeqnoCheck, func(i interface{}) error { return nil }),
 	}
 }