feat: upgrade cairo compiler to 2.8.2

xJonathanLEI · Sep 22, 2024 · 14ad06f · 14ad06f
1 parent db63131
commit 14ad06f
Show file tree

Hide file tree

Showing 4 changed files with 220 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,6 +13,7 @@ auto_impl = "1.1.0"
 bigdecimal = "0.4.1"
 cairo-starknet-2-6-4 = { package = "cairo-lang-starknet-classes", git = "https://github.com/starkware-libs/cairo", tag = "v2.6.4" }
 cairo-starknet-2-7-1 = { package = "cairo-lang-starknet-classes", git = "https://github.com/starkware-libs/cairo", tag = "v2.7.1" }
+cairo-starknet-2-8-2 = { package = "cairo-lang-starknet-classes", git = "https://github.com/starkware-libs/cairo", tag = "v2.8.2" }
 chrono = "0.4.26"
 clap = { version = "4.3.8", features = ["derive", "env", "string"] }
 clap_complete = "4.3.1"

diff --git a/src/casm.rs b/src/casm.rs
@@ -72,10 +72,9 @@ impl CasmArgs {
                 match network {
                     Some(network) => {
                         let auto_version = match network {
-                            Network::Sepolia | Network::SepoliaIntegration => {
-                                CompilerVersion::V2_7_1
+                            Network::Sepolia | Network::SepoliaIntegration | Network::Mainnet => {
+                                CompilerVersion::V2_8_2
                             }
-                            Network::Mainnet => CompilerVersion::V2_6_4,
                         };
 
                         eprintln!(

diff --git a/src/compiler.rs b/src/compiler.rs
@@ -14,6 +14,10 @@ use cairo_starknet_2_7_1::{
     casm_contract_class::CasmContractClass as Cairo271CasmClass,
     contract_class::ContractClass as Cairo271Class,
 };
+use cairo_starknet_2_8_2::{
+    casm_contract_class::CasmContractClass as Cairo282CasmClass,
+    contract_class::ContractClass as Cairo282Class,
+};
 use clap::{builder::PossibleValue, ValueEnum};
 use starknet::core::types::{
     contract::{CompiledClass, SierraClass},
@@ -37,6 +41,7 @@ pub struct CompilerBinary {
 pub enum CompilerVersion {
     V2_6_4,
     V2_7_1,
+    V2_8_2,
 }
 
 impl BuiltInCompiler {
@@ -69,6 +74,20 @@ impl BuiltInCompiler {
                 serde_json::to_string(&casm_contract)?
             }
             CompilerVersion::V2_7_1 => {
+                // TODO: directly convert type without going through JSON
+                let contract_class: Cairo282Class = serde_json::from_str(&sierra_class_json)?;
+
+                // TODO: implement the `validate_compatible_sierra_version` call
+
+                let casm_contract = Cairo282CasmClass::from_contract_class(
+                    contract_class,
+                    false,
+                    MAX_BYTECODE_SIZE,
+                )?;
+
+                serde_json::to_string(&casm_contract)?
+            }
+            CompilerVersion::V2_8_2 => {
                 // TODO: directly convert type without going through JSON
                 let contract_class: Cairo271Class = serde_json::from_str(&sierra_class_json)?;
 
@@ -142,7 +161,7 @@ impl Default for CompilerVersion {
 
 impl ValueEnum for CompilerVersion {
     fn value_variants<'a>() -> &'a [Self] {
-        &[Self::V2_6_4, Self::V2_7_1]
+        &[Self::V2_6_4, Self::V2_7_1, Self::V2_8_2]
     }
 
     fn to_possible_value(&self) -> Option<PossibleValue> {
@@ -159,6 +178,12 @@ impl ValueEnum for CompilerVersion {
                     .alias("2.7")
                     .alias("v2.7"),
             ),
+            Self::V2_8_2 => Some(
+                PossibleValue::new("2.8.2")
+                    .alias("v2.8.2")
+                    .alias("2.8")
+                    .alias("v2.8"),
+            ),
         }
     }
 }
@@ -170,6 +195,7 @@ impl FromStr for CompilerVersion {
         match s {
             "2.6.4" | "v2.6.4" | "2.6" | "v2.6" => Ok(Self::V2_6_4),
             "2.7.1" | "v2.7.1" | "2.7" | "v2.7" => Ok(Self::V2_7_1),
+            "2.8.2" | "v2.8.2" | "2.8" | "v2.8" => Ok(Self::V2_8_2),
             _ => Err(anyhow::anyhow!("unknown version: {}", s)),
         }
     }
@@ -180,6 +206,7 @@ impl Display for CompilerVersion {
         match self {
             CompilerVersion::V2_6_4 => write!(f, "2.6.4"),
             CompilerVersion::V2_7_1 => write!(f, "2.7.1"),
+            CompilerVersion::V2_8_2 => write!(f, "2.8.2"),
         }
     }
 }