continue-on-error foundations: refactor verification to a separate trait

CHANGELOG.md

@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - [900](https://github.com/FuelLabs/fuel-vm/pull/900): Change the error variant `DuplicateMessageInputId` to `DuplicateInputNonce` which now contains a nonce instead of `MessageId` for performance improvements.
 - [907](https://github.com/FuelLabs/fuel-vm/pull/907): `StorageRead` and `StorageWrite` traits no longer return the number of bytes written. They already required that the whole buffer is used, but now this is reflected in signature and documentation as well.
 - [914](https://github.com/FuelLabs/fuel-vm/pull/914): The built-in profiler is removed. Use the debugger with single-stepping instead.
+- [918](https://github.com/FuelLabs/fuel-vm/pull/918): Interpreter is now generic over the validation error handling. No behavioural changes, but the `Interpreter` has one extra type parameter.
 
 ### Changed
 - [904](https://github.com/FuelLabs/fuel-vm/pull/904): Moved the logic of each opcode into its own function. It helps so reduce the size of the `instruction_inner` function, allowing compiler to do better optimizations. The Mira swaps receive performance improvement in 16.5%.

fuel-vm/examples/external.rs

@@ -49,8 +49,8 @@ use fuel_vm::{
 pub struct FileReadEcal;
 
 impl EcalHandler for FileReadEcal {
-    fn ecal<M, S, Tx>(
-        vm: &mut Interpreter<M, S, Tx, Self>,
+    fn ecal<M, S, Tx, V>(
+        vm: &mut Interpreter<M, S, Tx, Self, V>,
         a: RegId,
         b: RegId,
         c: RegId,
@@ -130,8 +130,8 @@ pub struct CounterEcal {
 }
 
 impl EcalHandler for CounterEcal {
-    fn ecal<M, S, Tx>(
-        vm: &mut Interpreter<M, S, Tx, Self>,
+    fn ecal<M, S, Tx, V>(
+        vm: &mut Interpreter<M, S, Tx, Self, V>,
         a: RegId,
         _b: RegId,
         _c: RegId,
@@ -193,8 +193,8 @@ pub struct SharedCounterEcal {
 }
 
 impl EcalHandler for SharedCounterEcal {
-    fn ecal<M, S, Tx>(
-        vm: &mut Interpreter<M, S, Tx, Self>,
+    fn ecal<M, S, Tx, V>(
+        vm: &mut Interpreter<M, S, Tx, Self, V>,
         a: RegId,
         _b: RegId,
         _c: RegId,

fuel-vm/src/backtrace.rs

@@ -43,8 +43,8 @@ impl Backtrace {
     /// Create a backtrace from a vm instance and instruction result.
     ///
     /// This isn't copy-free and shouldn't be provided by default.
-    pub fn from_vm_error<M, S, Tx, Ecal>(
-        vm: &Interpreter<M, S, Tx, Ecal>,
+    pub fn from_vm_error<M, S, Tx, Ecal, V>(
+        vm: &Interpreter<M, S, Tx, Ecal, V>,
         result: ScriptExecutionResult,
     ) -> Self
     where

fuel-vm/src/interpreter.rs

@@ -11,8 +11,12 @@ use crate::{
     context::Context,
     error::SimpleResult,
     state::Debugger,
+    verification,
+};
+use alloc::{
+    collections::BTreeSet,
+    vec::Vec,
 };
-use alloc::vec::Vec;
 use core::{
     mem,
     ops::Index,
@@ -106,21 +110,21 @@ pub struct NotSupportedEcal;
 
 /// VM interpreter.
 ///
-/// The internal state of the VM isn't expose because the intended usage is to
+/// The internal state of the VM isn't exposed because the intended usage is to
 /// either inspect the resulting receipts after a transaction execution, or the
 /// resulting mutated transaction.
 ///
 /// These can be obtained with the help of a [`crate::transactor::Transactor`]
 /// or a client implementation.
 #[derive(Debug, Clone)]
-pub struct Interpreter<M, S, Tx = (), Ecal = NotSupportedEcal> {
+pub struct Interpreter<M, S, Tx = (), Ecal = NotSupportedEcal, V = verification::Normal> {
     registers: [Word; VM_REGISTER_COUNT],
     memory: M,
     frames: Vec<CallFrame>,
     receipts: ReceiptsCtx,
     tx: Tx,
     initial_balances: InitialBalances,
-    input_contracts: alloc::collections::BTreeSet<ContractId>,
+    input_contracts: BTreeSet<ContractId>,
     input_contracts_index_to_output_index: alloc::collections::BTreeMap<u16, u16>,
     storage: S,
     debugger: Debugger,
@@ -131,6 +135,7 @@ pub struct Interpreter<M, S, Tx = (), Ecal = NotSupportedEcal> {
     /// `append_panic_receipt` and is `PanicContext::None` after consumption.
     panic_context: PanicContext,
     ecal_state: Ecal,
+    verifier: V,
 }
 
 /// Interpreter parameters
@@ -204,21 +209,21 @@ pub(crate) enum PanicContext {
     ContractId(ContractId),
 }
 
-impl<M: Memory, S, Tx, Ecal> Interpreter<M, S, Tx, Ecal> {
+impl<M: Memory, S, Tx, Ecal, V> Interpreter<M, S, Tx, Ecal, V> {
     /// Returns the current state of the VM memory
     pub fn memory(&self) -> &MemoryInstance {
         self.memory.as_ref()
     }
 }
 
-impl<M: AsMut<MemoryInstance>, S, Tx, Ecal> Interpreter<M, S, Tx, Ecal> {
+impl<M: AsMut<MemoryInstance>, S, Tx, Ecal, V> Interpreter<M, S, Tx, Ecal, V> {
     /// Returns mutable access to the vm memory
     pub fn memory_mut(&mut self) -> &mut MemoryInstance {
         self.memory.as_mut()
     }
 }
 
-impl<M, S, Tx, Ecal> Interpreter<M, S, Tx, Ecal> {
+impl<M, S, Tx, Ecal, V> Interpreter<M, S, Tx, Ecal, V> {
     /// Returns the current state of the registers
     pub const fn registers(&self) -> &[Word] {
         &self.registers
@@ -314,6 +319,11 @@ impl<M, S, Tx, Ecal> Interpreter<M, S, Tx, Ecal> {
     pub fn receipts_mut(&mut self) -> &mut ReceiptsCtx {
         &mut self.receipts
     }
+
+    /// Get verifier state. Note that the default verifier has no state.
+    pub fn verifier(&self) -> &V {
+        &self.verifier
+    }
 }
 
 pub(crate) fn flags(flag: Reg<FLAG>) -> Flags {
@@ -328,13 +338,13 @@ pub(crate) fn is_unsafe_math(flag: Reg<FLAG>) -> bool {
     flags(flag).contains(Flags::UNSAFEMATH)
 }
 
-impl<M, S, Tx, Ecal> AsRef<S> for Interpreter<M, S, Tx, Ecal> {
+impl<M, S, Tx, Ecal, V> AsRef<S> for Interpreter<M, S, Tx, Ecal, V> {
     fn as_ref(&self) -> &S {
         &self.storage
     }
 }
 
-impl<M, S, Tx, Ecal> AsMut<S> for Interpreter<M, S, Tx, Ecal> {
+impl<M, S, Tx, Ecal, V> AsMut<S> for Interpreter<M, S, Tx, Ecal, V> {
     fn as_mut(&mut self) -> &mut S {
         &mut self.storage
     }
@@ -675,30 +685,3 @@ impl CheckedMetadata for BlobCheckedMetadata {
         }
     }
 }
-
-pub(crate) struct InputContracts<'vm> {
-    input_contracts: &'vm alloc::collections::BTreeSet<ContractId>,
-    panic_context: &'vm mut PanicContext,
-}
-
-impl<'vm> InputContracts<'vm> {
-    pub fn new(
-        input_contracts: &'vm alloc::collections::BTreeSet<ContractId>,
-        panic_context: &'vm mut PanicContext,
-    ) -> Self {
-        Self {
-            input_contracts,
-            panic_context,
-        }
-    }
-
-    /// Checks that the contract is declared in the transaction inputs.
-    pub fn check(&mut self, contract: &ContractId) -> SimpleResult<()> {
-        if !self.input_contracts.contains(contract) {
-            *self.panic_context = PanicContext::ContractId(*contract);
-            Err(PanicReason::ContractNotInInputs.into())
-        } else {
-            Ok(())
-        }
-    }
-}

fuel-vm/src/interpreter/alu.rs

@@ -19,7 +19,7 @@ use fuel_types::Word;
 mod muldiv;
 mod wideint;
 
-impl<M, S, Tx, Ecal> Interpreter<M, S, Tx, Ecal>
+impl<M, S, Tx, Ecal, V> Interpreter<M, S, Tx, Ecal, V>
 where
     Tx: ExecutableTransaction,
 {

fuel-vm/src/interpreter/alu/muldiv.rs

@@ -15,7 +15,7 @@ use fuel_asm::{
 };
 use fuel_types::Word;
 
-impl<M, S, Tx, Ecal> Interpreter<M, S, Tx, Ecal>
+impl<M, S, Tx, Ecal, V> Interpreter<M, S, Tx, Ecal, V>
 where
     Tx: ExecutableTransaction,
 {

fuel-vm/src/interpreter/alu/wideint.rs

@@ -61,7 +61,7 @@ macro_rules! wideint_ops {
                 $t::from_le_bytes(truncated)
             }
 
-            impl<M, S, Tx, Ecal> Interpreter<M, S, Tx, Ecal>
+            impl<M, S, Tx, Ecal, V> Interpreter<M, S, Tx, Ecal, V>
             where
                 M: Memory,
                 Tx: ExecutableTransaction,

fuel-vm/src/interpreter/balances.rs

@@ -166,7 +166,7 @@ impl RuntimeBalances {
 
     /// Write all assets into the start of VM stack, i.e. at $ssp.
     /// Panics if the assets cannot fit.
-    pub fn to_vm<M, S, Tx, Ecal>(self, vm: &mut Interpreter<M, S, Tx, Ecal>)
+    pub fn to_vm<M, S, Tx, Ecal, V>(self, vm: &mut Interpreter<M, S, Tx, Ecal, V>)
     where
         M: Memory,
         Tx: ExecutableTransaction,

fuel-vm/src/interpreter/blob.rs

@@ -27,7 +27,7 @@ use super::{
     WriteRegKey,
 };
 
-impl<M, S, Tx, Ecal> Interpreter<M, S, Tx, Ecal>
+impl<M, S, Tx, Ecal, V> Interpreter<M, S, Tx, Ecal, V>
 where
     M: Memory,
     S: InterpreterStorage,