checkpoint

Signed-off-by: Elliot <[email protected]>

Author: ElliotFriedman

src/proposals/sips/SIP00.sol renamed to src/exercises/00/SIP00.sol

@@ -10,7 +10,7 @@ import {Vault} from "src/exercises/00/Vault00.sol";
 import {MockToken} from "@mocks/MockToken.sol";
 import {ForkSelector, ETHEREUM_FORK_ID} from "@test/utils/Forks.sol";
 
-/// DO_RUN=false DO_BUILD=false DO_DEPLOY=true DO_SIMULATE=false DO_PRINT=false DO_VALIDATE=true forge script src/proposals/sips/SIP00.sol:SIP00 -vvvv
+/// DO_RUN=false DO_BUILD=false DO_DEPLOY=true DO_SIMULATE=false DO_PRINT=false DO_VALIDATE=true forge script src/exercises/00/SIP00.sol:SIP00 -vvvv
 contract SIP00 is GovernorBravoProposal {
     using ForkSelector for uint256;
 

src/proposals/sips/SIP01.sol renamed to src/exercises/01/SIP01.sol

@@ -6,11 +6,11 @@ import {GovernorBravoProposal} from
 import {Addresses} from
     "@forge-proposal-simulator/addresses/Addresses.sol";
 
-import {Vault} from "src/exercises/00/Vault00.sol";
+import {Vault} from "src/exercises/01/Vault01.sol";
 import {MockToken} from "@mocks/MockToken.sol";
 import {ForkSelector, ETHEREUM_FORK_ID} from "@test/utils/Forks.sol";
 
-/// DO_RUN=false DO_BUILD=false DO_DEPLOY=true DO_SIMULATE=false DO_PRINT=false DO_VALIDATE=true forge script src/proposals/sips/SIP01.sol:SIP01 -vvvv
+/// DO_RUN=false DO_BUILD=false DO_DEPLOY=true DO_SIMULATE=false DO_PRINT=false DO_VALIDATE=true forge script src/exercises/01/SIP01.sol:SIP01 -vvvv
 contract SIP01 is GovernorBravoProposal {
     using ForkSelector for uint256;
 

src/proposals/sips/SIP02.sol renamed to src/exercises/02/SIP02.sol

@@ -6,7 +6,7 @@ import {GovernorBravoProposal} from
 import {Addresses} from
     "@forge-proposal-simulator/addresses/Addresses.sol";
 
-import {Vault03} from "src/exercises/03/Vault03.sol";
+import {Vault03} from "src/exercises/03/Vault.sol";
 import {Vault04} from "src/exercises/04/Vault04.sol";
 import {MockToken} from "@mocks/MockToken.sol";
 import {ForkSelector, ETHEREUM_FORK_ID} from "@test/utils/Forks.sol";
@@ -20,7 +20,7 @@ import {ERC1967Utils} from
     "@openzeppelin/contracts/proxy/ERC1967/ERC1967Utils.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
-/// DO_RUN=false DO_BUILD=false DO_DEPLOY=true DO_SIMULATE=false DO_PRINT=false DO_VALIDATE=true forge script src/proposals/sips/SIP02.sol:SIP02 -vvvv
+/// DO_RUN=false DO_BUILD=false DO_DEPLOY=true DO_SIMULATE=false DO_PRINT=false DO_VALIDATE=true forge script src/exercises/02/SIP02.sol:SIP02 -vvvv
 contract SIP02 is GovernorBravoProposal {
     using ForkSelector for uint256;
 
@@ -140,7 +140,6 @@ contract SIP02 is GovernorBravoProposal {
             1_000_000e18,
             "Max supply should be 1,000,000 USDC"
         );
-        // fails as slot for totalSupplied is changed
         assertEq(
             vault.totalSupplied(),
             1_000e18,

src/exercises/03/SIP04.sol

@@ -0,0 +1,124 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity ^0.8.0;
+
+import {GovernorBravoProposal} from
+    "@forge-proposal-simulator/src/proposals/GovernorBravoProposal.sol";
+import {Addresses} from
+    "@forge-proposal-simulator/addresses/Addresses.sol";
+
+import {Vault04} from "src/exercises/04/Vault04.sol";
+import {MockToken} from "@mocks/MockToken.sol";
+import {ForkSelector, ETHEREUM_FORK_ID} from "@test/utils/Forks.sol";
+import {
+    ProxyAdmin,
+    TransparentUpgradeableProxy,
+    ITransparentUpgradeableProxy
+} from
+    "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
+import {ERC1967Utils} from
+    "@openzeppelin/contracts/proxy/ERC1967/ERC1967Utils.sol";
+import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+
+/// DO_RUN=false DO_BUILD=false DO_DEPLOY=true DO_SIMULATE=false DO_PRINT=false DO_VALIDATE=true forge script src/exercises/SIP04.sol:SIP04 -vvvv
+contract SIP04 is GovernorBravoProposal {
+    using ForkSelector for uint256;
+
+    constructor() {
+        primaryForkId = ETHEREUM_FORK_ID;
+    }
+
+    function setupProposal() public {
+        ETHEREUM_FORK_ID.createForksAndSelect();
+
+        string memory addressesFolderPath = "./addresses";
+        uint256[] memory chainIds = new uint256[](1);
+        chainIds[0] = 1;
+
+        setAddresses(new Addresses(addressesFolderPath, chainIds));
+    }
+
+    function name() public pure override returns (string memory) {
+        return "SIP-04 Upgrade";
+    }
+
+    function description()
+        public
+        pure
+        override
+        returns (string memory)
+    {
+        return name();
+    }
+
+    function run() public override {
+        setupProposal();
+
+        setGovernor(addresses.getAddress("COMPOUND_GOVERNOR_BRAVO"));
+
+        super.run();
+    }
+
+    function deploy() public override {
+        if (!addresses.isAddressSet("PROXY_ADMIN")) {
+            ProxyAdmin proxyAdmin = new ProxyAdmin();
+            proxyAdmin.transferOwnership(
+                addresses.getAddress("COMPOUND_TIMELOCK_BRAVO")
+            );
+
+            addresses.addAddress("PROXY_ADMIN", address(proxyAdmin), true);
+        }
+
+        address vaultProxy;
+        if (!addresses.isAddressSet("V4_VAULT_IMPLEMENTATION")) {
+            address vaultImpl = address(new Vault04());
+            addresses.addAddress(
+                "V4_VAULT_IMPLEMENTATION", vaultImpl, true
+            );
+
+            address[] memory tokens = new address[](3);
+            tokens[0] = addresses.getAddress("USDC");
+            tokens[1] = addresses.getAddress("DAI");
+            tokens[2] = addresses.getAddress("USDT");
+
+            address owner = addresses.getAddress("COMPOUND_TIMELOCK_BRAVO");
+
+            // Generate calldata for initialize function of vault
+            bytes memory data = abi.encodeWithSignature(
+                "initialize(address[],address)", tokens, owner
+            );
+
+            vaultProxy = address(
+                new TransparentUpgradeableProxy(
+                    vaultImpl, owner, data
+                )
+            );
+            addresses.addAddress("VAULT_PROXY", vaultProxy, true);
+        }
+    }
+
+    function validate() public view override {
+        Vault04 vault = Vault04(addresses.getAddress("VAULT_PROXY"));
+
+        assertEq(
+            vault.authorizedToken(addresses.getAddress("USDC")),
+            true,
+            "USDC should be authorized"
+        );
+        assertEq(
+            vault.authorizedToken(addresses.getAddress("DAI")),
+            true,
+            "DAI should be authorized"
+        );
+        assertEq(
+            vault.authorizedToken(addresses.getAddress("USDT")),
+            true,
+            "USDT should be authorized"
+        );
+
+        address vaultProxy = addresses.getAddress("VAULT_PROXY");
+        bytes32 adminSlot =
+            vm.load(vaultProxy, ERC1967Utils.ADMIN_SLOT);
+
+        address proxyAdmin = address(uint160(uint256(adminSlot)));
+    }
+}

src/exercises/03/Vault03.sol

@@ -4,12 +4,13 @@ import {SafeERC20} from
     "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import {console} from "@forge-std/console.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+
 import {Test} from "@forge-std/Test.sol";
 
 import {Vault} from "src/exercises/00/Vault00.sol";
-import {SIP00} from "src/proposals/sips/SIP00.sol";
+import {SIP00} from "src/exercises/00/SIP00.sol";
 
-contract TestSIP00 is Test, SIP00 {
+contract TestVault00 is Test, SIP00 {
     using SafeERC20 for IERC20;
 
     Vault public vault;
@@ -39,15 +40,17 @@ contract TestSIP00 is Test, SIP00 {
         /// run the proposal
         deploy();
 
-        /// validate the proposal
-        validate();
-
         dai = addresses.getAddress("DAI");
         usdc = addresses.getAddress("USDC");
         usdt = addresses.getAddress("USDT");
         vault = Vault(addresses.getAddress("V1_VAULT"));
     }
 
+    function testValidate() public view {
+        /// validate the proposal
+        validate();
+    }
+
     function testVaultDepositDai() public {
         uint256 daiDepositAmount = 1_000e18;