Merge pull request #145 from CoinAlpha/development

release / development -> master

conf/global_conf.yml.example

@@ -29,18 +29,9 @@ ETHEREUM_RPC_URL: "https://{chain}.infura.io/v3/{api_key}"
 ETHEREUM_TOKEN_LIST_URL: https://wispy-bird-88a7.uniswap.workers.dev/?url=http://tokens.1inch.eth.link
 
 # Balancer
-# subgraph_chain
-# Reference: https://docs.balancer.finance/sor/development#subgraph
-# - mainnet: balancer
-# - kovan: balancer-kovan
-# Note: REACT_APP_SUBGRAPH_URL used by @balancer-labs/sor
-REACT_APP_SUBGRAPH_URL: https://api.thegraph.com/subgraphs/name/balancer-labs/{subgraph_chain}
-
-# exchange_proxy:
-# Reference: https://docs.balancer.finance/smart-contracts/addresses
-# - mainnet: 0x3E66B66Fd1d0b02fDa6C811Da9E0547970DB2f21
-# - kovan: 0x4e67bf5bD28Dd4b570FBAFe11D0633eCbA2754Ec
-EXCHANGE_PROXY:
+BALANCER_VAULT: "0xBA12222222228d8Ba445958a75a0704d566BF2C8"
+BALANCER_GAS_BASE: 300688
+BALANCER_MAX_SWAPS: 4
 
 # Uniswap
 # Reference: https://uniswap.org/docs/v2/smart-contracts/router02/
@@ -82,10 +73,6 @@ ETH_GAS_STATION_GAS_LEVEL: fast
 ETH_GAS_STATION_REFRESH_TIME: 60
 ETH_MANUAL_GAS_PRICE: 100
 
-# Balancer Config
-BALANCER_MAX_SWAPS: 4
-
-
 # Perpetual Finance Provider URL
 # default:  https://dai.poa.network , https://rpc.xdaichain.com, etc
 XDAI_PROVIDER:

package.json

@@ -22,7 +22,7 @@
     "test:e2e": "jest --config ./test/jest-e2e.json"
   },
   "dependencies": {
-    "@balancer-labs/sor": "^0.3.3",
+    "@balancer-labs/sor":"github:mifeng/balancer-sor#john/v2-package",
     "@ethersproject/experimental": "^5.3.0",
     "@perp/contract": "^1.0.6",
     "@terra-money/terra.js": "^1.8.8",

src/assets/erc20_tokens_kovan.json

@@ -78,6 +78,66 @@
       "address": "0x3D2097889B97A9eF23B3eA8FC10c626fbda29099",
       "decimals": 18,
       "chainId": 42
+    },
+    {
+      "symbol": "BALWETH",
+      "address": "0xdFCeA9088c8A88A76FF74892C1457C17dfeef9C1",
+      "decimals": 18,
+      "chainId": 42
+    },
+    {
+      "symbol": "BALUSDC",
+      "address": "0xc2569dd7d0fd715B054fBf16E75B001E5c0C1115",
+      "decimals": 6,
+      "chainId": 42
+    },
+    {
+      "symbol": "BALBAL",
+      "address": "0x41286Bb1D3E870f3F750eB7E1C25d7E48c8A1Ac7",
+      "decimals": 18,
+      "chainId": 42
+    },
+    {
+      "symbol": "BALMKR",
+      "address": "0xAf9ac3235be96eD496db7969f60D354fe5e426B0",
+      "decimals": 18,
+      "chainId": 42
+    },
+    {
+      "symbol": "BALDAI",
+      "address": "0x04DF6e4121c27713ED22341E7c7Df330F56f289B",
+      "decimals": 18,
+      "chainId": 42
+    },
+    {
+      "symbol": "BALPERP",
+      "address": "0x8F4beBF498cc624a0797Fe64114A6Ff169EEe078",
+      "decimals": 18,
+      "chainId": 42
+    },
+    {
+      "symbol": "BALWBTC",
+      "address": "0x1C8E3Bcb3378a443CC591f154c5CE0EBb4dA9648",
+      "decimals": 8,
+      "chainId": 42
+    },
+    {
+      "symbol": "BALUSDT",
+      "address": "0xcC08220af469192C53295fDd34CFb8DF29aa17AB",
+      "decimals": 6,
+      "chainId": 42
+    },
+    {
+      "symbol": "BALPAX",
+      "address": "0x15E76Fc74C6ab1c3141D61219883d1c59F716E21",
+      "decimals": 18,
+      "chainId": 42
+    },
+    {
+      "symbol": "BALGUSD",
+      "address": "0x22ee6c3B011fACC530dd01fe94C58919344d6Db5",
+      "decimals": 2,
+      "chainId": 42
     }
   ]
 }