Skip to content

Commit

Permalink
DAO-43 Multichain support - WIP (#1562)
Browse files Browse the repository at this point in the history
* DAO-92 upgrade use wallet to 0.9.0 (#1557)

* use use-wallet 0.9.0

* remove unnecessary dependency

* fix the CI error @toruslabs/[email protected] for node version too old

* Re-order templates (#1558)

* detect network change

* use injected instead of provided connector, as provided connector is a hack to around web3.js overrides

* switch welcome page content base on network

* more reactive network changes

* fix error on missing networkType

* eth node and ipfs settings by network

* getAppLocator by network type

Co-authored-by: Rekard0 <[email protected]>

* fix open organization error and slow down due to too many open websockets (#1563)

* show unsupported network error (#1565)

* DAO-104 CI job error (#1566)

* temporary use --network-concurrency 1, to be removed once use-wallet 0.9.0 is published.

* Merge to DAO-43-multichain (#1568)

* connectors redesigned for multichain

* local storage key missing network type

* DAO-83 only show network settings on mainnet (#1569)

* only show network settings on mainnet

* refresh org on network change (#1570)

* Dao 120 websocket leakage (#1572)

* refactor and attempt to fix websocket leaks

* fix connection error on socket disconnect web3

* eslint fixed

* update aragon wrapper

Co-authored-by: yuetloo <[email protected]>

* Feature/dao 81 multi localstorage (#1573)

* connectors redesigned for multichain

* eslint problems fixed

* multi localstorage

* update multi localstorage

* update aragon.js wrapper

* eslint fixed

* DAO-128 connection not open (#1574)

* fix load org error on network switch

* ipfs settings is network agnostic

* code review comment

* remove mainnet from network type

* DAO-143 Create DAO freeze (#1579)

fix bug that caused create dao to freeze

* show wrong network on connect button and refactoring (#1575)

* fix screen id typo and clear cache error because wrapper = null (#1580)

* show network only for mainnet (#1581)

* DAO-139: remove sentry (#1582)

* show network only for mainnet

* replace logging with sentry with console.log

* remove sentry

* add newline

* remove obsolete .env.enc file

* DAO-162: handle network change in the middle of create DAO flow (#1583)

* fix deployment error due to missing wallet

* redirect to home on network change

* fix lint error

* DAO-194: use networkName from use-wallet (#1586)

* use networkName from use-wallet

* remove neteworkType.js

* revert network type changes for notification service

* update comment

* fix undefined web3 error (#1588)

* Feature/dao migration (#1590)

* connectors redesigned for multichain

* eslint problems fixed

* add govern migration page

* fix lint error

* add address field and refactoring

* add govern migration script call

* add govern migration handler

* remove network type

* update yarn.lock

* eslint fixed

* eslint fixed

* eslint fixed

* eslint fixed

* fix nullish operator

* fixed eslint

* fixed eslint

Co-authored-by: yuetloo <[email protected]>

* add mumbai

* Feature/migration (#1592)

* add mumbai

* migration + multichain

* eslint fixed

* eslint fixed

* Fix/matic symbol on create (#1593)

* add mumbai

* fix matic symbol

* eslint fixed

* Feature/dao 233 hide discover apps (#1596)

* add mumbai

* add discover app check

* eslint fixed

* fix missing dependency in hook

* Feature/dao 235 copy missing (#1597)

* add mumbai

* fix network name on copy missing

* Feature/dao 230 remove templates (#1598)

* add mumbai

* add template removal for unavailable templates

* eslint fixed'

* Feature/update aragonui (#1599)

* add mumbai

* update aragon ui

* Feature/ DAO-222 (#1600)

* page ui updates

* update ui order

* add transaction pannel

* clean up

* fix lint

* add descripting to transaction

* remove unneccessary dep

Co-authored-by: Giorgi Lagidze <[email protected]>

* DAO-238 polygon no connection issue (#1601)

* fix no connection issue and eslint warning

* remove unneccessary comment

Co-authored-by: Giorgi Lagidze <[email protected]>

* Fix/govern migration check (#1602)

* add mumbai

* govern migration restriction

* fix eslint

* date restriction for migration

* eslint fixed

* DAO-239 initialize wrapper with Client network information (#1603)

* pass network to init wrapper

* from network to type + use wallet update

Co-authored-by: Giorgi Lagidze <[email protected]>

* update wrapper and multichain

* add ens registry for matic

* change matic socket

* matic node change

* enable migration on mainnet as well

* DAO-245 reset connection status on network switch (#1604)

* cleanup code

* reset isListening status on network switch

Co-authored-by: Rekard0 <[email protected]>
Co-authored-by: Giorgi Lagidze <[email protected]>
  • Loading branch information
3 people authored Sep 1, 2021
1 parent 10d487d commit 9b3f7e2
Show file tree
Hide file tree
Showing 99 changed files with 7,668 additions and 4,924 deletions.
5 changes: 2 additions & 3 deletions .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@
{
"modules": false,
"useBuiltIns": "entry",
"corejs": 3,
"corejs": 3
}
],
"@babel/preset-react"
],
"plugins": [
["styled-components", { "displayName": true }],
"@babel/plugin-proposal-class-properties"
["styled-components", { "displayName": true }]
],
"env": {
"test": {
Expand Down
6 changes: 0 additions & 6 deletions .env.enc

This file was deleted.

1 change: 0 additions & 1 deletion .env.sample
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
ARAGON_PORTIS_DAPP_ID=
ARAGON_FORTMATIC_API_KEY=
ARAGON_SENTRY_DSN=
5 changes: 3 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ jobs:
- name: Install node
uses: actions/setup-node@v1
with:
node-version: 12
node-version: 14
- name: Install dependencies
run: yarn install --frozen-lockfile
# TODO remove --network-concurrency 1 once use-wallet 0.9.0 is published
run: yarn install --frozen-lockfile --network-concurrency 1
- name: Build Aragon
run: yarn build
- name: Run BundleWatch
Expand Down
6 changes: 0 additions & 6 deletions HACKS.md

This file was deleted.

14 changes: 1 addition & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,7 @@ For a long time (2018-2020), these releases were our primary "official" builds.

A number of environment secrets are required during publishing and these are sometimes different per network.

You may either specify these secrets as environment variables or use a `.env`. An Aragon One encrypted file ([`.env.enc`](./.env.enc)) is included in this repo with the current secrets used when publishing to aragonPM.

To decrypt:

```
keybase decrypt -i .env.enc -o .env
```

To encrypt:

```
keybase encrypt --team aragonone -i .env -o .env.enc
```
You may either specify these secrets as environment variables or use a `.env`.

## Contributing

Expand Down
6 changes: 0 additions & 6 deletions docs/CONFIGURATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,6 @@ API key from [Formatic](fortmatic.com). Requires separate keys for testnet / mai

API key from [Portis](portis.io). Requires separate keys for testnet / mainnet.

## 3rd Party APIs

### `ARAGON_SENTRY_DSN`

[Sentry DSN](https://docs.sentry.io/error-reporting/configuration/?platform=node#dsn) for forwarding error logs.

## Development settings

### `ARAGON_PORT`
Expand Down
16 changes: 0 additions & 16 deletions now.json

This file was deleted.

10 changes: 6 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,24 @@
},
"dependencies": {
"@aragon/templates-tokens": "^1.2.1",
"@aragon/ui": "^1.5.0",
"@aragon/wrapper": "^5.0.0-rc.28",
"@sentry/browser": "^5.17.0",
"@aragon/ui": "^1.9.0",
"@aragon/v2-migrator-script": "^0.1.4",
"@aragon/wrapper": "^5.3.0",
"@ungap/event-target": "^0.1.0",
"clipboard-polyfill": "^2.8.6",
"core-js": "^3.3.2",
"dayjs": "^1.8.28",
"decimal.js": "^10.2.0",
"dotenv": "^8.2.0",
"eth-ens-namehash": "^2.0.8",
"ethers": "^5.4.4",
"file-saver": "^2.0.1",
"history": "^4.9.0",
"lodash.debounce": "^4.0.8",
"lodash.memoize": "^4.1.2",
"lodash.throttle": "^4.1.1",
"lodash.uniqby": "^4.7.0",
"network-config": "^3.0.0",
"prop-types": "^15.6.2",
"react": "^16.8.6",
"react-dom": "^16.8.6",
Expand All @@ -60,7 +62,7 @@
"regenerator-runtime": "^0.13.3",
"resolve-pathname": "^3.0.0",
"styled-components": "^4.1.3",
"use-wallet": "^0.7.1",
"use-wallet": "https://github.com/aragon/use-wallet.git#multichain",
"web3": "^1.2.6",
"web3-eth-abi": "^1.2.6",
"web3-utils": "^1.2.6"
Expand Down
Loading

0 comments on commit 9b3f7e2

Please sign in to comment.