From 036f7efab1e43e0526fa6bd8fa50ab120f6aa8e5 Mon Sep 17 00:00:00 2001 From: paulo-ocean Date: Fri, 21 Jun 2024 12:18:43 +0100 Subject: [PATCH 1/6] add support for agreementId --- src/commands.ts | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/commands.ts b/src/commands.ts index fc0d403..b17c573 100644 --- a/src/commands.ts +++ b/src/commands.ts @@ -569,6 +569,11 @@ export class Commands { } public async getJobStatus(args: string[]) { + // args[1] - did (for checking if data asset exists, legacy) + // args[2] - jobId + // args[3] - agreementId + const hasAgreementId = args.length === 4; + const dataDdo = await this.aquarius.waitForAqua(args[1]); if (!dataDdo) { console.error( @@ -576,6 +581,11 @@ export class Commands { ); return; } + const jobId = args[2] + let agreementId = null; + if(hasAgreementId) { + agreementId = args[3]; + } const providerURI = this.macOsProviderUrl && dataDdo.chainId === 8996 ? this.macOsProviderUrl @@ -584,8 +594,8 @@ export class Commands { const jobStatus = (await ProviderInstance.computeStatus( providerURI, await this.signer.getAddress(), - args[2], - args[1] + jobId, + agreementId )) as ComputeJob; console.log(util.inspect(jobStatus, false, null, true)); } From 39e27cbb7ec4601fc1636e810b289607c6c92016 Mon Sep 17 00:00:00 2001 From: paulo-ocean Date: Wed, 26 Jun 2024 09:06:06 +0100 Subject: [PATCH 2/6] upped sdk version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4281f0b..bf51c9d 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ }, "dependencies": { "@oceanprotocol/contracts": "^2.0.4", - "@oceanprotocol/lib": "^3.3.1", + "@oceanprotocol/lib": "^3.3.3", "cross-fetch": "^3.1.5", "crypto-js": "^4.1.1", "decimal.js": "^10.4.1", From 02af2fd488ba23c1473aeab520dc3f13d6b6e06d Mon Sep 17 00:00:00 2001 From: paulo-ocean Date: Thu, 27 Jun 2024 08:33:59 +0100 Subject: [PATCH 3/6] evo: upped lib version --- package-lock.json | 15 ++++++++------- package.json | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index cd37017..8557e47 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,11 +5,12 @@ "requires": true, "packages": { "": { + "name": "ocean-cli", "version": "2.0.0", "license": "Apache-2.0", "dependencies": { "@oceanprotocol/contracts": "^2.0.4", - "@oceanprotocol/lib": "^3.3.2", + "@oceanprotocol/lib": "3.3.3-next.0", "cross-fetch": "^3.1.5", "crypto-js": "^4.1.1", "decimal.js": "^10.4.1", @@ -1003,9 +1004,9 @@ "integrity": "sha512-5+SHH0YnpAnOHv9h5xuVLo20tGLLF0utubq3+O25C3NDSaqdm7kvN3sILGxVP1MtUZgJA1yEeUsNYYv0t2jMhw==" }, "node_modules/@oceanprotocol/lib": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-3.3.2.tgz", - "integrity": "sha512-WjDensCEsblBLhRqyuwvDWGc+gAOqi8OsZnmZibXxLPbhMIX5oqB74xKmlNKQHKa6k1Z9VmyPdKCc7oIhYmD+g==", + "version": "3.3.3-next.0", + "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-3.3.3-next.0.tgz", + "integrity": "sha512-z4QxdeAkETBQfbrOqQr1DlyfA7OvLIH3CtET1HOAfHq3CABBR1bZVz/MSg8nLOItYTTLR/CFkjIqN8iiipd3SQ==", "dependencies": { "@oceanprotocol/contracts": "^2.0.3", "cross-fetch": "^4.0.0", @@ -9774,9 +9775,9 @@ "integrity": "sha512-5+SHH0YnpAnOHv9h5xuVLo20tGLLF0utubq3+O25C3NDSaqdm7kvN3sILGxVP1MtUZgJA1yEeUsNYYv0t2jMhw==" }, "@oceanprotocol/lib": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-3.3.2.tgz", - "integrity": "sha512-WjDensCEsblBLhRqyuwvDWGc+gAOqi8OsZnmZibXxLPbhMIX5oqB74xKmlNKQHKa6k1Z9VmyPdKCc7oIhYmD+g==", + "version": "3.3.3-next.0", + "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-3.3.3-next.0.tgz", + "integrity": "sha512-z4QxdeAkETBQfbrOqQr1DlyfA7OvLIH3CtET1HOAfHq3CABBR1bZVz/MSg8nLOItYTTLR/CFkjIqN8iiipd3SQ==", "requires": { "@oceanprotocol/contracts": "^2.0.3", "cross-fetch": "^4.0.0", diff --git a/package.json b/package.json index bf51c9d..9740a24 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ }, "dependencies": { "@oceanprotocol/contracts": "^2.0.4", - "@oceanprotocol/lib": "^3.3.3", + "@oceanprotocol/lib": "3.3.3-next.0", "cross-fetch": "^3.1.5", "crypto-js": "^4.1.1", "decimal.js": "^10.4.1", From 72455f17b2693fed3149d73284e511516b747eb4 Mon Sep 17 00:00:00 2001 From: paulo-ocean Date: Tue, 2 Jul 2024 09:54:14 +0100 Subject: [PATCH 4/6] upped sdk version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9740a24..b075df5 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ }, "dependencies": { "@oceanprotocol/contracts": "^2.0.4", - "@oceanprotocol/lib": "3.3.3-next.0", + "@oceanprotocol/lib": "3.3.3-next.1", "cross-fetch": "^3.1.5", "crypto-js": "^4.1.1", "decimal.js": "^10.4.1", From 7cefec81758cc465a478db32d5e9e7d0bfefde8d Mon Sep 17 00:00:00 2001 From: paulo-ocean Date: Tue, 2 Jul 2024 09:57:52 +0100 Subject: [PATCH 5/6] update lock file with sdk last --- package-lock.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8557e47..dd984b1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "@oceanprotocol/contracts": "^2.0.4", - "@oceanprotocol/lib": "3.3.3-next.0", + "@oceanprotocol/lib": "3.3.3-next.1", "cross-fetch": "^3.1.5", "crypto-js": "^4.1.1", "decimal.js": "^10.4.1", @@ -1004,9 +1004,9 @@ "integrity": "sha512-5+SHH0YnpAnOHv9h5xuVLo20tGLLF0utubq3+O25C3NDSaqdm7kvN3sILGxVP1MtUZgJA1yEeUsNYYv0t2jMhw==" }, "node_modules/@oceanprotocol/lib": { - "version": "3.3.3-next.0", - "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-3.3.3-next.0.tgz", - "integrity": "sha512-z4QxdeAkETBQfbrOqQr1DlyfA7OvLIH3CtET1HOAfHq3CABBR1bZVz/MSg8nLOItYTTLR/CFkjIqN8iiipd3SQ==", + "version": "3.3.3-next.1", + "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-3.3.3-next.1.tgz", + "integrity": "sha512-BT1SdZL5T1zzNkb/2OfVtFa/0PcuyTkaV6A5v11kgF+t6ham4zLrofta8hcAC49bmJneBRozDOtxgWn0c9AuKg==", "dependencies": { "@oceanprotocol/contracts": "^2.0.3", "cross-fetch": "^4.0.0", @@ -9775,9 +9775,9 @@ "integrity": "sha512-5+SHH0YnpAnOHv9h5xuVLo20tGLLF0utubq3+O25C3NDSaqdm7kvN3sILGxVP1MtUZgJA1yEeUsNYYv0t2jMhw==" }, "@oceanprotocol/lib": { - "version": "3.3.3-next.0", - "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-3.3.3-next.0.tgz", - "integrity": "sha512-z4QxdeAkETBQfbrOqQr1DlyfA7OvLIH3CtET1HOAfHq3CABBR1bZVz/MSg8nLOItYTTLR/CFkjIqN8iiipd3SQ==", + "version": "3.3.3-next.1", + "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-3.3.3-next.1.tgz", + "integrity": "sha512-BT1SdZL5T1zzNkb/2OfVtFa/0PcuyTkaV6A5v11kgF+t6ham4zLrofta8hcAC49bmJneBRozDOtxgWn0c9AuKg==", "requires": { "@oceanprotocol/contracts": "^2.0.3", "cross-fetch": "^4.0.0", From 8d17a155ebb204e16e0a16036292ab3eb191ac54 Mon Sep 17 00:00:00 2001 From: paulo-ocean Date: Tue, 2 Jul 2024 13:09:41 +0100 Subject: [PATCH 6/6] upped sdk version --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index dd984b1..552c482 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "@oceanprotocol/contracts": "^2.0.4", - "@oceanprotocol/lib": "3.3.3-next.1", + "@oceanprotocol/lib": "^3.3.3", "cross-fetch": "^3.1.5", "crypto-js": "^4.1.1", "decimal.js": "^10.4.1", @@ -1004,9 +1004,9 @@ "integrity": "sha512-5+SHH0YnpAnOHv9h5xuVLo20tGLLF0utubq3+O25C3NDSaqdm7kvN3sILGxVP1MtUZgJA1yEeUsNYYv0t2jMhw==" }, "node_modules/@oceanprotocol/lib": { - "version": "3.3.3-next.1", - "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-3.3.3-next.1.tgz", - "integrity": "sha512-BT1SdZL5T1zzNkb/2OfVtFa/0PcuyTkaV6A5v11kgF+t6ham4zLrofta8hcAC49bmJneBRozDOtxgWn0c9AuKg==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-3.3.3.tgz", + "integrity": "sha512-d98X3tBsfbtUJe90wmXI2HcabE3jyY+5628md6vpuItBCnSZgHIQaFvvND2jRThNEmr+4axavylNk/BS3muA5g==", "dependencies": { "@oceanprotocol/contracts": "^2.0.3", "cross-fetch": "^4.0.0", @@ -9775,9 +9775,9 @@ "integrity": "sha512-5+SHH0YnpAnOHv9h5xuVLo20tGLLF0utubq3+O25C3NDSaqdm7kvN3sILGxVP1MtUZgJA1yEeUsNYYv0t2jMhw==" }, "@oceanprotocol/lib": { - "version": "3.3.3-next.1", - "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-3.3.3-next.1.tgz", - "integrity": "sha512-BT1SdZL5T1zzNkb/2OfVtFa/0PcuyTkaV6A5v11kgF+t6ham4zLrofta8hcAC49bmJneBRozDOtxgWn0c9AuKg==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-3.3.3.tgz", + "integrity": "sha512-d98X3tBsfbtUJe90wmXI2HcabE3jyY+5628md6vpuItBCnSZgHIQaFvvND2jRThNEmr+4axavylNk/BS3muA5g==", "requires": { "@oceanprotocol/contracts": "^2.0.3", "cross-fetch": "^4.0.0", diff --git a/package.json b/package.json index b075df5..bf51c9d 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ }, "dependencies": { "@oceanprotocol/contracts": "^2.0.4", - "@oceanprotocol/lib": "3.3.3-next.1", + "@oceanprotocol/lib": "^3.3.3", "cross-fetch": "^3.1.5", "crypto-js": "^4.1.1", "decimal.js": "^10.4.1",