Update anchor deployments, fix relayer modal on bridge tab (#389)

* Branch for adding another ORML asset * Update deployment configuration for evm-localnet and 6-bridge WETH testnet * Comment out EVM testnet deployment chains until it is stable * Update to latest deployed webb.js * Fix Error when switching to unsupported network
tangle-network · May 16, 2022 · 167b54b · 167b54b
1 parent 3154455
commit 167b54b
Show file tree

Hide file tree

Showing 23 changed files with 223 additions and 194 deletions.
diff --git a/package.json b/package.json
@@ -13,17 +13,17 @@
     "eslint": "^6.6.0",
     "@polkadot/api": "8.1.1",
     "react-error-overlay": "6.0.9",
-    "@webb-tools/api": "0.1.4-55",
-    "@webb-tools/api-derive": "0.1.4-55",
-    "@webb-tools/types": "0.1.4-55",
-    "@webb-tools/app-util": "0.1.4-55",
-    "@webb-tools/sdk-core": "0.1.4-55",
-    "@webb-tools/wasm-utils": "0.1.4-55",
-    "@webb-tools/api-providers": "0.1.4-55",
+    "@webb-tools/api": "0.1.4-60",
+    "@webb-tools/api-derive": "0.1.4-60",
+    "@webb-tools/types": "0.1.4-60",
+    "@webb-tools/app-util": "0.1.4-60",
+    "@webb-tools/sdk-core": "0.1.4-60",
+    "@webb-tools/wasm-utils": "0.1.4-60",
+    "@webb-tools/api-providers": "0.1.4-60",
     "@webb-tools/utils": "0.1.7",
-    "@webb-tools/contracts": "0.1.7",
+    "@webb-tools/contracts": "0.1.8",
     "@webb-tools/interfaces": "0.1.9",
-    "@webb-tools/anchors": "0.1.11"
+    "@webb-tools/anchors": "0.1.12"
   },
   "scripts": {
     "bump-version": "node scripts/bump-version.js",
@@ -43,7 +43,7 @@
     "@walletconnect/client": "^1.7.1",
     "@walletconnect/qrcode-modal": "^1.7.1",
     "@walletconnect/web3-provider": "^1.7.1",
-    "@webb-tools/api-providers": "0.1.4-55",
+    "@webb-tools/api-providers": "0.1.4-60",
     "D": "^1.0.0",
     "circom": "^0.5.45",
     "circomlib": "^2.0.1",
@@ -60,7 +60,8 @@
     "rxjs": "7.5.2",
     "snarkjs": "0.4.16",
     "tinycolor2": "^1.4.2",
-    "web3": "^1.3.5"
+    "web3": "^1.3.5",
+    "yargs": "^17.4.1"
   },
   "devDependencies": {
     "@babel/plugin-syntax-import-meta": "^7.10.4",

diff --git a/packages/apps/src/configs/anchors/anchor-config.ts b/packages/apps/src/configs/anchors/anchor-config.ts
@@ -4,37 +4,37 @@ import { AppConfig, InternalChainId, WebbCurrencyId } from '@webb-tools/api-prov
 export const anchorsConfig: AppConfig['anchors'] = {
   [WebbCurrencyId.webbWETH]: [
     {
-      amount: '0.1',
+      amount: '0.01',
       anchorTreeIds: {},
       anchorAddresses: {
-        [InternalChainId.Ropsten]: '0x97747a4De7302Ff7Ee3334e33138879469BFEcf8',
-        [InternalChainId.Rinkeby]: '0x09B722aA809A076027FA51902e431a8C03e3f8dF',
-        [InternalChainId.Goerli]: '0x6aA5C74953F7Da1556a298C5e129E417410474E2',
-        [InternalChainId.PolygonTestnet]: '0x12323BcABB342096669d80F968f7a31bdB29d4C4',
-        [InternalChainId.OptimismTestnet]: '0xC44A4EcAC4f23b6F92485Cb1c90dBEd75a987BC8',
-        [InternalChainId.ArbitrumTestnet]: '0xD8a8F9629a98EABFF31CfA9493f274A4D5e768Cd',
+        [InternalChainId.Ropsten]: '0x09d2D6520BE3922549c81885477258F41c96c43f',
+        [InternalChainId.Rinkeby]: '0x95E2eB4c9Fe2FB580E27dCe997e0E3D69FFdDf5a',
+        [InternalChainId.Goerli]: '0x6188F18359250f241e2171BAFD57447F8931176e',
+        [InternalChainId.PolygonTestnet]: '0x95E2eB4c9Fe2FB580E27dCe997e0E3D69FFdDf5a',
+        [InternalChainId.OptimismTestnet]: '0x27a693cdF40acFc18195C2ecc9f0352452624e84',
+        [InternalChainId.ArbitrumTestnet]: '0x30aEF9a80BAe60Cd789904C8875fbd6a19b80488',
       },
     },
   ],
   [WebbCurrencyId.WEBB]: [
     {
       amount: '10',
       anchorTreeIds: {
-        [InternalChainId.WebbDevelopment]: '3',
+        [InternalChainId.ProtocolSubstrateStandalone]: '3',
       },
       anchorAddresses: {},
     },
     {
       amount: '100',
       anchorTreeIds: {
-        [InternalChainId.WebbDevelopment]: '4',
+        [InternalChainId.ProtocolSubstrateStandalone]: '4',
       },
       anchorAddresses: {},
     },
     {
       amount: '1000',
       anchorTreeIds: {
-        [InternalChainId.WebbDevelopment]: '5',
+        [InternalChainId.ProtocolSubstrateStandalone]: '5',
       },
       anchorAddresses: {},
     },
@@ -45,7 +45,17 @@ export const anchorsConfig: AppConfig['anchors'] = {
       anchorTreeIds: {},
       anchorAddresses: {
         [InternalChainId.HermesLocalnet]: '0xbfce6B877Ebff977bB6e80B24FbBb7bC4eBcA4df',
-        [InternalChainId.AthenaLocalnet]: '0x4e3df2073bf4b43B9944b8e5A463b1E185D6448C',
+        [InternalChainId.AthenaLocalnet]: '0xcd75Ad7AC9C9325105f798c476E84176648F391A',
+        [InternalChainId.DemeterLocalnet]: '0x4e3df2073bf4b43B9944b8e5A463b1E185D6448C',
+      },
+    },
+    {
+      amount: '0.01',
+      anchorTreeIds: {},
+      anchorAddresses: {
+        [InternalChainId.HermesLocalnet]: '0xaC361518Bb9535D0E3172DC45a4e56d71a7FDFc4',
+        [InternalChainId.AthenaLocalnet]: '0x3d3955aAe5Bdf9E6547A140Baad4BC57Fa4EBA17',
+        [InternalChainId.DemeterLocalnet]: '0x91eB86019FD8D7c5a9E31143D422850A13F670A3',
       },
     },
   ],

diff --git a/packages/apps/src/configs/chains/chain-config.ts b/packages/apps/src/configs/chains/chain-config.ts
@@ -1,4 +1,3 @@
-// import { GLogo, KLogo, RLogo } from '@webb-dapp/apps/configs/logos/chains';
 // import ArbitrumLogo from '@webb-dapp/apps/configs/logos/chains/ArbitrumLogo';
 // import EdgewareLogo from '@webb-dapp/apps/configs/logos/chains/EdgewareLogo';
 import GanacheLogo from '@webb-dapp/apps/configs/logos/chains/GanacheLogo';
@@ -7,6 +6,7 @@ import GanacheLogo from '@webb-dapp/apps/configs/logos/chains/GanacheLogo';
 // import PolygonLogo from '@webb-dapp/apps/configs/logos/chains/PolygonLogo';
 // import ShidenLogo from '@webb-dapp/apps/configs/logos/chains/ShidenLogo';
 import WEBBLogo from '@webb-dapp/apps/configs/logos/chains/WebbLogo';
+import EtherLogo from '@webb-dapp/apps/configs/logos/Eth';
 import {
   AppConfig,
   ChainType,
@@ -75,9 +75,9 @@ export const chainsConfig: AppConfig['chains'] = {
   //   url: 'https://rinkeby.infura.io/v3/e54b7176271840f9ba62e842ff5d6db4',
   //   evmRpcUrls: ['https://rinkeby.infura.io/v3/e54b7176271840f9ba62e842ff5d6db4'],
   //   blockExplorerStub: 'https://rinkeby.etherscan.io',
-  //   logo: RLogo,
+  //   logo: EtherLogo,
   //   tag: 'test',
-  //   currencies: [WebbCurrencyId.ETH, WebbCurrencyId.WETH],
+  //   currencies: [WebbCurrencyId.ETH, WebbCurrencyId.WETH, WebbCurrencyId.webbWETH],
   //   nativeCurrencyId: WebbCurrencyId.ETH,
   // },
   // [InternalChainId.Ropsten]: {
@@ -89,9 +89,9 @@ export const chainsConfig: AppConfig['chains'] = {
   //   url: 'https://ropsten.infura.io/v3/e54b7176271840f9ba62e842ff5d6db4',
   //   evmRpcUrls: ['https://ropsten.infura.io/v3/e54b7176271840f9ba62e842ff5d6db4'],
   //   blockExplorerStub: 'https://ropsten.etherscan.io',
-  //   logo: RLogo,
+  //   logo: EtherLogo,
   //   tag: 'test',
-  //   currencies: [WebbCurrencyId.ETH, WebbCurrencyId.WETH],
+  //   currencies: [WebbCurrencyId.ETH, WebbCurrencyId.WETH, WebbCurrencyId.webbWETH],
   //   nativeCurrencyId: WebbCurrencyId.ETH,
   // },
   // [InternalChainId.Goerli]: {
@@ -103,9 +103,9 @@ export const chainsConfig: AppConfig['chains'] = {
   //   url: 'https://goerli.infura.io/v3/e54b7176271840f9ba62e842ff5d6db4',
   //   evmRpcUrls: ['https://goerli.infura.io/v3/e54b7176271840f9ba62e842ff5d6db4'],
   //   blockExplorerStub: 'https://goerli.etherscan.io',
-  //   logo: GLogo,
+  //   logo: EtherLogo,
   //   tag: 'test',
-  //   currencies: [WebbCurrencyId.ETH, WebbCurrencyId.WETH],
+  //   currencies: [WebbCurrencyId.ETH, WebbCurrencyId.WETH, WebbCurrencyId.webbWETH],
   //   nativeCurrencyId: WebbCurrencyId.ETH,
   // },
   // [InternalChainId.Kovan]: {
@@ -133,7 +133,7 @@ export const chainsConfig: AppConfig['chains'] = {
   //   blockExplorerStub: 'https://kovan-optimistic.etherscan.io',
   //   logo: OptimismLogo,
   //   tag: 'test',
-  //   currencies: [WebbCurrencyId.ETH, WebbCurrencyId.WETH],
+  //   currencies: [WebbCurrencyId.ETH, WebbCurrencyId.WETH, WebbCurrencyId.webbWETH],
   //   nativeCurrencyId: WebbCurrencyId.ETH,
   // },
   // [InternalChainId.ArbitrumTestnet]: {
@@ -147,7 +147,7 @@ export const chainsConfig: AppConfig['chains'] = {
   //   blockExplorerStub: 'https://testnet.arbiscan.io',
   //   logo: ArbitrumLogo,
   //   tag: 'test',
-  //   currencies: [WebbCurrencyId.ETH, WebbCurrencyId.WETH],
+  //   currencies: [WebbCurrencyId.ETH, WebbCurrencyId.WETH, WebbCurrencyId.webbWETH],
   //   nativeCurrencyId: WebbCurrencyId.ETH,
   // },
   // [InternalChainId.HarmonyTestnet1]: {
@@ -237,7 +237,7 @@ export const chainsConfig: AppConfig['chains'] = {
   //   evmRpcUrls: ['https://rpc-mumbai.maticvigil.com/'],
   //   blockExplorerStub: 'https://mumbai.polygonscan.com/',
   //   logo: PolygonLogo,
-  //   currencies: [WebbCurrencyId.MATIC, WebbCurrencyId.WETH],
+  //   currencies: [WebbCurrencyId.MATIC, WebbCurrencyId.WETH, WebbCurrencyId.webbWETH],
   //   nativeCurrencyId: WebbCurrencyId.MATIC,
   // },
   [InternalChainId.HermesLocalnet]: {
@@ -250,8 +250,8 @@ export const chainsConfig: AppConfig['chains'] = {
     url: 'http://127.0.0.1:5001',
     evmRpcUrls: ['http://127.0.0.1:5001'],
     logo: GanacheLogo,
-    currencies: [WebbCurrencyId.webbDEV, WebbCurrencyId.DEV],
-    nativeCurrencyId: WebbCurrencyId.DEV,
+    currencies: [WebbCurrencyId.webbDEV, WebbCurrencyId.DEV, WebbCurrencyId.ETH],
+    nativeCurrencyId: WebbCurrencyId.ETH,
   },
   [InternalChainId.AthenaLocalnet]: {
     chainType: ChainType.EVM,
@@ -263,8 +263,21 @@ export const chainsConfig: AppConfig['chains'] = {
     url: 'http://127.0.0.1:5002',
     evmRpcUrls: ['http://127.0.0.1:5002'],
     logo: GanacheLogo,
-    currencies: [WebbCurrencyId.webbDEV, WebbCurrencyId.DEV],
-    nativeCurrencyId: WebbCurrencyId.DEV,
+    currencies: [WebbCurrencyId.webbDEV, WebbCurrencyId.DEV, WebbCurrencyId.ETH],
+    nativeCurrencyId: WebbCurrencyId.ETH,
+  },
+  [InternalChainId.DemeterLocalnet]: {
+    chainType: ChainType.EVM,
+    group: 'eth',
+    id: InternalChainId.DemeterLocalnet,
+    chainId: EVMChainId.DemeterLocalnet,
+    name: 'Demeter Localnet',
+    tag: 'dev',
+    url: 'http://127.0.0.1:5003',
+    evmRpcUrls: ['http://127.0.0.1:5003'],
+    logo: GanacheLogo,
+    currencies: [WebbCurrencyId.webbDEV, WebbCurrencyId.DEV, WebbCurrencyId.ETH],
+    nativeCurrencyId: WebbCurrencyId.ETH,
   },
   // [InternalChainId.DkgSubstrateStandalone]: {
   //   chainType: ChainType.SubstrateDevelopment,

diff --git a/packages/apps/src/configs/currencies/currency-config.ts b/packages/apps/src/configs/currencies/currency-config.ts
@@ -5,6 +5,7 @@ import PolygonLogo from '@webb-dapp/apps/configs/logos/chains/PolygonLogo';
 import ShidenLogo from '@webb-dapp/apps/configs/logos/chains/ShidenLogo';
 import WEBBLogo from '@webb-dapp/apps/configs/logos/chains/WebbLogo';
 import EtherLogo from '@webb-dapp/apps/configs/logos/Eth';
+import { PolkaLogo } from '@webb-dapp/apps/configs/logos/PolkaLogo';
 import WebbWrappedLogo from '@webb-dapp/apps/configs/logos/WebbWrappedLogo';
 import {
   AppConfig,
@@ -55,6 +56,7 @@ export const currenciesConfig: AppConfig['currencies'] = {
       [InternalChainId.ArbitrumTestnet, zeroAddress],
       [InternalChainId.HermesLocalnet, zeroAddress],
       [InternalChainId.AthenaLocalnet, zeroAddress],
+      [InternalChainId.DemeterLocalnet, zeroAddress],
     ]),
   },
   [WebbCurrencyId.ONE]: {
@@ -134,12 +136,12 @@ export const currenciesConfig: AppConfig['currencies'] = {
     role: CurrencyRole.Governable,
     icon: WebbWrappedLogo(EtherLogo()),
     addresses: new Map([
-      [InternalChainId.Ropsten, '0x105779076d17FAe5EAADF010CA677475549F49E4'],
-      [InternalChainId.Rinkeby, '0x4e7D4BEe028655F2865d9D147cF7B609c516d39C'],
-      [InternalChainId.Goerli, '0x5257c558c246311552A824c491285667B3a445a2'],
-      [InternalChainId.PolygonTestnet, '0x50A7b748F3C50F808a289cA041E48834A41A6d95'],
-      [InternalChainId.OptimismTestnet, '0xEAF873F1F6c91fEf73d4839b5fC7954554BBE518'],
-      [InternalChainId.ArbitrumTestnet, '0xD6F1E78B5F1Ebf8fF5a60C9d52eabFa73E5c5220'],
+      [InternalChainId.Ropsten, '0xb3532c9faae4a65e63c912734512b772a102e2e9'],
+      [InternalChainId.Rinkeby, '0xb3532c9faae4a65e63c912734512b772a102e2e9'],
+      [InternalChainId.Goerli, '0xb3532c9faae4a65e63c912734512b772a102e2e9'],
+      [InternalChainId.PolygonTestnet, '0xb3532c9faae4a65e63c912734512b772a102e2e9'],
+      [InternalChainId.OptimismTestnet, '0x04392b225e273266d867055fe7a075d488d8e05e'],
+      [InternalChainId.ArbitrumTestnet, '0xb30b0bf0cd3a73f97679c962424d4ef8dfe8e13d'],
     ]),
   },
   [WebbCurrencyId.DEV]: {
@@ -149,10 +151,11 @@ export const currenciesConfig: AppConfig['currencies'] = {
     id: WebbCurrencyId.DEV,
     type: CurrencyType.ERC20,
     role: CurrencyRole.Wrappable,
-    icon: React.createElement(EtherLogo),
+    icon: React.createElement(GanacheLogo),
     addresses: new Map([
       [InternalChainId.HermesLocalnet, '0x2946259E0334f33A064106302415aD3391BeD384'],
-      [InternalChainId.AthenaLocalnet, '0xF2E246BB76DF876Cef8b38ae84130F4F55De395b'],
+      [InternalChainId.AthenaLocalnet, '0xDe09E74d4888Bc4e65F589e8c13Bce9F71DdF4c7'],
+      [InternalChainId.DemeterLocalnet, '0xF2E246BB76DF876Cef8b38ae84130F4F55De395b'],
     ]),
   },
   [WebbCurrencyId.webbDEV]: {
@@ -162,10 +165,11 @@ export const currenciesConfig: AppConfig['currencies'] = {
     id: WebbCurrencyId.webbDEV,
     type: CurrencyType.ERC20,
     role: CurrencyRole.Governable,
-    icon: WebbWrappedLogo(EtherLogo()),
+    icon: WebbWrappedLogo(GanacheLogo()),
     addresses: new Map([
       [InternalChainId.HermesLocalnet, '0x510C6297cC30A058F41eb4AF1BFC9953EaD8b577'],
-      [InternalChainId.AthenaLocalnet, '0x7758F98C1c487E5653795470eEab6C4698bE541b'],
+      [InternalChainId.AthenaLocalnet, '0xcbD945E77ADB65651F503723aC322591f3435cC5'],
+      [InternalChainId.DemeterLocalnet, '0x7758F98C1c487E5653795470eEab6C4698bE541b'],
     ]),
   },
   [WebbCurrencyId.TEST]: {

diff --git a/packages/apps/src/configs/wallets/wallets-config.ts b/packages/apps/src/configs/wallets/wallets-config.ts
@@ -23,6 +23,7 @@ const ANY_EVM = [
   InternalChainId.PolygonTestnet,
   InternalChainId.HermesLocalnet,
   InternalChainId.AthenaLocalnet,
+  InternalChainId.DemeterLocalnet,
 ];
 export const walletsConfig: AppConfig['wallet'] = {
   [WalletId.Polkadot]: {

diff --git a/packages/bridge/package.json b/packages/bridge/package.json
@@ -10,10 +10,10 @@
     "@polkadot/react-identicon": "1.3.1",
     "@polkadot/ui-keyring": "1.3.1",
     "@webb-dapp/react-hooks": "0.2.1-beta.1",
-    "@webb-tools/api": "0.1.4-55",
-    "@webb-tools/app-util": "0.1.4-55",
-    "@webb-tools/sdk-core": "0.1.4-55",
-    "@webb-tools/types": "0.1.4-55",
+    "@webb-tools/api": "0.1.4-60",
+    "@webb-tools/app-util": "0.1.4-60",
+    "@webb-tools/sdk-core": "0.1.4-60",
+    "@webb-tools/types": "0.1.4-60",
     "dayjs": "^1.8.25",
     "i18next": "^19.7.0",
     "react": "^16.13.1",