merged multinetwork into poc-urql

README.md

@@ -127,6 +127,7 @@ const queryLatest = {
   offset: 9,
   query: {
     // https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html
+
     query_string: { query: `-isInPurgatory:true` }
   },
   sort: { created: -1 }
@@ -141,11 +142,7 @@ function Component() {
     const source = axios.CancelToken.source()
 
     async function init() {
-      const result = await queryMetadata(
+      const result = await queryMetadata(query, source.token)
-        query,
-        appConfig.metadataCacheUri,
-        source.token
-      )
       setResult(result)
     }
     init()

package-lock.json

@@ -13,7 +13,7 @@
         "@coingecko/cryptoformat": "^0.4.2",
         "@loadable/component": "^5.15.0",
         "@oceanprotocol/art": "^3.0.0",
-        "@oceanprotocol/lib": "^0.16.1",
+        "@oceanprotocol/lib": "^0.16.2",
         "@oceanprotocol/typographies": "^0.1.0",
         "@portis/web3": "^4.0.4",
         "@sindresorhus/slugify": "^2.1.0",
@@ -5439,9 +5439,9 @@
       }
     },
     "node_modules/@oceanprotocol/lib": {
-      "version": "0.16.1",
+      "version": "0.16.2",
-      "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-0.16.1.tgz",
+      "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-0.16.2.tgz",
-      "integrity": "sha512-zSVs1VaC8T+BBo9MeL88odU6wFNRHAptaLPHT6qGf2Nvc8MyhHdP15TdnHpeLJF4Ez0k6WKemnOQ1DNuaW8FlA==",
+      "integrity": "sha512-hESsrSjTf/6O4oLrJgBzzTn7EkANtpa+Sl+fp/VXBZ3YvJRbp4instlKJMCqWHi+CA4dYr/uLRmaXeY/PGyx5w==",
       "dependencies": {
         "@ethereum-navigator/navigator": "^0.5.3",
         "@oceanprotocol/contracts": "^0.6.4",
@@ -46361,11 +46361,6 @@
         "safer-buffer": "^2.0.2",
         "tweetnacl": "~0.14.0"
       },
-      "bin": {
-        "sshpk-conv": "bin/sshpk-conv",
-        "sshpk-sign": "bin/sshpk-sign",
-        "sshpk-verify": "bin/sshpk-verify"
-      },
       "engines": {
         "node": ">=0.10.0"
       }
@@ -57659,9 +57654,9 @@
       }
     },
     "@oceanprotocol/lib": {
-      "version": "0.16.1",
+      "version": "0.16.2",
-      "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-0.16.1.tgz",
+      "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-0.16.2.tgz",
-      "integrity": "sha512-zSVs1VaC8T+BBo9MeL88odU6wFNRHAptaLPHT6qGf2Nvc8MyhHdP15TdnHpeLJF4Ez0k6WKemnOQ1DNuaW8FlA==",
+      "integrity": "sha512-hESsrSjTf/6O4oLrJgBzzTn7EkANtpa+Sl+fp/VXBZ3YvJRbp4instlKJMCqWHi+CA4dYr/uLRmaXeY/PGyx5w==",
       "requires": {
         "@ethereum-navigator/navigator": "^0.5.3",
         "@oceanprotocol/contracts": "^0.6.4",

package.json

@@ -26,7 +26,7 @@
     "@coingecko/cryptoformat": "^0.4.2",
     "@loadable/component": "^5.15.0",
     "@oceanprotocol/art": "^3.0.0",
-    "@oceanprotocol/lib": "^0.16.1",
+    "@oceanprotocol/lib": "^0.16.2",
     "@oceanprotocol/typographies": "^0.1.0",
     "@portis/web3": "^4.0.4",
     "@sindresorhus/slugify": "^2.1.0",

src/components/atoms/AssetType.tsx

@@ -5,21 +5,20 @@ import { ReactComponent as Compute } from '../../images/compute.svg'
 import { ReactComponent as Download } from '../../images/download.svg'
 import { ReactComponent as Lock } from '../../images/lock.svg'
 import NetworkName from './NetworkName'
-import { useOcean } from '../../providers/Ocean'
 
 const cx = classNames.bind(styles)
 
 export default function AssetType({
   type,
   accessType,
-  className
+  className,
+  chainId
 }: {
   type: string
   accessType: string
+  chainId: number
   className?: string
 }): ReactElement {
-  const { config } = useOcean()
-
   const styleClasses = cx({
     [className]: className
   })
@@ -37,12 +36,8 @@ export default function AssetType({
         {type === 'dataset' ? 'data set' : 'algorithm'}
       </div>
       {/* TODO: networkId needs to come from the multinetwork DDO for each asset */}
-      {(config?.networkId || 1) && (
+      {chainId && (
-        <NetworkName
+        <NetworkName networkId={chainId} className={styles.network} minimal />
-          networkId={config?.networkId || 1}
-          className={styles.network}
-          minimal
-        />
       )}
     </div>
   )

src/components/atoms/ButtonBuy.tsx

@@ -12,6 +12,8 @@ interface ButtonBuyProps {
   dtBalance: string
   assetType: string
   assetTimeout: string
+  isConsumable: boolean
+  consumableFeedback: string
   hasPreviousOrderSelectedComputeAsset?: boolean
   hasDatatokenSelectedComputeAsset?: boolean
   dtSymbolSelectedComputeAsset?: string
@@ -23,6 +25,7 @@ interface ButtonBuyProps {
   type?: 'submit'
   priceType?: string
   algorithmPriceType?: string
+  algorithmConsumableStatus?: number
 }
 
 function getConsumeHelpText(
@@ -30,13 +33,18 @@ function getConsumeHelpText(
   dtSymbol: string,
   hasDatatoken: boolean,
   hasPreviousOrder: boolean,
-  assetType: string
+  assetType: string,
+  isConsumable: boolean,
+  consumableFeedback: string
 ) {
-  const text = hasPreviousOrder
+  const text =
-    ? `You bought this ${assetType} already allowing you to use it without paying again.`
+    isConsumable === false
-    : hasDatatoken
+      ? consumableFeedback
-    ? `You own ${dtBalance} ${dtSymbol} allowing you to use this data set by spending 1 ${dtSymbol}, but without paying OCEAN again.`
+      : hasPreviousOrder
-    : `For using this ${assetType}, you will buy 1 ${dtSymbol} and immediately spend it back to the publisher and pool.`
+      ? `You bought this ${assetType} already allowing you to use it without paying again.`
+      : hasDatatoken
+      ? `You own ${dtBalance} ${dtSymbol} allowing you to use this data set by spending 1 ${dtSymbol}, but without paying OCEAN again.`
+      : `For using this ${assetType}, you will buy 1 ${dtSymbol} and immediately spend it back to the publisher and pool.`
 
   return text
 }
@@ -47,22 +55,34 @@ function getComputeAssetHelpText(
   dtSymbol: string,
   dtBalance: string,
   assetType: string,
+  isConsumable: boolean,
+  consumableFeedback: string,
   hasPreviousOrderSelectedComputeAsset?: boolean,
   hasDatatokenSelectedComputeAsset?: boolean,
   dtSymbolSelectedComputeAsset?: string,
   dtBalanceSelectedComputeAsset?: string,
-  selectedComputeAssetType?: string
+  selectedComputeAssetType?: string,
+  algorithmConsumableStatus?: number
 ) {
   const computeAssetHelpText = getConsumeHelpText(
     dtBalance,
     dtSymbol,
     hasDatatoken,
     hasPreviousOrder,
-    assetType
+    assetType,
+    isConsumable,
+    consumableFeedback
   )
   const text =
-    !dtSymbolSelectedComputeAsset && !dtBalanceSelectedComputeAsset
+    (!dtSymbolSelectedComputeAsset && !dtBalanceSelectedComputeAsset) ||
+    isConsumable === false
       ? ''
+      : algorithmConsumableStatus === 1
+      ? 'The selected algorithm has been temporarily disabled by the publisher, please try again later.'
+      : algorithmConsumableStatus === 2
+      ? 'Access denied, your wallet address is not found on the selected algorithm allow list.'
+      : algorithmConsumableStatus === 3
+      ? 'Access denied, your wallet address is found on the selected algorithm deny list.'
       : hasPreviousOrderSelectedComputeAsset
       ? `You already bought the selected ${selectedComputeAssetType}, allowing you to use it without paying again.`
       : hasDatatokenSelectedComputeAsset
@@ -81,6 +101,8 @@ export default function ButtonBuy({
   dtBalance,
   assetType,
   assetTimeout,
+  isConsumable,
+  consumableFeedback,
   hasPreviousOrderSelectedComputeAsset,
   hasDatatokenSelectedComputeAsset,
   dtSymbolSelectedComputeAsset,
@@ -91,7 +113,8 @@ export default function ButtonBuy({
   isLoading,
   type,
   priceType,
-  algorithmPriceType
+  algorithmPriceType,
+  algorithmConsumableStatus
 }: ButtonBuyProps): ReactElement {
   const buttonText =
     action === 'download'
@@ -127,7 +150,9 @@ export default function ButtonBuy({
                   dtSymbol,
                   hasDatatoken,
                   hasPreviousOrder,
-                  assetType
+                  assetType,
+                  isConsumable,
+                  consumableFeedback
                 )
               : getComputeAssetHelpText(
                   hasPreviousOrder,
@@ -135,11 +160,14 @@ export default function ButtonBuy({
                   dtSymbol,
                   dtBalance,
                   assetType,
+                  isConsumable,
+                  consumableFeedback,
                   hasPreviousOrderSelectedComputeAsset,
                   hasDatatokenSelectedComputeAsset,
                   dtSymbolSelectedComputeAsset,
                   dtBalanceSelectedComputeAsset,
-                  selectedComputeAssetType
+                  selectedComputeAssetType,
+                  algorithmConsumableStatus
                 )}
           </div>
         </>

src/components/atoms/Input/index.tsx

@@ -27,6 +27,13 @@ export interface InputProps {
       | ChangeEvent<HTMLSelectElement>
       | ChangeEvent<HTMLTextAreaElement>
   ): void
+  onKeyPress?(
+    e:
+      | React.KeyboardEvent<HTMLInputElement>
+      | React.KeyboardEvent<HTMLInputElement>
+      | React.KeyboardEvent<HTMLSelectElement>
+      | React.KeyboardEvent<HTMLTextAreaElement>
+  ): void
   rows?: number
   multiple?: boolean
   pattern?: string
@@ -42,6 +49,7 @@ export interface InputProps {
   defaultChecked?: boolean
   size?: 'mini' | 'small' | 'large' | 'default'
   className?: string
+  divClassName?: string
 }
 
 export default function Input(props: Partial<InputProps>): ReactElement {
@@ -50,10 +58,13 @@ export default function Input(props: Partial<InputProps>): ReactElement {
   const hasError =
     props.form?.touched[field.name] && props.form?.errors[field.name]
 
-  const styleClasses = cx({
+  const styleClasses = cx(
-    field: true,
+    {
-    hasError: hasError
+      field: true,
-  })
+      hasError: hasError
+    },
+    props.divClassName
+  )
 
   return (
     <div

src/components/molecules/AssetListTitle.tsx

@@ -30,11 +30,7 @@ export default function AssetListTitle({
     const source = axios.CancelToken.source()
 
     async function getAssetName() {
-      const title = await getAssetsNames(
+      const title = await getAssetsNames([did], source.token)
-        [did],
-        appConfig.metadataCacheUri,
-        source.token
-      )
       setAssetTitle(title[did])
     }
 

src/components/molecules/AssetTeaser.tsx

@@ -11,7 +11,7 @@ import { useOcean } from '../../providers/Ocean'
 import styles from './AssetTeaser.module.css'
 
 declare type AssetTeaserProps = {
-  ddo: DDO
+  ddo: any
   price: BestPrice
 }
 
@@ -42,6 +42,7 @@ const AssetTeaser: React.FC<AssetTeaserProps> = ({
           type={type}
           accessType={accessType}
           className={styles.typeDetails}
+          chainId={ddo.chainId}
         />
 
         <div className={styles.content}>

src/components/molecules/Bookmarks.tsx

@@ -6,13 +6,16 @@ import { useOcean } from '../../providers/Ocean'
 import Price from '../atoms/Price'
 import Tooltip from '../atoms/Tooltip'
 import AssetTitle from './AssetListTitle'
-import { queryMetadata } from '../../utils/aquarius'
+import {
+  queryMetadata,
+  transformChainIdsListToQuery
+} from '../../utils/aquarius'
 import axios, { CancelToken } from 'axios'
 import { useSiteMetadata } from '../../hooks/useSiteMetadata'
 
 async function getAssetsBookmarked(
   bookmarks: string[],
-  metadataCacheUri: string,
+  chainIds: number[],
   cancelToken: CancelToken
 ) {
   const searchDids = JSON.stringify(bookmarks)
@@ -27,7 +30,9 @@ async function getAssetsBookmarked(
     offset: 100,
     query: {
       query_string: {
-        query: searchDids,
+        query: `(${searchDids}) AND (${transformChainIdsListToQuery(
+          chainIds
+        )})`,
         fields: ['dataToken'],
         default_operator: 'OR'
       }
@@ -36,11 +41,7 @@ async function getAssetsBookmarked(
   }
 
   try {
-    const result = await queryMetadata(
+    const result = await queryMetadata(queryBookmarks, cancelToken)
-      queryBookmarks,
-      metadataCacheUri,
-      cancelToken
-    )
 
     return result
   } catch (error) {
@@ -84,6 +85,7 @@ export default function Bookmarks(): ReactElement {
 
   const [pinned, setPinned] = useState<DDO[]>()
   const [isLoading, setIsLoading] = useState<boolean>()
+  const { chainIds } = useUserPreferences()
 
   useEffect(() => {
     if (!appConfig.metadataCacheUri || bookmarks === []) return
@@ -101,7 +103,7 @@ export default function Bookmarks(): ReactElement {
       try {
         const resultPinned = await getAssetsBookmarked(
           bookmarks,
-          appConfig.metadataCacheUri,
+          chainIds,
           source.token
         )
         setPinned(resultPinned?.results)
@@ -116,7 +118,7 @@ export default function Bookmarks(): ReactElement {
     return () => {
       source.cancel()
     }
-  }, [bookmarks, appConfig.metadataCacheUri])
+  }, [bookmarks, chainIds])
 
   return (
     <Table

src/components/molecules/FormFields/Credential/index.tsx

@@ -30,11 +30,11 @@ export default function Credentials(props: InputProps) {
       toast.error('Wallet address is invalid')
       return
     }
-    if (arrayInput.includes(value)) {
+    if (arrayInput.includes(value.toLowerCase())) {
       toast.error('Wallet address already added into list')
       return
     }
-    setArrayInput((arrayInput) => [...arrayInput, value])
+    setArrayInput((arrayInput) => [...arrayInput, value.toLowerCase()])
     setValue('')
   }
 

src/components/molecules/Menu.module.css

@@ -9,36 +9,76 @@
 .logo {
   white-space: nowrap;
   display: flex;
+  flex: 0 0 auto;
+  flex-direction: row;
+  justify-content: center;
   align-items: center;
-  order: 1;
 }
 
 .navigation {
-  order: 3;
+  width: auto;
-  width: 100%;
+  margin: 0;
-  margin-top: calc(var(--spacer) / 2);
+  text-align: left;
-  text-align: center;
+  border: none;
-  border-top: 1px solid var(--border-color);
+}
-  border-bottom: 1px solid var(--border-color);
+
-  margin-left: -1rem;
+.search {
-  margin-right: -1rem;
+  display: flex;
-  width: calc(100% + 2rem);
+  flex: 1 0 auto;
+  justify-content: center;
+  align-items: center;
+  align-self: flex-start;
+  padding-left: 20px;
+  margin-left: auto;
 }
 
 .actions {
   display: flex;
+  flex: 0 0 auto;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
   align-self: flex-start;
-  margin-left: auto;
-  order: 2;
 }
 
 .title {
   display: none;
 }
 
+@media (max-width: 38rem) {
+  .actions {
+    margin-left: auto;
+  }
+  .navigation {
+    order: 3;
+    display: block;
+    justify-content: center;
+    align-items: center;
+    margin-top: calc(var(--spacer) / 2);
+    text-align: center;
+    border-top: 1px solid var(--border-color);
+    border-bottom: 1px solid var(--border-color);
+    margin-left: -1rem;
+    margin-right: -1rem;
+    width: calc(50% + 2rem);
+  }
+}
+
+@media (max-width: 75rem) {
+  .navigation {
+    flex: 1 0 auto;
+    justify-content: left;
+    align-items: left;
+  }
+  .search {
+    flex: 0 0 100%;
+    padding-top: 10px;
+    order: 4;
+  }
+}
+
 @media screen and (min-width: 42rem) {
   .navigation {
-    order: 2;
     width: auto;
     margin: 0;
     text-align: left;

src/components/molecules/Menu.tsx

@@ -8,6 +8,7 @@ import UserPreferences from './UserPreferences'
 import Badge from '../atoms/Badge'
 import Logo from '../atoms/Logo'
 import Networks from './UserPreferences/Networks'
+import SearchBar from './SearchBar'
 
 const Wallet = loadable(() => import('./Wallet'))
 
@@ -51,6 +52,9 @@ export default function Menu(): ReactElement {
         ))}
       </ul>
 
+      <div className={styles.search}>
+        <SearchBar />
+      </div>
       <div className={styles.actions}>
         <Networks />
         <Wallet />

src/components/molecules/PoolTransactions.tsx

@@ -12,6 +12,7 @@ import { gql, useQuery } from 'urql'
 
 import web3 from 'web3'
 import { useWeb3 } from '../../providers/Web3'
+import { getOceanConfig } from '../../utils/ocean'
 
 const txHistoryQueryByPool = gql`
   query TransactionHistoryByPool($user: String, $pool: String) {

src/components/molecules/SearchBar.module.css

@@ -1,17 +1,49 @@
-.form {
+.search {
-  margin-bottom: var(--spacer);
+  display: flex;
-  width: 100%;
+  flex: 1 0 auto;
-  max-width: 30rem;
+  align-self: stretch;
+}
+.button {
+  padding: calc(var(--spacer) / 6) calc(var(--spacer) / 3);
+  cursor: pointer;
+  border: 1px solid var(--border-color);
+  border-radius: var(--border-radius);
+  background-color: var(--background-content);
+  border-left: none;
+  white-space: nowrap;
+  min-width: 4rem;
 }
 
-.form > div > div {
+.button:hover,
+.button:focus {
+  color: var(--brand-white);
+  text-decoration: none;
+  transform: translate3d(0, -0.05rem, 0);
+  box-shadow: 0 12px 30px 0 rgba(0, 0, 0, 0.1);
+}
+
+.input {
+  height: 36px !important;
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
+.searchInput {
+  flex-grow: 2;
+  margin-bottom: 0px;
+}
+
+.searchIcon {
+  fill: var(--brand-grey-light);
+  transition: 0.2s ease-out;
+}
+.search > div > div {
   margin: 0;
 }
 
-.form label {
+.search label {
   display: none;
 }
 
-.form input {
+.search input {
   background-color: var(--background-content);
 }

src/components/molecules/SearchBar.stories.tsx

@@ -10,5 +10,3 @@ export default {
 export const Normal = () => <SearchBar />
 
 export const WithInitialValue = () => <SearchBar initialValue="Water" />
-
-export const WithFilters = () => <SearchBar filters />

src/components/molecules/SearchBar.tsx

@@ -1,24 +1,35 @@
-import React, { useState, ChangeEvent, FormEvent, ReactElement } from 'react'
+import React, {
+  useState,
+  useEffect,
+  ChangeEvent,
+  FormEvent,
+  ReactElement
+} from 'react'
 import { navigate } from 'gatsby'
+import queryString from 'query-string'
 import styles from './SearchBar.module.css'
 import Button from '../atoms/Button'
 import Input from '../atoms/Input'
 import InputGroup from '../atoms/Input/InputGroup'
 import { addExistingParamsToUrl } from '../templates/Search/utils'
+import { ReactComponent as SearchIcon } from '../../images/search.svg'
 
 export default function SearchBar({
   placeholder,
   initialValue,
-  filters,
   size
 }: {
   placeholder?: string
   initialValue?: string
-  filters?: boolean
   size?: 'small' | 'large'
 }): ReactElement {
   let [value, setValue] = useState(initialValue || '')
+  const parsed = queryString.parse(location.search)
+  const { text, owner } = parsed
 
+  useEffect(() => {
+    ;(text || owner) && setValue((text || owner) as string)
+  }, [text, owner])
   async function startSearch(e: FormEvent<HTMLButtonElement>) {
     e.preventDefault()
     if (value === '') value = ' '
@@ -50,27 +61,33 @@ export default function SearchBar({
   }
 
   return (
-    <form className={styles.form}>
+    <form className={styles.search}>
-      <InputGroup>
+      <Input
-        <Input
+        type="search"
-          type="search"
+        name="search"
-          name="search"
+        placeholder={placeholder || 'What are you looking for?'}
-          placeholder={placeholder || 'What are you looking for?'}
+        value={value}
-          value={value}
+        onChange={handleChange}
-          onChange={handleChange}
+        required
-          required
+        size="small"
-          size={size}
+        divClassName={styles.searchInput}
-        />
+        className={styles.input}
-        <Button
+        onKeyPress={async (e: React.KeyboardEvent<HTMLInputElement>) => {
-          onClick={async (e: FormEvent<HTMLButtonElement>) =>
+          if (e.key === 'Enter') {
             await startSearch(e)
           }
-        >
+        }}
-          Search
+      />
-        </Button>
+      <Button
-      </InputGroup>
+        onClick={async (e: FormEvent<HTMLButtonElement>) =>
-
+          await startSearch(e)
-      {filters && <fieldset className={styles.filters}>Type, Price</fieldset>}
+        }
+        style="text"
+        size="small"
+        className={styles.button}
+      >
+        <SearchIcon className={styles.searchIcon} />
+      </Button>
     </form>
   )
 }

src/components/molecules/Wallet/index.module.css

@@ -1,3 +1,4 @@
 .wallet {
   display: flex;
+  align-self: stretch;
 }

src/components/organisms/AssetActions/Compute/FormComputeDataset.tsx

@@ -9,6 +9,8 @@ import { AssetSelectionAsset } from '../../../molecules/FormFields/AssetSelectio
 import ButtonBuy from '../../../atoms/ButtonBuy'
 import PriceOutput from './PriceOutput'
 import { useAsset } from '../../../../providers/Asset'
+import { useOcean } from '../../../../providers/Ocean'
+import { useWeb3 } from '../../../../providers/Web3'
 
 const contentQuery = graphql`
   query StartComputeDatasetQuery {
@@ -58,7 +60,9 @@ export default function FormStartCompute({
   selectedComputeAssetType,
   selectedComputeAssetTimeout,
   stepText,
-  algorithmPrice
+  algorithmPrice,
+  isConsumable,
+  consumableFeedback
 }: {
   algorithms: AssetSelectionAsset[]
   ddoListAlgorithms: DDO[]
@@ -78,6 +82,8 @@ export default function FormStartCompute({
   selectedComputeAssetTimeout?: string
   stepText: string
   algorithmPrice: BestPrice
+  isConsumable: boolean
+  consumableFeedback: string
 }): ReactElement {
   const data = useStaticQuery(contentQuery)
   const content = data.content.edges[0].node.childPagesJson
@@ -86,6 +92,10 @@ export default function FormStartCompute({
     useFormikContext()
   const { price, ddo, isAssetNetwork } = useAsset()
   const [totalPrice, setTotalPrice] = useState(price?.value)
+  const { accountId } = useWeb3()
+  const { ocean } = useOcean()
+  const [algorithmConsumableStatus, setAlgorithmConsumableStatus] =
+    useState<number>()
 
   function getAlgorithmAsset(algorithmId: string): DDO {
     let assetDdo = null
@@ -97,8 +107,19 @@ export default function FormStartCompute({
 
   useEffect(() => {
     if (!values.algorithm) return
-    setSelectedAlgorithm(getAlgorithmAsset(values.algorithm))
+    const algorithmDDO = getAlgorithmAsset(values.algorithm)
-  }, [values.algorithm])
+    setSelectedAlgorithm(algorithmDDO)
+
+    if (!accountId || !isConsumable) return
+    async function checkIsConsumable() {
+      const consumable = await ocean.assets.isConsumable(
+        algorithmDDO,
+        accountId.toLowerCase()
+      )
+      if (consumable) setAlgorithmConsumableStatus(consumable.status)
+    }
+    checkIsConsumable()
+  }, [values.algorithm, accountId, isConsumable])
 
   //
   // Set price for calculation output
@@ -149,7 +170,12 @@ export default function FormStartCompute({
 
       <ButtonBuy
         action="compute"
-        disabled={isComputeButtonDisabled || !isValid || !isAssetNetwork}
+        disabled={
+          isComputeButtonDisabled ||
+          !isValid ||
+          !isAssetNetwork ||
+          algorithmConsumableStatus > 0
+        }
         hasPreviousOrder={hasPreviousOrder}
         hasDatatoken={hasDatatoken}
         dtSymbol={ddo.dataTokenInfo.symbol}
@@ -168,6 +194,9 @@ export default function FormStartCompute({
         type="submit"
         priceType={price?.type}
         algorithmPriceType={algorithmPrice?.type}
+        isConsumable={isConsumable}
+        consumableFeedback={consumableFeedback}
+        algorithmConsumableStatus={algorithmConsumableStatus}
       />
     </Form>
   )

src/components/organisms/AssetActions/Compute/index.tsx

@@ -38,6 +38,7 @@ import { secondsToString } from '../../../../utils/metadata'
 import { AssetSelectionAsset } from '../../../molecules/FormFields/AssetSelection'
 import AlgorithmDatasetsListForCompute from '../../AssetContent/AlgorithmDatasetsListForCompute'
 import { getPreviousOrders, getPrice } from '../../../../utils/subgraph'
+import { chainIds } from '../../../../../app.config'
 
 const SuccessAction = () => (
   <Button style="text" to="/history?defaultTab=ComputeJobs" size="small">
@@ -49,12 +50,16 @@ export default function Compute({
   isBalanceSufficient,
   dtBalance,
   file,
-  fileIsLoading
+  fileIsLoading,
+  isConsumable,
+  consumableFeedback
 }: {
   isBalanceSufficient: boolean
   dtBalance: string
   file: FileMetadata
   fileIsLoading?: boolean
+  isConsumable?: boolean
+  consumableFeedback?: string
 }): ReactElement {
   const { appConfig } = useSiteMetadata()
   const { accountId } = useWeb3()
@@ -81,7 +86,11 @@ export default function Compute({
   const [algorithmTimeout, setAlgorithmTimeout] = useState<string>()
 
   const isComputeButtonDisabled =
-    isJobStarting === true || file === null || !ocean || !isBalanceSufficient
+    isJobStarting === true ||
+    file === null ||
+    !ocean ||
+    !isBalanceSufficient ||
+    !isConsumable
   const hasDatatoken = Number(dtBalance) >= 1
 
   async function checkPreviousOrders(ddo: DDO) {
@@ -153,7 +162,6 @@ export default function Compute({
         getQuerryString(
           computeService.attributes.main.privacy.publisherTrustedAlgorithms
         ),
-        appConfig.metadataCacheUri,
         source.token
       )
       setDdoAlgorithmList(gueryResults.results)
@@ -161,7 +169,6 @@ export default function Compute({
       algorithmSelectionList = await transformDDOToAssetSelection(
         datasetComputeService?.serviceEndpoint,
         gueryResults.results,
-        appConfig.metadataCacheUri,
         []
       )
     }
@@ -419,6 +426,8 @@ export default function Compute({
             selectedComputeAssetTimeout={algorithmTimeout}
             stepText={pricingStepText || 'Starting Compute Job...'}
             algorithmPrice={algorithmPrice}
+            isConsumable={isConsumable}
+            consumableFeedback={consumableFeedback}
           />
         </Formik>
       )}

src/components/organisms/AssetActions/Consume.tsx

@@ -35,13 +35,17 @@ export default function Consume({
   file,
   isBalanceSufficient,
   dtBalance,
-  fileIsLoading
+  fileIsLoading,
+  isConsumable,
+  consumableFeedback
 }: {
   ddo: DDO
   file: FileMetadata
   isBalanceSufficient: boolean
   dtBalance: string
   fileIsLoading?: boolean
+  isConsumable?: boolean
+  consumableFeedback?: string
 }): ReactElement {
   const { accountId } = useWeb3()
   const { ocean } = useOcean()
@@ -54,7 +58,7 @@ export default function Consume({
   const { consumeStepText, consume, consumeError, isLoading } = useConsume()
   const [isDisabled, setIsDisabled] = useState(true)
   const [hasDatatoken, setHasDatatoken] = useState(false)
-  const [isConsumable, setIsConsumable] = useState(true)
+  const [isConsumablePrice, setIsConsumablePrice] = useState(true)
   const [assetTimeout, setAssetTimeout] = useState('')
   const [result] = useQuery<OrdersData>({
     query: previousOrderQuery,
@@ -94,7 +98,7 @@ export default function Consume({
   useEffect(() => {
     if (!price) return
 
-    setIsConsumable(
+    setIsConsumablePrice(
       price.isConsumable !== undefined ? price.isConsumable === 'true' : true
     )
   }, [price])
@@ -105,14 +109,15 @@ export default function Consume({
 
   useEffect(() => {
     setIsDisabled(
-      (!ocean ||
+      !isConsumable ||
-        !isBalanceSufficient ||
+        ((!ocean ||
-        !isAssetNetwork ||
+          !isBalanceSufficient ||
-        typeof consumeStepText !== 'undefined' ||
+          !isAssetNetwork ||
-        pricingIsLoading ||
+          typeof consumeStepText !== 'undefined' ||
-        !isConsumable) &&
+          pricingIsLoading ||
-        !hasPreviousOrder &&
+          !isConsumablePrice) &&
-        !hasDatatoken
+          !hasPreviousOrder &&
+          !hasDatatoken)
     )
   }, [
     ocean,
@@ -121,8 +126,9 @@ export default function Consume({
     isAssetNetwork,
     consumeStepText,
     pricingIsLoading,
-    isConsumable,
+    isConsumablePrice,
-    hasDatatoken
+    hasDatatoken,
+    isConsumable
   ])
 
   async function handleConsume() {
@@ -163,6 +169,8 @@ export default function Consume({
       stepText={consumeStepText || pricingStepText}
       isLoading={pricingIsLoading || isLoading}
       priceType={price?.type}
+      isConsumable={isConsumable}
+      consumableFeedback={consumableFeedback}
     />
   )
 

src/components/organisms/AssetActions/Edit/FormEditComputeDataset.tsx

@@ -17,6 +17,7 @@ import { ComputePrivacyForm } from '../../../../models/FormEditComputeDataset'
 import { publisherTrustedAlgorithm as PublisherTrustedAlgorithm } from '@oceanprotocol/lib'
 import axios from 'axios'
 import { useSiteMetadata } from '../../../../hooks/useSiteMetadata'
+import { chainIds } from '../../../../../app.config'
 
 export default function FormEditComputeDataset({
   data,
@@ -51,16 +52,11 @@ export default function FormEditComputeDataset({
       },
       sort: { created: -1 }
     }
-    const querryResult = await queryMetadata(
+    const querryResult = await queryMetadata(query, source.token)
-      query,
-      appConfig.metadataCacheUri,
-      source.token
-    )
     const datasetComputeService = ddo.findServiceByType('compute')
     const algorithmSelectionList = await transformDDOToAssetSelection(
       datasetComputeService?.serviceEndpoint,
       querryResult.results,
-      appConfig.metadataCacheUri,
       publisherTrustedAlgorithms
     )
     return algorithmSelectionList

src/components/organisms/AssetActions/index.tsx

@@ -26,6 +26,24 @@ export default function AssetActions(): ReactElement {
   const [fileIsLoading, setFileIsLoading] = useState<boolean>(false)
   const isCompute = Boolean(ddo?.findServiceByType('compute'))
 
+  const [isConsumable, setIsConsumable] = useState<boolean>(true)
+  const [consumableFeedback, setConsumableFeedback] = useState<string>('')
+
+  useEffect(() => {
+    if (!ddo || !accountId) return
+    async function checkIsConsumable() {
+      const consumable: any = await ocean.assets.isConsumable(
+        ddo,
+        accountId.toLowerCase()
+      )
+      if (consumable) {
+        setIsConsumable(consumable.result)
+        setConsumableFeedback(consumable.message)
+      }
+    }
+    checkIsConsumable()
+  }, [accountId, ddo])
+
   useEffect(() => {
     const { attributes } = ddo.findServiceByType('metadata')
     setFileMetadata(attributes.main.files[0])
@@ -88,6 +106,8 @@ export default function AssetActions(): ReactElement {
       isBalanceSufficient={isBalanceSufficient}
       file={fileMetadata}
       fileIsLoading={fileIsLoading}
+      isConsumable={isConsumable}
+      consumableFeedback={consumableFeedback}
     />
   ) : (
     <Consume
@@ -96,6 +116,8 @@ export default function AssetActions(): ReactElement {
       isBalanceSufficient={isBalanceSufficient}
       file={fileMetadata}
       fileIsLoading={fileIsLoading}
+      isConsumable={isConsumable}
+      consumableFeedback={consumableFeedback}
     />
   )
 

src/components/organisms/AssetContent/MetaMain.tsx

@@ -20,6 +20,7 @@ export default function MetaMain(): ReactElement {
         <AssetType
           type={type}
           accessType={accessType}
+          chainId={ddo.chainId}
           className={styles.assetType}
         />
         <ExplorerLink

src/components/pages/History/ComputeJobs/Details.tsx

@@ -50,11 +50,7 @@ function DetailsAssets({ job }: { job: ComputeJobMetaData }) {
     async function getAlgoMetadata() {
       const source = axios.CancelToken.source()
 
-      const ddo = await retrieveDDO(
+      const ddo = await retrieveDDO(job.algoDID, source.token)
-        job.algoDID,
-        appConfig.metadataCacheUri,
-        source.token
-      )
       setAlgoDtSymbol(ddo.dataTokenInfo.symbol)
 
       const { attributes } = ddo.findServiceByType('metadata')

src/components/pages/History/ComputeJobs/index.tsx

@@ -10,13 +10,17 @@ import Button from '../../../atoms/Button'
 import { useOcean } from '../../../../providers/Ocean'
 import { gql, useQuery } from 'urql'
 import { useWeb3 } from '../../../../providers/Web3'
-import { queryMetadata } from '../../../../utils/aquarius'
+import {
+  queryMetadata,
+  transformChainIdsListToQuery
+} from '../../../../utils/aquarius'
 import axios, { CancelToken } from 'axios'
 import Details from './Details'
 import { ComputeJob } from '@oceanprotocol/lib/dist/node/ocean/interfaces/Compute'
 import { ReactComponent as Refresh } from '../../../../images/refresh.svg'
 import styles from './index.module.css'
 import { useSiteMetadata } from '../../../../hooks/useSiteMetadata'
+import { useUserPreferences } from '../../../../providers/UserPreferences'
 
 const getComputeOrders = gql`
   query ComputeOrders($user: String!) {
@@ -83,31 +87,35 @@ const columns = [
 
 async function getAssetMetadata(
   queryDtList: string,
-  metadataCacheUri: string,
+  cancelToken: CancelToken,
-  cancelToken: CancelToken
+  chainIds: number[]
 ): Promise<DDO[]> {
   const queryDid = {
     page: 1,
     offset: 100,
     query: {
       query_string: {
-        query: `(${queryDtList}) AND service.attributes.main.type:dataset AND service.type:compute`,
+        query: `(${queryDtList}) (${transformChainIdsListToQuery(
+          chainIds
+        )}) AND (${transformChainIdsListToQuery(
+          chainIds
+        )}) AND service.attributes.main.type:dataset AND service.type:compute`,
         fields: ['dataToken']
       }
     }
   }
 
-  const result = await queryMetadata(queryDid, metadataCacheUri, cancelToken)
+  const result = await queryMetadata(queryDid, cancelToken)
 
   return result.results
 }
 
 export default function ComputeJobs(): ReactElement {
-  const { appConfig } = useSiteMetadata()
   const { ocean, account, config } = useOcean()
   const { accountId } = useWeb3()
   const [isLoading, setIsLoading] = useState(true)
   const [jobs, setJobs] = useState<ComputeJobMetaData[]>([])
+  const { chainIds } = useUserPreferences()
   const [result] = useQuery<ComputeOrders>({
     query: getComputeOrders,
     variables: {
@@ -117,8 +125,7 @@ export default function ComputeJobs(): ReactElement {
   const { data } = result
 
   async function getJobs() {
-    if (!ocean || !account) return
+    if (!accountId) return
-
     setIsLoading(true)
 
     // await refetch()
@@ -134,11 +141,7 @@ export default function ComputeJobs(): ReactElement {
 
     try {
       const source = axios.CancelToken.source()
-      const assets = await getAssetMetadata(
+      const assets = await getAssetMetadata(queryDtList, source.token, chainIds)
-        queryDtList,
-        appConfig.metadataCacheUri,
-        source.token
-      )
       const providers: Provider[] = []
       const serviceEndpoints: string[] = []
       for (let i = 0; i < data.tokenOrders.length; i++) {
@@ -240,12 +243,12 @@ export default function ComputeJobs(): ReactElement {
   }
 
   useEffect(() => {
-    if (data === undefined || !appConfig.metadataCacheUri) {
+    if (data === undefined || !chainIds) {
       setIsLoading(false)
       return
     }
     getJobs()
-  }, [ocean, account, data, appConfig.metadataCacheUri])
+  }, [ocean, account, data, chainIds])
 
   return (
     <>

src/components/pages/History/Downloads.tsx

@@ -78,11 +78,7 @@ export default function ComputeDownloads(): ReactElement {
           const did = web3.utils
             .toChecksumAddress(data.tokenOrders[i].datatokenId.address)
             .replace('0x', 'did:op:')
-          const ddo = await retrieveDDO(
+          const ddo = await retrieveDDO(did, source.token)
-            did,
-            appConfig.metadataCacheUri,
-            source.token
-          )
           if (ddo.service[1].type === 'access') {
             filteredOrders.push({
               did: did,

src/components/pages/History/PublishedList.tsx

@@ -3,7 +3,10 @@ import { QueryResult } from '@oceanprotocol/lib/dist/node/metadatacache/Metadata
 import React, { ReactElement, useEffect, useState } from 'react'
 import AssetList from '../../organisms/AssetList'
 import axios from 'axios'
-import { queryMetadata } from '../../../utils/aquarius'
+import {
+  queryMetadata,
+  transformChainIdsListToQuery
+} from '../../../utils/aquarius'
 import { useWeb3 } from '../../../providers/Web3'
 import { useSiteMetadata } from '../../../hooks/useSiteMetadata'
 import { useUserPreferences } from '../../../providers/UserPreferences'
@@ -27,7 +30,9 @@ export default function PublishedList(): ReactElement {
         offset: 9,
         query: {
           query_string: {
-            query: `(publicKey.owner:${accountId})`
+            query: `(publicKey.owner:${accountId}) AND (${transformChainIdsListToQuery(
+              chainIds
+            )})`
           }
         },
         sort: { created: -1 }
@@ -36,11 +41,7 @@ export default function PublishedList(): ReactElement {
         const source = axios.CancelToken.source()
 
         queryResult || setIsLoading(true)
-        const result = await queryMetadata(
+        const result = await queryMetadata(queryPublishedAssets, source.token)
-          queryPublishedAssets,
-          appConfig.metadataCacheUri,
-          source.token
-        )
         setQueryResult(result)
       } catch (error) {
         Logger.error(error.message)

src/components/pages/Home.tsx

@@ -10,7 +10,10 @@ import Container from '../atoms/Container'
 import Button from '../atoms/Button'
 import Bookmarks from '../molecules/Bookmarks'
 import axios from 'axios'
-import { queryMetadata } from '../../utils/aquarius'
+import {
+  queryMetadata,
+  transformChainIdsListToQuery
+} from '../../utils/aquarius'
 import Permission from '../organisms/Permission'
 import { getHighestLiquidityDIDs } from '../../utils/subgraph'
 import { DDO, Logger } from '@oceanprotocol/lib'
@@ -28,7 +31,9 @@ async function getQueryHighest(
     offset: 15,
     query: {
       query_string: {
-        query: `(${dids}) AND -isInPurgatory:true`,
+        query: `(${dids}) AND (${transformChainIdsListToQuery(
+          chainIds
+        )}) AND -isInPurgatory:true`,
         fields: ['dataToken']
       }
     }
@@ -44,7 +49,9 @@ function getQueryLatest(chainIds: number[]): SearchQuery {
     offset: 9,
     query: {
       query_string: {
-        query: `-isInPurgatory:true`
+        query: `(${transformChainIdsListToQuery(
+          chainIds
+        )}) AND -isInPurgatory:true `
       }
     },
     sort: { created: -1 }
@@ -72,6 +79,7 @@ function SectionQueryResult({
   const { appConfig } = useSiteMetadata()
   const [result, setResult] = useState<QueryResult>()
   const [loading, setLoading] = useState<boolean>()
+  const { chainIds } = useUserPreferences()
 
   useEffect(() => {
     if (!appConfig.metadataCacheUri) return
@@ -80,11 +88,7 @@ function SectionQueryResult({
     async function init() {
       try {
         setLoading(true)
-        const result = await queryMetadata(
+        const result = await queryMetadata(query, source.token)
-          query,
-          appConfig.metadataCacheUri,
-          source.token
-        )
         if (queryData && result.totalResults > 0 && result.totalResults <= 15) {
           const searchDIDs = queryData.split(' ')
           const sortedAssets = sortElements(result.results, searchDIDs)
@@ -134,10 +138,6 @@ export default function HomePage(): ReactElement {
   return (
     <Permission eventType="browse">
       <>
-        <Container narrow className={styles.searchWrap}>
-          <SearchBar size="large" />
-        </Container>
-
         <section className={styles.section}>
           <h3>Bookmarks</h3>
           <Bookmarks />

src/components/templates/Search/index.tsx

@@ -1,7 +1,6 @@
 import React, { ReactElement, useState, useEffect } from 'react'
 import Permission from '../../organisms/Permission'
 import { QueryResult } from '@oceanprotocol/lib/dist/node/metadatacache/MetadataCache'
-import SearchBar from '../../molecules/SearchBar'
 import AssetList from '../../organisms/AssetList'
 import styles from './index.module.css'
 import queryString from 'query-string'
@@ -11,6 +10,7 @@ import { getResults } from './utils'
 import { navigate } from 'gatsby'
 import { updateQueryStringParameter } from '../../../utils'
 import { useSiteMetadata } from '../../../hooks/useSiteMetadata'
+import { useUserPreferences } from '../../../providers/UserPreferences'
 
 export default function SearchPage({
   location,
@@ -22,6 +22,7 @@ export default function SearchPage({
   const { appConfig } = useSiteMetadata()
   const parsed = queryString.parse(location.search)
   const { text, owner, tags, page, sort, sortOrder, serviceType } = parsed
+  const { chainIds } = useUserPreferences()
   const [queryResult, setQueryResult] = useState<QueryResult>()
   const [loading, setLoading] = useState<boolean>()
   const [service, setServiceType] = useState<string>(serviceType as string)
@@ -35,7 +36,11 @@ export default function SearchPage({
     async function initSearch() {
       setLoading(true)
       setTotalResults(undefined)
-      const queryResult = await getResults(parsed, appConfig.metadataCacheUri)
+      const queryResult = await getResults(
+        parsed,
+        appConfig.metadataCacheUri,
+        chainIds
+      )
       setQueryResult(queryResult)
       setTotalResults(queryResult.totalResults)
       setLoading(false)
@@ -49,7 +54,8 @@ export default function SearchPage({
     page,
     serviceType,
     sortOrder,
-    appConfig.metadataCacheUri
+    appConfig.metadataCacheUri,
+    chainIds
   ])
 
   function setPage(page: number) {
@@ -65,9 +71,6 @@ export default function SearchPage({
     <Permission eventType="browse">
       <>
         <div className={styles.search}>
-          {(text || owner || tags) && (
-            <SearchBar initialValue={(text || owner) as string} />
-          )}
           <div className={styles.row}>
             <ServiceFilter
               serviceType={service}

src/components/templates/Search/utils.ts

@@ -1,6 +1,11 @@
 import { QueryResult } from '@oceanprotocol/lib/dist/node/metadatacache/MetadataCache'
 import { MetadataCache, Logger } from '@oceanprotocol/lib'
+import {
+  queryMetadata,
+  transformChainIdsListToQuery
+} from '../../../utils/aquarius'
 import queryString from 'query-string'
+import axios from 'axios'
 
 export const SortTermOptions = {
   Created: 'created',
@@ -46,6 +51,7 @@ function getSortType(sortParam: string): string {
 }
 
 export function getSearchQuery(
+  chainIds: number[],
   text?: string,
   owner?: string,
   tags?: string,
@@ -137,6 +143,11 @@ export function getSearchQuery(
               ]
             }
           },
+          {
+            query_string: {
+              query: `${transformChainIdsListToQuery(chainIds)}`
+            }
+          },
           {
             term: {
               isInPurgatory: false
@@ -163,7 +174,8 @@ export async function getResults(
     sortOrder?: string
     serviceType?: string
   },
-  metadataCacheUri: string
+  metadataCacheUri: string,
+  chainIds: number[]
 ): Promise<QueryResult> {
   const {
     text,
@@ -176,9 +188,9 @@ export async function getResults(
     sortOrder,
     serviceType
   } = params
-  const metadataCache = new MetadataCache(metadataCacheUri, Logger)
 
   const searchQuery = getSearchQuery(
+    chainIds,
     text,
     owner,
     tags,
@@ -189,7 +201,9 @@ export async function getResults(
     sortOrder,
     serviceType
   )
-  const queryResult = await metadataCache.queryMetadata(searchQuery)
+  const source = axios.CancelToken.source()
+  // const queryResult = await metadataCache.queryMetadata(searchQuery)
+  const queryResult = await queryMetadata(searchQuery, source.token)
   return queryResult
 }
 

src/images/search.svg

@@ -0,0 +1 @@
+<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd"><path d="M15.853 16.56c-1.683 1.517-3.911 2.44-6.353 2.44-5.243 0-9.5-4.257-9.5-9.5s4.257-9.5 9.5-9.5 9.5 4.257 9.5 9.5c0 2.442-.923 4.67-2.44 6.353l7.44 7.44-.707.707-7.44-7.44zm-6.353-15.56c4.691 0 8.5 3.809 8.5 8.5s-3.809 8.5-8.5 8.5-8.5-3.809-8.5-8.5 3.809-8.5 8.5-8.5z"/></svg>

src/providers/Asset.tsx

@@ -14,14 +14,13 @@ import axios, { CancelToken } from 'axios'
 import { retrieveDDO } from '../utils/aquarius'
 import { getPrice } from '../utils/subgraph'
 import { MetadataMarket } from '../@types/MetaData'
-import { DDO_TEMPORARY } from './Ocean'
 import { useWeb3 } from './Web3'
 import { useSiteMetadata } from '../hooks/useSiteMetadata'
 
 interface AssetProviderValue {
   isInPurgatory: boolean
   purgatoryData: PurgatoryData
-  ddo: DDO
+  ddo: any
   did: string
   metadata: MetadataMarket
   title: string
@@ -51,7 +50,7 @@ function AssetProvider({
   const { networkId } = useWeb3()
   const [isInPurgatory, setIsInPurgatory] = useState(false)
   const [purgatoryData, setPurgatoryData] = useState<PurgatoryData>()
-  const [ddo, setDDO] = useState<DDO>()
+  const [ddo, setDDO] = useState<any>()
   const [did, setDID] = useState<string>()
   const [metadata, setMetadata] = useState<MetadataMarket>()
   const [title, setTitle] = useState<string>()
@@ -65,11 +64,7 @@ function AssetProvider({
   const fetchDdo = async (token?: CancelToken) => {
     Logger.log('[asset] Init asset, get DDO')
     setLoading(true)
-    const ddo = await retrieveDDO(
+    const ddo = await retrieveDDO(asset as string, token)
-      asset as string,
-      appConfig.metadataCacheUri,
-      token
-    )
 
     if (!ddo) {
       setError(
@@ -126,7 +121,7 @@ function AssetProvider({
     }
   }, [])
 
-  const initMetadata = useCallback(async (ddo: DDO): Promise<void> => {
+  const initMetadata = useCallback(async (ddo: any): Promise<void> => {
     if (!ddo) return
     setLoading(true)
     const returnedPrice = await getPrice(ddo)
@@ -155,7 +150,7 @@ function AssetProvider({
     if (!networkId || !ddo) return
 
     // TODO: remove typing once present in ocean.js' DDO typing
-    const isAssetNetwork = networkId === (ddo as DDO_TEMPORARY).chainId
+    const isAssetNetwork = networkId === ddo?.chainId
     setIsAssetNetwork(isAssetNetwork)
   }, [networkId, ddo])
 

src/providers/Ocean.tsx

@@ -28,11 +28,6 @@ interface OceanProviderValue {
 
 const OceanContext = createContext({} as OceanProviderValue)
 
-// TODO: remove temporary typing once ddo.chainId is present in ocean.js
-export interface DDO_TEMPORARY extends DDO {
-  chainId: number
-}
-
 function OceanProvider({ children }: { children: ReactNode }): ReactElement {
   const { web3, accountId } = useWeb3()
   const { ddo } = useAsset()
@@ -71,13 +66,13 @@ function OceanProvider({ children }: { children: ReactNode }): ReactElement {
   // -----------------------------------
   useEffect(() => {
     // TODO: remove DDO typing once ocean.js has it
-    if (!(ddo as DDO_TEMPORARY)?.chainId) return
+    if (!ddo?.chainId) return
 
     const config = {
-      ...getOceanConfig((ddo as DDO_TEMPORARY)?.chainId),
+      ...getOceanConfig(ddo?.chainId),
 
       // add local dev values
-      ...((ddo as DDO_TEMPORARY)?.chainId === 8996 && {
+      ...(ddo?.chainId === 8996 && {
         ...getDevelopmentConfig()
       })
     }

src/utils/aquarius.ts

@@ -12,7 +12,6 @@ import {
 import { AssetSelectionAsset } from '../components/molecules/FormFields/AssetSelection'
 import { PriceList, getAssetsPriceList } from './subgraph'
 import axios, { CancelToken, AxiosResponse } from 'axios'
-import { DDO_TEMPORARY } from '../providers/Ocean'
 
 function getQueryForAlgorithmDatasets(algorithmDid: string) {
   return {
@@ -50,18 +49,25 @@ export function transformQueryResult(
   }
 }
 
+export function transformChainIdsListToQuery(chainIds: number[]) {
+  let chainQuery = ''
+  chainIds.forEach((chainId) => {
+    chainQuery += `chainId:${chainId} OR `
+  })
+  chainQuery = chainQuery.slice(0, chainQuery.length - 4)
+  return chainQuery
+}
+
 export async function queryMetadata(
   query: SearchQuery,
-  metadataCacheUri: string,
   cancelToken: CancelToken
-): Promise<QueryResult> {
+): Promise<any> {
   try {
-    const response: AxiosResponse<QueryResult> = await axios.post(
+    const response: AxiosResponse<any> = await axios.post(
-      `${metadataCacheUri}/api/v1/aquarius/assets/ddo/query`,
+      `https://multiaqua.oceanprotocol.com/api/v1/aquarius/assets/ddo/query`,
       { ...query, cancelToken }
     )
     if (!response || response.status !== 200 || !response.data) return
-
     return transformQueryResult(response.data)
   } catch (error) {
     if (axios.isCancel(error)) {
@@ -74,19 +80,17 @@ export async function queryMetadata(
 
 export async function retrieveDDO(
   did: string | DID,
-  metadataCacheUri: string,
   cancelToken: CancelToken
-): Promise<DDO_TEMPORARY> {
+): Promise<DDO> {
   try {
     const response: AxiosResponse<DDO> = await axios.get(
-      `${metadataCacheUri}/api/v1/aquarius/assets/ddo/${did}`,
+      `https://multiaqua.oceanprotocol.com/api/v1/aquarius/assets/ddo/${did}`,
       { cancelToken }
     )
     if (!response || response.status !== 200 || !response.data) return
 
-    // TODO: remove hacking in chainId in DDO response once Aquarius gives us that
+    const data = { ...response.data }
-    const data = { ...response.data, chainId: 1 }
+    return new DDO(data)
-    return new DDO(data) as DDO_TEMPORARY
   } catch (error) {
     if (axios.isCancel(error)) {
       Logger.log(error.message)
@@ -98,12 +102,11 @@ export async function retrieveDDO(
 
 export async function getAssetsNames(
   didList: string[] | DID[],
-  metadataCacheUri: string,
   cancelToken: CancelToken
 ): Promise<Record<string, string>> {
   try {
     const response: AxiosResponse<Record<string, string>> = await axios.post(
-      `${metadataCacheUri}/api/v1/aquarius/assets/names`,
+      `https://multiaqua.oceanprotocol.com/api/v1/aquarius/assets/names`,
       {
         didList,
         cancelToken
@@ -123,7 +126,6 @@ export async function getAssetsNames(
 export async function transformDDOToAssetSelection(
   datasetProviderEndpoint: string,
   ddoList: DDO[],
-  metadataCacheUri: string,
   selectedAlgorithms?: PublisherTrustedAlgorithm[]
 ): Promise<AssetSelectionAsset[]> {
   const source = axios.CancelToken.source()
@@ -138,7 +140,7 @@ export async function transformDDOToAssetSelection(
     algoComputeService?.serviceEndpoint &&
       (didProviderEndpointMap[ddo.id] = algoComputeService?.serviceEndpoint)
   }
-  const ddoNames = await getAssetsNames(didList, metadataCacheUri, source.token)
+  const ddoNames = await getAssetsNames(didList, source.token)
   const algorithmList: AssetSelectionAsset[] = []
   didList?.forEach((did: string) => {
     if (
@@ -180,7 +182,6 @@ export async function getAlgorithmDatasetsForCompute(
   const source = axios.CancelToken.source()
   const computeDatasets = await queryMetadata(
     getQueryForAlgorithmDatasets(algorithmId),
-    metadataCacheUri,
     source.token
   )
   const computeDatasetsForCurrentAlgorithm: DDO[] = []
@@ -198,7 +199,6 @@ export async function getAlgorithmDatasetsForCompute(
   const datasets = await transformDDOToAssetSelection(
     datasetProviderUri,
     computeDatasetsForCurrentAlgorithm,
-    metadataCacheUri,
     []
   )
   return datasets

src/utils/metadata.ts

@@ -116,6 +116,7 @@ export function transformPublishFormToMetadata(
       name,
       author,
       dateCreated: ddo ? ddo.created : currentTime,
+      datePublished: '',
       files: typeof files !== 'string' && files,
       license: 'https://market.oceanprotocol.com/terms'
     },