fix(protocol): fix bug in LibBytesUtils.toBytes32 (TKO-07) (#15565)

Co-authored-by: Brecht Devos <Brechtp.Devos@gmail.com>
taikoxyz · Jan 29, 2024 · 6def8a3 · 6def8a3
1 parent b2176d3
commit 6def8a3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 18 deletions.
diff --git a/packages/protocol/contracts/thirdparty/LibBytesUtils.sol b/packages/protocol/contracts/thirdparty/LibBytesUtils.sol
@@ -111,19 +111,6 @@ library LibBytesUtils {
         return slice(_bytes, _start, _bytes.length - _start);
     }
 
-    function toBytes32(bytes memory _bytes) internal pure returns (bytes32) {
-        if (_bytes.length < 32) {
-            bytes32 ret;
-            assembly {
-                ret := mload(add(_bytes, 32))
-            }
-            return ret;
-        }
-
-        return abi.decode(_bytes, (bytes32)); // will truncate if input length >
-            // 32 bytes
-    }
-
     function toNibbles(bytes memory _bytes) internal pure returns (bytes memory) {
         bytes memory nibbles = new bytes(_bytes.length * 2);
 

diff --git a/packages/protocol/contracts/thirdparty/LibMerkleTrie.sol b/packages/protocol/contracts/thirdparty/LibMerkleTrie.sol
@@ -171,10 +171,7 @@ library LibMerkleTrie {
                 );
             } else {
                 // Nodes smaller than 31 bytes aren't hashed.
-                require(
-                    LibBytesUtils.toBytes32(currentNode.encoded) == currentNodeID,
-                    "Invalid internal node hash"
-                );
+                require(bytes32(currentNode.encoded) == currentNodeID, "Invalid internal node hash");
             }
 
             if (currentNode.decoded.length == BRANCH_NODE_LENGTH) {
@@ -275,7 +272,7 @@ library LibMerkleTrie {
             nodeID = LibRLPReader.readBytes(_node);
         }
 
-        return LibBytesUtils.toBytes32(nodeID);
+        return bytes32(nodeID);
     }
 
     /**