diff --git a/Cargo.lock b/Cargo.lock index cc28d58..6770730 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -407,10 +407,10 @@ dependencies = [ [[package]] name = "cairo-lang-casm" -version = "2.7.0" -source = "git+https://github.com/starkware-libs/cairo?tag=v2.7.0#223ca99633f50809c4b574df55545b042494d8d0" +version = "2.7.1" +source = "git+https://github.com/starkware-libs/cairo?tag=v2.7.1#964a02d84c6bde5b39d4ef333eeecf7e588da135" dependencies = [ - "cairo-lang-utils 2.7.0", + "cairo-lang-utils 2.7.1", "indoc", "num-bigint", "num-traits 0.2.19", @@ -429,10 +429,10 @@ dependencies = [ [[package]] name = "cairo-lang-eq-solver" -version = "2.7.0" -source = "git+https://github.com/starkware-libs/cairo?tag=v2.7.0#223ca99633f50809c4b574df55545b042494d8d0" +version = "2.7.1" +source = "git+https://github.com/starkware-libs/cairo?tag=v2.7.1#964a02d84c6bde5b39d4ef333eeecf7e588da135" dependencies = [ - "cairo-lang-utils 2.7.0", + "cairo-lang-utils 2.7.1", "good_lp", ] @@ -463,11 +463,11 @@ dependencies = [ [[package]] name = "cairo-lang-sierra" -version = "2.7.0" -source = "git+https://github.com/starkware-libs/cairo?tag=v2.7.0#223ca99633f50809c4b574df55545b042494d8d0" +version = "2.7.1" +source = "git+https://github.com/starkware-libs/cairo?tag=v2.7.1#964a02d84c6bde5b39d4ef333eeecf7e588da135" dependencies = [ "anyhow", - "cairo-lang-utils 2.7.0", + "cairo-lang-utils 2.7.1", "const-fnv1a-hash", "convert_case", "derivative", @@ -504,13 +504,13 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-ap-change" -version = "2.7.0" -source = "git+https://github.com/starkware-libs/cairo?tag=v2.7.0#223ca99633f50809c4b574df55545b042494d8d0" +version = "2.7.1" +source = "git+https://github.com/starkware-libs/cairo?tag=v2.7.1#964a02d84c6bde5b39d4ef333eeecf7e588da135" dependencies = [ - "cairo-lang-eq-solver 2.7.0", - "cairo-lang-sierra 2.7.0", - "cairo-lang-sierra-type-size 2.7.0", - "cairo-lang-utils 2.7.0", + "cairo-lang-eq-solver 2.7.1", + "cairo-lang-sierra 2.7.1", + "cairo-lang-sierra-type-size 2.7.1", + "cairo-lang-utils 2.7.1", "itertools 0.12.1", "num-bigint", "num-traits 0.2.19", @@ -533,13 +533,13 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-gas" -version = "2.7.0" -source = "git+https://github.com/starkware-libs/cairo?tag=v2.7.0#223ca99633f50809c4b574df55545b042494d8d0" +version = "2.7.1" +source = "git+https://github.com/starkware-libs/cairo?tag=v2.7.1#964a02d84c6bde5b39d4ef333eeecf7e588da135" dependencies = [ - "cairo-lang-eq-solver 2.7.0", - "cairo-lang-sierra 2.7.0", - "cairo-lang-sierra-type-size 2.7.0", - "cairo-lang-utils 2.7.0", + "cairo-lang-eq-solver 2.7.1", + "cairo-lang-sierra 2.7.1", + "cairo-lang-sierra-type-size 2.7.1", + "cairo-lang-utils 2.7.1", "itertools 0.12.1", "num-bigint", "num-traits 0.2.19", @@ -568,16 +568,16 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-to-casm" -version = "2.7.0" -source = "git+https://github.com/starkware-libs/cairo?tag=v2.7.0#223ca99633f50809c4b574df55545b042494d8d0" +version = "2.7.1" +source = "git+https://github.com/starkware-libs/cairo?tag=v2.7.1#964a02d84c6bde5b39d4ef333eeecf7e588da135" dependencies = [ "assert_matches", - "cairo-lang-casm 2.7.0", - "cairo-lang-sierra 2.7.0", - "cairo-lang-sierra-ap-change 2.7.0", - "cairo-lang-sierra-gas 2.7.0", - "cairo-lang-sierra-type-size 2.7.0", - "cairo-lang-utils 2.7.0", + "cairo-lang-casm 2.7.1", + "cairo-lang-sierra 2.7.1", + "cairo-lang-sierra-ap-change 2.7.1", + "cairo-lang-sierra-gas 2.7.1", + "cairo-lang-sierra-type-size 2.7.1", + "cairo-lang-utils 2.7.1", "indoc", "itertools 0.12.1", "num-bigint", @@ -597,11 +597,11 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-type-size" -version = "2.7.0" -source = "git+https://github.com/starkware-libs/cairo?tag=v2.7.0#223ca99633f50809c4b574df55545b042494d8d0" +version = "2.7.1" +source = "git+https://github.com/starkware-libs/cairo?tag=v2.7.1#964a02d84c6bde5b39d4ef333eeecf7e588da135" dependencies = [ - "cairo-lang-sierra 2.7.0", - "cairo-lang-utils 2.7.0", + "cairo-lang-sierra 2.7.1", + "cairo-lang-utils 2.7.1", ] [[package]] @@ -630,13 +630,13 @@ dependencies = [ [[package]] name = "cairo-lang-starknet-classes" -version = "2.7.0" -source = "git+https://github.com/starkware-libs/cairo?tag=v2.7.0#223ca99633f50809c4b574df55545b042494d8d0" +version = "2.7.1" +source = "git+https://github.com/starkware-libs/cairo?tag=v2.7.1#964a02d84c6bde5b39d4ef333eeecf7e588da135" dependencies = [ - "cairo-lang-casm 2.7.0", - "cairo-lang-sierra 2.7.0", - "cairo-lang-sierra-to-casm 2.7.0", - "cairo-lang-utils 2.7.0", + "cairo-lang-casm 2.7.1", + "cairo-lang-sierra 2.7.1", + "cairo-lang-sierra-to-casm 2.7.1", + "cairo-lang-utils 2.7.1", "convert_case", "itertools 0.12.1", "num-bigint", @@ -667,8 +667,8 @@ dependencies = [ [[package]] name = "cairo-lang-utils" -version = "2.7.0" -source = "git+https://github.com/starkware-libs/cairo?tag=v2.7.0#223ca99633f50809c4b574df55545b042494d8d0" +version = "2.7.1" +source = "git+https://github.com/starkware-libs/cairo?tag=v2.7.1#964a02d84c6bde5b39d4ef333eeecf7e588da135" dependencies = [ "hashbrown 0.14.5", "indexmap 2.3.0", @@ -3122,7 +3122,7 @@ dependencies = [ "auto_impl", "bigdecimal", "cairo-lang-starknet-classes 2.6.4", - "cairo-lang-starknet-classes 2.7.0", + "cairo-lang-starknet-classes 2.7.1", "chrono", "clap", "clap_complete", diff --git a/Cargo.toml b/Cargo.toml index de9c243..da10b5b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ async-trait = "0.1.68" 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-0 = { package = "cairo-lang-starknet-classes", git = "https://github.com/starkware-libs/cairo", tag = "v2.7.0" } +cairo-starknet-2-7-1 = { package = "cairo-lang-starknet-classes", git = "https://github.com/starkware-libs/cairo", tag = "v2.7.1" } 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 index e2bc5f7..5772d4a 100644 --- a/src/casm.rs +++ b/src/casm.rs @@ -73,7 +73,7 @@ impl CasmArgs { Some(network) => { let auto_version = match network { Network::Sepolia | Network::SepoliaIntegration => { - CompilerVersion::V2_7_0 + CompilerVersion::V2_7_1 } Network::Mainnet => CompilerVersion::V2_6_4, }; diff --git a/src/compiler.rs b/src/compiler.rs index 66f4b5d..fb5e54d 100644 --- a/src/compiler.rs +++ b/src/compiler.rs @@ -10,9 +10,9 @@ use cairo_starknet_2_6_4::{ casm_contract_class::CasmContractClass as Cairo264CasmClass, contract_class::ContractClass as Cairo264Class, }; -use cairo_starknet_2_7_0::{ - casm_contract_class::CasmContractClass as Cairo270CasmClass, - contract_class::ContractClass as Cairo270Class, +use cairo_starknet_2_7_1::{ + casm_contract_class::CasmContractClass as Cairo271CasmClass, + contract_class::ContractClass as Cairo271Class, }; use clap::{builder::PossibleValue, ValueEnum}; use starknet::core::types::{ @@ -36,7 +36,7 @@ pub struct CompilerBinary { #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum CompilerVersion { V2_6_4, - V2_7_0, + V2_7_1, } impl BuiltInCompiler { @@ -68,13 +68,13 @@ impl BuiltInCompiler { serde_json::to_string(&casm_contract)? } - CompilerVersion::V2_7_0 => { + CompilerVersion::V2_7_1 => { // TODO: directly convert type without going through JSON - let contract_class: Cairo270Class = serde_json::from_str(&sierra_class_json)?; + let contract_class: Cairo271Class = serde_json::from_str(&sierra_class_json)?; // TODO: implement the `validate_compatible_sierra_version` call - let casm_contract = Cairo270CasmClass::from_contract_class( + let casm_contract = Cairo271CasmClass::from_contract_class( contract_class, false, MAX_BYTECODE_SIZE, @@ -142,13 +142,13 @@ impl Default for CompilerVersion { impl ValueEnum for CompilerVersion { fn value_variants<'a>() -> &'a [Self] { - &[Self::V2_6_4, Self::V2_7_0] + &[Self::V2_6_4, Self::V2_7_1] } fn to_possible_value(&self) -> Option { match self { Self::V2_6_4 => Some(PossibleValue::new("2.6.4").alias("v2.6.4")), - Self::V2_7_0 => Some(PossibleValue::new("2.7.0").alias("v2.7.0")), + Self::V2_7_1 => Some(PossibleValue::new("2.7.1").alias("v2.7.1")), } } } @@ -159,7 +159,7 @@ impl FromStr for CompilerVersion { fn from_str(s: &str) -> Result { match s { "2.6.4" | "v2.6.4" => Ok(Self::V2_6_4), - "2.7.0" | "v2.7.0" => Ok(Self::V2_7_0), + "2.7.1" | "v2.7.1" => Ok(Self::V2_7_1), _ => Err(anyhow::anyhow!("unknown version: {}", s)), } } @@ -169,7 +169,7 @@ impl Display for CompilerVersion { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { match self { CompilerVersion::V2_6_4 => write!(f, "2.6.4"), - CompilerVersion::V2_7_0 => write!(f, "2.7.0"), + CompilerVersion::V2_7_1 => write!(f, "2.7.1"), } } }