Merge remote-tracking branch 'origin/master' into fix/block-validator-shutdown-resilience

Author: joshuacolvin0

.github/workflows/_validation-tests.yml

@@ -32,14 +32,16 @@ jobs:
       - name: Run arbitrator prover on block input json
         run: |
           target/bin/prover target/machines/latest/machine.v2.wavm.br -b \
-          --json-inputs="${{ env.INPUT_FILE }}"
+            --json-inputs="${{ env.INPUT_FILE }}" | tee /tmp/prover_output.txt
+          grep -q "Computed state matches the expected one" /tmp/prover_output.txt
 
       - name: Run jit prover on block input json
         id: jit
         run: |
           target/bin/jit --binary target/machines/latest/replay.wasm --require-success --debug \
             json --inputs '${{ env.INPUT_FILE }}' | tee /tmp/jit_output.txt
 
+          grep -q "Computed state matches the expected one" /tmp/jit_output.txt
           JIT_HASH=$(grep -oP 'hash \K(0x)?[a-f0-9]+' /tmp/jit_output.txt)
           echo "jit_hash=$JIT_HASH" >> $GITHUB_OUTPUT
 

.github/workflows/testdata/block_inputs.json

@@ -7,6 +7,7 @@ members = [
     "crates/jit",
     "crates/validation",
     "crates/prover",
+    "crates/prover-ffi",
     "crates/stylus",
     "crates/validator",
     "crates/wasm-libraries/arbcompress",
@@ -33,7 +34,7 @@ resolver = "2"
 
 [workspace.package]
 authors = ["Offchain Labs"]
-edition = "2021"
+edition = "2024"
 homepage = "https://arbitrum.io"
 license = "BSL"
 publish = false
@@ -105,6 +106,7 @@ caller-env = { path = "crates/caller-env", default-features = false }
 forward = { path = "crates/wasm-libraries/forward" }
 jit = { path = "crates/jit" }
 prover = { path = "crates/prover", default-features = false }
+prover-ffi = { path = "crates/prover-ffi" }
 stylus = { path = "crates/stylus", default-features = false }
 user-host-trait = { path = "crates/wasm-libraries/user-host-trait" }
 validation = { path = "crates/validation" }

Cargo.lock

@@ -87,7 +87,8 @@ rust_arbutil_files = $(wildcard crates/arbutil/src/*.* crates/arbutil/src/*/*.*
 
 prover_direct_includes = $(patsubst %,$(output_latest)/%.wasm, forward forward_stub)
 prover_dir = crates/prover/
-rust_prover_files = $(wildcard $(prover_dir)/src/*.* $(prover_dir)/src/*/*.* $(prover_dir)/*.toml $(prover_dir)/*.rs) $(rust_arbutil_files) $(prover_direct_includes) $(arb_brotli_files)
+prover_ffi_dir = crates/prover-ffi/
+rust_prover_files = $(wildcard $(prover_dir)/src/*.* $(prover_dir)/src/*/*.* $(prover_dir)/*.toml $(prover_dir)/*.rs) $(wildcard $(prover_ffi_dir)/src/*.rs $(prover_ffi_dir)/*.toml) $(rust_arbutil_files) $(prover_direct_includes) $(arb_brotli_files)
 
 wasm_lib = crates/wasm-libraries
 wasm_lib_cargo = $(wasm_lib)/.cargo/config.toml

Cargo.toml

@@ -210,19 +210,13 @@ func extractMessagesImpl(
 		)
 	}
 
-	// Update the delayed message accumulator in the MEL state.
+	// Update the delayed message inbox accumulator in the MEL state.
 	for _, delayed := range delayedMessages {
 		if err = state.AccumulateDelayedMessage(delayed); err != nil {
 			return nil, nil, nil, nil, err
 		}
 		state.DelayedMessagesSeen += 1
 	}
-	if len(delayedMessages) > 0 {
-		// Only need to calculate partials once, after all the delayed messages are `seen`
-		if err := state.GenerateDelayedMessagesSeenMerklePartialsAndRoot(); err != nil {
-			return nil, nil, nil, nil, err
-		}
-	}
 
 	// Extract L2 messages from batches
 	for i, batch := range batches {

Makefile

@@ -18,6 +18,7 @@ import (
 
 var ErrDelayedMessageNotYetFinalized = errors.New("delayed message not yet finalized")
 var ErrDelayedAccumulatorMismatch = errors.New("delayed message accumulator mismatch")
+var ErrDelayedMessagePreimageNotFound = errors.New("delayed message preimage not found")
 
 type BatchDataLocation uint8