From 6c9746a8ad2e55eb8b79db5034b321bbb1a3596a Mon Sep 17 00:00:00 2001 From: Bogdan Fazakas Date: Wed, 19 Jan 2022 17:26:22 +0200 Subject: [PATCH] fix opfee and DataToken naming --- docs/beginners_guide.md | 6 +++--- docs/overview.md | 2 +- docs/quickstart_marketplace.md | 6 +++--- docs/quickstart_simple.md | 6 +++--- src/pools/Router.ts | 2 +- src/pools/balancer/Pool.ts | 2 +- src/pools/ssContracts/SideStaking.ts | 10 +++++----- src/tokens/Datatoken.ts | 4 ++-- test/unit/pools/Router.test.ts | 4 ++-- test/unit/pools/ssContracts/SideStaking.test.ts | 8 ++++---- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/docs/beginners_guide.md b/docs/beginners_guide.md index aa293434..5140813f 100644 --- a/docs/beginners_guide.md +++ b/docs/beginners_guide.md @@ -166,10 +166,10 @@ The process of creating and deploying the ERC20 datatokens has been automated by ```Javascript const Web3 = require("web3"); -const { Ocean, DataTokens } = require("@oceanprotocol/lib"); +const { Ocean, Datatokens } = require("@oceanprotocol/lib"); const { factoryABI } = require("@oceanprotocol/contracts/artifacts/DTFactory.json"); -const { datatokensABI } = require("@oceanprotocol/contracts/artifacts/DataTokenTemplate.json"); +const { datatokensABI } = require("@oceanprotocol/contracts/artifacts/DatatokenTemplate.json"); const { config, contracts, urls } = require("./config"); const init = async () => { @@ -180,7 +180,7 @@ const init = async () => { const alice = accounts[0].id; console.log('Alice account address:', alice) - const datatoken = new DataTokens( + const datatoken = new Datatokens( contracts.DTFactory, factoryABI, datatokensABI, diff --git a/docs/overview.md b/docs/overview.md index 5f71415b..f02f623d 100644 --- a/docs/overview.md +++ b/docs/overview.md @@ -342,7 +342,7 @@ ocean.exchange.getAllExchangesSwaps(account: string): Promise; consume/start, stop, results, status, define-service ```Typescript -ocean.compute.start(did: string, txId: string, tokenAddress: string, consumerAccount: Account, algorithmDid?: string, algorithmMeta?: MetadataAlgorithm, output?: Output, serviceIndex?: string, serviceType?: string, algorithmTransferTxId?: string, algorithmDataToken?: string): Promise; +ocean.compute.start(did: string, txId: string, tokenAddress: string, consumerAccount: Account, algorithmDid?: string, algorithmMeta?: MetadataAlgorithm, output?: Output, serviceIndex?: string, serviceType?: string, algorithmTransferTxId?: string, algorithmDatatoken?: string): Promise; ``` ```Typescript diff --git a/docs/quickstart_marketplace.md b/docs/quickstart_marketplace.md index d8925589..f72873d7 100644 --- a/docs/quickstart_marketplace.md +++ b/docs/quickstart_marketplace.md @@ -121,10 +121,10 @@ Now open the `marketplace.js` file in your text editor. Enter the following code ```Javascript const Web3 = require("web3"); -const { Ocean, DataTokens } = require("@oceanprotocol/lib"); +const { Ocean, Datatokens } = require("@oceanprotocol/lib"); const { factoryABI } = require("@oceanprotocol/contracts/artifacts/DTFactory.json"); -const { datatokensABI } = require("@oceanprotocol/contracts/artifacts/DataTokenTemplate.json"); +const { datatokensABI } = require("@oceanprotocol/contracts/artifacts/DatatokenTemplate.json"); const { config, contracts, urls } = require("./config"); @@ -137,7 +137,7 @@ const init = async () => { const alice = accounts[0].id; console.log('Alice account address:', alice) - const datatoken = new DataTokens( + const datatoken = new Datatokens( contracts.DTFactory, factoryABI, datatokensABI, diff --git a/docs/quickstart_simple.md b/docs/quickstart_simple.md index 4c98f0ca..2ca303e0 100644 --- a/docs/quickstart_simple.md +++ b/docs/quickstart_simple.md @@ -114,10 +114,10 @@ Now open the `index.js` file in your text editor. Enter the following code and s ```Javascript const Web3 = require("web3"); -const { Ocean, DataTokens } = require("@oceanprotocol/lib"); +const { Ocean, Datatokens } = require("@oceanprotocol/lib"); const { factoryABI } = require("@oceanprotocol/contracts/artifacts/DTFactory.json"); -const { datatokensABI } = require("@oceanprotocol/contracts/artifacts/DataTokenTemplate.json"); +const { datatokensABI } = require("@oceanprotocol/contracts/artifacts/DatatokenTemplate.json"); const { config, contracts, urls } = require("./config"); @@ -130,7 +130,7 @@ const init = async () => { const alice = accounts[0].id; console.log('Alice account address:', alice) - const datatoken = new DataTokens( + const datatoken = new Datatokens( contracts.DTFactory, factoryABI, datatokensABI, diff --git a/src/pools/Router.ts b/src/pools/Router.ts index 1ccfb338..37f4108d 100644 --- a/src/pools/Router.ts +++ b/src/pools/Router.ts @@ -568,7 +568,7 @@ export class Router { const estGas = await this.estGasUpdateOPFFee(address, newFee) // Invoke createToken function of the contract - const trxReceipt = await this.router.methods.updateOPFFee(newFee).send({ + const trxReceipt = await this.router.methods.updateOPFFee(newFee, newFee).send({ from: address, gas: estGas + 1, gasPrice: await getFairGasPrice(this.web3) diff --git a/src/pools/balancer/Pool.ts b/src/pools/balancer/Pool.ts index d790c1e3..0e1499d7 100644 --- a/src/pools/balancer/Pool.ts +++ b/src/pools/balancer/Pool.ts @@ -68,7 +68,7 @@ export class Pool { } /** - * Get Alloance for both DataToken and Ocean + * Get Alloance for both Datatoken and Ocean * @param {String } tokenAdress * @param {String} owner * @param {String} spender diff --git a/src/pools/ssContracts/SideStaking.ts b/src/pools/ssContracts/SideStaking.ts index 0503ae8b..62b6705d 100644 --- a/src/pools/ssContracts/SideStaking.ts +++ b/src/pools/ssContracts/SideStaking.ts @@ -58,7 +58,7 @@ export class SideStaking { * @param {String} datatokenAddress datatoken address * @return {String} */ - async getDataTokenCirculatingSupply( + async getDatatokenCirculatingSupply( ssAddress: string, datatokenAddress: string ): Promise { @@ -66,7 +66,7 @@ export class SideStaking { let result = null try { result = await sideStaking.methods - .getDataTokenCirculatingSupply(datatokenAddress) + .getDatatokenCirculatingSupply(datatokenAddress) .call() } catch (e) { LoggerInstance.error(`ERROR: Failed to get: ${e.message}`) @@ -81,7 +81,7 @@ export class SideStaking { * @param {String} datatokenAddress datatoken address * @return {String} */ - async getDataTokenCurrentCirculatingSupply( + async getDatatokenCurrentCirculatingSupply( ssAddress: string, datatokenAddress: string ): Promise { @@ -89,7 +89,7 @@ export class SideStaking { const sideStaking = new this.web3.eth.Contract(this.ssAbi, ssAddress) let result = null result = await sideStaking.methods - .getDataTokenCurrentCirculatingSupply(datatokenAddress) + .getDatatokenCurrentCirculatingSupply(datatokenAddress) .call() return result.toString() } catch (e) { @@ -184,7 +184,7 @@ export class SideStaking { const sideStaking = new this.web3.eth.Contract(this.ssAbi, ssAddress) let result = null try { - result = await sideStaking.methods.getDataTokenBalance(datatokenAddress).call() + result = await sideStaking.methods.getDatatokenBalance(datatokenAddress).call() } catch (e) { LoggerInstance.error(`ERROR: Failed to get: ${e.message}`) } diff --git a/src/tokens/Datatoken.ts b/src/tokens/Datatoken.ts index aba1d967..d5ce6f2e 100644 --- a/src/tokens/Datatoken.ts +++ b/src/tokens/Datatoken.ts @@ -41,7 +41,7 @@ export class Datatoken { public nft: Nft /** - * Instantiate ERC20 DataTokens + * Instantiate ERC20 Datatokens * @param {AbiItem | AbiItem[]} datatokensAbi * @param {Web3} web3 */ @@ -1216,7 +1216,7 @@ export class Datatoken { return roles } - /** Returns the DataToken capital + /** Returns the Datatoken capital * @param {String} dtAddress Datatoken adress * @return {Promise} */ diff --git a/test/unit/pools/Router.test.ts b/test/unit/pools/Router.test.ts index efe906f8..c97aeefc 100644 --- a/test/unit/pools/Router.test.ts +++ b/test/unit/pools/Router.test.ts @@ -129,12 +129,12 @@ describe('Router unit test', () => { }) it('#getCurrentOPFFee - should return actual OPF Fee', async () => { - const opfFee = 1e15 + const opfFee = 0 expect(await router.getCurrentOPFFee()).to.equal(opfFee.toString()) }) it('#updateOPFFee - should update opf fee if Router Owner', async () => { - const opfFee = 1e15 + const opfFee = 0 expect(await router.getCurrentOPFFee()).to.equal(opfFee.toString()) const newOPFFee = 1e14 await router.updateOPFFee(contracts.accounts[0], 1e14) diff --git a/test/unit/pools/ssContracts/SideStaking.test.ts b/test/unit/pools/ssContracts/SideStaking.test.ts index ae5c4f85..ac9d1ce7 100644 --- a/test/unit/pools/ssContracts/SideStaking.test.ts +++ b/test/unit/pools/ssContracts/SideStaking.test.ts @@ -196,17 +196,17 @@ describe('SideStaking unit test', () => { ) }) - it('#getDataTokenCirculatingSupply - should get datatoken supply in circulation (vesting amount excluded)', async () => { + it('#getDatatokenCirculatingSupply - should get datatoken supply in circulation (vesting amount excluded)', async () => { expect( - await sideStaking.getDataTokenCirculatingSupply( + await sideStaking.getDatatokenCirculatingSupply( contracts.sideStakingAddress, erc20Token ) ).to.equal(web3.utils.toWei('12000')) }) - it('#getDataTokenCurrentCirculatingSupply - should get datatoken supply in circulation ', async () => { + it('#getDatatokenCurrentCirculatingSupply - should get datatoken supply in circulation ', async () => { expect( - await sideStaking.getDataTokenCurrentCirculatingSupply( + await sideStaking.getDatatokenCurrentCirculatingSupply( contracts.sideStakingAddress, erc20Token )