Merge branch 'fix/tree-openzeppelin-compliant' into feat/verify-agg-proof-on-chain

Author: MarcosNicolau

aggregation_mode/aggregation_programs/risc0/src/lib.rs

@@ -42,9 +42,13 @@ impl IsMerkleTreeBackend for Risc0ImageIdAndPubInputs {
 
     fn hash_new_parent(child_1: &Self::Node, child_2: &Self::Node) -> Self::Node {
         let mut hasher = Keccak::v256();
-        hasher.update(child_1);
-        hasher.update(child_2);
-
+        if child_1 < child_2 {
+            hasher.update(child_1);
+            hasher.update(child_2);
+        } else {
+            hasher.update(child_2);
+            hasher.update(child_1);
+        }
         let mut hash = [0u8; 32];
         hasher.finalize(&mut hash);
         hash

aggregation_mode/aggregation_programs/sp1/src/lib.rs

@@ -39,8 +39,13 @@ impl IsMerkleTreeBackend for SP1VkAndPubInputs {
 
     fn hash_new_parent(child_1: &Self::Node, child_2: &Self::Node) -> Self::Node {
         let mut hasher = Keccak256::new();
-        hasher.update(child_1);
-        hasher.update(child_2);
+        if child_1 < child_2 {
+            hasher.update(child_1);
+            hasher.update(child_2);
+        } else {
+            hasher.update(child_2);
+            hasher.update(child_1);
+        }
         hasher.finalize().into()
     }
 }

aggregation_mode/programs_ids.json

@@ -1,4 +1,4 @@
 {
-  "risc0_image_id": "0xb0ce0665805c4219d134845b74be6f1f97ab74dbbc1b341b73af4068d33bc1b0",
-  "sp1_vk_hash": "0x0035279b39b0a20aac302dd3c569f3a6324a00acc1b8e864af9e3a5fbf453b69"
-}
+  "risc0_image_id": "0x8bb4145379d717fd7e3921751a2060246445ef290cdad782884180861cf0a3e8",
+  "sp1_vk_hash": "0x008ad92d4c564c912ad93d8660bf67a8d2e9088aa942da4e605a5e8c4383c384"
+}

aggregation_mode/src/aggregators/mod.rs

@@ -152,8 +152,13 @@ impl IsMerkleTreeBackend for AlignedProof {
 
     fn hash_new_parent(child_1: &Self::Node, child_2: &Self::Node) -> Self::Node {
         let mut hasher = Keccak256::new();
-        hasher.update(child_1);
-        hasher.update(child_2);
+        if child_1 < child_2 {
+            hasher.update(child_1);
+            hasher.update(child_2);
+        } else {
+            hasher.update(child_2);
+            hasher.update(child_1);
+        }
         hasher.finalize().into()
     }
 }

batcher/aligned-sdk/src/sdk/aggregation/types.rs

@@ -73,11 +73,16 @@ impl IsMerkleTreeBackend for Hash32 {
     fn hash_data(leaf: &Self::Data) -> Self::Node {
         leaf.0
     }
-
+    
     fn hash_new_parent(child_1: &Self::Node, child_2: &Self::Node) -> Self::Node {
         let mut hasher = Keccak256::new();
-        hasher.update(child_1);
-        hasher.update(child_2);
+        if child_1 < child_2 {
+            hasher.update(child_1);
+            hasher.update(child_2);
+        } else {
+            hasher.update(child_2);
+            hasher.update(child_1);
+        }
         hasher.finalize().into()
     }
 }