Merge pull request #271 from OceanProtocolEnterprise/feat/stage

Feat/stage

Author: AdriGeorge

.env.example

@@ -14,6 +14,7 @@
 # NEXT_PUBLIC_HIDE_ONBOARDING_MODULE_BY_DEFAULT=true
 # NEXT_PUBLIC_NODE_URI_INDEXED=["https://.."]
 # NEXT_PUBLIC_WALLETCONNECT_PROJECT_ID=
+# NEXT_PUBLIC_DATASPACE=oceanenterprise
 # NEXT_PUBLIC_ESCROW_ADDRESSES={"11155111":"0x5494711392a67DA50D3bC7b1fcC2d1877cFaA4d2", "11155420":"0x4D49eEedFac8Ea03328c0E4871b680C06d892092"}
 # NEXT_PUBLIC_NODE_URI_MAP={"1":"https://mainnet...", "10":"https://optimism...", "11155111":"https://eth-sepolia.g.alchemy.com/.., "11155420":"https://opt-sepolia.g.alchemy.com/..}
 # NEXT_PUBLIC_CONSUME_MARKET_ORDER_FEE_MAP={"11155111":[{"token":"0x1B083D8584dd3e6Ff37d04a6e7e82b5F622f3985","amount":"1500000000000000000"}, {"token": "0x08210F9170F89Ab7658F0B5E3fF39b0E03C594D4", "amount": "2000000"}]}

app.config.cjs

@@ -177,5 +177,8 @@ module.exports = {
           getEnv('NEXT_PUBLIC_PROVIDER_URL') ||
             process.env.NEXT_PUBLIC_PROVIDER_URL ||
             'https://ocean-node-vm3.oceanenterprise.io'
-        ]
+        ],
+
+  dataspace:
+    getEnv('NEXT_PUBLIC_DATASPACE') || process.env.NEXT_PUBLIC_DATASPACE || null
 }

scripts/docker-entrypoint.sh

@@ -37,7 +37,9 @@ const config = {
     process.env.NEXT_PUBLIC_CREDENTIAL_VALIDITY_DURATION,
   NEXT_PUBLIC_NODE_URI_MAP: process.env.NEXT_PUBLIC_NODE_URI_MAP,
   NEXT_PUBLIC_MARKET_FEE_ADDRESS: process.env.NEXT_PUBLIC_MARKET_FEE_ADDRESS,
-  NEXT_PUBLIC_ALLOWED_ERC20_ADDRESSES: process.env.NEXT_PUBLIC_ALLOWED_ERC20_ADDRESSES
+  NEXT_PUBLIC_ALLOWED_ERC20_ADDRESSES:
+    process.env.NEXT_PUBLIC_ALLOWED_ERC20_ADDRESSES,
+  NEXT_PUBLIC_DATASPACE: process.env.NEXT_PUBLIC_DATASPACE
 }
 
 fs.writeFileSync(

scripts/write-runtime-config.cjs

@@ -57,7 +57,8 @@ const config = {
   NEXT_PUBLIC_NODE_URI_MAP: process.env.NEXT_PUBLIC_NODE_URI_MAP,
   NEXT_PUBLIC_MARKET_FEE_ADDRESS: process.env.NEXT_PUBLIC_MARKET_FEE_ADDRESS,
   NEXT_PUBLIC_ALLOWED_ERC20_ADDRESSES:
-    process.env.NEXT_PUBLIC_ALLOWED_ERC20_ADDRESSES
+    process.env.NEXT_PUBLIC_ALLOWED_ERC20_ADDRESSES,
+  NEXT_PUBLIC_DATASPACE: process.env.NEXT_PUBLIC_DATASPACE
 }
 
 const outputPath = path.join(process.cwd(), 'public', 'runtime-config.js')

src/@context/MarketMetadata/_types.ts

@@ -39,6 +39,7 @@ export interface AppConfig {
   showPreviewAlert: string
   ssiEnabled: boolean
   showOnboardingModuleByDefault: boolean
+  dataspace: string | null
 }
 export interface SiteContent {
   siteTitle: string

src/@types/ddo/CredentialSubject.ts

@@ -12,6 +12,7 @@ export interface CredentialSubject {
   credentials: Credential
   chainId: number
   nftAddress: string
+  dataspace?: string
   event?: Event
   datatokens?: AssetDatatoken[]
 }

src/@utils/aquarius/index.ts

@@ -4,7 +4,8 @@ import axios, { CancelToken, AxiosResponse } from 'axios'
 import {
   metadataCacheUri,
   allowDynamicPricing,
-  nodeUriIndex
+  nodeUriIndex,
+  dataspace
 } from '../../../app.config.cjs'
 import {
   SortDirectionOptions,
@@ -119,11 +120,17 @@ FilterTerm | undefined {
     : getFilterTerm('indexedMetadata.stats.prices.type', 'pool')
 }
 
+function getDataspaceFilterTerm(): FilterTerm | undefined {
+  if (!dataspace) return undefined
+  return getFilterTerm('credentialSubject.dataspace.keyword', dataspace)
+}
+
 export function generateBaseQuery(
   baseQueryParams: BaseQueryParams,
   index?: string,
   allNode?: boolean
 ): SearchQuery {
+  const dataspaceFilterTerm = getDataspaceFilterTerm()
   const generatedQuery = {
     index: index ?? 'op_ddo_v5.0.0',
     from: baseQueryParams.esPaginationOptions?.from || 0,
@@ -165,7 +172,8 @@ export function generateBaseQuery(
                   }
                 }
               ]
-            : [])
+            : []),
+          ...(dataspaceFilterTerm ? [dataspaceFilterTerm] : [])
         ]
       }
     }

