Update TaikoL2.sol

taikoxyz · Aug 2, 2024 · baf39b1 · baf39b1
1 parent 55dbace
commit baf39b1
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/packages/protocol/contracts/L2/TaikoL2.sol b/packages/protocol/contracts/L2/TaikoL2.sol
@@ -287,24 +287,25 @@ contract TaikoL2 is EssentialContract {
         if (publicInputHash != currentPublicInputHash) revert L2_PUBLIC_INPUT_HASH_MISMATCH();
 
         // Check if the gas settings has changed
+        bool postFork = block.number >= ontakeForkHeight();
         uint64 newGasTarget = uint64(_gasIssuancePerSecond) * _basefeeAdjustmentQuotient;
-        if (newGasTarget != parentGasTarget) {
+        if (postFork && newGasTarget != parentGasTarget) {
             // adjust parentGasExcess to keep the basefee unchanged. Note that due to math
             // calculation precision, the basefee may change slightly.
             parentGasExcess =
                 Lib1559Math.adjustExcess(parentGasExcess, parentGasTarget, newGasTarget);
         }
 
         // Verify the base fee per gas is correct
-        (uint256 basefee, uint64 newGasExcess) = block.number < ontakeForkHeight()
-            ? getBasefee(_anchorBlockId, _parentGasUsed)
-            : calculateBaseFee(
+        (uint256 basefee, uint64 newGasExcess) = postFork
+            ? calculateBaseFee(
                 _gasIssuancePerSecond,
                 uint64(block.timestamp - parentTimestamp),
                 _basefeeAdjustmentQuotient,
                 parentGasExcess,
                 _parentGasUsed
-            );
+            )
+            : getBasefee(_anchorBlockId, _parentGasUsed);
 
         if (!skipFeeCheck() && block.basefee != basefee) revert L2_BASEFEE_MISMATCH();
 
@@ -319,7 +320,6 @@ contract TaikoL2 is EssentialContract {
         }
 
         // Update state variables
-
         bytes32 parentHash = blockhash(parentId);
         l2Hashes[parentId] = parentHash;