INVARIANT TEST

.github/workflows/ci.yml

@@ -11,7 +11,6 @@ env:
   MAINNET_RPC_URL: ${{ secrets.MAINNET_RPC_URL }}
   FOUNDRY_PROFILE: ci
 
-
 jobs:
   lint:
     runs-on: ubuntu-latest
@@ -54,7 +53,6 @@ jobs:
           echo "✅ Passed" >> $GITHUB_STEP_SUMMARY
 
   test:
-    needs: ["lint", "build"]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -67,14 +65,8 @@ jobs:
       - name: Show the Foundry config
         run: "forge config"
 
-      - name: Generate a fuzz seed that changes weekly to avoid burning through RPC allowance
-        run: >
-          echo "FOUNDRY_FUZZ_SEED=$(
-            echo $(($EPOCHSECONDS - $EPOCHSECONDS % 604800))
-          )" >> $GITHUB_ENV
-
       - name: Run tests
-        run: forge test -vvv --gas-report
+        run: forge test -vvv --gas-report --color always
 
       - name: Add test summary
         run: |

.gitmodules

@@ -4,9 +4,6 @@
 [submodule "lib/openzeppelin-contracts"]
 	path = lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
-[submodule "lib/v4-core"]
-	path = lib/v4-core
-	url = https://github.com/Uniswap/v4-core
 [submodule "lib/chimera"]
 	path = lib/chimera
 	url = https://github.com/Recon-Fuzz/chimera

foundry.toml

@@ -12,7 +12,7 @@ chain_id = 99
 block_timestamp = 2592000
 
 [profile.ci.fuzz]
-runs = 5000
+runs = 500
 
 [profile.default.fuzz]
 runs = 100

script/DeploySepolia.s.sol

@@ -2,59 +2,48 @@
 pragma solidity ^0.8.13;
 
 import {Script} from "forge-std/Script.sol";
-import {MockERC20} from "forge-std/mocks/MockERC20.sol";
 
-import {PoolManager, Deployers, Hooks} from "v4-core/test/utils/Deployers.sol";
 import {ICurveStableswapFactoryNG} from "../src/interfaces/ICurveStableswapFactoryNG.sol";
 import {ICurveStableswapNG} from "../src/interfaces/ICurveStableswapNG.sol";
 import {ILiquidityGauge} from "./../src/interfaces/ILiquidityGauge.sol";
 
 import {IGovernance} from "../src/interfaces/IGovernance.sol";
 
 import {Governance} from "../src/Governance.sol";
-import {UniV4Donations} from "../src/UniV4Donations.sol";
 import {CurveV2GaugeRewards} from "../src/CurveV2GaugeRewards.sol";
-import {Hooks} from "../src/utils/BaseHook.sol";
 
+import {MockERC20Tester} from "../test/mocks/MockERC20Tester.sol";
 import {MockStakingV1} from "../test/mocks/MockStakingV1.sol";
+import {MockStakingV1Deployer} from "../test/mocks/MockStakingV1Deployer.sol";
 import {HookMiner} from "./utils/HookMiner.sol";
 
