fix(sozo): handle edge case when base_class_hash is FieldElement::ZERO

dojoengine · May 17, 2024 · 01bf09d · 01bf09d
1 parent 628542f
commit 01bf09d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/crates/dojo-world/src/manifest/mod.rs b/crates/dojo-world/src/manifest/mod.rs
@@ -178,7 +178,9 @@ impl DeploymentManifest {
         self.contracts.iter_mut().for_each(|contract| {
             let previous_contract = previous.contracts.iter().find(|c| c.name == contract.name);
             if let Some(previous_contract) = previous_contract {
-                contract.inner.base_class_hash = previous_contract.inner.base_class_hash;
+                if previous_contract.inner.base_class_hash != FieldElement::ZERO {
+                    contract.inner.base_class_hash = previous_contract.inner.base_class_hash;
+                }
             }
         });
     }

diff --git a/crates/sozo/ops/src/migration/migrate.rs b/crates/sozo/ops/src/migration/migrate.rs
@@ -791,9 +791,15 @@ pub async fn update_manifests_and_abis(
     }
 
     local_manifest.contracts.iter_mut().for_each(|contract| {
-        let salt = generate_salt(&contract.name);
-        contract.inner.address =
-            Some(get_contract_address(salt, contract.inner.base_class_hash, &[], world_address));
+        if contract.inner.base_class_hash != FieldElement::ZERO {
+            let salt = generate_salt(&contract.name);
+            contract.inner.address = Some(get_contract_address(
+                salt,
+                contract.inner.base_class_hash,
+                &[],
+                world_address,
+            ));
+        }
     });
 
     // copy abi files from `abi/base` to `abi/deployments/{chain_id}` and update abi path in

diff --git a/scripts/rebuild_test_artifacts.sh b/scripts/rebuild_test_artifacts.sh