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

use serviceIndex instead of serviceID

Browse Source
This commit is contained in:
Bogdan Fazakas 2021-12-02 16:51:26 +02:00
parent fdb3c05ca5
commit 112a552b90
5 changed files with 80 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

198
package-lock.json generated
View File

@ -1853,38 +1853,6 @@
"node": ">=6.9.0" "node": ">=6.9.0"
} }
}, },
"node_modules/@balancer-labs/v2-asset-manager-utils": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/@balancer-labs/v2-asset-manager-utils/-/v2-asset-manager-utils-0.1.0.tgz",
"integrity": "sha512-TbBXKp+laIbjMqzJUqibNtJHG6Fsq51BfSxqwr6BWQc0Ysif2drRx9nbF3OCY5DNvM1J+c5LZ6mYno/uqSbgGw==",
"dependencies": {
"@balancer-labs/v2-solidity-utils": "1.0.0",
"@balancer-labs/v2-vault": "1.0.0"
}
},
"node_modules/@balancer-labs/v2-pool-utils": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/@balancer-labs/v2-pool-utils/-/v2-pool-utils-1.0.0.tgz",
"integrity": "sha512-7CSdHuWqSiEsK+/v+xgnn/Bc+9qNOvCF1T0UDidlxCfa1L2djpYz8P/J+ouITcGaz/330yGTEsrkd94ZOoLE2w==",
"dependencies": {
"@balancer-labs/v2-asset-manager-utils": "0.1.0",
"@balancer-labs/v2-solidity-utils": "1.0.0",
"@balancer-labs/v2-vault": "1.0.0"
}
},
"node_modules/@balancer-labs/v2-solidity-utils": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/@balancer-labs/v2-solidity-utils/-/v2-solidity-utils-1.0.0.tgz",
"integrity": "sha512-nTmxPRhErmNTIsSU18wX0sbm6CbVEs3FYpbQDw1QUzPaqg+ono+lYkqExrlf63OBJGE60QPbjTybQaLW1MNoqQ=="
},
"node_modules/@balancer-labs/v2-vault": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/@balancer-labs/v2-vault/-/v2-vault-1.0.0.tgz",
"integrity": "sha512-md5ri4sGamvg2K3914HMailkhcyo6PhYJmd6k8AMJvTnKG3gr2jNNBuRygtoKGRqT6hrty46/EXQG/Nn/Fk9+g==",
"dependencies": {
"@balancer-labs/v2-solidity-utils": "1.0.0"
}
},
"node_modules/@cspotcode/source-map-consumer": { "node_modules/@cspotcode/source-map-consumer": {
"version": "0.8.0", "version": "0.8.0",
"resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz", "resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz",
@ -1951,9 +1919,9 @@
} }
}, },
"node_modules/@ensdomains/ensjs/node_modules/ethers": { "node_modules/@ensdomains/ensjs/node_modules/ethers": {
"version": "5.5.1", "version": "5.5.2",
"resolved": "https://registry.npmjs.org/ethers/-/ethers-5.5.1.tgz", "resolved": "https://registry.npmjs.org/ethers/-/ethers-5.5.2.tgz",
"integrity": "sha512-RodEvUFZI+EmFcE6bwkuJqpCYHazdzeR1nMzg+YWQSmQEsNtfl1KHGfp/FWZYl48bI/g7cgBeP2IlPthjiVngw==", "integrity": "sha512-EF5W+6Wwcu6BqVwpgmyR5U2+L4c1FQzlM/02dkZOugN3KF0cG9bzHZP+TDJglmPm2/IzCEJDT7KBxzayk7SAHw==",
"funding": [ "funding": [
{ {
"type": "individual", "type": "individual",
@ -1980,10 +1948,10 @@
"@ethersproject/json-wallets": "5.5.0", "@ethersproject/json-wallets": "5.5.0",
"@ethersproject/keccak256": "5.5.0", "@ethersproject/keccak256": "5.5.0",
"@ethersproject/logger": "5.5.0", "@ethersproject/logger": "5.5.0",
"@ethersproject/networks": "5.5.0", "@ethersproject/networks": "5.5.1",
"@ethersproject/pbkdf2": "5.5.0", "@ethersproject/pbkdf2": "5.5.0",
"@ethersproject/properties": "5.5.0", "@ethersproject/properties": "5.5.0",
"@ethersproject/providers": "5.5.0", "@ethersproject/providers": "5.5.1",
"@ethersproject/random": "5.5.0", "@ethersproject/random": "5.5.0",
"@ethersproject/rlp": "5.5.0", "@ethersproject/rlp": "5.5.0",
"@ethersproject/sha2": "5.5.0", "@ethersproject/sha2": "5.5.0",
@ -1993,7 +1961,7 @@
"@ethersproject/transactions": "5.5.0", "@ethersproject/transactions": "5.5.0",
"@ethersproject/units": "5.5.0", "@ethersproject/units": "5.5.0",
"@ethersproject/wallet": "5.5.0", "@ethersproject/wallet": "5.5.0",
"@ethersproject/web": "5.5.0", "@ethersproject/web": "5.5.1",
"@ethersproject/wordlists": "5.5.0" "@ethersproject/wordlists": "5.5.0"
} }
}, },
@ -2588,9 +2556,9 @@
] ]
}, },
"node_modules/@ethersproject/networks": { "node_modules/@ethersproject/networks": {
"version": "5.5.0", "version": "5.5.1",
"resolved": "https://registry.npmjs.org/@ethersproject/networks/-/networks-5.5.0.tgz", "resolved": "https://registry.npmjs.org/@ethersproject/networks/-/networks-5.5.1.tgz",
"integrity": "sha512-KWfP3xOnJeF89Uf/FCJdV1a2aDJe5XTN2N52p4fcQ34QhDqQFkgQKZ39VGtiqUgHcLI8DfT0l9azC3KFTunqtA==", "integrity": "sha512-tYRDM4zZtSUcKnD4UMuAlj7SeXH/k5WC4SP2u1Pn57++JdXHkRu2zwNkgNogZoxHzhm9Q6qqurDBVptHOsW49Q==",
"funding": [ "funding": [
{ {
"type": "individual", "type": "individual",
@ -2643,9 +2611,9 @@
} }
}, },
"node_modules/@ethersproject/providers": { "node_modules/@ethersproject/providers": {
"version": "5.5.0", "version": "5.5.1",
"resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.5.0.tgz", "resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.5.1.tgz",
"integrity": "sha512-xqMbDnS/FPy+J/9mBLKddzyLLAQFjrVff5g00efqxPzcAwXiR+SiCGVy6eJ5iAIirBOATjx7QLhDNPGV+AEQsw==", "integrity": "sha512-2zdD5sltACDWhjUE12Kucg2PcgM6V2q9JMyVvObtVGnzJu+QSmibbP+BHQyLWZUBfLApx2942+7DC5D+n4wBQQ==",
"funding": [ "funding": [
{ {
"type": "individual", "type": "individual",
@ -2901,9 +2869,9 @@
} }
}, },
"node_modules/@ethersproject/web": { "node_modules/@ethersproject/web": {
"version": "5.5.0", "version": "5.5.1",
"resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.5.0.tgz", "resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.5.1.tgz",
"integrity": "sha512-BEgY0eL5oH4mAo37TNYVrFeHsIXLRxggCRG/ksRIxI2X5uj5IsjGmcNiRN/VirQOlBxcUhCgHhaDLG4m6XAVoA==", "integrity": "sha512-olvLvc1CB12sREc1ROPSHTdFCdvMh0J5GSJYiQg2D0hdD4QmJDy8QYDb1CvoqD/bF1c++aeKv2sR5uduuG9dQg==",
"funding": [ "funding": [
{ {
"type": "individual", "type": "individual",
@ -3051,15 +3019,14 @@
"node_modules/@oceanprotocol/contracts": { "node_modules/@oceanprotocol/contracts": {
"name": "hardhat-project", "name": "hardhat-project",
"version": "v1.0.0-alpha.1", "version": "v1.0.0-alpha.1",
"resolved": "git+ssh://git@github.com/oceanprotocol/contracts.git#f72642e81064777242625f7a1b31af92a925f292", "resolved": "git+ssh://git@github.com/oceanprotocol/contracts.git#9d734766e9a44ce668321bc79e2d863f91fba116",
"dependencies": { "dependencies": {
"@balancer-labs/v2-pool-utils": "^1.0.0", "@openzeppelin/contracts": "^4.3.3",
"@openzeppelin/contracts": "^4.2.0", "@openzeppelin/test-helpers": "^0.5.15",
"@openzeppelin/test-helpers": "^0.5.10",
"dotenv": "^10.0.0", "dotenv": "^10.0.0",
"eth-permit": "^0.1.10", "eth-permit": "^0.2.1",
"ethereumjs-util": "^7.0.10", "ethereumjs-util": "^7.1.3",
"hardhat-contract-sizer": "^2.0.3", "hardhat-contract-sizer": "^2.1.1",
"solidity-bytes-utils": "^0.8.0" "solidity-bytes-utils": "^0.8.0"
} }
}, },
@ -3217,9 +3184,9 @@
} }
}, },
"node_modules/@openzeppelin/contracts": { "node_modules/@openzeppelin/contracts": {
"version": "4.3.3", "version": "4.4.0",
"resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-4.3.3.tgz", "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-4.4.0.tgz",
"integrity": "sha512-tDBopO1c98Yk7Cv/PZlHqrvtVjlgK5R4J6jxLwoO7qxK4xqOiZG+zSkIvGFpPZ0ikc3QOED3plgdqjgNTnBc7g==" "integrity": "sha512-dlKiZmDvJnGRLHojrDoFZJmsQVeltVeoiRN7RK+cf2FmkhASDEblE0RiaYdxPNsUZa6mRG8393b9bfyp+V5IAw=="
}, },
"node_modules/@openzeppelin/test-helpers": { "node_modules/@openzeppelin/test-helpers": {
"version": "0.5.15", "version": "0.5.15",
@ -7465,9 +7432,9 @@
} }
}, },
"node_modules/core-js-pure": { "node_modules/core-js-pure": {
"version": "3.19.1", "version": "3.19.2",
"resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.19.1.tgz", "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.19.2.tgz",
"integrity": "sha512-Q0Knr8Es84vtv62ei6/6jXH/7izKmOrtrxH9WJTHLCMAVeU+8TF8z8Nr08CsH4Ot0oJKzBzJJL9SJBYIv7WlfQ==", "integrity": "sha512-5LkcgQEy8pFeVnd/zomkUBSwnmIxuF1C8E9KrMAbOc8f34IBT9RGvTYeNDdp1PnvMJrrVhvk1hg/yVV5h/znlg==",
"hasInstallScript": true, "hasInstallScript": true,
"peer": true, "peer": true,
"funding": { "funding": {
@ -10028,9 +9995,9 @@
} }
}, },
"node_modules/eth-permit": { "node_modules/eth-permit": {
"version": "0.1.10", "version": "0.2.1",
"resolved": "https://registry.npmjs.org/eth-permit/-/eth-permit-0.1.10.tgz", "resolved": "https://registry.npmjs.org/eth-permit/-/eth-permit-0.2.1.tgz",
"integrity": "sha512-cMAjWvGEaCQoWSlKWBqkBMQvhCtXzVlkTCnYBxGRsCxznbBZSiYuOsHpTAb4EerRwQJkRgwd3vPvcZh3OA7Siw==", "integrity": "sha512-+a91Il8JDsKXnib6a5CWEwBc9OOR93IYM1GRGlcnEa+NwMHkWLg4P8lyEHnUmoMVfjutoQTz8wnEWr5Y+k3QOQ==",
"dependencies": { "dependencies": {
"utf8": "^3.0.0" "utf8": "^3.0.0"
} }
@ -10788,9 +10755,9 @@
"integrity": "sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g==" "integrity": "sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g=="
}, },
"node_modules/fast-check": { "node_modules/fast-check": {
"version": "2.19.0", "version": "2.20.0",
"resolved": "https://registry.npmjs.org/fast-check/-/fast-check-2.19.0.tgz", "resolved": "https://registry.npmjs.org/fast-check/-/fast-check-2.20.0.tgz",
"integrity": "sha512-qY4Rc0Nljl2aJx2qgbK3o6wPBjL9QvhKdD/VqJgaKd5ewn8l4ViqgDpUHJq/JkHTBnFKomYYvkFkOYGDVTT8bw==", "integrity": "sha512-tFNjLyPnOUg6iimVxOtoWMJOIyybCo7B8gUGm1yv43jDCQ0hlPUn0fmna/XO/n1yPxn/dxQw3+IygPSbMDiiog==",
"dependencies": { "dependencies": {
"pure-rand": "^5.0.0" "pure-rand": "^5.0.0"
}, },
@ -26937,38 +26904,6 @@
"to-fast-properties": "^2.0.0" "to-fast-properties": "^2.0.0"
} }
}, },
"@balancer-labs/v2-asset-manager-utils": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/@balancer-labs/v2-asset-manager-utils/-/v2-asset-manager-utils-0.1.0.tgz",
"integrity": "sha512-TbBXKp+laIbjMqzJUqibNtJHG6Fsq51BfSxqwr6BWQc0Ysif2drRx9nbF3OCY5DNvM1J+c5LZ6mYno/uqSbgGw==",
"requires": {
"@balancer-labs/v2-solidity-utils": "1.0.0",
"@balancer-labs/v2-vault": "1.0.0"
}
},
"@balancer-labs/v2-pool-utils": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/@balancer-labs/v2-pool-utils/-/v2-pool-utils-1.0.0.tgz",
"integrity": "sha512-7CSdHuWqSiEsK+/v+xgnn/Bc+9qNOvCF1T0UDidlxCfa1L2djpYz8P/J+ouITcGaz/330yGTEsrkd94ZOoLE2w==",
"requires": {
"@balancer-labs/v2-asset-manager-utils": "0.1.0",
"@balancer-labs/v2-solidity-utils": "1.0.0",
"@balancer-labs/v2-vault": "1.0.0"
}
},
"@balancer-labs/v2-solidity-utils": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/@balancer-labs/v2-solidity-utils/-/v2-solidity-utils-1.0.0.tgz",
"integrity": "sha512-nTmxPRhErmNTIsSU18wX0sbm6CbVEs3FYpbQDw1QUzPaqg+ono+lYkqExrlf63OBJGE60QPbjTybQaLW1MNoqQ=="
},
"@balancer-labs/v2-vault": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/@balancer-labs/v2-vault/-/v2-vault-1.0.0.tgz",
"integrity": "sha512-md5ri4sGamvg2K3914HMailkhcyo6PhYJmd6k8AMJvTnKG3gr2jNNBuRygtoKGRqT6hrty46/EXQG/Nn/Fk9+g==",
"requires": {
"@balancer-labs/v2-solidity-utils": "1.0.0"
}
},
"@cspotcode/source-map-consumer": { "@cspotcode/source-map-consumer": {
"version": "0.8.0", "version": "0.8.0",
"resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz", "resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz",
@ -27028,9 +26963,9 @@
}, },
"dependencies": { "dependencies": {
"ethers": { "ethers": {
"version": "5.5.1", "version": "5.5.2",
"resolved": "https://registry.npmjs.org/ethers/-/ethers-5.5.1.tgz", "resolved": "https://registry.npmjs.org/ethers/-/ethers-5.5.2.tgz",
"integrity": "sha512-RodEvUFZI+EmFcE6bwkuJqpCYHazdzeR1nMzg+YWQSmQEsNtfl1KHGfp/FWZYl48bI/g7cgBeP2IlPthjiVngw==", "integrity": "sha512-EF5W+6Wwcu6BqVwpgmyR5U2+L4c1FQzlM/02dkZOugN3KF0cG9bzHZP+TDJglmPm2/IzCEJDT7KBxzayk7SAHw==",
"requires": { "requires": {
"@ethersproject/abi": "5.5.0", "@ethersproject/abi": "5.5.0",
"@ethersproject/abstract-provider": "5.5.1", "@ethersproject/abstract-provider": "5.5.1",
@ -27047,10 +26982,10 @@
"@ethersproject/json-wallets": "5.5.0", "@ethersproject/json-wallets": "5.5.0",
"@ethersproject/keccak256": "5.5.0", "@ethersproject/keccak256": "5.5.0",
"@ethersproject/logger": "5.5.0", "@ethersproject/logger": "5.5.0",
"@ethersproject/networks": "5.5.0", "@ethersproject/networks": "5.5.1",
"@ethersproject/pbkdf2": "5.5.0", "@ethersproject/pbkdf2": "5.5.0",
"@ethersproject/properties": "5.5.0", "@ethersproject/properties": "5.5.0",
"@ethersproject/providers": "5.5.0", "@ethersproject/providers": "5.5.1",
"@ethersproject/random": "5.5.0", "@ethersproject/random": "5.5.0",
"@ethersproject/rlp": "5.5.0", "@ethersproject/rlp": "5.5.0",
"@ethersproject/sha2": "5.5.0", "@ethersproject/sha2": "5.5.0",
@ -27060,7 +26995,7 @@
"@ethersproject/transactions": "5.5.0", "@ethersproject/transactions": "5.5.0",
"@ethersproject/units": "5.5.0", "@ethersproject/units": "5.5.0",
"@ethersproject/wallet": "5.5.0", "@ethersproject/wallet": "5.5.0",
"@ethersproject/web": "5.5.0", "@ethersproject/web": "5.5.1",
"@ethersproject/wordlists": "5.5.0" "@ethersproject/wordlists": "5.5.0"
} }
} }
@ -27500,9 +27435,9 @@
"integrity": "sha512-rIY/6WPm7T8n3qS2vuHTUBPdXHl+rGxWxW5okDfo9J4Z0+gRRZT0msvUdIJkE4/HS29GUMziwGaaKO2bWONBrg==" "integrity": "sha512-rIY/6WPm7T8n3qS2vuHTUBPdXHl+rGxWxW5okDfo9J4Z0+gRRZT0msvUdIJkE4/HS29GUMziwGaaKO2bWONBrg=="
}, },
"@ethersproject/networks": { "@ethersproject/networks": {
"version": "5.5.0", "version": "5.5.1",
"resolved": "https://registry.npmjs.org/@ethersproject/networks/-/networks-5.5.0.tgz", "resolved": "https://registry.npmjs.org/@ethersproject/networks/-/networks-5.5.1.tgz",
"integrity": "sha512-KWfP3xOnJeF89Uf/FCJdV1a2aDJe5XTN2N52p4fcQ34QhDqQFkgQKZ39VGtiqUgHcLI8DfT0l9azC3KFTunqtA==", "integrity": "sha512-tYRDM4zZtSUcKnD4UMuAlj7SeXH/k5WC4SP2u1Pn57++JdXHkRu2zwNkgNogZoxHzhm9Q6qqurDBVptHOsW49Q==",
"requires": { "requires": {
"@ethersproject/logger": "^5.5.0" "@ethersproject/logger": "^5.5.0"
} }
@ -27525,9 +27460,9 @@
} }
}, },
"@ethersproject/providers": { "@ethersproject/providers": {
"version": "5.5.0", "version": "5.5.1",
"resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.5.0.tgz", "resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.5.1.tgz",
"integrity": "sha512-xqMbDnS/FPy+J/9mBLKddzyLLAQFjrVff5g00efqxPzcAwXiR+SiCGVy6eJ5iAIirBOATjx7QLhDNPGV+AEQsw==", "integrity": "sha512-2zdD5sltACDWhjUE12Kucg2PcgM6V2q9JMyVvObtVGnzJu+QSmibbP+BHQyLWZUBfLApx2942+7DC5D+n4wBQQ==",
"requires": { "requires": {
"@ethersproject/abstract-provider": "^5.5.0", "@ethersproject/abstract-provider": "^5.5.0",
"@ethersproject/abstract-signer": "^5.5.0", "@ethersproject/abstract-signer": "^5.5.0",
@ -27671,9 +27606,9 @@
} }
}, },
"@ethersproject/web": { "@ethersproject/web": {
"version": "5.5.0", "version": "5.5.1",
"resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.5.0.tgz", "resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.5.1.tgz",
"integrity": "sha512-BEgY0eL5oH4mAo37TNYVrFeHsIXLRxggCRG/ksRIxI2X5uj5IsjGmcNiRN/VirQOlBxcUhCgHhaDLG4m6XAVoA==", "integrity": "sha512-olvLvc1CB12sREc1ROPSHTdFCdvMh0J5GSJYiQg2D0hdD4QmJDy8QYDb1CvoqD/bF1c++aeKv2sR5uduuG9dQg==",
"requires": { "requires": {
"@ethersproject/base64": "^5.5.0", "@ethersproject/base64": "^5.5.0",
"@ethersproject/bytes": "^5.5.0", "@ethersproject/bytes": "^5.5.0",
@ -27777,16 +27712,15 @@
} }
}, },
"@oceanprotocol/contracts": { "@oceanprotocol/contracts": {
"version": "git+ssh://git@github.com/oceanprotocol/contracts.git#f72642e81064777242625f7a1b31af92a925f292", "version": "git+ssh://git@github.com/oceanprotocol/contracts.git#9d734766e9a44ce668321bc79e2d863f91fba116",
"from": "@oceanprotocol/contracts@github:oceanprotocol/contracts#v4main_postaudit", "from": "@oceanprotocol/contracts@github:oceanprotocol/contracts#v4main_postaudit",
"requires": { "requires": {
"@balancer-labs/v2-pool-utils": "^1.0.0", "@openzeppelin/contracts": "^4.3.3",
"@openzeppelin/contracts": "^4.2.0", "@openzeppelin/test-helpers": "^0.5.15",
"@openzeppelin/test-helpers": "^0.5.10",
"dotenv": "^10.0.0", "dotenv": "^10.0.0",
"eth-permit": "^0.1.10", "eth-permit": "^0.2.1",
"ethereumjs-util": "^7.0.10", "ethereumjs-util": "^7.1.3",
"hardhat-contract-sizer": "^2.0.3", "hardhat-contract-sizer": "^2.1.1",
"solidity-bytes-utils": "^0.8.0" "solidity-bytes-utils": "^0.8.0"
} }
}, },
@ -27935,9 +27869,9 @@
} }
}, },
"@openzeppelin/contracts": { "@openzeppelin/contracts": {
"version": "4.3.3", "version": "4.4.0",
"resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-4.3.3.tgz", "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-4.4.0.tgz",
"integrity": "sha512-tDBopO1c98Yk7Cv/PZlHqrvtVjlgK5R4J6jxLwoO7qxK4xqOiZG+zSkIvGFpPZ0ikc3QOED3plgdqjgNTnBc7g==" "integrity": "sha512-dlKiZmDvJnGRLHojrDoFZJmsQVeltVeoiRN7RK+cf2FmkhASDEblE0RiaYdxPNsUZa6mRG8393b9bfyp+V5IAw=="
}, },
"@openzeppelin/test-helpers": { "@openzeppelin/test-helpers": {
"version": "0.5.15", "version": "0.5.15",
@ -31420,9 +31354,9 @@
} }
}, },
"core-js-pure": { "core-js-pure": {
"version": "3.19.1", "version": "3.19.2",
"resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.19.1.tgz", "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.19.2.tgz",
"integrity": "sha512-Q0Knr8Es84vtv62ei6/6jXH/7izKmOrtrxH9WJTHLCMAVeU+8TF8z8Nr08CsH4Ot0oJKzBzJJL9SJBYIv7WlfQ==", "integrity": "sha512-5LkcgQEy8pFeVnd/zomkUBSwnmIxuF1C8E9KrMAbOc8f34IBT9RGvTYeNDdp1PnvMJrrVhvk1hg/yVV5h/znlg==",
"peer": true "peer": true
}, },
"core-util-is": { "core-util-is": {
@ -33401,9 +33335,9 @@
} }
}, },
"eth-permit": { "eth-permit": {
"version": "0.1.10", "version": "0.2.1",
"resolved": "https://registry.npmjs.org/eth-permit/-/eth-permit-0.1.10.tgz", "resolved": "https://registry.npmjs.org/eth-permit/-/eth-permit-0.2.1.tgz",
"integrity": "sha512-cMAjWvGEaCQoWSlKWBqkBMQvhCtXzVlkTCnYBxGRsCxznbBZSiYuOsHpTAb4EerRwQJkRgwd3vPvcZh3OA7Siw==", "integrity": "sha512-+a91Il8JDsKXnib6a5CWEwBc9OOR93IYM1GRGlcnEa+NwMHkWLg4P8lyEHnUmoMVfjutoQTz8wnEWr5Y+k3QOQ==",
"requires": { "requires": {
"utf8": "^3.0.0" "utf8": "^3.0.0"
} }
@ -34111,9 +34045,9 @@
"integrity": "sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g==" "integrity": "sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g=="
}, },
"fast-check": { "fast-check": {
"version": "2.19.0", "version": "2.20.0",
"resolved": "https://registry.npmjs.org/fast-check/-/fast-check-2.19.0.tgz", "resolved": "https://registry.npmjs.org/fast-check/-/fast-check-2.20.0.tgz",
"integrity": "sha512-qY4Rc0Nljl2aJx2qgbK3o6wPBjL9QvhKdD/VqJgaKd5ewn8l4ViqgDpUHJq/JkHTBnFKomYYvkFkOYGDVTT8bw==", "integrity": "sha512-tFNjLyPnOUg6iimVxOtoWMJOIyybCo7B8gUGm1yv43jDCQ0hlPUn0fmna/XO/n1yPxn/dxQw3+IygPSbMDiiog==",
"requires": { "requires": {
"pure-rand": "^5.0.0" "pure-rand": "^5.0.0"
} }

16
src/datatokens/Datatoken.ts
View File

@ -19,7 +19,7 @@ interface Roles {
export interface OrderParams { export interface OrderParams {
consumer: string consumer: string
amount: string amount: string
serviceId: number serviceIndex: number
consumeFeeAddress: string consumeFeeAddress: string
consumeFeeToken: string consumeFeeToken: string
consumeFeeAmount: string consumeFeeAmount: string
@ -818,7 +818,7 @@ export class Datatoken {
* @param {String} address User address which calls * @param {String} address User address which calls
* @param {String} consumer Consumer Address * @param {String} consumer Consumer Address
* @param {String} amount Amount of tokens that is going to be transfered * @param {String} amount Amount of tokens that is going to be transfered
* @param {Number} serviceId Service index in the metadata * @param {Number} serviceIndex Service index in the metadata
* @param {String} mpFeeAddress Consume marketplace fee address * @param {String} mpFeeAddress Consume marketplace fee address
* @param {String} feeToken address of the token marketplace wants to add fee on top * @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 * @param {String} feeAmount amount of feeToken to be transferred to mpFeeAddress on top, will be converted to WEI
@ -830,7 +830,7 @@ export class Datatoken {
address: string, address: string,
consumer: string, consumer: string,
amount: string, amount: string,
serviceId: number, serviceIndex: number,
mpFeeAddress: string, mpFeeAddress: string,
feeToken: string, feeToken: string,
feeAmount: string, feeAmount: string,
@ -847,7 +847,7 @@ export class Datatoken {
.startOrder( .startOrder(
consumer, consumer,
this.web3.utils.toWei(amount), this.web3.utils.toWei(amount),
serviceId, serviceIndex,
mpFeeAddress, mpFeeAddress,
feeToken, feeToken,
this.web3.utils.toWei(feeAmount) this.web3.utils.toWei(feeAmount)
@ -864,7 +864,7 @@ export class Datatoken {
* @param {String} address User address which calls * @param {String} address User address which calls
* @param {String} consumer Consumer Address * @param {String} consumer Consumer Address
* @param {String} amount Amount of tokens that is going to be transfered * @param {String} amount Amount of tokens that is going to be transfered
* @param {Number} serviceId Service index in the metadata * @param {Number} serviceIndex Service index in the metadata
* @param {String} mpFeeAddress Consume marketplace fee address * @param {String} mpFeeAddress Consume marketplace fee address
* @param {String} feeToken address of the token marketplace wants to add fee on top * @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 * @param {String} feeAmount amount of feeToken to be transferred to mpFeeAddress on top, will be converted to WEI
@ -875,7 +875,7 @@ export class Datatoken {
address: string, address: string,
consumer: string, consumer: string,
amount: string, amount: string,
serviceId: number, serviceIndex: number,
mpFeeAddress: string, mpFeeAddress: string,
feeToken: string, feeToken: string,
feeAmount: string feeAmount: string
@ -888,7 +888,7 @@ export class Datatoken {
address, address,
consumer, consumer,
amount, amount,
serviceId, serviceIndex,
mpFeeAddress, mpFeeAddress,
feeToken, feeToken,
feeAmount, feeAmount,
@ -899,7 +899,7 @@ export class Datatoken {
.startOrder( .startOrder(
consumer, consumer,
this.web3.utils.toWei(amount), this.web3.utils.toWei(amount),
serviceId, serviceIndex,
mpFeeAddress, mpFeeAddress,
feeToken, feeToken,
this.web3.utils.toWei(feeAmount) this.web3.utils.toWei(feeAmount)

2
src/factories/NFTFactory.ts
View File

@ -22,7 +22,7 @@ export interface TokenOrder {
tokenAddress: string tokenAddress: string
consumer: string consumer: string
amount: string | number amount: string | number
serviceId: number serviceIndex: number
consumeFeeAddress: string consumeFeeAddress: string
consumeFeeToken: string // address of the token marketplace wants to add fee on top consumeFeeToken: string // address of the token marketplace wants to add fee on top
consumeFeeAmount: number consumeFeeAmount: number

4
test/unit/Datatoken.test.ts
View File

@ -282,7 +282,7 @@ describe('Datatoken', () => {
const order: OrderParams = { const order: OrderParams = {
consumer: user1, consumer: user1,
amount: '1', amount: '1',
serviceId: 1, serviceIndex: 1,
consumeFeeAddress: user1, consumeFeeAddress: user1,
consumeFeeToken: '0x0000000000000000000000000000000000000000', consumeFeeToken: '0x0000000000000000000000000000000000000000',
consumeFeeAmount: '0' consumeFeeAmount: '0'
@ -301,7 +301,7 @@ describe('Datatoken', () => {
const order: OrderParams = { const order: OrderParams = {
consumer: user1, consumer: user1,
amount: '1', amount: '1',
serviceId: 1, serviceIndex: 1,
consumeFeeAddress: user1, consumeFeeAddress: user1,
consumeFeeToken: '0x0000000000000000000000000000000000000000', consumeFeeToken: '0x0000000000000000000000000000000000000000',
consumeFeeAmount: '0' consumeFeeAmount: '0'

6
test/unit/NFTFactory.test.ts
View File

@ -311,7 +311,7 @@ describe('NFT Factory test', () => {
it('#startMultipleTokenOrder- should succed to start multiple orders', async () => { it('#startMultipleTokenOrder- should succed to start multiple orders', async () => {
const consumer = user2 // could be different user const consumer = user2 // could be different user
const dtAmount = web3.utils.toWei('1') const dtAmount = web3.utils.toWei('1')
const serviceId = 1 // dummy index const serviceIndex = 1 // dummy index
const consumeFeeAddress = user3 // marketplace fee Collector const consumeFeeAddress = user3 // marketplace fee Collector
const consumeFeeAmount = 0 // fee to be collected on top, requires approval const consumeFeeAmount = 0 // fee to be collected on top, requires approval
const consumeFeeToken = contracts.daiAddress // token address for the feeAmount, in this case DAI const consumeFeeToken = contracts.daiAddress // token address for the feeAmount, in this case DAI
@ -348,7 +348,7 @@ describe('NFT Factory test', () => {
tokenAddress: dtAddress, tokenAddress: dtAddress,
consumer: consumer, consumer: consumer,
amount: dtAmount, amount: dtAmount,
serviceId: serviceId, serviceIndex: serviceIndex,
consumeFeeAddress: consumeFeeAddress, consumeFeeAddress: consumeFeeAddress,
consumeFeeToken: consumeFeeToken, consumeFeeToken: consumeFeeToken,
consumeFeeAmount: consumeFeeAmount consumeFeeAmount: consumeFeeAmount
@ -357,7 +357,7 @@ describe('NFT Factory test', () => {
tokenAddress: dtAddress2, tokenAddress: dtAddress2,
consumer: consumer, consumer: consumer,
amount: dtAmount, amount: dtAmount,
serviceId: serviceId, serviceIndex: serviceIndex,
consumeFeeAddress: consumeFeeAddress, consumeFeeAddress: consumeFeeAddress,
consumeFeeToken: consumeFeeToken, consumeFeeToken: consumeFeeToken,
consumeFeeAmount: consumeFeeAmount consumeFeeAmount: consumeFeeAmount