Updated merkle proof calculation

EspressoSystems · Apr 1, 2022 · 266e558 · 266e558
1 parent a084cf2
commit 266e558
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/solgen/src/bridge/Outbox.sol b/solgen/src/bridge/Outbox.sol
@@ -184,6 +184,6 @@ contract Outbox is DelegateCallAware, IOutbox {
         uint256 path,
         bytes32 item
     ) public pure returns (bytes32) {
-        return MerkleLib.calculateRoot(proof, path, keccak256(abi.encodePacked(item)));
+        return MerkleLib.calculateRoot(proof, path, item);
     }
 }
diff --git a/solgen/src/libraries/MerkleLib.sol b/solgen/src/libraries/MerkleLib.sol
@@ -49,9 +49,9 @@ library MerkleLib {
         bytes32 h = item;
         for (uint256 i = 0; i < proofItems; i++) {
             if (route % 2 == 0) {
-                h = keccak256(abi.encodePacked(nodes[i], h));
-            } else {
                 h = keccak256(abi.encodePacked(h, nodes[i]));
+            } else {
+                h = keccak256(abi.encodePacked(nodes[i], h));
             }
             route /= 2;
         }