Merge branch 'release/1.17.0'

balancer · Aug 31, 2021 · cad2d9e · cad2d9e · vercel · Aug 31, 2021
2 parents 2451166 + 9f7e534
commit cad2d9e
Show file tree

Hide file tree

Showing 18 changed files with 307 additions and 24 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@balancer-labs/frontend-v2",
-  "version": "1.16.2",
+  "version": "1.17.0",
   "engines": {
     "node": "14.x",
     "npm": ">=7"

diff --git a/src/assets/images/icons/networks/arbitrum.svg b/src/assets/images/icons/networks/arbitrum.svg
diff --git a/src/components/navs/AppNav/AppNavActions.vue b/src/components/navs/AppNav/AppNavActions.vue
@@ -51,12 +51,13 @@ export default defineComponent({
       account,
       toggleWalletSelectModal,
       isMainnet,
-      isPolygon
+      isPolygon,
+      isArbitrum
     } = useWeb3();
 
     // COMPUTED
     const liquidityMiningSupported = computed(
-      () => isMainnet.value || isPolygon.value
+      () => isMainnet.value || isPolygon.value || isArbitrum.value
     );
 
     // METHODS

diff --git a/src/components/navs/AppNav/AppNavNetworkSelect.vue b/src/components/navs/AppNav/AppNavNetworkSelect.vue
@@ -81,6 +81,12 @@ export default defineComponent({
         name: 'Polygon',
         subdomain: 'polygon',
         key: '137'
+      },
+      {
+        id: 'arbitrum',
+        name: 'Arbitrum',
+        subdomain: 'arbitrum',
+        key: '42161'
       }
     ];
 

diff --git a/src/components/navs/AppNav/AppNavSettings.vue b/src/components/navs/AppNav/AppNavSettings.vue
@@ -219,12 +219,12 @@ export default defineComponent({
     const {
       explorerLinks,
       account,
-      chainId,
       disconnectWallet,
       connector,
       isV1Supported,
       isEIP1559SupportedNetwork,
-      userNetworkConfig
+      userNetworkConfig,
+      appNetworkConfig
     } = useWeb3();
     const { ethereumTxType, setEthereumTxType } = useEthereumTxType();
 
@@ -262,7 +262,7 @@ export default defineComponent({
     const connectorLogo = computed(() => getConnectorLogo(connector.value?.id));
     const hideDisconnect = computed(() => connector.value?.id == 'gnosis');
     const isGnosisSupportedNetwork = computed(() =>
-      GP_SUPPORTED_NETWORKS.includes(chainId.value)
+      GP_SUPPORTED_NETWORKS.includes(appNetworkConfig.chainId)
     );
 
     // METHODS
@@ -292,7 +292,6 @@ export default defineComponent({
       // computed
       account,
       appTradeLiquidity,
-      chainId,
       appTradeInterface,
       networkName,
       networkColorClass,

diff --git a/src/constants/initialTokens.json b/src/constants/initialTokens.json
@@ -10,5 +10,9 @@
   "137": {
     "input": "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
     "output": "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619"
+  },
+  "42161": {
+    "input": "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+    "output": "0xFF970A61A04b1cA14834A43f5dE4533eBDDB5CC8"
   }
 }
diff --git a/src/constants/network.ts b/src/constants/network.ts
@@ -1,12 +1,13 @@
-export type NetworkId = 1 | 3 | 4 | 5 | 42 | 137;
+export type NetworkId = 1 | 3 | 4 | 5 | 42 | 137 | 42161;
 
 export enum Network {
   MAINNET = 1,
   ROPSTEN = 3,
   RINKEBY = 4,
   GÖRLI = 5,
   KOVAN = 42,
-  POLYGON = 137
+  POLYGON = 137,
+  ARBITRUM = 42161
 }
 
 export const APP_NETWORK_ID = Number(process.env.VUE_APP_NETWORK) as NetworkId;
diff --git a/src/constants/pools.ts b/src/constants/pools.ts
@@ -61,6 +61,10 @@ export const POOLS = {
     '0xc66ba2b6595d3613ccab350c886ace23866ede24': 'stablePool',
     '0x67d27634e44793fe63c467035e31ea8635117cd4': 'stablePool', // Metastable
     '0x751dfdace1ad995ff13c927f6f761c6604532c79': 'stablePool', // Kovan
-    '0x590e544e7ca956bb878f8c873e82e65550d67d2f': 'stablePool' // Kovan Metastable
+    '0x590e544e7ca956bb878f8c873e82e65550d67d2f': 'stablePool', // Kovan Metastable
+    '0x7dfdef5f355096603419239ce743bfaf1120312b': 'weightedPool', // Arbitrum Weighted
+    '0xcf0a32bbef8f064969f21f7e02328fb577382018': 'weightedPool', // Arbitrum WeightedOracle
+    '0x2433477a10fc5d31b9513c638f19ee85caed53fd': 'stablePool', // Arbitrum Stable
+    '0xebfd5681977e38af65a7487dc70b8221d089ccad': 'stablePool' // Arbitrum MetaStable
   }
 };
diff --git a/src/constants/tokenlists.ts b/src/constants/tokenlists.ts
@@ -53,5 +53,14 @@ export const TOKEN_LIST_MAP: TokenListMapByNetwork = {
     External: [
       'https://unpkg.com/[email protected]/build/quickswap-default.tokenlist.json'
     ]
+  },
+  '42161': {
+    Balancer: {
+      Default:
+        'https://storageapi.fleek.co/tomafrench-team-bucket/arbitrum.listed.tokenlist.json',
+      Vetted:
+        'https://storageapi.fleek.co/tomafrench-team-bucket/arbitrum.vetted.tokenlist.json'
+    },
+    External: []
   }
 };
diff --git a/src/constants/tokens.ts b/src/constants/tokens.ts
@@ -18,6 +18,10 @@ export const TOKENS = {
     '137': {
       WETH: '0x7ceb23fd6bc0add59e62ac25578270cff1b9f619',
       BAL: '0x9a71012b13ca4d3d0cdc72a177df3ef03b0e76a3'
+    },
+    '42161': {
+      WETH: '0x82aF49447D8a07e3bd95BD0d56f35241523fBab1',
+      BAL: '0x040d1EdC9569d4Bab2D15287Dc5A4F10F56a56B8'
     }
   },
   Prices: {
@@ -37,6 +41,16 @@ export const TOKENS = {
           '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
         '0x04df6e4121c27713ed22341e7c7df330f56f289b':
           '0x6b175474e89094c44da98b954eedeac495271d0f'
+      },
+      '42161': {
+        '0x82af49447d8a07e3bd95bd0d56f35241523fbab1':
+          '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+        '0x040d1edc9569d4bab2d15287dc5a4f10f56a56b8':
+          '0xba100000625a3754423978a60c9317c58a424e3d',
+        '0x2f2a2543b76a4166549f7aab2e75bef0aefc5b0f':
+          '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599',
+        '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8':
+          '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48'
       }
     },
     // TODO - remove once coingecko supports wstETH