dev2master (#1785)

* fix: switches mumbai rpc to our alchemy node (#1769) * fix: update web3.js and wrapper (#1779) * F/rinkeby to goerli (#1783) * feat: removes rinkeby and adds goerli * fix: makes the linter happy
aragon · Oct 13, 2022 · e6b2423 · e6b2423
1 parent d5f93d6
commit e6b2423
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 122 deletions.
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@
 
 ## Quick start
 
-Install with `yarn` and launch the app with `yarn start`. By default, the app is configured to connect to the Ethereum Rinkeby testnet.
+Install with `yarn` and launch the app with `yarn start`. By default, the app is configured to connect to the Ethereum Goerli testnet.
 
 For connecting to other chains / deployments, a few useful npm scripts are provided:
 
@@ -33,7 +33,7 @@ The Aragon client is automatically deployed to IPFS with each new commit to `mas
 
 ### aragonPM
 
-"Checkpointed" releases, tagged in our [releases page](https://github.com/aragon/aragon/releases), are published on-chain onto the `aragon.aragonpm.eth` aragonPM repository for all supported Ethereum environments (mainnet and Rinkeby testnet).
+"Checkpointed" releases, tagged in our [releases page](https://github.com/aragon/aragon/releases), are published on-chain onto the `aragon.aragonpm.eth` aragonPM repository for all supported Ethereum environments (mainnet and Goerli testnet).
 
 For a long time (2018-2020), these releases were our primary "official" builds. With [Fleek](https://fleek.co/), however, we now relegate these on-chain deployments as historical backups in case a user wants to use an older version.
 

diff --git a/arapp.json b/arapp.json
@@ -15,31 +15,16 @@
       "appName": "aragon.aragonpm.eth",
       "network": "harmonyTest"
     },
-    "rinkeby": {
+    "goerli": {
       "registry": "0x98df287b6c145399aaa709692c8d308357bc085d",
       "appName": "aragon.aragonpm.eth",
-      "network": "rinkeby"
-    },
-    "staging": {
-      "registry": "0xfe03625ea880a8cba336f9b5ad6e15b0a3b5a939",
-      "appName": "aragon.aragonpm.eth",
-      "network": "rinkeby"
+      "network": "goerli"
     },
     "mainnet": {
       "registry": "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e",
       "appName": "aragon.aragonpm.eth",
       "network": "mainnet"
     },
-    "ropsten": {
-      "registry": "0x6afe2cacee211ea9179992f89dc61ff25c61e923",
-      "appName": "aragon.aragonpm.eth",
-      "network": "ropsten"
-    },
-    "rinkeby-old": {
-      "registry": "0xfbae32d1cde62858bc45f51efc8cc4fa1415447e",
-      "appName": "aragon.aragonpm.eth",
-      "network": "rinkeby"
-    }
   },
   "roles": []
 }
diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md
@@ -1,6 +1,6 @@
 # Build-time environment options
 
-The app can be configured in a number of ways via environment variables. Without any settings, the app is configured to connect to our Rinkeby deployment fetching assets from IPFS.
+The app can be configured in a number of ways via environment variables. Without any settings, the app is configured to connect to our Goerli deployment fetching assets from IPFS.
 
 ## General settings
 
@@ -14,7 +14,7 @@ Address of the ENS registry that [aragonPM](https://hack.aragon.org/docs/apm-int
 
 ### `ARAGON_ETH_NETWORK_TYPE`
 
-Expected network type to connect to. Either one of `main`, `rinkeby` or `local`.
+Expected network type to connect to. Either one of `main`, `goerli` or `local`.
 
 ### `ARAGON_ETH_SUBSCRIPTION_EVENT_DELAY`
 

diff --git a/docs/FRONTEND_SETUP.md b/docs/FRONTEND_SETUP.md
@@ -41,12 +41,12 @@ cd aragon
 yarn install
 ```
 
-If a change only impacts the Aragon client, the easiest is to run it connected to rinkeby, and create a testing organization. It requires an internet connection, but it doesn’t require to setup anything else (local Ethereum / IPFS nodes).
+If a change only impacts the Aragon client, the easiest is to run it connected to goerli, and create a testing organization. It requires an internet connection, but it doesn’t require to setup anything else (local Ethereum / IPFS nodes).
 
 Run it:
 
 ```
-yarn start:rinkeby
+yarn start:goerli
 ```
 
 The development server is now running on http://localhost:3000/, and file changes will trigger a rebuild and reload the page.
@@ -106,7 +106,7 @@ Apps need to receive data from the client to run properly, and won’t work when
 
 ```
 cd aragon
-ARAGON_APP_LOCATOR=local yarn start:rinkeby
+ARAGON_APP_LOCATOR=local yarn start:goerli
 ```
 
 Aragon client knows the local ports of every app, so loading any organization and trying to access e.g. the Token Manager will load it from the version running locally.
diff --git a/package.json b/package.json
@@ -114,14 +114,14 @@
     "start": "node scripts/start",
     "start:local": "node scripts/launch-local",
     "start:mainnet": "cross-env ARAGON_ETH_NETWORK_TYPE=main npm start",
-    "start:rinkeby": "npm start",
+    "start:goerli": "npm start",
     "start:staging": "cross-env ARAGON_ENS_REGISTRY_ADDRESS=0xfe03625ea880a8cba336f9b5ad6e15b0a3b5a939 npm start",
     "start:ropsten": "cross-env ARAGON_ETH_NETWORK_TYPE=ropsten npm start",
     "start:xdai": "cross-env ARAGON_ETH_NETWORK_TYPE=xdai npm start",
     "build": "node scripts/build",
     "build:local": "node scripts/build-local",
     "build:mainnet": "cross-env ARAGON_ETH_NETWORK_TYPE=main npm run build",
-    "build:rinkeby": "npm run build",
+    "build:goerli": "npm run build",
     "build:staging": "cross-env ARAGON_ENS_REGISTRY_ADDRESS=0xfe03625ea880a8cba336f9b5ad6e15b0a3b5a939 npm run build",
     "build:ropsten": "cross-env ARAGON_ETH_NETWORK_TYPE=ropsten npm run build",
     "build:xdai": "cross-env ARAGON_ETH_NETWORK_TYPE=xdai npm run build",
@@ -134,9 +134,9 @@
     "publish:mainnet:major": "npm run publish:major -- --environment mainnet --build-script build:mainnet",
     "publish:mainnet:minor": "npm run publish:minor -- --environment mainnet --build-script build:mainnet",
     "publish:mainnet:patch": "npm run publish:patch -- --environment mainnet --build-script build:mainnet",
-    "publish:rinkeby:major": "npm run publish:major -- --environment rinkeby --build-script build:rinkeby",
-    "publish:rinkeby:minor": "npm run publish:minor -- --environment rinkeby --build-script build:rinkeby",
-    "publish:rinkeby:patch": "npm run publish:patch -- --environment rinkeby --build-script build:rinkeby",
+    "publish:goerli:major": "npm run publish:major -- --environment goerli --build-script build:goerli",
+    "publish:goerli:minor": "npm run publish:minor -- --environment goerli --build-script build:goerli",
+    "publish:goerli:patch": "npm run publish:patch -- --environment goerli --build-script build:goerli",
     "publish:staging:major": "npm run publish:major -- --environment staging --build-script build:staging",
     "publish:staging:minor": "npm run publish:minor -- --environment staging --build-script build:staging",
     "publish:staging:patch": "npm run publish:patch -- --environment staging --build-script build:staging",

diff --git a/src/ethereum-providers/connectors.js b/src/ethereum-providers/connectors.js
@@ -7,7 +7,7 @@ export const connectors = [
   {
     id: 'injected',
     properties: {
-      chainId: [1, 4, 137, 80001, 1666600000, 1666700000, 97, 56, 588, 1088], // add here to handle more injected chains
+      chainId: [1, 5, 137, 80001, 1666600000, 1666700000, 97, 56, 588, 1088], // add here to handle more injected chains
     },
   },
   {
@@ -37,10 +37,10 @@ export const connectors = [
   {
     id: 'walletconnect',
     properties: {
-      chainId: [1, 4, 137, 80001, 1666600000, 1666700000, 97, 56, 588, 1088], // add here to handle more injected chains
+      chainId: [1, 5, 137, 80001, 1666600000, 1666700000, 97, 56, 588, 1088], // add here to handle more injected chains
       rpc: {
         '1': 'https://mainnet.eth.aragon.network',
-        '4': 'https://rinkeby.eth.aragon.network',
+        '5': 'https://goerli.eth.aragon.network',
         '137': 'https://polygon-rpc.com',
         '80001': 'https://rpc-mumbai.maticvigil.com',
         '1666600000': 'https://api.harmony.one/',

diff --git a/src/known-organizations/index.js b/src/known-organizations/index.js
@@ -1,5 +1,4 @@
 import aragonGovernanceImage from './images/aragon-governance.svg'
-import aragonMesh from './images/aragon-mesh.svg'
 import aragonNetworkImage from './images/aragon-network.svg'
 import aragonOneImage from './images/aragon-one.svg'
 import blankDaoImage from './images/blankdao.svg'
@@ -11,14 +10,12 @@ import lightwaveImage from './images/lightwave.svg'
 import livepeerImage from './images/livepeer.svg'
 import melonCouncilImage from './images/melon-council.svg'
 import myBitImage from './images/mybit.svg'
-import onehive from './images/1hive.svg'
 import saintFameImage from './images/saint-fame.svg'
 import pieDaoImage from './images/pie-dao.png'
 import valtechImage from './images/valtech.png'
 import pNetworkImage from './images/pnetwork.png'
 import cryptokekImage from './images/cryptokek.svg'
 import nucypherDaoImage from './images/nucypher.svg'
-import nucypherIbexImage from './images/nucypher-ibex.png'
 
 const TEMPLATE_DEMOCRACY = 'Democracy'
 const TEMPLATE_REPUTATION = 'Reputation'
@@ -163,64 +160,6 @@ export const KnownOrganizations = {
       },
     ].map(org => [org.address.toLowerCase(), org])
   ),
-  rinkeby: new Map(
-    [
-      {
-        address: '0x43374144c33def77a0ebacec72e9c944a6c375fe',
-        domain: 'reputation08.aragonid.eth',
-        name: 'Example reputation organization',
-        image: null,
-        recommended: true,
-        template: TEMPLATE_REPUTATION,
-      },
-      {
-        address: '0xb2a22974bd09eb5d1b5c726e7c29f4faef636dd2',
-        domain: 'company08.aragonid.eth',
-        name: 'Example company',
-        image: null,
-        recommended: true,
-        template: TEMPLATE_COMPANY,
-      },
-      {
-        address: '0x0d9938b8720eb5124371c9fa2049144626f67d2e',
-        domain: 'membership08.aragonid.eth',
-        name: 'Example membership',
-        image: null,
-        recommended: true,
-        template: TEMPLATE_MEMBERSHIP,
-      },
-      {
-        address: '0xe520428c232f6da6f694b121181f907931fd2211',
-        domain: 'hive.aragonid.eth',
-        name: '1Hive',
-        image: onehive,
-        recommended: true,
-        template: null,
-      },
-      {
-        address: '0xa48300a4e89b59a79452db7d3cd408df57f4aa78',
-        domain: 'mesh.aragonid.eth',
-        name: 'Aragon Mesh',
-        image: aragonMesh,
-        recommended: true,
-        template: null,
-      },
-      {
-        address: '0xf55DB37807a95C937A0c9c16941D19B54Ce046D2',
-        domain: 'pnetwork.aragonid.eth',
-        image: pNetworkImage,
-        name: 'pNetwork',
-        template: null,
-      },
-      {
-        address: '0x6781aa0CA10d409010d169C9598AC89F2446F2A5',
-        domain: 'ibex.aragonid.eth',
-        image: nucypherIbexImage,
-        name: 'NuCypher IBEX Tesnet DAO',
-        template: null,
-      },
-    ].map(org => [org.address.toLowerCase(), org])
-  ),
 }
 
 // Get the organizations that might appear in the suggestions,

diff --git a/src/network-config.js b/src/network-config.js
@@ -4,7 +4,7 @@ import { chains } from 'use-wallet'
 
 const localEnsRegistryAddress = getEnsRegistryAddress()
 const DAI_MAINNET_TOKEN_ADDRESS = '0x6b175474e89094c44da98b954eedeac495271d0f'
-const DAI_RINKEBY_TOKEN_ADDRESS = '0x5592EC0cfb4dbc12D3aB100b257153436a1f0FEa'
+const DAI_GOERLI_TOKEN_ADDRESS = '0xdc31ee1784292379fbb2964b3b9c4124d8f89c60'
 
 // TODO stop exposing data object [vr 17-09-2021]
 // cconnectGraphEndpoint is https://github.com/aragon/connect/tree/master/packages/connect-thegraph
@@ -46,23 +46,23 @@ export const networkConfigs = {
       ...chains.getChainInformation(3),
     },
   },
-  [chains.getChainInformation(4).type]: {
+  [chains.getChainInformation(5).type]: {
     isActive: true,
     addresses: {
       ensRegistry:
-        localEnsRegistryAddress || '0x98df287b6c145399aaa709692c8d308357bc085d',
-      dai: DAI_RINKEBY_TOKEN_ADDRESS,
+        localEnsRegistryAddress || '0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e',
+      dai: DAI_GOERLI_TOKEN_ADDRESS,
       governExecutorProxy: '0x0451533f685fe028c439821b7502e4cf63b4c32f',
     },
     nodes: {
-      defaultEth: 'wss://rinkeby.eth.aragon.network/ws',
+      defaultEth: 'wss://goerli.eth.aragon.network/ws',
     },
     connectGraphEndpoint:
-      'https://api.thegraph.com/subgraphs/name/aragon/aragon-rinkeby',
+      'https://api.thegraph.com/subgraphs/name/aragon/aragon-goerli',
     settings: {
-      chainId: 4,
+      chainId: 5,
       testnet: true,
-      ...chains.getChainInformation(4), // as returned by web3.eth.net.getNetworkType()
+      ...chains.getChainInformation(5), // as returned by web3.eth.net.getNetworkType()
       live: true,
     },
   },

diff --git a/src/templates/company/index.js b/src/templates/company/index.js
@@ -119,12 +119,7 @@ export default {
     const adjustedDuration = new BN(duration).toString()
     const votingSettings = [adjustedSupport, adjustedQuorum, adjustedDuration]
 
-    // Rinkeby has its gas limit capped at 7M, so some larger 6.5M+ transactions are
-    // often not mined
-    const forceMultipleTransactions =
-      networkType === 'rinkeby' && members.length > 1
-
-    if (!hasPayroll && !forceMultipleTransactions) {
+    if (!hasPayroll) {
       return [
         {
           name: 'Create organization',

diff --git a/src/templates/dandelion/config/helpers/getBlockTime.js b/src/templates/dandelion/config/helpers/getBlockTime.js
@@ -2,7 +2,6 @@
 const NETWORK_TIMES = new Map([
   ['main', 13],
   ['kovan', 4],
-  ['rinkeby', 14],
   ['ropsten', 11],
   ['goerli', 15],
   ['private', 2],

diff --git a/src/templates/membership/index.js b/src/templates/membership/index.js
@@ -118,12 +118,7 @@ export default {
     const adjustedDuration = new BN(duration).toString()
     const votingSettings = [adjustedSupport, adjustedQuorum, adjustedDuration]
 
-    // Rinkeby has its gas limit capped at 7M, so some larger 6.5M+ transactions are
-    // often not mined
-    const forceMultipleTransactions =
-      networkType === 'rinkeby' && members.length > 1
-
-    if (!hasPayroll && !forceMultipleTransactions) {
+    if (!hasPayroll) {
       return [
         {
           name: 'Create organization',

diff --git a/src/templates/reputation/index.js b/src/templates/reputation/index.js
@@ -119,12 +119,7 @@ export default {
     const adjustedDuration = new BN(duration).toString()
     const votingSettings = [adjustedSupport, adjustedQuorum, adjustedDuration]
 
-    // Rinkeby has its gas limit capped at 7M, so some larger 6.5M+ transactions are
-    // often not mined
-    const forceMultipleTransactions =
-      networkType === 'rinkeby' && members.length > 1
-
-    if (!hasPayroll && !forceMultipleTransactions) {
+    if (!hasPayroll) {
       return [
         {
           name: 'Create organization',

diff --git a/src/testnet/airdrop.js b/src/testnet/airdrop.js
@@ -4,7 +4,7 @@ export function testTokensEnabled(network) {
   return !!tokens[network]
 }
 
-export default (web3, financeAddr, from, network = 'rinkeby') => {
+export default (web3, financeAddr, from, network = 'goerli') => {
   const ts = tokens[network]
   const depositer = new web3.eth.Contract(tokens.depositerABI, ts.depositer)
 

diff --git a/src/util/web3.js b/src/util/web3.js
@@ -182,7 +182,7 @@ export function getWeb3(provider) {
 
 /**
  * Get the web3 provider by the network type
- * @param {string} networkType node network type, i.e. main, rinkeby
+ * @param {string} networkType node network type, i.e. main, goerli
  * @returns {object} web3 web socket provider
  */
 export function getWeb3Provider(networkType) {