refactor(protocol): avoid memory copy in _getInstance (#13215)

taikoxyz · Feb 26, 2023 · 72f9c1d · 72f9c1d
1 parent 9804099
commit 72f9c1d
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 26 deletions.
diff --git a/packages/protocol/contracts/L1/libs/LibProving.sol b/packages/protocol/contracts/L1/libs/LibProving.sol
@@ -454,21 +454,16 @@ library LibProving {
 
     function _getInstance(
         Evidence memory evidence
-    ) internal pure returns (bytes32 instance) {
-        bytes[] memory headerRLPItemsList = LibBlockHeader
-            .getBlockHeaderRLPItemsList(evidence.header);
-        bytes[] memory instanceRLPItemsList = new bytes[](
-            headerRLPItemsList.length + 2
+    ) internal pure returns (bytes32) {
+        bytes[] memory list = LibBlockHeader.getBlockHeaderRLPItemsList(
+            evidence.header,
+            2
         );
 
-        for (uint256 i; i < headerRLPItemsList.length; ++i) {
-            instanceRLPItemsList[i] = headerRLPItemsList[i];
-        }
-        instanceRLPItemsList[headerRLPItemsList.length] = LibRLPWriter
-            .writeAddress(evidence.prover);
-        instanceRLPItemsList[headerRLPItemsList.length + 1] = LibRLPWriter
-            .writeHash(evidence.meta.txListHash);
+        uint256 len = list.length;
+        list[len - 2] = LibRLPWriter.writeAddress(evidence.prover);
+        list[len - 1] = LibRLPWriter.writeHash(evidence.meta.txListHash);
 
-        instance = keccak256(LibRLPWriter.writeList(instanceRLPItemsList));
+        return keccak256(LibRLPWriter.writeList(list));
     }
 }
diff --git a/packages/protocol/contracts/libs/LibBlockHeader.sol b/packages/protocol/contracts/libs/LibBlockHeader.sol
@@ -35,20 +35,21 @@ library LibBlockHeader {
         BlockHeader memory header
     ) internal pure returns (bytes32) {
         bytes memory rlpHeader = LibRLPWriter.writeList(
-            getBlockHeaderRLPItemsList(header)
+            getBlockHeaderRLPItemsList(header, 0)
         );
         return keccak256(rlpHeader);
     }
 
     function getBlockHeaderRLPItemsList(
-        BlockHeader memory header
+        BlockHeader memory header,
+        uint256 extraCapacity
     ) internal pure returns (bytes[] memory list) {
         if (header.baseFeePerGas == 0) {
             // non-EIP11559 transaction
-            list = new bytes[](15);
+            list = new bytes[](15 + extraCapacity);
         } else {
             // EIP1159 transaction
-            list = new bytes[](16);
+            list = new bytes[](16 + extraCapacity);
         }
         list[0] = LibRLPWriter.writeHash(header.parentHash);
         list[1] = LibRLPWriter.writeHash(header.ommersHash);

diff --git a/packages/protocol/contracts/test/libs/TestLibProving.sol b/packages/protocol/contracts/test/libs/TestLibProving.sol
@@ -224,14 +224,6 @@ library TestLibProving {
 
         if (!skipZKPVerification) {
             for (uint256 i; i < config.zkProofsPerBlock; ++i) {
-                bytes32 instance = keccak256(
-                    abi.encode(
-                        blockHash,
-                        evidence.prover,
-                        evidence.meta.txListHash
-                    )
-                );
-
                 if (
                     !proofVerifier.verifyZKP({
                         verifierId: string(
@@ -243,7 +235,7 @@ library TestLibProving {
                             )
                         ),
                         zkproof: evidence.proofs[i],
-                        instance: instance
+                        instance: _getInstance(evidence)
                     })
                 ) revert L1_ZKP();
             }
@@ -438,4 +430,19 @@ library TestLibProving {
         BlockHeader memory header,
         TaikoData.BlockMetadata memory meta
     ) private pure {}
+
+    function _getInstance(
+        Evidence memory evidence
+    ) internal pure returns (bytes32) {
+        bytes[] memory list = LibBlockHeader.getBlockHeaderRLPItemsList(
+            evidence.header,
+            2
+        );
+
+        uint256 len = list.length;
+        list[len - 2] = LibRLPWriter.writeAddress(evidence.prover);
+        list[len - 1] = LibRLPWriter.writeHash(evidence.meta.txListHash);
+
+        return keccak256(LibRLPWriter.writeList(list));
+    }
 }