Skip to content

Commit 6024d39

Browse files
committed
Merge branch 'main' into alex/2803_best_2worlds
* main: chore: minor deduplication (#3139) refactor(store,cache)!: optimize cache restore as O(1) (#3134) ci: remove spamoor results from benchmark results per PR (#3138) build(deps): Bump rollup from 4.22.4 to 4.59.0 in /docs in the npm_and_yarn group across 1 directory (#3136) fix(block): fix blocktime timer usage (#3137) build(deps): bump core v1.0.0 (#3135)
2 parents 191ae01 + 3b3d5e7 commit 6024d39

48 files changed

Lines changed: 1355 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/benchmark.yml

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
# single job to push all results to gh-pages sequentially, avoiding race conditions
104104
publish-benchmarks:
105105
name: Publish Benchmark Results
106-
needs: [evm-benchmark, spamoor-benchmark]
106+
needs: [evm-benchmark]
107107
runs-on: ubuntu-latest
108108
permissions:
109109
contents: write
@@ -115,11 +115,6 @@ jobs:
115115
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
116116
with:
117117
name: evm-benchmark-results
118-
- name: Download Spamoor benchmark results
119-
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
120-
with:
121-
name: spamoor-benchmark-results
122-
path: test/e2e/benchmark/
123118

124119
# only update the benchmark baseline on push/dispatch, not on PRs
125120
- name: Store EVM Contract Roundtrip result
@@ -154,22 +149,3 @@ jobs:
154149
alert-threshold: '150%'
155150
fail-on-alert: true
156151
comment-on-alert: true
157-
158-
# delete local gh-pages so the next benchmark action step fetches fresh from remote
159-
- name: Reset local gh-pages branch
160-
if: always()
161-
run: git branch -D gh-pages || true
162-
163-
- name: Store Spamoor Trace result
164-
if: always()
165-
uses: benchmark-action/github-action-benchmark@a7bc2366eda11037936ea57d811a43b3418d3073 # v1.21.0
166-
with:
167-
name: Spamoor Trace Benchmarks
168-
tool: 'customSmallerIsBetter'
169-
output-file-path: test/e2e/benchmark/spamoor_bench.json
170-
auto-push: ${{ github.event_name != 'pull_request' }}
171-
save-data-file: ${{ github.event_name != 'pull_request' }}
172-
github-token: ${{ secrets.GITHUB_TOKEN }}
173-
alert-threshold: '150%'
174-
fail-on-alert: false
175-
comment-on-alert: true

.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

.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: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
## [Unreleased]
1111

12+
## v1.0.0
13+
1214
### Added
1315

1416
- Add disaster recovery for sequencer
@@ -21,6 +23,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2123
By using one or the other, you are losing the ability to rollback or replay transactions earlier than `HEAD-n`.
2224
When using _classic pruning_, you aren't able to fetch blocks prior to `HEAD-n`.
2325

26+
### Fixed
27+
28+
- Fix block timer to account for execution time. Previously, the block timer reset to the full `block_time` duration after `ProduceBlock` completed, making the effective interval `block_time + execution_time`. Now the timer subtracts elapsed execution time so blocks are produced at the configured cadence.
29+
2430
### Changes
2531

2632
- Store pending blocks separately from executed blocks key. [#3073](https://github.com/evstack/ev-node/pull/3073)

apps/evm/go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@ go 1.25.6
44

55
replace (
66
github.com/evstack/ev-node => ../../
7-
github.com/evstack/ev-node/core => ../../core
87
github.com/evstack/ev-node/execution/evm => ../../execution/evm
98
)
109

1110
require (
1211
github.com/ethereum/go-ethereum v1.17.0
1312
github.com/evstack/ev-node v1.0.0-rc.4
14-
github.com/evstack/ev-node/core v1.0.0-rc.1
13+
github.com/evstack/ev-node/core v1.0.0
1514
github.com/evstack/ev-node/execution/evm v1.0.0-rc.3
1615
github.com/ipfs/go-datastore v0.9.1
1716
github.com/rs/zerolog v1.34.0

apps/evm/go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,8 @@ github.com/ethereum/go-bigmodexpfix v0.0.0-20250911101455-f9e208c548ab h1:rvv6MJ
407407
github.com/ethereum/go-bigmodexpfix v0.0.0-20250911101455-f9e208c548ab/go.mod h1:IuLm4IsPipXKF7CW5Lzf68PIbZ5yl7FFd74l/E0o9A8=
408408
github.com/ethereum/go-ethereum v1.17.0 h1:2D+1Fe23CwZ5tQoAS5DfwKFNI1HGcTwi65/kRlAVxes=
409409
github.com/ethereum/go-ethereum v1.17.0/go.mod h1:2W3msvdosS/MCWytpqTcqgFiRYbTH59FxDJzqah120o=
410+
github.com/evstack/ev-node/core v1.0.0 h1:s0Tx0uWHme7SJn/ZNEtee4qNM8UO6PIxXnHhPbbKTz8=
411+
github.com/evstack/ev-node/core v1.0.0/go.mod h1:n2w/LhYQTPsi48m6lMj16YiIqsaQw6gxwjyJvR+B3sY=
410412
github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
411413
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
412414
github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=

apps/grpc/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ WORKDIR /ev-node
1010
# Copy go mod files
1111
COPY go.mod go.sum ./
1212
COPY apps/grpc/go.mod apps/grpc/go.sum ./apps/grpc/
13-
COPY core/go.mod ./core/
13+
COPY core/go.mod core/go.sum ./core/
1414
COPY execution/grpc/go.mod execution/grpc/go.sum ./execution/grpc/
1515

1616
# Download dependencies

apps/grpc/go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@ go 1.25.6
44

55
replace (
66
github.com/evstack/ev-node => ../../
7-
github.com/evstack/ev-node/core => ../../core
87
github.com/evstack/ev-node/execution/grpc => ../../execution/grpc
98
)
109

1110
require (
1211
github.com/evstack/ev-node v1.0.0-rc.4
13-
github.com/evstack/ev-node/core v1.0.0-rc.1
12+
github.com/evstack/ev-node/core v1.0.0
1413
github.com/evstack/ev-node/execution/grpc v1.0.0-rc.1
1514
github.com/ipfs/go-datastore v0.9.1
1615
github.com/rs/zerolog v1.34.0

apps/grpc/go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,8 @@ github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6Ni
367367
github.com/envoyproxy/protoc-gen-validate v0.10.1/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss=
368368
github.com/envoyproxy/protoc-gen-validate v1.0.1/go.mod h1:0vj8bNkYbSTNS2PIyH87KZaeN4x9zpL9Qt8fQC7d+vs=
369369
github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE=
370+
github.com/evstack/ev-node/core v1.0.0 h1:s0Tx0uWHme7SJn/ZNEtee4qNM8UO6PIxXnHhPbbKTz8=
371+
github.com/evstack/ev-node/core v1.0.0/go.mod h1:n2w/LhYQTPsi48m6lMj16YiIqsaQw6gxwjyJvR+B3sY=
370372
github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
371373
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
372374
github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=

apps/testapp/go.mod

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@ module github.com/evstack/ev-node/apps/testapp
22

33
go 1.25.6
44

5-
replace (
6-
github.com/evstack/ev-node => ../../.
7-
github.com/evstack/ev-node/core => ../../core
8-
)
5+
replace github.com/evstack/ev-node => ../../.
96

107
require (
118
github.com/evstack/ev-node v1.0.0-rc.4
12-
github.com/evstack/ev-node/core v1.0.0-rc.1
9+
github.com/evstack/ev-node/core v1.0.0
1310
github.com/ipfs/go-datastore v0.9.1
1411
github.com/rs/zerolog v1.34.0
1512
github.com/spf13/cobra v1.10.2

0 commit comments

Comments
 (0)