Merge master with wasmer7 into zk-prove-any/sp1 by bragaigor · Pull Request #4527 · OffchainLabs/nitro

bragaigor · 2026-03-19T11:17:13Z

Build currently failing until rust version is updated

The new version of stylus-sdk may be producing a wasm that has a different gas cost. To ensure that the different gas cost is not an issue with the new version, we will test the wasm generated by the old stylus-sdk version, before updating the gas costs in the test.

Also update .wat files to use new API for get_local and get_global Signed-off-by: Igor Braga <5835477+bragaigor@users.noreply.github.com>

Signed-off-by: Igor Braga <5835477+bragaigor@users.noreply.github.com>

codecov · 2026-03-19T11:35:50Z

Codecov Report

❌ Patch coverage is 20.68966% with 23 lines in your changes missing coverage. Please review.
✅ Project coverage is 32.59%. Comparing base (ef87792) to head (9e3f5dd).
⚠️ Report is 276 commits behind head on zk-prove-any/sp1-runner.

Additional details and impacted files

@@                     Coverage Diff                     @@
##           zk-prove-any/sp1-runner    #4527      +/-   ##
===========================================================
- Coverage                    34.54%   32.59%   -1.96%     
===========================================================
  Files                          497      497              
  Lines                        58813    58849      +36     
===========================================================
- Hits                         20318    19179    -1139     
- Misses                       34887    36300    +1413     
+ Partials                      3608     3370     -238

github-actions · 2026-03-19T12:11:44Z

❌ 5 Tests Failed:

Tests completed	Failed	Passed	Skipped
4558	5	4553	0

View the top 3 failed tests by shortest run time

TestPruningDBSizeReduction

Stack Traces | 0.000s run time

=== RUN   TestPruningDBSizeReduction
--- FAIL: TestPruningDBSizeReduction (0.00s)

TestPruningStateAvailabilityMinimal

Stack Traces | 15.080s run time

... [CONTENT TRUNCATED: Keeping last 20 lines]
DEBUG[03-23|13:37:06.795] Journaled pathdb diff layer              root=b1432c..6b954b parent=dbcbcc..8ee8ad id=226                block=225
DEBUG[03-23|13:37:06.795] Journaled pathdb diff layer              root=36f6c0..42b9aa parent=b1432c..6b954b id=227                block=226
DEBUG[03-23|13:37:06.795] Journaled pathdb diff layer              root=3f8501..3fb8dc parent=36f6c0..42b9aa id=228                block=227
DEBUG[03-23|13:37:06.795] Journaled pathdb diff layer              root=7a4cda..4b5d7b parent=3f8501..3fb8dc id=229                block=228
DEBUG[03-23|13:37:06.795] Journaled pathdb diff layer              root=8d7080..472b36 parent=7a4cda..4b5d7b id=230                block=229
DEBUG[03-23|13:37:06.795] Journaled pathdb diff layer              root=bb8b05..c46bb1 parent=8d7080..472b36 id=231                block=230
DEBUG[03-23|13:37:06.795] Journaled pathdb diff layer              root=28e12c..d15f4c parent=bb8b05..c46bb1 id=232                block=231
DEBUG[03-23|13:37:06.795] Journaled pathdb diff layer              root=a1de86..be1bd3 parent=28e12c..d15f4c id=233                block=232
DEBUG[03-23|13:37:06.795] Journaled pathdb diff layer              root=850056..90e904 parent=a1de86..be1bd3 id=234                block=233
DEBUG[03-23|13:37:06.795] Journaled pathdb diff layer              root=451438..690e9b parent=850056..90e904 id=235                block=234
DEBUG[03-23|13:37:06.795] Journaled pathdb diff layer              root=56d084..ed7d4e parent=451438..690e9b id=236                block=235
DEBUG[03-23|13:37:06.795] Journaled pathdb diff layer              root=0fc766..193a36 parent=56d084..ed7d4e id=237                block=236
INFO [03-23|13:37:06.796] Persisted dirty state to disk            size=1.23MiB   elapsed=9.131ms
INFO [03-23|13:37:06.796] Blockchain stopped
TRACE[03-23|13:37:06.796] P2P networking is spinning down
DEBUG[03-23|13:37:06.797] RPC server shutting down
INFO [03-23|13:37:06.797] HTTP server stopped                      endpoint=127.0.0.1:44721
DEBUG[03-23|13:37:06.797] RPC server shutting down
TRACE[03-23|13:37:06.797] P2P networking is spinning down
--- FAIL: TestPruningStateAvailabilityMinimal (15.08s)

TestSequencerPriceAdjustsFrom25Gwei

Stack Traces | 17.190s run time

