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

change address[1] to paymentCollector based on smart contract (#1375)

Browse Source 
Co-authored-by: Soon Huat <soon_huat.phan@daimler.com>
This commit is contained in:
Soon Huat 2022-03-29 22:40:30 +08:00 committed by GitHub
parent 4157e1e473
commit 4c5da01d66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/@types/Erc20.ts
View File

@ -1,7 +1,7 @@
export interface Erc20CreateParams {
templateIndex: number
minter: string
feeManager: string
paymentCollector: string
mpFeeAddress: string
feeToken: string
feeAmount: string

14
src/tokens/NFT.ts
View File

@ -44,7 +44,7 @@ export class Nft {
* @param {String} nftAddress ERC721 addreess
* @param {String} address User address
* @param {String} minter User set as initial minter for the ERC20
* @param {String} feeManager initial feeManager for this DT
* @param {String} paymentCollector initial paymentCollector for this DT
* @param {String} mpFeeAddress Consume marketplace fee address
* @param {String} feeToken address of the token marketplace wants to add fee on top
* @param {String} feeAmount amount of feeToken to be transferred to mpFeeAddress on top, will be converted to WEI
@ -59,7 +59,7 @@ export class Nft {
nftAddress: string,
address: string,
minter: string,
feeManager: string,
paymentCollector: string,
mpFeeAddress: string,
feeToken: string,
feeAmount: string,
@ -82,7 +82,7 @@ export class Nft {
.createERC20(
templateIndex,
[name, symbol],
[minter, feeManager, mpFeeAddress, feeToken],
[minter, paymentCollector, mpFeeAddress, feeToken],
[this.web3.utils.toWei(cap), this.web3.utils.toWei(feeAmount)],
[]
)
@ -98,7 +98,7 @@ export class Nft {
* @param {String} nftAddress ERC721 addreess
* @param {String} address User address
* @param {String} minter User set as initial minter for the ERC20
* @param {String} feeManager initial feeManager for this DT
* @param {String} paymentCollector initial paymentCollector for this DT
* @param {String} mpFeeAddress Consume marketplace fee address
* @param {String} feeToken address of the token marketplace wants to add fee on top
* @param {String} feeAmount amount of feeToken to be transferred to mpFeeAddress on top, will be converted to WEI
@ -112,7 +112,7 @@ export class Nft {
nftAddress: string,
address: string,
minter: string,
feeManager: string,
paymentCollector: string,
mpFeeAddress: string,
feeToken: string,
feeAmount: string,
@ -141,7 +141,7 @@ export class Nft {
nftAddress,
address,
minter,
feeManager,
paymentCollector,
mpFeeAddress,
feeToken,
feeAmount,
@ -157,7 +157,7 @@ export class Nft {
.createERC20(
templateIndex,
[name, symbol],
[minter, feeManager, mpFeeAddress, feeToken],
[minter, paymentCollector, mpFeeAddress, feeToken],
[this.web3.utils.toWei(cap), this.web3.utils.toWei(feeAmount)],
[]
)

2
src/utils/ContractUtils.ts
View File

@ -45,7 +45,7 @@ export function getErcCreationParams(ercParams: Erc20CreateParams): any {
strings: [ercParams.name || name, ercParams.symbol || symbol],
addresses: [
ercParams.minter,
ercParams.feeManager,
ercParams.paymentCollector,
ercParams.mpFeeAddress,
ercParams.feeToken
],

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

@ -142,7 +142,7 @@ describe('Simple compute tests', async () => {
templateIndex: 1,
cap: '100000',
feeAmount: '0',
feeManager: '0x0000000000000000000000000000000000000000',
paymentCollector: '0x0000000000000000000000000000000000000000',
feeToken: '0x0000000000000000000000000000000000000000',
minter: publisherAccount,
mpFeeAddress: '0x0000000000000000000000000000000000000000'
@ -191,7 +191,7 @@ describe('Simple compute tests', async () => {
templateIndex: 1,
cap: '100000',
feeAmount: '0',
feeManager: '0x0000000000000000000000000000000000000000',
paymentCollector: '0x0000000000000000000000000000000000000000',
feeToken: '0x0000000000000000000000000000000000000000',
minter: publisherAccount,
mpFeeAddress: '0x0000000000000000000000000000000000000000'

6
test/integration/PublishFlows.test.ts
View File

@ -102,7 +102,7 @@ describe('Publish tests', async () => {
templateIndex: 1,
cap: '100000',
feeAmount: '0',
feeManager: ZERO_ADDRESS,
paymentCollector: ZERO_ADDRESS,
feeToken: ZERO_ADDRESS,
minter: accounts[0],
mpFeeAddress: ZERO_ADDRESS
@ -181,7 +181,7 @@ describe('Publish tests', async () => {
templateIndex: 1,
cap: '100000',
feeAmount: '0',
feeManager: ZERO_ADDRESS,
paymentCollector: ZERO_ADDRESS,
feeToken: ZERO_ADDRESS,
minter: accounts[0],
mpFeeAddress: ZERO_ADDRESS
@ -257,7 +257,7 @@ describe('Publish tests', async () => {
templateIndex: 1,
cap: '100000',
feeAmount: '0',
feeManager: ZERO_ADDRESS,
paymentCollector: ZERO_ADDRESS,
feeToken: ZERO_ADDRESS,
minter: accounts[0],
mpFeeAddress: ZERO_ADDRESS

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

@ -82,7 +82,7 @@ describe('Simple Publish & consume test', async () => {
templateIndex: 1,
cap: '100000',
feeAmount: '0',
feeManager: '0x0000000000000000000000000000000000000000',
paymentCollector: '0x0000000000000000000000000000000000000000',
feeToken: '0x0000000000000000000000000000000000000000',
minter: publisherAccount,
mpFeeAddress: '0x0000000000000000000000000000000000000000'

8
test/unit/NftFactory.test.ts
View File

@ -104,7 +104,7 @@ describe('Nft Factory test', () => {
const ercParams: Erc20CreateParams = {
templateIndex: 1,
minter: contracts.accounts[0],
feeManager: user3,
paymentCollector: user3,
mpFeeAddress: user2,
feeToken: '0x0000000000000000000000000000000000000000',
cap: '10000',
@ -140,7 +140,7 @@ describe('Nft Factory test', () => {
const ercParams: Erc20CreateParams = {
templateIndex: 1,
minter: user2,
feeManager: user3,
paymentCollector: user3,
mpFeeAddress: user2,
feeToken: '0x0000000000000000000000000000000000000000',
cap: '1000000',
@ -190,7 +190,7 @@ describe('Nft Factory test', () => {
const ercParams: Erc20CreateParams = {
templateIndex: 1,
minter: contracts.accounts[0],
feeManager: user3,
paymentCollector: user3,
mpFeeAddress: user2,
feeToken: '0x0000000000000000000000000000000000000000',
cap: '1000000',
@ -240,7 +240,7 @@ describe('Nft Factory test', () => {
const ercParams: Erc20CreateParams = {
templateIndex: 1,
minter: contracts.accounts[0],
feeManager: user3,
paymentCollector: user3,
mpFeeAddress: user2,
feeToken: '0x0000000000000000000000000000000000000000',
cap: '1000000',

4
test/unit/pools/Router.test.ts
View File

@ -127,7 +127,7 @@ describe('Router unit test', () => {
const ercParams: Erc20CreateParams = {
templateIndex: 1,
minter: contracts.accounts[0],
feeManager: user3,
paymentCollector: user3,
mpFeeAddress: contracts.accounts[0],
feeToken: '0x0000000000000000000000000000000000000000',
cap: '1000000',
@ -180,7 +180,7 @@ describe('Router unit test', () => {
const ercParams2: Erc20CreateParams = {
templateIndex: 1,
minter: contracts.accounts[0],
feeManager: user3,
paymentCollector: user3,
mpFeeAddress: contracts.accounts[0],
feeToken: '0x0000000000000000000000000000000000000000',
cap: '1000000',

4
test/unit/pools/balancer/Pool.test.ts
View File

@ -139,7 +139,7 @@ describe('Pool unit test', () => {
const ercParams: Erc20CreateParams = {
templateIndex: 1,
minter: contracts.accounts[0],
feeManager: user3,
paymentCollector: user3,
mpFeeAddress: contracts.accounts[0],
feeToken: '0x0000000000000000000000000000000000000000',
cap: '1000000',
@ -591,7 +591,7 @@ describe('Pool unit test', () => {
const ercParams: Erc20CreateParams = {
templateIndex: 1,
minter: contracts.accounts[0],
feeManager: user3,
paymentCollector: user3,
mpFeeAddress: contracts.accounts[0],
feeToken: '0x0000000000000000000000000000000000000000',
cap: '1000000',

2
test/unit/pools/dispenser/Dispenser.test.ts
View File

@ -89,7 +89,7 @@ describe('Dispenser flow', () => {
const ercParams: Erc20CreateParams = {
templateIndex: 1,
minter: contracts.accounts[0],
feeManager: user3,
paymentCollector: user3,
mpFeeAddress: user2,
feeToken: '0x0000000000000000000000000000000000000000',
cap: '10000',

4
test/unit/pools/fixedRate/FixedRateExchange.test.ts
View File

@ -103,7 +103,7 @@ describe('Fixed Rate unit test', () => {
const ercParams: Erc20CreateParams = {
templateIndex: 1,
minter: contracts.accounts[0],
feeManager: user3,
paymentCollector: user3,
mpFeeAddress: contracts.accounts[0],
feeToken: ADDRESS_ZERO,
cap: '1000000',
@ -419,7 +419,7 @@ describe('Fixed Rate unit test', () => {
const ercParams: Erc20CreateParams = {
templateIndex: 1,
minter: contracts.accounts[0],
feeManager: user3,
paymentCollector: user3,
mpFeeAddress: contracts.accounts[0],
feeToken: ADDRESS_ZERO,
cap: '1000000',

4
test/unit/pools/ssContracts/SideStaking.test.ts
View File

@ -152,7 +152,7 @@ describe('SideStaking unit test', () => {
const ercParams: Erc20CreateParams = {
templateIndex: 1,
minter: contracts.accounts[0],
feeManager: user3,
paymentCollector: user3,
mpFeeAddress: contracts.accounts[0],
feeToken: '0x0000000000000000000000000000000000000000',
cap: '1000000',
@ -395,7 +395,7 @@ describe('SideStaking unit test', () => {
const ercParams: Erc20CreateParams = {
templateIndex: 1,
minter: contracts.accounts[0],
feeManager: user3,
paymentCollector: user3,
mpFeeAddress: contracts.accounts[0],
feeToken: '0x0000000000000000000000000000000000000000',
cap: '1000000',