upgraded mode

Makefile

@@ -43,7 +43,7 @@ ft-mode-migration :; forge test --match-contract TestMigrate \
 
 ft-mode-upgrade-fork :; forge test --match-contract TestUpgradeToV110 \
 	--rpc-url https://mainnet.mode.network/ \
-	--fork-block-number 18689270 \
+	--fork-block-number 18697900 \
 	-vvvv
 
 ft-mode-sepolia-upgrade-fork :; forge test --match-contract TestUpgradeToV110 \
@@ -68,15 +68,26 @@ upgrade-mode-sepolia :; export TRY_EXECUTE=true && forge script UpgradeToV110 \
 	-vvvvv
 
 # on an anvil fork will run the upgrade script
-anvil-fork-mode :; anvil -f https://mainnet.mode.network --fork-block-number 18689270 --auto-impersonate
+anvil-fork-mode :; anvil -f https://mainnet.mode.network --fork-block-number 18697900 # --auto-impersonate
 upgrade-fork-mode :; export TRY_EXECUTE=false && forge script UpgradeToV110 \
 	--rpc-url http://localhost:8545 \
-	--sender $(SIGNER_ADDRESS) \
-	--unlocked \
+	--private-key $(DEPLOYMENT_PRIVATE_KEY) \
 	--broadcast \
 	-vvvvv
 
+upgrade-preview-mode :; export TRY_EXECUTE=true && forge script UpgradeToV110 \
+	--rpc-url https://mainnet.mode.network \
+	--private-key $(DEPLOYMENT_PRIVATE_KEY) \
+	-vvvvv
 
+upgrade-mode :; export TRY_EXECUTE=true && forge script UpgradeToV110 \
+	--rpc-url https://mainnet.mode.network \
+	--private-key $(DEPLOYMENT_PRIVATE_KEY) \
+	--broadcast \
+	--verify \
+	--verifier blockscout \
+	--verifier-url https://explorer.mode.network/api\? \
+	-vvvvv
 
 deploy-preview-mode-sepolia :; forge script DeployGauges \
   --rpc-url https://sepolia.mode.network \

script/approve.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+ETH_WHALE="0xE28842dAF2cDe94EecC81b26A436eB043454F010"
+MULTISIG="0x4315B4D2C707981f7fA51DBE91079Ea8c44e2e95"
+RPC_FLAG="--rpc-url http://localhost:8545"
+PROPOSAL_ID=2
+
+SIGNER_0="0x946138B088524414EEDaf0699BA10d7Fb5673A34"
+SIGNER_1="0xbd3eE47A1576F26454C65B96b7AbfaF8Ee9cB4a1"
+SIGNER_2="0x9395e6b95afFee7d7b2b107127Fcc9e4167A336f"
+
+cast send $SIGNER_0 --from $ETH_WHALE --unlocked --value "0.01ether" $RPC_FLAG
+cast send $SIGNER_1 --from $ETH_WHALE --unlocked --value "0.01ether" $RPC_FLAG
+cast send $SIGNER_2 --from $ETH_WHALE --unlocked --value "0.01ether" $RPC_FLAG
+
+cast send $MULTISIG --from $SIGNER_0 --unlocked "approve(uint256,bool)" $PROPOSAL_ID false $RPC_FLAG
+cast send $MULTISIG --from $SIGNER_1 --unlocked "approve(uint256,bool)" $PROPOSAL_ID false $RPC_FLAG
+cast send $MULTISIG --from $SIGNER_2 --unlocked "approve(uint256,bool)" $PROPOSAL_ID true $RPC_FLAG

script/unlock.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Load the signer address from the .env file and unlock it for use in test scripts via anvil
+SIGNER=$(grep '^SIGNER_ADDRESS=' .env | cut -d '=' -f2)
+echo "Unlocking $SIGNER"
+cast rpc --rpc-url http://localhost:8545 anvil_impersonateAccount $SIGNER
+
+ETH_WHALE="0xb4E38F1A3Bf250144364CF29076Ecd2D1f8C2329"
+cast rpc --rpc-url http://localhost:8545 anvil_impersonateAccount $ETH_WHALE
+cast send --from $ETH_WHALE --unlocked --value "10000000000000000000" $SIGNER --rpc-url http://localhost:8545

test/fork/upgradeViaMultisig.t.sol

