Merge branch 'main' into perf-badger-options-bench

Author: tac0turtle

.gitignore

@@ -1,4 +1,5 @@
 coverage.txt
+*.out
 proto/pb
 proto/tendermint
 types/pb/tendermint
@@ -30,3 +31,4 @@ docs/.vitepress/cache
 .claude
 .gocache
 .gomodcache
+/.cache

CLAUDE.md

@@ -44,15 +44,15 @@ The project uses a zero-dependency core package pattern:
 
 - **core/** - Contains only interfaces and types, no external dependencies
 - **block/** - Block management, creation, validation, and synchronization
-- **p2p/** - Networking layer built on libp2p
-- **sequencing/** - Modular sequencer implementations
-- **testapp/** - Reference implementation for testing
+- **pkg/p2p/** - Networking layer built on libp2p
+- **pkg/sequencers/** - Modular sequencer implementations
+- **apps/testapp/** - Reference implementation for testing
 
 ### Key Interfaces
 
-- **Executor** (core/executor.go) - Handles state transitions
-- **Sequencer** (core/sequencer.go) - Orders transactions
-- **DA** (pkg/da/types) - Data availability layer abstraction
+- **Executor** (`core/executor.go`) - Handles state transitions
+- **Sequencer** (`core/sequencer.go`) - Orders transactions
+- **DA** (`pkg/da/types`) - Data availability layer abstraction
 
 ### Modular Design
 

apps/evm/cmd/run.go

@@ -13,6 +13,7 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/spf13/cobra"
 
+	"github.com/evstack/ev-node/apps/evm/server"
 	"github.com/evstack/ev-node/block"
 	"github.com/evstack/ev-node/core/execution"
 	coresequencer "github.com/evstack/ev-node/core/sequencer"
@@ -26,11 +27,9 @@ import (
 	genesispkg "github.com/evstack/ev-node/pkg/genesis"
 	"github.com/evstack/ev-node/pkg/p2p"
 	"github.com/evstack/ev-node/pkg/p2p/key"
+	"github.com/evstack/ev-node/pkg/sequencers/based"
+	"github.com/evstack/ev-node/pkg/sequencers/single"
 	"github.com/evstack/ev-node/pkg/store"
-	"github.com/evstack/ev-node/sequencers/based"
-	"github.com/evstack/ev-node/sequencers/single"
-
-	"github.com/evstack/ev-node/apps/evm/server"
 )
 
 const (
@@ -56,7 +55,8 @@ var RunCmd = &cobra.Command{
 			return err
 		}
 
-		executor, err := createExecutionClient(cmd, datastore)
+		tracingEnabled := nodeConfig.Instrumentation.IsTracingEnabled()
+		executor, err := createExecutionClient(cmd, datastore, tracingEnabled)
 		if err != nil {
 			return err
 		}
@@ -201,7 +201,7 @@ func createSequencer(
 	return sequencer, nil
 }
 
-func createExecutionClient(cmd *cobra.Command, db datastore.Batching) (execution.Executor, error) {
+func createExecutionClient(cmd *cobra.Command, db datastore.Batching, tracingEnabled bool) (execution.Executor, error) {
 	// Read execution client parameters from flags
 	ethURL, err := cmd.Flags().GetString(evm.FlagEvmEthURL)
 	if err != nil {
@@ -246,7 +246,7 @@ func createExecutionClient(cmd *cobra.Command, db datastore.Batching) (execution
 	genesisHash := common.HexToHash(genesisHashStr)
 	feeRecipient := common.HexToAddress(feeRecipientStr)
 
-	return evm.NewEngineExecutionClient(ethURL, engineURL, jwtSecret, genesisHash, feeRecipient, db)
+	return evm.NewEngineExecutionClient(ethURL, engineURL, jwtSecret, genesisHash, feeRecipient, db, tracingEnabled)
 }
 
 // addFlags adds flags related to the EVM execution client

apps/evm/go.mod

@@ -35,6 +35,7 @@ require (
 	github.com/celestiaorg/go-square/merkle v0.0.0-20240627094109-7d01436067a3 // indirect
 	github.com/celestiaorg/go-square/v3 v3.0.2 // indirect
 	github.com/celestiaorg/nmt v0.24.2 // indirect
+	github.com/cenkalti/backoff/v5 v5.0.3 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/consensys/gnark-crypto v0.18.0 // indirect
 	github.com/crate-crypto/go-eth-kzg v1.4.0 // indirect
@@ -70,6 +71,7 @@ require (
 	github.com/google/gopacket v1.1.19 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/websocket v1.5.3 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
 	github.com/hashicorp/golang-lru v1.0.2 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/holiman/uint256 v1.3.2 // indirect
@@ -171,9 +173,13 @@ require (
 	github.com/wlynxg/anet v0.0.5 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
-	go.opentelemetry.io/otel v1.38.0 // indirect
-	go.opentelemetry.io/otel/metric v1.38.0 // indirect
-	go.opentelemetry.io/otel/trace v1.38.0 // indirect
+	go.opentelemetry.io/otel v1.39.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0 // indirect
+	go.opentelemetry.io/otel/metric v1.39.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.38.0 // indirect
+	go.opentelemetry.io/otel/trace v1.39.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.7.1 // indirect
 	go.uber.org/dig v1.19.0 // indirect
 	go.uber.org/fx v1.24.0 // indirect
 	go.uber.org/mock v0.5.2 // indirect
@@ -193,8 +199,18 @@ require (
 	golang.org/x/tools v0.39.0 // indirect
 	golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
 	gonum.org/v1/gonum v0.16.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect
+	google.golang.org/grpc v1.75.0 // indirect
 	google.golang.org/protobuf v1.36.10 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	lukechampine.com/blake3 v1.4.1 // indirect
 )
+
+// pin google genproto to a single version to avoid ambiguous imports pulled by transitive deps
+replace (
+	google.golang.org/genproto => google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9
+	google.golang.org/genproto/googleapis/api => google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9
+	google.golang.org/genproto/googleapis/rpc => google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9
+)