Merge main branch

.dockerignore

@@ -0,0 +1,35 @@
+# See https://help.github.com/ignore-files/ for more about ignoring files.
+
+# configuration
+# (keep `.env.enc` and `.env.sample`, but ignore all other `.env`s)
+.env*
+!.env.enc
+!.env.sample
+
+# dependencies
+node_modules/
+
+# testing
+coverage/
+
+# production
+public/
+
+# zeit now configuration
+.now
+
+# misc
+.DS_Store
+.cache
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+public/apps/
+public/aragon-ui/
+
+# ignore package-lock files (only use yarn.lock)
+package-lock.json
+
+.github

.env.sample

@@ -1,3 +1,4 @@
 ARAGON_PORTIS_DAPP_ID=
 ARAGON_FORTMATIC_API_KEY=
 ARAGON_SENTRY_DSN=
+ARAGON_WALLETCONNECT_RPC_URL=

Dockerfile

@@ -0,0 +1,34 @@
+FROM node:12
+
+RUN yarn global add http-server
+
+WORKDIR /aragon
+COPY package.json yarn.lock ./
+
+RUN yarn install --frozen-lockfile --non-interactive --ignore-optional \
+ && yarn cache clean
+COPY . .
+
+ARG ARAGON_APP_LOCATOR
+ARG ARAGON_ETH_NETWORK_TYPE
+ARG ARAGON_ENS_REGISTRY_ADDRESS
+ARG ARAGON_IPFS_GATEWAY
+ARG ARAGON_DEFAULT_ETH_NODE
+ARG ARAGON_WALLETCONNECT_RPC_URL
+ARG ARAGON_PORTIS_DAPP_ID
+ARG ARAGON_FORTMATIC_API_KEY
+ARG ARAGON_SENTRY_DSN
+
+ENV ARAGON_APP_LOCATOR=$ARAGON_APP_LOCATOR
+ENV ARAGON_ETH_NETWORK_TYPE=$ARAGON_ETH_NETWORK_TYPE
+ENV ARAGON_ENS_REGISTRY_ADDRESS=$ARAGON_ENS_REGISTRY_ADDRESS
+ENV ARAGON_IPFS_GATEWAY=$ARAGON_IPFS_GATEWAY
+ENV ARAGON_DEFAULT_ETH_NODE=$ARAGON_DEFAULT_ETH_NODE
+ENV ARAGON_WALLETCONNECT_RPC_URL=$ARAGON_WALLETCONNECT_RPC_URL
+ENV ARAGON_PORTIS_DAPP_ID=$ARAGON_PORTIS_DAPP_ID
+ENV ARAGON_FORTMATIC_API_KEY=$ARAGON_FORTMATIC_API_KEY
+ENV ARAGON_SENTRY_DSN=$ARAGON_SENTRY_DSN
+ENV NODE_OPTIONS=--max_old_space_size=4096
+RUN yarn build
+
+ENTRYPOINT ["http-server"]

build.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+source ./.env
+set -e +u
+set -o pipefail
+
+: ${TAG:=rinkeby}
+IMG="lidofinance/aragon-client"
+export DOCKER_CONFIG=$HOME/.lidofinance
+
+# : ${ARAGON_APP_LOCATOR:=ipfs}
+# : ${ARAGON_ETH_NETWORK_TYPE:=main}
+# : ${ARAGON_ENS_REGISTRY_ADDRESS:=0x314159265dd8dbb310642f98f50c066173c1259b}
+# : ${ARAGON_IPFS_GATEWAY:=https://ipfs.eth.aragon.network/ipfs}
+# : ${ARAGON_DEFAULT_ETH_NODE:=wss://mainnet.eth.aragon.network/ws}
+# : ${ARAGON_WALLETCONNECT_RPC_URL:=https://mainnet.eth.aragon.network}
+# : ${ARAGON_PORTIS_DAPP_ID:=}
+# : ${ARAGON_FORTMATIC_API_KEY:=}
+# : ${ARAGON_SENTRY_DSN:=}
+
+echo "Building $IMG:$TAG Docker image..."
+docker build \
+    --build-arg ARAGON_APP_LOCATOR=$ARAGON_APP_LOCATOR \
+    --build-arg ARAGON_ETH_NETWORK_TYPE=$ARAGON_ETH_NETWORK_TYPE \
+    --build-arg ARAGON_ENS_REGISTRY_ADDRESS=$ARAGON_ENS_REGISTRY_ADDRESS \
+    --build-arg ARAGON_DEFAULT_ETH_NODE=$ARAGON_DEFAULT_ETH_NODE \
+    --build-arg ARAGON_IPFS_GATEWAY=$ARAGON_IPFS_GATEWAY \
+    --build-arg ARAGON_WALLETCONNECT_RPC_URL=$ARAGON_WALLETCONNECT_RPC_URL \
+    --build-arg ARAGON_PORTIS_DAPP_ID=$ARAGON_PORTIS_DAPP_ID \
+    --build-arg ARAGON_FORTMATIC_API_KEY=$ARAGON_FORTMATIC_API_KEY \
+    --build-arg ARAGON_SENTRY_DSN=$ARAGON_SENTRY_DSN \
+    -t $IMG:$TAG .
+
+echo "Pushing $IMG:$TAG to the Docker Hub"
+docker push $IMG:$TAG

