Merge pull request #331 from maticnetwork/fix-merkle-patricia-library

Fix merkle patricia library

Author: jdkanani

contracts/common/lib/MerklePatriciaProof.sol

@@ -69,12 +69,12 @@ library MerklePatriciaProof {
                 );
                 pathPtr += 1;
             } else if (currentNodeList.length == 2) {
-                pathPtr += _nibblesToTraverse(
+                uint256 traversed = _nibblesToTraverse(
                     RLPReader.toBytes(currentNodeList[0]),
                     path,
                     pathPtr
                 );
-                if (pathPtr == path.length) {
+                if (pathPtr + traversed == path.length) {
                     //leaf node
                     if (
                         keccak256(RLPReader.toBytes(currentNodeList[1])) ==
@@ -87,17 +87,11 @@ library MerklePatriciaProof {
                 }
 
                 //extension node
-                if (
-                    _nibblesToTraverse(
-                        RLPReader.toBytes(currentNodeList[0]),
-                        path,
-                        pathPtr
-                    ) ==
-                    0
-                ) {
+                if (traversed == 0) {
                     return false;
                 }
 
+                pathPtr += traversed;
                 nodeKey = bytes32(RLPReader.toUintStrict(currentNodeList[1]));
             } else {
                 return false;

test/helpers/proofs.js

@@ -190,8 +190,8 @@ export function getReceiptBytes(receipt) {
     utils.toBuffer(
       receipt.status !== undefined && receipt.status != null
         ? receipt.status
-          ? 1
-          : 0
+          ? '0x1'
+          : '0x'
         : receipt.root
     ),
     utils.toBuffer(receipt.cumulativeGasUsed),

test/helpers/utils.js

@@ -326,7 +326,12 @@ export function startExit(
         ethUtils.bufferToHex(reference.receiptsRoot),
         ethUtils.bufferToHex(reference.receipt),
         ethUtils.bufferToHex(rlp.encode(reference.receiptParentNodes)),
-        ethUtils.bufferToHex(rlp.encode(reference.path)), // branch mask,
+        ethUtils.bufferToHex(
+          Buffer.concat([
+            Buffer.from('00', 'hex'),
+            reference.path
+          ])
+        ), // branch mask,
         logIndex
       ])
     ),
@@ -399,7 +404,12 @@ export function startExitForErc20PredicateLegacy(
         ethUtils.bufferToHex(reference.receiptsRoot),
         ethUtils.bufferToHex(reference.receipt),
         ethUtils.bufferToHex(rlp.encode(reference.receiptParentNodes)),
-        ethUtils.bufferToHex(rlp.encode(reference.path)), // branch mask,
+        ethUtils.bufferToHex(
+          Buffer.concat([
+            Buffer.from('00', 'hex'),
+            reference.path
+          ])
+        ), // branch mask,
         logIndex
       ])
     ),
@@ -490,7 +500,12 @@ export function buildReferenceTxPayload(input) {
     ethUtils.bufferToHex(reference.receiptsRoot),
     ethUtils.bufferToHex(reference.receipt),
     ethUtils.bufferToHex(rlp.encode(reference.receiptParentNodes)),
-    ethUtils.bufferToHex(rlp.encode(reference.path)), // branch mask,
+    ethUtils.bufferToHex(
+      Buffer.concat([
+        Buffer.from('00', 'hex'),
+        reference.path
+      ])
+    ), // branch mask,
     logIndex
   ]
 }