Free
+ )
+ }
+
+ if (isNaN(price)) {
+ return (
+
+ Invalid Price
+
+ )
+ }
+
return (
- {price === 0 ? (
-
)
}
diff --git a/src/components/@shared/Price/index.test.tsx b/src/components/@shared/Price/index.test.tsx
index 112c1f6e33..14989150b8 100644
--- a/src/components/@shared/Price/index.test.tsx
+++ b/src/components/@shared/Price/index.test.tsx
@@ -13,25 +13,51 @@ describe('@shared/Price', () => {
it('renders fixed price', () => {
render(
Free
- ) : !price || Number.isNaN(price) ? (
- -
- ) : (
- <>
-
- {formatNumber(price, locale, decimals)}
- {symbol}
-
- {conversion &&
+ {formatNumber(price, locale, decimals)}
+ {symbol}
+
+ {conversion &&
@@ -236,23 +255,21 @@ export default function Download({
state="info"
text={`The publisher temporarily disabled ordering for this asset`}
/>
+ ) : !isPricingLoaded ? (
+
)
-}
+})
diff --git a/src/components/Asset/AssetActions/index.tsx b/src/components/Asset/AssetActions/index.tsx
index 93ecac6163..9ca5d03a22 100644
--- a/src/components/Asset/AssetActions/index.tsx
+++ b/src/components/Asset/AssetActions/index.tsx
@@ -1,4 +1,10 @@
-import React, { ReactElement, useState, useEffect } from 'react'
+import React, {
+ ReactElement,
+ useState,
+ useEffect,
+ useCallback,
+ useMemo
+} from 'react'
import Download from './Download'
import { FileInfo, LoggerInstance, Datatoken } from '@oceanprotocol/lib'
import { compareAsBN } from '@utils/numbers'
@@ -15,7 +21,10 @@ import AssetStats from './AssetStats'
import { useAccount, useProvider, useNetwork } from 'wagmi'
import useBalance from '@hooks/useBalance'
-export default function AssetActions({
+// Simple in-memory cache for file metadata
+const fileMetadataCache = new Map()
+
+export default React.memo(function AssetActions({
asset
}: {
asset: AssetExtended
@@ -27,99 +36,113 @@ export default function AssetActions({
const { isAssetNetwork } = useAsset()
const newCancelToken = useCancelToken()
const isMounted = useIsMounted()
-
- // TODO: using this for the publish preview works fine, but produces a console warning
- // on asset details page as there is no formik context there:
- // Warning: Formik context is undefined, please verify you are calling useFormikContext()
- // as child of a component.
- const formikState = useFormikContext()
+ const formikValues = useFormikContext()
const [isBalanceSufficient, setIsBalanceSufficient] = useState()
const [dtBalance, setDtBalance] = useState()
const [fileMetadata, setFileMetadata] = useState()
const [fileIsLoading, setFileIsLoading] = useState(false)
- // Get and set file info
- useEffect(() => {
+ // Memoized file info initialization
+ const initFileInfo = useCallback(async () => {
+ const cacheKey = `${asset?.id}-${asset?.services[0]?.id}`
+ if (fileMetadataCache.has(cacheKey)) {
+ setFileMetadata(fileMetadataCache.get(cacheKey))
+ return
+ }
+
const oceanConfig = getOceanConfig(asset?.chainId)
if (!oceanConfig) return
- async function initFileInfo() {
- setFileIsLoading(true)
- const providerUrl =
- formikState?.values?.services[0].providerUrl.url ||
- asset?.services[0]?.serviceEndpoint
-
- const storageType = formikState?.values?.services
- ? formikState?.values?.services[0].files[0].type
- : null
-
- // TODO: replace 'any' with correct typing
- const file = formikState?.values?.services[0].files[0] as any
- const query = file?.query || undefined
- const abi = file?.abi || undefined
- const headers = file?.headers || undefined
- const method = file?.method || undefined
-
- try {
- const fileInfoResponse = formikState?.values?.services?.[0].files?.[0]
- .url
- ? await getFileInfo(
- formikState?.values?.services?.[0].files?.[0].url,
- providerUrl,
- storageType,
- query,
- headers,
- abi,
- chain?.id,
- method
- )
- : await getFileDidInfo(asset?.id, asset?.services[0]?.id, providerUrl)
-
- fileInfoResponse && setFileMetadata(fileInfoResponse[0])
-
- // set the content type in the Dataset Schema
+ setFileIsLoading(true)
+ const providerUrl =
+ formikValues?.values.services[0].providerUrl.url ||
+ asset?.services[0]?.serviceEndpoint
+
+ const storageType = formikValues?.values.services
+ ? formikValues?.values.services[0].files[0].type
+ : null
+ const file = formikValues?.values.services[0].files[0] as any
+ const query = file?.query || undefined
+ const abi = file?.abi || undefined
+ const headers = file?.headers || undefined
+ const method = file?.method || undefined
+
+ try {
+ const fileInfoResponse = formikValues?.values.services?.[0].files?.[0].url
+ ? await getFileInfo(
+ formikValues?.values.services?.[0].files?.[0].url,
+ providerUrl,
+ storageType,
+ query,
+ headers,
+ abi,
+ chain?.id,
+ method
+ )
+ : await getFileDidInfo(asset?.id, asset?.services[0]?.id, providerUrl)
+
+ if (fileInfoResponse && isMounted()) {
+ setFileMetadata(fileInfoResponse[0])
+ fileMetadataCache.set(cacheKey, fileInfoResponse[0])
+
+ // Update dataset schema
const datasetSchema = document.scripts?.namedItem('datasetSchema')
if (datasetSchema) {
const datasetSchemaJSON = JSON.parse(datasetSchema.innerText)
if (datasetSchemaJSON?.distribution[0]['@type'] === 'DataDownload') {
- const contentType = fileInfoResponse[0]?.contentType
- datasetSchemaJSON.distribution[0].encodingFormat = contentType
+ datasetSchemaJSON.distribution[0].encodingFormat =
+ fileInfoResponse[0]?.contentType
datasetSchema.innerText = JSON.stringify(datasetSchemaJSON)
}
}
-
- setFileIsLoading(false)
- } catch (error) {
- setFileIsLoading(false)
- LoggerInstance.error(error.message)
}
+ } catch (error) {
+ LoggerInstance.error(error.message)
+ } finally {
+ if (isMounted()) setFileIsLoading(false)
}
+ }, [asset, formikValues, chain?.id, newCancelToken, isMounted])
+
+ // Memoized datatoken balance initialization
+ const initDtBalance = useCallback(async () => {
+ if (
+ !web3Provider ||
+ !accountId ||
+ !asset?.accessDetails?.baseToken?.address ||
+ !isAssetNetwork
+ )
+ return
+
+ try {
+ const datatokenInstance = new Datatoken(web3Provider as any)
+ const dtBalance = await datatokenInstance.balance(
+ asset.accessDetails.baseToken.address,
+ accountId
+ )
+ if (isMounted()) setDtBalance(dtBalance)
+ } catch (e: any) {
+ LoggerInstance.error('[DT Balance Error]', e.message || e)
+ }
+ }, [web3Provider, accountId, asset, isAssetNetwork, isMounted])
+
+ // Fetch file info
+ useEffect(() => {
initFileInfo()
- }, [asset, isMounted, newCancelToken, formikState?.values?.services])
+ }, [initFileInfo])
- // Get and set user DT balance
+ // Fetch datatoken balance
useEffect(() => {
- if (!web3Provider || !accountId || !isAssetNetwork) return
-
- async function init() {
- try {
- const datatokenInstance = new Datatoken(web3Provider as any)
- const dtBalance = await datatokenInstance.balance(
- asset.services[0].datatokenAddress,
- accountId
- )
- setDtBalance(dtBalance)
- } catch (e) {
- LoggerInstance.error(e.message)
- }
- }
- init()
- }, [web3Provider, accountId, asset, isAssetNetwork])
+ initDtBalance()
+ }, [initDtBalance])
// Check user balance against price
useEffect(() => {
- if (asset?.accessDetails?.type === 'free') setIsBalanceSufficient(true)
+ if (asset?.accessDetails?.type === 'free') {
+ setIsBalanceSufficient(true)
+ return
+ }
+
if (
!asset?.accessDetails?.price ||
!asset?.accessDetails?.baseToken?.symbol ||
@@ -133,15 +156,16 @@ export default function AssetActions({
balance,
asset?.accessDetails?.baseToken?.symbol
)
- setIsBalanceSufficient(
+ const isSufficient =
compareAsBN(baseTokenBalance, `${asset?.accessDetails.price}`) ||
- Number(dtBalance) >= 1
- )
+ Number(dtBalance) >= 1
+
+ if (isMounted()) setIsBalanceSufficient(isSufficient)
return () => {
- setIsBalanceSufficient(false)
+ if (isMounted()) setIsBalanceSufficient(false)
}
- }, [balance, accountId, asset?.accessDetails, dtBalance])
+ }, [balance, accountId, asset?.accessDetails, dtBalance, isMounted])
return (
()
-
- useEffect(() => {
- if (!asset) return
-
- const queryContext = getQueryContext(asset.chainId)
- setQueryContext(queryContext)
- }, [asset])
-
- const [result] = useQuery({
- query: getReceipts,
- variables: { address: asset?.nft.address.toLowerCase() },
- context: queryContext,
- pause: !asset || !queryContext
- })
- const { data } = result
-
- //
- // 2. Construct display data based on fetched data.
- //
- useEffect(() => {
- if (!data || data.nftUpdates.length === 0) return
- const receiptCollection = data.nftUpdates
- setReceipts(receiptCollection)
- }, [data, setReceipts])
-
- return (
- <>
- ()
useEffect(() => {
- if (!ddo) return
+ if (!ddo.datatokens[0]?.address) {
+ LoggerInstance.error('Datatoken address missing from DDO')
+ return
+ }
async function getInitialPaymentCollector() {
try {
const signer = await getDummySigner(ddo.chainId)
- const datatoken = new Datatoken(signer)
+ const datatoken = new Datatoken(signer, ddo.chainId)
+ const { address } = ddo.datatokens[0]
+
+ LoggerInstance.log('[MetaFull] Using datatoken address:', address)
+
+ // const collector = await datatoken.getPaymentCollector(address)
setPaymentCollector(
- await datatoken.getPaymentCollector(ddo.datatokens[0].address)
+ await datatoken.getPaymentCollector(
+ ddo.indexedMetadata.stats[0].datatokenAddress || ''
+ )
)
} catch (error) {
LoggerInstance.error(
@@ -30,6 +43,7 @@ export default function MetaFull({ ddo }: { ddo: Asset }): ReactElement {
)
}
}
+
getInitialPaymentCollector()
}, [ddo])
@@ -46,17 +60,18 @@ export default function MetaFull({ ddo }: { ddo: Asset }): ReactElement {
)}
diff --git a/src/components/Asset/Edit/DebugEditMetadata.tsx b/src/components/Asset/Edit/DebugEditMetadata.tsx
index 286d6ec4e2..5ad5ad7df1 100644
--- a/src/components/Asset/Edit/DebugEditMetadata.tsx
+++ b/src/components/Asset/Edit/DebugEditMetadata.tsx
@@ -1,4 +1,4 @@
-import { Asset, Metadata, Service } from '@oceanprotocol/lib'
+import { Asset, Metadata, Service } from '@oceanprotocol/ddo-js'
import React, { ReactElement, useEffect, useState } from 'react'
import DebugOutput from '@shared/DebugOutput'
import { MetadataEditForm } from './_types'
diff --git a/src/components/Asset/Edit/EditMetadata.tsx b/src/components/Asset/Edit/EditMetadata.tsx
index 1dcdccfd1c..bd7039655d 100644
--- a/src/components/Asset/Edit/EditMetadata.tsx
+++ b/src/components/Asset/Edit/EditMetadata.tsx
@@ -3,12 +3,10 @@ import { Formik } from 'formik'
import {
LoggerInstance,
FixedRateExchange,
- Asset,
Datatoken,
- Nft,
- Metadata,
- Service
+ Nft
} from '@oceanprotocol/lib'
+import { Asset, Metadata, Service } from '@oceanprotocol/ddo-js'
import { validationSchema } from './_validation'
import { getInitialValues } from './_constants'
import { MetadataEditForm } from './_types'
@@ -162,7 +160,7 @@ export default function Edit({
// delete custom helper properties injected in the market so we don't write them on chain
delete (updatedAsset as AssetExtended).accessDetails
delete (updatedAsset as AssetExtended).datatokens
- delete (updatedAsset as AssetExtended).stats
+ delete (updatedAsset as AssetExtended).indexedMetadata?.stats
const setMetadataTx = await setNftMetadata(
updatedAsset,
accountId,
diff --git a/src/components/Asset/Edit/FormEditMetadata.tsx b/src/components/Asset/Edit/FormEditMetadata.tsx
index 29e258787b..3e93750d38 100644
--- a/src/components/Asset/Edit/FormEditMetadata.tsx
+++ b/src/components/Asset/Edit/FormEditMetadata.tsx
@@ -95,6 +95,9 @@ export default function FormEditMetadata({
{...getFieldContent('price', data)}
component={Input}
name="price"
+ type="number"
+ min={process.env.NEXT_PUBLIC_MIN_ASSET_PRICE}
+ step="any"
/>
)}
diff --git a/src/components/Asset/Edit/_constants.ts b/src/components/Asset/Edit/_constants.ts
index 12f09b95ce..b3786c5271 100644
--- a/src/components/Asset/Edit/_constants.ts
+++ b/src/components/Asset/Edit/_constants.ts
@@ -1,4 +1,4 @@
-import { Metadata, Service } from '@oceanprotocol/lib'
+import { Metadata, Service } from '@oceanprotocol/ddo-js'
import { parseConsumerParameters, secondsToString } from '@utils/ddo'
import { MetadataEditForm } from './_types'
diff --git a/src/components/Asset/RelatedAssets/_utils.ts b/src/components/Asset/RelatedAssets/_utils.ts
index 40232bdd8f..eae0cb3c56 100644
--- a/src/components/Asset/RelatedAssets/_utils.ts
+++ b/src/components/Asset/RelatedAssets/_utils.ts
@@ -22,10 +22,10 @@ export function generateQuery(
tags && {
terms: { 'metadata.tags.keyword': tags }
},
- owner && { term: { 'nft.owner.keyword': owner } }
+ owner && { term: { 'indexedMetadata.nft.owner.keyword': owner } }
],
sort: {
- 'stats.orders': 'desc'
+ 'indexedMetadata.stats.orders': 'desc'
},
sortOptions: {
sortBy: SortTermOptions.Orders
diff --git a/src/components/Asset/RelatedAssets/index.tsx b/src/components/Asset/RelatedAssets/index.tsx
index 34f4c0fb69..de4a7c4cc3 100644
--- a/src/components/Asset/RelatedAssets/index.tsx
+++ b/src/components/Asset/RelatedAssets/index.tsx
@@ -1,5 +1,6 @@
import React, { ReactElement, useEffect, useState } from 'react'
-import { Asset, LoggerInstance } from '@oceanprotocol/lib'
+import { LoggerInstance } from '@oceanprotocol/lib'
+import { Asset } from '@oceanprotocol/ddo-js'
import { generateBaseQuery, queryMetadata } from '@utils/aquarius'
import { useUserPreferences } from '@context/UserPreferences'
import { useAsset } from '@context/Asset'
@@ -20,7 +21,7 @@ export default function RelatedAssets(): ReactElement {
if (
!chainIds?.length ||
!asset?.nftAddress ||
- !asset?.nft ||
+ !asset?.indexedMetadata?.nft ||
!asset?.metadata
) {
return
@@ -51,7 +52,7 @@ export default function RelatedAssets(): ReactElement {
asset.nftAddress,
4 - tagResults.length,
null,
- asset.nft.owner
+ asset.indexedMetadata.nft.owner
)
)
diff --git a/src/components/Asset/index.tsx b/src/components/Asset/index.tsx
index edc1cf761d..b732fd3233 100644
--- a/src/components/Asset/index.tsx
+++ b/src/components/Asset/index.tsx
@@ -9,6 +9,7 @@ import AssetContent from './AssetContent'
export default function AssetDetails({ uri }: { uri: string }): ReactElement {
const router = useRouter()
const { asset, title, error, isInPurgatory, loading } = useAsset()
+
const [pageTitle, setPageTitle] = useState
-
- )}
-
+
+
)}
)}
@@ -275,7 +292,6 @@ export default function Download({
values?.dataServiceParams,
asset.services[0].consumerParameters
)
-
await handleOrderOrDownload(dataServiceParams)
}}
>
@@ -290,7 +306,7 @@ export default function Download({
) : (
@@ -151,8 +175,9 @@ export default function AssetActions({
isBalanceSufficient={isBalanceSufficient}
file={fileMetadata}
fileIsLoading={fileIsLoading}
+ accessDetails={asset.accessDetails}
/>
)
-}
+})
diff --git a/src/components/Asset/AssetContent/EditHistory.tsx b/src/components/Asset/AssetContent/EditHistory.tsx
deleted file mode 100644
index e6c7bcdcb0..0000000000
--- a/src/components/Asset/AssetContent/EditHistory.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import React, { ReactElement, useEffect, useState } from 'react'
-import { useAsset } from '@context/Asset'
-import ExplorerLink from '@shared/ExplorerLink'
-import Time from '@shared/atoms/Time'
-import { gql, OperationContext, useQuery } from 'urql'
-import { NftUpdate_nftUpdates as NftUpdate } from '../../../@types/subgraph/NftUpdate'
-import { getQueryContext } from '@utils/subgraph'
-import styles from './EditHistory.module.css'
-
-const getReceipts = gql`
- query NftUpdate($address: String!) {
- nftUpdates(
- where: { nft: $address }
- orderBy: timestamp
- orderDirection: desc
- ) {
- id
- nft {
- address
- }
- tx
- timestamp
- type
- }
- }
-`
-
-export default function EditHistory({
- receipts,
- setReceipts
-}: {
- receipts: NftUpdate[]
- setReceipts: (receipts: NftUpdate[]) => void
-}): ReactElement {
- const { asset } = useAsset()
-
- function getUpdateType(type: string): string {
- switch (type) {
- case 'METADATA_CREATED':
- return 'published'
- case 'METADATA_UPDATED':
- return 'updated'
- case 'STATE_UPDATED':
- return 'state updated'
- case 'TOKENURI_UPDATED':
- return 'NFT metadata updated'
- default:
- return ''
- }
- }
- //
- // 1. Construct subgraph query based on DDO.
- // Need to wait for it to avoid infinite rerender loop with useQuery.
- //
- const [queryContext, setQueryContext] = useStateMetadata History
--
- {receipts?.map((receipt) => (
-
-
-
- {getUpdateType(receipt.type)}{' '} - - -
- ))}
-
- Owned by
@@ -92,7 +90,7 @@ export default function AssetContent({
isAssetNetwork={isAssetNetwork}
/>
diff --git a/src/components/Asset/AssetContent/MetaSecondary.tsx b/src/components/Asset/AssetContent/MetaSecondary.tsx
index e3b58e2d93..f2fe941d99 100644
--- a/src/components/Asset/AssetContent/MetaSecondary.tsx
+++ b/src/components/Asset/AssetContent/MetaSecondary.tsx
@@ -3,7 +3,7 @@ import MetaItem from './MetaItem'
import styles from './MetaSecondary.module.css'
import Tags from '@shared/atoms/Tags'
import Button from '@shared/atoms/Button'
-import { Asset } from '@oceanprotocol/lib'
+import { Asset } from '@oceanprotocol/ddo-js'
const SampleButton = ({ url }: { url: string }) => (
-
+ Debug info:{' '}
+ {JSON.stringify({
+ queryResult,
+ parsed,
+ chainIds
+ })}
+
+
+ )}
)
}
diff --git a/src/components/Footer/MarketStats/index.tsx b/src/components/Footer/MarketStats/index.tsx
index c0ddccf725..31e8c5af37 100644
--- a/src/components/Footer/MarketStats/index.tsx
+++ b/src/components/Footer/MarketStats/index.tsx
@@ -1,6 +1,6 @@
import React, { ReactElement, useCallback, useEffect, useState } from 'react'
import { OperationContext } from 'urql'
-import { fetchData, getSubgraphUri } from '@utils/subgraph'
+// import { fetchData, getSubgraphUri } from '@utils/subgraph'
import useNetworkMetadata, {
filterNetworksByType
} from '@hooks/useNetworkMetadata'
@@ -17,9 +17,9 @@ import content from '../../../../content/footer.json'
import Loader from '@components/@shared/atoms/Loader'
const initialTotal: StatsTotal = {
- nfts: 0,
- datatokens: 0,
- orders: 0
+ nfts: 32,
+ datatokens: 12,
+ orders: 14
}
function LoaderArea() {
@@ -57,36 +57,36 @@ export default function MarketStats(): ReactElement {
//
// Helper: fetch data from subgraph
//
- const getMarketStats = useCallback(async () => {
- if (!mainChainIds?.length) return
- const newData: {
- [chainId: number]: FooterStatsValuesGlobalStatistics
- } = {}
- for (const chainId of mainChainIds) {
- const context: OperationContext = {
- url: `${getSubgraphUri(
- chainId
- )}/subgraphs/name/oceanprotocol/ocean-subgraph`,
- requestPolicy: 'network-only'
- }
+ // const getMarketStats = useCallback(async () => {
+ // if (!mainChainIds?.length) return
+ // const newData: {
+ // [chainId: number]: FooterStatsValuesGlobalStatistics
+ // } = {}
+ // for (const chainId of mainChainIds) {
+ // const context: OperationContext = {
+ // url: `${getSubgraphUri(
+ // chainId
+ // )}/subgraphs/name/oceanprotocol/ocean-subgraph`,
+ // requestPolicy: 'network-only'
+ // }
- try {
- const response = await fetchData(queryGlobalStatistics, null, context)
- if (!response?.data?.globalStatistics) return
- newData[chainId] = response.data.globalStatistics[0]
- } catch (error) {
- LoggerInstance.error('Error fetching global stats: ', error.message)
- }
- }
- setData(newData)
- }, [mainChainIds])
+ // try {
+ // const response = await fetchData(queryGlobalStatistics, null, context)
+ // if (!response?.data?.globalStatistics) return
+ // newData[chainId] = response.data.globalStatistics[0]
+ // } catch (error) {
+ // LoggerInstance.error('Error fetching global stats: ', error.message)
+ // }
+ // }
+ // setData(newData)
+ // }, [mainChainIds])
//
// 1. Fetch Data
//
- useEffect(() => {
- getMarketStats()
- }, [getMarketStats])
+ // useEffect(() => {
+ // getMarketStats()
+ // }, [getMarketStats])
//
// 2. Data Manipulation
@@ -121,7 +121,7 @@ export default function MarketStats(): ReactElement {
) : (
- ) {
+ async function startSearch(e: React.SyntheticEvent) {
e.preventDefault()
if (value === '') setValue(' ')
diff --git a/src/components/Header/Wallet/Details.tsx b/src/components/Header/Wallet/Details.tsx
index cb14579bf5..d241176de0 100644
--- a/src/components/Header/Wallet/Details.tsx
+++ b/src/components/Header/Wallet/Details.tsx
@@ -57,11 +57,11 @@ export default function Details(): ReactElement {
significantFigures: 4
})}
- [] = [
},
{
name: 'Price',
- selector: (row) => {
const baseQueryParams = {
chainIds,
+ query: {
+ bool: {
+ filter: [
+ { terms: { chainId: chainIds } },
+ { exists: { field: 'indexedMetadata.stats.orders' } },
+ { exists: { field: 'metadata.tags' } }
+ ]
+ }
+ },
aggs: {
topTags: {
terms: {
field: 'metadata.tags.keyword',
- size: 20,
+ size,
order: { totalSales: 'desc' }
},
aggs: {
@@ -28,18 +38,23 @@ export async function getTopTags(
esPaginationOptions: { from: 0, size: 0 }
} as BaseQueryParams
- const query = generateBaseQuery(baseQueryParams)
try {
- const result = await queryMetadata(query, cancelToken)
- const tagsList = result?.aggregations?.topTags?.buckets.map(
- (x: { key: string }) => x.key
- )
+ const query = generateBaseQuery(baseQueryParams)
+ const result = await queryMetadataTags(query, cancelToken)
+
+ const tagsList = result?.tags || []
+
+ if (tagsList.length === 0) {
+ LoggerInstance.warn('No tags found in aggregation results')
+ }
+
return tagsList
} catch (error) {
if (axios.isCancel(error)) {
- LoggerInstance.log(error.message)
+ LoggerInstance.log('Query canceled:', error.message)
} else {
- LoggerInstance.error(error.message)
+ LoggerInstance.error('Error fetching top tags:', error.message)
}
+ return []
}
}
diff --git a/src/components/Home/index.tsx b/src/components/Home/index.tsx
index c233312253..e49e6da0b0 100644
--- a/src/components/Home/index.tsx
+++ b/src/components/Home/index.tsx
@@ -17,6 +17,8 @@ export default function HomePage(): ReactElement {
const [queryMostAllocation, setQueryMostAllocation] = useState()
const filterDatasets: unknown[] = []
+ const now = Date.now()
+ const thirtyDaysAgo = now - 30 * 24 * 60 * 60 * 1000
useEffect(() => {
const baseParams = {
@@ -24,9 +26,19 @@ export default function HomePage(): ReactElement {
esPaginationOptions: {
size: 6
},
- filters: filterDatasets,
+ filters: [
+ {
+ range: {
+ 'indexedMetadata.event.block': {
+ gte: 0
+ }
+ }
+ }
+ ],
sortOptions: {
- sortBy: SortTermOptions.Created
+ sortBy: SortTermOptions.Created,
+ sortOrder: 'desc',
+ missing: '_last'
} as SortOptions
} as BaseQueryParams
setQueryLatest(generateBaseQuery(baseParams))
@@ -36,9 +48,20 @@ export default function HomePage(): ReactElement {
esPaginationOptions: {
size: 6
},
+ filters: [
+ {
+ range: {
+ 'indexedMetadata.stats.orders': {
+ gt: 0
+ }
+ }
+ }
+ ],
sortOptions: {
- sortBy: SortTermOptions.Orders
- } as SortOptions
+ sortBy: SortTermOptions.Orders,
+ sortOrder: 'asc',
+ missing: '_last'
+ }
} as BaseQueryParams
setQueryMostSales(generateBaseQuery(baseParamsSales))
}, [chainIds])
@@ -59,7 +82,10 @@ export default function HomePage(): ReactElement {
title="Recently Published"
query={queryLatest}
action={
-
)
}
diff --git a/src/components/Profile/History/Downloads.tsx b/src/components/Profile/History/Downloads.tsx
index 805f4c366c..eed77aac8a 100644
--- a/src/components/Profile/History/Downloads.tsx
+++ b/src/components/Profile/History/Downloads.tsx
@@ -1,4 +1,4 @@
-import React, { ReactElement } from 'react'
+import React, { ReactElement, useEffect } from 'react'
import Table, { TableOceanColumn } from '@shared/atoms/Table'
import Time from '@shared/atoms/Time'
import AssetTitle from '@shared/AssetListTitle'
@@ -30,14 +30,19 @@ export default function ComputeDownloads({
}: {
accountId: string
}): ReactElement {
- const { downloads, isDownloadsLoading } = useProfile()
+ const { downloads, downloadsTotal, isDownloadsLoading, handlePageChange } =
+ useProfile()
const { chainIds } = useUserPreferences()
return accountId ? (
1 ? (
diff --git a/src/components/Publish/Pricing/index.tsx b/src/components/Publish/Pricing/index.tsx
index 4043b6ee2f..0b5fa1d68c 100644
--- a/src/components/Publish/Pricing/index.tsx
+++ b/src/components/Publish/Pricing/index.tsx
@@ -21,7 +21,7 @@ export default function PricingFields(): ReactElement {
const defaultBaseToken =
approvedBaseTokens?.find((token) =>
- token.name.toLowerCase().includes('ocean')
+ token.name.toLowerCase().includes('weth')
) || approvedBaseTokens?.[0]
const isBaseTokenSet = !!approvedBaseTokens?.find(
diff --git a/src/components/Publish/Steps.tsx b/src/components/Publish/Steps.tsx
index 5c6b845e88..d5c8aaaa0a 100644
--- a/src/components/Publish/Steps.tsx
+++ b/src/components/Publish/Steps.tsx
@@ -32,7 +32,9 @@ export function Steps({
const defaultBaseToken =
approvedBaseTokens?.find((token) =>
- token.name.toLowerCase().includes('ocean')
+ token.name
+ .toLowerCase()
+ .includes(process.env.NEXT_PUBLIC_OCEAN_TOKEN_SYMBOL.toLowerCase())
) || approvedBaseTokens?.[0]
const isBaseTokenSet = !!approvedBaseTokens?.find(
(token) => token?.address === values?.pricing?.baseToken?.address
@@ -66,7 +68,7 @@ export function Steps({
const config = getOceanConfig(values.user.chainId)
if (config) {
setFieldValue('services[0].providerUrl', {
- url: config.providerUri,
+ url: config.oceanNodeUri,
valid: true,
custom: false
})
diff --git a/src/components/Publish/_constants.tsx b/src/components/Publish/_constants.tsx
index 4cc72b30ab..b46a73c4eb 100644
--- a/src/components/Publish/_constants.tsx
+++ b/src/components/Publish/_constants.tsx
@@ -1,5 +1,5 @@
import React from 'react'
-import { allowFixedPricing } from '../../../app.config'
+import { allowFixedPricing } from '../../../app.config.cjs'
import {
FormPublishData,
MetadataAlgorithmContainer,
@@ -75,7 +75,7 @@ export const initialValues: FormPublishData = {
}
],
pricing: {
- baseToken: { address: '', name: '', symbol: 'OCEAN', decimals: 18 },
+ baseToken: { address: '', name: '', symbol: 'WETH', decimals: 18 },
price: 0,
type: allowFixedPricing === 'true' ? 'fixed' : 'free',
freeAgreement: false
diff --git a/src/components/Publish/_types.ts b/src/components/Publish/_types.ts
index 2c359646a5..e22512ef0c 100644
--- a/src/components/Publish/_types.ts
+++ b/src/components/Publish/_types.ts
@@ -1,4 +1,5 @@
-import { FileInfo, ServiceComputeOptions } from '@oceanprotocol/lib'
+import { FileInfo } from '@oceanprotocol/lib'
+import { ServiceComputeOptions } from '@oceanprotocol/ddo-js'
import { NftMetadata } from '@utils/nft'
import { ReactElement } from 'react'
export interface FormPublishService {
diff --git a/src/components/Publish/_utils.ts b/src/components/Publish/_utils.ts
index 2a02a9054f..219923ffa1 100644
--- a/src/components/Publish/_utils.ts
+++ b/src/components/Publish/_utils.ts
@@ -1,6 +1,5 @@
import {
Config,
- DDO,
FreCreationParams,
generateDid,
DatatokenCreateParams,
@@ -10,11 +9,14 @@ import {
NftCreateData,
NftFactory,
ZERO_ADDRESS,
- getEventFromTx,
+ getEventFromTx
+} from '@oceanprotocol/lib'
+import {
ConsumerParameter,
Metadata,
- Service
-} from '@oceanprotocol/lib'
+ Service,
+ DDO
+} from '@oceanprotocol/ddo-js'
import { mapTimeoutStringToSeconds, normalizeFile } from '@utils/ddo'
import { generateNftCreateData } from '@utils/nft'
import { getEncryptedFiles } from '@utils/provider'
@@ -31,7 +33,7 @@ import {
publisherMarketFixedSwapFee,
defaultDatatokenTemplateIndex,
customProviderUrl
-} from '../../../app.config'
+} from '../../../app.config.cjs'
import { sanitizeUrl } from '@utils/url'
import { getContainerChecksum } from '@utils/docker'
import { parseEther } from 'ethers/lib/utils'
@@ -290,7 +292,6 @@ export async function createTokensAndPricing(
ercParams,
freParams
)
-
const trxReceipt = await result.wait()
const nftCreatedEvent = getEventFromTx(trxReceipt, 'NFTCreated')
const tokenCreatedEvent = getEventFromTx(trxReceipt, 'TokenCreated')
diff --git a/src/components/Publish/_validation.ts b/src/components/Publish/_validation.ts
index 934de8bc94..5b30d64382 100644
--- a/src/components/Publish/_validation.ts
+++ b/src/components/Publish/_validation.ts
@@ -8,7 +8,9 @@ import { validationConsumerParameters } from '@components/@shared/FormInput/Inpu
// TODO: conditional validation
// e.g. when algo is selected, Docker image is required
// hint, hint: https://github.com/jquense/yup#mixedwhenkeys-string--arraystring-builder-object--value-schema-schema-schema
-
+const minAssetPrice = parseFloat(
+ process.env.NEXT_PUBLIC_MIN_ASSET_PRICE || '0.0001'
+)
const validationMetadata = {
type: Yup.string()
.matches(/dataset|algorithm/g, { excludeEmptyString: true })
@@ -112,7 +114,10 @@ const validationPricing = {
// https://github.com/jquense/yup#mixedwhenkeys-string--arraystring-builder-object--value-schema-schema-schema
price: Yup.number()
- .min(1, (param: { min: number }) => `Must be more or equal to ${param.min}`)
+ .min(
+ minAssetPrice,
+ (param: { min: number }) => `Must be more or equal to ${param.min}`
+ )
.max(
1000000,
(param: { max: number }) => `Must be less than or equal to ${param.max}`
diff --git a/src/components/Publish/index.tsx b/src/components/Publish/index.tsx
index 674b552745..b053c7632b 100644
--- a/src/components/Publish/index.tsx
+++ b/src/components/Publish/index.tsx
@@ -16,14 +16,14 @@ import useNftFactory from '@hooks/useNftFactory'
import {
ProviderInstance,
LoggerInstance,
- DDO,
getErrorMessage
} from '@oceanprotocol/lib'
+import { DDO } from '@oceanprotocol/ddo-js'
import { getOceanConfig } from '@utils/ocean'
import { validationSchema } from './_validation'
import { useAbortController } from '@hooks/useAbortController'
import { setNFTMetadataAndTokenURI } from '@utils/nft'
-import { customProviderUrl } from '../../../app.config'
+import { customProviderUrl } from '../../../app.config.cjs'
import { useAccount, useNetwork, useSigner } from 'wagmi'
export default function PublishPage({
@@ -69,6 +69,7 @@ export default function PublishPage({
try {
const config = getOceanConfig(chain?.id)
+
LoggerInstance.log('[publish] using config: ', config)
const { erc721Address, datatokenAddress, txHash } =
diff --git a/src/components/Search/utils.ts b/src/components/Search/utils.ts
index cdc23b1b3c..834f1c3e9e 100644
--- a/src/components/Search/utils.ts
+++ b/src/components/Search/utils.ts
@@ -1,4 +1,5 @@
import { LoggerInstance } from '@oceanprotocol/lib'
+import { State } from '@oceanprotocol/ddo-js'
import {
escapeEsReservedCharacters,
generateBaseQuery,
@@ -42,6 +43,11 @@ export function getSearchQuery(
text = escapeEsReservedCharacters(text)
const emptySearchTerm = text === undefined || text === ''
const filters: FilterTerm[] = []
+ filters.push({
+ term: {
+ 'indexedMetadata.nft.state': State.Active
+ }
+ })
let searchTerm = text || ''
let nestedQuery
if (tags) {
@@ -59,10 +65,10 @@ export function getSearchQuery(
: '**'
const searchFields = [
'id',
- 'nft.owner',
- 'datatokens.address',
- 'datatokens.name',
- 'datatokens.symbol',
+ 'indexedMetadata.nft.owner',
+ 'indexedMetadata.stats.datatokenAddress',
+ 'indexedMetadata.stats.name',
+ 'indexedMetadata.stats.symbol',
'metadata.name^10',
'metadata.author',
'metadata.description',
@@ -121,8 +127,8 @@ export function getSearchQuery(
chainIds,
nestedQuery,
esPaginationOptions: {
- from: (Number(page) - 1 || 0) * (Number(offset) || 21),
- size: Number(offset) || 21
+ from: page || 0,
+ size: Number(offset) || 1000
},
sortOptions: { sortBy: sort, sortDirection },
filters