Added new flexible fork script, small change to .env to match pattern…

… of other rpcs

.env.template

@@ -1,12 +1,12 @@
-## Etherscan explorer API config
+## Etherscan and RPC url config
 ETHERSCAN_API_KEY="put your key here plz"
-MAINNET_URL="https://api.etherscan.io/"
-GOERLI_RPC_URL="https://api-goerli.etherscan.io/"
+MAINNET_RPC_URL="MAINNET RPC URL"
+GOERLI_RPC_URL="GOERLI RPC URL"
 
-## Polyscan explorer API config
+## Polyscan and RPC url config
 POLYSCAN_API_KEY="put your key here plz"
-POLYGON_RPC_URL="https://api.polygonscan.com/"
-MUMBAI_RPC_URL="https://api-testnet.polygonscan.com/"
+POLYGON_RPC_URL="POLYGON RPC URL"
+MUMBAI_RPC_URL="MUMBAI RPC URL"
 
 ##Solidity config settings
 OPTIMIZER_FLAG=true

config/env.config.ts

@@ -16,7 +16,7 @@ const ETHERSCAN_API_KEY = extractString("ETHERSCAN_API_KEY");
 const GOERLI_RPC_URL = extractString("GOERLI_RPC_URL");
 const GANACHE_PRIVATE_KEY = extractString("GANACHE_PRIVATE_KEY");
 const GANACHE_RPC_URL = extractString("GANACHE_RPC_URL");
-const MAINNET_RPC_URL = extractString("MAINNET_URL");
+const MAINNET_RPC_URL = extractString("MAINNET_RPC_URL");
 const MUMBAI_RPC_URL = extractString("MUMBAI_RPC_URL");
 const POLYGON_RPC_URL = extractString("POLYGON_RPC_URL");
 const POLYSCAN_API_KEY = extractString("POLYSCAN_API_KEY");

fork.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# turn logging on
+set -x;
+
+if [ "$1" == "mumbai" ]; then 
+  rpc=$(grep MUMBAI_RPC_URL .env | cut -d '=' -f2 | sed -e 's/^\"//' -e 's/\"$//');
+elif [ "$1" == "polygon" ]; then
+  rpc=$(grep POLYGON_RPC_URL .env | cut -d '=' -f2 | sed -e 's/^\"//' -e 's/\"$//');
+elif [ "$1" == "goerli" ]; then
+  rpc=$(grep GOERLI_RPC_URL .env | cut -d '=' -f2 | sed -e 's/^\"//' -e 's/\"$//');
+elif [ "$1" == "mainnet" ]; then
+  rpc=$(grep MAINNET_RPC_URL .env | cut -d '=' -f2 | sed -e 's/^\"//' -e 's/\"$//');
+else
+  echo ERROR: Select valid option from {mumbai, polygon, goerli, mainnet}
+  exit 1;
+fi
+
+hardhat node --fork $rpc

package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "preinstall": "npx only-allow yarn",
     "format": "prettier --write './{config,contracts,eth-sdk,scripts,tasks,test,utils}/**/*.{ts,js,sol}'",
-    "fork": "hardhat node --fork $(grep MUMBAI_RPC_URL .env | cut -d '=' -f2 | sed -e 's/^\"//' -e 's/\"$//')",
+    "fork": "bash ./fork.sh",
     "test": "hardhat test",
     "compile": "bash ./compile.sh",
     "deploy": "hardhat compile && hardhat deploy:AngelProtocol",