From 382bed5d4f8973dc03bd84dae0e9212a99146ea8 Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Wed, 15 Jul 2020 10:45:16 +0300 Subject: [PATCH 1/5] Update .travis.yml use provider-py latest from barge --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0e670ddc..b3752a13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,6 @@ before_script: - git clone https://github.com/oceanprotocol/barge - cd barge - git checkout v3 - - export PROVIDER_VERSION=phase2 - bash -x start_ocean.sh --no-dashboard 2>&1 > start_ocean.log & - cd .. - sleep 300 From 4191efb3b4ff2a98cc98ae45da24f5c0701d791a Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Wed, 15 Jul 2020 12:24:20 +0300 Subject: [PATCH 2/5] Update ConfigHelper.ts --- src/utils/ConfigHelper.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/utils/ConfigHelper.ts b/src/utils/ConfigHelper.ts index 69b5afcc..e1d75289 100644 --- a/src/utils/ConfigHelper.ts +++ b/src/utils/ConfigHelper.ts @@ -2,6 +2,7 @@ export interface ConfigHelper { network: string url: string factoryAddress: string + oceanTokenAddress: string } const configs = [ @@ -9,12 +10,14 @@ const configs = [ { network: 'pacific', url: 'https://pacific.oceanprotocol.com', - factoryAddress: '0x1234' + factoryAddress: '0x1234', + oceanTokenAddress: '0x012578f9381e876A9E2a9111Dfd436FF91A451ae' }, { network: 'mainnet', url: 'https://mainnet.infura.io/v3/YOUR-PROJECT-ID', - factoryAddress: '0x1234' + factoryAddress: '0x1234', + oceanTokenAddress: '0x985dd3d42de1e256d09e1c10f112bccb8015ad41' } ] @@ -25,9 +28,11 @@ export class ConfigHelper { confighelp.factoryAddress = null confighelp.url = null confighelp.network = network + confighelp.oceanTokenAddress = null const knownconfig = configs.find((c) => c.network === network) if (knownconfig) { confighelp.factoryAddress = knownconfig.factoryAddress + confighelp.oceanTokenAddress = knownconfig.oceanTokenAddress confighelp.url = knownconfig.url confighelp.network = knownconfig.network } From e13ddbc4c0fa87433f9ef0f089ca7e952f429911 Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Wed, 15 Jul 2020 12:30:41 +0300 Subject: [PATCH 3/5] Update Config.ts --- src/models/Config.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/models/Config.ts b/src/models/Config.ts index e2876de1..2693db2c 100644 --- a/src/models/Config.ts +++ b/src/models/Config.ts @@ -31,7 +31,13 @@ export class Config { * @type {any} */ public web3Provider?: any - + + /** + * Ocean Token address + * @type {string} + */ + public oceanTokenAddress?: string + /** * Factory address * @type {string} From 6cbbef56263940224dbd27a76ebf52de0cc9c324 Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Wed, 15 Jul 2020 02:44:08 -0700 Subject: [PATCH 4/5] fix lint --- src/models/Config.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/models/Config.ts b/src/models/Config.ts index 2693db2c..bcfd0637 100644 --- a/src/models/Config.ts +++ b/src/models/Config.ts @@ -31,13 +31,13 @@ export class Config { * @type {any} */ public web3Provider?: any - + /** * Ocean Token address * @type {string} */ public oceanTokenAddress?: string - + /** * Factory address * @type {string} From 318d1dd5a2757e33004ebb3fd7bd9131ade7d405 Mon Sep 17 00:00:00 2001 From: Ahmed Ali Date: Wed, 15 Jul 2020 12:06:11 +0200 Subject: [PATCH 5/5] fix provider version --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b3752a13..bdd83b56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ before_script: - git clone https://github.com/oceanprotocol/barge - cd barge - git checkout v3 + - export PROVIDER_VERSION=latest - bash -x start_ocean.sh --no-dashboard 2>&1 > start_ocean.log & - cd .. - sleep 300