Skip to content

Commit 70232ed

Browse files
committed
Merge remote-tracking branch 'origin/main' into marko/key_rotation
2 parents cb61c77 + 79b5b4f commit 70232ed

55 files changed

Lines changed: 4121 additions & 886 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/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ jobs:
8181
[
8282
{"name": "ev-node-evm", "dockerfile": "apps/evm/Dockerfile"},
8383
{"name": "ev-node-grpc", "dockerfile": "apps/grpc/Dockerfile"},
84+
{"name": "ev-node-loadgen", "dockerfile": "apps/loadgen/Dockerfile"},
8485
{"name": "ev-node-testapp", "dockerfile": "apps/testapp/Dockerfile"}
8586
]
8687

.github/workflows/rust-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
run: cargo llvm-cov --workspace --lcov --output-path lcov.info
8383

8484
- name: Upload coverage to Codecov
85-
uses: codecov/codecov-action@v6
85+
uses: codecov/codecov-action@v7
8686
with:
8787
files: lcov.info
8888
flags: rust

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ jobs:
145145
name: integration-test-coverage-report-${{ github.sha }}
146146
path: ./integration-coverage
147147
- name: Upload combined coverage report
148-
uses: codecov/codecov-action@v6
148+
uses: codecov/codecov-action@v7
149149
with:
150150
token: ${{ secrets.CODECOV_TOKEN }}
151151
files: ./unit-coverage/coverage.txt,./integration-coverage/coverage.txt

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ docs/.vitepress/cache
2626
*.log
2727
*.tgz
2828
.idea
29+
.junie
2930
.temp
3031
.vite_opt_cache
3132
.vscode
3233
.gocache
3334
.gomodcache
3435
/.cache
36+
*.diff

.just/build.just

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ build-all:
2828
@cd apps/evm && go build -ldflags "{{ ldflags }}" -o {{ build_dir }}/evm .
2929
@echo "--> Building grpc"
3030
@cd apps/grpc && go build -ldflags "{{ ldflags }}" -o {{ build_dir }}/evgrpc .
31+
@echo "--> Building loadgen"
32+
@cd apps/loadgen && go build -ldflags "{{ ldflags }}" -o {{ build_dir }}/ev-loadgen .
3133
@echo "--> Building local-da"
3234
@cd tools/local-da && go build -ldflags "{{ ldflags }}" -o {{ build_dir }}/local-da .
3335
@echo "--> All ev-node binaries built!"

.just/loadgen.just

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Build ev-loadgen binary
2+
[group('loadgen')]
3+
build-loadgen:
4+
@echo "--> Building ev-loadgen"
5+
@mkdir -p {{ build_dir }}
6+
@cd apps/loadgen && go build -o {{ build_dir }}/ev-loadgen .
7+
@echo " Check the binary with: {{ build_dir }}/ev-loadgen"
8+
9+
# Build ev-loadgen Docker image
10+
[group('loadgen')]
11+
docker-build-loadgen:
12+
@echo "--> Building ev-loadgen Docker image"
13+
@docker build -f apps/loadgen/Dockerfile -t ev-loadgen:dev .
14+
@echo "--> Docker image built: ev-loadgen:dev"

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
## [Unreleased]
1111

12+
## v1.1.3
13+
14+
### Fixed
15+
16+
- Drain the pending tx queue in merged batches with a durable WAL-backed ack, fixing severe queue backlog under heavy tx load. Tx dedup moved from the reaper cache into the sequencer queue [#3351](https://github.com/evstack/ev-node/pull/3351)
17+
1218
## v1.1.2
1319

1420
### Changes

apps/evm/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ replace (
1010

1111
require (
1212
github.com/ethereum/go-ethereum v1.17.3
13-
github.com/evstack/ev-node v1.1.2
13+
github.com/evstack/ev-node v1.1.3
1414
github.com/evstack/ev-node/core v1.0.0
1515
github.com/evstack/ev-node/execution/evm v1.0.1
1616
github.com/ipfs/go-datastore v0.9.1
@@ -119,7 +119,7 @@ require (
119119
github.com/ipld/go-ipld-prime v0.23.0 // indirect
120120
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
121121
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
122-
github.com/klauspost/compress v1.18.0 // indirect
122+
github.com/klauspost/compress v1.18.5 // indirect
123123
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
124124
github.com/koron/go-ssdp v0.0.6 // indirect
125125
github.com/libp2p/go-buffer-pool v0.1.0 // indirect

apps/evm/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -478,8 +478,8 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V
478478
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
479479
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
480480
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
481-
github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
482-
github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
481+
github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE=
482+
github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ=
483483
github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
484484
github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
485485
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=

apps/grpc/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ replace (
99
)
1010

1111
require (
12-
github.com/evstack/ev-node v1.1.2
12+
github.com/evstack/ev-node v1.1.3
1313
github.com/evstack/ev-node/core v1.0.0
1414
github.com/evstack/ev-node/execution/grpc v1.0.0
1515
github.com/ipfs/go-datastore v0.9.1
@@ -101,7 +101,7 @@ require (
101101
github.com/ipld/go-ipld-prime v0.23.0 // indirect
102102
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
103103
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
104-
github.com/klauspost/compress v1.18.0 // indirect
104+
github.com/klauspost/compress v1.18.5 // indirect
105105
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
106106
github.com/koron/go-ssdp v0.0.6 // indirect
107107
github.com/libp2p/go-buffer-pool v0.1.0 // indirect

0 commit comments

Comments
 (0)