From 9257595f28f05ee6284d9edd0eb65a956ebcc28a Mon Sep 17 00:00:00 2001
From: Rachel Bousfield <nfranks@protonmail.com>
Date: Tue, 7 May 2024 09:35:48 -0600
Subject: [PATCH] code quality improvements

---
 arbitrator/arbutil/src/evm/api.rs | 2 +-
 arbitrator/prover/src/binary.rs   | 6 +++---
 arbitrator/prover/src/machine.rs  | 2 +-
 go-ethereum                       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arbitrator/arbutil/src/evm/api.rs b/arbitrator/arbutil/src/evm/api.rs
index f84f92ad96..093e7f2984 100644
--- 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
index 18f9ecec09..f6c3e9fe8f 100644
--- 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
index fd7e22e1b2..5466c7f790 100644
--- 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!(
diff --git a/go-ethereum b/go-ethereum
index 72f81daa8c..da519ddc4f 160000
--- a/go-ethereum
+++ b/go-ethereum
@@ -1 +1 @@
-Subproject commit 72f81daa8c59f044246b6e1f3eca08187edd7417
+Subproject commit da519ddc4fd5113a46da734e41b37369a1dce098