Merge pull request #2 from solidity-labs-io/final-exercises

Final exercises

Author: ElliotFriedman

.github/workflows/test.yml

@@ -7,6 +7,7 @@ on:
 
 env:
   FOUNDRY_PROFILE: ci
+  ETH_RPC_URL: ${{secrets.ETH_RPC_URL}}
 
 jobs:
   check:

foundry.toml

@@ -20,7 +20,7 @@ remappings = [
 fs_permissions = [{ access = "read", path = "./addresses/"}]
 
 [fmt]
-line_length = 80
+line_length = 70
 
 # See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options
 

src/examples/01/REQUIREMENTS.md

@@ -3,18 +3,17 @@ 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 {Addresses} from
+    "@forge-proposal-simulator/addresses/Addresses.sol";
 
-import {Vault} from "src/examples/00/Vault00.sol";
-import {MockToken} from "@mocks/MockToken.sol";
+import {Vault} from "src/exercises/00/Vault00.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;
 
     constructor() {
-        // ETHEREUM_FORK_ID.createForksAndSelect();
         primaryForkId = ETHEREUM_FORK_ID;
     }
 
@@ -32,7 +31,12 @@ contract SIP00 is GovernorBravoProposal {
         return "SIP-00 System Deploy";
     }
 
-    function description() public pure override returns (string memory) {
+    function description()
+        public
+        pure
+        override
+        returns (string memory)
+    {
         return name();
     }
 
@@ -45,20 +49,20 @@ contract SIP00 is GovernorBravoProposal {
     }
 
     function deploy() public override {
-        if (!addresses.isAddressSet("V1_VAULT")) {
+        if (!addresses.isAddressSet("V0_VAULT")) {
             address[] memory tokens = new address[](3);
             tokens[0] = addresses.getAddress("USDC");
             tokens[1] = addresses.getAddress("DAI");
             tokens[2] = addresses.getAddress("USDT");
 
             Vault vault = new Vault(tokens);
 
-            addresses.addAddress("V1_VAULT", address(vault), true);
+            addresses.addAddress("V0_VAULT", address(vault), true);
         }
     }
 
     function validate() public view override {
-        Vault vault = Vault(addresses.getAddress("V1_VAULT"));
+        Vault vault = Vault(addresses.getAddress("V0_VAULT"));
 
         assertEq(
             vault.authorizedToken(addresses.getAddress("USDC")),

src/examples/00/REQUIREMENTS.md renamed to src/exercises/00/REQUIREMENTS.md

@@ -59,7 +59,9 @@ contract Vault {
 
         totalSupplied += amount;
 
-        IERC20(token).safeTransferFrom(msg.sender, address(this), amount);
+        IERC20(token).safeTransferFrom(
+            msg.sender, address(this), amount
+        );
 
         emit Deposit(token, msg.sender, amount);
     }

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

@@ -0,0 +1,5 @@
+# Overview
+
+The first round of security reviews was conducted by an external security firm. The results were pretty bad for such a simple contract. They refused to give you the findings, so you're on your own.
+
+Good luck...

src/examples/00/Vault00.sol renamed to src/exercises/00/Vault00.sol

@@ -3,18 +3,17 @@ 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 {Addresses} from
+    "@forge-proposal-simulator/addresses/Addresses.sol";
 
-import {Vault} from "src/examples/00/Vault00.sol";
-import {MockToken} from "@mocks/MockToken.sol";
+import {Vault} from "src/exercises/01/Vault01.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;
 
     constructor() {
-        // ETHEREUM_FORK_ID.createForksAndSelect();
         primaryForkId = ETHEREUM_FORK_ID;
     }
 
@@ -32,7 +31,12 @@ contract SIP01 is GovernorBravoProposal {
         return "SIP-01 System Deploy";
     }
 
-    function description() public pure override returns (string memory) {
+    function description()
+        public
+        pure
+        override
+        returns (string memory)
+    {
         return name();
     }
 
@@ -46,11 +50,9 @@ contract SIP01 is GovernorBravoProposal {
 
     function deploy() public override {
         if (!addresses.isAddressSet("V1_VAULT")) {
-            address[] memory tokens = new address[](3);
+            address[] memory tokens = new address[](2);
             tokens[0] = addresses.getAddress("USDC");
-            // usdc added again instead of dai
-            tokens[1] = addresses.getAddress("USDC");
-            tokens[2] = addresses.getAddress("USDT");
+            tokens[1] = addresses.getAddress("USDT");
 
             Vault vault = new Vault(tokens);
 
@@ -67,14 +69,14 @@ contract SIP01 is GovernorBravoProposal {
             "USDC should be authorized"
         );
         assertEq(
-            vault.authorizedToken(addresses.getAddress("DAI")),
+            vault.authorizedToken(addresses.getAddress("USDT")),
             true,
-            "DAI should be authorized"
+            "USDT should be authorized"
         );
         assertEq(
-            vault.authorizedToken(addresses.getAddress("USDT")),
+            vault.authorizedToken(addresses.getAddress("DAI")),
             true,
-            "USDT should be authorized"
+            "DAI should be authorized"
         );
     }
 }

src/exercises/01/REQUIREMENTS.md

@@ -67,7 +67,9 @@ contract Vault {
 
         totalSupplied += normalizedAmount;
 
-        IERC20(token).safeTransferFrom(msg.sender, address(this), amount);
+        IERC20(token).safeTransferFrom(
+            msg.sender, address(this), amount
+        );
 
         emit Deposit(token, msg.sender, amount);
     }