Merge pull request #67 from gnosis/remove-rinkeby

remove rinkeby

packages/contracts/docs/setup_guide.md

@@ -1,19 +1,19 @@
 # Zodiac Exit Module Setup Guide
 
-This guide shows how to setup the Exit module with a Gnosis Safe on the Rinkeby testnetwork.
+This guide shows how to setup the Exit module with a Gnosis Safe on the Goerli testnetwork.
 
 The Exit Module belongs to the [Zodiac](https://github.com/gnosis/zodiac) collection of tools. If you have any questions about Zodiac, join the [Gnosis Guild Discord](https://discord.gg/wwmBWTgyEq). Follow [@GnosisGuild](https://twitter.com/gnosisguild) on Twitter for updates. 
 
 ## Prerequisites
 
-To start the process you need to create a Safe on the Rinkeby test network (e.g. via https://rinkeby.gnosis-safe.io).
+To start the process you need to create a Safe on the Goerli test network (e.g. via https://goerli.gnosis-safe.io).
 
 For the hardhat tasks to work, the environment needs to be properly configured. See the [sample env file](../.env.sample) for more information. In order to deploy the Exit Module, two contracts are needed: a designated token and circulating supply.
 
 First, deployment of the designated token can be done using the following hardhat command:
 
 ```bash
-yarn hardhat deployDesignatedToken --user 0xRECEIVER_OF_TOKENS --network rinkeby
+yarn hardhat deployDesignatedToken --user 0xRECEIVER_OF_TOKENS --network goerli
 ```
 
 Note: In this script, one (1) token is minted to the address passed as the user parameter. If no user parameter is given, then the signer of transaction will receive the minted token by default.
@@ -54,10 +54,10 @@ These setup tasks require the following parameters (also mentioned above):
 
 There are more optional parameters. For more information on these optional paramters, run `yarn hardhat setup --help`.
 
-An example for this on Rinkeby would be:
+An example for this on Goerli would be:
 
 ```bash
-yarn hardhat --network rinkeby setup --owner <owner_address> --avatar <avatar_address> --target <target_address> --token 0x0000000000000000000000000000000000000100 --supply 0x1230000000000000000000000000000000000900 --proxied true`
+yarn hardhat --network goerli setup --owner <owner_address> --avatar <avatar_address> --target <target_address> --token 0x0000000000000000000000000000000000000100 --supply 0x1230000000000000000000000000000000000900 --proxied true`
 ```
 
 This should return the address of the deployed Exit Module. For this guide we assume this to be `0x9797979797979797979797979797979797979797`.
@@ -66,9 +66,9 @@ Once the module has been deployed, you should verify the source code. (Note: It
 
 Please note that the supply argument above must be the address of the  circulating supply contract that was deployed through the setup scripts. You can check the setup script logs to obtain the address.
 
-An example for this on Rinkeby would be:
+An example for this on Goerli would be:
 ```bash
-yarn hardhat --network rinkeby verifyEtherscan --module 0x9797979797979797979797979797979797979797 --owner <owner_address> --avatar <avatar_address> --target <target_address> --token 0x0000000000000000000000000000000000000100 --supply 0x1230000000000000000000000000000000000900`
+yarn hardhat --network goerli verifyEtherscan --module 0x9797979797979797979797979797979797979797 --owner <owner_address> --avatar <avatar_address> --target <target_address> --token 0x0000000000000000000000000000000000000100 --supply 0x1230000000000000000000000000000000000900`
 ```
 
 ## Enabling the module
@@ -78,7 +78,7 @@ To allow the Exit Module to actually execute transactions, you must enable it on
 
 ## Executing an Exit
 
-In order to test the Exit Module execution on Rinkeby, you will need some ERC20 tokens. If you don't have any to test, you can get some at https://app.compound.finance/ with the following steps (**make sure you are on Rinkeby testnetwork**): 1) Connect wallet, and click on any token in the supply markets list. 2) A modal will appear. Select the tab "Withdraw" and click on "Faucet". 3) This will trigger a transaction that will send the Rinkeby network tokens you selected to your account.
+In order to test the Exit Module execution on Goerli, you will need some ERC20 tokens. If you don't have any to test, you can get some at https://app.compound.finance/ with the following steps (**make sure you are on Goerli testnetwork**): 1) Connect wallet, and click on any token in the supply markets list. 2) A modal will appear. Select the tab "Withdraw" and click on "Faucet". 3) This will trigger a transaction that will send the Goerli network tokens you selected to your account.
 
 Request at least two tokens and send them to the Gnosis Safe address.
 

packages/contracts/hardhat.config.ts

@@ -38,18 +38,18 @@ export default {
       ...sharedNetworkConfig,
       url: `https://mainnet.infura.io/v3/${INFURA_KEY}`,
     },
-    rinkeby: {
+    goerli: {
       ...sharedNetworkConfig,
-      url: `https://rinkeby.infura.io/v3/${INFURA_KEY}`,
+      url: `https://goerli.infura.io/v3/${INFURA_KEY}`,
     },
     xdai: {
       ...sharedNetworkConfig,
       url: "https://xdai.poanetwork.dev",
     },
     matic: {
       ...sharedNetworkConfig,
-      url: "https://rpc-mainnet.maticvigil.com"
-    }
+      url: "https://rpc-mainnet.maticvigil.com",
+    },
   },
   namedAccounts: {
     deployer: 0,

packages/contracts/src/deploy/verify.ts

@@ -4,7 +4,7 @@ import { TASK_ETHERSCAN_VERIFY } from "hardhat-deploy";
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { run } = hre;
-  if (!["rinkeby", "mainnet", "ropsten"].includes(hre.network.name)) {
+  if (!["goerli", "mainnet", "ropsten"].includes(hre.network.name)) {
     return;
   }
 

packages/exit-app/src/utils/networks.ts

@@ -1,6 +1,6 @@
 export enum NETWORK {
   MAINNET = 1,
-  RINKEBY = 4,
+  GOERLI = 5,
   BSC = 56,
   XDAI = 100,
   POLYGON = 137,
@@ -20,23 +20,23 @@ export const NATIVE_ASSET: Record<string, Coin> = {
 
 export const NETWORK_NATIVE_ASSET: Record<NETWORK, Coin> = {
   [NETWORK.MAINNET]: NATIVE_ASSET.ETH,
-  [NETWORK.RINKEBY]: NATIVE_ASSET.ETH,
+  [NETWORK.GOERLI]: NATIVE_ASSET.ETH,
   [NETWORK.BSC]: NATIVE_ASSET.BNB,
   [NETWORK.XDAI]: NATIVE_ASSET.XDAI,
   [NETWORK.POLYGON]: NATIVE_ASSET.MATIC,
 }
 
 export const NETWORK_NAME: Record<NETWORK, string> = {
   [NETWORK.MAINNET]: 'Mainnet',
-  [NETWORK.RINKEBY]: 'Rinkeby',
+  [NETWORK.GOERLI]: 'Goerli',
   [NETWORK.BSC]: 'Binance Smart Chain',
   [NETWORK.XDAI]: 'Gnosis Chain',
   [NETWORK.POLYGON]: 'Polygon',
 }
 
 export const NETWORK_DEFAULT_RPC: Record<NETWORK, string> = {
   [NETWORK.MAINNET]: 'https://mainnet.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161',
-  [NETWORK.RINKEBY]: 'https://rinkeby.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161',
+  [NETWORK.GOERLI]: 'https://goerli.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161',
   [NETWORK.BSC]: 'https://bsc-dataseed.binance.org',
   [NETWORK.XDAI]: 'https://rpc.gnosischain.com',
   [NETWORK.POLYGON]: 'https://polygon-rpc.com',