Skip to content

Commit f7cae77

Browse files
committed
Merge branch 'main' into release/v7.0.0
2 parents b14fdf0 + 56c0cf0 commit f7cae77

File tree

110 files changed

+4783
-1843
lines changed

Some content is hidden

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

110 files changed

+4783
-1843
lines changed
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: "Install RISC0"
2+
description: "Install RISC0 Toolchain"
3+
4+
runs:
5+
using: "composite"
6+
steps:
7+
- name: Install RISC0
8+
shell: bash
9+
run: |
10+
curl -L https://risczero.com/install | bash
11+
~/.risc0/bin/rzup install cargo-risczero 3.0.3
12+
~/.risc0/bin/rzup install risc0-groth16
13+
~/.risc0/bin/rzup install rust
14+
~/.risc0/bin/rzup install cpp
15+
~/.risc0/bin/rzup install r0vm 3.0.3

.github/workflows/common_failure_alerts.yaml

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -50,31 +50,10 @@ jobs:
5050
id: failed_jobs
5151
uses: actions/github-script@v7
5252
with:
53+
result-encoding: string
5354
script: |
54-
const runId = context.payload.workflow_run.id;
55-
const { owner, repo } = context.repo;
56-
const failingConclusions = new Set(['failure', 'timed_out', 'action_required']);
57-
const failedJobs = await github.paginate(
58-
github.rest.actions.listJobsForWorkflowRun,
59-
{
60-
owner,
61-
repo,
62-
run_id: runId,
63-
per_page: 100,
64-
},
65-
response => {
66-
const jobs = Array.isArray(response?.data?.jobs) ? response.data.jobs : [];
67-
return jobs.filter(
68-
job => job.conclusion && failingConclusions.has(job.conclusion)
69-
);
70-
}
71-
);
72-
const ignoredJobs = new Set(['Integration Test']);
73-
const relevantJobs = failedJobs
74-
.map(job => job.name)
75-
.filter(name => !ignoredJobs.has(name));
76-
const names = relevantJobs.length > 0 ? relevantJobs.join('\n- ') : 'Unknown job';
77-
core.setOutput('names', relevantJobs.length > 0 ? `- ${names}` : names);
55+
const collectFailedJobs = require('./scripts/collect_failed_jobs');
56+
await collectFailedJobs({ github, core, context });
7857
7958
- name: Post failure to Slack
8059
env:

.github/workflows/main_prover.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ jobs:
9999
ETHREX_PROPOSER_BLOCK_TIME=12000 \
100100
ETHREX_COMMITTER_COMMIT_TIME=30000 \
101101
ETHREX_WATCHER_WATCH_INTERVAL=1000 \
102+
ETHREX_COMMITTER_FIRST_WAKE_UP_TIME=60000 \
102103
ETHREX_BLOCK_PRODUCER_BASE_FEE_VAULT_ADDRESS=0x000c0d6b7c4516a5b274c51ea331a9410fe69127 \
103104
ETHREX_BLOCK_PRODUCER_OPERATOR_FEE_VAULT_ADDRESS=0xd5d2a85751b6F158e5b9B8cD509206A865672362 \
104105
ETHREX_BLOCK_PRODUCER_OPERATOR_FEE_PER_GAS=1000000000 \

.github/workflows/pr-main_l2.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,7 @@ jobs:
6969
- name: Install RISC0
7070
env:
7171
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
72-
run: |
73-
curl -L https://risczero.com/install | bash
74-
~/.risc0/bin/rzup install cargo-risczero 3.0.3
75-
~/.risc0/bin/rzup install risc0-groth16
76-
~/.risc0/bin/rzup install rust
72+
uses: ./.github/actions/install-risc0
7773

7874
- name: Create placeholder SP1 ELF
7975
run: |

.github/workflows/pr-main_l2_prover.yaml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,11 @@ jobs:
3030
- name: Add Rust Cache
3131
uses: Swatinem/rust-cache@v2
3232

33-
- name: RISC-V Risc0 toolchain install
33+
- name: Install RISC0
3434
if: matrix.backend == 'risc0'
3535
env:
3636
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
37-
# should be able to specify a version for `rzup install rust` (toolchain version)
38-
# but it throws a "error decoding response body" in that case
39-
run: |
40-
curl -L https://risczero.com/install | bash
41-
~/.risc0/bin/rzup install cargo-risczero 3.0.3
42-
~/.risc0/bin/rzup install risc0-groth16
43-
~/.risc0/bin/rzup install rust
37+
uses: ./.github/actions/install-risc0
4438

4539
- name: RISC-V SP1 toolchain install
4640
if: matrix.backend == 'sp1'

.github/workflows/tag_release.yaml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ permissions:
1818
env:
1919
REGISTRY: ghcr.io
2020
IMAGE_NAME: ${{ github.repository }}
21+
PROVER_REPRODUCIBLE_BUILD: true
2122

2223
jobs:
2324
build-ethrex:
@@ -96,11 +97,8 @@ jobs:
9697
if: ${{ matrix.platform == 'ubuntu-22.04' }}
9798
env:
9899
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
99-
run: |
100-
curl -L https://risczero.com/install | bash
101-
~/.risc0/bin/rzup install cargo-risczero 3.0.3
102-
~/.risc0/bin/rzup install risc0-groth16
103-
~/.risc0/bin/rzup install rust
100+
uses: ./.github/actions/install-risc0
101+
104102
- name: Install CUDA (only Linux x86 GPU)
105103
uses: Jimver/cuda-toolkit@v0.2.24
106104
if: ${{ matrix.platform == 'ubuntu-22.04' && matrix.stack == 'l2_gpu' }}
@@ -185,11 +183,7 @@ jobs:
185183
if: ${{ matrix.zkvm == 'risc0' }}
186184
env:
187185
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
188-
run: |
189-
curl -L https://risczero.com/install | bash
190-
~/.risc0/bin/rzup install cargo-risczero 3.0.3
191-
~/.risc0/bin/rzup install risc0-groth16
192-
~/.risc0/bin/rzup install rust
186+
uses: ./.github/actions/install-risc0
193187

194188
- name: Build ethrex elf - ${{ matrix.zkvm }}
195189
run: |
@@ -299,6 +293,9 @@ jobs:
299293
- name: Checkout code
300294
uses: actions/checkout@v4
301295

296+
- name: Free Disk Space
297+
uses: ./.github/actions/free-disk
298+
302299
- name: Format name
303300
run: |
304301
# For branch builds (main) we want docker images tagged as 'main'. For tag pushes

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
## Perf
44

5+
### 2025-11-13
6+
7+
- Use specialized DUP implementation [#5324](https://github.com/lambdaclass/ethrex/pull/5324)
8+
- Avoid recalculating blob base fee while preparing transactions [#5328](https://github.com/lambdaclass/ethrex/pull/5328)
9+
- Use BlobDB for account_codes column family [#5300](https://github.com/lambdaclass/ethrex/pull/5300)
10+
511
### 2025-11-12
612

713
- Only mark individual values as dirty instead of the whole trie [#5282](https://github.com/lambdaclass/ethrex/pull/5282)

0 commit comments

Comments
 (0)