Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 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
30 changes: 17 additions & 13 deletions src/components/c2d/compute_engine_docker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -215,11 +215,8 @@ export class C2DEngineDocker extends C2DEngine {
price: 1
}))

const sepoliaChainId = SEPOLIA_CHAIN_ID
const usdcToken = USDC_TOKEN

const benchmarkFees: ComputeEnvFeesStructure = {
[sepoliaChainId]: [{ feeToken: usdcToken, prices: benchmarkPrices }]
[BASE_CHAIN_ID]: [{ feeToken: USDC_TOKEN_ADDRESS_BASE, prices: benchmarkPrices }]
}

const benchmarkEnv: C2DEnvironmentConfig = {
Expand All @@ -234,8 +231,8 @@ export class C2DEngineDocker extends C2DEngine {
...gpuResources
],
access: {
addresses: [BENCHMARK_MONITORING_ADDRESS],
accessLists: null
addresses: [],
accessLists: [{ '8453': ['0xcb7Db55Ca9Aa9C3b25F5Bc266da63317fa02086a'] }]
Comment thread
alexcos20 marked this conversation as resolved.
Outdated
},
fees: benchmarkFees
}
Expand Down Expand Up @@ -280,7 +277,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++) {
Expand Down Expand Up @@ -397,8 +400,9 @@ 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
const baseAccessList = env.access?.accessLists?.[0] as AccessList
const isBenchmarkEnv = baseAccessList['8453'].includes(
getAddress('0xcb7Db55Ca9Aa9C3b25F5Bc266da63317fa02086a')
)
if (isBenchmarkEnv) {
const total = physicalCpuCount > 0 ? physicalCpuCount : cpuRes.total
Expand Down
3 changes: 2 additions & 1 deletion src/utils/config/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading