Skip to content

Commit 5712be8

Browse files
julienrbrtjulienrbrt
authored
Merge branch 'main' into julien/hotfix-da-inclusion
2 parents ded4214 + 4a70e0b commit 5712be8

159 files changed

Lines changed: 11032 additions & 4120 deletions

File tree

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: 49 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
steps:
2626
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2727
- name: Set up Go
28-
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
28+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
2929
with:
3030
go-version-file: ./go.mod
3131
- name: Set up Docker Buildx
@@ -57,7 +57,7 @@ jobs:
5757
steps:
5858
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5959
- name: Set up Go
60-
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
60+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
6161
with:
6262
go-version-file: ./go.mod
6363
- name: Set up Docker Buildx
@@ -85,7 +85,7 @@ jobs:
8585
steps:
8686
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
8787
- name: Set up Go
88-
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
88+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
8989
with:
9090
go-version-file: ./go.mod
9191
- name: Set up Docker Buildx
@@ -100,6 +100,51 @@ jobs:
100100
-run='^TestSpamoorSuite$/^TestERC20Throughput$' -v -timeout=15m \
101101
./benchmark/ --evm-binary=../../../build/evm
102102
103+
defi-benchmark:
104+
name: DeFi Simulation Benchmark
105+
runs-on: ubuntu-latest
106+
timeout-minutes: 30
107+
steps:
108+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
109+
- name: Set up Go
110+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
111+
with:
112+
go-version-file: ./go.mod
113+
- name: Set up Docker Buildx
114+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
115+
- name: Install just
116+
uses: extractions/setup-just@v3
117+
- name: Build binaries
118+
run: just build-evm build-da
119+
- name: Run DeFi simulation test
120+
run: |
121+
cd test/e2e && go test -tags evm \
122+
-run='^TestSpamoorSuite$/^TestDeFiSimulation$' -v -timeout=15m \
123+
./benchmark/ --evm-binary=../../../build/evm
124+
125+
# TODO: wire up to publish results once additional tests are in place.
126+
state-pressure-benchmark:
127+
name: State Pressure Benchmark
128+
runs-on: ubuntu-latest
129+
timeout-minutes: 30
130+
steps:
131+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
132+
- name: Set up Go
133+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
134+
with:
135+
go-version-file: ./go.mod
136+
- name: Set up Docker Buildx
137+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
138+
- name: Install just
139+
uses: extractions/setup-just@v3
140+
- name: Build binaries
141+
run: just build-evm build-da
142+
- name: Run state pressure test
143+
run: |
144+
cd test/e2e && go test -tags evm \
145+
-run='^TestSpamoorSuite$/^TestStatePressure$' -v -timeout=15m \
146+
./benchmark/ --evm-binary=../../../build/evm
147+
103148
# single job to push all results to gh-pages sequentially, avoiding race conditions
104149
publish-benchmarks:
105150
name: Publish Benchmark Results
@@ -112,7 +157,7 @@ jobs:
112157
steps:
113158
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
114159
- name: Download EVM benchmark results
115-
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
160+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
116161
with:
117162
name: evm-benchmark-results
118163

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
with:
1919
ref: ${{ github.head_ref }}
2020

21-
- uses: actions/setup-go@v6.3.0
21+
- uses: actions/setup-go@v6.4.0
2222
with:
2323
go-version-file: ./go.mod
2424

‎.github/workflows/docker-tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
steps:
2525
- uses: actions/checkout@v6.0.2
2626
- name: set up go
27-
uses: actions/setup-go@v6.3.0
27+
uses: actions/setup-go@v6.4.0
2828
with:
2929
go-version-file: ./test/docker-e2e/go.mod
3030
- name: Install just
@@ -43,7 +43,7 @@ jobs:
4343
steps:
4444
- uses: actions/checkout@v6.0.2
4545
- name: set up go
46-
uses: actions/setup-go@v6.3.0
46+
uses: actions/setup-go@v6.4.0
4747
with:
4848
go-version-file: ./test/docker-e2e/go.mod
4949
- name: Install just
@@ -62,7 +62,7 @@ jobs:
6262
steps:
6363
- uses: actions/checkout@v6.0.2
6464
- name: set up go
65-
uses: actions/setup-go@v6.3.0
65+
uses: actions/setup-go@v6.4.0
6666
with:
6767
go-version-file: ./test/docker-e2e/go.mod
6868
- name: Install just

‎.github/workflows/docs_deploy.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ concurrency:
1919
group: pages
2020
cancel-in-progress: false
2121

