[EVM] Add pending nonce support

baseapp/abci.go

@@ -226,7 +226,7 @@ func (app *BaseApp) CheckTx(ctx context.Context, req *abci.RequestCheckTx) (*abc
  res := sdkerrors.ResponseCheckTx(err, 0, 0, app.trace)
  return &abci.ResponseCheckTxV2{ResponseCheckTx: &res}, err
  }
- gInfo, result, _, priority, pendingTxChecker, err := app.runTx(sdkCtx, mode, tx, sha256.Sum256(req.Tx))
+ gInfo, result, _, priority, pendingTxChecker, expireTxHandler, err := app.runTx(sdkCtx, mode, tx, sha256.Sum256(req.Tx))
  if err != nil {
  res := sdkerrors.ResponseCheckTx(err, gInfo.GasWanted, gInfo.GasUsed, app.trace)
  return &abci.ResponseCheckTxV2{ResponseCheckTx: &res}, err
@@ -241,6 +241,7 @@ func (app *BaseApp) CheckTx(ctx context.Context, req *abci.RequestCheckTx) (*abc
  res.IsPendingTransaction = true
  res.Checker = pendingTxChecker
  }
+ res.ExpireTxHandler = expireTxHandler
 
  return res, nil
 }
@@ -270,7 +271,7 @@ func (app *BaseApp) DeliverTx(ctx sdk.Context, req abci.RequestDeliverTx, tx sdk
  telemetry.SetGauge(float32(gInfo.GasWanted), "tx", "gas", "wanted")
  }()
 
