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 branch 'v4main' into issue-1349-rewrite-pool-test

Browse Source
This commit is contained in:
Miquel A. Cabot 2022-04-28 17:44:25 +02:00
commit bedbb5acc8
14 changed files with 2197 additions and 1582 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View File

@ -58,8 +58,6 @@ jobs:
working-directory: ${{ github.workspace }}/barge working-directory: ${{ github.workspace }}/barge
run: | run: |
bash -x start_ocean.sh --no-aquarius --no-elasticsearch --no-provider --no-dashboard 2>&1 > start_ocean.log & bash -x start_ocean.sh --no-aquarius --no-elasticsearch --no-provider --no-dashboard 2>&1 > start_ocean.log &
env:
CONTRACTS_VERSION: v1.0.0-alpha.28
- run: npm ci - run: npm ci
- name: Wait for contracts deployment - name: Wait for contracts deployment
working-directory: ${{ github.workspace }}/barge working-directory: ${{ github.workspace }}/barge
@ -117,8 +115,6 @@ jobs:
working-directory: ${{ github.workspace }}/barge working-directory: ${{ github.workspace }}/barge
run: | run: |
bash -x start_ocean.sh --with-provider2 --no-dashboard --with-c2d 2>&1 > start_ocean.log & bash -x start_ocean.sh --with-provider2 --no-dashboard --with-c2d 2>&1 > start_ocean.log &
env:
CONTRACTS_VERSION: v1.0.0-alpha.28
- run: npm ci - run: npm ci
- run: npm run build:metadata - run: npm run build:metadata

2754
CHANGELOG.md
View File

File diff suppressed because it is too large Load Diff

