From cee861cffdf470f490c48e150e9e78b1f5652970 Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Thu, 14 May 2020 06:08:45 -0700 Subject: [PATCH 1/3] fix timeouts --- src/ocean/OceanAssets.ts | 3 ++- src/ocean/OceanCompute.ts | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ocean/OceanAssets.ts b/src/ocean/OceanAssets.ts index 9e0b9d5..bec9ff3 100644 --- a/src/ocean/OceanAssets.ts +++ b/src/ocean/OceanAssets.ts @@ -477,7 +477,8 @@ export class OceanAssets extends Instantiable { public async createAccessServiceAttributes( consumerAccount: Account, price: string, - datePublished: string + datePublished: string, + timeout: number = 0 ): Promise { const { templates } = this.ocean.keeper const serviceAgreementTemplate = await templates.escrowAccessSecretStoreTemplate.getServiceAgreementTemplate() diff --git a/src/ocean/OceanCompute.ts b/src/ocean/OceanCompute.ts index 331f16d..0f332e8 100644 --- a/src/ocean/OceanCompute.ts +++ b/src/ocean/OceanCompute.ts @@ -266,7 +266,8 @@ export class OceanCompute extends Instantiable { public async createComputeServiceAttributes( consumerAccount: Account, price: string, - datePublished: string + datePublished: string, + timeout: number = 3600 ): Promise { const { templates } = this.ocean.keeper const serviceAgreementTemplate = await templates.escrowComputeExecutionTemplate.getServiceAgreementTemplate() @@ -281,7 +282,7 @@ export class OceanCompute extends Instantiable { creator: consumerAccount.getId(), datePublished, price, - timeout: 3600, + timeout: timeout, name }, serviceAgreementTemplate From 46e3de63f1dd350e24a337c9e41068558b16cc2f Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Thu, 14 May 2020 06:10:37 -0700 Subject: [PATCH 2/3] fix timeouts --- src/ocean/OceanAssets.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ocean/OceanAssets.ts b/src/ocean/OceanAssets.ts index bec9ff3..d6b3740 100644 --- a/src/ocean/OceanAssets.ts +++ b/src/ocean/OceanAssets.ts @@ -492,7 +492,7 @@ export class OceanAssets extends Instantiable { creator: consumerAccount.getId(), datePublished, price, - timeout: 3600, + timeout: timeout, name: 'dataAssetAccessServiceAgreement' }, serviceAgreementTemplate From 62e2dd640aecdb4ae0f292c98c5703fa158b4279 Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Sat, 16 May 2020 01:28:42 -0700 Subject: [PATCH 3/3] fix travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8faa400..19b8192 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ before_script: - git clone https://github.com/oceanprotocol/barge - cd barge - export AQUARIUS_VERSION=unstable - - export BRIZO_VERSION=v0.9.5 + - export BRIZO_VERSION=v0.9.7 - export KEEPER_VERSION=v0.13.2 - export EVENTS_HANDLER_VERSION=v0.4.7 - export KEEPER_OWNER_ROLE_ADDRESS="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260"