feat(protocol): Add parent's metaHash to assignment (#15498)

Co-authored-by: David <david@taiko.xyz>
taikoxyz · Jan 18, 2024 · 267e9a0 · 267e9a0 · vercel · Jan 18, 2024
1 parent 99dd1d2
commit 267e9a0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/packages/protocol/contracts/L1/hooks/AssignmentHook.sol b/packages/protocol/contracts/L1/hooks/AssignmentHook.sol
@@ -33,6 +33,7 @@ contract AssignmentHook is EssentialContract, IHook {
         uint64 maxBlockId;
         uint64 maxProposedIn;
         bytes32 metaHash;
+        bytes32 parentMetaHash;
         TaikoData.TierFee[] tierFees;
         bytes signature;
     }
@@ -82,6 +83,7 @@ contract AssignmentHook is EssentialContract, IHook {
         if (
             block.timestamp > assignment.expiry
                 || assignment.metaHash != 0 && blk.metaHash != assignment.metaHash
+                || assignment.parentMetaHash != 0 && meta.parentMetaHash != assignment.parentMetaHash
                 || assignment.maxBlockId != 0 && meta.id > assignment.maxBlockId
                 || assignment.maxProposedIn != 0 && block.number > assignment.maxProposedIn
         ) {
@@ -161,6 +163,7 @@ contract AssignmentHook is EssentialContract, IHook {
                 taikoL1Address,
                 address(this),
                 assignment.metaHash,
+                assignment.parentMetaHash,
                 blobHash,
                 assignment.feeToken,
                 assignment.expiry,

diff --git a/packages/protocol/contracts/L1/libs/LibProposing.sol b/packages/protocol/contracts/L1/libs/LibProposing.sol
@@ -92,11 +92,11 @@ library LibProposing {
             revert L1_TOO_MANY_BLOCKS();
         }
 
-        TaikoData.Block storage parent =
-            state.blocks[(b.numBlocks - 1) % config.blockRingBufferSize];
+        bytes32 parentMetaHash =
+            state.blocks[(b.numBlocks - 1) % config.blockRingBufferSize].metaHash;
 
         // Check if parent block has the right meta hash
-        if (params.parentMetaHash != 0 && parent.metaHash != params.parentMetaHash) {
+        if (params.parentMetaHash != 0 && parentMetaHash != params.parentMetaHash) {
             revert L1_UNEXPECTED_PARENT();
         }
 
@@ -124,7 +124,7 @@ library LibProposing {
                 txListByteSize: 0, // to be initialized below
                 minTier: 0, // to be initialized below
                 blobUsed: txList.length == 0,
-                parentMetaHash: parent.metaHash
+                parentMetaHash: parentMetaHash
             });
         }
 

diff --git a/packages/protocol/test/L1/TaikoL1TestBase.sol b/packages/protocol/test/L1/TaikoL1TestBase.sol
@@ -199,6 +199,7 @@ abstract contract TaikoL1TestBase is TaikoTest {
             maxBlockId: 0,
             maxProposedIn: 0,
             metaHash: 0,
+            parentMetaHash: 0,
             signature: new bytes(0)
         });