Skip to content

Commit 1b8da2e

Browse files
authored
Merge branch 'main' into alex/sync_race
2 parents a2607e5 + ff88b95 commit 1b8da2e

21 files changed

Lines changed: 442 additions & 442 deletions

File tree

.github/workflows/benchmark.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Set up Docker Buildx
3232
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
3333
- name: Install just
34-
uses: extractions/setup-just@v3
34+
uses: extractions/setup-just@v4
3535
- name: Build binaries
3636
run: just build-evm build-da
3737
- name: Run EVM benchmarks
@@ -63,7 +63,7 @@ jobs:
6363
- name: Set up Docker Buildx
6464
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
6565
- name: Install just
66-
uses: extractions/setup-just@v3
66+
uses: extractions/setup-just@v4
6767
- name: Build binaries
6868
run: just build-evm build-da
6969
- name: Run Spamoor smoke test
@@ -91,7 +91,7 @@ jobs:
9191
- name: Set up Docker Buildx
9292
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
9393
- name: Install just
94-
uses: extractions/setup-just@v3
94+
uses: extractions/setup-just@v4
9595
- name: Build binaries
9696
run: just build-evm build-da
9797
- name: Run ERC20 throughput test
@@ -113,7 +113,7 @@ jobs:
113113
- name: Set up Docker Buildx
114114
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
115115
- name: Install just
116-
uses: extractions/setup-just@v3
116+
uses: extractions/setup-just@v4
117117
- name: Build binaries
118118
run: just build-evm build-da
119119
- name: Run DeFi simulation test
@@ -136,7 +136,7 @@ jobs:
136136
- name: Set up Docker Buildx
137137
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
138138
- name: Install just
139-
uses: extractions/setup-just@v3
139+
uses: extractions/setup-just@v4
140140
- name: Build binaries
141141
run: just build-evm build-da
142142
- name: Run state pressure test
@@ -164,7 +164,7 @@ jobs:
164164
# only update the benchmark baseline on push/dispatch, not on PRs
165165
- name: Store EVM Contract Roundtrip result
166166
if: always()
167-
uses: benchmark-action/github-action-benchmark@a7bc2366eda11037936ea57d811a43b3418d3073 # v1.21.0
167+
uses: benchmark-action/github-action-benchmark@a60cea5bc7b49e15c1f58f411161f99e0df48372 # v1.22.0
168168
with:
169169
name: EVM Contract Roundtrip
170170
tool: 'go'
@@ -183,7 +183,7 @@ jobs:
183183

184184
- name: Store Block Executor result
185185
if: always()
186-
uses: benchmark-action/github-action-benchmark@a7bc2366eda11037936ea57d811a43b3418d3073 # v1.21.0
186+
uses: benchmark-action/github-action-benchmark@a60cea5bc7b49e15c1f58f411161f99e0df48372 # v1.22.0
187187
with:
188188
name: Block Executor Benchmark
189189
tool: 'go'

.github/workflows/dependabot-auto-fix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
go-version-file: ./go.mod
2424

2525
- name: Install just
26-
uses: extractions/setup-just@v3
26+
uses: extractions/setup-just@v4
2727

2828
- name: Run dependency update
2929
run: just deps

.github/workflows/docker-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
go-version-file: ./test/docker-e2e/go.mod
3030
cache-dependency-path: "**/go.sum"
3131
- name: Install just
32-
uses: extractions/setup-just@v3
32+
uses: extractions/setup-just@v4
3333
- name: Run Docker E2E Tests
3434
run: just test-docker-e2e
3535
env:
@@ -49,7 +49,7 @@ jobs:
4949
go-version-file: ./test/docker-e2e/go.mod
5050
cache-dependency-path: "**/go.sum"
5151
- name: Install just
52-
uses: extractions/setup-just@v3
52+
uses: extractions/setup-just@v4
5353
- name: Run Docker Upgrade E2E Tests
5454
run: just test-docker-upgrade-e2e
5555
env:
@@ -69,7 +69,7 @@ jobs:
6969
go-version-file: ./test/docker-e2e/go.mod
7070
cache-dependency-path: "**/go.sum"
7171
- name: Install just
72-
uses: extractions/setup-just@v3
72+
uses: extractions/setup-just@v4
7373
- name: Run Docker Compat E2E Tests
7474
run: just test-docker-compat
7575
env:

.github/workflows/test.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
go-version-file: ./go.mod
2020
cache-dependency-path: "**/go.sum"
2121
- name: Install just
22-
uses: extractions/setup-just@v3
22+
uses: extractions/setup-just@v4
2323
- name: Build all ev-node binaries
2424
run: just build-all
2525

@@ -32,7 +32,7 @@ jobs:
3232
with:
3333
go-version-file: ./go.mod
3434
cache-dependency-path: "**/go.sum"
35-
- uses: extractions/setup-just@v3
35+
- uses: extractions/setup-just@v4
3636
- run: just deps
3737
- name: check for diff
3838
run: git diff --exit-code
@@ -51,7 +51,7 @@ jobs:
5151
go-version-file: ./go.mod
5252
cache-dependency-path: "**/go.sum"
5353
- name: Install just
54-
uses: extractions/setup-just@v3
54+
uses: extractions/setup-just@v4
5555
- name: Run unit test
5656
run: just test-cover
5757
- name: Upload unit test coverage report
@@ -71,7 +71,7 @@ jobs:
7171
go-version-file: ./go.mod
7272
cache-dependency-path: "**/go.sum"
7373
- name: Install just
74-
uses: extractions/setup-just@v3
74+
uses: extractions/setup-just@v4
7575
- name: Run integration test
7676
run: just test-integration-cover
7777
- name: Upload integration test coverage report
@@ -106,7 +106,7 @@ jobs:
106106
cache-from: type=gha,scope=ev-node-testapp
107107
cache-to: type=gha,mode=max,scope=ev-node-testapp
108108
- name: Install just
109-
uses: extractions/setup-just@v3
109+
uses: extractions/setup-just@v4
110110
- name: E2E Tests
111111
run: just test-e2e
112112

@@ -122,7 +122,7 @@ jobs:
122122
go-version-file: ./go.mod
123123
cache-dependency-path: "**/go.sum"
124124
- name: Install just
125-
uses: extractions/setup-just@v3
125+
uses: extractions/setup-just@v4
126126
- name: EVM Tests
127127
run: just test-evm
128128