build_local.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+ARAGON_IPFS_GATEWAY=http://localhost:8080/ipfs \
+ARAGON_DEFAULT_ETH_NODE=ws://localhost:8546 \
+ARAGON_APP_LOCATOR=ipfs \
+ARAGON_ETH_NETWORK_TYPE=local \
+ARAGON_ENS_REGISTRY_ADDRESS=0x5f6f7e8cc7346a11ca2def8f827b7a0b612c56a1 \
+TAG=local ./build.sh

build_mainnet.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+ARAGON_ETH_NETWORK_TYPE=main \
+ARAGON_DEFAULT_ETH_NODE=wss://mainnet.infura.io/ws/v3/e03b2755aaf24488aa013b9aed8c4170 \
+ARAGON_WALLETCONNECT_RPC_URL=https://mainnet.infura.io/v3/e03b2755aaf24488aa013b9aed8c4170 \
+TAG=mainnet-infura ./build.sh

build_rinkeby.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+ARAGON_ETH_NETWORK_TYPE=rinkeby \
+TAG=rinkeby ./build.sh

build_testnet.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+
+ARAGON_IPFS_GATEWAY=https://goerli.lido.fi/ipfs \
+ARAGON_DEFAULT_ETH_NODE=wss://goerli-light.eth.linkpool.io/ws \
+ARAGON_WALLETCONNECT_RPC_URL=https://goerli-light.eth.linkpool.io \
+ARAGON_APP_LOCATOR=ipfs \
+ARAGON_ETH_NETWORK_TYPE=goerli \
+ARAGON_ENS_REGISTRY_ADDRESS=0x043e6dbc5cad60874727d21ecc2aaebf50a0de80 \
+TAG=testnet ./build.sh
+

package.json

