From b21d70c5292ba0cb4326faf9b66d2c16416d5b4f Mon Sep 17 00:00:00 2001 From: mariacarmina Date: Fri, 6 Jun 2025 12:29:48 +0300 Subject: [PATCH 1/6] Fix parsing envs for ocean-node system tests. --- test/consumeFlow.test.ts | 16 ++++++++-------- test/paidComputeFlow.test.ts | 16 +++++----------- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/test/consumeFlow.test.ts b/test/consumeFlow.test.ts index 9219b03..94545c5 100644 --- a/test/consumeFlow.test.ts +++ b/test/consumeFlow.test.ts @@ -57,7 +57,7 @@ describe("Ocean CLI Publishing", function() { const jsonMatch = output.match(/did:op:[a-f0-9]{64}/); if (!jsonMatch) { console.error("Raw output:", output); - throw new Error("Could not find compute environments in the output"); + throw new Error("Could not find did in the output"); } try { @@ -81,7 +81,7 @@ describe("Ocean CLI Publishing", function() { const jsonMatch = output.match(/did:op:[a-f0-9]{64}/); if (!jsonMatch) { console.error("Raw output:", output); - throw new Error("Could not find compute environments in the output"); + throw new Error("Could not find did in the output"); } try { @@ -104,7 +104,7 @@ describe("Ocean CLI Publishing", function() { const jsonMatch = output.match(/did:op:[a-f0-9]{64}/); if (!jsonMatch) { console.error("Raw output:", output); - throw new Error("Could not find compute environments in the output"); + throw new Error("Could not find did in the output"); } try { @@ -127,7 +127,7 @@ describe("Ocean CLI Publishing", function() { const jsonMatch = output.match(/did:op:[a-f0-9]{64}/); if (!jsonMatch) { console.error("Raw output:", output); - throw new Error("Could not find compute environments in the output"); + throw new Error("Could not find did in the output"); } try { @@ -145,7 +145,7 @@ describe("Ocean CLI Publishing", function() { const jsonMatch = output.match(/s*([\s\S]*)/); if (!jsonMatch) { console.error("Raw output:", output); - throw new Error("Could not find compute environments in the output"); + throw new Error("Could not find ddo in the output"); } try { @@ -162,7 +162,7 @@ describe("Ocean CLI Publishing", function() { const jsonMatch = output.match(/s*([\s\S]*)/); if (!jsonMatch) { console.error("Raw output:", output); - throw new Error("Could not find compute environments in the output"); + throw new Error("Could not find ddo in the output"); } try { @@ -179,7 +179,7 @@ describe("Ocean CLI Publishing", function() { const jsonMatch = output.match(/s*([\s\S]*)/); if (!jsonMatch) { console.error("Raw output:", output); - throw new Error("Could not find compute environments in the output"); + throw new Error("Could not find ddo in the output"); } try { @@ -196,7 +196,7 @@ describe("Ocean CLI Publishing", function() { const jsonMatch = output.match(/s*([\s\S]*)/); if (!jsonMatch) { console.error("Raw output:", output); - throw new Error("Could not find compute environments in the output"); + throw new Error("Could not find ddo in the output"); } try { diff --git a/test/paidComputeFlow.test.ts b/test/paidComputeFlow.test.ts index dec76c2..b53395b 100644 --- a/test/paidComputeFlow.test.ts +++ b/test/paidComputeFlow.test.ts @@ -89,7 +89,7 @@ describe("Ocean CLI Paid Compute", function() { const jsonMatch = output.match(/s*([\s\S]*)/); if (!jsonMatch) { console.error("Raw output:", output); - throw new Error("Could not find compute environments in the output"); + throw new Error("Could not find ddo in the output"); } try { @@ -106,7 +106,7 @@ describe("Ocean CLI Paid Compute", function() { const jsonMatch = output.match(/s*([\s\S]*)/); if (!jsonMatch) { console.error("Raw output:", output); - throw new Error("Could not find compute environments in the output"); + throw new Error("Could not find ddo in the output"); } try { @@ -125,18 +125,12 @@ describe("Ocean CLI Paid Compute", function() { console.error("Raw output:", output); throw new Error("Could not find compute environments in the output"); } - const match = jsonMatch[0].match(/Exiting compute environments:\s*(.*)/s); - const result = match ? match[1].trim() : null; - if (!result) { - console.error("Raw output:", output); - throw new Error("Could not find compute environments in the output"); - } - + let environments; try { - environments = eval(result); + environments = eval(jsonMatch[1]); } catch (error) { - console.error(`Extracted output: ${jsonMatch[0]} and final result: ${result}`); + console.error(`Extracted output: ${jsonMatch[0]} and final result: ${jsonMatch[1]}`); throw new Error("Failed to parse the extracted output:\n" + error); } From 6bc8d0624cb9786e68b6c5d228658155d35bc3c9 Mon Sep 17 00:00:00 2001 From: mariacarmina Date: Fri, 6 Jun 2025 14:25:49 +0300 Subject: [PATCH 2/6] Add check for tty. --- src/cli.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/cli.ts b/src/cli.ts index 2b16123..7bfbb78 100644 --- a/src/cli.ts +++ b/src/cli.ts @@ -225,6 +225,10 @@ export async function createCLI() { const proceed = options.accept; if (!proceed) { + if (!process.stdin.isTTY) { + console.error(chalk.red('Cannot prompt for confirmation (non-TTY). Use "--accept true" to skip.')); + process.exit(1); + } const rl = createInterface({ input, output }); const confirmation = await rl.question(`\nProceed with payment for starting compute job at price ${amount} in tokens from address ${initResp.payment.token}? (y/n): `); rl.close(); From 86dcad0f79b8d3907255373d48fe528cb2ef51c3 Mon Sep 17 00:00:00 2001 From: mariacarmina Date: Fri, 6 Jun 2025 16:05:04 +0300 Subject: [PATCH 3/6] Fix dataset on new structure of lists. --- .github/workflows/ci.yml | 2 ++ metadata/simpleComputeDataset.json | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf3cf9b..e667744 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -86,6 +86,8 @@ jobs: working-directory: ${{ github.workspace }}/barge run: | bash -x start_ocean.sh --with-typesense 2>&1 > start_ocean.log & + env: + NODE_VERSION: pr-950 - run: npm ci - run: npm run build - run: docker image ls diff --git a/metadata/simpleComputeDataset.json b/metadata/simpleComputeDataset.json index 8d99cb1..c087a43 100644 --- a/metadata/simpleComputeDataset.json +++ b/metadata/simpleComputeDataset.json @@ -42,8 +42,8 @@ "compute": { "allowRawAlgorithm": false, "allowNetworkAccess": true, - "publisherTrustedAlgorithmPublishers": [], - "publisherTrustedAlgorithms": [] + "publisherTrustedAlgorithmPublishers": ["*"], + "publisherTrustedAlgorithms": ["*"] } } ], From 21c13ccb21f9eef0638f47c4b92474408815ddba Mon Sep 17 00:00:00 2001 From: mariacarmina Date: Tue, 10 Jun 2025 11:36:55 +0300 Subject: [PATCH 4/6] Update ddo.js version. --- .github/workflows/ci.yml | 3 +- package-lock.json | 173 ++++++++++++++++++++++++++++++++------- package.json | 2 +- 3 files changed, 146 insertions(+), 32 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e667744..76f0ad1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -85,9 +85,8 @@ jobs: - name: Run Barge working-directory: ${{ github.workspace }}/barge run: | + export NODE_VERSION=pr-950 bash -x start_ocean.sh --with-typesense 2>&1 > start_ocean.log & - env: - NODE_VERSION: pr-950 - run: npm ci - run: npm run build - run: docker image ls diff --git a/package-lock.json b/package-lock.json index 763101c..89e5514 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@oasisprotocol/sapphire-paratime": "^1.3.2", "@oceanprotocol/contracts": "^2.3.1", - "@oceanprotocol/ddo-js": "^0.0.8", + "@oceanprotocol/ddo-js": "^0.1.0", "@oceanprotocol/lib": "^4.1.3", "commander": "^13.1.0", "cross-fetch": "^3.1.5", @@ -3561,10 +3561,9 @@ "license": "Apache-2.0" }, "node_modules/@oceanprotocol/ddo-js": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/@oceanprotocol/ddo-js/-/ddo-js-0.0.8.tgz", - "integrity": "sha512-Rv/vbsWjMEmwsLX57TYmJ0nuV3lOnJ4C6IKFvW14lfsN72e6i8kBshpFx7tYjpuVyW+WgyHvGOGjQmf0WBj0Mw==", - "license": "Apache-2.0", + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@oceanprotocol/ddo-js/-/ddo-js-0.1.0.tgz", + "integrity": "sha512-dQmwKZiq6/D7mIDWQVsCuZzMtkWPKHYL7fVM9xk5qXByka/aieziVBLP+L2ObfYZFX77aOJLR8Bj4q5kpGwd/Q==", "dependencies": { "@rdfjs/formats-common": "^3.1.0", "@types/rdfjs__formats-common": "^3.1.5", @@ -3627,19 +3626,6 @@ "node": ">= 14.16" } }, - "node_modules/@oceanprotocol/ddo-js/node_modules/rdf-literal": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/rdf-literal/-/rdf-literal-2.0.0.tgz", - "integrity": "sha512-jlQ+h7EvnXmncmk8OzOYR8T3gNfd4g0LQXbflHkEkancic8dh0Tdt5RiRq8vUFndjIeNHt1RWeA5TAj6rgrtng==", - "license": "MIT", - "dependencies": { - "rdf-data-factory": "^2.0.0" - }, - "funding": { - "type": "individual", - "url": "https://github.com/sponsors/rubensworks/" - } - }, "node_modules/@oceanprotocol/lib": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-4.1.3.tgz", @@ -3662,6 +3648,51 @@ "web3": "^1.8.0" } }, + "node_modules/@oceanprotocol/lib/node_modules/@oceanprotocol/ddo-js": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/@oceanprotocol/ddo-js/-/ddo-js-0.0.8.tgz", + "integrity": "sha512-Rv/vbsWjMEmwsLX57TYmJ0nuV3lOnJ4C6IKFvW14lfsN72e6i8kBshpFx7tYjpuVyW+WgyHvGOGjQmf0WBj0Mw==", + "dependencies": { + "@rdfjs/formats-common": "^3.1.0", + "@types/rdfjs__formats-common": "^3.1.5", + "@zazuko/env-node": "^2.1.4", + "chai": "^5.1.2", + "ethers": "^5.7.2", + "rdf-literal": "^2.0.0", + "rdf-validate-shacl": "^0.5.6" + } + }, + "node_modules/@oceanprotocol/lib/node_modules/assertion-error": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz", + "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==", + "engines": { + "node": ">=12" + } + }, + "node_modules/@oceanprotocol/lib/node_modules/chai": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/chai/-/chai-5.2.0.tgz", + "integrity": "sha512-mCuXncKXk5iCLhfhwTc0izo0gtEmpz5CtG2y8GiOINBlMVS6v8TMRc5TaLWKS6692m9+dVVfzgeVxR5UxWHTYw==", + "dependencies": { + "assertion-error": "^2.0.1", + "check-error": "^2.1.1", + "deep-eql": "^5.0.1", + "loupe": "^3.1.0", + "pathval": "^2.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@oceanprotocol/lib/node_modules/check-error": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz", + "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==", + "engines": { + "node": ">= 16" + } + }, "node_modules/@oceanprotocol/lib/node_modules/cross-fetch": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz", @@ -3670,6 +3701,27 @@ "node-fetch": "^2.6.12" } }, + "node_modules/@oceanprotocol/lib/node_modules/deep-eql": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz", + "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==", + "engines": { + "node": ">=6" + } + }, + "node_modules/@oceanprotocol/lib/node_modules/loupe": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.3.tgz", + "integrity": "sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==" + }, + "node_modules/@oceanprotocol/lib/node_modules/pathval": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz", + "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==", + "engines": { + "node": ">= 14.16" + } + }, "node_modules/@rdfjs/data-model": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/@rdfjs/data-model/-/data-model-2.1.0.tgz", @@ -13323,6 +13375,18 @@ "readable-stream": "3 - 4" } }, + "node_modules/rdf-literal": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/rdf-literal/-/rdf-literal-2.0.0.tgz", + "integrity": "sha512-jlQ+h7EvnXmncmk8OzOYR8T3gNfd4g0LQXbflHkEkancic8dh0Tdt5RiRq8vUFndjIeNHt1RWeA5TAj6rgrtng==", + "dependencies": { + "rdf-data-factory": "^2.0.0" + }, + "funding": { + "type": "individual", + "url": "https://github.com/sponsors/rubensworks/" + } + }, "node_modules/rdf-validate-datatype": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/rdf-validate-datatype/-/rdf-validate-datatype-0.2.2.tgz", @@ -18787,9 +18851,9 @@ "integrity": "sha512-43Vz+DJfoNZLteg91sYvNDR5tJLWcAXl78VoSTriw38j81p6FSLcPNCHzPZKwX9FxyMk3uQe9U4u9REUBEQUfw==" }, "@oceanprotocol/ddo-js": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/@oceanprotocol/ddo-js/-/ddo-js-0.0.8.tgz", - "integrity": "sha512-Rv/vbsWjMEmwsLX57TYmJ0nuV3lOnJ4C6IKFvW14lfsN72e6i8kBshpFx7tYjpuVyW+WgyHvGOGjQmf0WBj0Mw==", + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@oceanprotocol/ddo-js/-/ddo-js-0.1.0.tgz", + "integrity": "sha512-dQmwKZiq6/D7mIDWQVsCuZzMtkWPKHYL7fVM9xk5qXByka/aieziVBLP+L2ObfYZFX77aOJLR8Bj4q5kpGwd/Q==", "requires": { "@rdfjs/formats-common": "^3.1.0", "@types/rdfjs__formats-common": "^3.1.5", @@ -18836,14 +18900,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz", "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==" - }, - "rdf-literal": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/rdf-literal/-/rdf-literal-2.0.0.tgz", - "integrity": "sha512-jlQ+h7EvnXmncmk8OzOYR8T3gNfd4g0LQXbflHkEkancic8dh0Tdt5RiRq8vUFndjIeNHt1RWeA5TAj6rgrtng==", - "requires": { - "rdf-data-factory": "^2.0.0" - } } } }, @@ -18865,6 +18921,42 @@ "form-data": "^2.3.3" }, "dependencies": { + "@oceanprotocol/ddo-js": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/@oceanprotocol/ddo-js/-/ddo-js-0.0.8.tgz", + "integrity": "sha512-Rv/vbsWjMEmwsLX57TYmJ0nuV3lOnJ4C6IKFvW14lfsN72e6i8kBshpFx7tYjpuVyW+WgyHvGOGjQmf0WBj0Mw==", + "requires": { + "@rdfjs/formats-common": "^3.1.0", + "@types/rdfjs__formats-common": "^3.1.5", + "@zazuko/env-node": "^2.1.4", + "chai": "^5.1.2", + "ethers": "^5.7.2", + "rdf-literal": "^2.0.0", + "rdf-validate-shacl": "^0.5.6" + } + }, + "assertion-error": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz", + "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==" + }, + "chai": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/chai/-/chai-5.2.0.tgz", + "integrity": "sha512-mCuXncKXk5iCLhfhwTc0izo0gtEmpz5CtG2y8GiOINBlMVS6v8TMRc5TaLWKS6692m9+dVVfzgeVxR5UxWHTYw==", + "requires": { + "assertion-error": "^2.0.1", + "check-error": "^2.1.1", + "deep-eql": "^5.0.1", + "loupe": "^3.1.0", + "pathval": "^2.0.0" + } + }, + "check-error": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz", + "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==" + }, "cross-fetch": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz", @@ -18872,6 +18964,21 @@ "requires": { "node-fetch": "^2.6.12" } + }, + "deep-eql": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz", + "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==" + }, + "loupe": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.3.tgz", + "integrity": "sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==" + }, + "pathval": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz", + "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==" } } }, @@ -25874,6 +25981,14 @@ "readable-stream": "3 - 4" } }, + "rdf-literal": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/rdf-literal/-/rdf-literal-2.0.0.tgz", + "integrity": "sha512-jlQ+h7EvnXmncmk8OzOYR8T3gNfd4g0LQXbflHkEkancic8dh0Tdt5RiRq8vUFndjIeNHt1RWeA5TAj6rgrtng==", + "requires": { + "rdf-data-factory": "^2.0.0" + } + }, "rdf-validate-datatype": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/rdf-validate-datatype/-/rdf-validate-datatype-0.2.2.tgz", diff --git a/package.json b/package.json index 09ae16a..9feb823 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "dependencies": { "@oasisprotocol/sapphire-paratime": "^1.3.2", "@oceanprotocol/contracts": "^2.3.1", - "@oceanprotocol/ddo-js": "^0.0.8", + "@oceanprotocol/ddo-js": "^0.1.0", "@oceanprotocol/lib": "^4.1.3", "commander": "^13.1.0", "cross-fetch": "^3.1.5", From b6720b06a67bea9e2059b639a2414a097deb2f68 Mon Sep 17 00:00:00 2001 From: mariacarmina Date: Wed, 11 Jun 2025 14:24:58 +0300 Subject: [PATCH 5/6] Update ocean.js --- package-lock.json | 136 +++------------------------------------------- package.json | 2 +- 2 files changed, 10 insertions(+), 128 deletions(-) diff --git a/package-lock.json b/package-lock.json index 89e5514..b4fcd9c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@oasisprotocol/sapphire-paratime": "^1.3.2", "@oceanprotocol/contracts": "^2.3.1", "@oceanprotocol/ddo-js": "^0.1.0", - "@oceanprotocol/lib": "^4.1.3", + "@oceanprotocol/lib": "^4.1.4", "commander": "^13.1.0", "cross-fetch": "^3.1.5", "crypto-js": "^4.1.1", @@ -3627,14 +3627,13 @@ } }, "node_modules/@oceanprotocol/lib": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-4.1.3.tgz", - "integrity": "sha512-PmMwrZPpWo/bBErK/LddVRXdWNBKdFqUgckMR2UukaftApBNqYukefodPOUoOSRAZyVBdAcsXh74MyeWvOff4w==", - "license": "Apache-2.0", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-4.1.4.tgz", + "integrity": "sha512-AGZi7/YckwxmoN0dyK+iGl58vr8VvQqk9dG6cU2x9nSmJDD1xcgFOinpV2fqw+6pohjjEvLAr+DgzJpdh7PJaw==", "dependencies": { "@oasisprotocol/sapphire-paratime": "^1.3.2", "@oceanprotocol/contracts": "^2.3.0", - "@oceanprotocol/ddo-js": "^0.0.8", + "@oceanprotocol/ddo-js": "^0.1.0", "@rdfjs/dataset": "^2.0.2", "@rdfjs/formats-common": "^3.1.0", "@zazuko/env-node": "^2.1.4", @@ -3648,51 +3647,6 @@ "web3": "^1.8.0" } }, - "node_modules/@oceanprotocol/lib/node_modules/@oceanprotocol/ddo-js": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/@oceanprotocol/ddo-js/-/ddo-js-0.0.8.tgz", - "integrity": "sha512-Rv/vbsWjMEmwsLX57TYmJ0nuV3lOnJ4C6IKFvW14lfsN72e6i8kBshpFx7tYjpuVyW+WgyHvGOGjQmf0WBj0Mw==", - "dependencies": { - "@rdfjs/formats-common": "^3.1.0", - "@types/rdfjs__formats-common": "^3.1.5", - "@zazuko/env-node": "^2.1.4", - "chai": "^5.1.2", - "ethers": "^5.7.2", - "rdf-literal": "^2.0.0", - "rdf-validate-shacl": "^0.5.6" - } - }, - "node_modules/@oceanprotocol/lib/node_modules/assertion-error": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz", - "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==", - "engines": { - "node": ">=12" - } - }, - "node_modules/@oceanprotocol/lib/node_modules/chai": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/chai/-/chai-5.2.0.tgz", - "integrity": "sha512-mCuXncKXk5iCLhfhwTc0izo0gtEmpz5CtG2y8GiOINBlMVS6v8TMRc5TaLWKS6692m9+dVVfzgeVxR5UxWHTYw==", - "dependencies": { - "assertion-error": "^2.0.1", - "check-error": "^2.1.1", - "deep-eql": "^5.0.1", - "loupe": "^3.1.0", - "pathval": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@oceanprotocol/lib/node_modules/check-error": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz", - "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==", - "engines": { - "node": ">= 16" - } - }, "node_modules/@oceanprotocol/lib/node_modules/cross-fetch": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz", @@ -3701,27 +3655,6 @@ "node-fetch": "^2.6.12" } }, - "node_modules/@oceanprotocol/lib/node_modules/deep-eql": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz", - "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==", - "engines": { - "node": ">=6" - } - }, - "node_modules/@oceanprotocol/lib/node_modules/loupe": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.3.tgz", - "integrity": "sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==" - }, - "node_modules/@oceanprotocol/lib/node_modules/pathval": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz", - "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==", - "engines": { - "node": ">= 14.16" - } - }, "node_modules/@rdfjs/data-model": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/@rdfjs/data-model/-/data-model-2.1.0.tgz", @@ -18904,13 +18837,13 @@ } }, "@oceanprotocol/lib": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-4.1.3.tgz", - "integrity": "sha512-PmMwrZPpWo/bBErK/LddVRXdWNBKdFqUgckMR2UukaftApBNqYukefodPOUoOSRAZyVBdAcsXh74MyeWvOff4w==", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-4.1.4.tgz", + "integrity": "sha512-AGZi7/YckwxmoN0dyK+iGl58vr8VvQqk9dG6cU2x9nSmJDD1xcgFOinpV2fqw+6pohjjEvLAr+DgzJpdh7PJaw==", "requires": { "@oasisprotocol/sapphire-paratime": "^1.3.2", "@oceanprotocol/contracts": "^2.3.0", - "@oceanprotocol/ddo-js": "^0.0.8", + "@oceanprotocol/ddo-js": "^0.1.0", "@rdfjs/dataset": "^2.0.2", "@rdfjs/formats-common": "^3.1.0", "@zazuko/env-node": "^2.1.4", @@ -18921,42 +18854,6 @@ "form-data": "^2.3.3" }, "dependencies": { - "@oceanprotocol/ddo-js": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/@oceanprotocol/ddo-js/-/ddo-js-0.0.8.tgz", - "integrity": "sha512-Rv/vbsWjMEmwsLX57TYmJ0nuV3lOnJ4C6IKFvW14lfsN72e6i8kBshpFx7tYjpuVyW+WgyHvGOGjQmf0WBj0Mw==", - "requires": { - "@rdfjs/formats-common": "^3.1.0", - "@types/rdfjs__formats-common": "^3.1.5", - "@zazuko/env-node": "^2.1.4", - "chai": "^5.1.2", - "ethers": "^5.7.2", - "rdf-literal": "^2.0.0", - "rdf-validate-shacl": "^0.5.6" - } - }, - "assertion-error": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz", - "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==" - }, - "chai": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/chai/-/chai-5.2.0.tgz", - "integrity": "sha512-mCuXncKXk5iCLhfhwTc0izo0gtEmpz5CtG2y8GiOINBlMVS6v8TMRc5TaLWKS6692m9+dVVfzgeVxR5UxWHTYw==", - "requires": { - "assertion-error": "^2.0.1", - "check-error": "^2.1.1", - "deep-eql": "^5.0.1", - "loupe": "^3.1.0", - "pathval": "^2.0.0" - } - }, - "check-error": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz", - "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==" - }, "cross-fetch": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz", @@ -18964,21 +18861,6 @@ "requires": { "node-fetch": "^2.6.12" } - }, - "deep-eql": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz", - "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==" - }, - "loupe": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.3.tgz", - "integrity": "sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==" - }, - "pathval": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz", - "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==" } } }, diff --git a/package.json b/package.json index 9feb823..ff1ff74 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "@oasisprotocol/sapphire-paratime": "^1.3.2", "@oceanprotocol/contracts": "^2.3.1", "@oceanprotocol/ddo-js": "^0.1.0", - "@oceanprotocol/lib": "^4.1.3", + "@oceanprotocol/lib": "^4.1.4", "commander": "^13.1.0", "cross-fetch": "^3.1.5", "crypto-js": "^4.1.1", From f2397e2433fcce67002e1687a4b6825a3da1c5e5 Mon Sep 17 00:00:00 2001 From: mariacarmina Date: Fri, 13 Jun 2025 12:30:40 +0300 Subject: [PATCH 6/6] Remove node version from ci. --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 76f0ad1..cf3cf9b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -85,7 +85,6 @@ jobs: - name: Run Barge working-directory: ${{ github.workspace }}/barge run: | - export NODE_VERSION=pr-950 bash -x start_ocean.sh --with-typesense 2>&1 > start_ocean.log & - run: npm ci - run: npm run build