apps/evm/go.mod

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ require (
2323
cloud.google.com/go/auth v0.18.2 // indirect
2424
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
2525
cloud.google.com/go/compute/metadata v0.9.0 // indirect
26-
cloud.google.com/go/iam v1.5.3 // indirect
27-
cloud.google.com/go/kms v1.26.0 // indirect
26+
cloud.google.com/go/iam v1.6.0 // indirect
27+
cloud.google.com/go/kms v1.27.0 // indirect
2828
cloud.google.com/go/longrunning v0.8.0 // indirect
2929
connectrpc.com/connect v1.19.1 // indirect
3030
connectrpc.com/grpcreflect v1.3.0 // indirect
@@ -35,8 +35,8 @@ require (
3535
github.com/StackExchange/wmi v1.2.1 // indirect
3636
github.com/armon/go-metrics v0.4.1 // indirect
3737
github.com/aws/aws-sdk-go-v2 v1.41.5 // indirect
38-
github.com/aws/aws-sdk-go-v2/config v1.32.13 // indirect
39-
github.com/aws/aws-sdk-go-v2/credentials v1.19.13 // indirect
38+
github.com/aws/aws-sdk-go-v2/config v1.32.14 // indirect
39+
github.com/aws/aws-sdk-go-v2/credentials v1.19.14 // indirect
4040
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.21 // indirect
4141
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.21 // indirect
4242
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.21 // indirect
@@ -45,15 +45,15 @@ require (
4545
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.21 // indirect
4646
github.com/aws/aws-sdk-go-v2/service/kms v1.50.4 // indirect
4747
github.com/aws/aws-sdk-go-v2/service/signin v1.0.9 // indirect
48-
github.com/aws/aws-sdk-go-v2/service/sso v1.30.14 // indirect
49-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.18 // indirect
48+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.15 // indirect
49+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.19 // indirect
5050
github.com/aws/aws-sdk-go-v2/service/sts v1.41.10 // indirect
51-
github.com/aws/smithy-go v1.24.2 // indirect
51+
github.com/aws/smithy-go v1.24.3 // indirect
5252
github.com/benbjohnson/clock v1.3.5 // indirect
5353
github.com/beorn7/perks v1.0.1 // indirect
5454
github.com/bits-and-blooms/bitset v1.20.0 // indirect
5555
github.com/boltdb/bolt v1.3.1 // indirect
56-
github.com/celestiaorg/go-header v0.8.1 // indirect
56+
github.com/celestiaorg/go-header v0.8.5 // indirect
5757
github.com/celestiaorg/go-libp2p-messenger v0.2.2 // indirect
5858
github.com/celestiaorg/go-square/merkle v0.0.0-20240627094109-7d01436067a3 // indirect
5959
github.com/celestiaorg/go-square/v3 v3.0.2 // indirect
@@ -96,7 +96,7 @@ require (
9696
github.com/google/s2a-go v0.1.9 // indirect
9797
github.com/google/uuid v1.6.0 // indirect
9898
github.com/googleapis/enterprise-certificate-proxy v0.3.14 // indirect
99-
github.com/googleapis/gax-go/v2 v2.19.0 // indirect
99+
github.com/googleapis/gax-go/v2 v2.20.0 // indirect
100100
github.com/gorilla/websocket v1.5.3 // indirect
101101
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
102102
github.com/hashicorp/go-hclog v1.6.3 // indirect
@@ -203,12 +203,12 @@ require (
203203
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
204204
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
205205
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 // indirect
206-
go.opentelemetry.io/otel v1.42.0 // indirect
207-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.42.0 // indirect
208-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.42.0 // indirect
209-
go.opentelemetry.io/otel/metric v1.42.0 // indirect
210-
go.opentelemetry.io/otel/sdk v1.42.0 // indirect
211-
go.opentelemetry.io/otel/trace v1.42.0 // indirect
206+
go.opentelemetry.io/otel v1.43.0 // indirect
207+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 // indirect
208+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0 // indirect
209+
go.opentelemetry.io/otel/metric v1.43.0 // indirect
210+
go.opentelemetry.io/otel/sdk v1.43.0 // indirect
211+
go.opentelemetry.io/otel/trace v1.43.0 // indirect
212212
go.opentelemetry.io/proto/otlp v1.10.0 // indirect
213213
go.uber.org/dig v1.19.0 // indirect
214214
go.uber.org/fx v1.24.0 // indirect
@@ -230,11 +230,11 @@ require (
230230
golang.org/x/tools v0.43.0 // indirect
231231
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
232232
gonum.org/v1/gonum v0.17.0 // indirect
233-
google.golang.org/api v0.273.0 // indirect
234-
google.golang.org/genproto v0.0.0-20260316180232-0b37fe3546d5 // indirect
235-
google.golang.org/genproto/googleapis/api v0.0.0-20260316180232-0b37fe3546d5 // indirect
236-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260319201613-d00831a3d3e7 // indirect
237-
google.golang.org/grpc v1.79.3 // indirect
233+
google.golang.org/api v0.273.1 // indirect
234+
google.golang.org/genproto v0.0.0-20260319201613-d00831a3d3e7 // indirect
235+
google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 // indirect
236+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect
237+
google.golang.org/grpc v1.80.0 // indirect
238238
google.golang.org/protobuf v1.36.11 // indirect
239239
gopkg.in/yaml.v2 v2.4.0 // indirect
240240
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)