From a643bfcb2720a53ca5c8cc5889443f9b373bca51 Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Wed, 15 Jul 2020 17:34:40 +0300 Subject: [PATCH 01/10] Update Datatokens.ts --- src/datatokens/Datatokens.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/datatokens/Datatokens.ts b/src/datatokens/Datatokens.ts index 5b82ed23..ec710a0f 100644 --- a/src/datatokens/Datatokens.ts +++ b/src/datatokens/Datatokens.ts @@ -20,8 +20,8 @@ export class DataTokens { */ constructor(factoryAddress: string, factoryABI: any, datatokensABI: any, web3: any) { this.factoryAddress = factoryAddress - this.factoryABI = factoryABI || defaultFactoryABI - this.datatokensABI = datatokensABI || defaultDatatokensABI + this.factoryABI = factoryABI || defaultFactoryABI.abi + this.datatokensABI = datatokensABI || defaultDatatokensABI.abi this.web3 = web3 } From 8184bc4a825ad47ca3414f5f36de9e8da3581060 Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Wed, 15 Jul 2020 17:37:14 +0300 Subject: [PATCH 02/10] Update Datatokens.ts --- src/datatokens/Datatokens.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/datatokens/Datatokens.ts b/src/datatokens/Datatokens.ts index ec710a0f..696273f9 100644 --- a/src/datatokens/Datatokens.ts +++ b/src/datatokens/Datatokens.ts @@ -1,5 +1,5 @@ const defaultFactoryABI = require('@oceanprotocol/contracts/artifacts/development/Factory.json') -const defaultDatatokensABI = require('@oceanprotocol/contracts/artifacts/development/DataTokenTemplate.json') +const defaultFactoryABI = require('@oceanprotocol/contracts/artifacts/development/DTFactory.json') /** * Provides a interface to DataTokens From 60ae6735c8534ff92a1a03311c76c27ff1462687 Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Wed, 15 Jul 2020 17:38:29 +0300 Subject: [PATCH 03/10] Update Datatokens.ts --- src/datatokens/Datatokens.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/datatokens/Datatokens.ts b/src/datatokens/Datatokens.ts index 696273f9..dea526fa 100644 --- a/src/datatokens/Datatokens.ts +++ b/src/datatokens/Datatokens.ts @@ -1,5 +1,5 @@ -const defaultFactoryABI = require('@oceanprotocol/contracts/artifacts/development/Factory.json') const defaultFactoryABI = require('@oceanprotocol/contracts/artifacts/development/DTFactory.json') +const defaultDatatokensABI = require('@oceanprotocol/contracts/artifacts/development/DataTokenTemplate.json') /** * Provides a interface to DataTokens From ce190b37a62808b8dc6817564310a0addb32069f Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Wed, 15 Jul 2020 17:50:54 +0300 Subject: [PATCH 04/10] Update ComputeFlow.test.ts --- test/integration/ComputeFlow.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/ComputeFlow.test.ts b/test/integration/ComputeFlow.test.ts index 7b480020..214b8cee 100644 --- a/test/integration/ComputeFlow.test.ts +++ b/test/integration/ComputeFlow.test.ts @@ -6,7 +6,7 @@ import { assert } from 'console' import { ServiceComputePrivacy } from '../../src/ddo/interfaces/Service' const Web3 = require('web3') const web3 = new Web3('http://127.0.0.1:8545') -const factory = require('@oceanprotocol/contracts/artifacts/development/Factory.json') +const factory = require('@oceanprotocol/contracts/artifacts/development/DTFactory.json') const datatokensTemplate = require('@oceanprotocol/contracts/artifacts/development/DataTokenTemplate.json') describe('Compute flow', () => { From df17eb2de42faf5203f5e314bc71c8f9db8ca2ed Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Wed, 15 Jul 2020 17:51:18 +0300 Subject: [PATCH 05/10] Update Marketplaceflow.test.ts --- test/integration/Marketplaceflow.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/Marketplaceflow.test.ts b/test/integration/Marketplaceflow.test.ts index cb0bf480..fc1a08dc 100644 --- a/test/integration/Marketplaceflow.test.ts +++ b/test/integration/Marketplaceflow.test.ts @@ -6,7 +6,7 @@ import { assert } from 'console' const Web3 = require('web3') const web3 = new Web3('http://127.0.0.1:8545') -const factory = require('@oceanprotocol/contracts/artifacts/development/Factory.json') +const factory = require('@oceanprotocol/contracts/artifacts/development/DTFactory.json') const datatokensTemplate = require('@oceanprotocol/contracts/artifacts/development/DataTokenTemplate.json') describe('Marketplace flow', () => { From f8a9049453690328426549947bd13d727aa8b9f6 Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Wed, 15 Jul 2020 17:51:37 +0300 Subject: [PATCH 06/10] Update Simpleflow.test.ts --- test/integration/Simpleflow.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/Simpleflow.test.ts b/test/integration/Simpleflow.test.ts index 8d10cfe5..9a41d405 100644 --- a/test/integration/Simpleflow.test.ts +++ b/test/integration/Simpleflow.test.ts @@ -5,7 +5,7 @@ import { Config } from '../../src/models/Config' const Web3 = require('web3') const web3 = new Web3('http://127.0.0.1:8545') -const factory = require('@oceanprotocol/contracts/artifacts/development/Factory.json') +const factory = require('@oceanprotocol/contracts/artifacts/development/DTFactory.json') const datatokensTemplate = require('@oceanprotocol/contracts/artifacts/development/DataTokenTemplate.json') describe('Simple flow', () => { From 4b3b053b320ec8bb33a84de40b6bea6651e13ffe Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Wed, 15 Jul 2020 17:52:26 +0300 Subject: [PATCH 07/10] Update Rinkeby.test.ts --- test/integration/Rinkeby.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/Rinkeby.test.ts b/test/integration/Rinkeby.test.ts index 4e828f32..66dfe7ec 100644 --- a/test/integration/Rinkeby.test.ts +++ b/test/integration/Rinkeby.test.ts @@ -3,7 +3,7 @@ import { DataTokens } from '../../src/datatokens/Datatokens' const Web3 = require('web3') const web3 = new Web3('wss://rinkeby.infura.io/ws/v3/357f2fe737db4304bd2f7285c5602d0d') -const factory = require('@oceanprotocol/contracts/artifacts/development/Factory.json') +const factory = require('@oceanprotocol/contracts/artifacts/development/DTFactory.json') const datatokensTemplate = require('@oceanprotocol/contracts/artifacts/development/DataTokenTemplate.json') describe('Rinkeby test', () => { From 5fe1f6d70bdc3c0d06707f4a53ac45d7f58b8845 Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Wed, 15 Jul 2020 17:52:50 +0300 Subject: [PATCH 08/10] Update Datatokens.test.ts --- test/unit/Datatokens.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/Datatokens.test.ts b/test/unit/Datatokens.test.ts index 627a2dc3..c4a947de 100644 --- a/test/unit/Datatokens.test.ts +++ b/test/unit/Datatokens.test.ts @@ -3,7 +3,7 @@ import { TestContractHandler } from '../TestContractHandler' import { DataTokens } from '../../src/datatokens/Datatokens' const Web3 = require('web3') -const factory = require('@oceanprotocol/contracts/artifacts/development/Factory.json') +const factory = require('@oceanprotocol/contracts/artifacts/development/DTFactory.json') const datatokensTemplate = require('@oceanprotocol/contracts/artifacts/development/DataTokenTemplate.json') const web3 = new Web3('http://127.0.0.1:8545') From 2230098ca5cfc26a720f212ea6dd37d6619a0e2d Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Wed, 15 Jul 2020 17:53:12 +0300 Subject: [PATCH 09/10] Update README_marketplace_flow.md --- docs/README_marketplace_flow.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/README_marketplace_flow.md b/docs/README_marketplace_flow.md index 9aca0e18..2caaf4a2 100644 --- a/docs/README_marketplace_flow.md +++ b/docs/README_marketplace_flow.md @@ -44,7 +44,7 @@ import { DataTokens } from '../../src/datatokens/Datatokens' import { Ocean } from '../../src/ocean/Ocean' const Web3 = require('web3') const web3 = new Web3('http://127.0.0.1:8545') -const factory = require('@oceanprotocol/contracts/artifacts/development/Factory.json') +const factory = require('@oceanprotocol/contracts/artifacts/development/DTFactory.json') const datatokensTemplate = require('@oceanprotocol/contracts/artifacts/development/DataTokenTemplate.json') // Alice's config @@ -172,4 +172,4 @@ await ocean.assets.order(ddo.id, accessService.type, bob.getId()).then(async (re ) }) -``` \ No newline at end of file +``` From faff5f143d541319a5a9d558be70098320ed1620 Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Wed, 15 Jul 2020 08:32:27 -0700 Subject: [PATCH 10/10] bump contracts --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 449687d7..97e1c6ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -881,9 +881,9 @@ } }, "@oceanprotocol/contracts": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-0.2.2.tgz", - "integrity": "sha512-wu5Ub5F50vCAON0GKyv4anPPLm+oWfHViksiAewVS/xvbbnSCt4gHws2Uc1ct25tiO/2AHAyJkqEiC0ep8SHeQ==" + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-0.2.3.tgz", + "integrity": "sha512-5Oohzno3tnISMYG1jhtHxKMMkcIypTZAPlIoFjE5vDlAW51tyuxwYxBXHYQ2/FLRVFkmUmy5yASKg9zbnKKwQw==" }, "@octokit/auth-token": { "version": "2.4.2", diff --git a/package.json b/package.json index bb3a3ca9..9d7e9e09 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ }, "dependencies": { "@ethereum-navigator/navigator": "^0.5.0", - "@oceanprotocol/contracts": "^0.2.2", + "@oceanprotocol/contracts": "^0.2.3", "bignumber.js": "^9.0.0", "fs": "0.0.1-security", "node-fetch": "^2.6.0",