Merge pull request #170 from moonwell-fi/test/temporal-governor

Test/temporal governor

Author: ElliotFriedman

.github/workflows/invariant.yml

@@ -17,4 +17,4 @@ jobs:
         uses: ./.github/actions
 
       - name: Invariant Test Contracts
-        run: time forge test -vvv --match-contract xWELLOwnerHandler
+        run: time forge test -vvv --match-contract Invariant

.gitmodules

@@ -14,3 +14,6 @@
 [submodule "lib/openzeppelin-contracts-upgradeable"]
 	path = lib/openzeppelin-contracts-upgradeable
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
+[submodule "lib/wormhole"]
+	path = lib/wormhole
+	url = https://github.com/wormhole-foundation/wormhole

foundry.toml

@@ -10,6 +10,9 @@ evm_version = 'paris' # lock to paris to prevent use of push0 opcode which is no
 optimizer_runs = 1
 rpc_storage_caching = { chains = "all", endpoints = "all" }
 
+[fuzz]
+runs = 1
+
 [rpc_endpoints]
 localhost = "http://127.0.0.1:8545"
 moonriver = "https://rpc.api.moonriver.moonbeam.network"

lib/wormhole

@@ -2,8 +2,9 @@
 @openzeppelin-contracts/=lib/openzeppelin-contracts/
 @openzeppelin/=lib/openzeppelin-contracts/
 @openzeppelin-contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/
+@wormhole/=lib/wormhole/ethereum/contracts/
 @protocol=src/
 @test=test/
 @proposals=src/proposals/
 @utils/=utils/
-@zelt/=lib/zelt/
+@zelt/=lib/zelt/

remappings.txt

@@ -28,11 +28,11 @@ contract DeployTokenSale is Script {
         vm.startBroadcast(PRIVATE_KEY);
 
         address implementation = deployCode(
-            "TokenSaleDistributor.sol:TokenSaleDistributor"
+            "artifacts/foundry/TokenSaleDistributor.sol/TokenSaleDistributor.json"
         );
 
         address proxy = deployCode(
-            "TokenSaleDistributorProxy.sol:TokenSaleDistributorProxy"
+            "artifacts/foundry/TokenSaleDistributorProxy.sol/TokenSaleDistributorProxy.json"
         );
 
         ITokenSaleDistributorProxy(proxy).setPendingImplementation(

script/DeployTokenSale.s.sol

@@ -167,7 +167,9 @@ contract MultichainGovernorDeploy is Test {
         address proxyAdmin
     ) public returns (address proxy, address implementation) {
         // deploy mock implementation
-        implementation = deployCode("MockStakedWell.sol:MockStakedWell");
+        implementation = deployCode(
+            "artifacts/foundry/MockStakedWell.sol/MockStakedWell.json"
+        );
 
         // generate init calldata
         bytes memory initData = abi.encodeWithSignature(
@@ -207,7 +209,9 @@ contract MultichainGovernorDeploy is Test {
         address proxyAdmin
     ) public returns (address proxy, address implementation) {
         // deploy actual stkWELL implementation for Base
-        implementation = deployCode("StakedWell.sol:StakedWell");
+        implementation = deployCode(
+            "artifacts/foundry/StakedWell.sol/StakedWell.json"
+        );
 
         // generate init calldata
         bytes memory initData = abi.encodeWithSignature(
@@ -246,11 +250,11 @@ contract MultichainGovernorDeploy is Test {
         )
     {
         ecosystemReserveImplementation = deployCode(
-            "EcosystemReserve.sol:EcosystemReserve"
+            "artifacts/foundry/EcosystemReserve.sol/EcosystemReserve.json"
         );
 
         ecosystemReserveController = deployCode(
-            "EcosystemReserveController.sol:EcosystemReserveController"
+            "artifacts/foundry/EcosystemReserveController.sol/EcosystemReserveController.json"
         );
 
         ecosystemReserveProxy = address(

src/governance/multichain/MultichainGovernorDeploy.sol

@@ -386,19 +386,10 @@ contract mipm23 is Configs, HybridProposal, MultichainGovernorDeploy {
     }
 
     function run(Addresses addresses, address) public override {
-        vm.selectFork(moonbeamForkId);
-
-        _runMoonbeamArtemisGovernor(
-            addresses.getAddress("WORMHOLE_CORE"),
-            addresses.getAddress("ARTEMIS_GOVERNOR"),
-            addresses.getAddress("WELL"),
-            address(1000000000)
-        );
-
         vm.selectFork(baseForkId);
 
         address temporalGovernor = addresses.getAddress("TEMPORAL_GOVERNOR");
-        _runBase(temporalGovernor);
+        _runBase(addresses, temporalGovernor);
 
         // switch back to the moonbeam fork so we can run the validations
         vm.selectFork(primaryForkId());

src/proposals/mips/mip-m23/mip-m23.sol

@@ -187,7 +187,7 @@ contract mipm24 is HybridProposal, MultichainGovernorDeploy {
         vm.selectFork(baseForkId);
 
         address temporalGovernor = addresses.getAddress("TEMPORAL_GOVERNOR");
-        _runBase(temporalGovernor);
+        _runBase(addresses, temporalGovernor);
 
         // switch back to the moonbeam fork so we can run the validations
         vm.selectFork(moonbeamForkId);