Merge branch 'main' into fix-http-upload

Author: giurgiur99

CHANGELOG.md

@@ -4,11 +4,50 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v3.0.6](https://github.com/oceanprotocol/ocean-node/compare/v3.0.5...v3.0.6)
+
+- fix fees on auto create benchmark env [`#1347`](https://github.com/oceanprotocol/ocean-node/pull/1347)
+
+#### [v3.0.5](https://github.com/oceanprotocol/ocean-node/compare/v3.0.4...v3.0.5)
+
+> 22 April 2026
+
+- enableNetwork per env [`#1346`](https://github.com/oceanprotocol/ocean-node/pull/1346)
+- Release 3.0.5 [`772a8f4`](https://github.com/oceanprotocol/ocean-node/commit/772a8f44795dab6563d818deb9a668e0b8ef2220)
+
+#### [v3.0.4](https://github.com/oceanprotocol/ocean-node/compare/v3.0.3...v3.0.4)
+
+> 22 April 2026
+
+- fix access list issue [`#1345`](https://github.com/oceanprotocol/ocean-node/pull/1345)
+- Release 3.0.4 [`01b6f9f`](https://github.com/oceanprotocol/ocean-node/commit/01b6f9f927926caf21494d7dabdc069db62b173d)
+
+#### [v3.0.3](https://github.com/oceanprotocol/ocean-node/compare/v3.0.2...v3.0.3)
+
+> 22 April 2026
+
+- set benchmark env on base [`#1337`](https://github.com/oceanprotocol/ocean-node/pull/1337)
+- parse multiaddrs if string [`#1342`](https://github.com/oceanprotocol/ocean-node/pull/1342)
+- Release 3.0.3 [`ad9cecc`](https://github.com/oceanprotocol/ocean-node/commit/ad9ceccf703fc6129fa0a240f3212cf5ccfea0aa)
+- set accessList [`a3cd730`](https://github.com/oceanprotocol/ocean-node/commit/a3cd730d8a1209edfecafe026a3351da659e4702)
+- add benchmark validation [`3f94ea8`](https://github.com/oceanprotocol/ocean-node/commit/3f94ea8968539d74e40d0055fc025149ed5206a7)
+
+#### [v3.0.2](https://github.com/oceanprotocol/ocean-node/compare/v3.0.1...v3.0.2)
+
+> 21 April 2026
+
+- fix: persistent storage required params to allow authToken [`#1341`](https://github.com/oceanprotocol/ocean-node/pull/1341)
+- Bump undici and release-it [`#1340`](https://github.com/oceanprotocol/ocean-node/pull/1340)
+- Release 3.0.2 [`8129284`](https://github.com/oceanprotocol/ocean-node/commit/8129284686017117e815ad5fee84e20c1e15f3bb)
+
 #### [v3.0.1](https://github.com/oceanprotocol/ocean-node/compare/v3.0.0...v3.0.1)
 
+> 20 April 2026
+
 - check if c2d is configured [`#1336`](https://github.com/oceanprotocol/ocean-node/pull/1336)
 - remove chainId [`#1338`](https://github.com/oceanprotocol/ocean-node/pull/1338)
 - fix: compose node env yaml indentation [`#1335`](https://github.com/oceanprotocol/ocean-node/pull/1335)
+- Release 3.0.1 [`1a25e48`](https://github.com/oceanprotocol/ocean-node/commit/1a25e48ad3410328b4710265ec434c074b28d78c)
 
 ### [v3.0.0](https://github.com/oceanprotocol/ocean-node/compare/v2.1.1...v3.0.0)
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "ocean-node",
-  "version": "3.0.1",
+  "version": "3.0.6",
   "description": "Ocean Node is used to run all core services in the Ocean stack",
   "author": "Ocean Protocol Foundation",
   "license": "Apache-2.0",

package.json

@@ -707,6 +707,7 @@ services:
 #      P2P_BOOTSTRAP_NODES: ''
 #      P2P_FILTER_ANNOUNCED_ADDRESSES: ''
       DOCKER_COMPUTE_ENVIRONMENTS: '$DOCKER_COMPUTE_ENVIRONMENTS'
+      ENABLE_BENCHMARK: true
 $(
   if [ "$enable_tls" == "y" ]; then
     echo "      HTTP_CERT_PATH: '/usr/src/app/certs/cert.pem'"

scripts/ocean-node-quickstart.sh

@@ -120,6 +120,7 @@ export interface ComputeEnvironmentBaseConfig {
   access: ComputeAccessList
   free?: ComputeEnvironmentFreeOptions
   platform: RunningPlatform
+  enableNetwork?: boolean // whether network is enabled for algorithm containers
 }
 
 export interface ComputeRuntimes {
@@ -152,6 +153,7 @@ export interface C2DEnvironmentConfig {
   access?: ComputeAccessList
   free?: ComputeEnvironmentFreeOptions
   resources?: ComputeResource[]
+  enableNetwork?: boolean // whether network is enabled for algorithm containers
 }
 
 export interface C2DDockerConfig {
@@ -168,7 +170,6 @@ export interface C2DDockerConfig {
   scanImages?: boolean
   scanImageDBUpdateInterval?: number // Default: 12 hours
   environments: C2DEnvironmentConfig[]
-  enableNetwork?: boolean // whether network is enabled for algorithm containers
 }
 
 export type ComputeResultType =

src/@types/C2D/C2D.ts

@@ -26,10 +26,9 @@ import type {
   ComputeResourcesPricingInfo
 } from '../../@types/C2D/C2D.js'
 import {
-  BENCHMARK_MONITORING_ADDRESS,
+  BASE_CHAIN_ID,
   getConfiguration,
-  SEPOLIA_CHAIN_ID,
-  USDC_TOKEN
+  USDC_TOKEN_ADDRESS_BASE
 } from '../../utils/config.js'
 import { C2DEngine } from './compute_engine_base.js'
 import { C2DDatabase } from '../database/C2DDatabase.js'
@@ -64,7 +63,8 @@ import { Service } from '@oceanprotocol/ddo-js'
 import { getOceanTokenAddressForChain } from '../../utils/address.js'
 import { dockerRegistrysAuth, dockerRegistryAuth } from '../../@types/OceanNode.js'
 import { EncryptMethod } from '../../@types/fileObject.js'
-import { ZeroAddress } from 'ethers'
+import { getAddress, ZeroAddress } from 'ethers'
+import { AccessList } from '../../@types/AccessList.js'
 
 const C2D_CONTAINER_UID = 1000
 const C2D_CONTAINER_GID = 1000
@@ -91,7 +91,6 @@ export class C2DEngineDocker extends C2DEngine {
   private trivyCachePath: string
   private cpuAllocations: Map<string, number[]> = new Map()
   private envCpuCoresMap: Map<string, number[]> = new Map()
-  private enableNetwork: boolean
 
   public constructor(
     clusterConfig: C2DClusterInfo,
@@ -115,7 +114,7 @@ export class C2DEngineDocker extends C2DEngine {
     this.paymentClaimInterval = clusterConfig.connection.paymentClaimInterval || 3600 // 1 hour
     this.scanImages = clusterConfig.connection.scanImages || false // default is not to scan images for now, until it's prod ready
     this.scanImageDBUpdateInterval = clusterConfig.connection.scanImageDBUpdateInterval
-    this.enableNetwork = clusterConfig.connection.enableNetwork ?? false
+
     if (
       clusterConfig.connection.protocol &&
       clusterConfig.connection.host &&
@@ -210,16 +209,11 @@ export class C2DEngineDocker extends C2DEngine {
     }
     const gpuResources: ComputeResource[] = Array.from(gpuMap.values())
 
-    const benchmarkPrices: ComputeResourcesPricingInfo[] = gpuResources.map((gpu) => ({
-      id: gpu.id,
-      price: 1
-    }))
-
-    const sepoliaChainId = SEPOLIA_CHAIN_ID
-    const usdcToken = USDC_TOKEN
+    const benchmarkPrices: ComputeResourcesPricingInfo[] =
+      gpuResources.length > 0 ? [{ id: gpuResources[0].id, price: 1 }] : []
 
     const benchmarkFees: ComputeEnvFeesStructure = {
-      [sepoliaChainId]: [{ feeToken: usdcToken, prices: benchmarkPrices }]
+      [BASE_CHAIN_ID]: [{ feeToken: USDC_TOKEN_ADDRESS_BASE, prices: benchmarkPrices }]
     }
 
     const benchmarkEnv: C2DEnvironmentConfig = {
@@ -234,10 +228,13 @@ export class C2DEngineDocker extends C2DEngine {
         ...gpuResources
       ],
       access: {
-        addresses: [BENCHMARK_MONITORING_ADDRESS],
-        accessLists: null
+        addresses: [],
+        accessLists: [
+          { [BASE_CHAIN_ID]: [getAddress('0xcb7Db55Ca9Aa9C3b25F5Bc266da63317fa02086a')] }
+        ]
       },
-      fees: benchmarkFees
+      fees: benchmarkFees,
+      enableNetwork: true
     }
 
     envConfig.environments.push(benchmarkEnv)
@@ -286,7 +283,13 @@ export class C2DEngineDocker extends C2DEngine {
     const consumerAddress = this.getKeyManager().getEthAddress()
 
     if (config.enableBenchmark) {
-      this.createBenchmarkEnvironment(sysinfo, envConfig)
+      if (supportedChains.includes(parseInt(BASE_CHAIN_ID))) {
+        this.createBenchmarkEnvironment(sysinfo, envConfig)
+      } else {
+        CORE_LOGGER.warn(
+          `Skipping benchmark environment: Base chain (${BASE_CHAIN_ID}) is not in supportedNetworks`
+        )
+      }
     }
 
     for (let envIdx = 0; envIdx < envConfig.environments.length; envIdx++) {
@@ -362,7 +365,8 @@ export class C2DEngineDocker extends C2DEngine {
         queMaxWaitTime: 0,
         queMaxWaitTimeFree: 0,
         runMaxWaitTime: 0,
-        runMaxWaitTimeFree: 0
+        runMaxWaitTimeFree: 0,
+        enableNetwork: envDef.enableNetwork
       }
 
       if (envDef.storageExpiry !== undefined) env.storageExpiry = envDef.storageExpiry
@@ -403,9 +407,16 @@ export class C2DEngineDocker extends C2DEngine {
     for (const env of this.envs) {
       const cpuRes = this.getResource(env.resources ?? [], 'cpu')
       if (cpuRes && cpuRes.total > 0) {
-        const isBenchmarkEnv = env.access?.addresses?.includes(
-          BENCHMARK_MONITORING_ADDRESS
-        )
+        let isBenchmarkEnv = false
+        if (env.access?.accessLists) {
+          const baseAccessList = env.access?.accessLists?.[0] as AccessList
+          if (baseAccessList && baseAccessList[BASE_CHAIN_ID]) {
+            isBenchmarkEnv = baseAccessList[BASE_CHAIN_ID].includes(
+              getAddress('0xcb7Db55Ca9Aa9C3b25F5Bc266da63317fa02086a')
+            )
+          }
+        }
+
         if (isBenchmarkEnv) {
           const total = physicalCpuCount > 0 ? physicalCpuCount : cpuRes.total
           const cores = Array.from({ length: total }, (_, i) => i)
@@ -1824,7 +1835,7 @@ export class C2DEngineDocker extends C2DEngine {
           }
         ]
       }
-      if (!this.enableNetwork) {
+      if (!env.enableNetwork) {
         hostConfig.NetworkMode = 'none' // no network inside the container
       }
       // disk

src/components/c2d/compute_engine_docker.ts

@@ -37,12 +37,7 @@ function requirePersistentStorage(handler: CommandHandler): PersistentStorageFac
 
 export class PersistentStorageCreateBucketHandler extends CommandHandler {
   validate(command: PersistentStorageCreateBucketCommand): ValidateParams {
-    const base = validateCommandParameters(command, [
-      'consumerAddress',
-      'signature',
-      'nonce',
-      'accessLists'
-    ])
+    const base = validateCommandParameters(command, ['accessLists'])
     if (!base.valid) return base
     if (!Array.isArray(command.accessLists)) {
       return buildInvalidRequestMessage(
@@ -115,12 +110,7 @@ export class PersistentStorageCreateBucketHandler extends CommandHandler {
 
 export class PersistentStorageGetBucketsHandler extends CommandHandler {
   validate(command: PersistentStorageGetBucketsCommand): ValidateParams {
-    const base = validateCommandParameters(command, [
-      'consumerAddress',
-      'signature',
-      'nonce',
-      'owner'
-    ])
+    const base = validateCommandParameters(command, ['owner'])
     if (!base.valid) return base
     if (!command.owner || typeof command.owner !== 'string') {
       return buildInvalidRequestMessage(
@@ -177,12 +167,7 @@ export class PersistentStorageGetBucketsHandler extends CommandHandler {
 
 export class PersistentStorageListFilesHandler extends CommandHandler {
   validate(command: PersistentStorageListFilesCommand): ValidateParams {
-    const base = validateCommandParameters(command, [
-      'consumerAddress',
-      'signature',
-      'nonce',
-      'bucketId'
-    ])
+    const base = validateCommandParameters(command, ['bucketId'])
     if (!base.valid) return base
     if (!command.bucketId || typeof command.bucketId !== 'string') {
       return buildInvalidRequestMessage('Invalid parameter: "bucketId" must be a string')
@@ -226,13 +211,7 @@ export class PersistentStorageListFilesHandler extends CommandHandler {
 
 export class PersistentStorageGetFileObjectHandler extends CommandHandler {
   validate(command: PersistentStorageGetFileObjectCommand): ValidateParams {
-    const base = validateCommandParameters(command, [
-      'consumerAddress',
-      'signature',
-      'nonce',
-      'bucketId',
-      'fileName'
-    ])
+    const base = validateCommandParameters(command, ['bucketId', 'fileName'])
     if (!base.valid) return base
     return { valid: true }
   }
@@ -280,13 +259,7 @@ export class PersistentStorageGetFileObjectHandler extends CommandHandler {
 
 export class PersistentStorageUploadFileHandler extends CommandHandler {
   validate(command: PersistentStorageUploadFileCommand): ValidateParams {
-    const base = validateCommandParameters(command, [
-      'consumerAddress',
-      'signature',
-      'nonce',
-      'bucketId',
-      'fileName'
-    ])
+    const base = validateCommandParameters(command, ['bucketId', 'fileName'])
     if (!base.valid) return base
     return { valid: true }
   }
@@ -338,13 +311,7 @@ export class PersistentStorageUploadFileHandler extends CommandHandler {
 
 export class PersistentStorageDeleteFileHandler extends CommandHandler {
   validate(command: PersistentStorageDeleteFileCommand): ValidateParams {
-    const base = validateCommandParameters(command, [
-      'consumerAddress',
-      'signature',
-      'nonce',
-      'bucketId',
-      'fileName'
-    ])
+    const base = validateCommandParameters(command, ['bucketId', 'fileName'])
     if (!base.valid) return base
     return { valid: true }
   }

src/components/core/handler/persistentStorage.ts

@@ -106,9 +106,23 @@ directCommandRoute.post(
         res.end()
       } else if (hasP2PInterface) {
         // Remote command - use P2P sendTo
+        let { multiAddrs } = req.body
+        if (typeof multiAddrs === 'string') {
+          if (multiAddrs.startsWith('[')) {
+            try {
+              const parsed = JSON.parse(multiAddrs)
+              multiAddrs = Array.isArray(parsed) ? parsed : [multiAddrs]
+            } catch {
+              multiAddrs = [multiAddrs]
+            }
+          } else {
+            multiAddrs = [multiAddrs]
+          }
+        }
+
         const response = await req.oceanNode
           .getP2PNode()
-          .sendTo(req.body.node as string, JSON.stringify(req.body), req.body.multiAddrs)
+          .sendTo(req.body.node as string, JSON.stringify(req.body), multiAddrs)
 
         res.status(response.status.httpStatus)
         if (response.status.headers) {

src/components/httpRoutes/commands.ts

@@ -76,9 +76,10 @@ export const ENV_TO_CONFIG_MAPPING = {
 // Configuration defaults
 export const DEFAULT_RATE_LIMIT_PER_MINUTE = 30
 export const DEFAULT_MAX_CONNECTIONS_PER_MINUTE = 60 * 2 // 120 requests per minute
-export const BENCHMARK_MONITORING_ADDRESS = '0xC5ea7916f95D5a087A644f1Dc0f7d19955eC446F'
 export const SEPOLIA_CHAIN_ID = '11155111'
+export const BASE_CHAIN_ID = '8453'
 export const USDC_TOKEN = '0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238'
+export const USDC_TOKEN_ADDRESS_BASE = '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913'
 
 export const DEFAULT_BOOTSTRAP_ADDRESSES = [
   // OPF nodes

src/utils/config/constants.ts

@@ -235,7 +235,8 @@ export const C2DEnvironmentConfigSchema = z
       })
       .optional(),
     free: ComputeEnvironmentFreeOptionsSchema.optional(),
-    resources: z.array(ComputeResourceSchema).optional()
+    resources: z.array(ComputeResourceSchema).optional(),
+    enableNetwork: z.boolean().optional().default(false)
   })
   .refine(
     (data) =>
@@ -270,7 +271,6 @@ export const C2DDockerConfigSchema = z.array(
     imageCleanupInterval: z.number().int().min(3600).optional().default(86400), // min 1 hour, default 24 hours
     scanImages: z.boolean().optional().default(false),
     scanImageDBUpdateInterval: z.number().int().min(3600).optional().default(43200), // default 43200 (12 hours)
-    enableNetwork: z.boolean().optional().default(false),
     environments: z.array(C2DEnvironmentConfigSchema).min(1)
   })
 )