Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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",
Expand Down
4 changes: 3 additions & 1 deletion src/components/c2d/compute_engine_docker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions src/components/core/compute/startCompute.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading