fix: handle REVERT and subtract 2500 gas

compiler_tester/src/directories/matter_labs/test/metadata/case/input/expected/mod.rs

@@ -9,6 +9,7 @@ use serde::Deserialize;
 use crate::compilers::mode::Mode;
 
 use self::variant::Variant;
+use self::variant::extended::Extended;
 
 ///
 /// The Matter Labs compiler test metadata expected data variant.
@@ -33,8 +34,13 @@ impl Expected {
     ///
     /// Creates EVM interpreter benchmark expected data.
     ///
-    pub fn successful_evm_interpreter_benchmark() -> Self {
-        Self::Single(Variant::Simple(vec![]))
+    pub fn successful_evm_interpreter_benchmark(exception: bool) -> Self {
+        Self::Single(Variant::Extended(Extended {
+            return_data: vec![],
+            events: vec![],
+            exception,
+            compiler_version: None,
+        }))
     }
 
     ///

compiler_tester/src/directories/matter_labs/test/mod.rs

@@ -318,6 +318,7 @@ impl MatterLabsTest {
         for pair_of_bytecodes in evm_contracts.chunks(2) {
             let full = &pair_of_bytecodes[0];
             let template = &pair_of_bytecodes[1];
+            let exception = full.contains("REVERT");
 
             metadata_cases.push(MatterLabsCase {
                 comment: None,
@@ -339,7 +340,7 @@ impl MatterLabsTest {
                         value: None,
                         storage: HashMap::new(),
                         expected: Some(
-                            MatterLabsCaseInputExpected::successful_evm_interpreter_benchmark(),
+                            MatterLabsCaseInputExpected::successful_evm_interpreter_benchmark(false),
                         ),
                     },
                     MatterLabsCaseInput {
@@ -354,41 +355,11 @@ impl MatterLabsTest {
                         value: None,
                         storage: HashMap::new(),
                         expected: Some(
-                            MatterLabsCaseInputExpected::successful_evm_interpreter_benchmark(),
-                        ),
-                    },
-                    MatterLabsCaseInput {
-                        comment: None,
-                        instance: "Proxy".to_owned(),
-                        caller: default_caller_address(),
-                        method: "#fallback".to_owned(),
-                        calldata: MatterLabsCaseInputCalldata::List(vec![
-                            "Benchmark.address".to_owned(),
-                            format!("{template}.address"),
-                        ]),
-                        value: None,
-                        storage: HashMap::new(),
-                        expected: Some(
-                            MatterLabsCaseInputExpected::successful_evm_interpreter_benchmark(),
-                        ),
-                    },
-                    MatterLabsCaseInput {
-                        comment: None,
-                        instance: "Proxy".to_owned(),
-                        caller: default_caller_address(),
-                        method: "#fallback".to_owned(),
-                        calldata: MatterLabsCaseInputCalldata::List(vec![
-                            "Benchmark.address".to_owned(),
-                            format!("{full}.address"),
-                        ]),
-                        value: None,
-                        storage: HashMap::new(),
-                        expected: Some(
-                            MatterLabsCaseInputExpected::successful_evm_interpreter_benchmark(),
+                            MatterLabsCaseInputExpected::successful_evm_interpreter_benchmark(exception),
                         ),
                     },
                 ],
-                expected: MatterLabsCaseInputExpected::successful_evm_interpreter_benchmark(),
+                expected: MatterLabsCaseInputExpected::successful_evm_interpreter_benchmark(exception),
                 ignore: false,
                 cycles: None,
             })

compiler_tester/src/test/case/input/runtime.rs

@@ -107,7 +107,7 @@ impl Runtime {
                 .return_data
                 .remove(0)
                 .unwrap_certain_as_ref()
-                .as_u64()
+                .as_u64() - EraVM::EVM_INTERPRETER_GAS_OVERHEAD
         } else {
             0
         };

compiler_tester/src/vm/eravm/mod.rs

@@ -50,6 +50,9 @@ impl EraVM {
     pub const DEFAULT_BENCHMARK_CALLER_ADDRESS: &'static str =
         "eeaffc9ff130f15d470945fd04b9017779c95dbf";
 
+    /// The extra amount of gas consumed by every call to the EVM interpreter.
+    pub const EVM_INTERPRETER_GAS_OVERHEAD: u64 = 2500;
+
     ///
     /// Creates and initializes a new EraVM instance.
     ///