@@ -113,94 +113,96 @@ contract TestUpgradeToV110 is Test {
         vm.stopPrank();
 
         uint proposalId;
-        IDAO.Action[] memory actions = buildActions();
+        // IDAO.Action[] memory actions = buildActions();
         if (isMainnet(network)) {
-            vm.startPrank(aragonSigners[0]);
-            uint256 aragonProposalId = _createAragonMsigProposal(actions);
+            // vm.startPrank(aragonSigners[0]);
+            // uint256 aragonProposalId = _createAragonMsigProposal(actions);
+            // vm.stopPrank();
+            vm.startPrank(0x8cDe1E4b1C03b8aA78cED50291B60E86f5dA8a39);
+            _executeAragonProposal(2);
             vm.stopPrank();
-            _executeAragonProposal(aragonProposalId);
             proposalId = PROPOSAL_ID;
         } else if (isTestnet(network)) {
-            vm.startPrank(modeSigners[0]);
-            proposalId = _buildMsigProposal(
-                actions,
-                modeSigners,
-                modeMultisig,
-                vm.envOr("TRY_EXECUTE", false)
-            );
-            vm.stopPrank();
+            // vm.startPrank(modeSigners[0]);
+            // proposalId = _buildMsigProposal(
+            //     actions,
+            //     modeSigners,
+            //     modeMultisig,
+            //     vm.envOr("TRY_EXECUTE", false)
+            // );
+            // vm.stopPrank();
         } else {
             revert("Invalid network");
         }
-
-        _signExecuteMultisigProposal(proposalId, modeSigners, modeMultisig);
-
-        // test
-        address lockImplNew = lockMode.implementation();
-        address voterImplNew = voterMode.implementation();
-        address lockBPTImplNew = lockBPT.implementation();
-        address voterBPTImplNew = voterBPT.implementation();
-
-        assertNotEq(lockImplOld, lockImplNew);
-        assertNotEq(voterImplOld, voterImplNew);
-        assertNotEq(lockBPTImplOld, lockImplNew);
-        assertNotEq(voterBPTImplOld, voterImplNew);
-
-        // uri is there on the new locks
-        vm.startPrank(address(modeDAO));
-        {
-            lockMode.setBaseURI("https://lockmode.com/");
-            lockBPT.setBaseURI("https://lockbpt.com/");
-        }
-        vm.stopPrank();
-
-        // check that reset is allowed during a voting window
-
-        // fetch a staker
-        address staker = getStaker(network);
-        bool isVotingActive = voterMode.votingActive();
-        // are they voting? if not, move to voting window
-
-        uint veNFT = VotingEscrow(voterMode.escrow()).ownedTokens(staker)[0];
-        if (!voterMode.isVoting(veNFT)) {
-            // create the gauge and vote for it
-            vm.startPrank(address(modeDAO));
-            {
-                voterMode.unpause();
-                voterMode.createGauge(address(1993), "");
-            }
-            vm.stopPrank();
-
-            // vote by moving to voting window
-            if (!isVotingActive) {
-                vm.warp(block.timestamp + 1 weeks);
-            }
-
-            vm.startPrank(staker);
-            {
-                IGaugeVote.GaugeVote[] memory votes = new IGaugeVote.GaugeVote[](1);
-                votes[0] = IGaugeVote.GaugeVote({weight: 1, gauge: address(1993)});
-                voterMode.vote(veNFT, votes);
-            }
-            vm.stopPrank();
-        }
-
-        // move to the dist window
-        if (isVotingActive) {
-            vm.warp(block.timestamp + 1 weeks);
-        }
-
-        // call reset
-        assertEq(voterMode.isVoting(veNFT), true);
-        assertEq(voterMode.votingActive(), false);
-
-        vm.startPrank(staker);
-        {
-            voterMode.reset(veNFT);
-        }
-        vm.stopPrank();
-
-        assertEq(voterMode.isVoting(veNFT), false);
+        //
+        // _signExecuteMultisigProposal(proposalId, modeSigners, modeMultisig);
+        //
+        // // test
+        // address lockImplNew = lockMode.implementation();
+        // address voterImplNew = voterMode.implementation();
+        // address lockBPTImplNew = lockBPT.implementation();
+        // address voterBPTImplNew = voterBPT.implementation();
+        //
+        // assertNotEq(lockImplOld, lockImplNew);
+        // assertNotEq(voterImplOld, voterImplNew);
+        // assertNotEq(lockBPTImplOld, lockImplNew);
+        // assertNotEq(voterBPTImplOld, voterImplNew);
+        //
+        // // uri is there on the new locks
+        // vm.startPrank(address(modeDAO));
+        // {
+        //     lockMode.setBaseURI("https://lockmode.com/");
+        //     lockBPT.setBaseURI("https://lockbpt.com/");
+        // }
+        // vm.stopPrank();
+        //
+        // // check that reset is allowed during a voting window
+        //
+        // // fetch a staker
+        // address staker = getStaker(network);
+        // bool isVotingActive = voterMode.votingActive();
+        // // are they voting? if not, move to voting window
+        //
+        // uint veNFT = VotingEscrow(voterMode.escrow()).ownedTokens(staker)[0];
+        // if (!voterMode.isVoting(veNFT)) {
+        //     // create the gauge and vote for it
+        //     vm.startPrank(address(modeDAO));
+        //     {
+        //         voterMode.unpause();
+        //         voterMode.createGauge(address(1993), "");
+        //     }
+        //     vm.stopPrank();
+        //
+        //     // vote by moving to voting window
+        //     if (!isVotingActive) {
+        //         vm.warp(block.timestamp + 1 weeks);
+        //     }
+        //
+        //     vm.startPrank(staker);
+        //     {
+        //         IGaugeVote.GaugeVote[] memory votes = new IGaugeVote.GaugeVote[](1);
+        //         votes[0] = IGaugeVote.GaugeVote({weight: 1, gauge: address(1993)});
+        //         voterMode.vote(veNFT, votes);
+        //     }
+        //     vm.stopPrank();
+        // }
+        //
+        // // move to the dist window
+        // if (isVotingActive) {
+        //     vm.warp(block.timestamp + 1 weeks);
+        // }
+        //
+        // // call reset
+        // assertEq(voterMode.isVoting(veNFT), true);
+        // assertEq(voterMode.votingActive(), false);
+        //
+        // vm.startPrank(staker);
+        // {
+        //     voterMode.reset(veNFT);
+        // }
+        // vm.stopPrank();
+        //
+        // assertEq(voterMode.isVoting(veNFT), false);
     }
 
     function _createAragonMsigProposal(