Merge branch 'main' into feat/foundry-reports

defi-wonderland · May 20, 2024 · 2fd5d36 · 2fd5d36
2 parents c0a886b + 1e9f2a5
commit 2fd5d36
Show file tree

Hide file tree

Showing 9 changed files with 534 additions and 1,024 deletions.
diff --git a/foundry.toml b/foundry.toml
@@ -10,7 +10,7 @@ sort_imports = true
 
 [profile.default]
 solc_version = '0.8.23'
-libs = ['node_modules']
+libs = ['node_modules', 'lib']
 optimizer_runs = 10_000
 
 [profile.optimized]

diff --git a/package.json b/package.json
@@ -13,8 +13,8 @@
     "build": "forge build",
     "build:optimized": "FOUNDRY_PROFILE=optimized forge build",
     "coverage": "forge coverage --match-contract Unit",
-    "deploy:mainnet": "bash -c 'source .env && forge script Deploy --broadcast --chain mainnet --private-key $MAINNET_DEPLOYER_PK'",
-    "deploy:sepolia": "bash -c 'source .env && forge script Deploy --broadcast --chain sepolia --private-key $SEPOLIA_DEPLOYER_PK'",
+    "deploy:mainnet": "bash -c 'source .env && forge script Deploy -vvvvv --rpc-url $MAINNET_RPC --broadcast --chain mainnet --private-key $MAINNET_DEPLOYER_PK'",
+    "deploy:sepolia": "bash -c 'source .env && forge script Deploy -vvvvv --rpc-url $SEPOLIA_RPC --broadcast --chain sepolia --private-key $SEPOLIA_DEPLOYER_PK'",
     "lint:check": "yarn lint:sol-tests && yarn lint:sol-logic && forge fmt --check",
     "lint:fix": "sort-package-json && forge fmt && yarn lint:sol-tests --fix && yarn lint:sol-logic --fix",
     "lint:natspec": "npx @defi-wonderland/natspec-smells --config natspec-smells.config.js",
@@ -32,18 +32,14 @@
     "test/**/*.sol": "yarn lint:sol-tests",
     "package.json": "sort-package-json"
   },
-  "dependencies": {
-    "isolmate": "github:defi-wonderland/isolmate#59e1804"
-  },
   "devDependencies": {
-    "@commitlint/cli": "17.0.3",
-    "@commitlint/config-conventional": "17.0.3",
-    "@defi-wonderland/natspec-smells": "1.0.3",
-    "ds-test": "github:dapphub/ds-test#e282159",
-    "forge-std": "github:foundry-rs/forge-std#4513bc2",
+    "@commitlint/cli": "19.3.0",
+    "@commitlint/config-conventional": "19.2.2",
+    "@defi-wonderland/natspec-smells": "1.1.1",
+    "forge-std": "github:foundry-rs/forge-std#1.8.2",
     "husky": ">=8",
     "lint-staged": ">=10",
-    "solhint": "github:solhint-community/solhint-community#v4.0.0-rc01",
-    "sort-package-json": "1.53.1"
+    "solhint-community": "4.0.0",
+    "sort-package-json": "2.10.0"
   }
 }
diff --git a/remappings.txt b/remappings.txt
@@ -1,6 +1,4 @@
-ds-test/=node_modules/ds-test/src
 forge-std/=node_modules/forge-std/src
-isolmate/=node_modules/isolmate/src
 
 contracts/=src/contracts
 interfaces/=src/interfaces
diff --git a/script/Deploy.sol b/script/Deploy.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.23;
 
 import {Greeter} from 'contracts/Greeter.sol';
 import {Script} from 'forge-std/Script.sol';
-import {IERC20} from 'isolmate/interfaces/tokens/IERC20.sol';
+import {IERC20} from 'forge-std/interfaces/IERC20.sol';
 
 contract Deploy is Script {
   struct DeploymentParams {

diff --git a/src/contracts/Greeter.sol b/src/contracts/Greeter.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.23;
 
+import {IERC20} from 'forge-std/interfaces/IERC20.sol';
 import {IGreeter} from 'interfaces/IGreeter.sol';
-import {IERC20} from 'isolmate/interfaces/tokens/IERC20.sol';
 
 contract Greeter is IGreeter {
   /**

diff --git a/src/interfaces/IGreeter.sol b/src/interfaces/IGreeter.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.23;
 
-import {IERC20} from 'isolmate/interfaces/tokens/IERC20.sol';
+import {IERC20} from 'forge-std/interfaces/IERC20.sol';
 
 /**
  * @title Greeter Contract
@@ -33,16 +33,6 @@ interface IGreeter {
    */
   error Greeter_InvalidGreeting();
 
-  /*///////////////////////////////////////////////////////////////
-                            LOGIC
-  //////////////////////////////////////////////////////////////*/
-  /**
-   * @notice Sets a new greeting
-   * @dev Only callable by the owner
-   * @param _newGreeting The new greeting to be set
-   */
-  function setGreeting(string memory _newGreeting) external;
-
   /*///////////////////////////////////////////////////////////////
                             VARIABLES
   //////////////////////////////////////////////////////////////*/
@@ -65,9 +55,18 @@ interface IGreeter {
    */
   function token() external view returns (IERC20 _token);
 
+  /*///////////////////////////////////////////////////////////////
+                            LOGIC
+  //////////////////////////////////////////////////////////////*/
+  /**
+   * @notice Sets a new greeting
+   * @dev Only callable by the owner
+   * @param _newGreeting The new greeting to be set
+   */
+  function setGreeting(string memory _newGreeting) external;
+
   /**
    * @notice Greets the caller
-   *
    * @return _greeting The greeting
    * @return _balance  Current token balance of the caller
    */

diff --git a/test/integration/IntegrationBase.sol b/test/integration/IntegrationBase.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.23;
 
 import {Greeter, IGreeter} from 'contracts/Greeter.sol';
 import {Test} from 'forge-std/Test.sol';
-import {IERC20} from 'isolmate/interfaces/tokens/IERC20.sol';
+import {IERC20} from 'forge-std/interfaces/IERC20.sol';
 
 contract IntegrationBase is Test {
   uint256 internal constant _FORK_BLOCK = 18_920_905;

diff --git a/test/unit/Greeter.t.sol b/test/unit/Greeter.t.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.23;
 
 import {Greeter, IGreeter} from 'contracts/Greeter.sol';
 import {Test} from 'forge-std/Test.sol';
-import {IERC20} from 'isolmate/interfaces/tokens/IERC20.sol';
+import {IERC20} from 'forge-std/interfaces/IERC20.sol';
 
 abstract contract Base is Test {
   address internal _owner = makeAddr('owner');