Skip to content

use Ocean as default token for fees #929

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexcos20 merged 1 commit into from
Apr 29, 2025
Merged

use Ocean as default token for fees #929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 31 additions & 2 deletions src/components/c2d/compute_engine_docker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ import type {
ComputeResult,
RunningPlatform,
ComputeEnvFeesStructure,
ComputeResourceRequest
ComputeResourceRequest,
ComputeEnvFees
} from '../../@types/C2D/C2D.js'
import { getConfiguration } from '../../utils/config.js'
import { C2DEngine } from './compute_engine_base.js'
Expand Down Expand Up @@ -43,6 +44,7 @@ import { decryptFilesObject, omitDBComputeFieldsFromComputeJob } from './index.j
import * as drc from 'docker-registry-client'
import { ValidateParams } from '../httpRoutes/validateCommands.js'
import { Service } from '@oceanprotocol/ddo-js'
import { getOceanTokenAddressForChain } from '../../utils/address.js'

export class C2DEngineDocker extends C2DEngine {
private envs: ComputeEnvironment[] = []
Expand Down Expand Up @@ -113,7 +115,34 @@ export class C2DEngineDocker extends C2DEngine {
if (supportedChains.includes(parseInt(feeChain))) {
if (fees === null) fees = {}
if (!(feeChain in fees)) fees[feeChain] = []
fees[feeChain] = envConfig.fees[feeChain]
const tmpFees: ComputeEnvFees[] = []
for (let i = 0; i < envConfig.fees[feeChain].length; i++) {
if (
envConfig.fees[feeChain][i].prices &&
envConfig.fees[feeChain][i].prices.length > 0
) {
if (!envConfig.fees[feeChain][i].feeToken) {
const tokenAddress = await getOceanTokenAddressForChain(parseInt(feeChain))
if (tokenAddress) {
envConfig.fees[feeChain][i].feeToken = tokenAddress
tmpFees.push(envConfig.fees[feeChain][i])
} else {
CORE_LOGGER.error(
`Unable to find Ocean token address for chain ${feeChain} and no custom token provided`
)
}
} else {
tmpFees.push(envConfig.fees[feeChain][i])
}
} else {
CORE_LOGGER.error(
`Unable to find prices for fee ${JSON.stringify(
envConfig.fees[feeChain][i]
)} on chain ${feeChain}`
)
}
}
fees[feeChain] = tmpFees
}

/* for (const chain of Object.keys(config.supportedNetworks)) {
Expand Down
7 changes: 7 additions & 0 deletions src/utils/address.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,13 @@ export function getOceanArtifactsAdressesByChainId(chain: number): any {
return null
}

// eslint-disable-next-line require-await
export function getOceanTokenAddressForChain(chainId: number): Promise<string | null> {
const addresses = getOceanArtifactsAdressesByChainId(chainId)
if (addresses && addresses.Ocean) return addresses.Ocean
return null
}

// default token addresses per chain
export const OCEAN_ARTIFACTS_ADDRESSES_PER_CHAIN = addresses
export const DEVELOPMENT_CHAIN_ID = 8996
Expand Down
Loading