oceanprotocol/market
1
0
Fork 0
mirror of https://github.com/oceanprotocol/market.git synced 2024-12-02 05:57:29 +01:00
Code Releases Activity

merge branch v4-c2d into fix/compute-jobs

Browse Source
This commit is contained in:
Bogdan Fazakas 2022-03-28 10:23:58 +03:00
commit d42b0b6a2d
10 changed files with 140 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app.config.js
View File

@ -11,10 +11,10 @@ module.exports = {
// List of chainIds which metadata cache queries will return by default. // List of chainIds which metadata cache queries will return by default.
// This preselects the Chains user preferences. // This preselects the Chains user preferences.
chainIds: [1, 137, 56, 1285, 246], chainIds: [3, 4, 80001, 1287],
// List of all supported chainIds. Used to populate the Chains user preferences list. // List of all supported chainIds. Used to populate the Chains user preferences list.
chainIdsSupported: [1, 3, 4, 137, 80001, 1287, 56, 2021000, 1285, 246], chainIdsSupported: [3, 4, 80001, 1287],
infuraProjectId: process.env.NEXT_PUBLIC_INFURA_PROJECT_ID || 'xxx', infuraProjectId: process.env.NEXT_PUBLIC_INFURA_PROJECT_ID || 'xxx',

2
content/site.json
View File

@ -16,7 +16,7 @@
} }
], ],
"warning": { "warning": {
"main": "We are in beta. Please familiarize yourself with [the market](https://oceanprotocol.com/technology/marketplaces), [the risks](https://blog.oceanprotocol.com/on-staking-on-data-in-ocean-market-3d8e09eb0a13), and the [Terms of Use](/terms).", "main": "",
"polygonPublish": "Only republish data sets with a pool from ETH Mainnet into Polygon/Matic if the liquidity is **less than or equal to 1000 OCEAN in the original pool**. Doing otherwise will lead to [purgatory](https://github.com/oceanprotocol/list-purgatory) for the data set in Polygon/Matic." "polygonPublish": "Only republish data sets with a pool from ETH Mainnet into Polygon/Matic if the liquidity is **less than or equal to 1000 OCEAN in the original pool**. Doing otherwise will lead to [purgatory](https://github.com/oceanprotocol/list-purgatory) for the data set in Polygon/Matic."
}, },
"announcement": { "announcement": {

213
package-lock.json generated
View File

@ -13,7 +13,7 @@
"@coingecko/cryptoformat": "^0.4.4", "@coingecko/cryptoformat": "^0.4.4",
"@loadable/component": "^5.15.2", "@loadable/component": "^5.15.2",
"@oceanprotocol/art": "^3.2.0", "@oceanprotocol/art": "^3.2.0",
"@oceanprotocol/lib": "^1.0.0-next.28", "@oceanprotocol/lib": "^1.0.0-next.29",
"@oceanprotocol/typographies": "^0.1.0", "@oceanprotocol/typographies": "^0.1.0",
"@portis/web3": "^4.0.7", "@portis/web3": "^4.0.7",
"@tippyjs/react": "^4.2.6", "@tippyjs/react": "^4.2.6",
@ -2063,9 +2063,9 @@
} }
}, },
"node_modules/@ensdomains/ensjs/node_modules/ethers": { "node_modules/@ensdomains/ensjs/node_modules/ethers": {
"version": "5.6.0", "version": "5.6.1",
"resolved": "https://registry.npmjs.org/ethers/-/ethers-5.6.0.tgz", "resolved": "https://registry.npmjs.org/ethers/-/ethers-5.6.1.tgz",
"integrity": "sha512-00FP71jt6bW3ndO5DhgH9mLIZhoCGnAKFLu8qig5KmV03ubEChKf2ilB3g6fX512tTYo+tSMDJ5WpCJWdBHkBQ==", "integrity": "sha512-qtl/2W+dwmUa5Z3JqwsbV3JEBZZHNARe5K/A2ePcNAuhJYnEKIgGOT/O9ouPwBijSqVoQnmQMzi5D48LFNOY2A==",
"funding": [ "funding": [
{ {
"type": "individual", "type": "individual",
@ -2095,7 +2095,7 @@
"@ethersproject/networks": "5.6.0", "@ethersproject/networks": "5.6.0",
"@ethersproject/pbkdf2": "5.6.0", "@ethersproject/pbkdf2": "5.6.0",
"@ethersproject/properties": "5.6.0", "@ethersproject/properties": "5.6.0",
"@ethersproject/providers": "5.6.0", "@ethersproject/providers": "5.6.1",
"@ethersproject/random": "5.6.0", "@ethersproject/random": "5.6.0",
"@ethersproject/rlp": "5.6.0", "@ethersproject/rlp": "5.6.0",
"@ethersproject/sha2": "5.6.0", "@ethersproject/sha2": "5.6.0",
@ -2754,9 +2754,9 @@
} }
}, },
"node_modules/@ethersproject/providers": { "node_modules/@ethersproject/providers": {
"version": "5.6.0", "version": "5.6.1",
"resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.6.0.tgz", "resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.6.1.tgz",
"integrity": "sha512-6+5PKXTWAttJWFWF8+xCDTCa2/dtq9BNrdKQHGl0IyIOwj99vM6OeThmIRcsIAzIOb8m0XS6w+1KFZwrf3j9nw==", "integrity": "sha512-w8Wx15nH+aVDvnoKCyI1f3x0B5idmk/bDJXMEUqCfdO8Eadd0QpDx9lDMTMmenhOmf9vufLJXjpSm24D3ZnVpg==",
"funding": [ "funding": [
{ {
"type": "individual", "type": "individual",
@ -3381,9 +3381,9 @@
"integrity": "sha512-aUQtg4m5hJlQ0u8C29O9TXJWcAenO3G9vP+vf6LNFkpTDOCMycN/F0SzHS89VNrvGUha8oTDEg7FAkfZBPv2WA==" "integrity": "sha512-aUQtg4m5hJlQ0u8C29O9TXJWcAenO3G9vP+vf6LNFkpTDOCMycN/F0SzHS89VNrvGUha8oTDEg7FAkfZBPv2WA=="
}, },
"node_modules/@oceanprotocol/contracts": { "node_modules/@oceanprotocol/contracts": {
"version": "1.0.0-alpha.22", "version": "1.0.0-alpha.26",
"resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-1.0.0-alpha.22.tgz", "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-1.0.0-alpha.26.tgz",
"integrity": "sha512-+m0E2WgH9x66DCtoHB3aaJ69ep3sp/x+jjae50HVgvpw0I0fvatXn5jfHrBxRIBvu0ZIbj6Ct0En3N6h5Yi1vw==", "integrity": "sha512-PHmewip7ZnyMhdk/eLLaGGt4NB9j02haw6djyMB21jZVsqcXr5fLOfvAxra93H0ddkAFMK2valo5Ga+X9c3RMQ==",
"dependencies": { "dependencies": {
"@openzeppelin/contracts": "^4.3.3", "@openzeppelin/contracts": "^4.3.3",
"@openzeppelin/test-helpers": "^0.5.15", "@openzeppelin/test-helpers": "^0.5.15",
@ -3403,11 +3403,11 @@
} }
}, },
"node_modules/@oceanprotocol/lib": { "node_modules/@oceanprotocol/lib": {
"version": "1.0.0-next.28", "version": "1.0.0-next.29",
"resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-1.0.0-next.28.tgz", "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-1.0.0-next.29.tgz",
"integrity": "sha512-al0pSEQyUh5UVKOSJdHV4hWeSQW5Ov1ERH0nMNIIiaEDWCJECkYHoJwtOS1Oxa/TxsGR9Bz/+N0ec7tJfKX6kQ==", "integrity": "sha512-/QualMxcT8XvnhZ/ixtShI7MVQn6Arkg0R9f8lMeQw4Dyykh7ZuIlfJxvIjzsMeSavdAgt2BIy1slzr6Z5VtyA==",
"dependencies": { "dependencies": {
"@oceanprotocol/contracts": "1.0.0-alpha.22", "@oceanprotocol/contracts": "1.0.0-alpha.26",
"bignumber.js": "^9.0.2", "bignumber.js": "^9.0.2",
"cross-fetch": "^3.1.5", "cross-fetch": "^3.1.5",
"crypto-js": "^4.1.1", "crypto-js": "^4.1.1",
@ -5000,18 +5000,18 @@
} }
}, },
"node_modules/@truffle/blockchain-utils": { "node_modules/@truffle/blockchain-utils": {
"version": "0.1.0", "version": "0.1.1",
"resolved": "https://registry.npmjs.org/@truffle/blockchain-utils/-/blockchain-utils-0.1.0.tgz", "resolved": "https://registry.npmjs.org/@truffle/blockchain-utils/-/blockchain-utils-0.1.1.tgz",
"integrity": "sha512-9mzYXPQkjOc23rHQM1i630i3ackITWP1cxf3PvBObaAnGqwPCQuqtmZtNDPdvN+YpOLpBGpZIdYolI91xLdJNQ==" "integrity": "sha512-o7nBlaMuasuADCCL2WzhvOXA5GT5ewd/F35cY6ZU69U5OUASR3ZP4CZetVCc5MZePPa/3CL9pzJ4Rhtg1ChwVA=="
}, },
"node_modules/@truffle/codec": { "node_modules/@truffle/codec": {
"version": "0.12.2", "version": "0.12.3",
"resolved": "https://registry.npmjs.org/@truffle/codec/-/codec-0.12.2.tgz", "resolved": "https://registry.npmjs.org/@truffle/codec/-/codec-0.12.3.tgz",
"integrity": "sha512-UiWPPWtW8nkLbdzut0KkFXg5Xt70XXtgsdpwSG7lYOXJTPeLcCpGnVvjrDglsvwk3gz3iiOVrdtq6JwYo4om6Q==", "integrity": "sha512-szDlA5KmTwFDL6yjB0i9bwz48nxObbxAwL6MERJRLrs7yQu/3jTtTW3cfw9owtsfqu7DzX4TXAPLp0eYb4PPUQ==",
"dependencies": { "dependencies": {
"@truffle/abi-utils": "^0.2.10", "@truffle/abi-utils": "^0.2.10",
"@truffle/compile-common": "^0.7.29", "@truffle/compile-common": "^0.7.29",
"big.js": "^5.2.2", "big.js": "^6.0.3",
"bn.js": "^5.1.3", "bn.js": "^5.1.3",
"cbor": "^5.1.0", "cbor": "^5.1.0",
"debug": "^4.3.1", "debug": "^4.3.1",
@ -5021,6 +5021,18 @@
"web3-utils": "1.5.3" "web3-utils": "1.5.3"
} }
}, },
"node_modules/@truffle/codec/node_modules/big.js": {
"version": "6.1.1",
"resolved": "https://registry.npmjs.org/big.js/-/big.js-6.1.1.tgz",
"integrity": "sha512-1vObw81a8ylZO5ePrtMay0n018TcftpTA5HFKDaSuiUDBo8biRBtjIobw60OpwuvrGk+FsxKamqN4cnmj/eXdg==",
"engines": {
"node": "*"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/bigjs"
}
},
"node_modules/@truffle/codec/node_modules/bn.js": { "node_modules/@truffle/codec/node_modules/bn.js": {
"version": "5.2.0", "version": "5.2.0",
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
@ -5087,14 +5099,14 @@
} }
}, },
"node_modules/@truffle/contract": { "node_modules/@truffle/contract": {
"version": "4.5.0", "version": "4.5.1",
"resolved": "https://registry.npmjs.org/@truffle/contract/-/contract-4.5.0.tgz", "resolved": "https://registry.npmjs.org/@truffle/contract/-/contract-4.5.1.tgz",
"integrity": "sha512-i2sjrxGGgahGwVTfHG380Q8XveQoP+NbTlcKBYmEaeUjLloHIECt4zxhVp79e8svmtiYXScRytHbYlQdCqYRCQ==", "integrity": "sha512-r6MM42Bq7HdN2jd17ZQicCBGAhzOSyQeR6hras7N30nz2WTAi9GUj3vhprZ1lRiVMufOfc1H935jxsJz1hQipQ==",
"dependencies": { "dependencies": {
"@ensdomains/ensjs": "^2.0.1", "@ensdomains/ensjs": "^2.0.1",
"@truffle/blockchain-utils": "^0.1.0", "@truffle/blockchain-utils": "^0.1.1",
"@truffle/contract-schema": "^3.4.6", "@truffle/contract-schema": "^3.4.6",
"@truffle/debug-utils": "^6.0.12", "@truffle/debug-utils": "^6.0.13",
"@truffle/error": "^0.1.0", "@truffle/error": "^0.1.0",
"@truffle/interface-adapter": "^0.5.12", "@truffle/interface-adapter": "^0.5.12",
"bignumber.js": "^7.2.1", "bignumber.js": "^7.2.1",
@ -5439,16 +5451,16 @@
} }
}, },
"node_modules/@truffle/debug-utils": { "node_modules/@truffle/debug-utils": {
"version": "6.0.12", "version": "6.0.13",
"resolved": "https://registry.npmjs.org/@truffle/debug-utils/-/debug-utils-6.0.12.tgz", "resolved": "https://registry.npmjs.org/@truffle/debug-utils/-/debug-utils-6.0.13.tgz",
"integrity": "sha512-us74FNgKApsm34NzekxZWzU9ewagXTv226CJFV2z6F9mBQyClYCH6FdsZDHBpcm1MDEsspntb9w3M3r+8qtEUg==", "integrity": "sha512-8BZ82FqOpnfzs2IvfYOgTzthQ0e8yO1Zm86CO4vPlrbTVI0bSemCFevau0QzR5bPXVg558MHpDOhZHmZN6yU1w==",
"dependencies": { "dependencies": {
"@truffle/codec": "^0.12.2", "@truffle/codec": "^0.12.3",
"@trufflesuite/chromafi": "^3.0.0", "@trufflesuite/chromafi": "^3.0.0",
"bn.js": "^5.1.3", "bn.js": "^5.1.3",
"chalk": "^2.4.2", "chalk": "^2.4.2",
"debug": "^4.3.1", "debug": "^4.3.1",
"highlightjs-solidity": "^2.0.4" "highlightjs-solidity": "^2.0.5"
} }
}, },
"node_modules/@truffle/debug-utils/node_modules/bn.js": { "node_modules/@truffle/debug-utils/node_modules/bn.js": {
@ -8714,6 +8726,7 @@
"version": "5.2.2", "version": "5.2.2",
"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
"integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
"dev": true,
"engines": { "engines": {
"node": "*" "node": "*"
} }
@ -13353,11 +13366,11 @@
"integrity": "sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g==" "integrity": "sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g=="
}, },
"node_modules/fast-check": { "node_modules/fast-check": {
"version": "2.23.0", "version": "2.23.2",
"resolved": "https://registry.npmjs.org/fast-check/-/fast-check-2.23.0.tgz", "resolved": "https://registry.npmjs.org/fast-check/-/fast-check-2.23.2.tgz",
"integrity": "sha512-aV1kOi6zUCytkICuhu9s8MBtJjlAos6MIU5NYCcgt5u2UVdgaAsqTI+u0n6Cea1hKFXdfSmfz6wfxce6Ozcj2w==", "integrity": "sha512-ECYuSlp6NLpvOj8eScKsqoz1ihtCpSDuEC2ofdGvgsEu1obHYEGqreJ/iPzkJFy73yoU0kCFea7PHUQDNM0VNg==",
"dependencies": { "dependencies": {
"pure-rand": "^5.0.0" "pure-rand": "^5.0.1"
}, },
"engines": { "engines": {
"node": ">=8.0.0" "node": ">=8.0.0"
@ -14230,9 +14243,9 @@
} }
}, },
"node_modules/hardhat-contract-sizer": { "node_modules/hardhat-contract-sizer": {
"version": "2.5.0", "version": "2.5.1",
"resolved": "https://registry.npmjs.org/hardhat-contract-sizer/-/hardhat-contract-sizer-2.5.0.tgz", "resolved": "https://registry.npmjs.org/hardhat-contract-sizer/-/hardhat-contract-sizer-2.5.1.tgz",
"integrity": "sha512-579Bm3QjrGyInL4RuPFPV/2jLDekw+fGmeLQ85GeiBciIKPHVS3ZYuZJDrp7E9J6A4Czk+QVCRA9YPT2Svn7lQ==", "integrity": "sha512-28yRb73e30aBVaZOOHTlHZFIdIasA/iFunIehrUviIJTubvdQjtSiQUo2wexHFtt71mQeMPP8qjw2sdbgatDnQ==",
"dependencies": { "dependencies": {
"chalk": "^4.0.0", "chalk": "^4.0.0",
"cli-table3": "^0.6.0" "cli-table3": "^0.6.0"
@ -14759,9 +14772,9 @@
} }
}, },
"node_modules/highlightjs-solidity": { "node_modules/highlightjs-solidity": {
"version": "2.0.4", "version": "2.0.5",
"resolved": "https://registry.npmjs.org/highlightjs-solidity/-/highlightjs-solidity-2.0.4.tgz", "resolved": "https://registry.npmjs.org/highlightjs-solidity/-/highlightjs-solidity-2.0.5.tgz",
"integrity": "sha512-jsmfDXrjjxt4LxWfzp27j4CX6qYk6B8uK8sxzEDyGts8Ut1IuVlFCysAu6n5RrgHnuEKA+SCIcGPweO7qlPhCg==" "integrity": "sha512-ReXxQSGQkODMUgHcWzVSnfDCDrL2HshOYgw3OlIYmfHeRzUPkfJTUIp95pK4CmbiNG2eMTOmNLpfCz9Zq7Cwmg=="
}, },
"node_modules/hmac-drbg": { "node_modules/hmac-drbg": {
"version": "1.0.1", "version": "1.0.1",
@ -19223,9 +19236,9 @@
} }
}, },
"node_modules/pure-rand": { "node_modules/pure-rand": {
"version": "5.0.0", "version": "5.0.1",
"resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-5.0.0.tgz", "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-5.0.1.tgz",
"integrity": "sha512-lD2/y78q+7HqBx2SaT6OT4UcwtvXNRfEpzYEzl0EQ+9gZq2Qi3fa0HDnYPeqQwhlHJFBUhT7AO3mLU3+8bynHA==", "integrity": "sha512-ksWccjmXOHU2gJBnH0cK1lSYdvSZ0zLoCMSz/nTGh6hDvCSgcRxDyIcOBD6KNxFz3xhMPm/T267Tbe2JRymKEQ==",
"funding": { "funding": {
"type": "opencollective", "type": "opencollective",
"url": "https://opencollective.com/fast-check" "url": "https://opencollective.com/fast-check"
@ -22368,9 +22381,9 @@
} }
}, },
"node_modules/undici": { "node_modules/undici": {
"version": "4.15.1", "version": "4.16.0",
"resolved": "https://registry.npmjs.org/undici/-/undici-4.15.1.tgz", "resolved": "https://registry.npmjs.org/undici/-/undici-4.16.0.tgz",
"integrity": "sha512-h8LJybhMKD09IyQZoQadNtIR/GmugVhTOVREunJrpV6RStriKBFdSVoFzEzTihwXi/27DIBO+Z0OGF+Mzfi0lA==", "integrity": "sha512-tkZSECUYi+/T1i4u+4+lwZmQgLXd4BLGlrc7KZPcLIW7Jpq99+Xpc30ONv7nS6F5UNOxp/HBZSSL9MafUrvJbw==",
"peer": true, "peer": true,
"engines": { "engines": {
"node": ">=12.18" "node": ">=12.18"
@ -25812,9 +25825,9 @@
} }
}, },
"ethers": { "ethers": {
"version": "5.6.0", "version": "5.6.1",
"resolved": "https://registry.npmjs.org/ethers/-/ethers-5.6.0.tgz", "resolved": "https://registry.npmjs.org/ethers/-/ethers-5.6.1.tgz",
"integrity": "sha512-00FP71jt6bW3ndO5DhgH9mLIZhoCGnAKFLu8qig5KmV03ubEChKf2ilB3g6fX512tTYo+tSMDJ5WpCJWdBHkBQ==", "integrity": "sha512-qtl/2W+dwmUa5Z3JqwsbV3JEBZZHNARe5K/A2ePcNAuhJYnEKIgGOT/O9ouPwBijSqVoQnmQMzi5D48LFNOY2A==",
"requires": { "requires": {
"@ethersproject/abi": "5.6.0", "@ethersproject/abi": "5.6.0",
"@ethersproject/abstract-provider": "5.6.0", "@ethersproject/abstract-provider": "5.6.0",
@ -25834,7 +25847,7 @@
"@ethersproject/networks": "5.6.0", "@ethersproject/networks": "5.6.0",
"@ethersproject/pbkdf2": "5.6.0", "@ethersproject/pbkdf2": "5.6.0",
"@ethersproject/properties": "5.6.0", "@ethersproject/properties": "5.6.0",
"@ethersproject/providers": "5.6.0", "@ethersproject/providers": "5.6.1",
"@ethersproject/random": "5.6.0", "@ethersproject/random": "5.6.0",
"@ethersproject/rlp": "5.6.0", "@ethersproject/rlp": "5.6.0",
"@ethersproject/sha2": "5.6.0", "@ethersproject/sha2": "5.6.0",
@ -26304,9 +26317,9 @@
} }
}, },
"@ethersproject/providers": { "@ethersproject/providers": {
"version": "5.6.0", "version": "5.6.1",
"resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.6.0.tgz", "resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.6.1.tgz",
"integrity": "sha512-6+5PKXTWAttJWFWF8+xCDTCa2/dtq9BNrdKQHGl0IyIOwj99vM6OeThmIRcsIAzIOb8m0XS6w+1KFZwrf3j9nw==", "integrity": "sha512-w8Wx15nH+aVDvnoKCyI1f3x0B5idmk/bDJXMEUqCfdO8Eadd0QpDx9lDMTMmenhOmf9vufLJXjpSm24D3ZnVpg==",
"requires": { "requires": {
"@ethersproject/abstract-provider": "^5.6.0", "@ethersproject/abstract-provider": "^5.6.0",
"@ethersproject/abstract-signer": "^5.6.0", "@ethersproject/abstract-signer": "^5.6.0",
@ -26672,9 +26685,9 @@
"integrity": "sha512-aUQtg4m5hJlQ0u8C29O9TXJWcAenO3G9vP+vf6LNFkpTDOCMycN/F0SzHS89VNrvGUha8oTDEg7FAkfZBPv2WA==" "integrity": "sha512-aUQtg4m5hJlQ0u8C29O9TXJWcAenO3G9vP+vf6LNFkpTDOCMycN/F0SzHS89VNrvGUha8oTDEg7FAkfZBPv2WA=="
}, },
"@oceanprotocol/contracts": { "@oceanprotocol/contracts": {
"version": "1.0.0-alpha.22", "version": "1.0.0-alpha.26",
"resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-1.0.0-alpha.22.tgz", "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-1.0.0-alpha.26.tgz",
"integrity": "sha512-+m0E2WgH9x66DCtoHB3aaJ69ep3sp/x+jjae50HVgvpw0I0fvatXn5jfHrBxRIBvu0ZIbj6Ct0En3N6h5Yi1vw==", "integrity": "sha512-PHmewip7ZnyMhdk/eLLaGGt4NB9j02haw6djyMB21jZVsqcXr5fLOfvAxra93H0ddkAFMK2valo5Ga+X9c3RMQ==",
"requires": { "requires": {
"@openzeppelin/contracts": "^4.3.3", "@openzeppelin/contracts": "^4.3.3",
"@openzeppelin/test-helpers": "^0.5.15", "@openzeppelin/test-helpers": "^0.5.15",
@ -26693,16 +26706,15 @@
} }
}, },
"@oceanprotocol/lib": { "@oceanprotocol/lib": {
"version": "1.0.0-next.28", "version": "1.0.0-next.29",
"resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-1.0.0-next.28.tgz", "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-1.0.0-next.29.tgz",
"integrity": "sha512-al0pSEQyUh5UVKOSJdHV4hWeSQW5Ov1ERH0nMNIIiaEDWCJECkYHoJwtOS1Oxa/TxsGR9Bz/+N0ec7tJfKX6kQ==", "integrity": "sha512-/QualMxcT8XvnhZ/ixtShI7MVQn6Arkg0R9f8lMeQw4Dyykh7ZuIlfJxvIjzsMeSavdAgt2BIy1slzr6Z5VtyA==",
"requires": { "requires": {
"@oceanprotocol/contracts": "1.0.0-alpha.22", "@oceanprotocol/contracts": "1.0.0-alpha.26",
"bignumber.js": "^9.0.2", "bignumber.js": "^9.0.2",
"cross-fetch": "^3.1.5", "cross-fetch": "^3.1.5",
"crypto-js": "^4.1.1", "crypto-js": "^4.1.1",
"decimal.js": "^10.3.1", "decimal.js": "^10.3.1",
"web3": "^1.7.1",
"web3-core": "^1.7.1", "web3-core": "^1.7.1",
"web3-eth-contract": "^1.7.1" "web3-eth-contract": "^1.7.1"
} }
@ -26805,7 +26817,6 @@
"integrity": "sha512-5vwpq6kbvwkQwKqAoOU3L72GZ3Ta8RRrewKj9OJRolx28KLJJ8Dg9Rf7obRwt5jQA9bkYd8gqzMTrI7H3xLfaw==", "integrity": "sha512-5vwpq6kbvwkQwKqAoOU3L72GZ3Ta8RRrewKj9OJRolx28KLJJ8Dg9Rf7obRwt5jQA9bkYd8gqzMTrI7H3xLfaw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@oclif/config": "^1.15.1",
"@oclif/errors": "^1.3.3", "@oclif/errors": "^1.3.3",
"@oclif/parser": "^3.8.3", "@oclif/parser": "^3.8.3",
"@oclif/plugin-help": "^3", "@oclif/plugin-help": "^3",
@ -27889,18 +27900,18 @@
} }
}, },
"@truffle/blockchain-utils": { "@truffle/blockchain-utils": {
"version": "0.1.0", "version": "0.1.1",
"resolved": "https://registry.npmjs.org/@truffle/blockchain-utils/-/blockchain-utils-0.1.0.tgz", "resolved": "https://registry.npmjs.org/@truffle/blockchain-utils/-/blockchain-utils-0.1.1.tgz",
"integrity": "sha512-9mzYXPQkjOc23rHQM1i630i3ackITWP1cxf3PvBObaAnGqwPCQuqtmZtNDPdvN+YpOLpBGpZIdYolI91xLdJNQ==" "integrity": "sha512-o7nBlaMuasuADCCL2WzhvOXA5GT5ewd/F35cY6ZU69U5OUASR3ZP4CZetVCc5MZePPa/3CL9pzJ4Rhtg1ChwVA=="
}, },
"@truffle/codec": { "@truffle/codec": {
"version": "0.12.2", "version": "0.12.3",
"resolved": "https://registry.npmjs.org/@truffle/codec/-/codec-0.12.2.tgz", "resolved": "https://registry.npmjs.org/@truffle/codec/-/codec-0.12.3.tgz",
"integrity": "sha512-UiWPPWtW8nkLbdzut0KkFXg5Xt70XXtgsdpwSG7lYOXJTPeLcCpGnVvjrDglsvwk3gz3iiOVrdtq6JwYo4om6Q==", "integrity": "sha512-szDlA5KmTwFDL6yjB0i9bwz48nxObbxAwL6MERJRLrs7yQu/3jTtTW3cfw9owtsfqu7DzX4TXAPLp0eYb4PPUQ==",
"requires": { "requires": {
"@truffle/abi-utils": "^0.2.10", "@truffle/abi-utils": "^0.2.10",
"@truffle/compile-common": "^0.7.29", "@truffle/compile-common": "^0.7.29",
"big.js": "^5.2.2", "big.js": "^6.0.3",
"bn.js": "^5.1.3", "bn.js": "^5.1.3",
"cbor": "^5.1.0", "cbor": "^5.1.0",
"debug": "^4.3.1", "debug": "^4.3.1",
@ -27910,6 +27921,11 @@
"web3-utils": "1.5.3" "web3-utils": "1.5.3"
}, },
"dependencies": { "dependencies": {
"big.js": {
"version": "6.1.1",
"resolved": "https://registry.npmjs.org/big.js/-/big.js-6.1.1.tgz",
"integrity": "sha512-1vObw81a8ylZO5ePrtMay0n018TcftpTA5HFKDaSuiUDBo8biRBtjIobw60OpwuvrGk+FsxKamqN4cnmj/eXdg=="
},
"bn.js": { "bn.js": {
"version": "5.2.0", "version": "5.2.0",
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
@ -27973,14 +27989,14 @@
} }
}, },
"@truffle/contract": { "@truffle/contract": {
"version": "4.5.0", "version": "4.5.1",
"resolved": "https://registry.npmjs.org/@truffle/contract/-/contract-4.5.0.tgz", "resolved": "https://registry.npmjs.org/@truffle/contract/-/contract-4.5.1.tgz",
"integrity": "sha512-i2sjrxGGgahGwVTfHG380Q8XveQoP+NbTlcKBYmEaeUjLloHIECt4zxhVp79e8svmtiYXScRytHbYlQdCqYRCQ==", "integrity": "sha512-r6MM42Bq7HdN2jd17ZQicCBGAhzOSyQeR6hras7N30nz2WTAi9GUj3vhprZ1lRiVMufOfc1H935jxsJz1hQipQ==",
"requires": { "requires": {
"@ensdomains/ensjs": "^2.0.1", "@ensdomains/ensjs": "^2.0.1",
"@truffle/blockchain-utils": "^0.1.0", "@truffle/blockchain-utils": "^0.1.1",
"@truffle/contract-schema": "^3.4.6", "@truffle/contract-schema": "^3.4.6",
"@truffle/debug-utils": "^6.0.12", "@truffle/debug-utils": "^6.0.13",
"@truffle/error": "^0.1.0", "@truffle/error": "^0.1.0",
"@truffle/interface-adapter": "^0.5.12", "@truffle/interface-adapter": "^0.5.12",
"bignumber.js": "^7.2.1", "bignumber.js": "^7.2.1",
@ -28265,16 +28281,16 @@
} }
}, },
"@truffle/debug-utils": { "@truffle/debug-utils": {
"version": "6.0.12", "version": "6.0.13",
"resolved": "https://registry.npmjs.org/@truffle/debug-utils/-/debug-utils-6.0.12.tgz", "resolved": "https://registry.npmjs.org/@truffle/debug-utils/-/debug-utils-6.0.13.tgz",
"integrity": "sha512-us74FNgKApsm34NzekxZWzU9ewagXTv226CJFV2z6F9mBQyClYCH6FdsZDHBpcm1MDEsspntb9w3M3r+8qtEUg==", "integrity": "sha512-8BZ82FqOpnfzs2IvfYOgTzthQ0e8yO1Zm86CO4vPlrbTVI0bSemCFevau0QzR5bPXVg558MHpDOhZHmZN6yU1w==",
"requires": { "requires": {
"@truffle/codec": "^0.12.2", "@truffle/codec": "^0.12.3",
"@trufflesuite/chromafi": "^3.0.0", "@trufflesuite/chromafi": "^3.0.0",
"bn.js": "^5.1.3", "bn.js": "^5.1.3",
"chalk": "^2.4.2", "chalk": "^2.4.2",
"debug": "^4.3.1", "debug": "^4.3.1",
"highlightjs-solidity": "^2.0.4" "highlightjs-solidity": "^2.0.5"
}, },
"dependencies": { "dependencies": {
"bn.js": { "bn.js": {
@ -31133,7 +31149,8 @@
"big.js": { "big.js": {
"version": "5.2.2", "version": "5.2.2",
"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
"integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==" "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
"dev": true
}, },
"bignumber.js": { "bignumber.js": {
"version": "9.0.2", "version": "9.0.2",
@ -34887,11 +34904,11 @@
"integrity": "sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g==" "integrity": "sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g=="
}, },
"fast-check": { "fast-check": {
"version": "2.23.0", "version": "2.23.2",
"resolved": "https://registry.npmjs.org/fast-check/-/fast-check-2.23.0.tgz", "resolved": "https://registry.npmjs.org/fast-check/-/fast-check-2.23.2.tgz",
"integrity": "sha512-aV1kOi6zUCytkICuhu9s8MBtJjlAos6MIU5NYCcgt5u2UVdgaAsqTI+u0n6Cea1hKFXdfSmfz6wfxce6Ozcj2w==", "integrity": "sha512-ECYuSlp6NLpvOj8eScKsqoz1ihtCpSDuEC2ofdGvgsEu1obHYEGqreJ/iPzkJFy73yoU0kCFea7PHUQDNM0VNg==",
"requires": { "requires": {
"pure-rand": "^5.0.0" "pure-rand": "^5.0.1"
} }
}, },
"fast-deep-equal": { "fast-deep-equal": {
@ -35765,9 +35782,9 @@
} }
}, },
"hardhat-contract-sizer": { "hardhat-contract-sizer": {
"version": "2.5.0", "version": "2.5.1",
"resolved": "https://registry.npmjs.org/hardhat-contract-sizer/-/hardhat-contract-sizer-2.5.0.tgz", "resolved": "https://registry.npmjs.org/hardhat-contract-sizer/-/hardhat-contract-sizer-2.5.1.tgz",
"integrity": "sha512-579Bm3QjrGyInL4RuPFPV/2jLDekw+fGmeLQ85GeiBciIKPHVS3ZYuZJDrp7E9J6A4Czk+QVCRA9YPT2Svn7lQ==", "integrity": "sha512-28yRb73e30aBVaZOOHTlHZFIdIasA/iFunIehrUviIJTubvdQjtSiQUo2wexHFtt71mQeMPP8qjw2sdbgatDnQ==",
"requires": { "requires": {
"chalk": "^4.0.0", "chalk": "^4.0.0",
"cli-table3": "^0.6.0" "cli-table3": "^0.6.0"
@ -35954,9 +35971,9 @@
"integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==" "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A=="
}, },
"highlightjs-solidity": { "highlightjs-solidity": {
"version": "2.0.4", "version": "2.0.5",
"resolved": "https://registry.npmjs.org/highlightjs-solidity/-/highlightjs-solidity-2.0.4.tgz", "resolved": "https://registry.npmjs.org/highlightjs-solidity/-/highlightjs-solidity-2.0.5.tgz",
"integrity": "sha512-jsmfDXrjjxt4LxWfzp27j4CX6qYk6B8uK8sxzEDyGts8Ut1IuVlFCysAu6n5RrgHnuEKA+SCIcGPweO7qlPhCg==" "integrity": "sha512-ReXxQSGQkODMUgHcWzVSnfDCDrL2HshOYgw3OlIYmfHeRzUPkfJTUIp95pK4CmbiNG2eMTOmNLpfCz9Zq7Cwmg=="
}, },
"hmac-drbg": { "hmac-drbg": {
"version": "1.0.1", "version": "1.0.1",
@ -39355,9 +39372,9 @@
"integrity": "sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0=" "integrity": "sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0="
}, },
"pure-rand": { "pure-rand": {
"version": "5.0.0", "version": "5.0.1",
"resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-5.0.0.tgz", "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-5.0.1.tgz",
"integrity": "sha512-lD2/y78q+7HqBx2SaT6OT4UcwtvXNRfEpzYEzl0EQ+9gZq2Qi3fa0HDnYPeqQwhlHJFBUhT7AO3mLU3+8bynHA==" "integrity": "sha512-ksWccjmXOHU2gJBnH0cK1lSYdvSZ0zLoCMSz/nTGh6hDvCSgcRxDyIcOBD6KNxFz3xhMPm/T267Tbe2JRymKEQ=="
}, },
"qrcode": { "qrcode": {
"version": "1.4.4", "version": "1.4.4",
@ -41808,9 +41825,9 @@
} }
}, },
"undici": { "undici": {
"version": "4.15.1", "version": "4.16.0",
"resolved": "https://registry.npmjs.org/undici/-/undici-4.15.1.tgz", "resolved": "https://registry.npmjs.org/undici/-/undici-4.16.0.tgz",
"integrity": "sha512-h8LJybhMKD09IyQZoQadNtIR/GmugVhTOVREunJrpV6RStriKBFdSVoFzEzTihwXi/27DIBO+Z0OGF+Mzfi0lA==", "integrity": "sha512-tkZSECUYi+/T1i4u+4+lwZmQgLXd4BLGlrc7KZPcLIW7Jpq99+Xpc30ONv7nS6F5UNOxp/HBZSSL9MafUrvJbw==",
"peer": true "peer": true
}, },
"unicode-canonical-property-names-ecmascript": { "unicode-canonical-property-names-ecmascript": {

2
package.json
View File

@ -21,7 +21,7 @@
"@coingecko/cryptoformat": "^0.4.4", "@coingecko/cryptoformat": "^0.4.4",
"@loadable/component": "^5.15.2", "@loadable/component": "^5.15.2",
"@oceanprotocol/art": "^3.2.0", "@oceanprotocol/art": "^3.2.0",
"@oceanprotocol/lib": "^1.0.0-next.28", "@oceanprotocol/lib": "^1.0.0-next.29",
"@oceanprotocol/typographies": "^0.1.0", "@oceanprotocol/typographies": "^0.1.0",
"@portis/web3": "^4.0.7", "@portis/web3": "^4.0.7",
"@tippyjs/react": "^4.2.6", "@tippyjs/react": "^4.2.6",

8
src/@utils/accessDetailsAndPricing.ts
View File

@ -294,10 +294,10 @@ export async function getOrderPriceAndFees(
} }
// calculate full price, we assume that all the values are in ocean, otherwise this will be incorrect // calculate full price, we assume that all the values are in ocean, otherwise this will be incorrect
orderPriceAndFee.price = new Decimal(orderPriceAndFee.price) orderPriceAndFee.price = new Decimal(+orderPriceAndFee.price || 0)
.add(new Decimal(orderPriceAndFee.consumeMarketOrderFee)) .add(new Decimal(+orderPriceAndFee?.consumeMarketOrderFee || 0))
.add(new Decimal(orderPriceAndFee.publisherMarketOrderFee)) .add(new Decimal(+orderPriceAndFee?.publisherMarketOrderFee || 0))
.add(new Decimal(orderPriceAndFee.providerFee.providerFeeAmount)) .add(new Decimal(+orderPriceAndFee?.providerFee?.providerFeeAmount || 0))
.toString() .toString()
return orderPriceAndFee return orderPriceAndFee
} }

5
src/@utils/fixedRateExchange.ts
View File

@ -2,6 +2,7 @@ import { FixedRateExchange, PriceAndFees } from '@oceanprotocol/lib'
import { AccessDetails } from 'src/@types/Price' import { AccessDetails } from 'src/@types/Price'
import Web3 from 'web3' import Web3 from 'web3'
import { getOceanConfig } from './ocean' import { getOceanConfig } from './ocean'
import { getSiteMetadata } from './siteConfig'
import { getDummyWeb3 } from './web3' import { getDummyWeb3 } from './web3'
/** /**
@ -24,11 +25,13 @@ export async function getFixedBuyPrice(
} }
const config = getOceanConfig(chainId) const config = getOceanConfig(chainId)
const { appConfig } = getSiteMetadata()
const fixed = new FixedRateExchange(web3, config.fixedRateExchangeAddress) const fixed = new FixedRateExchange(web3, config.fixedRateExchangeAddress)
const estimatedPrice = await fixed.calcBaseInGivenOutDT( const estimatedPrice = await fixed.calcBaseInGivenOutDT(
accessDetails.addressOrId, accessDetails.addressOrId,
'1' '1',
appConfig.consumeMarketPoolSwapFee
) )
return estimatedPrice return estimatedPrice
} }

4
src/components/@shared/FileIcon/index.tsx
View File

@ -27,8 +27,6 @@ export default function FileIcon({
small?: boolean small?: boolean
isLoading?: boolean isLoading?: boolean
}): ReactElement { }): ReactElement {
if (!file) return null
const styleClasses = cx({ const styleClasses = cx({
file: true, file: true,
small: small, small: small,
@ -37,7 +35,7 @@ export default function FileIcon({
return ( return (
<ul className={styleClasses}> <ul className={styleClasses}>
{isLoading === false || isLoading === undefined ? ( {!isLoading && file ? (
<> <>
{file.contentType || file.contentLength ? ( {file.contentType || file.contentLength ? (
<> <>

5
src/components/App/index.tsx
View File

@ -10,7 +10,6 @@ import PrivacyPreferenceCenter from '../Privacy/PrivacyPreferenceCenter'
import styles from './index.module.css' import styles from './index.module.css'
import { ToastContainer } from 'react-toastify' import { ToastContainer } from 'react-toastify'
import { useRouter } from 'next/router' import { useRouter } from 'next/router'
// import waves from '@oceanprotocol/art/waves/waves.png'
import content from '../../../content/purgatory.json' import content from '../../../content/purgatory.json'
export default function App({ export default function App({
@ -26,7 +25,9 @@ export default function App({
return ( return (
<div className={styles.app}> <div className={styles.app}>
{router.pathname === '/' && <AnnouncementBanner text={warning.main} />} {router.pathname === '/' && warning.main !== '' && (
<AnnouncementBanner text={warning.main} />
)}
<Header /> <Header />
{isInPurgatory && ( {isInPurgatory && (

9
src/components/Asset/AssetActions/Download.tsx
View File

@ -73,7 +73,11 @@ export default function Download({
setValidOrderTx(asset?.accessDetails?.validOrderTx) setValidOrderTx(asset?.accessDetails?.validOrderTx)
// get full price and fees // get full price and fees
async function init() { async function init() {
if (asset?.accessDetails?.addressOrId === ZERO_ADDRESS) return if (
asset?.accessDetails?.addressOrId === ZERO_ADDRESS ||
asset?.accessDetails?.type === 'free'
)
return
setIsLoading(true) setIsLoading(true)
setStatusText('Calculating price including fees.') setStatusText('Calculating price including fees.')
const orderPriceAndFees = await getOrderPriceAndFees(asset, ZERO_ADDRESS) const orderPriceAndFees = await getOrderPriceAndFees(asset, ZERO_ADDRESS)
@ -190,7 +194,8 @@ export default function Download({
const tx = await fixed.collectBT( const tx = await fixed.collectBT(
accountId, accountId,
asset?.accessDetails?.addressOrId asset?.accessDetails?.addressOrId,
baseTokenBalance.toString()
) )
if (!tx) { if (!tx) {

4
src/components/Header/UserPreferences/Networks/NetworksList.tsx
View File

@ -13,10 +13,10 @@ export default function NetworksList({
<NetworkItem key={chainId} chainId={chainId} /> <NetworkItem key={chainId} chainId={chainId} />
)) ))
return ( return content.length ? (
<> <>
<h4 className={styles.titleGroup}>{title}</h4> <h4 className={styles.titleGroup}>{title}</h4>
<div className={styles.networks}>{content}</div> <div className={styles.networks}>{content}</div>
</> </>
) ) : null
} }