Merge pull request #87 from NethermindEth/anshu/fixate-taiko-version

Fixate Taiko version
NethermindEth · Aug 25, 2024 · 928886f · 928886f
2 parents f1b3872 + 9611824
commit 928886f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/SmartContracts/src/avs/PreconfTaskManager.sol b/SmartContracts/src/avs/PreconfTaskManager.sol
@@ -140,7 +140,7 @@ contract PreconfTaskManager is IPreconfTaskManager, Initializable {
         address proposer = blockIdToProposer[blockId];
 
         // Pull the formalised block from Taiko
-        ITaikoL1.BlockV2 memory taikoBlock = taikoL1.getBlockV2(uint64(blockId));
+        ITaikoL1.Block memory taikoBlock = taikoL1.getBlock(uint64(blockId));
 
         if (block.timestamp - taikoBlock.proposedAt >= PreconfConstants.DISPUTE_PERIOD) {
             // Revert if the dispute window has been missed

diff --git a/SmartContracts/src/interfaces/taiko/ITaikoL1.sol b/SmartContracts/src/interfaces/taiko/ITaikoL1.sol
@@ -17,6 +17,8 @@ interface ITaikoL1 {
         bool blobUsed;
         bytes32 parentMetaHash;
         address sender;
+        uint32 blobTxListOffset;
+        uint32 blobTxListLength;
     }
 
     struct EthDeposit {
@@ -42,16 +44,17 @@ interface ITaikoL1 {
         uint64 lastUnpausedAt;
     }
 
-    struct BlockV2 {
+    struct Block {
         bytes32 metaHash;
         address assignedProver;
         uint96 livenessBond;
         uint64 blockId;
         uint64 proposedAt;
         uint64 proposedIn;
-        uint24 nextTransitionId;
-        bool livenessBondReturned;
-        uint24 verifiedTransitionId;
+        uint32 nextTransitionId;
+        uint32 verifiedTransitionId;
+        uint64 timestamp;
+        uint32 l1StateBlockNumber;
     }
 
     function proposeBlock(bytes calldata _params, bytes calldata _txList)
@@ -61,5 +64,5 @@ interface ITaikoL1 {
 
     function getStateVariables() external view returns (SlotA memory, SlotB memory);
 
-    function getBlockV2(uint64 _blockId) external view returns (BlockV2 memory blk_);
+    function getBlock(uint64 _blockId) external view returns (Block memory blk_);
 }