src/@utils/provider.ts

@@ -23,7 +23,6 @@ import {
   PolicyServerInitiateActionData,
   PolicyServerInitiateComputeActionData
 } from 'src/@types/PolicyServer'
-import { getOceanConfig } from '@utils/ocean'
 
 export async function initializeProviderForComputeMulti(
   datasets:
@@ -40,13 +39,11 @@ export async function initializeProviderForComputeMulti(
   computeEnv: ComputeEnvironment,
   selectedResources: ResourceType,
   svcIndexAlgo: number,
+  paymentTokenAddress: string,
   algoParams?: Record<string, any>,
   datasetParams?: Record<string, any>
 ) {
   const safeDatasets = datasets ?? []
-  const { oceanTokenAddress } = getOceanConfig(
-    algorithm.credentialSubject.chainId
-  )
   const computeAssets = safeDatasets.map(
     ({ asset, service, accessDetails }) => ({
       documentId: asset.id,
@@ -113,7 +110,7 @@ export async function initializeProviderForComputeMulti(
     computeAssets,
     computeAlgo,
     computeEnv.id,
-    oceanTokenAddress,
+    paymentTokenAddress,
     validUntil,
     providerUrl,
     accountId,

src/@utils/runtimeConfig.ts

@@ -25,6 +25,7 @@ export type RuntimeConfig = {
   NEXT_PUBLIC_MARKET_FEE_ADDRESS?: string
   NEXT_PUBLIC_MARKET_DEVELOPMENT?: string
   NEXT_PUBLIC_ALLOWED_ERC20_ADDRESSES?: string
+  NEXT_PUBLIC_DATASPACE?: string
 }
 
 declare global {
@@ -70,7 +71,8 @@ const runtimeConfig: RuntimeConfig = (() => {
     NEXT_PUBLIC_MARKET_FEE_ADDRESS: process.env.NEXT_PUBLIC_MARKET_FEE_ADDRESS,
     NEXT_PUBLIC_MARKET_DEVELOPMENT: process.env.NEXT_PUBLIC_MARKET_DEVELOPMENT,
     NEXT_PUBLIC_ALLOWED_ERC20_ADDRESSES:
-      process.env.NEXT_PUBLIC_ALLOWED_ERC20_ADDRESSES
+      process.env.NEXT_PUBLIC_ALLOWED_ERC20_ADDRESSES,
+    NEXT_PUBLIC_DATASPACE: process.env.NEXT_PUBLIC_DATASPACE
   }
 
   if (typeof window !== 'undefined' && window.__RUNTIME_CONFIG__) {

src/components/ComputeWizard/ComputeWizardController.tsx

@@ -323,7 +323,6 @@ export default function ComputeWizardController({
     initError,
     setInitError
   } = useComputeInitialization({
-    oceanTokenAddress: baseTokenAddress,
     web3Provider
   })
   const {
@@ -598,6 +597,19 @@ export default function ComputeWizardController({
           datasetParams[param.name] = param.value ?? param.default ?? ''
         })
       }
+      const paymentTokenAddress =
+        formValues?.baseToken ||
+        baseTokenAddress ||
+        selectedComputeEnv.fees?.[
+          String(formValues?.user?.chainId || asset.credentialSubject.chainId)
+        ]?.[0]?.feeToken
+
+      if (!paymentTokenAddress) {
+        throw new Error(
+          'No payment token selected. Please choose a price token in C2D Environment Configuration.'
+        )
+      }
+
       const initResult = await initializePricingAndProvider({
         datasetsForProvider,
         algorithmAsset: actualAlgorithmAsset,
@@ -608,6 +620,7 @@ export default function ComputeWizardController({
         selectedComputeEnv,
         selectedResources,
         algoIndex: actualSvcIndex,
+        paymentTokenAddress,
         algoParams,
         datasetParams,
         accountId,