@@ -35,7 +35,7 @@
   "dependencies": {
     "@aragon/templates-tokens": "^1.2.1",
     "@aragon/ui": "^1.5.0",
-    "@aragon/wrapper": "^5.0.0-rc.28",
+    "@1hive/wrapper": "^5.0.0",
     "@sentry/browser": "^5.17.0",
     "@ungap/event-target": "^0.1.0",
     "clipboard-polyfill": "^2.8.6",
@@ -98,8 +98,8 @@
     "rimraf": "^2.6.2"
   },
   "resolutions": {
-    "@aragon/wrapper/web3": "1.2.6",
-    "@aragon/wrapper/web3-eth-abi": "1.2.6"
+    "@1hive/wrapper/web3": "1.2.6",
+    "@1hive/wrapper/web3-eth-abi": "1.2.6"
   },
   "scripts": {
     "bundlewatch": "bundlewatch",
@@ -110,13 +110,15 @@
     "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",
+    "start:polygon": "cross-env ARAGON_ETH_NETWORK_TYPE=polygon 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: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",
+    "build:polygon": "cross-env ARAGON_ETH_NETWORK_TYPE=polygon npm run build",
     "lint": "eslint ./src",
     "test": "npm run lint && npm run jest",
     "jest": "jest",

scripts/build

@@ -19,6 +19,6 @@ process.env.ARAGON_PACKAGE_VERSION = commitSha
   ? `${version}-${commitSha}`
   : version
 execute(
-  `parcel build src/index.html --out-dir ./${buildDir} --public-url ./ --no-cache`,
+  `parcel build src/index.html --out-dir ./${buildDir} --public-url ./ --no-cache --no-source-maps`,
   { stdio: 'inherit' }
 )

src/App.js

@@ -45,12 +45,11 @@ const INITIAL_DAO_STATE = {
 }
 
 const SELECTOR_NETWORKS = [
-  ['main', 'Ethereum Mainnet', 'https://client.aragon.org/'],
-  [
-    'rinkeby',
-    'Ethereum Testnet (Rinkeby)',
-    'https://rinkeby.client.aragon.org/',
-  ],
+  [100, 'xdai', 'xDai Network', '.'], // the dots are used to direct the app to the same page, as a refresh
+  [137, 'polygon', 'Polygon Network', '.'],
+  [1, 'main', 'Ethereum Mainnet', '.'],
+  [4, 'rinkeby', 'Ethereum Testnet (Rinkeby)', '.'],
+  [5, 'goerli', 'Ethereum Testnet (Göerli)', '.'],
 ]
 if (network.type === 'ropsten') {
   SELECTOR_NETWORKS.push([

src/aragon.cdapp

@@ -0,0 +1,11 @@
+{
+    "name": "Aragon",
+    "version": "1.0",
+    "description": "Create and manage decentralized organizations (DAOs) on Ethereum.",
+    "author": "plasmmer",
+    "url": "https://aragon.plasmmer.eth.link/index.html",
+    "icon": "https://aragon.plasmmer.eth.link/favicon.caf9c731.svg",
+    "permissions" : "true",
+    "width": "700",
+    "height": "450"
+}

src/aragonjs-wrapper.js

@@ -4,7 +4,7 @@ import Aragon, {
   ensResolve,
   getRecommendedGasLimit,
   providers,
-} from '@aragon/wrapper'
+} from '@1hive/wrapper'
 import {
   appOverrides,
   sortAppsPair,

src/ethereum-providers/index.js

@@ -7,6 +7,7 @@ import status from './icons/Status.png'
 import wallet from './icons/wallet.svg'
 import fortmatic from './icons/Fortmatic.svg'
 import portis from './icons/Portis.svg'
+import walletconnect from './icons/WalletConnect.svg'
 
 // See the corresponding prop type, EthereumProviderType, in prop-types.js.
 const PROVIDERS = new Map(
@@ -65,6 +66,15 @@ const PROVIDERS = new Map(
         'your Ethereum wallet': 'Portis',
       },
     },
+    {
+      id: 'walletconnect',
+      name: 'WalletConnect',
+      type: 'Any',
+      image: walletconnect,
+      strings: {
+        'your Ethereum wallet': 'WalletConnect',
+      },
+    },
     {
       id: 'unknown',
       name: 'Unknown',

src/known-organizations/index.js

@@ -19,6 +19,12 @@ 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'
+import lidoImage from './images/lido.svg'
+import gamlrImage from './images/gamlr.png'
+import plasmmerImage from './images/plasmmer.jpg'
+import AragonChinaImage from './images/aragonchina.png'
+import floflisImage from './images/floflis.jpg'
+import opiImage from './images/opi.png'
 
 const TEMPLATE_DEMOCRACY = 'Democracy'
 const TEMPLATE_REPUTATION = 'Reputation'
@@ -29,6 +35,22 @@ const TEMPLATE_DANDELION = 'Dandelion'
 export const KnownOrganizations = {
   main: new Map(
     [
+      {
+        address: '0xb8FFC3Cd6e7Cf5a098A1c92F48009765B24088Dc',
+        domain: 'lido-dao.aragonid.eth',
+        image: lidoImage,
+        name: 'Lido',
+        template: TEMPLATE_COMPANY,
+        recommended: true,
+      },
+      {
+        address: '0xacf1921f2298d977843fe8b6d56d57e9060799ef',
+        domain: 'aragonchina.aragonid.eth',
+        name: 'Aragon China',
+        image: AragonChinaImage,
+        recommended: true,
+        template: TEMPLATE_COMPANY,
+      },
       {
         address: '0xF47917B108ca4B820CCEA2587546fbB9f7564b56',
         domain: 'dcl.eth',
@@ -165,6 +187,14 @@ export const KnownOrganizations = {
   ),
   rinkeby: new Map(
     [
+      {
+        address: '0x900f89ad80DEF8ffCAFE930B69Da111b0051Af6A',
+        domain: 'lido-dao-test-2.aragonid.eth',
+        image: lidoImage,
+        name: 'Lido',
+        template: TEMPLATE_COMPANY,
+        recommended: true,
+      },
       {
         address: '0x43374144c33def77a0ebacec72e9c944a6c375fe',
         domain: 'reputation08.aragonid.eth',
@@ -221,6 +251,54 @@ export const KnownOrganizations = {
       },
     ].map(org => [org.address.toLowerCase(), org])
   ),
+  goerli: new Map(
+    [
+      {
+        address: '0xE2Bb0843167da9672534cc939c59D6F6F31d3D42',
+        domain: 'lido-testnet.aragonid.eth',
+        image: lidoImage,
+        name: 'Lido',
+        template: TEMPLATE_COMPANY,
+        recommended: true,
+      },
+    ].map(org => [org.address.toLowerCase(), org])
+  ),
+  xdai: new Map(
+    [
+      {
+        address: '0xe9938dbafba04f609c5d484b2871adae204c90fa',
+        domain: 'gamlr.aragonid.eth',
+        image: gamlrImage,
+        name: 'Gamlr',
+        template: TEMPLATE_COMPANY,
+        recommended: true,
+      },
+      {
+        address: '0xbc2d0266f338ee49fc5639d7b6fdd748fe52946a',
+        domain: 'plasmmer.aragonid.eth',
+        image: plasmmerImage,
+        name: 'Plasmmer',
+        template: TEMPLATE_COMPANY,
+        recommended: true,
+      },
+      {
+        address: '0x535d7922966a778d890a15be1df11d0846ebaeb8',
+        domain: 'floflis.aragonid.eth',
+        image: floflisImage,
+        name: 'Floflis',
+        template: TEMPLATE_COMPANY,
+        recommended: true,
+      },
+      {
+        address: '0x45e7702b62ee9e53add9698523bf503556aa6697',
+        domain: 'opi.aragonid.eth',
+        image: opiImage,
+        name: 'Open Planet Initiative (bricked by Vitalik)',
+        template: TEMPLATE_REPUTATION,
+        recommended: true,
+      },
+    ].map(org => [org.address.toLowerCase(), org])
+  ),
 }
 
 // Get the organizations that might appear in the suggestions,