Skip to content

Commit b9cbd6e

Browse files
authored
Merge pull request #132 from OceanProtocolEnterprise/feat/sync-05-2026
chore: 1366
2 parents e6fa52e + e8ab5e1 commit b9cbd6e

5 files changed

Lines changed: 15 additions & 14 deletions

File tree

.github/workflows/ci.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -279,11 +279,6 @@ jobs:
279279
echo "ADDRESS_FILE=${SYSTEM_TEST_ADDRESS_FILE}" >> "$GITHUB_ENV"
280280
- name: Configure escrow timeout for system tests
281281
run: echo "ESCROW_CLAIM_TIMEOUT=$(date +%s)" >> "$GITHUB_ENV"
282-
- name: Use separate consumer key for ocean-cli paid compute system test
283-
working-directory: ${{ github.workspace }}/ocean-cli
284-
run: |
285-
perl -0pi -e 's/0xc594c6e5def4bab63ac29eed19a134c130388f74f019bc74b8f4389df2837a58/0x1d751ded5a32226054cd2e71261039b65afb9ee1c746d055dd699b1150a5befc/g' test/paidComputeFlow.test.ts
286-
grep -n "PRIVATE_KEY" test/paidComputeFlow.test.ts
287282

288283
- name: docker logs
289284
run: docker logs ocean-contracts-1 && docker logs ocean-typesense-1

package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ocean-node",
3-
"version": "3.1.1",
3+
"version": "3.1.11",
44
"description": "Ocean Node is used to run all core services in the Ocean stack",
55
"author": "Ocean Protocol Foundation",
66
"license": "Apache-2.0",
@@ -77,7 +77,7 @@
7777
"@oceanprotocol/ddo-js": "^0.2.0",
7878
"axios": "^1.15.0",
7979
"base58-js": "^2.0.0",
80-
"basic-ftp": "^5.3.0",
80+
"basic-ftp": "^5.3.1",
8181
"cors": "^2.8.5",
8282
"datastore-level": "^12.0.2",
8383
"delay": "^5.0.0",

src/components/c2d/compute_engine_docker.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ export class C2DEngineDocker extends C2DEngine {
217217
description: 'Auto-generated benchmark environment',
218218
storageExpiry: 604800,
219219
maxJobDuration: 180,
220-
minJobDuration: 60,
220+
minJobDuration: 0,
221221
resources: [
222222
{ id: 'cpu', total: sysinfo.NCPU, min: 1, max: sysinfo.NCPU },
223223
{ id: 'ram', total: ramGB, min: 1, max: ramGB },
@@ -385,6 +385,8 @@ export class C2DEngineDocker extends C2DEngine {
385385
env.free.maxJobDuration = envDef.free.maxJobDuration
386386
if (envDef.free.maxJobs !== undefined) env.free.maxJobs = envDef.free.maxJobs
387387
if (envDef.free.resources) env.free.resources = envDef.free.resources
388+
if (envDef.free.allowImageBuild !== undefined)
389+
env.free.allowImageBuild = envDef.free.allowImageBuild
388390
}
389391

390392
const envIdSuffix = envDef.id || String(envIdx)

src/components/core/compute/startCompute.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -573,6 +573,10 @@ export class PaidComputeStartHandler extends CommonComputeHandler {
573573
task.maxJobDuration
574574
)
575575
let agreementId
576+
CORE_LOGGER.logMessage(
577+
`escrow.createLock cost=${cost} token=${task.payment.token} chainId=${task.payment.chainId} resources=${JSON.stringify(task.resources)} maxJobDuration=${task.maxJobDuration}`,
578+
true
579+
)
576580
try {
577581
agreementId = await engine.escrow.createLock(
578582
task.payment.chainId,

0 commit comments

Comments
 (0)