feat(protocol): add ITaikoInbox.Config to ITaikoInbox.BatchInfo (#…

…19004)
taikoxyz · Feb 27, 2025 · 6afec95 · 6afec95
1 parent fa63bb3
commit 6afec95
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/packages/protocol/contracts/layer1/based/ITaikoInbox.sol b/packages/protocol/contracts/layer1/based/ITaikoInbox.sol
@@ -70,7 +70,7 @@ interface ITaikoInbox {
         // corresponds to the `_anchorStateRoot` parameter in the anchor transaction.
         // The batch's validity proof shall verify the integrity of these two values.
         bytes32 anchorBlockHash;
-        LibSharedData.BaseFeeConfig baseFeeConfig;
+        Config config;
     }
 
     /// @dev This struct holds batch metadata essential for proving the batch.

diff --git a/packages/protocol/contracts/layer1/based/TaikoInbox.sol b/packages/protocol/contracts/layer1/based/TaikoInbox.sol
@@ -165,7 +165,7 @@ abstract contract TaikoInbox is EssentialContract, ITaikoInbox, IProposeBatch, I
                 // Data for the L2 anchor transaction, shared by all blocks in the batch
                 anchorBlockId: anchorBlockId,
                 anchorBlockHash: blockhash(anchorBlockId),
-                baseFeeConfig: config.baseFeeConfig
+                config: config
             });
 
             require(info_.anchorBlockHash != 0, ZeroAnchorBlockHash());

diff --git a/packages/protocol/test/layer1/preconf/mocks/MockTaikoInbox.sol b/packages/protocol/test/layer1/preconf/mocks/MockTaikoInbox.sol
@@ -37,12 +37,28 @@ contract MockTaikoInbox is EssentialContract {
             anchorBlockId: params.anchorBlockId,
             anchorBlockHash: bytes32(0), // Mock value
             blocks: params.blocks,
-            baseFeeConfig: LibSharedData.BaseFeeConfig({
-                adjustmentQuotient: 0,
-                sharingPctg: 0,
-                gasIssuancePerSecond: 0,
-                minGasExcess: 0,
-                maxGasIssuancePerBlock: 0
+            config: ITaikoInbox.Config({
+                chainId: 0,
+                maxUnverifiedBatches: 0,
+                batchRingBufferSize: 0,
+                maxBatchesToVerify: 0,
+                blockMaxGasLimit: 0,
+                livenessBondBase: 0,
+                livenessBondPerBlock: 0,
+                stateRootSyncInternal: 0,
+                maxAnchorHeightOffset: 0,
+                baseFeeConfig: LibSharedData.BaseFeeConfig({
+                    adjustmentQuotient: 0,
+                    sharingPctg: 0,
+                    gasIssuancePerSecond: 0,
+                    minGasExcess: 0,
+                    maxGasIssuancePerBlock: 0
+                }),
+                provingWindow: 0,
+                cooldownWindow: 0,
+                maxSignalsToReceive: 0,
+                maxBlocksPerBatch: 0,
+                forkHeights: ITaikoInbox.ForkHeights({ ontake: 0, pacaya: 0, shasta: 0, unzen: 0 })
             })
         });