621
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "@oceanprotocol/lib", "name": "@oceanprotocol/lib",
"version": "1.0.0-next.33", "version": "1.0.0-next.37",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "@oceanprotocol/lib", "name": "@oceanprotocol/lib",
"version": "1.0.0-next.33", "version": "1.0.0-next.37",
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"@oceanprotocol/contracts": "1.0.0-alpha.28", "@oceanprotocol/contracts": "1.0.0-alpha.28",
@ -19,12 +19,12 @@
"web3-eth-contract": "^1.7.1" "web3-eth-contract": "^1.7.1"
}, },
"devDependencies": { "devDependencies": {
"@truffle/hdwallet-provider": "^2.0.5", "@truffle/hdwallet-provider": "^2.0.7",
"@types/chai": "^4.2.19", "@types/chai": "^4.3.1",
"@types/chai-spies": "^1.0.3", "@types/chai-spies": "^1.0.3",
"@types/crypto-js": "^4.1.1", "@types/crypto-js": "^4.1.1",
"@types/mocha": "^9.1.0", "@types/mocha": "^9.1.1",
"@types/node": "^17.0.23", "@types/node": "^17.0.29",
"@types/node-fetch": "^3.0.3", "@types/node-fetch": "^3.0.3",
"@typescript-eslint/eslint-plugin": "^4.33.0", "@typescript-eslint/eslint-plugin": "^4.33.0",
"@typescript-eslint/parser": "^4.33.0", "@typescript-eslint/parser": "^4.33.0",
@ -37,7 +37,7 @@
"eslint-config-prettier": "^8.5.0", "eslint-config-prettier": "^8.5.0",
"eslint-plugin-prettier": "^4.0.0", "eslint-plugin-prettier": "^4.0.0",
"fs": "0.0.1-security", "fs": "0.0.1-security",
"microbundle": "^0.14.2", "microbundle": "^0.15.0",
"mocha": "^9.2.2", "mocha": "^9.2.2",
"mock-local-storage": "^1.1.21", "mock-local-storage": "^1.1.21",
"nyc": "^15.1.0", "nyc": "^15.1.0",
@ -2417,6 +2417,24 @@
"integrity": "sha512-/kSXhY692qiV1MXu6EeOZvg5nECLclxNXcKCxJ3cXQgYuRymRHpdx/t7JXfsK+JLjwA1e1c1/SBrlQYpusC29Q==", "integrity": "sha512-/kSXhY692qiV1MXu6EeOZvg5nECLclxNXcKCxJ3cXQgYuRymRHpdx/t7JXfsK+JLjwA1e1c1/SBrlQYpusC29Q==",
"dev": true "dev": true
}, },
"node_modules/@noble/hashes": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.0.0.tgz",
"integrity": "sha512-DZVbtY62kc3kkBtMHqwCOfXrT/hnoORy5BJ4+HU1IR59X0KWAOqsfzQPcUl/lQLlG7qXbe/fZ3r/emxtAl+sqg==",
"dev": true
},
"node_modules/@noble/secp256k1": {
"version": "1.5.5",
"resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.5.5.tgz",
"integrity": "sha512-sZ1W6gQzYnu45wPrWx8D3kwI2/U29VYTx9OjbDAd7jwRItJ0cSTMPRL/C8AWZFn9kWFLQGqEXVEE86w4Z8LpIQ==",
"dev": true,
"funding": [
{
"type": "individual",
"url": "https://paulmillr.com/funding/"
}
]
},
"node_modules/@nodelib/fs.scandir": { "node_modules/@nodelib/fs.scandir": {
"version": "2.1.5", "version": "2.1.5",
"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@ -2723,6 +2741,51 @@
"integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
"dev": true "dev": true
}, },
"node_modules/@scure/base": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/@scure/base/-/base-1.0.0.tgz",
"integrity": "sha512-gIVaYhUsy+9s58m/ETjSJVKHhKTBMmcRb9cEV5/5dwvfDlfORjKrFsDeDHWRrm6RjcPvCLZFwGJjAjLj1gg4HA==",
"dev": true,
"funding": [
{
"type": "individual",
"url": "https://paulmillr.com/funding/"
}
]
},
"node_modules/@scure/bip32": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.0.1.tgz",
"integrity": "sha512-AU88KKTpQ+YpTLoicZ/qhFhRRIo96/tlb+8YmDDHR9yiKVjSsFZiefJO4wjS2PMTkz5/oIcw84uAq/8pleQURA==",
"dev": true,
"funding": [
{
"type": "individual",
"url": "https://paulmillr.com/funding/"
}
],
"dependencies": {
"@noble/hashes": "~1.0.0",
"@noble/secp256k1": "~1.5.2",
"@scure/base": "~1.0.0"
}
},
"node_modules/@scure/bip39": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.0.0.tgz",
"integrity": "sha512-HrtcikLbd58PWOkl02k9V6nXWQyoa7A0+Ek9VF7z17DDk9XZAFUcIdqfh0jJXLypmizc5/8P6OxoUeKliiWv4w==",
"dev": true,
"funding": [
{
"type": "individual",
"url": "https://paulmillr.com/funding/"
}
],
"dependencies": {
"@noble/hashes": "~1.0.0",
"@scure/base": "~1.0.0"
}
},
"node_modules/@sindresorhus/is": { "node_modules/@sindresorhus/is": {
"version": "0.14.0", "version": "0.14.0",
"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
@ -2755,15 +2818,15 @@
} }
}, },
"node_modules/@truffle/hdwallet-provider": { "node_modules/@truffle/hdwallet-provider": {
"version": "2.0.5", "version": "2.0.7",
"resolved": "https://registry.npmjs.org/@truffle/hdwallet-provider/-/hdwallet-provider-2.0.5.tgz", "resolved": "https://registry.npmjs.org/@truffle/hdwallet-provider/-/hdwallet-provider-2.0.7.tgz",
"integrity": "sha512-aF0tadToEU31w33mhUYK7oV8GGuyID2Ov/yx1pueTKcMhOAJYfqEMTE96qq/GNQOkrsmi7blnGdjCSzuCUCb7w==", "integrity": "sha512-ddkVUPfBjbxtlvhO7hc2DbqSZ+PrICgI44EIWZwFg5v6Zam+qPVLnfrEnXSVoJzw4j+usFzTIxvpiid+AzKdLw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@ethereumjs/common": "^2.4.0", "@ethereumjs/common": "^2.4.0",
"@ethereumjs/tx": "^3.3.0", "@ethereumjs/tx": "^3.3.0",
"eth-sig-util": "^3.0.1", "eth-sig-util": "^3.0.1",
"ethereum-cryptography": "^0.1.3", "ethereum-cryptography": "1.0.3",
"ethereum-protocol": "^1.0.1", "ethereum-protocol": "^1.0.1",
"ethereumjs-util": "^6.1.0", "ethereumjs-util": "^6.1.0",
"ethereumjs-wallet": "^1.0.1", "ethereumjs-wallet": "^1.0.1",
@ -2779,6 +2842,18 @@
"@types/node": "*" "@types/node": "*"
} }
}, },
"node_modules/@truffle/hdwallet-provider/node_modules/ethereum-cryptography": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-1.0.3.tgz",
"integrity": "sha512-NQLTW0x0CosoVb/n79x/TRHtfvS3hgNUPTUSCu0vM+9k6IIhHFFrAOJReneexjZsoZxMjJHnJn4lrE8EbnSyqQ==",
"dev": true,
"dependencies": {
"@noble/hashes": "1.0.0",
"@noble/secp256k1": "1.5.5",
"@scure/bip32": "1.0.1",
"@scure/bip39": "1.0.0"
}
},
"node_modules/@truffle/hdwallet-provider/node_modules/ethereumjs-util": { "node_modules/@truffle/hdwallet-provider/node_modules/ethereumjs-util": {
"version": "6.2.1", "version": "6.2.1",
"resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz", "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz",
@ -2794,6 +2869,29 @@
"rlp": "^2.2.3" "rlp": "^2.2.3"
} }
}, },
"node_modules/@truffle/hdwallet-provider/node_modules/ethereumjs-util/node_modules/ethereum-cryptography": {
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-0.1.3.tgz",
"integrity": "sha512-w8/4x1SGGzc+tO97TASLja6SLd3fRIK2tLVcV2Gx4IB21hE19atll5Cq9o3d0ZmAYC/8aw0ipieTSiekAea4SQ==",
"dev": true,
"dependencies": {
"@types/pbkdf2": "^3.0.0",
"@types/secp256k1": "^4.0.1",
"blakejs": "^1.1.0",
"browserify-aes": "^1.2.0",
"bs58check": "^2.1.2",
"create-hash": "^1.2.0",
"create-hmac": "^1.1.7",
"hash.js": "^1.1.7",
"keccak": "^3.0.0",
"pbkdf2": "^3.0.17",
"randombytes": "^2.1.0",
"safe-buffer": "^5.1.2",
"scrypt-js": "^3.0.0",
"secp256k1": "^4.0.1",
"setimmediate": "^1.0.5"
}
},
"node_modules/@trysound/sax": { "node_modules/@trysound/sax": {
"version": "0.2.0", "version": "0.2.0",
"resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz", "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
@ -2836,9 +2934,9 @@
} }
}, },
"node_modules/@types/chai": { "node_modules/@types/chai": {
"version": "4.3.0", "version": "4.3.1",
"resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.0.tgz", "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.1.tgz",
"integrity": "sha512-/ceqdqeRraGolFTcfoXNiqjyQhZzbINDngeoAq9GoHa8PPK1yNzTaxWjA6BFWp5Ua9JpXEMSS4s5i9tS0hOJtw==", "integrity": "sha512-/zPMqDkzSZ8t3VtxOa4KPq7uzzW978M9Tvh+j7GHKuo6k6GTLxPJ4J5gE5cjfJ26pnXst0N5Hax8Sr0T2Mi9zQ==",
"dev": true "dev": true
}, },
"node_modules/@types/chai-spies": { "node_modules/@types/chai-spies": {
@ -2875,15 +2973,15 @@
"dev": true "dev": true
}, },
"node_modules/@types/mocha": { "node_modules/@types/mocha": {
"version": "9.1.0", "version": "9.1.1",
"resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.0.tgz", "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz",
"integrity": "sha512-QCWHkbMv4Y5U9oW10Uxbr45qMMSzl4OzijsozynUAgx3kEHUdXB00udx2dWDQ7f2TU2a2uuiFaRZjCe3unPpeg==", "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==",
"dev": true "dev": true
}, },
"node_modules/@types/node": { "node_modules/@types/node": {
"version": "17.0.23", "version": "17.0.29",
"resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.29.tgz",
"integrity": "sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw==" "integrity": "sha512-tx5jMmMFwx7wBwq/V7OohKDVb/JwJU5qCVkeLMh1//xycAJ/ESuw9aJ9SEtlCZDYi2pBfe4JkisSoAtbOsBNAA=="
}, },
"node_modules/@types/node-fetch": { "node_modules/@types/node-fetch": {
"version": "3.0.3", "version": "3.0.3",
@ -5244,6 +5342,15 @@
"resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz", "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
"integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==" "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="
}, },
"node_modules/define-lazy-prop": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
"integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
"dev": true,
"engines": {
"node": ">=8"
}
},
"node_modules/define-properties": { "node_modules/define-properties": {
"version": "1.1.3", "version": "1.1.3",
"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
@ -5436,12 +5543,12 @@
"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
}, },
"node_modules/ejs": { "node_modules/ejs": {
"version": "3.1.6", "version": "3.1.7",
"resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.6.tgz", "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.7.tgz",
"integrity": "sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==", "integrity": "sha512-BIar7R6abbUxDA3bfXrO4DSgwo8I+fB5/1zgujl3HLLjwd6+9iOnrT+t3grn2qbk9vOgBubXOFwX2m9axoFaGw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"jake": "^10.6.1" "jake": "^10.8.5"
}, },
"bin": { "bin": {
"ejs": "bin/cli.js" "ejs": "bin/cli.js"
@ -7913,12 +8020,33 @@
} }
}, },
"node_modules/filelist": { "node_modules/filelist": {
"version": "1.0.2", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.2.tgz", "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.3.tgz",
"integrity": "sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==", "integrity": "sha512-LwjCsruLWQULGYKy7TX0OPtrL9kLpojOFKc5VCTxdFTV7w5zbsgqVKfnkKG7Qgjtq50gKfO56hJv88OfcGb70Q==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"minimatch": "^3.0.4" "minimatch": "^5.0.1"
}
},
"node_modules/filelist/node_modules/brace-expansion": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
"dev": true,
"dependencies": {
"balanced-match": "^1.0.0"
}
},
"node_modules/filelist/node_modules/minimatch": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
"integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
"dev": true,
"dependencies": {
"brace-expansion": "^2.0.1"
},
"engines": {
"node": ">=10"
} }
}, },
"node_modules/filesize": { "node_modules/filesize": {
@ -9790,13 +9918,13 @@
} }
}, },
"node_modules/jake": { "node_modules/jake": {
"version": "10.8.2", "version": "10.8.5",
"resolved": "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz", "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
"integrity": "sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==", "integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"async": "0.9.x", "async": "^3.2.3",
"chalk": "^2.4.2", "chalk": "^4.0.2",
"filelist": "^1.0.1", "filelist": "^1.0.1",
"minimatch": "^3.0.4" "minimatch": "^3.0.4"
}, },
@ -9804,15 +9932,85 @@
"jake": "bin/cli.js" "jake": "bin/cli.js"
}, },
"engines": { "engines": {
"node": "*" "node": ">=10"
}
},
"node_modules/jake/node_modules/ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"dependencies": {
"color-convert": "^2.0.1"
},
"engines": {
"node": ">=8"
},
"funding": {
"url": "https://github.com/chalk/ansi-styles?sponsor=1"
} }
}, },
"node_modules/jake/node_modules/async": { "node_modules/jake/node_modules/async": {
"version": "0.9.2", "version": "3.2.3",
"resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
"integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=", "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
"dev": true "dev": true
}, },
"node_modules/jake/node_modules/chalk": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"dependencies": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
},
"engines": {
"node": ">=10"
},
"funding": {
"url": "https://github.com/chalk/chalk?sponsor=1"
}
},
"node_modules/jake/node_modules/color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"dependencies": {
"color-name": "~1.1.4"
},
"engines": {
"node": ">=7.0.0"
}
},
"node_modules/jake/node_modules/color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true
},
"node_modules/jake/node_modules/has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true,
"engines": {
"node": ">=8"
}
},
"node_modules/jake/node_modules/supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"dependencies": {
"has-flag": "^4.0.0"
},
"engines": {
"node": ">=8"
}
},
"node_modules/jest-worker": { "node_modules/jest-worker": {
"version": "26.6.2", "version": "26.6.2",
"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz", "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
@ -10772,9 +10970,9 @@
} }
}, },
"node_modules/microbundle": { "node_modules/microbundle": {
"version": "0.14.2", "version": "0.15.0",
"resolved": "https://registry.npmjs.org/microbundle/-/microbundle-0.14.2.tgz", "resolved": "https://registry.npmjs.org/microbundle/-/microbundle-0.15.0.tgz",
"integrity": "sha512-jODALfU3w7jnJAqw7Tou9uU8e8zH0GRVWzOd/V7eAvD1fsfb9pyMbmzhFZqnX6SCb54eP1EF5oRyNlSxBAxoag==", "integrity": "sha512-EkFst5ntLXoQGewkvga/Kd72RcN7IuJRl5ivLihJSbvLfJQo8LDS0n9X0q81vegiC59vhtKIM6qjrl1fOAtuGw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@babel/core": "^7.12.10", "@babel/core": "^7.12.10",
@ -10813,6 +11011,7 @@
"rollup-plugin-postcss": "^4.0.0", "rollup-plugin-postcss": "^4.0.0",
"rollup-plugin-terser": "^7.0.2", "rollup-plugin-terser": "^7.0.2",
"rollup-plugin-typescript2": "^0.29.0", "rollup-plugin-typescript2": "^0.29.0",
"rollup-plugin-visualizer": "^5.6.0",
"sade": "^1.7.4", "sade": "^1.7.4",
"terser": "^5.7.0", "terser": "^5.7.0",
"tiny-glob": "^0.2.8", "tiny-glob": "^0.2.8",
@ -14138,6 +14337,80 @@
"integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==", "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==",
"dev": true "dev": true
}, },
"node_modules/rollup-plugin-visualizer": {
"version": "5.6.0",
"resolved": "https://registry.npmjs.org/rollup-plugin-visualizer/-/rollup-plugin-visualizer-5.6.0.tgz",
"integrity": "sha512-CKcc8GTUZjC+LsMytU8ocRr/cGZIfMR7+mdy4YnlyetlmIl/dM8BMnOEpD4JPIGt+ZVW7Db9ZtSsbgyeBH3uTA==",
"dev": true,
"dependencies": {
"nanoid": "^3.1.32",
"open": "^8.4.0",
"source-map": "^0.7.3",
"yargs": "^17.3.1"
},
"bin": {
"rollup-plugin-visualizer": "dist/bin/cli.js"
},
"engines": {
"node": ">=12"
},
"peerDependencies": {
"rollup": "^2.0.0"
}
},
"node_modules/rollup-plugin-visualizer/node_modules/open": {
"version": "8.4.0",
"resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
"integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
"dev": true,
"dependencies": {
"define-lazy-prop": "^2.0.0",
"is-docker": "^2.1.1",
"is-wsl": "^2.2.0"
},
"engines": {
"node": ">=12"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/rollup-plugin-visualizer/node_modules/source-map": {
"version": "0.7.3",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
"dev": true,
"engines": {
"node": ">= 8"
}
},
"node_modules/rollup-plugin-visualizer/node_modules/yargs": {
"version": "17.4.1",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.4.1.tgz",
"integrity": "sha512-WSZD9jgobAg3ZKuCQZSa3g9QOJeCCqLoLAykiWgmXnDo9EPnn4RPf5qVTtzgOx66o6/oqhcA5tHtJXpG8pMt3g==",
"dev": true,
"dependencies": {
"cliui": "^7.0.2",
"escalade": "^3.1.1",
"get-caller-file": "^2.0.5",
"require-directory": "^2.1.1",
"string-width": "^4.2.3",
"y18n": "^5.0.5",
"yargs-parser": "^21.0.0"
},
"engines": {
"node": ">=12"
}
},
"node_modules/rollup-plugin-visualizer/node_modules/yargs-parser": {
"version": "21.0.1",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
"integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==",
"dev": true,
"engines": {
"node": ">=12"
}
},
"node_modules/rollup-pluginutils": { "node_modules/rollup-pluginutils": {
"version": "2.8.2", "version": "2.8.2",
"resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz",
@ -18491,6 +18764,18 @@
"integrity": "sha512-/kSXhY692qiV1MXu6EeOZvg5nECLclxNXcKCxJ3cXQgYuRymRHpdx/t7JXfsK+JLjwA1e1c1/SBrlQYpusC29Q==", "integrity": "sha512-/kSXhY692qiV1MXu6EeOZvg5nECLclxNXcKCxJ3cXQgYuRymRHpdx/t7JXfsK+JLjwA1e1c1/SBrlQYpusC29Q==",
"dev": true "dev": true
}, },
"@noble/hashes": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.0.0.tgz",
"integrity": "sha512-DZVbtY62kc3kkBtMHqwCOfXrT/hnoORy5BJ4+HU1IR59X0KWAOqsfzQPcUl/lQLlG7qXbe/fZ3r/emxtAl+sqg==",
"dev": true
},
"@noble/secp256k1": {
"version": "1.5.5",
"resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.5.5.tgz",
"integrity": "sha512-sZ1W6gQzYnu45wPrWx8D3kwI2/U29VYTx9OjbDAd7jwRItJ0cSTMPRL/C8AWZFn9kWFLQGqEXVEE86w4Z8LpIQ==",
"dev": true
},
"@nodelib/fs.scandir": { "@nodelib/fs.scandir": {
"version": "2.1.5", "version": "2.1.5",
"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@ -18733,6 +19018,33 @@
} }
} }
}, },
"@scure/base": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/@scure/base/-/base-1.0.0.tgz",
"integrity": "sha512-gIVaYhUsy+9s58m/ETjSJVKHhKTBMmcRb9cEV5/5dwvfDlfORjKrFsDeDHWRrm6RjcPvCLZFwGJjAjLj1gg4HA==",
"dev": true
},
"@scure/bip32": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.0.1.tgz",
"integrity": "sha512-AU88KKTpQ+YpTLoicZ/qhFhRRIo96/tlb+8YmDDHR9yiKVjSsFZiefJO4wjS2PMTkz5/oIcw84uAq/8pleQURA==",
"dev": true,
"requires": {
"@noble/hashes": "~1.0.0",
"@noble/secp256k1": "~1.5.2",
"@scure/base": "~1.0.0"
}
},
"@scure/bip39": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.0.0.tgz",
"integrity": "sha512-HrtcikLbd58PWOkl02k9V6nXWQyoa7A0+Ek9VF7z17DDk9XZAFUcIdqfh0jJXLypmizc5/8P6OxoUeKliiWv4w==",
"dev": true,
"requires": {
"@noble/hashes": "~1.0.0",
"@scure/base": "~1.0.0"
}
},
"@sindresorhus/is": { "@sindresorhus/is": {
"version": "0.14.0", "version": "0.14.0",
"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
@ -18759,15 +19071,15 @@
} }
}, },
"@truffle/hdwallet-provider": { "@truffle/hdwallet-provider": {
"version": "2.0.5", "version": "2.0.7",
"resolved": "https://registry.npmjs.org/@truffle/hdwallet-provider/-/hdwallet-provider-2.0.5.tgz", "resolved": "https://registry.npmjs.org/@truffle/hdwallet-provider/-/hdwallet-provider-2.0.7.tgz",
"integrity": "sha512-aF0tadToEU31w33mhUYK7oV8GGuyID2Ov/yx1pueTKcMhOAJYfqEMTE96qq/GNQOkrsmi7blnGdjCSzuCUCb7w==", "integrity": "sha512-ddkVUPfBjbxtlvhO7hc2DbqSZ+PrICgI44EIWZwFg5v6Zam+qPVLnfrEnXSVoJzw4j+usFzTIxvpiid+AzKdLw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@ethereumjs/common": "^2.4.0", "@ethereumjs/common": "^2.4.0",
"@ethereumjs/tx": "^3.3.0", "@ethereumjs/tx": "^3.3.0",
"eth-sig-util": "^3.0.1", "eth-sig-util": "^3.0.1",
"ethereum-cryptography": "^0.1.3", "ethereum-cryptography": "1.0.3",
"ethereum-protocol": "^1.0.1", "ethereum-protocol": "^1.0.1",
"ethereumjs-util": "^6.1.0", "ethereumjs-util": "^6.1.0",
"ethereumjs-wallet": "^1.0.1", "ethereumjs-wallet": "^1.0.1",
@ -18783,6 +19095,18 @@
"@types/node": "*" "@types/node": "*"
} }
}, },
"ethereum-cryptography": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-1.0.3.tgz",
"integrity": "sha512-NQLTW0x0CosoVb/n79x/TRHtfvS3hgNUPTUSCu0vM+9k6IIhHFFrAOJReneexjZsoZxMjJHnJn4lrE8EbnSyqQ==",
"dev": true,
"requires": {
"@noble/hashes": "1.0.0",
"@noble/secp256k1": "1.5.5",
"@scure/bip32": "1.0.1",
"@scure/bip39": "1.0.0"
}
},
"ethereumjs-util": { "ethereumjs-util": {
"version": "6.2.1", "version": "6.2.1",
"resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz", "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz",
@ -18796,6 +19120,31 @@
"ethereum-cryptography": "^0.1.3", "ethereum-cryptography": "^0.1.3",
"ethjs-util": "0.1.6", "ethjs-util": "0.1.6",
"rlp": "^2.2.3" "rlp": "^2.2.3"
},
"dependencies": {
"ethereum-cryptography": {
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-0.1.3.tgz",
"integrity": "sha512-w8/4x1SGGzc+tO97TASLja6SLd3fRIK2tLVcV2Gx4IB21hE19atll5Cq9o3d0ZmAYC/8aw0ipieTSiekAea4SQ==",
"dev": true,
"requires": {
"@types/pbkdf2": "^3.0.0",
"@types/secp256k1": "^4.0.1",
"blakejs": "^1.1.0",
"browserify-aes": "^1.2.0",
"bs58check": "^2.1.2",
"create-hash": "^1.2.0",
"create-hmac": "^1.1.7",
"hash.js": "^1.1.7",
"keccak": "^3.0.0",
"pbkdf2": "^3.0.17",
"randombytes": "^2.1.0",
"safe-buffer": "^5.1.2",
"scrypt-js": "^3.0.0",
"secp256k1": "^4.0.1",
"setimmediate": "^1.0.5"
}
}
} }
} }
} }
@ -18839,9 +19188,9 @@
} }
}, },
"@types/chai": { "@types/chai": {
"version": "4.3.0", "version": "4.3.1",
"resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.0.tgz", "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.1.tgz",
"integrity": "sha512-/ceqdqeRraGolFTcfoXNiqjyQhZzbINDngeoAq9GoHa8PPK1yNzTaxWjA6BFWp5Ua9JpXEMSS4s5i9tS0hOJtw==", "integrity": "sha512-/zPMqDkzSZ8t3VtxOa4KPq7uzzW978M9Tvh+j7GHKuo6k6GTLxPJ4J5gE5cjfJ26pnXst0N5Hax8Sr0T2Mi9zQ==",
"dev": true "dev": true
}, },
"@types/chai-spies": { "@types/chai-spies": {
@ -18878,15 +19227,15 @@
"dev": true "dev": true
}, },
"@types/mocha": { "@types/mocha": {
"version": "9.1.0", "version": "9.1.1",
"resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.0.tgz", "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz",
"integrity": "sha512-QCWHkbMv4Y5U9oW10Uxbr45qMMSzl4OzijsozynUAgx3kEHUdXB00udx2dWDQ7f2TU2a2uuiFaRZjCe3unPpeg==", "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==",
"dev": true "dev": true
}, },
"@types/node": { "@types/node": {
"version": "17.0.23", "version": "17.0.29",
"resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.29.tgz",
"integrity": "sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw==" "integrity": "sha512-tx5jMmMFwx7wBwq/V7OohKDVb/JwJU5qCVkeLMh1//xycAJ/ESuw9aJ9SEtlCZDYi2pBfe4JkisSoAtbOsBNAA=="
}, },
"@types/node-fetch": { "@types/node-fetch": {
"version": "3.0.3", "version": "3.0.3",
@ -20683,6 +21032,12 @@
"resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz", "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
"integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==" "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="
}, },
"define-lazy-prop": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
"integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
"dev": true
},
"define-properties": { "define-properties": {
"version": "1.1.3", "version": "1.1.3",
"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
@ -20832,12 +21187,12 @@
"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
}, },
"ejs": { "ejs": {
"version": "3.1.6", "version": "3.1.7",
"resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.6.tgz", "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.7.tgz",
"integrity": "sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==", "integrity": "sha512-BIar7R6abbUxDA3bfXrO4DSgwo8I+fB5/1zgujl3HLLjwd6+9iOnrT+t3grn2qbk9vOgBubXOFwX2m9axoFaGw==",
"dev": true, "dev": true,
"requires": { "requires": {
"jake": "^10.6.1" "jake": "^10.8.5"
} }
}, },
"electron-to-chromium": { "electron-to-chromium": {
@ -22853,12 +23208,32 @@
} }
}, },
"filelist": { "filelist": {
"version": "1.0.2", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.2.tgz", "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.3.tgz",
"integrity": "sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==", "integrity": "sha512-LwjCsruLWQULGYKy7TX0OPtrL9kLpojOFKc5VCTxdFTV7w5zbsgqVKfnkKG7Qgjtq50gKfO56hJv88OfcGb70Q==",
"dev": true, "dev": true,
"requires": { "requires": {
"minimatch": "^3.0.4" "minimatch": "^5.0.1"
},
"dependencies": {
"brace-expansion": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
"dev": true,
"requires": {
"balanced-match": "^1.0.0"
}
},
"minimatch": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
"integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
"dev": true,
"requires": {
"brace-expansion": "^2.0.1"
}
}
} }
}, },
"filesize": { "filesize": {
@ -24223,22 +24598,71 @@
} }
}, },
"jake": { "jake": {
"version": "10.8.2", "version": "10.8.5",
"resolved": "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz", "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
"integrity": "sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==", "integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==",
"dev": true, "dev": true,
"requires": { "requires": {
"async": "0.9.x", "async": "^3.2.3",
"chalk": "^2.4.2", "chalk": "^4.0.2",
"filelist": "^1.0.1", "filelist": "^1.0.1",
"minimatch": "^3.0.4" "minimatch": "^3.0.4"
}, },
"dependencies": { "dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"async": { "async": {
"version": "0.9.2", "version": "3.2.3",
"resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
"integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=", "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
"dev": true "dev": true
},
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"requires": {
"color-name": "~1.1.4"
}
},
"color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true
},
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true
},
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"requires": {
"has-flag": "^4.0.0"
}
} }
} }
}, },
@ -25062,9 +25486,9 @@
"integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=" "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
}, },
"microbundle": { "microbundle": {
"version": "0.14.2", "version": "0.15.0",
"resolved": "https://registry.npmjs.org/microbundle/-/microbundle-0.14.2.tgz", "resolved": "https://registry.npmjs.org/microbundle/-/microbundle-0.15.0.tgz",
"integrity": "sha512-jODALfU3w7jnJAqw7Tou9uU8e8zH0GRVWzOd/V7eAvD1fsfb9pyMbmzhFZqnX6SCb54eP1EF5oRyNlSxBAxoag==", "integrity": "sha512-EkFst5ntLXoQGewkvga/Kd72RcN7IuJRl5ivLihJSbvLfJQo8LDS0n9X0q81vegiC59vhtKIM6qjrl1fOAtuGw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/core": "^7.12.10", "@babel/core": "^7.12.10",
@ -25103,6 +25527,7 @@
"rollup-plugin-postcss": "^4.0.0", "rollup-plugin-postcss": "^4.0.0",
"rollup-plugin-terser": "^7.0.2", "rollup-plugin-terser": "^7.0.2",
"rollup-plugin-typescript2": "^0.29.0", "rollup-plugin-typescript2": "^0.29.0",
"rollup-plugin-visualizer": "^5.6.0",
"sade": "^1.7.4", "sade": "^1.7.4",
"terser": "^5.7.0", "terser": "^5.7.0",
"tiny-glob": "^0.2.8", "tiny-glob": "^0.2.8",
@ -27512,6 +27937,58 @@
} }
} }
}, },
"rollup-plugin-visualizer": {
"version": "5.6.0",
"resolved": "https://registry.npmjs.org/rollup-plugin-visualizer/-/rollup-plugin-visualizer-5.6.0.tgz",
"integrity": "sha512-CKcc8GTUZjC+LsMytU8ocRr/cGZIfMR7+mdy4YnlyetlmIl/dM8BMnOEpD4JPIGt+ZVW7Db9ZtSsbgyeBH3uTA==",
"dev": true,
"requires": {
"nanoid": "^3.1.32",
"open": "^8.4.0",
"source-map": "^0.7.3",
"yargs": "^17.3.1"
},
"dependencies": {
"open": {
"version": "8.4.0",
"resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
"integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
"dev": true,
"requires": {
"define-lazy-prop": "^2.0.0",
"is-docker": "^2.1.1",
"is-wsl": "^2.2.0"
}
},
"source-map": {
"version": "0.7.3",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
"dev": true
},
"yargs": {
"version": "17.4.1",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.4.1.tgz",
"integrity": "sha512-WSZD9jgobAg3ZKuCQZSa3g9QOJeCCqLoLAykiWgmXnDo9EPnn4RPf5qVTtzgOx66o6/oqhcA5tHtJXpG8pMt3g==",
"dev": true,
"requires": {
"cliui": "^7.0.2",
"escalade": "^3.1.1",
"get-caller-file": "^2.0.5",
"require-directory": "^2.1.1",
"string-width": "^4.2.3",
"y18n": "^5.0.5",
"yargs-parser": "^21.0.0"
}
},
"yargs-parser": {
"version": "21.0.1",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
"integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==",
"dev": true
}
}
},
"rollup-pluginutils": { "rollup-pluginutils": {
"version": "2.8.2", "version": "2.8.2",
"resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz",

13
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@oceanprotocol/lib", "name": "@oceanprotocol/lib",
"source": "./src/index.ts", "source": "./src/index.ts",
"version": "1.0.0-next.33", "version": "1.0.0-next.37",
"description": "JavaScript client library for Ocean Protocol", "description": "JavaScript client library for Ocean Protocol",
"main": "./dist/lib.js", "main": "./dist/lib.js",
"umd:main": "dist/lib.umd.js", "umd:main": "dist/lib.umd.js",
@ -40,6 +40,7 @@
"test:unit:cover": "nyc --report-dir coverage/unit npm run test:unit", "test:unit:cover": "nyc --report-dir coverage/unit npm run test:unit",
"test:integration": "npm run mocha -- 'test/integration/**/*.test.ts'", "test:integration": "npm run mocha -- 'test/integration/**/*.test.ts'",
"test:provider": "npm run mocha -- 'test/integration/Provider.test.ts'", "test:provider": "npm run mocha -- 'test/integration/Provider.test.ts'",
"test:compute": "npm run mocha -- 'test/integration/ComputeFlow.test.ts'",
"test:integration:cover": "nyc --report-dir coverage/integration --no-clean npm run test:integration" "test:integration:cover": "nyc --report-dir coverage/integration --no-clean npm run test:integration"
}, },
"repository": { "repository": {
@ -67,12 +68,12 @@
"web3-eth-contract": "^1.7.1" "web3-eth-contract": "^1.7.1"
}, },
"devDependencies": { "devDependencies": {
"@truffle/hdwallet-provider": "^2.0.5", "@truffle/hdwallet-provider": "^2.0.7",
"@types/chai": "^4.2.19", "@types/chai": "^4.3.1",
"@types/chai-spies": "^1.0.3", "@types/chai-spies": "^1.0.3",
"@types/crypto-js": "^4.1.1", "@types/crypto-js": "^4.1.1",
"@types/mocha": "^9.1.0", "@types/mocha": "^9.1.1",
"@types/node": "^17.0.23", "@types/node": "^17.0.29",
"@types/node-fetch": "^3.0.3", "@types/node-fetch": "^3.0.3",
"@typescript-eslint/eslint-plugin": "^4.33.0", "@typescript-eslint/eslint-plugin": "^4.33.0",
"@typescript-eslint/parser": "^4.33.0", "@typescript-eslint/parser": "^4.33.0",
@ -85,7 +86,7 @@
"eslint-config-prettier": "^8.5.0", "eslint-config-prettier": "^8.5.0",
"eslint-plugin-prettier": "^4.0.0", "eslint-plugin-prettier": "^4.0.0",
"fs": "0.0.1-security", "fs": "0.0.1-security",
"microbundle": "^0.14.2", "microbundle": "^0.15.0",
"mocha": "^9.2.2", "mocha": "^9.2.2",
"mock-local-storage": "^1.1.21", "mock-local-storage": "^1.1.21",
"nyc": "^15.1.0", "nyc": "^15.1.0",

6
src/@types/Compute.ts
View File

@ -1,6 +1,10 @@
import { Metadata, MetadataAlgorithm } from './DDO/Metadata' import { Metadata, MetadataAlgorithm } from './DDO/Metadata'
export type ComputeResultType = 'algorithmLog' | 'output' export type ComputeResultType =
| 'algorithmLog'
| 'output'
| 'configrationLog'
| 'publishLog'
export interface ComputeEnvironment { export interface ComputeEnvironment {
id: string id: string

4
src/pools/balancer/Pool.ts
View File

@ -1019,7 +1019,7 @@ export class Pool {
) )
let result = null let result = null
const maxSwap = await getMaxSwapExactOut(this, poolAddress, tokenInOutMarket.tokenIn) const maxSwap = await getMaxSwapExactOut(this, poolAddress, tokenInOutMarket.tokenOut)
if (new Decimal(amountsInOutMaxFee.tokenAmountOut).greaterThan(maxSwap)) { if (new Decimal(amountsInOutMaxFee.tokenAmountOut).greaterThan(maxSwap)) {
throw new Error(`tokenAmountOut is greater than ${maxSwap.toString()}`) throw new Error(`tokenAmountOut is greater than ${maxSwap.toString()}`)
} }
@ -1519,7 +1519,7 @@ export class Pool {
this.config this.config
) )
const maxSwap = await getMaxSwapExactOut(this, poolAddress, tokenIn) const maxSwap = await getMaxSwapExactOut(this, poolAddress, tokenOut)
if (new Decimal(tokenAmountOut).greaterThan(maxSwap)) { if (new Decimal(tokenAmountOut).greaterThan(maxSwap)) {
throw new Error(`tokenAmountOut is greater than ${maxSwap.toString()}`) throw new Error(`tokenAmountOut is greater than ${maxSwap.toString()}`)

116
src/provider/Provider.ts
View File

@ -1,5 +1,5 @@
import Web3 from 'web3' import Web3 from 'web3'
import { LoggerInstance, getData, downloadFile, downloadFileBrowser } from '../utils' import { LoggerInstance, getData } from '../utils'
import { import {
FileMetadata, FileMetadata,
ComputeJob, ComputeJob,
@ -10,9 +10,7 @@ import {
ProviderInitialize ProviderInitialize
} from '../@types/' } from '../@types/'
import { noZeroX } from '../utils/ConversionTypeHelper' import { noZeroX } from '../utils/ConversionTypeHelper'
import { signText, signWithHash } from '../utils/SignatureUtils'
import fetch from 'cross-fetch' import fetch from 'cross-fetch'
import { DownloadResponse } from '../@types/DownloadResponse'
export interface HttpCallback { export interface HttpCallback {
(httpMethod: string, url: string, body: string, header: any): Promise<any> (httpMethod: string, url: string, body: string, header: any): Promise<any>
} }
@ -67,7 +65,7 @@ export class Provider {
return serviceEndpoints return serviceEndpoints
} }
/** Encrypt DDO using the Provider's own symmetric key /** Gets current nonce
* @param {string} providerUri provider uri address * @param {string} providerUri provider uri address
* @param {string} consumerAddress Publisher address * @param {string} consumerAddress Publisher address
* @param {AbortSignal} signal abort signal * @param {AbortSignal} signal abort signal
@ -107,22 +105,21 @@ export class Provider {
} }
} }
public async createSignature( public async signProviderRequest(
web3: Web3, web3: Web3,
accountId: string, accountId: string,
agreementId: string message: string,
password?: string
): Promise<string> { ): Promise<string> {
const signature = await signText(web3, noZeroX(agreementId), accountId) const consumerMessage = web3.utils.soliditySha3({
return signature t: 'bytes',
} v: web3.utils.utf8ToHex(message)
})
public async createHashSignature( const isMetaMask =
web3: Web3, web3 && web3.currentProvider && (web3.currentProvider as any).isMetaMask
accountId: string, if (isMetaMask)
message: string return await web3.eth.personal.sign(consumerMessage, accountId, password)
): Promise<string> { else return await web3.eth.sign(consumerMessage, accountId)
const signature = await signWithHash(web3, message, accountId)
return signature
} }
/** Encrypt data using the Provider's own symmetric key /** Encrypt data using the Provider's own symmetric key
@ -144,12 +141,11 @@ export class Provider {
const path = this.getEndpointURL(serviceEndpoints, 'encrypt') const path = this.getEndpointURL(serviceEndpoints, 'encrypt')
? this.getEndpointURL(serviceEndpoints, 'encrypt').urlPath ? this.getEndpointURL(serviceEndpoints, 'encrypt').urlPath
: null : null
if (!path) return null if (!path) return null
try { try {
const response = await fetch(path, { const response = await fetch(path, {
method: 'POST', method: 'POST',
body: decodeURI(JSON.stringify(data)), body: JSON.stringify(data),
headers: { headers: {
'Content-Type': 'application/octet-stream' 'Content-Type': 'application/octet-stream'
}, },
@ -361,8 +357,7 @@ export class Provider {
: null : null
if (!downloadUrl) return null if (!downloadUrl) return null
const nonce = Date.now() const nonce = Date.now()
const signature = await this.createSignature(web3, accountId, did + nonce) const signature = await this.signProviderRequest(web3, accountId, did + nonce)
let consumeUrl = downloadUrl let consumeUrl = downloadUrl
consumeUrl += `?fileIndex=${fileIndex}` consumeUrl += `?fileIndex=${fileIndex}`
consumeUrl += `&documentId=${did}` consumeUrl += `&documentId=${did}`
@ -411,12 +406,11 @@ export class Provider {
let signatureMessage = consumerAddress let signatureMessage = consumerAddress
signatureMessage += dataset.documentId signatureMessage += dataset.documentId
signatureMessage += nonce signatureMessage += nonce
const signature = await this.createHashSignature( const signature = await this.signProviderRequest(
web3, web3,
consumerAddress, consumerAddress,
signatureMessage signatureMessage
) )
const payload = Object() const payload = Object()
payload.consumerAddress = consumerAddress payload.consumerAddress = consumerAddress
payload.signature = signature payload.signature = signature
@ -441,7 +435,7 @@ export class Provider {
const params = await response.json() const params = await response.json()
return params return params
} }
console.error('Compute start failed:', response.status, response.statusText) LoggerInstance.error('Compute start failed: ', response.status, response.statusText)
LoggerInstance.error('Payload was:', payload) LoggerInstance.error('Payload was:', payload)
return null return null
} catch (e) { } catch (e) {
@ -490,12 +484,11 @@ export class Provider {
signatureMessage += jobId || '' signatureMessage += jobId || ''
signatureMessage += (did && `${noZeroX(did)}`) || '' signatureMessage += (did && `${noZeroX(did)}`) || ''
signatureMessage += nonce signatureMessage += nonce
const signature = await this.createHashSignature( const signature = await this.signProviderRequest(
web3, web3,
consumerAddress, consumerAddress,
signatureMessage signatureMessage
) )
const payload = Object() const payload = Object()
payload.signature = signature payload.signature = signature
payload.documentId = noZeroX(did) payload.documentId = noZeroX(did)
@ -582,23 +575,21 @@ export class Provider {
} }
} }
/** Get status for a specific jobId/documentId/owner. /** Get compute result url
* @param {string} jobId * @param {string} providerUri The URI of the provider we want to query
* @param {number} index * @param {Web3} web3 Web3 instance
* @param {string} providerUri * @param {string} consumerAddress The consumer ethereum address
* @param {string} destination * @param {string} jobId The ID of a compute job.
* @param {Web3} web3 * @param {number} index Result index
* @param {AbortSignal} signal abort signal * @return {Promise<string>}
* @return {Promise<ComputeJob | ComputeJob[]>}
*/ */
public async computeResult( public async getComputeResultUrl(
jobId: string,
index: number,
accountId: string,
providerUri: string, providerUri: string,
web3: Web3, web3: Web3,
signal?: AbortSignal consumerAddress: string,
): Promise<DownloadResponse | void> { jobId: string,
index: number
): Promise<string> {
const providerEndpoints = await this.getEndpoints(providerUri) const providerEndpoints = await this.getEndpoints(providerUri)
const serviceEndpoints = await this.getServiceEndpoints( const serviceEndpoints = await this.getServiceEndpoints(
providerUri, providerUri,
@ -608,38 +599,24 @@ export class Provider {
? this.getEndpointURL(serviceEndpoints, 'computeResult').urlPath ? this.getEndpointURL(serviceEndpoints, 'computeResult').urlPath
: null : null
const nonce = await this.getNonce( const nonce = Date.now()
providerUri, let signatureMessage = consumerAddress
accountId,
signal,
providerEndpoints,
serviceEndpoints
)
let signatureMessage = accountId
signatureMessage += jobId signatureMessage += jobId
signatureMessage += index.toString() signatureMessage += index.toString()
signatureMessage += nonce signatureMessage += nonce
const signature = await this.createHashSignature(web3, accountId, signatureMessage) const signature = await this.signProviderRequest(
web3,
let consumeUrl = computeResultUrl consumerAddress,
consumeUrl += `?consumerAddress=${accountId}` signatureMessage
consumeUrl += `&jobId=${jobId}` )
consumeUrl += `&index=${String(index)}`
consumeUrl += (signature && `&signature=${signature}`) || ''
if (!computeResultUrl) return null if (!computeResultUrl) return null
try { let resultUrl = computeResultUrl
if (document) { resultUrl += `?consumerAddress=${consumerAddress}`
await downloadFileBrowser(consumeUrl) resultUrl += `&jobId=${jobId}`
} else { resultUrl += `&index=${index.toString()}`
return await downloadFile(consumeUrl, index) resultUrl += `&nonce=${nonce}`
} resultUrl += (signature && `&signature=${signature}`) || ''
} catch (e) { return resultUrl
LoggerInstance.error('Error getting job result')
LoggerInstance.error(e)
throw e
}
} }
/** Deletes a compute job. /** Deletes a compute job.
@ -680,12 +657,11 @@ export class Provider {
signatureMessage += jobId || '' signatureMessage += jobId || ''
signatureMessage += (did && `${noZeroX(did)}`) || '' signatureMessage += (did && `${noZeroX(did)}`) || ''
signatureMessage += nonce signatureMessage += nonce
const signature = await this.createHashSignature( const signature = await this.signProviderRequest(
web3, web3,
consumerAddress, consumerAddress,
signatureMessage signatureMessage
) )
const payload = Object() const payload = Object()
payload.documentId = noZeroX(did) payload.documentId = noZeroX(did)
payload.consumerAddress = consumerAddress payload.consumerAddress = consumerAddress

88
src/tokens/Datatoken.ts
View File

@ -782,8 +782,15 @@ export class Datatoken {
new this.web3.eth.Contract(this.datatokensAbi, dtAddress), new this.web3.eth.Contract(this.datatokensAbi, dtAddress),
this.config this.config
) )
if ((await this.getDTPermissions(dtAddress, address)).paymentManager !== true) { const isPaymentManager = (await this.getDTPermissions(dtAddress, address))
throw new Error(`Caller is not Fee Manager`) .paymentManager
const nftAddress = !isPaymentManager && (await this.getNFTAddress(dtAddress))
const isNftOwner = nftAddress && (await this.nft.getNftOwner(nftAddress)) === address
const nftPermissions =
nftAddress && !isNftOwner && (await this.nft.getNftPermissions(nftAddress, address))
const isErc20Deployer = nftPermissions?.deployERC20
if (!isPaymentManager && !isNftOwner && !isErc20Deployer) {
throw new Error(`Caller is not Fee Manager, owner or erc20 Deployer`)
} }
const estGas = await this.estGasSetPaymentCollector( const estGas = await this.estGasSetPaymentCollector(
@ -1002,6 +1009,83 @@ export class Datatoken {
} }
} }
/** Estimate gas cost for reuseOrder method
* @param {String} dtAddress Datatoken address
* @param {String} address User address which calls
* @param {String} orderTxId previous valid order
* @param {providerFees} providerFees provider fees
* @param {Contract} contractInstance optional contract instance
* @return {Promise<any>}
*/
public async estGasReuseOrder(
dtAddress: string,
address: string,
orderTxId: string,
providerFees: ProviderFees,
contractInstance?: Contract
): Promise<any> {
const dtContract =
contractInstance ||
setContractDefaults(
new this.web3.eth.Contract(this.datatokensAbi, dtAddress),
this.config
)
// Estimate gas for reuseOrder method
const gasLimitDefault = this.GASLIMIT_DEFAULT
let estGas
try {
estGas = await dtContract.methods
.reuseOrder(orderTxId, providerFees)
.estimateGas({ from: address }, (err, estGas) => (err ? gasLimitDefault : estGas))
} catch (e) {
estGas = gasLimitDefault
}
return estGas
}
/** Reuse Order: called by payer or consumer having a valid order, but with expired provider access.
* Pays the provider fee again, but it will not require a new datatoken payment
* Requires previous approval of provider fee.
* @param {String} dtAddress Datatoken address
* @param {String} address User address which calls
* @param {String} orderTxId previous valid order
* @param {providerFees} providerFees provider fees
* @return {Promise<TransactionReceipt>} string
*/
public async reuseOrder(
dtAddress: string,
address: string,
orderTxId: string,
providerFees: ProviderFees
): Promise<TransactionReceipt> {
const dtContract = setContractDefaults(
new this.web3.eth.Contract(this.datatokensAbi, dtAddress),
this.config
)
try {
const estGas = await this.estGasReuseOrder(
dtAddress,
address,
orderTxId,
providerFees,
dtContract
)
const trxReceipt = await dtContract.methods
.reuseOrder(orderTxId, providerFees)
.send({
from: address,
gas: estGas + 1,
gasPrice: await getFairGasPrice(this.web3, this.config)
})
return trxReceipt
} catch (e) {
LoggerInstance.error(`ERROR: Failed to call reuse order order : ${e.message}`)
throw new Error(`Failed to start order: ${e.message}`)
}
}
/** Estimate gas cost for buyFromFreAndOrder method /** Estimate gas cost for buyFromFreAndOrder method
* @param {String} dtAddress Datatoken address * @param {String} dtAddress Datatoken address
* @param {String} address User address which calls * @param {String} address User address which calls

3
src/utils/ConfigHelper.ts
View File

@ -32,7 +32,8 @@ export const configHelperNetworks: Config[] = [
...configHelperNetworksBase, ...configHelperNetworksBase,
chainId: 8996, chainId: 8996,
network: 'development', network: 'development',
metadataCacheUri: 'http://127.0.0.1:5000' metadataCacheUri: 'http://127.0.0.1:5000',
providerUri: 'http://172.15.0.4:8030'
}, },
{ {
...configHelperNetworksBase, ...configHelperNetworksBase,

7
src/utils/DdoHelpers.ts
View File

@ -1,5 +1,6 @@
import sha256 from 'crypto-js/sha256' import sha256 from 'crypto-js/sha256'
import Web3 from 'web3' import Web3 from 'web3'
import LoggerInstance from './Logger'
export function generateDid(erc721Address: string, chainId: number): string { export function generateDid(erc721Address: string, chainId: number): string {
erc721Address = Web3.utils.toChecksumAddress(erc721Address) erc721Address = Web3.utils.toChecksumAddress(erc721Address)
@ -8,5 +9,9 @@ export function generateDid(erc721Address: string, chainId: number): string {
} }
export function getHash(data: any): string { export function getHash(data: any): string {
return sha256(data).toString() try {
return sha256(data).toString()
} catch (e) {
LoggerInstance.error('getHash error: ', e.message)
}
} }

53
src/utils/SignatureUtils.ts
View File

@ -1,32 +1,6 @@
import Web3 from 'web3' import Web3 from 'web3'
import { LoggerInstance } from './Logger' import { LoggerInstance } from './Logger'
export async function signText(
web3: Web3,
text: string,
publicKey: string,
password?: string
): Promise<string> {
const isMetaMask =
web3 && web3.currentProvider && (web3.currentProvider as any).isMetaMask
try {
return await web3.eth.personal.sign(text, publicKey, password)
} catch (e) {
if (isMetaMask) {
throw e
}
LoggerInstance.warn('Error on personal sign.')
LoggerInstance.warn(e)
try {
return await web3.eth.sign(text, publicKey)
} catch (e2) {
LoggerInstance.error('Error on sign.')
LoggerInstance.error(e2)
throw new Error('Error executing personal sign')
}
}
}
export async function signHash(web3: Web3, message: string, address: string) { export async function signHash(web3: Web3, message: string, address: string) {
let signedMessage = await web3.eth.sign(message, address) let signedMessage = await web3.eth.sign(message, address)
signedMessage = signedMessage.substr(2) // remove 0x signedMessage = signedMessage.substr(2) // remove 0x
@ -38,30 +12,3 @@ export async function signHash(web3: Web3, message: string, address: string) {
if (v === '0x01') v = '0x1c' if (v === '0x01') v = '0x1c'
return { v, r, s } return { v, r, s }
} }
export async function signWithHash(
web3: Web3,
text: string,
publicKey: string,
password?: string
): Promise<string> {
const hash = web3.utils.utf8ToHex(text)
const isMetaMask =
web3 && web3.currentProvider && (web3.currentProvider as any).isMetaMask
try {
return await web3.eth.personal.sign(hash, publicKey, password)
} catch (e) {
if (isMetaMask) {
throw e
}
LoggerInstance.warn('Error on personal sign.')
LoggerInstance.warn(e)
try {
return await web3.eth.sign(hash, publicKey)
} catch (e2) {
LoggerInstance.error('Error on sign.')
LoggerInstance.error(e2)
throw new Error('Error executing personal sign')
}
}
}

2
src/utils/TokenUtils.ts
View File

@ -5,7 +5,7 @@ import { minAbi } from './minAbi'
import LoggerInstance from './Logger' import LoggerInstance from './Logger'
import { TransactionReceipt } from 'web3-core' import { TransactionReceipt } from 'web3-core'
import Web3 from 'web3' import Web3 from 'web3'
import { GASLIMIT_DEFAULT } from '.' import { GASLIMIT_DEFAULT } from './Constants'
/** /**
* Estimate gas cost for approval function * Estimate gas cost for approval function

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

@ -1,6 +1,5 @@
import { assert } from 'chai' import { assert } from 'chai'
import { SHA256 } from 'crypto-js' import { SHA256 } from 'crypto-js'
import console from 'console'
import { web3, getTestConfig, getAddresses } from '../config' import { web3, getTestConfig, getAddresses } from '../config'
import { import {
Config, Config,
@ -10,9 +9,10 @@ import {
NftCreateData, NftCreateData,
Datatoken, Datatoken,
getHash, getHash,
Nft Nft,
sleep
} from '../../src' } from '../../src'
import { ProviderFees, Erc20CreateParams } from '../../src/@types' import { ProviderFees, Erc20CreateParams, ComputeJob, Asset } from '../../src/@types'
const assetUrl = [ const assetUrl = [
{ {
@ -110,12 +110,15 @@ const algoDdo = {
} }
] ]
} }
let providerUrl: string
let consumerAccount: string
let computeJobId: string
let resolvedDDOAsset: Asset
describe('Simple compute tests', async () => { describe('Simple compute tests', async () => {
let config: Config let config: Config
let addresses: any let addresses: any
let aquarius: Aquarius let aquarius: Aquarius
let providerUrl: any
before(async () => { before(async () => {
config = await getTestConfig(web3) config = await getTestConfig(web3)
@ -130,7 +133,7 @@ describe('Simple compute tests', async () => {
const Factory = new NftFactory(addresses.ERC721Factory, web3) const Factory = new NftFactory(addresses.ERC721Factory, web3)
const accounts = await web3.eth.getAccounts() const accounts = await web3.eth.getAccounts()
const publisherAccount = accounts[0] const publisherAccount = accounts[0]
const consumerAccount = accounts[1] consumerAccount = accounts[1]
const chain = await web3.eth.getChainId() const chain = await web3.eth.getChainId()
const nftParamsAsset: NftCreateData = { const nftParamsAsset: NftCreateData = {
name: 'testNFT', name: 'testNFT',
@ -234,7 +237,7 @@ describe('Simple compute tests', async () => {
) )
// let's wait // let's wait
const resolvedDDOAsset = await aquarius.waitForAqua(ddo.id) resolvedDDOAsset = await aquarius.waitForAqua(ddo.id)
assert(resolvedDDOAsset, 'Cannot fetch DDO from Aquarius') assert(resolvedDDOAsset, 'Cannot fetch DDO from Aquarius')
const resolvedDDOAlgo = await aquarius.waitForAqua(algoDdo.id) const resolvedDDOAlgo = await aquarius.waitForAqua(algoDdo.id)
assert(resolvedDDOAlgo, 'Cannot fetch DDO from Aquarius') assert(resolvedDDOAlgo, 'Cannot fetch DDO from Aquarius')
@ -246,7 +249,6 @@ describe('Simple compute tests', async () => {
const computeEnvs = await ProviderInstance.getComputeEnvironments(providerUrl) const computeEnvs = await ProviderInstance.getComputeEnvironments(providerUrl)
assert(computeEnvs, 'No Compute environments found') assert(computeEnvs, 'No Compute environments found')
// we choose the first env // we choose the first env
console.log(computeEnvs)
const computeEnv = computeEnvs[0].id const computeEnv = computeEnvs[0].id
const computeConsumerAddress = computeEnvs[0].consumerAddress const computeConsumerAddress = computeEnvs[0].consumerAddress
// let's have 10 minutesof compute access // let's have 10 minutesof compute access
@ -265,7 +267,6 @@ describe('Simple compute tests', async () => {
computeEnv, computeEnv,
computeValidUntil computeValidUntil
) )
console.log(initializeDataAlgo)
const providerAlgoFees: ProviderFees = { const providerAlgoFees: ProviderFees = {
providerFeeAddress: initializeDataAlgo.providerFee.providerFeeAddress, providerFeeAddress: initializeDataAlgo.providerFee.providerFeeAddress,
providerFeeToken: initializeDataAlgo.providerFee.providerFeeToken, providerFeeToken: initializeDataAlgo.providerFee.providerFeeToken,
@ -302,7 +303,6 @@ describe('Simple compute tests', async () => {
computeEnv, computeEnv,
computeValidUntil computeValidUntil
) )
console.log(initializeData)
const providerDatasetFees: ProviderFees = { const providerDatasetFees: ProviderFees = {
providerFeeAddress: initializeData.providerFee.providerFeeAddress, providerFeeAddress: initializeData.providerFee.providerFeeAddress,
providerFeeToken: initializeData.providerFee.providerFeeToken, providerFeeToken: initializeData.providerFee.providerFeeToken,
@ -340,12 +340,28 @@ describe('Simple compute tests', async () => {
} }
) )
assert(computeJobs, 'Cannot start compute job') assert(computeJobs, 'Cannot start compute job')
const jobStatus = await ProviderInstance.computeStatus( computeJobId = computeJobs[0].jobId
})
it('Check compute status', async () => {
const jobStatus = (await ProviderInstance.computeStatus(
providerUrl, providerUrl,
consumerAccount, consumerAccount,
computeJobs[0].jobId, computeJobId,
resolvedDDOAsset.id resolvedDDOAsset.id
)) as ComputeJob
assert(jobStatus, 'Cannot retrieve compute status!')
})
it('Get download compute results url', async () => {
sleep(10000)
const downloadURL = await ProviderInstance.getComputeResultUrl(
providerUrl,
web3,
consumerAccount,
computeJobId,
0
) )
assert(jobStatus) assert(downloadURL, 'Provider getComputeResultUrl failed!')
}) })
}) })

68
test/unit/tokens/Datatoken.test.ts
View File

@ -24,6 +24,7 @@ describe('Datatoken', () => {
let user1: string let user1: string
let user2: string let user2: string
let user3: string let user3: string
let erc20DeployerUser: string
let contracts: Addresses let contracts: Addresses
let nftDatatoken: Nft let nftDatatoken: Nft
let datatoken: Datatoken let datatoken: Datatoken
@ -42,6 +43,7 @@ describe('Datatoken', () => {
user1 = accounts[1] user1 = accounts[1]
user2 = accounts[2] user2 = accounts[2]
user3 = accounts[3] user3 = accounts[3]
erc20DeployerUser = accounts[4]
}) })
it('should deploy contracts', async () => { it('should deploy contracts', async () => {
@ -76,7 +78,7 @@ describe('Datatoken', () => {
}) })
it('#createERC20 - should create a new ERC20 DT from NFT contract', async () => { it('#createERC20 - should create a new ERC20 DT from NFT contract', async () => {
// await nftDatatoken.addERC20Deployer(nftAddress, nftOwner, nftOwner) await nftDatatoken.addErc20Deployer(nftAddress, nftOwner, erc20DeployerUser)
datatokenAddress = await nftDatatoken.createErc20( datatokenAddress = await nftDatatoken.createErc20(
nftAddress, nftAddress,
nftOwner, nftOwner,
@ -287,7 +289,7 @@ describe('Datatoken', () => {
) )
}) })
it('#setPaymentCollector - should fail to set a new paymentCollector, if NOT PAYMENT Manager', async () => { it('#setPaymentCollector - should fail to set a new paymentCollector, if NOT PAYMENT Manager, NFT OWNER OR ERC 20 DEPLOYER', async () => {
assert( assert(
(await datatoken.getDTPermissions(datatokenAddress, user2)).paymentManager === false (await datatoken.getDTPermissions(datatokenAddress, user2)).paymentManager === false
) )
@ -295,7 +297,7 @@ describe('Datatoken', () => {
try { try {
await datatoken.setPaymentCollector(datatokenAddress, user1, user2) await datatoken.setPaymentCollector(datatokenAddress, user1, user2)
} catch (e) { } catch (e) {
assert(e.message === 'Caller is not Fee Manager') assert(e.message === 'Caller is not Fee Manager, owner or erc20 Deployer')
} }
}) })
@ -313,6 +315,25 @@ describe('Datatoken', () => {
assert((await datatoken.getPaymentCollector(datatokenAddress)) === user3) assert((await datatoken.getPaymentCollector(datatokenAddress)) === user3)
}) })
it('#setPaymentCollector - should set a new paymentCollector, if NFT OWNER', async () => {
assert((await nftDatatoken.getNftOwner(nftAddress)) === nftOwner)
await datatoken.setPaymentCollector(datatokenAddress, nftOwner, user2)
assert((await datatoken.getPaymentCollector(datatokenAddress)) === user2)
})
it('#setPaymentCollector - should set a new paymentCollector, if ERC 20 DEPLOYER', async () => {
assert(
(await nftDatatoken.getNftPermissions(nftAddress, erc20DeployerUser))
.deployERC20 === true
)
await datatoken.setPaymentCollector(datatokenAddress, erc20DeployerUser, user3)
assert((await datatoken.getPaymentCollector(datatokenAddress)) === user3)
})
it('#startOrder- user2 should create an order for DT ', async () => { it('#startOrder- user2 should create an order for DT ', async () => {
assert( assert(
(await datatoken.balance(datatokenAddress, user1)) === '10', (await datatoken.balance(datatokenAddress, user1)) === '10',
@ -367,6 +388,47 @@ describe('Datatoken', () => {
) )
}) })
it('#reuseOrder- user2 should user should succeed to call reuseOrder on a using a previous txId ', async () => {
const providerData = JSON.stringify({ timeout: 0 })
const providerFeeToken = ZERO_ADDRESS
const providerFeeAmount = '0'
const providerValidUntil = '0'
const message = web3.utils.soliditySha3(
{ t: 'bytes', v: web3.utils.toHex(web3.utils.asciiToHex(providerData)) },
{ t: 'address', v: user3 },
{ t: 'address', v: providerFeeToken },
{ t: 'uint256', v: providerFeeAmount },
{ t: 'uint256', v: providerValidUntil }
)
const { v, r, s } = await signHash(web3, message, user3)
const providerFees: ProviderFees = {
providerFeeAddress: user3,
providerFeeToken: providerFeeToken,
providerFeeAmount: providerFeeAmount,
v: v,
r: r,
s: s,
providerData: web3.utils.toHex(web3.utils.asciiToHex(providerData)),
validUntil: providerValidUntil
}
const order = await datatoken.startOrder(
datatokenAddress,
user1,
user2,
1,
providerFees
)
assert(order.transactionHash, ' Failed to start order')
const reusedOrder = await datatoken.reuseOrder(
datatokenAddress,
user2,
order.transactionHash,
providerFees
)
assert(reusedOrder.events.OrderReused.event === 'OrderReused')
assert(reusedOrder.events.ProviderFee.event === 'ProviderFee')
})
it('#buyFromDispenserAndOrder- Enterprise method', async () => { it('#buyFromDispenserAndOrder- Enterprise method', async () => {
const providerData = JSON.stringify({ timeout: 0 }) const providerData = JSON.stringify({ timeout: 0 })
const providerFeeToken = ZERO_ADDRESS const providerFeeToken = ZERO_ADDRESS