From 0bc27e1bbb25fea8434674ebf4f57694c57ff258 Mon Sep 17 00:00:00 2001 From: AdriGeorge Date: Mon, 11 May 2026 09:42:07 +0200 Subject: [PATCH 1/3] chore: 1366 --- .github/workflows/ci.yml | 5 ----- package-lock.json | 8 ++++---- package.json | 2 +- src/components/core/compute/startCompute.ts | 4 ++++ 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a2f240c01..a7a06de0d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -279,11 +279,6 @@ jobs: echo "ADDRESS_FILE=${SYSTEM_TEST_ADDRESS_FILE}" >> "$GITHUB_ENV" - name: Configure escrow timeout for system tests run: echo "ESCROW_CLAIM_TIMEOUT=$(date +%s)" >> "$GITHUB_ENV" - - name: Use separate consumer key for ocean-cli paid compute system test - working-directory: ${{ github.workspace }}/ocean-cli - run: | - perl -0pi -e 's/0xc594c6e5def4bab63ac29eed19a134c130388f74f019bc74b8f4389df2837a58/0x1d751ded5a32226054cd2e71261039b65afb9ee1c746d055dd699b1150a5befc/g' test/paidComputeFlow.test.ts - grep -n "PRIVATE_KEY" test/paidComputeFlow.test.ts - name: docker logs run: docker logs ocean-contracts-1 && docker logs ocean-typesense-1 diff --git a/package-lock.json b/package-lock.json index 369d4e0a4..da9870cc0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,7 @@ "@oceanprotocol/ddo-js": "^0.2.0", "axios": "^1.15.0", "base58-js": "^2.0.0", - "basic-ftp": "^5.3.0", + "basic-ftp": "^5.3.1", "cors": "^2.8.5", "datastore-level": "^12.0.2", "delay": "^5.0.0", @@ -8480,9 +8480,9 @@ } }, "node_modules/basic-ftp": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.3.0.tgz", - "integrity": "sha512-5K9eNNn7ywHPsYnFwjKgYH8Hf8B5emh7JKcPaVjjrMJFQQwGpwowEnZNEtHs7DfR7hCZsmaK3VA4HUK0YarT+w==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.3.1.tgz", + "integrity": "sha512-bopVNp6ugyA150DDuZfPFdt1KZ5a94ZDiwX4hMgZDzF+GttD80lEy8kj98kbyhLXnPvhtIo93mdnLIjpCAeeOw==", "license": "MIT", "engines": { "node": ">=10.0.0" diff --git a/package.json b/package.json index 2579aa26a..4f689458f 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "@oceanprotocol/ddo-js": "^0.2.0", "axios": "^1.15.0", "base58-js": "^2.0.0", - "basic-ftp": "^5.3.0", + "basic-ftp": "^5.3.1", "cors": "^2.8.5", "datastore-level": "^12.0.2", "delay": "^5.0.0", diff --git a/src/components/core/compute/startCompute.ts b/src/components/core/compute/startCompute.ts index ff68feaea..2499ce22b 100644 --- a/src/components/core/compute/startCompute.ts +++ b/src/components/core/compute/startCompute.ts @@ -573,6 +573,10 @@ export class PaidComputeStartHandler extends CommonComputeHandler { task.maxJobDuration ) let agreementId + CORE_LOGGER.logMessage( + `escrow.createLock cost=${cost} token=${task.payment.token} chainId=${task.payment.chainId} resources=${JSON.stringify(task.resources)} maxJobDuration=${task.maxJobDuration}`, + true + ) try { agreementId = await engine.escrow.createLock( task.payment.chainId, From 5eb6e5ad939fc504dfe191a0e6090e2c7efe939c Mon Sep 17 00:00:00 2001 From: AdriGeorge Date: Thu, 14 May 2026 08:11:52 +0200 Subject: [PATCH 2/3] chore: 1371 --- src/components/c2d/compute_engine_docker.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/c2d/compute_engine_docker.ts b/src/components/c2d/compute_engine_docker.ts index 2183bb11d..4daa31449 100755 --- a/src/components/c2d/compute_engine_docker.ts +++ b/src/components/c2d/compute_engine_docker.ts @@ -217,7 +217,7 @@ export class C2DEngineDocker extends C2DEngine { description: 'Auto-generated benchmark environment', storageExpiry: 604800, maxJobDuration: 180, - minJobDuration: 60, + minJobDuration: 0, resources: [ { id: 'cpu', total: sysinfo.NCPU, min: 1, max: sysinfo.NCPU }, { id: 'ram', total: ramGB, min: 1, max: ramGB }, @@ -385,6 +385,8 @@ export class C2DEngineDocker extends C2DEngine { env.free.maxJobDuration = envDef.free.maxJobDuration if (envDef.free.maxJobs !== undefined) env.free.maxJobs = envDef.free.maxJobs if (envDef.free.resources) env.free.resources = envDef.free.resources + if (envDef.free.allowImageBuild !== undefined) + env.free.allowImageBuild = envDef.free.allowImageBuild } const envIdSuffix = envDef.id || String(envIdx) From e8ab5e11dbe4173dacb56e624f8ae88588ac5b0a Mon Sep 17 00:00:00 2001 From: AdriGeorge Date: Thu, 14 May 2026 10:14:38 +0200 Subject: [PATCH 3/3] chore: v3.1.11 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index da9870cc0..500db652a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ocean-node", - "version": "3.1.1", + "version": "3.1.11", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "ocean-node", - "version": "3.1.1", + "version": "3.1.11", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { diff --git a/package.json b/package.json index 4f689458f..bca6ee73c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ocean-node", - "version": "3.1.1", + "version": "3.1.11", "description": "Ocean Node is used to run all core services in the Ocean stack", "author": "Ocean Protocol Foundation", "license": "Apache-2.0",