Merge branch 'main' into fix-boilerplates

Author: yihuang

CHANGELOG.md

@@ -26,6 +26,7 @@
 - [\#511](https://github.com/cosmos/evm/pull/511) Minor code cleanup for `AddPrecompileFn`.
 - [\#544](https://github.com/cosmos/evm/pull/544) Parse logs from the txResult.Data and avoid emitting EVM events to cosmos-sdk events.
 - [\#582](https://github.com/cosmos/evm/pull/582) Add block max-gas (from genesis.json) and new min-tip (from app.toml/flags) ingestion into mempool config
+- [\#598](https://github.com/cosmos/evm/pull/598) Reduce number of times CreateQueryContext in mempool.
 - [\#577](https://github.com/cosmos/evm/pull/577) Cleanup precompiles boilerplate code.
 
 ### FEATURES

Makefile

@@ -395,3 +395,73 @@ mocks:
 	@go get github.com/vektra/mockery/v2
 	@go generate ./...
 	@make format-go
+
+###############################################################################
+###                              D2 Diagrams                                ###
+###############################################################################
+
+D2_THEME=300
+D2_DARK_THEME=200
+D2_LAYOUT=tala
+
+D2_ENV_VARS=D2_THEME=$(D2_THEME) \
+	    D2_DARK_THEME=$(D2_DARK_THEME) \
+	    D2_LAYOUT=$(D2_LAYOUT)
+
+.PHONY: d2check d2watch d2gen d2gen-all
+
+d2check:
+	@echo "🔍 checking if d2 is installed..."
+	@which d2 > /dev/null 2>&1 || { \
+		echo "🔴 d2 is not installed, see installation docs: https://d2lang.com/tour/install/"; \
+		exit 1; \
+	}
+	@echo "🟢 d2 is installed"
+	@echo "🔍 checking if $(D2_LAYOUT) layout is installed..."
+	@d2 layout | grep $(D2_LAYOUT) > /dev/null 2>&1 || { \
+		echo "🔴 $(D2_LAYOUT) layout is not installed, see docs: https://d2lang.com/tour/layouts/"; \
+		exit 1; \
+	}
+	@echo "🟢 $(D2_LAYOUT) layout is installed"
+
+d2watch: d2check
+	@if [ -z "$(FILE)" ]; then \
+		echo "🔴 missing required parameter FILE, the correct usage is: make d2watch FILE=path/to/file.d2"; \
+		exit 1; \
+	fi
+	@if [ ! -f "$(FILE)" ]; then \
+		echo "🔴 file $(FILE) does not exist"; \
+		exit 1; \
+	fi
+	@echo "🔄 watching $(FILE) for changes..."
+	@dir=$$(dirname "$(FILE)"); \
+	basename=$$(basename "$(FILE)" .d2); \
+	svgfile="$$dir/$$basename.svg"; \
+	printf "📊 generating $$svgfile from $(FILE)... "; \
+	$(D2_ENV_VARS) d2 --watch "$(FILE)" "$$svgfile"
+
+d2gen: d2check
+	@if [ -z "$(FILE)" ]; then \
+		echo "🔴 missing required parameter FILE, the correct usage is: make d2gen FILE=path/to/file.d2"; \
+		exit 1; \
+	fi
+	@if [ ! -f "$(FILE)" ]; then \
+		echo "🔴 file $(FILE) does not exist"; \
+		exit 1; \
+	fi
+	@dir=$$(dirname "$(FILE)"); \
+	basename=$$(basename "$(FILE)" .d2); \
+	svgfile="$$dir/$$basename.svg"; \
+	printf "📊 generating $$svgfile from $(FILE)... "; \
+	$(D2_ENV_VARS) d2 "$(FILE)" "$$svgfile" > /dev/null 2>&1 && echo "done ✅" || echo "failed ❌";
+
+d2gen-all: d2check
+	@echo "🟢 generating svg files for all d2 diagrams..."
+	@find . -name "*.d2" -type f | while read d2file; do \
+		dir=$$(dirname "$$d2file"); \
+		basename=$$(basename "$$d2file" .d2); \
+		svgfile="$$dir/$$basename.svg"; \
+		printf "📊 generating $$svgfile from $$d2file... "; \
+		$(D2_ENV_VARS) d2 "$$d2file" "$$svgfile" > /dev/null 2>&1 && echo "done ✅" || echo "failed ❌"; \
+	done
+	@echo "✅ svg files generated for all d2 diagrams"

contracts/solidity/precompiles/testutil/contracts/StakingReverter.sol

@@ -49,6 +49,36 @@ contract StakingReverter {
         STAKING_CONTRACT.delegate(address(this), validatorAddress, 10);
     }
 
+    /// @dev nestedTryCatchDelegations performs nested try/catch calls to precompile
+    /// where inner calls revert intentionally. Only the successful delegations
+    /// outside the reverting scope should persist.
+    ///
+    /// Expected successful delegations: 1 (before loop) + outerTimes (after each catch) + 1 (after loop)
+    function nestedTryCatchDelegations(uint outerTimes, uint innerTimes, string calldata validatorAddress) external {
+        // Initial successful delegate before any nested reverts
+        STAKING_CONTRACT.delegate(address(this), validatorAddress, 10);
+
+        for (uint i = 0; i < outerTimes; i++) {
+            // Outer call that will revert and be caught
+            try StakingReverter(address(this)).performDelegation(validatorAddress) {
+                // no-op
+            } catch {
+                // After catching the revert, perform a successful delegate
+                STAKING_CONTRACT.delegate(address(this), validatorAddress, 10);
+
+                // Inner nested loop of reverting calls
+                for (uint j = 0; j < innerTimes; j++) {
+                    try StakingReverter(address(this)).performDelegation(validatorAddress) {
+                        // no-op
+                    } catch {}
+                }
+            }
+        }
+
+        // Final successful delegate after the loops
+        STAKING_CONTRACT.delegate(address(this), validatorAddress, 10);
+    }
+
     function performDelegation(string calldata validatorAddress) external {
         STAKING_CONTRACT.delegate(address(this), validatorAddress, 10);
         revert();

crypto/ethsecp256k1/ethsecp256k1.go

@@ -8,8 +8,6 @@ import (
 
 	"github.com/ethereum/go-ethereum/crypto"
 
-	tmcrypto "github.com/cometbft/cometbft/crypto"
-
 	"github.com/cosmos/evm/ethereum/eip712"
 
 	errorsmod "cosmossdk.io/errors"
@@ -147,13 +145,13 @@ var (
 
 // Address returns the address of the ECDSA public key.
 // The function will return an empty address if the public key is invalid.
-func (pubKey PubKey) Address() tmcrypto.Address {
+func (pubKey PubKey) Address() cryptotypes.Address {
 	pubk, err := crypto.DecompressPubkey(pubKey.Key)
 	if err != nil {
 		return nil
 	}
 
-	return tmcrypto.Address(crypto.PubkeyToAddress(*pubk).Bytes())
+	return cryptotypes.Address(crypto.PubkeyToAddress(*pubk).Bytes())
 }
 
 // Bytes returns the raw bytes of the ECDSA public key.

mempool/README.md

@@ -411,7 +411,7 @@ The following diagrams illustrate the complete transaction flow architecture, sh
 
 ### Architecture Overview
 
-![EVM Mempool Architecture](img/mempool_architecture.jpg)
+![EVM Mempool Architecture](img/mempool_architecture.svg)
 
 ### Transaction Flow
 

mempool/blockchain.go

@@ -41,6 +41,7 @@ type Blockchain struct {
 	zeroHeader         *types.Header
 	blockGasLimit      uint64
 	previousHeaderHash common.Hash
+	latestCtx          sdk.Context
 }
 
 // newBlockchain creates a new Blockchain instance that bridges Cosmos SDK state with Ethereum mempools.
@@ -78,10 +79,8 @@ func (b Blockchain) Config() *params.ChainConfig {
 // including block height, timestamp, gas limits, and base fee (if London fork is active).
 // Returns a zero header as placeholder if the context is not yet available.
 func (b Blockchain) CurrentBlock() *types.Header {
-	ctx, err := b.GetLatestCtx()
-	// This should only error out on the first block.
+	ctx, err := b.GetLatestContext()
 	if err != nil {
-		b.logger.Debug("failed to get latest context, returning zero header", "error", err)
 		return b.zeroHeader
 	}
 
@@ -169,6 +168,12 @@ func (b Blockchain) SubscribeChainHeadEvent(ch chan<- core.ChainHeadEvent) event
 
 // NotifyNewBlock sends a chain head event when a new block is finalized
 func (b *Blockchain) NotifyNewBlock() {
+	latestCtx, err := b.newLatestContext()
+	if err != nil {
+		b.latestCtx = sdk.Context{}
+		b.logger.Debug("failed to get latest context, notifying chain head", "error", err)
+	}
+	b.latestCtx = latestCtx
 	header := b.CurrentBlock()
 	headerHash := header.Hash()
 
@@ -197,7 +202,7 @@ func (b Blockchain) StateAt(hash common.Hash) (vm.StateDB, error) {
 	}
 
 	// Always get the latest context to avoid stale nonce state.
-	ctx, err := b.GetLatestCtx()
+	ctx, err := b.GetLatestContext()
 	if err != nil {
 		// If we can't get the latest context for blocks past 1, something is seriously wrong with the chain state
 		return nil, fmt.Errorf("failed to get latest context for StateAt: %w", err)
@@ -210,9 +215,21 @@ func (b Blockchain) StateAt(hash common.Hash) (vm.StateDB, error) {
 	return stateDB, nil
 }
 
-// GetLatestCtx retrieves the most recent query context from the application.
+// GetLatestContext returns the latest context as updated by the block,
+// or attempts to retrieve it again if unavailable.
+func (b Blockchain) GetLatestContext() (sdk.Context, error) {
+	b.logger.Debug("getting latest context")
+
+	if b.latestCtx.Context() != nil {
+		return b.latestCtx, nil
+	}
+
+	return b.newLatestContext()
+}
+
+// newLatestContext retrieves the most recent query context from the application.
 // This provides access to the current blockchain state for transaction validation and execution.
-func (b Blockchain) GetLatestCtx() (sdk.Context, error) {
+func (b Blockchain) newLatestContext() (sdk.Context, error) {
 	b.logger.Debug("getting latest context")
 
 	ctx, err := b.getCtxCallback(0, false)

mempool/img/mempool_architecture.d2

@@ -0,0 +1,62 @@
+direction: right
+
+# entities
+prepare proposal
+check tx\nhandler
+comet bft
+rpc call
+broadcast
+rebroadcast\ncallback: { shape: diamond }
+evm mempool: {
+    direction: up
+
+    # entities
+    ext mempool\ninterface impl
+    cosmos priority\nnonce mempool
+    tx pool: {
+        direction: up
+
+        # entities
+        queued\ntransactions
+        pending\ntransactions
+        tx pool\ninterface
+        reset loop\n(evicts from\nqueued and\npending txs)
+        promotion: {shape: diamond }
+        filter: { shape: diamond }
+        
+        # edges
+        filter -> queued\ntransactions: add nonce\ngapped txs
+        filter -> pending\ntransactions: add\nexecutable txs
+        promotion -> pending\ntransactions: promote tx
+        queued\ntransactions -> promotion: check closed gap\nand promote tx
+        pending\ntransactions -> tx pool\ninterface: get txs for\nblock building
+        tx pool\ninterface -> filter: add valid txs
+    }
+    
+    # edges
+    tx pool.tx pool\ninterface -> ext mempool\ninterface impl: get txs for\nblock building
+    
+    cosmos priority\nnonce mempool -> ext mempool\ninterface impl: get txs for\nblock building
+
+    ext mempool\ninterface impl -> tx pool.tx pool\ninterface: success/nonce gap failure:\nadd valid evm txs
+    ext mempool\ninterface impl -> tx pool.tx pool\ninterface: recheck tx\neviction
+    ext mempool\ninterface impl -> cosmos priority\nnonce mempool: add\ncosmos txs
+}
+
+# edges
+rebroadcast\ncallback -> comet bft: rebroadcast\nrebuilt tx
+
+evm mempool.tx pool.promotion -> rebroadcast\ncallback: call rebroadcast\ncallback
+evm mempool.ext mempool\ninterface impl -> prepare proposal: get txs for\nblock building
+
+comet bft -> broadcast: success:\nbroadcast tx
+comet bft -> check tx\nhandler: send tx for validation
+comet bft -> check tx\nhandler: send tx again\nfor recheck
+
+check tx\nhandler -> rpc call: queued\nsuccess response
+check tx\nhandler -> comet bft: success: broadcast\nand add to mempool
+check tx\nhandler -> comet bft: recheck tx complete\nfailure: discard from pool
+check tx\nhandler -> evm mempool.ext mempool\ninterface impl: complete failure:\nremove from pending
+check tx\nhandler -> evm mempool.ext mempool\ninterface impl: nonce gap failure:\nadd transaction
+check tx\nhandler -> evm mempool.ext mempool\ninterface impl: success:\nadd txs
+check tx\nhandler -> evm mempool.ext mempool\ninterface impl: recheck tx complete\nfailure: eviction