Use require instead of assert

hyperlane-xyz · Dec 9, 2022 · be2c3b4 · be2c3b4
1 parent 6b4dbcf
commit be2c3b4
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/multisig-ism/src/main.sw b/multisig-ism/src/main.sw
@@ -68,8 +68,13 @@ impl MultisigIsm for Contract {
         let calculated_root = StorageMerkleTree::branch_root(message.id(), metadata.proof, metadata.index);
         require(metadata.root == calculated_root, "!merkle");
 
+<<<<<<< HEAD
         let origin = message.origin();
         require(metadata.commitment() == storage.commitment.get(origin), "!commitment");
+=======
+        let commitment = metadata.commitment();
+        require(commitment == storage.commitment.get(message.origin_domain), "!commitment");
+>>>>>>> 5bcff5c (Use require instead of assert)
 
         require(metadata.threshold <= metadata.signatures.len(), "!threshold");