Skip to content

Commit 4d3dfcd

Browse files
authored
Merge pull request #738 from onflow/mpeter/update-dependencies
Update `cadence`/`flow-go`/`flow-go-sdk`/`flow-emulator` dependencies
2 parents cb79210 + 6d60018 commit 4d3dfcd

15 files changed

+189
-203
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
fetch-depth: 0
1717
- uses: actions/setup-go@v4
1818
with:
19-
go-version: '1.22.x'
19+
go-version: '1.23.x'
2020
- uses: actions/cache@v3
2121
with:
2222
path: ~/go/pkg/mod
@@ -33,7 +33,7 @@ jobs:
3333
- uses: actions/checkout@v4
3434
- uses: actions/setup-go@v4
3535
with:
36-
go-version: "1.22.x"
36+
go-version: "1.23.x"
3737
- name: Run golangci-lint
3838
uses: golangci/golangci-lint-action@v4
3939
with:

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# BUILD BIN
22

3-
FROM golang:1.22.0 as app-builder
3+
FROM golang:1.23 as app-builder
44

55
# Build the app binary in /app
66
WORKDIR /app

api/debug.go

+1-7
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ func (d *DebugAPI) TraceCall(
238238
}
239239
}
240240
}
241-
res, err := view.DryCall(
241+
_, err = view.DryCall(
242242
from,
243243
to,
244244
tx.Data,
@@ -250,12 +250,6 @@ func (d *DebugAPI) TraceCall(
250250
return nil, err
251251
}
252252

253-
for _, log := range res.Logs {
254-
if tracer != nil && tracer.OnLog != nil {
255-
tracer.OnLog(log)
256-
}
257-
}
258-
259253
return tracer.GetResult()
260254
}
261255

bootstrap/bootstrap.go

+23-3
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"github.com/onflow/flow-go/fvm/evm"
1515
flowGo "github.com/onflow/flow-go/model/flow"
1616
"github.com/onflow/flow-go/module/component"
17+
"github.com/onflow/flow-go/module/irrecoverable"
1718
flowMetrics "github.com/onflow/flow-go/module/metrics"
1819
"github.com/onflow/flow-go/module/util"
1920
gethTypes "github.com/onflow/go-ethereum/core/types"
@@ -368,10 +369,29 @@ func (b *Bootstrap) StartMetricsServer(ctx context.Context) error {
368369
b.logger.Info().Msg("bootstrap starting metrics server")
369370

370371
b.metrics = flowMetrics.NewServer(b.logger, uint(b.config.MetricsPort))
371-
err := util.WaitClosed(ctx, b.metrics.Ready())
372-
if err != nil {
372+
373+
// this logic is needed since the metric server is a component.
374+
// we need to start and stop it manually here.
375+
376+
ictx, errCh := irrecoverable.WithSignaler(ctx)
377+
b.metrics.Start(ictx)
378+
if err := util.WaitClosed(ctx, b.metrics.Ready()); err != nil {
373379
return fmt.Errorf("failed to start metrics server: %w", err)
374380
}
381+
select {
382+
case err := <-errCh:
383+
// there might be an error already if the startup failed
384+
return err
385+
default:
386+
}
387+
388+
go func() {
389+
err := <-errCh
390+
if err != nil {
391+
b.logger.Err(err).Msg("error in metrics server")
392+
panic(err)
393+
}
394+
}()
375395

376396
return nil
377397
}
@@ -380,8 +400,8 @@ func (b *Bootstrap) StopMetricsServer() {
380400
if b.metrics == nil {
381401
return
382402
}
383-
b.logger.Warn().Msg("shutting down metrics server")
384403
<-b.metrics.Done()
404+
b.logger.Warn().Msg("shutting down metrics server")
385405
}
386406

387407
func (b *Bootstrap) StartProfilerServer(_ context.Context) error {

go.mod

+18-21
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
module github.com/onflow/flow-evm-gateway
22

3-
go 1.22
3+
go 1.23
44

55
require (
66
github.com/cockroachdb/pebble v1.1.1
77
github.com/goccy/go-json v0.10.2
88
github.com/hashicorp/go-multierror v1.1.1
9-
github.com/onflow/atree v0.8.0
10-
github.com/onflow/cadence v1.2.2
11-
github.com/onflow/flow-go v0.38.0-preview.0.4
12-
github.com/onflow/flow-go-sdk v1.2.3
9+
github.com/onflow/atree v0.9.0
10+
github.com/onflow/cadence v1.3.1
11+
github.com/onflow/flow-go v0.38.0-util.0.20250203085701-72e6e6235fa5
12+
github.com/onflow/flow-go-sdk v1.3.1
1313
github.com/onflow/go-ethereum v1.14.7
1414
github.com/prometheus/client_golang v1.18.0
1515
github.com/rs/cors v1.8.0
@@ -18,20 +18,17 @@ require (
1818
github.com/sethvargo/go-limiter v1.0.0
1919
github.com/sethvargo/go-retry v0.2.3
2020
github.com/spf13/cobra v1.8.1
21-
github.com/stretchr/testify v1.9.0
21+
github.com/stretchr/testify v1.10.0
2222
go.uber.org/ratelimit v0.3.1
2323
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a
2424
golang.org/x/sync v0.8.0
25-
google.golang.org/grpc v1.63.2
25+
google.golang.org/grpc v1.64.1
2626
)
2727

2828
require (
29-
cloud.google.com/go v0.112.0 // indirect
30-
cloud.google.com/go/compute v1.24.0 // indirect
31-
cloud.google.com/go/compute/metadata v0.2.3 // indirect
29+
cloud.google.com/go/compute/metadata v0.5.0 // indirect
3230
cloud.google.com/go/iam v1.1.6 // indirect
3331
cloud.google.com/go/kms v1.15.7 // indirect
34-
cloud.google.com/go/storage v1.36.0 // indirect
3532
github.com/DataDog/zstd v1.5.2 // indirect
3633
github.com/Microsoft/go-winio v0.6.2 // indirect
3734
github.com/SaveTheRbtz/mph v0.1.1-0.20240117162131-4166ec7869bc // indirect
@@ -88,7 +85,7 @@ require (
8885
github.com/google/s2a-go v0.1.7 // indirect
8986
github.com/google/uuid v1.6.0 // indirect
9087
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
91-
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
88+
github.com/googleapis/gax-go/v2 v2.12.2 // indirect
9289
github.com/gorilla/websocket v1.5.0 // indirect
9390
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
9491
github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -181,10 +178,10 @@ require (
181178
github.com/vmihailenco/msgpack/v4 v4.3.11 // indirect
182179
github.com/vmihailenco/tagparser v0.1.1 // indirect
183180
github.com/x448/float16 v0.8.4 // indirect
184-
github.com/zeebo/blake3 v0.2.3 // indirect
181+
github.com/zeebo/blake3 v0.2.4 // indirect
185182
go.opencensus.io v0.24.0 // indirect
186-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect
187-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect
183+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
184+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
188185
go.opentelemetry.io/otel v1.24.0 // indirect
189186
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
190187
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
@@ -196,19 +193,19 @@ require (
196193
go.uber.org/multierr v1.11.0 // indirect
197194
go.uber.org/zap v1.26.0 // indirect
198195
golang.org/x/crypto v0.28.0 // indirect
199-
golang.org/x/net v0.25.0 // indirect
200-
golang.org/x/oauth2 v0.17.0 // indirect
196+
golang.org/x/net v0.26.0 // indirect
197+
golang.org/x/oauth2 v0.18.0 // indirect
201198
golang.org/x/sys v0.26.0 // indirect
202199
golang.org/x/text v0.19.0 // indirect
203200
golang.org/x/time v0.5.0 // indirect
204201
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
205202
gonum.org/v1/gonum v0.14.0 // indirect
206-
google.golang.org/api v0.162.0 // indirect
203+
google.golang.org/api v0.169.0 // indirect
207204
google.golang.org/appengine v1.6.8 // indirect
208205
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
209-
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
210-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
211-
google.golang.org/protobuf v1.33.0 // indirect
206+
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
207+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
208+
google.golang.org/protobuf v1.34.2 // indirect
212209
gopkg.in/ini.v1 v1.67.0 // indirect
213210
gopkg.in/yaml.v3 v3.0.1 // indirect
214211
lukechampine.com/blake3 v1.3.0 // indirect

0 commit comments

Comments
 (0)