From 72a447b3c5f0c65b411e1121de1bbc5f88c0bd70 Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Mon, 4 Oct 2021 17:12:14 +0300 Subject: [PATCH] Use latest ocean.js (#898) * bump to latest ocean.js * bump ocean.js --- package-lock.json | 120 ++++++++++++++++-- package.json | 2 +- .../organisms/AssetActions/Compute/index.tsx | 2 + src/hooks/useConsume.ts | 1 + src/hooks/usePublish.ts | 3 +- 5 files changed, 113 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index e0d73233b..65723c7b0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@coingecko/cryptoformat": "^0.4.4", "@loadable/component": "^5.15.0", "@oceanprotocol/art": "^3.2.0", - "@oceanprotocol/lib": "^0.18.0", + "@oceanprotocol/lib": "^0.19.0", "@oceanprotocol/typographies": "^0.1.0", "@portis/web3": "^4.1.0", "@sindresorhus/slugify": "^2.1.0", @@ -5666,9 +5666,9 @@ } }, "node_modules/@oceanprotocol/lib": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-0.18.0.tgz", - "integrity": "sha512-iZL4bKtK5JDBYGqrzaA/bom5Uq/kgrwBQ76m2sU2U4qCkluN67kyAHD9EwOE/g+osZ4E56v+JVnzi3bGurxmsw==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-0.19.0.tgz", + "integrity": "sha512-CQ/3tKzozjRnuicL6GNa+JGZzArnrFWYmZYEAUeXSiWQhe6n3r1uAR6wB71GeeNFGOIpkEFEyTBEZnhGzmFgRw==", "dependencies": { "@ethereum-navigator/navigator": "^0.5.3", "@oceanprotocol/contracts": "^0.6.5", @@ -5681,7 +5681,7 @@ "save-file": "^2.3.1", "uuid": "^8.3.2", "web3": "^1.5.2", - "web3-core": "^1.5.2", + "web3-core": "^1.5.3", "web3-eth-contract": "^1.5.2" }, "peerDependencies": { @@ -24581,7 +24581,104 @@ "bundleDependencies": [ "source-map-support", "yargs", - "ethereumjs-util" + "ethereumjs-util", + "@types/bn.js", + "@types/node", + "@types/pbkdf2", + "@types/secp256k1", + "ansi-regex", + "ansi-styles", + "base-x", + "blakejs", + "bn.js", + "brorand", + "browserify-aes", + "bs58", + "bs58check", + "buffer-from", + "buffer-xor", + "camelcase", + "cipher-base", + "cliui", + "color-convert", + "color-name", + "create-hash", + "create-hmac", + "cross-spawn", + "decamelize", + "elliptic", + "emoji-regex", + "end-of-stream", + "ethereum-cryptography", + "ethjs-util", + "evp_bytestokey", + "execa", + "find-up", + "get-caller-file", + "get-stream", + "hash-base", + "hash.js", + "hmac-drbg", + "inherits", + "invert-kv", + "is-fullwidth-code-point", + "is-hex-prefixed", + "is-stream", + "isexe", + "keccak", + "lcid", + "locate-path", + "map-age-cleaner", + "md5.js", + "mem", + "mimic-fn", + "minimalistic-assert", + "minimalistic-crypto-utils", + "nice-try", + "node-addon-api", + "node-gyp-build", + "npm-run-path", + "once", + "os-locale", + "p-defer", + "p-finally", + "p-is-promise", + "p-limit", + "p-locate", + "p-try", + "path-exists", + "path-key", + "pbkdf2", + "pump", + "randombytes", + "readable-stream", + "require-directory", + "require-main-filename", + "ripemd160", + "rlp", + "safe-buffer", + "scrypt-js", + "secp256k1", + "semver", + "set-blocking", + "setimmediate", + "sha.js", + "shebang-command", + "shebang-regex", + "signal-exit", + "source-map", + "string_decoder", + "string-width", + "strip-ansi", + "strip-eof", + "strip-hex-prefix", + "util-deprecate", + "which", + "which-module", + "wrap-ansi", + "wrappy", + "y18n", + "yargs-parser" ], "dependencies": { "ethereumjs-util": "6.2.1", @@ -63127,9 +63224,9 @@ } }, "@oceanprotocol/lib": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-0.18.0.tgz", - "integrity": "sha512-iZL4bKtK5JDBYGqrzaA/bom5Uq/kgrwBQ76m2sU2U4qCkluN67kyAHD9EwOE/g+osZ4E56v+JVnzi3bGurxmsw==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-0.19.0.tgz", + "integrity": "sha512-CQ/3tKzozjRnuicL6GNa+JGZzArnrFWYmZYEAUeXSiWQhe6n3r1uAR6wB71GeeNFGOIpkEFEyTBEZnhGzmFgRw==", "requires": { "@ethereum-navigator/navigator": "^0.5.3", "@oceanprotocol/contracts": "^0.6.5", @@ -63141,8 +63238,7 @@ "node-abort-controller": "^2.0.0", "save-file": "^2.3.1", "uuid": "^8.3.2", - "web3": "^1.5.2", - "web3-core": "^1.5.2", + "web3-core": "^1.5.3", "web3-eth-contract": "^1.5.2" }, "dependencies": { @@ -63365,7 +63461,6 @@ "integrity": "sha512-5vwpq6kbvwkQwKqAoOU3L72GZ3Ta8RRrewKj9OJRolx28KLJJ8Dg9Rf7obRwt5jQA9bkYd8gqzMTrI7H3xLfaw==", "dev": true, "requires": { - "@oclif/config": "^1.15.1", "@oclif/errors": "^1.3.3", "@oclif/parser": "^3.8.3", "@oclif/plugin-help": "^3", @@ -71114,7 +71209,6 @@ "integrity": "sha512-FeXxO37BLV5JRvxPmVFB91zRHalavV8H4TdQGt1/hz0AkoPymIV68OkuB+TptpjeYgatcgKPoPvPhglJkTzFQQ==", "optional": true, "requires": { - "bitcore-lib": "^8.25.10", "unorm": "^1.4.1" } }, diff --git a/package.json b/package.json index 827689f43..f38d84111 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "@coingecko/cryptoformat": "^0.4.4", "@loadable/component": "^5.15.0", "@oceanprotocol/art": "^3.2.0", - "@oceanprotocol/lib": "^0.18.0", + "@oceanprotocol/lib": "^0.19.0", "@oceanprotocol/typographies": "^0.1.0", "@portis/web3": "^4.1.0", "@sindresorhus/slugify": "^2.1.0", diff --git a/src/components/organisms/AssetActions/Compute/index.tsx b/src/components/organisms/AssetActions/Compute/index.tsx index 189338164..1e66a7f5d 100644 --- a/src/components/organisms/AssetActions/Compute/index.tsx +++ b/src/components/organisms/AssetActions/Compute/index.tsx @@ -333,6 +333,7 @@ export default function Compute({ computeAlgorithm, appConfig.marketFeeAddress, undefined, + null, false ) @@ -353,6 +354,7 @@ export default function Compute({ serviceAlgo.index, appConfig.marketFeeAddress, undefined, + null, false ) diff --git a/src/hooks/useConsume.ts b/src/hooks/useConsume.ts index a0b98670d..fb28a0a78 100644 --- a/src/hooks/useConsume.ts +++ b/src/hooks/useConsume.ts @@ -64,6 +64,7 @@ function useConsume(): UseConsume { undefined, marketFeeAddress, undefined, + null, false ) Logger.log('order created', orderId) diff --git a/src/hooks/usePublish.ts b/src/hooks/usePublish.ts index e79b04127..bf4137734 100644 --- a/src/hooks/usePublish.ts +++ b/src/hooks/usePublish.ts @@ -93,7 +93,8 @@ function usePublish(): UsePublish { price, publishedDate, timeout, - providerUri + providerUri, + null ) Logger.log('access service created', accessService) services.push(accessService)