checkpoint

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

Author: ElliotFriedman

src/exercises/IVault.sol renamed to src/IVault.sol

@@ -10,7 +10,6 @@ import {VaultStorageOwnable} from
     "src/exercises/storage/VaultStorageOwnable.sol";
 
 /// @notice Add maxsupply to the vault and update getNormalizedAmount logic
-/// deploy Vault 03 to mainnet
 /// add integration tests
 contract Vault is VaultStorageOwnable {
     using SafeERC20 for IERC20;
@@ -180,7 +179,7 @@ contract Vault is VaultStorageOwnable {
         uint8 decimals = IERC20Metadata(token).decimals();
         normalizedAmount = amount;
         if (decimals < 18) {
-            normalizedAmount = amount ** (10 * (18 - decimals));
+            normalizedAmount = amount * (10 ** (18 - decimals));
         }
     }
 }

src/exercises/03/Vault03.sol

@@ -70,6 +70,7 @@ contract SIP04 is GovernorBravoProposal {
         override
         buildModifier(addresses.getAddress("COMPOUND_TIMELOCK_BRAVO"))
     {
+        /// static calls - filtered out
         address vaultProxy = addresses.getAddress("VAULT_PROXY");
         bytes32 adminSlot =
             vm.load(vaultProxy, ERC1967Utils.ADMIN_SLOT);
@@ -115,6 +116,9 @@ contract SIP04 is GovernorBravoProposal {
             vm.load(vaultProxy, ERC1967Utils.ADMIN_SLOT);
         address proxyAdmin = address(uint160(uint256(adminSlot)));
 
+        /// check not paused
+        /// check logic contract address is v4 impl
+
         assertEq(
             ProxyAdmin(proxyAdmin).owner(),
             addresses.getAddress("COMPOUND_TIMELOCK_BRAVO"),

src/exercises/04/SIP04.sol

@@ -12,7 +12,7 @@ import {Authorized} from "src/exercises/storage/Authorized.sol";
 contract VaultStoragePausable is
     OwnableUpgradeable,
     Supply,
+    Authorized,
     Balances,
-    PausableUpgradeable,
-    Authorized
+    PausableUpgradeable
 {}

src/exercises/storage/VaultStoragePausable.sol

@@ -24,6 +24,23 @@ contract TestVault04 is Test, SIP04 {
     address public usdc;
     address public usdt;
 
+    function _loadUsers() private {
+        address[] memory users = new address[](3);
+        users[0] = userA;
+        users[1] = userB;
+        users[2] = userC;
+
+        for (uint256 i = 0; i < users.length; i++) {
+            uint256 daiDepositAmount = 1_000e18;
+            uint256 usdtDepositAmount = 1_000e8;
+            uint256 usdcDepositAmount = 1_000e6;
+
+            _vaultDeposit(dai, users[i], daiDepositAmount);
+            _vaultDeposit(usdc, users[i], usdcDepositAmount);
+            _vaultDeposit(usdt, users[i], usdtDepositAmount);
+        }
+    }
+
     function setUp() public {
         /// set the environment variables
         vm.setEnv("DO_RUN", "false");
@@ -38,10 +55,23 @@ contract TestVault04 is Test, SIP04 {
         sip03.setupProposal();
         sip03.deploy();
 
+        /// set the addresses contrac to the SIP03 addresses for integration testing
+        setAddresses(sip03.addresses());
+        dai = addresses.getAddress("DAI");
+        usdc = addresses.getAddress("USDC");
+        usdt = addresses.getAddress("USDT");
+        vault = Vault(addresses.getAddress("VAULT_PROXY"));
+
+        vm.prank(vault.owner());
+        vault.setMaxSupply(100_000_000e18);
+
+        /// load data into newly deployed contract
+        _loadUsers();
+
         /// setup the proposal
         setupProposal();
 
-        /// copy SIP03 addresses into this contract for integration testing
+        /// overwrite the newly created proposal Addresses contract
         setAddresses(sip03.addresses());
 
         /// deploy contracts from MIP-04
@@ -50,11 +80,20 @@ contract TestVault04 is Test, SIP04 {
         /// build and run proposal
         build();
         simulate();
+    }
 
-        dai = addresses.getAddress("DAI");
-        usdc = addresses.getAddress("USDC");
-        usdt = addresses.getAddress("USDT");
-        vault = Vault(addresses.getAddress("VAULT_PROXY"));
+    function testSetup() public view {
+        assertTrue(
+            vault.authorizedToken(address(dai)), "Dai not whitelisted"
+        );
+        assertTrue(
+            vault.authorizedToken(address(usdc)),
+            "Usdc not whitelisted"
+        );
+        assertTrue(
+            vault.authorizedToken(address(usdt)),
+            "Usdt not whitelisted"
+        );
     }
 
     function testVaultDepositDai() public {
@@ -67,16 +106,20 @@ contract TestVault04 is Test, SIP04 {
         uint256 daiDepositAmount = 1_000e18;
 
         _vaultDeposit(dai, address(this), daiDepositAmount);
+        uint256 startingVaultBalance = vault.balanceOf(address(this));
+        uint256 startingTotalSupplied = vault.totalSupplied();
 
         vault.withdraw(dai, daiDepositAmount);
 
         assertEq(
             vault.balanceOf(address(this)),
-            0,
+            startingVaultBalance - daiDepositAmount,
             "vault dai balance not 0"
         );
         assertEq(
-            vault.totalSupplied(), 0, "vault total supplied not 0"
+            vault.totalSupplied(),
+            startingTotalSupplied - daiDepositAmount,
+            "vault total supplied not 0"
         );
         assertEq(
             IERC20(dai).balanceOf(address(this)),