Fix default env variables

morpho-org · Oct 25, 2022 · b4fb00d · b4fb00d
1 parent 8c5c21e
commit b4fb00d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/.env.example b/.env.example
@@ -1,4 +1,4 @@
-NETWORK=eth-mainnet
 DEPLOYER_PRIVATE_KEY=
 TENDERLY_SECRET_KEY=
+ETHERSCAN_API_KEY=
 ALCHEMY_KEY=
diff --git a/.github/workflows/ci-hardhat-common.yml b/.github/workflows/ci-hardhat-common.yml
@@ -36,4 +36,5 @@ jobs:
       - name: Run tests
         run: yarn test
         env:
-          ALCHEMY_KEY: ${{ secrets.alchemyKey }}
+          NETWORK: eth-mainnet
+          ALCHEMY_KEY: ${{ secrets.ALCHEMY_KEY }}
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -22,9 +22,8 @@ const config: HardhatUserConfig = {
   networks: {
     hardhat: {
       forking: {
-        enabled: true,
-        url: `https://${process.env.NETWORK}.g.alchemy.com/v2/${process.env.ALCHEMY_KEY}`,
-        blockNumber: Number(process.env.BLOCK_NUMBER ?? 15_500_000),
+        url: `https://${process.env.NETWORK || "eth-mainnet"}.g.alchemy.com/v2/${process.env.ALCHEMY_KEY}`,
+        blockNumber: Number(process.env.BLOCK_NUMBER || 15_500_000),
       },
     },
   },
@@ -37,9 +36,6 @@ const config: HardhatUserConfig = {
       },
     }),
   },
-  paths: {
-    sources: "./contracts/",
-  },
   solidity: {
     compilers: [
       {

diff --git a/package.json b/package.json
@@ -3,8 +3,8 @@
   "version": "1.0.0",
   "description": "Core contracts of the Morpho Protocol V1.",
   "scripts": {
-    "test": "NETWORK=eth-mainnet hardhat test test/*.spec.ts",
-    "test:upgrade:stEth": "NETWORK=eth-mainnet BLOCK_NUMBER=15580517 hardhat test test/upgrades/stEth.spec.ts",
+    "test": "hardhat test test/*.spec.ts",
+    "test:upgrade:stEth": "BLOCK_NUMBER=15580517 hardhat test test/upgrades/stEth.spec.ts",
     "lint": "yarn lint:sol && yarn lint:ts",
     "lint:ts": "eslint . --ext .ts",
     "lint:sol": "solhint 'contracts/**/*.sol'",