[OTE-553] Timestamp nonce #1970
+188
−242
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,6 +2,7 @@ package ante | |
|
|
||
| import ( | ||
| "fmt" | ||
| "time" | ||
|
|
||
| errorsmod "cosmossdk.io/errors" | ||
| txsigning "cosmossdk.io/x/tx/signing" | ||
|
|
@@ -13,6 +14,7 @@ import ( | |
| authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing" | ||
| "github.com/dydxprotocol/v4-chain/protocol/lib/metrics" | ||
| accountpluskeeper "github.com/dydxprotocol/v4-chain/protocol/x/accountplus/keeper" | ||
| accountplustypes "github.com/dydxprotocol/v4-chain/protocol/x/accountplus/types" | ||
| gometrics "github.com/hashicorp/go-metrics" | ||
| "google.golang.org/protobuf/types/known/anypb" | ||
| ) | ||
|
|
@@ -63,7 +65,8 @@ func (svd SigVerificationDecorator) AnteHandle( | |
| return ctx, err | ||
| } | ||
|
|
||
| // Check that signer length and signature length are the same. | ||
| // The ordering of the sigs and signers have matching ordering (sigs[i] belongs to signers[i]). | ||
| if len(sigs) != len(signers) { | ||
| err := errorsmod.Wrapf( | ||
| sdkerrors.ErrUnauthorized, | ||
|
|
@@ -78,6 +81,7 @@ func (svd SigVerificationDecorator) AnteHandle( | |
| // only messages that use `GoodTilBlock` for replay protection. | ||
| skipSequenceValidation := ShouldSkipSequenceValidation(tx.GetMsgs()) | ||
|
|
||
| // Iterate on sig and signer pairs. | ||
| for i, sig := range sigs { | ||
| acc, err := sdkante.GetSignerAcc(ctx, svd.ak, signers[i]) | ||
| if err != nil { | ||
|
|
@@ -95,35 +99,28 @@ func (svd SigVerificationDecorator) AnteHandle( | |
| // `GoodTilBlock` for replay protection. | ||
| if !skipSequenceValidation { | ||
| if accountpluskeeper.IsTimestampNonce(sig.Sequence) { | ||
| defer telemetry.ModuleMeasureSince( | ||
|
There was a problem hiding this comment. This needs to be put within ProcessTimestampNonce so that the There was a problem hiding this comment. A bit confused. As u said defer run after the function below is run. In this case it is right above There was a problem hiding this comment. A defer statement defers the execution of a function until the surrounding function returns. https://go.dev/tour/flowcontrol/12 |
||
| accountplustypes.ModuleName, | ||
| time.Now(), | ||
| metrics.TimestampNonce, | ||
| metrics.Latency, | ||
| ) | ||
| err = svd.akp.ProcessTimestampNonce(ctx, acc, sig.Sequence) | ||
|
|
||
| if err == nil { | ||
| telemetry.IncrCounterWithLabels( | ||
| []string{metrics.TimestampNonce, metrics.Valid, metrics.Count}, | ||
| 1, | ||
| []gometrics.Label{metrics.GetLabelForIntValue(metrics.ExecMode, int(ctx.ExecMode()))}, | ||
| ) | ||
| return ctx, nil | ||
| } else { | ||
| telemetry.IncrCounterWithLabels( | ||
| []string{metrics.TimestampNonce, metrics.Invalid, metrics.Count}, | ||
| 1, | ||
| []gometrics.Label{metrics.GetLabelForIntValue(metrics.ExecMode, int(ctx.ExecMode()))}, | ||
| ) | ||
| return ctx, errorsmod.Wrapf(sdkerrors.ErrWrongSequence, err.Error()) | ||
| } | ||
| } else { | ||
| if sig.Sequence != acc.GetSequence() { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| package ante | ||
|
|
||
| import ( | ||
| errorsmod "cosmossdk.io/errors" | ||
| sdk "github.com/cosmos/cosmos-sdk/types" | ||
| sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" | ||
| authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing" | ||
| accountpluskeeper "github.com/dydxprotocol/v4-chain/protocol/x/accountplus/keeper" | ||
| ) | ||
|
|
||
| // IsTimestampNonceTx returns `true` if the supplied `tx` consist of a single signature that uses a timestamp nonce | ||
| // value for sequence | ||
| func IsTimestampNonceTx(ctx sdk.Context, tx sdk.Tx) (bool, error) { | ||
| sigTx, ok := tx.(authsigning.SigVerifiableTx) | ||
| if !ok { | ||
| return false, errorsmod.Wrap(sdkerrors.ErrTxDecode, "invalid transaction type") | ||
| } | ||
| signatures, err := sigTx.GetSignaturesV2() | ||
| if err != nil { | ||
| return false, err | ||
| } | ||
|
|
||
| if len(signatures) != 1 { | ||
| return false, errorsmod.Wrap(sdkerrors.ErrTxDecode, "more than one signature") | ||
| } | ||
|
|
||
| return accountpluskeeper.IsTimestampNonce(signatures[0].Sequence), nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| package ante_test | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/cosmos/cosmos-sdk/codec" | ||
| codectypes "github.com/cosmos/cosmos-sdk/codec/types" | ||
| "github.com/cosmos/cosmos-sdk/testutil/testdata" | ||
| sdk "github.com/cosmos/cosmos-sdk/types" | ||
| "github.com/cosmos/cosmos-sdk/types/tx/signing" | ||
| authtx "github.com/cosmos/cosmos-sdk/x/auth/tx" | ||
| "github.com/dydxprotocol/v4-chain/protocol/testutil/constants" | ||
| sdktest "github.com/dydxprotocol/v4-chain/protocol/testutil/sdk" | ||
| "github.com/dydxprotocol/v4-chain/protocol/x/accountplus/ante" | ||
| "github.com/dydxprotocol/v4-chain/protocol/x/accountplus/keeper" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func TestIsTimestampNonceTx(t *testing.T) { | ||
| tests := map[string]struct { | ||
| seqs []uint64 | ||
| expectedResult bool | ||
| expectedErr bool | ||
| }{ | ||
| "Returns false for non-ts nonce": { | ||
| seqs: []uint64{0}, | ||
| expectedResult: false, | ||
| expectedErr: false, | ||
| }, | ||
| "Returns true for ts nonce": { | ||
| seqs: []uint64{keeper.TimestampNonceSequenceCutoff}, | ||
| expectedResult: true, | ||
| expectedErr: false, | ||
| }, | ||
| "Returns error for more than one signature": { | ||
| seqs: []uint64{keeper.TimestampNonceSequenceCutoff, keeper.TimestampNonceSequenceCutoff}, | ||
| expectedResult: false, | ||
| expectedErr: true, | ||
| }, | ||
| } | ||
|
|
||
| // Run tests. | ||
| for name, tc := range tests { | ||
| t.Run(name, func(t *testing.T) { | ||
| // Initialize some test setup which builds a test transaction from a slice of messages. | ||
| var reg codectypes.InterfaceRegistry | ||
| protoCfg := authtx.NewTxConfig(codec.NewProtoCodec(reg), authtx.DefaultSignModes) | ||
| builder := protoCfg.NewTxBuilder() | ||
| err := builder.SetMsgs([]sdk.Msg{constants.Msg_Send}...) | ||
| require.NoError(t, err) | ||
|
|
||
| // Create signatures | ||
| var signatures []signing.SignatureV2 | ||
| for _, seq := range tc.seqs { | ||
| signatures = append(signatures, getSignature(seq)) | ||
| } | ||
| err = builder.SetSignatures(signatures...) | ||
|
|
||
| require.NoError(t, err) | ||
| tx := builder.GetTx() | ||
| ctx, _, _ := sdktest.NewSdkContextWithMultistore() | ||
|
|
||
| // Invoke the function under test. | ||
| result, err := ante.IsTimestampNonceTx(ctx, tx) | ||
|
|
||
| // Assert the results. | ||
| if tc.expectedErr { | ||
| require.NotNil(t, err) | ||
| } | ||
| require.Equal(t, tc.expectedResult, result) | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func getSignature(seq uint64) signing.SignatureV2 { | ||
| _, pubKey, _ := testdata.KeyTestPubAddr() | ||
| return signing.SignatureV2{ | ||
| PubKey: pubKey, | ||
| Data: &signing.SingleSignatureData{ | ||
| SignMode: signing.SignMode_SIGN_MODE_DIRECT, | ||
| Signature: nil, | ||
| }, | ||
| Sequence: seq, | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Consider logging the timestamp nonce check for better debugging.
The check for timestamp nonce transactions can be logged for better debugging and monitoring.