22+
permissions:
23+
contents: write
24+
2225
jobs:
2326
# Build job
2427
build:
@@ -36,7 +39,7 @@ jobs:
3639
cache: yarn # or pnpm / npm
3740
cache-dependency-path: docs/yarn.lock
3841
- name: Setup Pages
39-
uses: actions/configure-pages@v5
42+
uses: actions/configure-pages@v6
4043
- name: Install dependencies
4144
run: yarn install # or pnpm install / npm ci
4245
working-directory: docs
@@ -46,6 +49,6 @@ jobs:
4649
- name: Deploy to GitHub Pages
4750
uses: peaceiris/actions-gh-pages@v4
4851
with:
49-
github_token: ${{ secrets.PAT_DOCS }}
52+
github_token: ${{ secrets.GITHUB_TOKEN }}
5053
publish_dir: ./docs/.vitepress/dist
5154
cname: ev.xyz

‎.github/workflows/docs_preview.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ jobs:
2222
steps:
2323
- name: Checkout
2424
uses: actions/checkout@v6.0.2
25+
with:
26+
persist-credentials: false
2527

2628
- name: Setup Node
2729
uses: actions/setup-node@v6

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/checkout@v6.0.2
16-
- uses: actions/setup-go@v6.3.0
16+
- uses: actions/setup-go@v6.4.0
1717
with:
1818
go-version-file: ./go.mod
1919
# This steps sets the GIT_DIFF environment variable to true

‎.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@v5
85+
uses: codecov/codecov-action@v6
8686
with:
8787
files: lcov.info
8888
flags: rust

‎.github/workflows/test.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v6.0.2
1616
- name: set up go
17-
uses: actions/setup-go@v6.3.0
17+
uses: actions/setup-go@v6.4.0
1818
with:
1919
go-version-file: ./go.mod
2020
- name: Install just
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: ubuntu-latest
2828
steps:
2929
- uses: actions/checkout@v6.0.2
30-
- uses: actions/setup-go@v6.3.0
30+
- uses: actions/setup-go@v6.4.0
3131
with:
3232
go-version-file: ./go.mod
3333
- uses: extractions/setup-just@v3
@@ -44,7 +44,7 @@ jobs:
4444
steps:
4545
- uses: actions/checkout@v6.0.2
4646
- name: set up go
47-
uses: actions/setup-go@v6.3.0
47+
uses: actions/setup-go@v6.4.0
4848
with:
4949
go-version-file: ./go.mod
5050
- name: Install just
@@ -63,7 +63,7 @@ jobs:
6363
steps:
6464
- uses: actions/checkout@v6.0.2
6565
- name: set up go
66-
uses: actions/setup-go@v6.3.0
66+
uses: actions/setup-go@v6.4.0
6767
with:
6868
go-version-file: ./go.mod
6969
- name: Install just
@@ -86,7 +86,7 @@ jobs:
8686
steps:
8787
- uses: actions/checkout@v6.0.2
8888
- name: set up go
89-
uses: actions/setup-go@v6.3.0
89+
uses: actions/setup-go@v6.4.0
9090
with:
9191
go-version-file: ./go.mod
9292
- name: Set up Docker Buildx
@@ -112,7 +112,7 @@ jobs:
112112
steps:
113113
- uses: actions/checkout@v6.0.2
114114
- name: set up go
115-
uses: actions/setup-go@v6.3.0
115+
uses: actions/setup-go@v6.4.0
116116
with:
117117
go-version-file: ./go.mod
118118
- name: Install just
@@ -129,17 +129,17 @@ jobs:
129129
steps:
130130
- uses: actions/checkout@v6.0.2
131131
- name: Download unit test coverage report
132-
uses: actions/download-artifact@v8.0.0
132+
uses: actions/download-artifact@v8.0.1
133133
with:
134134
name: unit-test-coverage-report-${{ github.sha }}
135135
path: ./unit-coverage
136136
- name: Download integration test coverage report
137-
uses: actions/download-artifact@v8.0.0
137+
uses: actions/download-artifact@v8.0.1
138138
with:
139139
name: integration-test-coverage-report-${{ github.sha }}
140140
path: ./integration-coverage
141141
- name: Upload combined coverage report
142-
uses: codecov/codecov-action@v5
142+
uses: codecov/codecov-action@v6
143143
with:
144144
token: ${{ secrets.CODECOV_TOKEN }}
145145
files: ./unit-coverage/coverage.txt,./integration-coverage/coverage.txt

0 commit comments

Comments
 (0)