Merge pull request #163 from oceanprotocol/bug/fix_datatokens_abi

Fix default abi's are not initialized correctly when initializing oceanlib
oceanprotocol · Jul 15, 2020 · 7d0af48 · 7d0af48
2 parents 36ba35f + faff5f1
commit 7d0af48
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git 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
       )
    })
 
-```
+```
diff --git a/package-lock.json b/package-lock.json
diff --git 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",

diff --git a/src/datatokens/Datatokens.ts b/src/datatokens/Datatokens.ts
@@ -1,4 +1,4 @@
-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')
 
 /**
@@ -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
     }
 

diff --git 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', () => {

diff --git 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', () => {

diff --git 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', () => {

diff --git 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', () => {

diff --git 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')