-contract DeploySepoliaScript is Script, Deployers {
+contract DeploySepoliaScript is Script, MockStakingV1Deployer {
     // Environment Constants
-    MockERC20 private lqty;
-    MockERC20 private bold;
-    address private stakingV1;
-    MockERC20 private usdc;
+    MockERC20Tester private lqty;
+    MockERC20Tester private bold;
+    MockStakingV1 private stakingV1;
+    MockERC20Tester private usdc;
 
-    PoolManager private constant poolManager = PoolManager(0xE8E23e97Fa135823143d6b9Cba9c699040D51F70);
     ICurveStableswapFactoryNG private constant curveFactory =
         ICurveStableswapFactoryNG(address(0xfb37b8D939FFa77114005e61CFc2e543d6F49A81));
 
     // Governance Constants
     uint128 private constant REGISTRATION_FEE = 100e18;
     uint128 private constant REGISTRATION_THRESHOLD_FACTOR = 0.001e18;
     uint128 private constant UNREGISTRATION_THRESHOLD_FACTOR = 3e18;
-    uint16 private constant REGISTRATION_WARM_UP_PERIOD = 4;
     uint16 private constant UNREGISTRATION_AFTER_EPOCHS = 4;
     uint128 private constant VOTING_THRESHOLD_FACTOR = 0.03e18;
     uint88 private constant MIN_CLAIM = 500e18;
     uint88 private constant MIN_ACCRUAL = 1000e18;
     uint32 private constant EPOCH_DURATION = 604800;
     uint32 private constant EPOCH_VOTING_CUTOFF = 518400;
 
-    // UniV4Donations Constants
-    uint256 private immutable VESTING_EPOCH_START = block.timestamp;
-    uint256 private constant VESTING_EPOCH_DURATION = 7 days;
-    uint24 private constant FEE = 400;
-    int24 constant MAX_TICK_SPACING = 32767;
-
     // CurveV2GaugeRewards Constants
     uint256 private constant DURATION = 7 days;
 
     // Contracts
     Governance private governance;
     address[] private initialInitiatives;
-    UniV4Donations private uniV4Donations;
     CurveV2GaugeRewards private curveV2GaugeRewards;
     ICurveStableswapNG private curvePool;
     ILiquidityGauge private gauge;
@@ -71,73 +60,33 @@ contract DeploySepoliaScript is Script, Deployers {
     }
 
     function deployEnvironment() private {
-        lqty = deployMockERC20("Liquity", "LQTY", 18);
-        bold = deployMockERC20("Bold", "BOLD", 18);
-        usdc = deployMockERC20("USD Coin", "USDC", 6);
-        stakingV1 = address(new MockStakingV1(address(lqty)));
+        (stakingV1, lqty,) = deployMockStakingV1();
+        bold = new MockERC20Tester("Bold", "BOLD");
+        usdc = new MockERC20Tester("USD Coin", "USDC");
     }
 
     function deployGovernance() private {
         governance = new Governance(
             address(lqty),
             address(bold),
-            stakingV1,
+            address(stakingV1),
             address(bold),
             IGovernance.Configuration({
                 registrationFee: REGISTRATION_FEE,
                 registrationThresholdFactor: REGISTRATION_THRESHOLD_FACTOR,
                 unregistrationThresholdFactor: UNREGISTRATION_THRESHOLD_FACTOR,
-                registrationWarmUpPeriod: REGISTRATION_WARM_UP_PERIOD,
                 unregistrationAfterEpochs: UNREGISTRATION_AFTER_EPOCHS,
                 votingThresholdFactor: VOTING_THRESHOLD_FACTOR,
                 minClaim: MIN_CLAIM,
                 minAccrual: MIN_ACCRUAL,
-                epochStart: uint32(block.timestamp - VESTING_EPOCH_START),
+                epochStart: block.timestamp - EPOCH_DURATION,
                 /// @audit Ensures that `initialInitiatives` can be voted on
                 epochDuration: EPOCH_DURATION,
                 epochVotingCutoff: EPOCH_VOTING_CUTOFF
             }),
             deployer,
             initialInitiatives
         );
-        assert(governance == uniV4Donations.governance());
-    }
-
-    function deployUniV4Donations(uint256 _nonce) private {
-        address gov = address(vm.computeCreateAddress(deployer, _nonce));
-        uint160 flags = uint160(Hooks.AFTER_INITIALIZE_FLAG | Hooks.AFTER_ADD_LIQUIDITY_FLAG);
-
-        (, bytes32 salt) = HookMiner.find(
-            0x4e59b44847b379578588920cA78FbF26c0B4956C,
-            // address(this),
-            flags,
-            type(UniV4Donations).creationCode,
-            abi.encode(
-                gov,
-                address(bold),
-                address(lqty),
-                block.timestamp,
-                EPOCH_DURATION,
-                address(poolManager),
-                address(usdc),
-                FEE,
-                MAX_TICK_SPACING
-            )
-        );
-
-        uniV4Donations = new UniV4Donations{salt: salt}(
-            gov,
-            address(bold),
-            address(lqty),
-            block.timestamp,
-            EPOCH_DURATION,
-            address(poolManager),
-            address(usdc),
-            FEE,
-            MAX_TICK_SPACING
-        );
-
-        initialInitiatives.push(address(uniV4Donations));
     }
 
     function deployCurveV2GaugeRewards(uint256 _nonce) private {
@@ -176,7 +125,6 @@ contract DeploySepoliaScript is Script, Deployers {
     function run() public {
         vm.startBroadcast(privateKey);
         deployEnvironment();
-        deployUniV4Donations(nonce + 8);
         deployGovernance();
         vm.stopBroadcast();
     }