Update Kakarot to v0.9.2 (#1439)

* Update kakarot to v0.9.2 * skip unvalid classes --------- Co-authored-by: GitHub Actions <[email protected]> Co-authored-by: Gregory Edison <[email protected]>
kkrt-labs · Oct 9, 2024 · 550af45 · 550af45
1 parent e90bed0
commit 550af45
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/lib/kakarot b/lib/kakarot
diff --git a/src/test_utils/katana/genesis.rs b/src/test_utils/katana/genesis.rs
@@ -150,13 +150,21 @@ impl KatanaGenesisBuilder<Uninitialized> {
         let entries = WalkDir::new(path).into_iter().filter(|e| e.is_ok() && e.as_ref().unwrap().file_type().is_file());
         let classes = entries
             .par_bridge()
-            .map(|entry| {
+            .filter_map(|entry| {
                 let path = entry.unwrap().path().to_path_buf();
                 let artifact = fs::read_to_string(&path).expect("Failed to read artifact");
                 let artifact = serde_json::from_str(&artifact).expect("Failed to parse artifact");
-                let class_hash =
-                    compute_class_hash(&artifact).inspect_err(|e| eprint!("Failed to compute class hash: {e:?}")).ok();
-                (path, GenesisClassJson { class: PathOrFullArtifact::Artifact(artifact), class_hash, name: None })
+                let class_hash = compute_class_hash(&artifact)
+                    .inspect_err(|e| eprintln!("Failed to compute class hash: {e:?} for {path:?}"))
+                    .ok()?;
+                Some((
+                    path,
+                    GenesisClassJson {
+                        class: PathOrFullArtifact::Artifact(artifact),
+                        class_hash: Some(class_hash),
+                        name: None,
+                    },
+                ))
             })
             .collect::<Vec<_>>();
 
@@ -363,7 +371,7 @@ fn compute_class_hash(class: &Value) -> Result<Felt> {
     if let Ok(sierra) = serde_json::from_value::<SierraClass>(class.clone()) {
         Ok(sierra.class_hash()?)
     } else {
-        let casm: LegacyContractClass = serde_json::from_value(class.clone()).expect("Failed to parse class code v0");
+        let casm: LegacyContractClass = serde_json::from_value(class.clone())?;
         Ok(casm.class_hash()?)
     }
 }
+3 −2		.github/workflows/ci.yml
+4 −21		.github/workflows/release.yml
+1 −1		README.md
+15 −14		deployments/starknet-mainnet/declarations.json
+10 −10		deployments/starknet-sepolia/declarations.json
+6 −30		deployments/starknet-sepolia/deployments.json
+2 −2		deployments/starknet-sepolia/kakarot_deployments.json
+12 −25		docker/deployer/Dockerfile
+1 −1		kakarot_scripts/benchmark_cairo_calls.py
+10 −2		kakarot_scripts/compile_kakarot.py
+3 −1		kakarot_scripts/constants.py
+22 −9		kakarot_scripts/deploy_kakarot.py
+38 −27		kakarot_scripts/utils/kakarot.py
+231 −99		kakarot_scripts/utils/starknet.py
+1 −1		kakarot_scripts/withdraw_accounts.py
+1 −1		tests/end_to_end/CairoPrecompiles/Pragma/test_pragma_precompile.py
+3 −5		tests/end_to_end/CairoPrecompiles/test_dual_vm_token.py
+1 −4		tests/end_to_end/EvmPrecompiles/test_evm_precompiles.py