Merge branch 'master' into backward-compat-docker

OffchainLabs · May 13, 2024 · d032762 · d032762
2 parents 262d698 + 9ba5f46
commit d032762
Show file tree

Hide file tree

Showing 90 changed files with 1,612 additions and 689 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        test-mode: [defaults, race, challenge, stylus]
+        test-mode: [defaults, race, challenge, stylus, long]
 
     steps:
       - name: Checkout
@@ -167,8 +167,14 @@ jobs:
         if: matrix.test-mode == 'stylus'
         run: |
           packages=`go list ./...`
-          stdbuf -oL gotestsum --format short-verbose --packages="$packages" --rerun-fails=1 --no-color=false -- ./... -coverprofile=coverage.txt -covermode=atomic -coverpkg=./...,./go-ethereum/... -parallel=8 -tags=stylustest -run=TestProgramArbitrator > >(stdbuf -oL tee full.log | grep -vE "INFO|seal")
+          stdbuf -oL gotestsum --format short-verbose --packages="$packages" --rerun-fails=1 --no-color=false -- ./... -timeout 60m -coverprofile=coverage.txt -covermode=atomic -coverpkg=./...,./go-ethereum/... -parallel=8 -tags=stylustest -run="TestProgramArbitrator" > >(stdbuf -oL tee full.log | grep -vE "INFO|seal")
 
+      - name: run long stylus tests
+        if: matrix.test-mode == 'long'
+        run: |
+          packages=`go list ./...`
+          stdbuf -oL gotestsum --format short-verbose --packages="$packages" --rerun-fails=1 --no-color=false -- ./... -timeout 60m -coverprofile=coverage.txt -covermode=atomic -coverpkg=./...,./go-ethereum/... -parallel=8 -tags=stylustest -run="TestProgramLong" > >(stdbuf -oL tee full.log | grep -vE "INFO|seal")
+  
       - name: Archive detailed run log
         uses: actions/upload-artifact@v3
         with:

diff --git a/arbitrator/arbutil/src/evm/api.rs b/arbitrator/arbutil/src/evm/api.rs
@@ -153,7 +153,7 @@ pub trait EvmApi<D: DataReader>: Send + 'static {
     ) -> (eyre::Result<Bytes20>, u32, u64);
 
     /// Returns the EVM return data.
-    /// Analogous to `vm.RETURNDATA`.
+    /// Analogous to `vm.RETURNDATACOPY`.
     fn get_return_data(&self) -> D;
 
     /// Emits an EVM log with the given number of topics and data, the first bytes of which should be the topic data.

diff --git a/arbitrator/prover/src/binary.rs b/arbitrator/prover/src/binary.rs
@@ -627,9 +627,9 @@ impl<'a> WasmBinary<'a> {
             ink_left: ink_left.as_u32(),
             ink_status: ink_status.as_u32(),
             depth_left: depth_left.as_u32(),
-            init_cost: init.try_into()?,
-            cached_init_cost: cached_init.try_into()?,
-            asm_estimate: asm_estimate.try_into()?,
+            init_cost: init.try_into().wrap_err("init cost too high")?,
+            cached_init_cost: cached_init.try_into().wrap_err("cached cost too high")?,
+            asm_estimate: asm_estimate.try_into().wrap_err("asm estimate too large")?,
             footprint,
             user_main,
         })

diff --git a/arbitrator/prover/src/machine.rs b/arbitrator/prover/src/machine.rs
@@ -1729,7 +1729,7 @@ impl Machine {
 
     pub fn jump_into_func(&mut self, module: u32, func: u32, mut args: Vec<Value>) -> Result<()> {
         let Some(source_module) = self.modules.get(module as usize) else {
-            bail!("no module at offest {}", module.red())
+            bail!("no module at offset {}", module.red())
         };
         let Some(source_func) = source_module.funcs.get(func as usize) else {
             bail!(