fix

taikoxyz · Jan 24, 2025 · 38b917f · 38b917f
1 parent 9b94d55
commit 38b917f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/packages/protocol/contracts/layer1/based/ForkRouter.sol b/packages/protocol/contracts/layer1/based/ForkRouter.sol
@@ -18,6 +18,7 @@ contract ForkRouter is UUPSUpgradeable, Ownable2StepUpgradeable {
     address public immutable newFork;
 
     error InvalidParams();
+    error NewForkInvalid();
     error NewForkNotActive();
     error ZeroAddress();
 
@@ -39,8 +40,12 @@ contract ForkRouter is UUPSUpgradeable, Ownable2StepUpgradeable {
         _fallback();
     }
 
-    function currentFork() public view returns (address) {
-        return IFork(newFork).isForkActive() ? newFork : oldFork;
+    function currentFork() public returns (address) {
+        (bool success, bytes memory isActive) =
+            newFork.delegatecall(abi.encodeCall(IFork.isForkActive, ()));
+
+        require(success, NewForkInvalid());
+        return abi.decode(isActive, (bool)) ? newFork : oldFork;
     }
 
     function isForkRouter() public pure returns (bool) {

diff --git a/packages/protocol/test/layer1/based/ForkRouter.t.sol b/packages/protocol/test/layer1/based/ForkRouter.t.sol
@@ -37,7 +37,7 @@ contract ForkFooA is EssentialContract, IFork {
 
     function init() external initializer {
         __Essential_init(address(0));
-        _state.a = 100;
+        _state.a = 1;
     }
 
     function setCounter(uint64 _a) external returns (uint64) {
@@ -77,7 +77,6 @@ contract ForkFooB is EssentialContract, IFork {
     }
 
     function isForkActive() external view override returns (bool) {
-        console.log("isForkActive in ForkFooB:", _state.b);
         return _state.b >= 10;
     }
 }
@@ -137,12 +136,17 @@ contract TestForkRouter is Layer1Test {
         });
 
         assertEq(ForkRouter(payable(router)).currentFork(), fork1);
-        // assertEq(ForkFooA(router).counter(), 1);
-        // assertEq(ForkFooA(router).setCounter(2), 2);
-        // assertEq(ForkFooA(router).counter(), 2);
-        // assertEq(ForkRouter(payable(router)).currentFork(), fork1);
+        assertEq(ForkFooA(router).counter(), 1);
+        assertEq(ForkFooA(router).setCounter(2), 2);
+        assertEq(ForkFooA(router).counter(), 2);
+        assertEq(ForkRouter(payable(router)).currentFork(), fork1);
+
+        assertEq(ForkFooA(router).setCounter(10), 10);
+        assertEq(ForkRouter(payable(router)).currentFork(), fork2);
+        assertEq(ForkFooA(router).setCounter(11), 11);
+        assertEq(ForkRouter(payable(router)).currentFork(), fork2);
 
-        // assertEq(ForkFooA(router).setCounter(10), 10);
-        // assertEq(ForkRouter(payable(router)).currentFork(), fork2);
+        assertEq(ForkFooA(router).setCounter(9), 9);
+        assertEq(ForkRouter(payable(router)).currentFork(), fork1);
     }
 }