... [CONTENT TRUNCATED: Keeping last 20 lines]
INFO [03-23|13:44:17.919] Updated payload                          id=0x03713ecce80d963d number=670 hash=c8db74..91e07d txs=1  withdrawals=0 gas=21000      fees=0.0021         root=0376f4..6c8fe3 elapsed="699.847µs"
INFO [03-23|13:44:17.920] Stopping work on payload                 id=0x03713ecce80d963d reason=delivery
INFO [03-23|13:44:17.920] Submitted transaction                    hash=0xfbea06ec710b158e20803d1ce9ccc5852f62cba6ae1a951e15486bf5ba849048 from=0xaF24Ca6c2831f4d4F629418b50C227DF0885613A nonce=60  recipient=0xaF24Ca6c2831f4d4F629418b50C227DF0885613A value=1,000,000,000,000
INFO [03-23|13:44:17.922] Starting work on payload                 id=0x0300a8d22fd5e14e
WARN [03-23|13:44:17.923] empty sequencer message
WARN [03-23|13:44:17.923] reading virtual delayed message segment  delayedMessagesRead=0 afterDelayedMessages=1
INFO [03-23|13:44:17.923] InboxTracker                             sequencerBatchCount=1  messageCount=1   l1Block=27  l1Timestamp=2026-03-23T13:44:41+0000
INFO [03-23|13:44:17.923] Updated payload                          id=0x0300a8d22fd5e14e number=102 hash=4303bc..80a2f1 txs=1  withdrawals=0 gas=21000      fees=0.002099995316 root=d85c06..e9bf0a elapsed="785.527µs"
INFO [03-23|13:44:17.924] Imported new potential chain segment     number=670 hash=c8db74..91e07d blocks=1  txs=1  mgas=0.021  elapsed=2.740ms      mgasps=7.663    triediffs=659.83KiB  triedirty=321.44KiB
INFO [03-23|13:44:17.924] Chain head was updated                   number=670 hash=c8db74..91e07d root=0376f4..6c8fe3 elapsed="99.298µs"
INFO [03-23|13:44:17.924] Stopping work on payload                 id=0x0300a8d22fd5e14e reason=delivery
INFO [03-23|13:44:17.925] Imported new potential chain segment     number=102 hash=4303bc..80a2f1 blocks=1  txs=1  mgas=0.021  elapsed=1.143ms      mgasps=18.363   triediffs=454.45KiB  triedirty=0.00B
INFO [03-23|13:44:17.925] Chain head was updated                   number=102 hash=4303bc..80a2f1 root=d85c06..e9bf0a elapsed="54.533µs"
INFO [03-23|13:44:17.926] Ethereum protocol stopped
INFO [03-23|13:44:17.926] Transaction pool stopped
INFO [03-23|13:44:17.926] Persisting dirty state                   head=32  root=f7a65e..cb35f8 layers=32
INFO [03-23|13:44:17.928] Persisted dirty state to disk            size=149.54KiB elapsed=2.607ms
INFO [03-23|13:44:17.929] Blockchain stopped
    fees_test.go:253: �[31;1m [batch count didn't update in time] �[0;0m
--- FAIL: TestSequencerPriceAdjustsFrom25Gwei (17.19s)

📣 Thoughts on this report? Let Codecov know! | Powered by Codecov

Signed-off-by: Igor Braga <5835477+bragaigor@users.noreply.github.com>

…-changes-to-master Port recent changes from zk-prove-any/sp1-runner to master

Signed-off-by: Igor Braga <5835477+bragaigor@users.noreply.github.com>

pmikolajczyk41

just a few questions - please resolve them at your will and merge whenever you feel it's good to go

arbnode/nitro-version-alerter/client.go

crates/jit/src/machine.rs

Makefile

crates/prover/src/binary.rs

crates/validation/Cargo.toml

sp1-crates/Cargo.toml

Signed-off-by: Igor Braga <5835477+bragaigor@users.noreply.github.com>

rory-ocl and others added 30 commits February 4, 2026 10:25

Upgrade wasmer version to 7

215d95e

Build currently failing until rust version is updated

Bump rust version to 1.93

512f796

Update rust version in github action

7721370

Update rust version in Dockerfile

0ea74b2

Merge branch 'rust-1.93' into wasmer7

3d31015

Try compiler flags to fix ci

fed9471

Add compiler-builtins to jit crate deps

c58cf02

remove failed ci fix

96e8319

enable probestack for jit crate

2ce46ce

Bump cbindgen version

05d962c

fix submodule pins

41e50fe

Fix updates for wasmer upgrade

e2a05af

Build stylus crate with new wasmparser

3788478

Fix wasmer import

24966eb

Fix stylus tests for new sdk version

4f0290d

Temporarity disable erc20 test and fix others

b155f23

Merge remote-tracking branch 'origin/master' into wasmer7

7f5e896

Use same geth as master

e3571b8

Set precompiles commit to same as master

494a92a

Merge remote-tracking branch 'origin/master' into wasmer7

61062ad

Merge remote-tracking branch 'origin/master' into wasmer7

c29160c

Merge remote-tracking branch 'origin/master' into wasmer7

6b9785c

Add consensus-v60-alpha.2 support

937ddcd

Update rust-toolchain.toml to use 1.93

eb2d9bf

Update tool versions in check-build

55dcc1f

Remove old module roots

68e8ccc

Revert multicall wat test and bump page target

51db780

Update blocks_input file and fix TestProgramSimpleCost tests

a57eabc

Also update .wat files to use new API for get_local and get_global Signed-off-by: Igor Braga <5835477+bragaigor@users.noreply.github.com>

Make clippy happy and temporarily comment cranelift verifier

ee1106b

Signed-off-by: Igor Braga <5835477+bragaigor@users.noreply.github.com>

Merge branch 'master' into braga/merge-master-wasmer7

0c1ac82

Signed-off-by: Igor Braga <5835477+bragaigor@users.noreply.github.com>

formatting and update sp1-crates deps

72c575a

Signed-off-by: Igor Braga <5835477+bragaigor@users.noreply.github.com>

bragaigor mentioned this pull request Mar 19, 2026

ZK Prover ANY OffchainLabs/wasmer#34

Draft

pmikolajczyk41 and others added 12 commits March 19, 2026 13:24

Remove check for empty msg

d9a3ce6

Check for target

4e7cde2

take by value

3345bec

take by value

7ced81b

use btreemap

4a8530b

update wasmer and fix sp1 compilation

2068b02

Signed-off-by: Igor Braga <5835477+bragaigor@users.noreply.github.com>

update wasmer for missing publish_eh_frame on x86

9a23354

Signed-off-by: Igor Braga <5835477+bragaigor@users.noreply.github.com>

attempt to fix Sp1 validation

6857904

Signed-off-by: Igor Braga <5835477+bragaigor@users.noreply.github.com>

Merge pull request #4521 from OffchainLabs/pmikolajczyk/nit-4671-port…

2bde565

…-changes-to-master Port recent changes from zk-prove-any/sp1-runner to master

test without custom brotli

8c4b746

Signed-off-by: Igor Braga <5835477+bragaigor@users.noreply.github.com>

readd brotli and update upstream wasmer

c93242d

Signed-off-by: Igor Braga <5835477+bragaigor@users.noreply.github.com>

Merge branch 'master' into braga/merge-master-wasmer7

e89d1d3

Signed-off-by: Igor Braga <5835477+bragaigor@users.noreply.github.com>

joshuacolvin0 changed the title ~~Merge master with wasmer7~~ Merge master with wasmer7 into zk-prove-any/sp1 Mar 20, 2026

bragaigor added 2 commits March 20, 2026 08:32

guard with sp1

20ffc8a

Signed-off-by: Igor Braga <5835477+bragaigor@users.noreply.github.com>

guard bad stylus arch check against sp1 builds

a2641fb

Signed-off-by: Igor Braga <5835477+bragaigor@users.noreply.github.com>

bragaigor marked this pull request as ready for review March 20, 2026 13:26

bragaigor assigned pmikolajczyk41 Mar 20, 2026

bragaigor requested a review from pmikolajczyk41 March 20, 2026 13:26

pmikolajczyk41 approved these changes Mar 23, 2026

View reviewed changes

pmikolajczyk41 assigned bragaigor and unassigned pmikolajczyk41 Mar 23, 2026

remove redundant code

9e3f5dd

Signed-off-by: Igor Braga <5835477+bragaigor@users.noreply.github.com>

bragaigor enabled auto-merge March 23, 2026 13:22

bragaigor merged commit 12376d8 into zk-prove-any/sp1-runner Mar 23, 2026
19 checks passed

bragaigor deleted the braga/merge-master-wasmer7 branch March 23, 2026 13:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge master with wasmer7 into zk-prove-any/sp1#4527

Merge master with wasmer7 into zk-prove-any/sp1#4527
bragaigor merged 120 commits intozk-prove-any/sp1-runnerfrom
braga/merge-master-wasmer7

bragaigor commented Mar 19, 2026 •

edited

Loading

Uh oh!

codecov bot commented Mar 19, 2026 •

edited

Loading

Uh oh!

github-actions bot commented Mar 19, 2026 •

edited

Loading

Uh oh!

pmikolajczyk41 left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Conversation

bragaigor commented Mar 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Mar 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

github-actions bot commented Mar 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

❌ 5 Tests Failed:

Uh oh!

pmikolajczyk41 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

bragaigor commented Mar 19, 2026 •

edited

Loading

codecov bot commented Mar 19, 2026 •

edited

Loading

github-actions bot commented Mar 19, 2026 •

edited

Loading