rebase

taikoxyz · Jan 13, 2025 · 8bf31bc · 8bf31bc
1 parent a9bee62
commit 8bf31bc
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 96 deletions.
diff --git a/packages/protocol/contracts/layer1/based/TaikoInbox.sol b/packages/protocol/contracts/layer1/based/TaikoInbox.sol
@@ -371,7 +371,7 @@ abstract contract TaikoInbox is EssentialContract, ITaikoInbox, ITaiko, IFork {
     }
 
     function isForkActive() external view override returns (bool) {
-        return state.stats2.numBlocks >= getConfigV3().forkHeights.pacaya;
+        return state.stats2.numBatches >= getConfig().forkHeights.pacaya;
     }
 
     // Public functions -------------------------------------------------------------------------

diff --git a/packages/protocol/contracts/layer1/fork/ForkManager.sol b/packages/protocol/contracts/layer1/fork/ForkManager.sol
diff --git a/packages/protocol/contracts/layer1/fork/PacayaForkManager.sol b/packages/protocol/contracts/layer1/fork/PacayaForkManager.sol