revision

protocol/app/ante/sigverify.go

@@ -2,7 +2,6 @@ package ante
 
 import (
 	"fmt"
-	"time"
 
 	errorsmod "cosmossdk.io/errors"
 	txsigning "cosmossdk.io/x/tx/signing"
@@ -14,7 +13,6 @@ 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"
 )
@@ -99,12 +97,6 @@ func (svd SigVerificationDecorator) AnteHandle(
 		// `GoodTilBlock` for replay protection.
 		if !skipSequenceValidation {
 			if accountpluskeeper.IsTimestampNonce(sig.Sequence) {
-				defer telemetry.ModuleMeasureSince(
-					accountplustypes.ModuleName,
-					time.Now(),
-					metrics.TimestampNonce,
-					metrics.Latency,
-				)
 				err = svd.akp.ProcessTimestampNonce(ctx, acc, sig.Sequence)
 
 				if err == nil {

protocol/x/accountplus/keeper/timestampnonce.go

@@ -2,8 +2,11 @@ package keeper
 
 import (
 	"fmt"
+	"time"
 
+	"github.com/cosmos/cosmos-sdk/telemetry"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/dydxprotocol/v4-chain/protocol/lib/metrics"
 	"github.com/dydxprotocol/v4-chain/protocol/x/accountplus/types"
 )
 
@@ -21,6 +24,13 @@ func IsValidTimestampNonce(tsNonce uint64, referenceTs uint64) bool {
 }
 
 func (k Keeper) ProcessTimestampNonce(ctx sdk.Context, acc sdk.AccountI, tsNonce uint64) error {
+	defer telemetry.ModuleMeasureSince(
+		types.ModuleName,
+		time.Now(),
+		metrics.TimestampNonce,
+		metrics.Latency,
+	)
+
 	blockTs := uint64(ctx.BlockTime().UnixMilli())
 	address := acc.GetAddress()