- gInfo, result, anteEvents, _, _, err := app.runTx(ctx.WithTxBytes(req.Tx).WithVoteInfos(app.voteInfos), runTxModeDeliver, tx, checksum)
+ gInfo, result, anteEvents, _, _, _, err := app.runTx(ctx.WithTxBytes(req.Tx).WithVoteInfos(app.voteInfos), runTxModeDeliver, tx, checksum)
  if err != nil {
  resultStr = "failed"
  // if we have a result, use those events instead of just the anteEvents

baseapp/baseapp.go

@@ -854,6 +854,7 @@ func (app *BaseApp) runTx(ctx sdk.Context, mode runTxMode, tx sdk.Tx, checksum [
  anteEvents []abci.Event,
  priority int64,
  pendingTxChecker abci.PendingTxChecker,
+ expireHandler abci.ExpireTxHandler,
  err error,
 ) {
  defer telemetry.MeasureThroughputSinceWithLabels(
@@ -889,7 +890,7 @@ func (app *BaseApp) runTx(ctx sdk.Context, mode runTxMode, tx sdk.Tx, checksum [
 
  // only run the tx if there is block gas remaining
  if mode == runTxModeDeliver && ctx.BlockGasMeter().IsOutOfGas() {
- return gInfo, nil, nil, -1, nil, sdkerrors.Wrap(sdkerrors.ErrOutOfGas, "no block gas left to run tx")
+ return gInfo, nil, nil, -1, nil, nil, sdkerrors.Wrap(sdkerrors.ErrOutOfGas, "no block gas left to run tx")
  }
 
  defer func() {
@@ -926,13 +927,13 @@ func (app *BaseApp) runTx(ctx sdk.Context, mode runTxMode, tx sdk.Tx, checksum [
  }
 
  if tx == nil {
- return sdk.GasInfo{}, nil, nil, 0, nil, sdkerrors.Wrap(sdkerrors.ErrTxDecode, "tx decode error")
+ return sdk.GasInfo{}, nil, nil, 0, nil, nil, sdkerrors.Wrap(sdkerrors.ErrTxDecode, "tx decode error")
  }
 
  msgs := tx.GetMsgs()
 
  if err := validateBasicTxMsgs(msgs); err != nil {
- return sdk.GasInfo{}, nil, nil, 0, nil, err
+ return sdk.GasInfo{}, nil, nil, 0, nil, nil, err
  }
 
  if app.anteHandler != nil {
@@ -974,7 +975,7 @@ func (app *BaseApp) runTx(ctx sdk.Context, mode runTxMode, tx sdk.Tx, checksum [
  // GasMeter expected to be set in AnteHandler
  gasWanted = ctx.GasMeter().Limit()
  if err != nil {
- return gInfo, nil, nil, 0, nil, err
+ return gInfo, nil, nil, 0, nil, nil, err
  }
 
  // Dont need to validate in checkTx mode
@@ -989,12 +990,13 @@ func (app *BaseApp) runTx(ctx sdk.Context, mode runTxMode, tx sdk.Tx, checksum [
  op.EmitValidationFailMetrics()
  }
  errMessage := fmt.Sprintf("Invalid Concurrent Execution antehandler missing %d access operations", len(missingAccessOps))
- return gInfo, nil, nil, 0, nil, sdkerrors.Wrap(sdkerrors.ErrInvalidConcurrencyExecution, errMessage)
+ return gInfo, nil, nil, 0, nil, nil, sdkerrors.Wrap(sdkerrors.ErrInvalidConcurrencyExecution, errMessage)
  }
  }
 
  priority = ctx.Priority()
  pendingTxChecker = ctx.PendingTxChecker()
+ expireHandler = ctx.ExpireTxHandler()
  msCache.Write()
  anteEvents = events.ToABCIEvents()
  anteSpan.End()
@@ -1024,7 +1026,7 @@ func (app *BaseApp) runTx(ctx sdk.Context, mode runTxMode, tx sdk.Tx, checksum [
  if ctx.CheckTxCallback() != nil {
  ctx.CheckTxCallback()(err)
  }
- return gInfo, result, anteEvents, priority, pendingTxChecker, err
+ return gInfo, result, anteEvents, priority, pendingTxChecker, expireHandler, err
 }
 
 // runMsgs iterates through a list of messages and executes them with the provided

baseapp/test_helpers.go

@@ -17,7 +17,7 @@ func (app *BaseApp) Check(txEncoder sdk.TxEncoder, tx sdk.Tx) (sdk.GasInfo, *sdk
  return sdk.GasInfo{}, nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "%s", err)
  }
  ctx := app.checkState.ctx.WithTxBytes(bz).WithVoteInfos(app.voteInfos).WithConsensusParams(app.GetConsensusParams(app.checkState.ctx))
- gasInfo, result, _, _, _, err := app.runTx(ctx, runTxModeCheck, tx, sha256.Sum256(bz))
+ gasInfo, result, _, _, _, _, err := app.runTx(ctx, runTxModeCheck, tx, sha256.Sum256(bz))
  if len(ctx.MultiStore().GetEvents()) > 0 {
  panic("Expected checkTx events to be empty")
  }
@@ -31,7 +31,7 @@ func (app *BaseApp) Simulate(txBytes []byte) (sdk.GasInfo, *sdk.Result, error) {
  if err != nil {
  return sdk.GasInfo{}, nil, err
  }
- gasInfo, result, _, _, _, err := app.runTx(ctx, runTxModeSimulate, tx, sha256.Sum256(txBytes))
+ gasInfo, result, _, _, _, _, err := app.runTx(ctx, runTxModeSimulate, tx, sha256.Sum256(txBytes))
  if len(ctx.MultiStore().GetEvents()) > 0 {
  panic("Expected simulate events to be empty")
  }
@@ -49,7 +49,7 @@ func (app *BaseApp) Deliver(txEncoder sdk.TxEncoder, tx sdk.Tx) (sdk.GasInfo, *s
  if err != nil {
  return sdk.GasInfo{}, &sdk.Result{}, err
  }
- gasInfo, result, _, _, _, err := app.runTx(ctx, runTxModeDeliver, decoded, sha256.Sum256(bz))
+ gasInfo, result, _, _, _, _, err := app.runTx(ctx, runTxModeDeliver, decoded, sha256.Sum256(bz))
  return gasInfo, result, err
 }
 

go.mod

@@ -146,7 +146,7 @@ replace (
  github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.7.0
  github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 
- github.com/tendermint/tendermint => github.com/sei-protocol/sei-tendermint v0.2.30-evm-2
+ github.com/tendermint/tendermint => github.com/sei-protocol/sei-tendermint v0.2.30-evm-6-pending-nonces
 
  // latest grpc doesn't work with with our modified proto compiler, so we need to enforce
  // the following version across all dependencies.

go.sum

@@ -689,8 +689,8 @@ github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg
 github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY=
 github.com/sei-protocol/sei-iavl v0.1.7 h1:cUdHDBkxs0FF/kOt1qCVLm0K+Bqaw92/dbZSgn4kxiA=
 github.com/sei-protocol/sei-iavl v0.1.7/go.mod h1:7PfkEVT5dcoQE+s/9KWdoXJ8VVVP1QpYYPLdxlkSXFk=
-github.com/sei-protocol/sei-tendermint v0.2.30-evm-2 h1:ibEV/DNT/5zO+A1+pP0Di96raadNv33ieOtMAn/iEr8=
-github.com/sei-protocol/sei-tendermint v0.2.30-evm-2/go.mod h1:+BtDvAwTkE64BlxzpH9ZP7S6vUYT9wRXiZa/WW8/o4g=
+github.com/sei-protocol/sei-tendermint v0.2.30-evm-6-pending-nonces h1:nhswd9gq5nO+p/QNT+GhJ+RB4swDfXVV584mVz+V+9c=
+github.com/sei-protocol/sei-tendermint v0.2.30-evm-6-pending-nonces/go.mod h1:+BtDvAwTkE64BlxzpH9ZP7S6vUYT9wRXiZa/WW8/o4g=
 github.com/sei-protocol/sei-tm-db v0.0.5 h1:3WONKdSXEqdZZeLuWYfK5hP37TJpfaUa13vAyAlvaQY=
 github.com/sei-protocol/sei-tm-db v0.0.5/go.mod h1:Cpa6rGyczgthq7/0pI31jys2Fw0Nfrc+/jKdP1prVqY=
 github.com/shirou/gopsutil v2.20.5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=

types/context.go

@@ -42,6 +42,7 @@ type Context struct {
  priority int64 // The tx priority, only relevant in CheckTx
  pendingTxChecker abci.PendingTxChecker // Checker for pending transaction, only relevant in CheckTx
  checkTxCallback func(error) // callback to make at the end of CheckTx. Input param is the error (nil-able) of `runMsgs`
+ expireTxHandler func() // callback that the mempool invokes when a tx is expired
 
  txBlockingChannels acltypes.MessageAccessOpsChannelMapping
  txCompletionChannels acltypes.MessageAccessOpsChannelMapping
@@ -118,6 +119,10 @@ func (c Context) Priority() int64 {
  return c.priority
 }
 
+func (c Context) ExpireTxHandler() abci.ExpireTxHandler {
+ return c.expireTxHandler
+}
+
 func (c Context) PendingTxChecker() abci.PendingTxChecker {
  return c.pendingTxChecker
 }
@@ -369,6 +374,11 @@ func (c Context) WithCheckTxCallback(checkTxCallback func(error)) Context {
  return c
 }
 
+func (c Context) WithExpireTxHandler(expireTxHandler func()) Context {
+ c.expireTxHandler = expireTxHandler
+ return c
+}
+
 // TODO: remove???
 func (c Context) IsZero() bool {
  return c.ms == nil