Skip to content

Commit 1436863

Browse files
julienrbrtjulienrbrt
authored
Merge branch 'main' into julien/aync-epochs
2 parents 8cd8713 + 453a8a4 commit 1436863

29 files changed

+5792
-183
lines changed

‎apps/evm/cmd/run.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"github.com/rs/zerolog"
1414
"github.com/spf13/cobra"
1515

16+
"github.com/evstack/ev-node/apps/evm/server"
1617
"github.com/evstack/ev-node/block"
1718
"github.com/evstack/ev-node/core/execution"
1819
coresequencer "github.com/evstack/ev-node/core/sequencer"
@@ -29,8 +30,6 @@ import (
2930
"github.com/evstack/ev-node/pkg/sequencers/based"
3031
"github.com/evstack/ev-node/pkg/sequencers/single"
3132
"github.com/evstack/ev-node/pkg/store"
32-
33-
"github.com/evstack/ev-node/apps/evm/server"
3433
)
3534

3635
const (
@@ -56,7 +55,8 @@ var RunCmd = &cobra.Command{
5655
return err
5756
}
5857

59-
executor, err := createExecutionClient(cmd, datastore)
58+
tracingEnabled := nodeConfig.Instrumentation.IsTracingEnabled()
59+
executor, err := createExecutionClient(cmd, datastore, tracingEnabled)
6060
if err != nil {
6161
return err
6262
}
@@ -200,7 +200,7 @@ func createSequencer(
200200
return sequencer, nil
201201
}
202202

203-
func createExecutionClient(cmd *cobra.Command, db datastore.Batching) (execution.Executor, error) {
203+
func createExecutionClient(cmd *cobra.Command, db datastore.Batching, tracingEnabled bool) (execution.Executor, error) {
204204
// Read execution client parameters from flags
205205
ethURL, err := cmd.Flags().GetString(evm.FlagEvmEthURL)
206206
if err != nil {
@@ -245,7 +245,7 @@ func createExecutionClient(cmd *cobra.Command, db datastore.Batching) (execution
245245
genesisHash := common.HexToHash(genesisHashStr)
246246
feeRecipient := common.HexToAddress(feeRecipientStr)
247247

248-
return evm.NewEngineExecutionClient(ethURL, engineURL, jwtSecret, genesisHash, feeRecipient, db)
248+
return evm.NewEngineExecutionClient(ethURL, engineURL, jwtSecret, genesisHash, feeRecipient, db, tracingEnabled)
249249
}
250250

251251
// addFlags adds flags related to the EVM execution client

‎apps/evm/go.mod‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ require (
3535
github.com/celestiaorg/go-square/merkle v0.0.0-20240627094109-7d01436067a3 // indirect
3636
github.com/celestiaorg/go-square/v3 v3.0.2 // indirect
3737
github.com/celestiaorg/nmt v0.24.2 // indirect
38+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
3839
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3940
github.com/consensys/gnark-crypto v0.18.0 // indirect
4041
github.com/crate-crypto/go-eth-kzg v1.4.0 // indirect
@@ -70,6 +71,7 @@ require (
7071
github.com/google/gopacket v1.1.19 // indirect
7172
github.com/google/uuid v1.6.0 // indirect
7273
github.com/gorilla/websocket v1.5.3 // indirect
74+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
7375
github.com/hashicorp/golang-lru v1.0.2 // indirect
7476
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
7577
github.com/holiman/uint256 v1.3.2 // indirect
@@ -171,9 +173,13 @@ require (
171173
github.com/wlynxg/anet v0.0.5 // indirect
172174
go.opencensus.io v0.24.0 // indirect
173175
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
174-
go.opentelemetry.io/otel v1.38.0 // indirect
175-
go.opentelemetry.io/otel/metric v1.38.0 // indirect
176-
go.opentelemetry.io/otel/trace v1.38.0 // indirect
176+
go.opentelemetry.io/otel v1.39.0 // indirect
177+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect
178+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0 // indirect
179+
go.opentelemetry.io/otel/metric v1.39.0 // indirect
180+
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
181+
go.opentelemetry.io/otel/trace v1.39.0 // indirect
182+
go.opentelemetry.io/proto/otlp v1.7.1 // indirect
177183
go.uber.org/dig v1.19.0 // indirect
178184
go.uber.org/fx v1.24.0 // indirect
179185
go.uber.org/mock v0.5.2 // indirect
@@ -193,8 +199,18 @@ require (
193199
golang.org/x/tools v0.39.0 // indirect
194200
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
195201
gonum.org/v1/gonum v0.16.0 // indirect
202+
google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 // indirect
203+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect
204+
google.golang.org/grpc v1.75.0 // indirect
196205
google.golang.org/protobuf v1.36.10 // indirect
197206
gopkg.in/yaml.v2 v2.4.0 // indirect
198207
gopkg.in/yaml.v3 v3.0.1 // indirect
199208
lukechampine.com/blake3 v1.4.1 // indirect
200209
)
210+
211+
// pin google genproto to a single version to avoid ambiguous imports pulled by transitive deps
212+
replace (
213+
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9
214+
google.golang.org/genproto/googleapis/api => google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9
215+
google.golang.org/genproto/googleapis/rpc => google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9
216+
)

‎apps/evm/go.sum‎

Lines changed: 1059 additions & 13 deletions
Large diffs are not rendered by default.

‎apps/grpc/go.mod‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ require (
2929
github.com/celestiaorg/go-square/merkle v0.0.0-20240627094109-7d01436067a3 // indirect
3030
github.com/celestiaorg/go-square/v3 v3.0.2 // indirect
3131
github.com/celestiaorg/nmt v0.24.2 // indirect
32+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
3233
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3334
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3435
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
@@ -51,6 +52,7 @@ require (
5152
github.com/google/gopacket v1.1.19 // indirect
5253
github.com/google/uuid v1.6.0 // indirect
5354
github.com/gorilla/websocket v1.5.3 // indirect
55+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
5456
github.com/hashicorp/golang-lru v1.0.2 // indirect
5557
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
5658
github.com/huin/goupnp v1.3.0 // indirect
@@ -144,9 +146,13 @@ require (
144146
github.com/wlynxg/anet v0.0.5 // indirect
145147
go.opencensus.io v0.24.0 // indirect
146148
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
147-
go.opentelemetry.io/otel v1.38.0 // indirect
148-
go.opentelemetry.io/otel/metric v1.38.0 // indirect
149-
go.opentelemetry.io/otel/trace v1.38.0 // indirect
149+
go.opentelemetry.io/otel v1.39.0 // indirect
150+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect
151+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0 // indirect
152+
go.opentelemetry.io/otel/metric v1.39.0 // indirect
153+
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
154+
go.opentelemetry.io/otel/trace v1.39.0 // indirect
155+
go.opentelemetry.io/proto/otlp v1.7.1 // indirect
150156
go.uber.org/dig v1.19.0 // indirect
151157
go.uber.org/fx v1.24.0 // indirect
152158
go.uber.org/mock v0.5.2 // indirect
@@ -166,7 +172,17 @@ require (
166172
golang.org/x/tools v0.39.0 // indirect
167173
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
168174
gonum.org/v1/gonum v0.16.0 // indirect
175+
google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 // indirect
176+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect
177+
google.golang.org/grpc v1.75.0 // indirect
169178
google.golang.org/protobuf v1.36.10 // indirect
170179
gopkg.in/yaml.v3 v3.0.1 // indirect
171180
lukechampine.com/blake3 v1.4.1 // indirect
172181
)
182+
183+
// pin google genproto to a single version to avoid ambiguous imports pulled by transitive deps
184+
replace (
185+
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9
186+
google.golang.org/genproto/googleapis/api => google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9
187+
google.golang.org/genproto/googleapis/rpc => google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9
188+
)

0 commit comments

Comments
 (0)