Skip to content

Commit 5e5035d

Browse files
committed
Merge branch 'main' into marko/add-trivy-scan
* main: fix(syncer): include in-flight and pending-cache work in PendingCount (#3162) chore: re-add replaces for development (#3161) build(deps): Bump quinn-proto from 0.11.13 to 0.11.14 in the cargo group across 1 directory (#3155) build(deps): bump execution/evm (#3160) build(deps): bump ev-node (#3159) chore: remove replaces from ev-node (#3158) chore: fix some function names in comment (#3156) fix: persist snapshot once for avoiding badger vlog (#3153) build(deps): Bump docker/setup-buildx-action from 3 to 4 (#3148) build(deps): Bump the all-go group across 5 directories with 8 updates (#3147) build(deps): Bump docker/login-action from 3 to 4 (#3149) build(deps): Bump docker/build-push-action from 6 to 7 (#3151) build(deps): Bump actions/setup-go from 6.2.0 to 6.3.0 (#3150) chore: prep evm rc.5 (#3145) build(deps): bump ev-node (#3144) feat(block): Event-Driven DA Follower with WebSocket Subscriptions (#3131) build(deps): Bump dompurify from 3.2.6 to 3.3.2 in /docs in the npm_and_yarn group across 1 directory (#3140) feat(benchmarking): adding gas burner test (#3115) chore: minor deduplication (#3139) refactor(store,cache)!: optimize cache restore as O(1) (#3134)
2 parents 517f2f4 + e4e35bf commit 5e5035d

86 files changed

Lines changed: 3030 additions & 2503 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/benchmark.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
with:
3030
go-version-file: ./go.mod
3131
- name: Set up Docker Buildx
32-
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
32+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
3333
- name: Install just
3434
uses: extractions/setup-just@v3
3535
- name: Build binaries
@@ -61,7 +61,7 @@ jobs:
6161
with:
6262
go-version-file: ./go.mod
6363
- name: Set up Docker Buildx
64-
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
64+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
6565
- name: Install just
6666
uses: extractions/setup-just@v3
6767
- name: Build binaries
@@ -85,11 +85,11 @@ jobs:
8585
steps:
8686
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
8787
- name: Set up Go
88-
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
88+
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
8989
with:
9090
go-version-file: ./go.mod
9191
- name: Set up Docker Buildx
92-
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
92+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
9393
- name: Install just
9494
uses: extractions/setup-just@v3
9595
- name: Build binaries

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ jobs:
5555
apps: |
5656
[
5757
{"name": "ev-node-evm", "dockerfile": "apps/evm/Dockerfile"},
58+
{"name": "ev-node-grpc", "dockerfile": "apps/grpc/Dockerfile"},
5859
{"name": "ev-node-testapp", "dockerfile": "apps/testapp/Dockerfile"}
5960
]
6061

.github/workflows/docker-build-push.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
uses: actions/checkout@v6.0.2
3232

3333
- name: Set up Docker Buildx
34-
uses: docker/setup-buildx-action@v3
34+
uses: docker/setup-buildx-action@v4
3535

3636
- name: Log in to GHCR
3737
uses: docker/login-action@v3
@@ -41,7 +41,7 @@ jobs:
4141
password: ${{ secrets.GITHUB_TOKEN }}
4242

4343
- name: Build and push ${{ matrix.app.name }} Docker image
44-
uses: docker/build-push-action@v6
44+
uses: docker/build-push-action@v7
4545
with:
4646
context: .
4747
file: ${{ matrix.app.dockerfile }}

.github/workflows/release-apps.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
uses: actions/checkout@v6.0.2
7979

8080
- name: Set up Docker Buildx
81-
uses: docker/setup-buildx-action@v3
81+
uses: docker/setup-buildx-action@v4
8282

8383
- name: Log in to GHCR
8484
uses: docker/login-action@v3
@@ -88,7 +88,7 @@ jobs:
8888
password: ${{ secrets.GITHUB_TOKEN }}
8989

9090
- name: Build and push Docker image
91-
uses: docker/build-push-action@v6
91+
uses: docker/build-push-action@v7
9292
with:
9393
context: .
9494
file: ${{ needs.parse-tag.outputs.dockerfile }}

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ jobs:
9090
with:
9191
go-version-file: ./go.mod
9292
- name: Set up Docker Buildx
93-
uses: docker/setup-buildx-action@v3
93+
uses: docker/setup-buildx-action@v4
9494
- name: Build evstack:local-dev (cached)
95-
uses: docker/build-push-action@v6
95+
uses: docker/build-push-action@v7
9696
with:
9797
context: .
9898
file: apps/testapp/Dockerfile

.golangci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ linters:
5555
gosec:
5656
excludes:
5757
- G115
58+
- G118
5859
revive:
5960
rules:
6061
- name: package-comments

CHANGELOG.md

Lines changed: 137 additions & 52 deletions
Large diffs are not rendered by default.

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/evm/cmd/run.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,11 @@ var RunCmd = &cobra.Command{
6060
return err
6161
}
6262

63-
blobClient, err := blobrpc.NewClient(context.Background(), nodeConfig.DA.Address, nodeConfig.DA.AuthToken, "")
63+
blobClient, err := blobrpc.NewWSClient(cmd.Context(), nodeConfig.DA.Address, nodeConfig.DA.AuthToken, "")
6464
if err != nil {
6565
return fmt.Errorf("failed to create blob client: %w", err)
6666
}
67+
defer blobClient.Close()
6768

6869
daClient := block.NewDAClient(blobClient, nodeConfig, logger)
6970

apps/evm/go.mod

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ replace (
88
)
99

1010
require (
11-
github.com/ethereum/go-ethereum v1.17.0
12-
github.com/evstack/ev-node v1.0.0-rc.4
11+
github.com/ethereum/go-ethereum v1.17.1
12+
github.com/evstack/ev-node v1.0.0
1313
github.com/evstack/ev-node/core v1.0.0
14-
github.com/evstack/ev-node/execution/evm v1.0.0-rc.3
14+
github.com/evstack/ev-node/execution/evm v1.0.0
1515
github.com/ipfs/go-datastore v0.9.1
1616
github.com/rs/zerolog v1.34.0
1717
github.com/spf13/cobra v1.10.2
@@ -47,7 +47,7 @@ require (
4747
github.com/dunglas/httpsfv v1.1.0 // indirect
4848
github.com/dustin/go-humanize v1.0.1 // indirect
4949
github.com/emicklei/dot v1.6.2 // indirect
50-
github.com/ethereum/c-kzg-4844/v2 v2.1.5 // indirect
50+
github.com/ethereum/c-kzg-4844/v2 v2.1.6 // indirect
5151
github.com/fatih/color v1.18.0 // indirect
5252
github.com/ferranbt/fastssz v0.1.4 // indirect
5353
github.com/filecoin-project/go-clock v0.1.0 // indirect
@@ -170,20 +170,20 @@ require (
170170
github.com/stretchr/objx v0.5.2 // indirect
171171
github.com/stretchr/testify v1.11.1 // indirect
172172
github.com/subosito/gotenv v1.6.0 // indirect
173-
github.com/supranational/blst v0.3.16-0.20250831170142-f48500c1fdbe // indirect
173+
github.com/supranational/blst v0.3.16 // indirect
174174
github.com/tklauser/go-sysconf v0.3.12 // indirect
175175
github.com/tklauser/numcpus v0.6.1 // indirect
176176
github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect
177177
github.com/wlynxg/anet v0.0.5 // indirect
178178
go.opencensus.io v0.24.0 // indirect
179179
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
180-
go.opentelemetry.io/otel v1.41.0 // indirect
181-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.41.0 // indirect
182-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.41.0 // indirect
183-
go.opentelemetry.io/otel/metric v1.41.0 // indirect
184-
go.opentelemetry.io/otel/sdk v1.41.0 // indirect
185-
go.opentelemetry.io/otel/trace v1.41.0 // indirect
186-
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
180+
go.opentelemetry.io/otel v1.42.0 // indirect
181+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.42.0 // indirect
182+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.42.0 // indirect
183+
go.opentelemetry.io/otel/metric v1.42.0 // indirect
184+
go.opentelemetry.io/otel/sdk v1.42.0 // indirect
185+
go.opentelemetry.io/otel/trace v1.42.0 // indirect
186+
go.opentelemetry.io/proto/otlp v1.10.0 // indirect
187187
go.uber.org/dig v1.19.0 // indirect
188188
go.uber.org/fx v1.24.0 // indirect
189189
go.uber.org/mock v0.5.2 // indirect
@@ -195,7 +195,7 @@ require (
195195
golang.org/x/exp v0.0.0-20260112195511-716be5621a96 // indirect
196196
golang.org/x/mod v0.32.0 // indirect
197197
golang.org/x/net v0.51.0 // indirect
198-
golang.org/x/sync v0.19.0 // indirect
198+
golang.org/x/sync v0.20.0 // indirect
199199
golang.org/x/sys v0.41.0 // indirect
200200
golang.org/x/telemetry v0.0.0-20260109210033-bd525da824e2 // indirect
201201
golang.org/x/text v0.34.0 // indirect
@@ -205,7 +205,7 @@ require (
205205
gonum.org/v1/gonum v0.17.0 // indirect
206206
google.golang.org/genproto/googleapis/api v0.0.0-20260209200024-4cfbd4190f57 // indirect
207207
google.golang.org/genproto/googleapis/rpc v0.0.0-20260209200024-4cfbd4190f57 // indirect
208-
google.golang.org/grpc v1.79.1 // indirect
208+
google.golang.org/grpc v1.79.2 // indirect
209209
google.golang.org/protobuf v1.36.11 // indirect
210210
gopkg.in/yaml.v2 v2.4.0 // indirect
211211
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)