Feat/multi token

.env.example

@@ -17,6 +17,6 @@
 # NEXT_PUBLIC_INFURA_PROJECT_ID=
 # 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=1500000000000000000
+# NEXT_PUBLIC_CONSUME_MARKET_ORDER_FEE_MAP={"11155111":[{"token":"0x1B083D8584dd3e6Ff37d04a6e7e82b5F622f3985","amount":"1500000000000000000"}, {"token": "0x08210F9170F89Ab7658F0B5E3fF39b0E03C594D4", "amount": "2000000"}]}
 # NEXT_PUBLIC_CONSUME_MARKET_FEE=0.1
 # NEXT_PUBLIC_MARKET_FEE_ADDRESS=0x0db00a90deee402256cb1df89f3e14d6b9130fdd

app.config.cjs

@@ -55,9 +55,8 @@ module.exports = {
 
   // consume market fee that is taken upon ordering an asset, it is an absolute value with 18 decimals, it is specified on order
   consumeMarketOrderFee:
-    getEnv('NEXT_PUBLIC_CONSUME_MARKET_ORDER_FEE') ||
-    process.env.NEXT_PUBLIC_CONSUME_MARKET_ORDER_FEE ||
-    '0',
+    getEnv('NEXT_PUBLIC_CONSUME_MARKET_ORDER_FEE_MAP') ||
+    process.env.NEXT_PUBLIC_CONSUME_MARKET_ORDER_FEE_MAP,
   consumeMarketFee:
     getEnv('NEXT_PUBLIC_CONSUME_MARKET_FEE') ||
     process.env.NEXT_PUBLIC_CONSUME_MARKET_FEE ||

scripts/docker-entrypoint.sh

@@ -25,8 +25,8 @@ const config = {
     process.env.NEXT_PUBLIC_WALLETCONNECT_PROJECT_ID,
   NEXT_PUBLIC_INFURA_PROJECT_ID: process.env.NEXT_PUBLIC_INFURA_PROJECT_ID,
   NEXT_PUBLIC_CONSUME_MARKET_FEE: process.env.NEXT_PUBLIC_CONSUME_MARKET_FEE,
-  NEXT_PUBLIC_CONSUME_MARKET_ORDER_FEE:
-    process.env.NEXT_PUBLIC_CONSUME_MARKET_ORDER_FEE,
+  NEXT_PUBLIC_CONSUME_MARKET_ORDER_FEE_MAP:
+    process.env.NEXT_PUBLIC_CONSUME_MARKET_ORDER_FEE_MAP,
   NEXT_PUBLIC_FIXED_RATE_EXCHANGE_ADDRESS:
     process.env.NEXT_PUBLIC_FIXED_RATE_EXCHANGE_ADDRESS,
   NEXT_PUBLIC_DISPENSER_ADDRESS: process.env.NEXT_PUBLIC_DISPENSER_ADDRESS,
@@ -39,7 +39,7 @@ 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_ERC20_ADDRESSES: process.env.NEXT_PUBLIC_ERC20_ADDRESSES
+  NEXT_PUBLIC_ALLOWED_ERC20_ADDRESSES: process.env.NEXT_PUBLIC_ALLOWED_ERC20_ADDRESSES
 }
 
 fs.writeFileSync(

scripts/write-runtime-config.cjs

@@ -44,8 +44,8 @@ const config = {
     process.env.NEXT_PUBLIC_WALLETCONNECT_PROJECT_ID,
   NEXT_PUBLIC_INFURA_PROJECT_ID: process.env.NEXT_PUBLIC_INFURA_PROJECT_ID,
   NEXT_PUBLIC_CONSUME_MARKET_FEE: process.env.NEXT_PUBLIC_CONSUME_MARKET_FEE,
-  NEXT_PUBLIC_CONSUME_MARKET_ORDER_FEE:
-    process.env.NEXT_PUBLIC_CONSUME_MARKET_ORDER_FEE,
+  NEXT_PUBLIC_CONSUME_MARKET_ORDER_FEE_MAP:
+    process.env.NEXT_PUBLIC_CONSUME_MARKET_ORDER_FEE_MAP,
   NEXT_PUBLIC_FIXED_RATE_EXCHANGE_ADDRESS:
     process.env.NEXT_PUBLIC_FIXED_RATE_EXCHANGE_ADDRESS,
   NEXT_PUBLIC_DISPENSER_ADDRESS: process.env.NEXT_PUBLIC_DISPENSER_ADDRESS,
@@ -58,7 +58,8 @@ 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_ERC20_ADDRESSES: process.env.NEXT_PUBLIC_ERC20_ADDRESSES
+  NEXT_PUBLIC_ALLOWED_ERC20_ADDRESSES:
+    process.env.NEXT_PUBLIC_ALLOWED_ERC20_ADDRESSES
 }
 
 const outputPath = path.join(process.cwd(), 'public', 'runtime-config.js')

src/@context/MarketMetadata/_types.ts

@@ -1,9 +1,15 @@
-export interface OpcFee {
-  chainId: number
+export interface OpcTokenData {
+  tokenAddress: string
   feePercentage: string
   maxFee: string
   minFee: string
-  approvedTokens: string[]
+  approved: boolean
+}
+
+export interface OpcFee {
+  chainId: number
+  // Instead of a single fee, we have an array of fee data per token
+  tokensData: OpcTokenData[]
 }
 
 export interface AppConfig {
@@ -16,6 +22,7 @@ export interface AppConfig {
   publisherMarketFixedSwapFee: string
   consumeMarketOrderFee: string
   consumeMarketFixedSwapFee: string
+  customProviderUrl?: string
   allowFixedPricing: string
   allowDynamicPricing: string
   allowFreePricing: string

src/@context/MarketMetadata/index.tsx

@@ -10,12 +10,12 @@ import {
 import { MarketMetadataProviderValue, OpcFee } from './_types'
 import siteContent from '../../../content/site.json'
 import appConfig from '../../../app.config.cjs'
-import { LoggerInstance } from '@oceanprotocol/lib'
 import { useConnect, useChainId } from 'wagmi'
 import { getOceanConfig } from '@utils/ocean'
 import { getTokenInfo } from '@utils/wallet'
 import useEnterpriseFeeColletor from '@hooks/useEnterpriseFeeCollector'
 import { useEthersSigner } from '@hooks/useEthersSigner'
+
 const MarketMetadataContext = createContext({} as MarketMetadataProviderValue)
 
 function MarketMetadataProvider({
@@ -28,27 +28,28 @@ function MarketMetadataProvider({
   const chainId = useChainId()
   const signer = useEthersSigner()
 
-  const { getOpcData } = useEnterpriseFeeColletor()
+  const { getOpcData, enterpriseFeeCollector } = useEnterpriseFeeColletor()
   const [opcFees, setOpcFees] = useState<OpcFee[]>()
   const [approvedBaseTokens, setApprovedBaseTokens] = useState<TokenInfo[]>()
+
   const config = getOceanConfig(chainId)
 
   // ---------------------------
   // Load OPC Fee Data
   // ---------------------------
   useEffect(() => {
     async function fetchData() {
+      // Safety check: Don't run if we don't have a signer yet
+      if (!signer) return
+
       const opcData = await getOpcData(appConfig.chainIdsSupported)
-      LoggerInstance.log('[MarketMetadata] Got new data.', {
-        opcFees: opcData,
-        siteContent,
-        appConfig
-      })
       setOpcFees(opcData)
     }
 
-    if (signer) fetchData()
-  }, [signer])
+    if (!opcFees && signer && enterpriseFeeCollector) {
+      fetchData()
+    }
+  }, [signer, getOpcData, enterpriseFeeCollector])
 
   // ---------------------------
   // Get OPC fee for given token
@@ -57,38 +58,58 @@ function MarketMetadataProvider({
     (tokenAddress: string, chainId: number): string => {
       if (!opcFees) return '0'
       const opc = opcFees.find((x) => x.chainId === chainId)
-      return opc?.feePercentage || '0'
+      return (
+        opc?.tokensData.find(
+          (x) => x.tokenAddress.toLowerCase() === tokenAddress.toLowerCase()
+        )?.feePercentage || '0'
+      )
     },
     [opcFees]
   )
 
   // ---------------------------
-  // Load OCEAN token metadata
+  // Load approved tokens metadata
   // ---------------------------
+
+  const tokenAddressesString = JSON.stringify(config?.tokenAddresses || [])
+
   useEffect(() => {
     async function fetchTokenInfoSafe() {
+      const addresses = JSON.parse(tokenAddressesString)
+
       try {
         if (isLoading) return
-        if (!config?.oceanTokenAddress) {
-          console.warn('[fetchTokenInfo] No oceanTokenAddress configured.')
-          return
-        }
 
-        if (!chainId) {
-          console.error('[fetchTokenInfo] chainId missing.')
+        if (!addresses || addresses.length === 0) {
           return
         }
 
-        if (!signer) {
-          console.warn('[fetchTokenInfo] Waiting for signer...')
-          return
-        }
-        const tokenDetails = await getTokenInfo(
-          config.oceanTokenAddress,
-          signer.provider
+        if (!chainId) return
+        if (!signer) return
+
+        // 1. Fetch metadata for all configured tokens
+        const tokenPromises = addresses.map((address: string) =>
+          getTokenInfo(address, signer.provider)
         )
 
-        setApprovedBaseTokens([tokenDetails])
+        const tokensDetails = await Promise.all(tokenPromises)
+        // 2. Identify allowed tokens from OPC Data for the current chain
+        const currentChainOpc = opcFees?.find((x) => x.chainId === chainId)
+
+        // Create a Set of allowed addresses (normalized to lowercase) for fast lookup
+        const allowedAddresses = new Set(
+          currentChainOpc?.tokensData.map((t) =>
+            t.tokenAddress.toLowerCase()
+          ) || []
+        )
+        // 3. Filter: Keep only valid tokens that ARE ALSO in the allowed list
+        const filteredTokens = tokensDetails.filter((t) => {
+          if (!t) return false // Filter out undefined fetch results
+
+          return allowedAddresses.has(t.address.toLowerCase())
+        })
+
+        setApprovedBaseTokens(filteredTokens)
       } catch (error: any) {
         console.error(
           '[fetchTokenInfo] Error fetching token info:',
@@ -97,8 +118,9 @@ function MarketMetadataProvider({
       }
     }
 
+    // added opcFees to dependency so it refilters when fee data arrives
     fetchTokenInfoSafe()
-  }, [isLoading, chainId, signer, config?.oceanTokenAddress])
+  }, [isLoading, chainId, signer, tokenAddressesString, opcFees])
 
   return (
     <MarketMetadataContext.Provider