Merge branch 'main' of github.com:sandclock-org/solidity_contracts in…

…to echidna

deploy/98_fixtures.ts

@@ -4,19 +4,15 @@ import { parseUnits } from "@ethersproject/units";
 import { BigNumber } from "ethers";
 import { run, ethers } from "hardhat";
 
-import { deployViaFactory, logContract } from "../scripts/deployHelpers";
-
 const func: DeployFunction = async function (env: HardhatRuntimeEnvironment) {
   const { get } = env.deployments;
 
   const [owner, alice, bob, treasury] = await ethers.getSigners();
 
   console.table([alice, bob, treasury]);
 
-  const underlying = await ethers.getContractAt(
-    "MockERC20",
-    "0x91b72467CFB9Bb79697AD58DBfcbd7dA8E4B65DA"
-  );
+  const ust = await get("USDC");
+  const underlying = await ethers.getContractAt("MockERC20", ust.address);
 
   const vaultAddress = (await get("Vault_USDC")).address;
   const vault = await ethers.getContractAt("Vault", vaultAddress);

package.json

@@ -17,7 +17,6 @@
     "@openzeppelin/contracts": "^4.4.1",
     "@openzeppelin/test-helpers": "^0.5.10",
     "@primitivefi/hardhat-dodoc": "^0.1.1",
-    "@rari-capital/solmate": "^5.9.0",
     "@typechain/ethers-v5": "^8.0.5",
     "@typechain/hardhat": "^3.1.0",
     "@types/chai": "^4.2.21",

yarn.lock

@@ -751,11 +751,6 @@
   dependencies:
     squirrelly "^8.0.8"
 
-"@rari-capital/solmate@^5.9.0":
-  version "5.9.0"
-  resolved "https://registry.npmjs.org/@rari-capital/solmate/-/solmate-5.9.0.tgz"
-  integrity sha512-Rf01eoR5i+8RMvavatNu8hdxDvzIOxpb3lAhjqGX2STvVB0a99V4GXVPMqoUomucuy0umZ39ORssPIgXTNHJdA==
-
 "@resolver-engine/core@^0.3.3":
   version "0.3.3"
   resolved "https://registry.npmjs.org/@resolver-engine/core/-/core-0.3.3.tgz"