oceanprotocol/ocean.js
1
0
Fork 0
mirror of https://github.com/oceanprotocol/ocean.js.git synced 2024-11-26 20:39:05 +01:00
Code Releases Activity

Merge pull request #163 from oceanprotocol/bug/fix_datatokens_abi

Browse Source 
Fix default abi's are not initialized correctly when initializing oceanlib
This commit is contained in:
Alex Coseru 2020-07-15 21:31:27 +03:00 committed by GitHub
commit 7d0af48e81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/README_marketplace_flow.md
View File

@ -44,7 +44,7 @@ import { DataTokens } from '../../src/datatokens/Datatokens'
import { Ocean } from '../../src/ocean/Ocean' import { Ocean } from '../../src/ocean/Ocean'
const Web3 = require('web3') const Web3 = require('web3')
const web3 = new Web3('http://127.0.0.1:8545') 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') const datatokensTemplate = require('@oceanprotocol/contracts/artifacts/development/DataTokenTemplate.json')
// Alice's config // Alice's config
@ -172,4 +172,4 @@ await ocean.assets.order(ddo.id, accessService.type, bob.getId()).then(async (re
) )
}) })
``` ```

6
package-lock.json generated
View File

@ -881,9 +881,9 @@
} }
}, },
"@oceanprotocol/contracts": { "@oceanprotocol/contracts": {
"version": "0.2.2", "version": "0.2.3",
"resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-0.2.2.tgz", "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-0.2.3.tgz",
"integrity": "sha512-wu5Ub5F50vCAON0GKyv4anPPLm+oWfHViksiAewVS/xvbbnSCt4gHws2Uc1ct25tiO/2AHAyJkqEiC0ep8SHeQ==" "integrity": "sha512-5Oohzno3tnISMYG1jhtHxKMMkcIypTZAPlIoFjE5vDlAW51tyuxwYxBXHYQ2/FLRVFkmUmy5yASKg9zbnKKwQw=="
}, },
"@octokit/auth-token": { "@octokit/auth-token": {
"version": "2.4.2", "version": "2.4.2",

2
package.json
View File

@ -38,7 +38,7 @@
}, },
"dependencies": { "dependencies": {
"@ethereum-navigator/navigator": "^0.5.0", "@ethereum-navigator/navigator": "^0.5.0",
"@oceanprotocol/contracts": "^0.2.2", "@oceanprotocol/contracts": "^0.2.3",
"bignumber.js": "^9.0.0", "bignumber.js": "^9.0.0",
"fs": "0.0.1-security", "fs": "0.0.1-security",
"node-fetch": "^2.6.0", "node-fetch": "^2.6.0",

6
src/datatokens/Datatokens.ts
View File

@ -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') 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) { constructor(factoryAddress: string, factoryABI: any, datatokensABI: any, web3: any) {
this.factoryAddress = factoryAddress this.factoryAddress = factoryAddress
this.factoryABI = factoryABI || defaultFactoryABI this.factoryABI = factoryABI || defaultFactoryABI.abi
this.datatokensABI = datatokensABI || defaultDatatokensABI this.datatokensABI = datatokensABI || defaultDatatokensABI.abi
this.web3 = web3 this.web3 = web3
} }

2
test/integration/ComputeFlow.test.ts
View File

@ -6,7 +6,7 @@ import { assert } from 'console'
import { ServiceComputePrivacy } from '../../src/ddo/interfaces/Service' import { ServiceComputePrivacy } from '../../src/ddo/interfaces/Service'
const Web3 = require('web3') const Web3 = require('web3')
const web3 = new Web3('http://127.0.0.1:8545') 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') const datatokensTemplate = require('@oceanprotocol/contracts/artifacts/development/DataTokenTemplate.json')
describe('Compute flow', () => { describe('Compute flow', () => {

2
test/integration/Marketplaceflow.test.ts
View File

@ -6,7 +6,7 @@ import { assert } from 'console'
const Web3 = require('web3') const Web3 = require('web3')
const web3 = new Web3('http://127.0.0.1:8545') 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') const datatokensTemplate = require('@oceanprotocol/contracts/artifacts/development/DataTokenTemplate.json')
describe('Marketplace flow', () => { describe('Marketplace flow', () => {

2
test/integration/Rinkeby.test.ts
View File

@ -3,7 +3,7 @@ import { DataTokens } from '../../src/datatokens/Datatokens'
const Web3 = require('web3') const Web3 = require('web3')
const web3 = new Web3('wss://rinkeby.infura.io/ws/v3/357f2fe737db4304bd2f7285c5602d0d') 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') const datatokensTemplate = require('@oceanprotocol/contracts/artifacts/development/DataTokenTemplate.json')
describe('Rinkeby test', () => { describe('Rinkeby test', () => {

2
test/integration/Simpleflow.test.ts
View File

@ -5,7 +5,7 @@ import { Config } from '../../src/models/Config'
const Web3 = require('web3') const Web3 = require('web3')
const web3 = new Web3('http://127.0.0.1:8545') 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') const datatokensTemplate = require('@oceanprotocol/contracts/artifacts/development/DataTokenTemplate.json')
describe('Simple flow', () => { describe('Simple flow', () => {

2
test/unit/Datatokens.test.ts
View File

@ -3,7 +3,7 @@ import { TestContractHandler } from '../TestContractHandler'
import { DataTokens } from '../../src/datatokens/Datatokens' import { DataTokens } from '../../src/datatokens/Datatokens'
const Web3 = require('web3') 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 datatokensTemplate = require('@oceanprotocol/contracts/artifacts/development/DataTokenTemplate.json')
const web3 = new Web3('http://127.0.0.1:8545') const web3 = new Web3('http://127.0.0.1:8545')