properly encode invalid instruction cost

matter-labs · Dec 11, 2023 · f08de5b · f08de5b
1 parent 7d43fd4
commit f08de5b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/addressing_modes.rs b/src/addressing_modes.rs
@@ -65,6 +65,7 @@ pub struct Arguments {
 
 pub(crate) const L1_MESSAGE_COST: u32 = 156250;
 pub(crate) const SSTORE_COST: u32 = 3501;
+pub(crate) const INVALID_INSTRUCTION_COST: u32 = 4294967295;
 
 impl Arguments {
     pub fn new(predicate: Predicate, gas_cost: u32) -> Self {
@@ -82,7 +83,8 @@ impl Arguments {
         match x {
             L1_MESSAGE_COST => 1,
             SSTORE_COST => 2,
-            1 | 2 => panic!("Reserved gas cost values overlap with actual gas costs"),
+            INVALID_INSTRUCTION_COST => 3,
+            1 | 2 | 3 => panic!("Reserved gas cost values overlap with actual gas costs"),
             x => x.try_into().expect("Gas cost doesn't fit into 8 bits"),
         }
     }

diff --git a/src/instruction_handlers/ret.rs b/src/instruction_handlers/ret.rs
@@ -1,6 +1,6 @@
 use super::call::get_far_call_arguments;
 use crate::{
-    addressing_modes::{Arguments, Immediate1, Register1, Source},
+    addressing_modes::{Arguments, Immediate1, Register1, Source, INVALID_INSTRUCTION_COST},
     predication::Flags,
     rollback::Rollback,
     state::{ExecutionEnd, InstructionResult, Panic},
@@ -159,7 +159,7 @@ impl Instruction {
     pub fn from_invalid() -> Self {
         Self {
             handler: invalid_instruction,
-            arguments: Arguments::new(Predicate::Always, 4294967295),
+            arguments: Arguments::new(Predicate::Always, INVALID_INSTRUCTION_COST),
         }
     }
 }