Add_perp_and_dex_w_bitwise_layouts (#2067)

Author: YairVaknin-starkware

vm/src/types/instance_definitions/builtins_instance_def.rs

@@ -282,6 +282,38 @@ impl BuiltinsInstanceDef {
             mul_mod,
         }
     }
+
+    pub(crate) fn perpetual() -> BuiltinsInstanceDef {
+        BuiltinsInstanceDef {
+            output: true,
+            pedersen: Some(PedersenInstanceDef::new(Some(32))),
+            range_check: Some(RangeCheckInstanceDef::new(Some(16))),
+            ecdsa: Some(EcdsaInstanceDef::new(Some(2048))),
+            bitwise: None,
+            ec_op: None,
+            keccak: None,
+            poseidon: None,
+            range_check96: None,
+            add_mod: None,
+            mul_mod: None,
+        }
+    }
+
+    pub(crate) fn dex_with_bitwise() -> BuiltinsInstanceDef {
+        BuiltinsInstanceDef {
+            output: true,
+            pedersen: Some(PedersenInstanceDef::default()),
+            range_check: Some(RangeCheckInstanceDef::default()),
+            ecdsa: Some(EcdsaInstanceDef::default()),
+            bitwise: Some(BitwiseInstanceDef::new(Some(64))),
+            ec_op: None,
+            keccak: None,
+            poseidon: None,
+            range_check96: None,
+            add_mod: None,
+            mul_mod: None,
+        }
+    }
 }
 
 #[cfg(test)]

vm/src/types/layout.rs

@@ -169,6 +169,30 @@ impl CairoLayout {
             builtins: BuiltinsInstanceDef::dynamic(params),
         }
     }
+
+    pub(crate) fn perpetual_instance() -> CairoLayout {
+        CairoLayout {
+            name: LayoutName::perpetual,
+            rc_units: 4,
+            cpu_component_step: DEFAULT_CPU_COMPONENT_STEP,
+            memory_units_per_step: DEFAULT_MEMORY_UNITS_PER_STEP,
+            builtins: BuiltinsInstanceDef::perpetual(),
+            public_memory_fraction: 4,
+            diluted_pool_instance_def: None,
+        }
+    }
+
+    pub(crate) fn dex_with_bitwise_instance() -> CairoLayout {
+        CairoLayout {
+            name: LayoutName::dex_with_bitwise,
+            rc_units: 4,
+            cpu_component_step: DEFAULT_CPU_COMPONENT_STEP,
+            memory_units_per_step: DEFAULT_MEMORY_UNITS_PER_STEP,
+            builtins: BuiltinsInstanceDef::dex_with_bitwise(),
+            public_memory_fraction: 4,
+            diluted_pool_instance_def: Some(DilutedPoolInstanceDef::new(2, 4, 16)),
+        }
+    }
 }
 
 #[cfg(feature = "test_utils")]
@@ -496,6 +520,31 @@ mod tests {
         );
     }
 
+    #[test]
+    fn get_perpetual_instance() {
+        let layout = CairoLayout::perpetual_instance();
+        let builtins = BuiltinsInstanceDef::perpetual();
+        assert_eq!(layout.name, LayoutName::perpetual);
+        assert_eq!(layout.rc_units, 4);
+        assert_eq!(layout.builtins, builtins);
+        assert_eq!(layout.public_memory_fraction, 4);
+        assert_eq!(layout.diluted_pool_instance_def, None);
+    }
+
+    #[test]
+    fn get_dex_with_bitwise_instance() {
+        let layout = CairoLayout::dex_with_bitwise_instance();
+        let builtins = BuiltinsInstanceDef::dex_with_bitwise();
+        assert_eq!(layout.name, LayoutName::dex_with_bitwise);
+        assert_eq!(layout.rc_units, 4);
+        assert_eq!(layout.builtins, builtins);
+        assert_eq!(layout.public_memory_fraction, 4);
+        assert_eq!(
+            layout.diluted_pool_instance_def,
+            Some(DilutedPoolInstanceDef::new(2, 4, 16))
+        );
+    }
+
     #[test]
     fn get_dynamic_instance() {
         // dummy cairo layout params

vm/src/types/layout_name.rs

@@ -22,6 +22,8 @@ pub enum LayoutName {
     all_cairo,
     dynamic,
     all_cairo_stwo,
+    perpetual,
+    dex_with_bitwise,
 }
 
 impl LayoutName {
@@ -39,6 +41,8 @@ impl LayoutName {
             LayoutName::all_cairo => "all_cairo",
             LayoutName::dynamic => "dynamic",
             LayoutName::all_cairo_stwo => "all_cairo_stwo",
+            LayoutName::perpetual => "perpetual",
+            LayoutName::dex_with_bitwise => "dex_with_bitwise",
         }
     }
 }
@@ -65,6 +69,8 @@ impl ValueEnum for LayoutName {
             Self::all_cairo,
             Self::dynamic,
             Self::all_cairo_stwo,
+            Self::perpetual,
+            Self::dex_with_bitwise,
         ]
     }
 

vm/src/vm/runners/cairo_runner.rs

@@ -191,6 +191,8 @@ impl CairoRunner {
             LayoutName::all_cairo => CairoLayout::all_cairo_instance(),
             LayoutName::all_cairo_stwo => CairoLayout::all_cairo_stwo_instance(),
             LayoutName::all_solidity => CairoLayout::all_solidity_instance(),
+            LayoutName::perpetual => CairoLayout::perpetual_instance(),
+            LayoutName::dex_with_bitwise => CairoLayout::dex_with_bitwise_instance(),
             LayoutName::dynamic => {
                 let params =
                     dynamic_layout_params.ok_or(RunnerError::MissingDynamicLayoutParams)?;