Move internal error handling to runners

Author: antoniolocascio

basic_bootloader/src/bootloader/mod.rs

@@ -6,6 +6,7 @@ use ruint::aliases::*;
 use system_hooks::addresses_constants::BOOTLOADER_FORMAL_ADDRESS;
 use zk_ee::execution_environment_type::ExecutionEnvironmentType;
 use zk_ee::memory::slice_vec::SliceVec;
+use zk_ee::system::errors::InternalError;
 use zk_ee::system::{EthereumLikeTypes, System, SystemTypes};
 
 pub mod run_single_interaction;
@@ -169,7 +170,7 @@ impl<S: EthereumLikeTypes> BasicBootloader<S> {
     pub fn run_prepared<Config: BasicBootloaderExecutionConfig>(
         oracle: <S::IO as IOSubsystemExt>::IOOracle,
         result_keeper: &mut impl ResultKeeperExt,
-    ) -> <S::IO as IOSubsystemExt>::FinalData
+    ) -> Result<<S::IO as IOSubsystemExt>::FinalData, InternalError>
     where
         S::IO: IOSubsystemExt,
         S::Memory: MemorySubsystemExt,
@@ -241,7 +242,7 @@ impl<S: EthereumLikeTypes> BasicBootloader<S> {
                         "Tx execution result: Internal error = {:?}\n",
                         err,
                     ));
-                    panic!("Internal error during tx execution {:?}", err)
+                    return Err(err);
                 }
                 Err(TxError::Validation(err)) => {
                     let _ = system.get_logger().write_fmt(format_args!(
@@ -374,6 +375,6 @@ impl<S: EthereumLikeTypes> BasicBootloader<S> {
         let r = system.finish(block_hash, l1_to_l2_tx_hash, upgrade_tx_hash, result_keeper);
         cycle_marker::end!("run_prepared");
         #[allow(clippy::let_and_return)]
-        r
+        Ok(r)
     }
 }

forward_system/src/run/mod.rs

@@ -161,6 +161,8 @@ pub fn run_batch_from_oracle_dump<
 ///
 /// Simulate single transaction on top of given state.
 /// The validation step is skipped, fields that needed for validation can be empty(any).
+/// Note that, as the validation step is skipped, an internal error is returned
+/// if the sender does not have enough balance for the top-level call value transfer.
 ///
 /// Needed for `eth_call` and `eth_estimateGas`.
 ///
@@ -189,7 +191,7 @@ pub fn simulate_tx<S: ReadStorage, PS: PreimageSource>(
     CallSimulationBootloader::run_prepared::<BasicBootloaderCallSimulationConfig>(
         oracle,
         &mut result_keeper,
-    );
+    )?;
     let mut batch_output: BatchOutput = result_keeper.into();
     Ok(batch_output.tx_results.remove(0))
 }

forward_system/src/system/bootloader.rs

@@ -17,5 +17,7 @@ pub fn run_forward<
     oracle: ForwardRunningOracle<T, PS, TS>,
     result_keeper: &mut impl ResultKeeperExt,
 ) {
-    let _oracle = ForwardBootloader::run_prepared::<Config>(oracle, result_keeper);
+    if let Err(err) = ForwardBootloader::run_prepared::<Config>(oracle, result_keeper) {
+        panic!("Forward run failed with: {:?}", err)
+    };
 }

proof_running_system/src/system/bootloader.rs

@@ -178,7 +178,8 @@ pub fn run_proving_inner<
     // Load all transactions from oracle and apply them.
     let (mut oracle, public_input) = ProvingBootloader::<O, L>::run_prepared::<
         BasicBootloaderProvingExecutionConfig,
-    >(oracle, &mut NopResultKeeper);
+    >(oracle, &mut NopResultKeeper)
+    .expect("Tried to prove a failing batch");
 
     // disconnect oracle before returning
     // TODO: check this is the intended behaviour (ignoring the result)