From 1c5a372beead38a92950cf55e131d13ee40250f8 Mon Sep 17 00:00:00 2001 From: Philip Su Date: Mon, 27 Nov 2023 14:21:22 -0800 Subject: [PATCH] Revert "Seqno config disable (#354)" (#364) This reverts commit 5f04ca7ead4294356a90f6e0816d095ea97dd539. 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 --- baseapp/block_gas_test.go | 2 +- proto/cosmos/auth/v1beta1/auth.proto | 1 - x/auth/ante/ante_test.go | 58 ------------ x/auth/ante/batch_sigverify.go | 13 +-- x/auth/ante/sigverify.go | 11 +-- x/auth/legacy/v040/migrate_test.go | 1 - x/auth/types/auth.pb.go | 133 +++++++++------------------ x/auth/types/params.go | 2 - 8 files changed, 54 insertions(+), 167 deletions(-) diff --git a/baseapp/block_gas_test.go b/baseapp/block_gas_test.go index 2d154709c..7d9e02c7b 100644 --- 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 index 6c7e863b7..72e1d9ec2 100644 --- 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 index 2f1717f17..4e6462c16 100644 --- 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 index 399a0ef56..ec9c7e325 100644 --- 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 index 503d7dbef..3df25abb0 100644 --- 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 index 2e391a226..b1e12ffce 100644 --- 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 index c13ed7a46..fa52ac5a8 100644 --- a/x/auth/types/auth.pb.go +++ b/x/auth/types/auth.pb.go @@ -113,7 +113,6 @@ type Params struct { TxSizeCostPerByte uint64 `protobuf:"varint,3,opt,name=tx_size_cost_per_byte,json=txSizeCostPerByte,proto3" json:"tx_size_cost_per_byte,omitempty" yaml:"tx_size_cost_per_byte"` SigVerifyCostED25519 uint64 `protobuf:"varint,4,opt,name=sig_verify_cost_ed25519,json=sigVerifyCostEd25519,proto3" json:"sig_verify_cost_ed25519,omitempty" yaml:"sig_verify_cost_ed25519"` SigVerifyCostSecp256k1 uint64 `protobuf:"varint,5,opt,name=sig_verify_cost_secp256k1,json=sigVerifyCostSecp256k1,proto3" json:"sig_verify_cost_secp256k1,omitempty" yaml:"sig_verify_cost_secp256k1"` - DisableSeqnoCheck bool `protobuf:"varint,6,opt,name=disable_seqno_check,json=disableSeqnoCheck,proto3" json:"disable_seqno_check,omitempty"` } func (m *Params) Reset() { *m = Params{} } @@ -183,13 +182,6 @@ func (m *Params) GetSigVerifyCostSecp256k1() uint64 { return 0 } -func (m *Params) GetDisableSeqnoCheck() bool { - if m != nil { - return m.DisableSeqnoCheck - } - return false -} - func init() { proto.RegisterType((*BaseAccount)(nil), "cosmos.auth.v1beta1.BaseAccount") proto.RegisterType((*ModuleAccount)(nil), "cosmos.auth.v1beta1.ModuleAccount") @@ -199,51 +191,50 @@ func init() { func init() { proto.RegisterFile("cosmos/auth/v1beta1/auth.proto", fileDescriptor_7e1f7e915d020d2d) } var fileDescriptor_7e1f7e915d020d2d = []byte{ - // 704 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x54, 0xc1, 0x6e, 0xda, 0x4a, - 0x14, 0xc5, 0x2f, 0x3c, 0x42, 0x86, 0x24, 0x12, 0x86, 0x24, 0x86, 0xf7, 0x64, 0x5b, 0x5e, 0xf1, - 0xa4, 0x87, 0x11, 0x54, 0xa9, 0x14, 0x16, 0x55, 0x63, 0xda, 0x45, 0xd4, 0x26, 0x8a, 0x8c, 0xd4, - 0x45, 0x55, 0xc9, 0x1d, 0x9b, 0x89, 0x63, 0x81, 0x3d, 0x8e, 0x67, 0x1c, 0xe1, 0x7c, 0x41, 0x77, - 0xed, 0xb2, 0xcb, 0x7c, 0x44, 0xfe, 0xa0, 0x9b, 0x2e, 0xa3, 0xac, 0xba, 0xb2, 0x2a, 0xb2, 0xa9, - 0xba, 0x64, 0x5f, 0xa9, 0xb2, 0xc7, 0x10, 0x88, 0xe8, 0x8a, 0xb9, 0xe7, 0x9c, 0x7b, 0xee, 0x9d, - 0x7b, 0xf1, 0x00, 0xd1, 0xc2, 0xc4, 0xc5, 0xa4, 0x05, 0x43, 0x7a, 0xde, 0xba, 0x6c, 0x9b, 0x88, - 0xc2, 0x76, 0x1a, 0xa8, 0x7e, 0x80, 0x29, 0xe6, 0x2b, 0x8c, 0x57, 0x53, 0x28, 0xe3, 0xeb, 0x35, - 0x06, 0x1a, 0xa9, 0xa4, 0x95, 0x29, 0xd2, 0xa0, 0x5e, 0xb5, 0xb1, 0x8d, 0x19, 0x9e, 0x9c, 0x32, - 0xb4, 0x66, 0x63, 0x6c, 0x8f, 0x50, 0x2b, 0x8d, 0xcc, 0xf0, 0xac, 0x05, 0xbd, 0x88, 0x51, 0xca, - 0x2f, 0x0e, 0x94, 0x34, 0x48, 0xd0, 0xa1, 0x65, 0xe1, 0xd0, 0xa3, 0xbc, 0x00, 0xd6, 0xe1, 0x60, - 0x10, 0x20, 0x42, 0x04, 0x4e, 0xe6, 0x1a, 0x1b, 0xfa, 0x2c, 0xe4, 0xdf, 0x81, 0x75, 0x3f, 0x34, - 0x8d, 0x21, 0x8a, 0x84, 0xbf, 0x64, 0xae, 0x51, 0xea, 0x54, 0x55, 0x66, 0xab, 0xce, 0x6c, 0xd5, - 0x43, 0x2f, 0xd2, 0x9a, 0x3f, 0x63, 0xa9, 0xea, 0x87, 0xe6, 0xc8, 0xb1, 0x12, 0xed, 0xff, 0xd8, - 0x75, 0x28, 0x72, 0x7d, 0x1a, 0x4d, 0x63, 0xa9, 0x1c, 0x41, 0x77, 0xd4, 0x55, 0x1e, 0x58, 0x45, - 0x2f, 0xf8, 0xa1, 0xf9, 0x0a, 0x45, 0xfc, 0x73, 0xb0, 0x0d, 0x59, 0x0b, 0x86, 0x17, 0xba, 0x26, - 0x0a, 0x84, 0x35, 0x99, 0x6b, 0xe4, 0xb5, 0xda, 0x34, 0x96, 0x76, 0x58, 0xda, 0x32, 0xaf, 0xe8, - 0x5b, 0x19, 0x70, 0x92, 0xc6, 0x7c, 0x1d, 0x14, 0x09, 0xba, 0x08, 0x91, 0x67, 0x21, 0x21, 0x9f, - 0xe4, 0xea, 0xf3, 0xb8, 0x2b, 0x7c, 0xb8, 0x96, 0x72, 0x9f, 0xaf, 0xa5, 0xdc, 0x8f, 0x6b, 0x29, - 0x77, 0x77, 0xd3, 0x2c, 0x66, 0xd7, 0x3d, 0x52, 0xbe, 0x70, 0x60, 0xeb, 0x18, 0x0f, 0xc2, 0xd1, - 0x7c, 0x02, 0xef, 0xc1, 0xa6, 0x09, 0x09, 0x32, 0x32, 0xf7, 0x74, 0x0c, 0xa5, 0x8e, 0xac, 0xae, - 0xd8, 0x84, 0xba, 0x30, 0x39, 0xed, 0x9f, 0xdb, 0x58, 0xe2, 0xa6, 0xb1, 0x54, 0x61, 0xdd, 0x2e, - 0x7a, 0x28, 0x7a, 0xc9, 0x5c, 0x98, 0x31, 0x0f, 0xf2, 0x1e, 0x74, 0x51, 0x3a, 0xc6, 0x0d, 0x3d, - 0x3d, 0xf3, 0x32, 0x28, 0xf9, 0x28, 0x70, 0x1d, 0x42, 0x1c, 0xec, 0x11, 0x61, 0x4d, 0x5e, 0x6b, - 0x6c, 0xe8, 0x8b, 0x50, 0xb7, 0x3e, 0xbb, 0xc3, 0xdd, 0x4d, 0x73, 0x7b, 0xa9, 0xe5, 0x23, 0xe5, - 0x63, 0x1e, 0x14, 0x4e, 0x61, 0x00, 0x5d, 0xc2, 0x9f, 0x80, 0x8a, 0x0b, 0xc7, 0x86, 0x8b, 0x5c, - 0x6c, 0x58, 0xe7, 0x30, 0x80, 0x16, 0x45, 0x01, 0x5b, 0x66, 0x5e, 0x13, 0xa7, 0xb1, 0x54, 0x67, - 0xfd, 0xad, 0x10, 0x29, 0x7a, 0xd9, 0x85, 0xe3, 0x63, 0xe4, 0xe2, 0xde, 0x1c, 0xe3, 0x0f, 0xc0, - 0x26, 0x1d, 0x1b, 0xc4, 0xb1, 0x8d, 0x91, 0xe3, 0x3a, 0x34, 0x6d, 0x3a, 0xaf, 0xed, 0x3d, 0x5c, - 0x74, 0x91, 0x55, 0x74, 0x40, 0xc7, 0x7d, 0xc7, 0x7e, 0x9d, 0x04, 0xbc, 0x0e, 0x76, 0x52, 0xf2, - 0x0a, 0x19, 0x16, 0x26, 0xd4, 0xf0, 0x51, 0x60, 0x98, 0x11, 0x45, 0xd9, 0x6a, 0xe5, 0x69, 0x2c, - 0xfd, 0xbb, 0xe0, 0xf1, 0x58, 0xa6, 0xe8, 0xe5, 0xc4, 0xec, 0x0a, 0xf5, 0x30, 0xa1, 0xa7, 0x28, - 0xd0, 0x22, 0x8a, 0xf8, 0x0b, 0xb0, 0x97, 0x54, 0xbb, 0x44, 0x81, 0x73, 0x16, 0x31, 0x3d, 0x1a, - 0x74, 0xf6, 0xf7, 0xdb, 0x07, 0x6c, 0xe9, 0x5a, 0x77, 0x12, 0x4b, 0xd5, 0xbe, 0x63, 0xbf, 0x49, - 0x15, 0x49, 0xea, 0xcb, 0x17, 0x29, 0x3f, 0x8d, 0x25, 0x91, 0x55, 0xfb, 0x83, 0x81, 0xa2, 0x57, - 0xc9, 0x52, 0x1e, 0x83, 0xf9, 0x08, 0xd4, 0x1e, 0x67, 0x10, 0x64, 0xf9, 0x9d, 0xfd, 0xa7, 0xc3, - 0xb6, 0xf0, 0x77, 0x5a, 0xf4, 0xd9, 0x24, 0x96, 0x76, 0x97, 0x8a, 0xf6, 0x67, 0x8a, 0x69, 0x2c, - 0xc9, 0xab, 0xcb, 0xce, 0x4d, 0x14, 0x7d, 0x97, 0xac, 0xcc, 0xe5, 0x55, 0x50, 0x19, 0x38, 0x04, - 0x9a, 0x23, 0x64, 0x10, 0x74, 0xe1, 0x25, 0xcb, 0x42, 0xd6, 0x50, 0x28, 0xc8, 0x5c, 0xa3, 0xa8, - 0x97, 0x33, 0xaa, 0x9f, 0x30, 0xbd, 0x84, 0xe8, 0x16, 0xb3, 0xff, 0x38, 0xa7, 0xf5, 0xbe, 0x4e, - 0x44, 0xee, 0x76, 0x22, 0x72, 0xdf, 0x27, 0x22, 0xf7, 0xe9, 0x5e, 0xcc, 0xdd, 0xde, 0x8b, 0xb9, - 0x6f, 0xf7, 0x62, 0xee, 0xed, 0x7f, 0xb6, 0x43, 0xcf, 0x43, 0x53, 0xb5, 0xb0, 0x9b, 0xbd, 0x1d, - 0xd9, 0x4f, 0x93, 0x0c, 0x86, 0xad, 0x31, 0x7b, 0x8a, 0x68, 0xe4, 0x23, 0x62, 0x16, 0xd2, 0x2f, - 0xfb, 0xc9, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1b, 0xbd, 0x76, 0x46, 0xa6, 0x04, 0x00, 0x00, + // 674 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x54, 0x4d, 0x4f, 0xdb, 0x4a, + 0x14, 0x8d, 0x5f, 0xf2, 0xf8, 0x98, 0x00, 0x12, 0x26, 0x80, 0x93, 0xf7, 0x64, 0x5b, 0x5e, 0xe5, + 0x49, 0x2f, 0x8e, 0x92, 0x8a, 0x4a, 0x64, 0x51, 0x15, 0xd3, 0x2e, 0x50, 0x0b, 0x42, 0x46, 0xea, + 0xa2, 0xaa, 0xe4, 0x8e, 0x9d, 0xc1, 0x58, 0x64, 0x32, 0xc6, 0x33, 0x46, 0x31, 0xbf, 0xa0, 0xcb, + 0x2e, 0xbb, 0xe4, 0x47, 0xf0, 0x0f, 0xba, 0xe9, 0x12, 0xb1, 0xea, 0xca, 0xad, 0xc2, 0xa6, 0xea, + 0x32, 0xfb, 0x4a, 0x95, 0x67, 0x9c, 0x90, 0xa0, 0x74, 0x95, 0xb9, 0xe7, 0x9c, 0x7b, 0xee, 0x9d, + 0x7b, 0xe3, 0x01, 0xaa, 0x47, 0x28, 0x26, 0xb4, 0x09, 0x63, 0x76, 0xd6, 0xbc, 0x6c, 0xb9, 0x88, + 0xc1, 0x16, 0x0f, 0xcc, 0x30, 0x22, 0x8c, 0xc8, 0x1b, 0x82, 0x37, 0x39, 0x94, 0xf3, 0xb5, 0xaa, + 0x00, 0x1d, 0x2e, 0x69, 0xe6, 0x0a, 0x1e, 0xd4, 0x2a, 0x3e, 0xf1, 0x89, 0xc0, 0xb3, 0x53, 0x8e, + 0x56, 0x7d, 0x42, 0xfc, 0x1e, 0x6a, 0xf2, 0xc8, 0x8d, 0x4f, 0x9b, 0xb0, 0x9f, 0x08, 0xca, 0xf8, + 0x25, 0x81, 0xb2, 0x05, 0x29, 0xda, 0xf3, 0x3c, 0x12, 0xf7, 0x99, 0xac, 0x80, 0x45, 0xd8, 0xed, + 0x46, 0x88, 0x52, 0x45, 0xd2, 0xa5, 0xfa, 0xb2, 0x3d, 0x0e, 0xe5, 0x77, 0x60, 0x31, 0x8c, 0x5d, + 0xe7, 0x1c, 0x25, 0xca, 0x5f, 0xba, 0x54, 0x2f, 0xb7, 0x2b, 0xa6, 0xb0, 0x35, 0xc7, 0xb6, 0xe6, + 0x5e, 0x3f, 0xb1, 0x1a, 0x3f, 0x53, 0xad, 0x12, 0xc6, 0x6e, 0x2f, 0xf0, 0x32, 0xed, 0xff, 0x04, + 0x07, 0x0c, 0xe1, 0x90, 0x25, 0xa3, 0x54, 0x5b, 0x4f, 0x20, 0xee, 0x75, 0x8c, 0x07, 0xd6, 0xb0, + 0x17, 0xc2, 0xd8, 0x7d, 0x85, 0x12, 0xf9, 0x39, 0x58, 0x83, 0xa2, 0x05, 0xa7, 0x1f, 0x63, 0x17, + 0x45, 0x4a, 0x51, 0x97, 0xea, 0x25, 0xab, 0x3a, 0x4a, 0xb5, 0x4d, 0x91, 0x36, 0xcb, 0x1b, 0xf6, + 0x6a, 0x0e, 0x1c, 0xf1, 0x58, 0xae, 0x81, 0x25, 0x8a, 0x2e, 0x62, 0xd4, 0xf7, 0x90, 0x52, 0xca, + 0x72, 0xed, 0x49, 0xdc, 0x51, 0x3e, 0x5c, 0x6b, 0x85, 0x4f, 0xd7, 0x5a, 0xe1, 0xc7, 0xb5, 0x56, + 0xb8, 0xbb, 0x69, 0x2c, 0xe5, 0xd7, 0x3d, 0x30, 0x3e, 0x4b, 0x60, 0xf5, 0x90, 0x74, 0xe3, 0xde, + 0x64, 0x02, 0xef, 0xc1, 0x8a, 0x0b, 0x29, 0x72, 0x72, 0x77, 0x3e, 0x86, 0x72, 0x5b, 0x37, 0xe7, + 0x6c, 0xc2, 0x9c, 0x9a, 0x9c, 0xf5, 0xcf, 0x6d, 0xaa, 0x49, 0xa3, 0x54, 0xdb, 0x10, 0xdd, 0x4e, + 0x7b, 0x18, 0x76, 0xd9, 0x9d, 0x9a, 0xb1, 0x0c, 0x4a, 0x7d, 0x88, 0x11, 0x1f, 0xe3, 0xb2, 0xcd, + 0xcf, 0xb2, 0x0e, 0xca, 0x21, 0x8a, 0x70, 0x40, 0x69, 0x40, 0xfa, 0x54, 0x29, 0xea, 0xc5, 0xfa, + 0xb2, 0x3d, 0x0d, 0x75, 0x6a, 0xe3, 0x3b, 0xdc, 0xdd, 0x34, 0xd6, 0x66, 0x5a, 0x3e, 0x30, 0xbe, + 0x15, 0xc1, 0xc2, 0x31, 0x8c, 0x20, 0xa6, 0xf2, 0x11, 0xd8, 0xc0, 0x70, 0xe0, 0x60, 0x84, 0x89, + 0xe3, 0x9d, 0xc1, 0x08, 0x7a, 0x0c, 0x45, 0x62, 0x99, 0x25, 0x4b, 0x1d, 0xa5, 0x5a, 0x4d, 0xf4, + 0x37, 0x47, 0x64, 0xd8, 0xeb, 0x18, 0x0e, 0x0e, 0x11, 0x26, 0xfb, 0x13, 0x4c, 0xde, 0x05, 0x2b, + 0x6c, 0xe0, 0xd0, 0xc0, 0x77, 0x7a, 0x01, 0x0e, 0x18, 0x6f, 0xba, 0x64, 0x6d, 0x3f, 0x5c, 0x74, + 0x9a, 0x35, 0x6c, 0xc0, 0x06, 0x27, 0x81, 0xff, 0x3a, 0x0b, 0x64, 0x1b, 0x6c, 0x72, 0xf2, 0x0a, + 0x39, 0x1e, 0xa1, 0xcc, 0x09, 0x51, 0xe4, 0xb8, 0x09, 0x43, 0xf9, 0x6a, 0xf5, 0x51, 0xaa, 0xfd, + 0x3b, 0xe5, 0xf1, 0x58, 0x66, 0xd8, 0xeb, 0x99, 0xd9, 0x15, 0xda, 0x27, 0x94, 0x1d, 0xa3, 0xc8, + 0x4a, 0x18, 0x92, 0x2f, 0xc0, 0x76, 0x56, 0xed, 0x12, 0x45, 0xc1, 0x69, 0x22, 0xf4, 0xa8, 0xdb, + 0xde, 0xd9, 0x69, 0xed, 0x8a, 0xa5, 0x5b, 0x9d, 0x61, 0xaa, 0x55, 0x4e, 0x02, 0xff, 0x0d, 0x57, + 0x64, 0xa9, 0x2f, 0x5f, 0x70, 0x7e, 0x94, 0x6a, 0xaa, 0xa8, 0xf6, 0x07, 0x03, 0xc3, 0xae, 0xd0, + 0x99, 0x3c, 0x01, 0xcb, 0x09, 0xa8, 0x3e, 0xce, 0xa0, 0xc8, 0x0b, 0xdb, 0x3b, 0x4f, 0xcf, 0x5b, + 0xca, 0xdf, 0xbc, 0xe8, 0xb3, 0x61, 0xaa, 0x6d, 0xcd, 0x14, 0x3d, 0x19, 0x2b, 0x46, 0xa9, 0xa6, + 0xcf, 0x2f, 0x3b, 0x31, 0x31, 0xec, 0x2d, 0x3a, 0x37, 0xb7, 0xb3, 0x94, 0xff, 0x67, 0x25, 0x6b, + 0xff, 0xcb, 0x50, 0x95, 0x6e, 0x87, 0xaa, 0xf4, 0x7d, 0xa8, 0x4a, 0x1f, 0xef, 0xd5, 0xc2, 0xed, + 0xbd, 0x5a, 0xf8, 0x7a, 0xaf, 0x16, 0xde, 0xfe, 0xe7, 0x07, 0xec, 0x2c, 0x76, 0x4d, 0x8f, 0xe0, + 0xfc, 0x2d, 0xc8, 0x7f, 0x1a, 0xb4, 0x7b, 0xde, 0x1c, 0x88, 0xa7, 0x85, 0x25, 0x21, 0xa2, 0xee, + 0x02, 0xff, 0x52, 0x9f, 0xfc, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x49, 0x90, 0x16, 0xd9, 0x76, 0x04, + 0x00, 0x00, } func (this *Params) Equal(that interface{}) bool { @@ -280,9 +271,6 @@ func (this *Params) Equal(that interface{}) bool { if this.SigVerifyCostSecp256k1 != that1.SigVerifyCostSecp256k1 { return false } - if this.DisableSeqnoCheck != that1.DisableSeqnoCheck { - return false - } return true } func (m *BaseAccount) Marshal() (dAtA []byte, err error) { @@ -408,16 +396,6 @@ func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.DisableSeqnoCheck { - i-- - if m.DisableSeqnoCheck { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x30 - } if m.SigVerifyCostSecp256k1 != 0 { i = encodeVarintAuth(dAtA, i, uint64(m.SigVerifyCostSecp256k1)) i-- @@ -524,9 +502,6 @@ func (m *Params) Size() (n int) { if m.SigVerifyCostSecp256k1 != 0 { n += 1 + sovAuth(uint64(m.SigVerifyCostSecp256k1)) } - if m.DisableSeqnoCheck { - n += 2 - } return n } @@ -966,26 +941,6 @@ func (m *Params) Unmarshal(dAtA []byte) error { break } } - case 6: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field DisableSeqnoCheck", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowAuth - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.DisableSeqnoCheck = bool(v != 0) default: iNdEx = preIndex skippy, err := skipAuth(dAtA[iNdEx:]) diff --git a/x/auth/types/params.go b/x/auth/types/params.go index 865f8bf3c..dbe41ac0e 100644 --- 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 }), } }