Merge branch 'master' into pn-any-to-erc20-swap-payment-processor

RequestNetwork · Apr 12, 2021 · af61334 · af61334
2 parents 8070bdf + 9d6c143
commit af61334
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/packages/advanced-logic/src/extensions/payment-network/any-to-erc20-proxy.ts b/packages/advanced-logic/src/extensions/payment-network/any-to-erc20-proxy.ts
@@ -41,7 +41,7 @@ const supportedCurrencies: Record<string, Record<RequestLogicTypes.CURRENCY, str
     [RequestLogicTypes.CURRENCY.BTC]: [],
   },
   mainnet: {
-    [RequestLogicTypes.CURRENCY.ISO4217]: ['CHF', 'EUR', 'GBP', 'SGD', 'USD'],
+    [RequestLogicTypes.CURRENCY.ISO4217]: ['AUD', 'CAD', 'CHF', 'EUR', 'GBP', 'SGD', 'USD'],
     [RequestLogicTypes.CURRENCY.ERC20]: [
       '0x1f573d6fb3f13d689ff844b4ce37794d79a7ff1c',
       '0x4e15361fd6b4bb609fa63c81a2be19d873717870',

diff --git a/packages/currency/src/chainlink-path-aggregators.ts b/packages/currency/src/chainlink-path-aggregators.ts
@@ -44,11 +44,13 @@ const currencyPairs: any = {
     },
   },
   mainnet: {
-    '0x1f573d6fb3f13d689ff844b4ce37794d79a7ff1c': {
+    '0x4f99f266506be1475e943b2f097827011bfa4e93': {
       '0x775eb53d00dd0acd3ec1696472105d579b9b386b': 1,
-      '0xf5af88e117747e87fc5929f2ff87221b1447652e': 1,
     },
     '0x775eb53d00dd0acd3ec1696472105d579b9b386b': {
+      '0x4f99f266506be1475e943b2f097827011bfa4e93': 1,
+      '0xfa6faefc053e6c8e393a73dcc12b09fcde019d25': 1,
+      '0xf5af88e117747e87fc5929f2ff87221b1447652e': 1,
       '0x1f573d6fb3f13d689ff844b4ce37794d79a7ff1c': 1,
       '0x8290333cef9e6d528dd5618fb97a76f268f3edd4': 1,
       '0x7fc66500c84a76ad7e9c93437bfc5ac33e2ddae9': 1,
@@ -59,9 +61,12 @@ const currencyPairs: any = {
       '0x013f29832cd6525c4c6df81c2aae8032a1ff2db2': 1,
       '0x17b4158805772ced11225e77339f90beb5aae968': 1,
       '0x6b175474e89094c44da98b954eedeac495271d0f': 1,
-      '0xf5af88e117747e87fc5929f2ff87221b1447652e': 1,
+    },
+    '0xfa6faefc053e6c8e393a73dcc12b09fcde019d25': {
+      '0x775eb53d00dd0acd3ec1696472105d579b9b386b': 1,
     },
     '0xf5af88e117747e87fc5929f2ff87221b1447652e': {
+      '0x775eb53d00dd0acd3ec1696472105d579b9b386b': 1,
       '0x1f573d6fb3f13d689ff844b4ce37794d79a7ff1c': 1,
       '0xa117000000f279d81a1d3cc75430faa017fa5a2e': 1,
       '0x7fc66500c84a76ad7e9c93437bfc5ac33e2ddae9': 1,
@@ -72,7 +77,10 @@ const currencyPairs: any = {
       '0x6b175474e89094c44da98b954eedeac495271d0f': 1,
       '0xc944e90c64b2c07662a292be6244bdf05cda44a7': 1,
       '0x967da4048cd07ab37855c090aaf366e4ce1b9f48': 1,
+    },
+    '0x1f573d6fb3f13d689ff844b4ce37794d79a7ff1c': {
       '0x775eb53d00dd0acd3ec1696472105d579b9b386b': 1,
+      '0xf5af88e117747e87fc5929f2ff87221b1447652e': 1,
     },
     '0xa117000000f279d81a1d3cc75430faa017fa5a2e': {
       '0xf5af88e117747e87fc5929f2ff87221b1447652e': 1,

diff --git a/packages/smart-contracts/artifacts/ChainlinkConversionPath/artifacts.json b/packages/smart-contracts/artifacts/ChainlinkConversionPath/artifacts.json
@@ -8,8 +8,8 @@
         "creationBlockNumber": 0
       },
       "mainnet": {
-        "address": "0xF7228EFeFa12cd768E0F32a7c5cD0c0D68f835e4",
-        "creationBlockNumber": 12198519
+        "address": "0xC5519f3fcECC8EC85caaF8836563dEe9a00080f9",
+        "creationBlockNumber": 12225729
       },
       "rinkeby": {
         "address": "0xBFAD7f00A3988BFf17144728b624267Fee7F236e",

diff --git a/packages/smart-contracts/artifacts/Erc20ConversionProxy/artifacts.json b/packages/smart-contracts/artifacts/Erc20ConversionProxy/artifacts.json
@@ -8,8 +8,8 @@
         "creationBlockNumber": 0
       },
       "mainnet": {
-        "address": "0x9091E9dD140274170f236D0eB33FCE2d29070e3c",
-        "creationBlockNumber": 12198570
+        "address": "0xe72Ecea44b6d8B2b3cf5171214D9730E86213cA2",
+        "creationBlockNumber": 12225751
       },
       "rinkeby": {
         "address": "0x78334ed20da456e89cd7e5a90de429d705f5bc88",

diff --git a/packages/toolbox/README.md b/packages/toolbox/README.md
@@ -4,12 +4,6 @@
 It is a collection of miscellaneous tools.
 This package can use other package of the monorepo, but the other packages cannot use toolbox.
 
-## Installation
-
-```bash
-npm install @requestnetwork/toolbox
-```
-
 ## Usage
 
 ### Create request