Fix BNB fork issue

The code has been refactored to create forks after the initialization process rather than before, allowing proper configuration of state variables for each chain. Additional token and pool validations have been introduced for enhanced reliability. This update fixed an issue with initiating forks in BNB, and the 'verifyTicks' and 'verifyPosition' methods now have a 'view' visibility specifier for better encapsulation.
Aperture-Finance · Apr 3, 2024 · 6e768eb · 6e768eb
1 parent 18b0ec1
commit 6e768eb
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 24 deletions.
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/test/foundry/Base.t.sol b/test/foundry/Base.t.sol
@@ -56,44 +56,38 @@ abstract contract BaseTest is
     uint256 internal token1Unit;
     int24 internal tickSpacing;
 
-    // Configure state variables for each chain before creating a fork
-    function initBeforeFork() internal returns (string memory chainAlias, uint256 blockNumber) {
+    // Configure state variables for each chain after creating a fork
+    function initAfterFork() internal {
+        factory = npm.factory();
+        WETH = npm.WETH9();
+        (token0, token1) = (WETH < USDC).switchIf(USDC, WETH);
+        pool = IUniswapV3Factory(factory).getPool(token0, token1, fee);
+        tickSpacing = V3PoolCallee.wrap(pool).tickSpacing();
+        token0Unit = 10 ** IERC20Metadata(token0).decimals();
+        token1Unit = 10 ** IERC20Metadata(token1).decimals();
+    }
+
+    function setUp() public virtual {
         if (chainId == 0) {
             chainId = vm.envOr("CHAIN_ID", uint256(1));
         }
-        chainAlias = getChain(chainId).chainAlias;
+        string memory chainAlias = getChain(chainId).chainAlias;
         // Configuration for each chain
         if (chainId == 1) {
-            blockNumber = 17000000;
+            vm.createSelectFork(chainAlias, 17000000);
             USDC = 0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48;
             npm = dex == DEX.PancakeSwapV3
                 ? INPM(0x46A15B0b27311cedF172AB29E4f4766fbE7F4364)
                 : INPM(0xC36442b4a4522E871399CD717aBDD847Ab11FE88);
         } else if (chainId == 56) {
-            blockNumber = 37460000;
+            vm.createSelectFork(chainAlias);
             USDC = 0x8AC76a51cc950d9822D68b83fE1Ad97B32Cd580d;
             npm = dex == DEX.PancakeSwapV3
                 ? INPM(0x46A15B0b27311cedF172AB29E4f4766fbE7F4364)
                 : INPM(0x7b8A01B39D58278b5DE7e48c8449c9f4F5170613);
         } else {
             revert("Unsupported chain");
         }
-    }
-
-    // Configure state variables for each chain after creating a fork
-    function initAfterFork() internal {
-        factory = npm.factory();
-        WETH = npm.WETH9();
-        (token0, token1) = (WETH < USDC).switchIf(USDC, WETH);
-        pool = IUniswapV3Factory(factory).getPool(token0, token1, fee);
-        tickSpacing = V3PoolCallee.wrap(pool).tickSpacing();
-        token0Unit = 10 ** IERC20Metadata(token0).decimals();
-        token1Unit = 10 ** IERC20Metadata(token1).decimals();
-    }
-
-    function setUp() public virtual {
-        (string memory chainAlias, uint256 blockNumber) = initBeforeFork();
-        vm.createSelectFork(chainAlias, blockNumber);
         initAfterFork();
         vm.label(WETH, "WETH");
         vm.label(USDC, "USDC");

diff --git a/test/foundry/PositionLens.t.sol b/test/foundry/PositionLens.t.sol
@@ -88,7 +88,7 @@ contract PositionLensTest is BaseTest {
         assertEq(collect1, amount1);
     }
 
-    function verifyPosition(PositionState memory pos) internal {
+    function verifyPosition(PositionState memory pos) internal view {
         {
             assertEq(pos.owner, npm.ownerOf(pos.tokenId), "owner");
             (, , address token0, , uint24 fee, int24 tickLower, , uint128 liquidity, , , , ) = npm.positions(

diff --git a/test/foundry/TickLens.t.sol b/test/foundry/TickLens.t.sol
@@ -7,7 +7,7 @@ import "contracts/EphemeralGetPopulatedTicksInRange.sol";
 import "./Base.t.sol";
 
 contract TickLensTest is BaseTest, PoolUtils {
-    function verifyTicks(PopulatedTick[] memory populatedTicks) internal {
+    function verifyTicks(PopulatedTick[] memory populatedTicks) internal view {
         for (uint256 i; i < populatedTicks.length; ++i) {
             PopulatedTick memory populatedTick = populatedTicks[i];
             (
+1 −0		.gitattributes
+0 −3		.gitmodules
+1 −1		README.md
+1 −1		foundry.toml
+0 −1		lib/ds-test
+1 −1		package.json
+635 −0		scripts/vm.py
+518 −225		src/StdAssertions.sol
+8 −2		src/StdChains.sol
+7 −11		src/StdJson.sol
+201 −106		src/StdStorage.sol
+179 −0		src/StdToml.sol
+4 −4		src/Test.sol
+1,286 −469		src/Vm.sol
+51 −33		src/mocks/MockERC20.sol
+46 −32		src/mocks/MockERC721.sol
+39 −909		test/StdAssertions.t.sol
+29 −24		test/StdChains.t.sol
+18 −10		test/StdCheats.t.sol
+3 −1		test/StdError.t.sol
+49 −0		test/StdJson.t.sol
+8 −8		test/StdMath.t.sol
+159 −11		test/StdStorage.t.sol
+49 −0		test/StdToml.t.sol
+20 −20		test/StdUtils.t.sol
+3 −3		test/Vm.t.sol
+8 −0		test/fixtures/test.json
+6 −0		test/fixtures/test.toml
+1 −1		test/mocks/MockERC20.t.sol
+1 −1		test/mocks/MockERC721.t.sol