Refactoring Market for new Ocean.js build (#481)

* removing imports from utils folder

* lib bump

* update status args

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>

package-lock.json

@@ -3620,27 +3620,321 @@
       "integrity": "sha512-j4PEZSVtKSqxDYMVh/hd5vk088Bg6a6QkrUMTXN9Q6OIFAMfHM235f1AxaakNrEyK0FKMD908KuJEdfFLRn9Hw=="
     },
     "@oceanprotocol/contracts": {
-      "version": "0.5.10",
+      "version": "0.5.13",
-      "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-0.5.10.tgz",
+      "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-0.5.13.tgz",
-      "integrity": "sha512-6GrBk1jy+zxjDjh2SPra06etrqdp8CB6RaZaTq2OQpK8dA2Dq91hqCbj+6eb21MlU8bDY3/atnxax9rgPgsxkA=="
+      "integrity": "sha512-0dasqU7PL8xZOxvn6ID2IJ6TgQZbkcwtZqiMiYvtsv9+fQr/n13qXYXwkmNEjQb3YL4IeSVUnHehk5KpGRPFWA=="
     },
     "@oceanprotocol/lib": {
-      "version": "0.12.1",
+      "version": "0.13.0",
-      "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-0.12.1.tgz",
+      "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-0.13.0.tgz",
-      "integrity": "sha512-Cw4d4Di6GnL1gfZcYqemnKh1Agpc66AemIJANfbJpO08KkgiLEZhhMYsYQZzha+zQD9Jr4ZuzE/ZlYDr6S0o6w==",
+      "integrity": "sha512-+LoN16bo1hcqfxsxLV22ZEbObdif0RJXg5GlndlF/VQGNVrSm+XYxUp+si5HCWa8sBeYH/hOSQRnrD8YXnyWrw==",
       "requires": {
         "@ethereum-navigator/navigator": "^0.5.2",
         "@oceanprotocol/contracts": "^0.5.10",
         "@types/crypto-js": "^4.0.1",
+        "cross-fetch": "^3.1.2",
         "crypto-js": "^4.0.0",
         "decimal.js": "^10.2.1",
         "fs": "0.0.1-security",
         "lzma": "^2.3.2",
-        "node-fetch": "^2.6.1",
+        "node-abort-controller": "^1.2.0",
         "save-file": "^2.3.1",
         "uuid": "^8.3.2",
-        "web3": "^1.3.4",
+        "web3": "^1.3.5",
-        "web3-eth-contract": "^1.3.4"
+        "web3-eth-contract": "^1.3.5"
+      },
+      "dependencies": {
+        "@types/node": {
+          "version": "12.20.7",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.7.tgz",
+          "integrity": "sha512-gWL8VUkg8VRaCAUgG9WmhefMqHmMblxe2rVpMF86nZY/+ZysU+BkAp+3cz03AixWDSSz0ks5WX59yAhv/cDwFA=="
+        },
+        "cross-fetch": {
+          "version": "3.1.4",
+          "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.4.tgz",
+          "integrity": "sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==",
+          "requires": {
+            "node-fetch": "2.6.1"
+          }
+        },
+        "eth-lib": {
+          "version": "0.2.8",
+          "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz",
+          "integrity": "sha512-ArJ7x1WcWOlSpzdoTBX8vkwlkSQ85CjjifSZtV4co64vWxSV8geWfPI9x4SVYu3DSxnX4yWFVTtGL+j9DUFLNw==",
+          "requires": {
+            "bn.js": "^4.11.6",
+            "elliptic": "^6.4.0",
+            "xhr-request-promise": "^0.1.2"
+          }
+        },
+        "web3": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/web3/-/web3-1.3.5.tgz",
+          "integrity": "sha512-UyQW/MT5EIGBrXPCh/FDIaD7RtJTn5/rJUNw2FOglp0qoXnCQHNKvntiR1ylztk05fYxIF6UgsC76IrazlKJjw==",
+          "requires": {
+            "web3-bzz": "1.3.5",
+            "web3-core": "1.3.5",
+            "web3-eth": "1.3.5",
+            "web3-eth-personal": "1.3.5",
+            "web3-net": "1.3.5",
+            "web3-shh": "1.3.5",
+            "web3-utils": "1.3.5"
+          }
+        },
+        "web3-bzz": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/web3-bzz/-/web3-bzz-1.3.5.tgz",
+          "integrity": "sha512-XiEUAbB1uKm/agqfwBsCW8fbw+sma85TfwuDpdcy591vinVk0S9TfWgLxro6v1KJ6nSELySIbKGbAJbh2GSyxw==",
+          "requires": {
+            "@types/node": "^12.12.6",
+            "got": "9.6.0",
+            "swarm-js": "^0.1.40",
+            "underscore": "1.9.1"
+          }
+        },
+        "web3-core": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.3.5.tgz",
+          "integrity": "sha512-VQjTvnGTqJwDwjKEHSApea3RmgtFGLDSJ6bqrOyHROYNyTyKYjFQ/drG9zs3rjDkND9mgh8foI1ty37Qua3QCQ==",
+          "requires": {
+            "@types/bn.js": "^4.11.5",
+            "@types/node": "^12.12.6",
+            "bignumber.js": "^9.0.0",
+            "web3-core-helpers": "1.3.5",
+            "web3-core-method": "1.3.5",
+            "web3-core-requestmanager": "1.3.5",
+            "web3-utils": "1.3.5"
+          }
+        },
+        "web3-core-helpers": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.3.5.tgz",
+          "integrity": "sha512-HYh3ix5FjysgT0jyzD8s/X5ym0b4BGU7I2QtuBiydMnE0mQEWy7GcT9XKpTySA8FTOHHIAQYvQS07DN/ky3UzA==",
+          "requires": {
+            "underscore": "1.9.1",
+            "web3-eth-iban": "1.3.5",
+            "web3-utils": "1.3.5"
+          }
+        },
+        "web3-core-method": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.3.5.tgz",
+          "integrity": "sha512-hCbmgQ+At6OTuaNGAdjXMsCr4eUCmp9yGKSuaB5HdkNVDpqFso4HHjVxcjNrTyJp3OZnyjKBzQzK1ZWLpLl84Q==",
+          "requires": {
+            "@ethersproject/transactions": "^5.0.0-beta.135",
+            "underscore": "1.9.1",
+            "web3-core-helpers": "1.3.5",
+            "web3-core-promievent": "1.3.5",
+            "web3-core-subscriptions": "1.3.5",
+            "web3-utils": "1.3.5"
+          }
+        },
+        "web3-core-promievent": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.3.5.tgz",
+          "integrity": "sha512-K0j8x3ZJr0eAyNvyUCxOUsSTd4hco0/9nxxlyOuijcsa6YV8l9NL6eqhniWbSyxCJT8ka5Mb7yAiUZe69EDLBQ==",
+          "requires": {
+            "eventemitter3": "4.0.4"
+          }
+        },
+        "web3-core-requestmanager": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/web3-core-requestmanager/-/web3-core-requestmanager-1.3.5.tgz",
+          "integrity": "sha512-9l294U3Ga8qmvv8E37BqjQREfMs+kFnkU3PY28g9DZGYzKvl3V1dgDYqxyrOBdCFhc7rNSpHdgC4PrVHjouspg==",
+          "requires": {
+            "underscore": "1.9.1",
+            "util": "^0.12.0",
+            "web3-core-helpers": "1.3.5",
+            "web3-providers-http": "1.3.5",
+            "web3-providers-ipc": "1.3.5",
+            "web3-providers-ws": "1.3.5"
+          }
+        },
+        "web3-core-subscriptions": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.3.5.tgz",
+          "integrity": "sha512-6mtXdaEB1V1zKLqYBq7RF2W75AK5ZJNGpW6QYC7Zvbku7zq1ZlgaUkJo88JKMWJ7etfaHaYqQ/7VveHk5sQynA==",
+          "requires": {
+            "eventemitter3": "4.0.4",
+            "underscore": "1.9.1",
+            "web3-core-helpers": "1.3.5"
+          }
+        },
+        "web3-eth": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-1.3.5.tgz",
+          "integrity": "sha512-5qqDPMMD+D0xRqOV2ePU2G7/uQmhn0FgCEhFzKDMHrssDQJyQLW/VgfA0NLn64lWnuUrGnQStGvNxrWf7MgsfA==",
+          "requires": {
+            "underscore": "1.9.1",
+            "web3-core": "1.3.5",
+            "web3-core-helpers": "1.3.5",
+            "web3-core-method": "1.3.5",
+            "web3-core-subscriptions": "1.3.5",
+            "web3-eth-abi": "1.3.5",
+            "web3-eth-accounts": "1.3.5",
+            "web3-eth-contract": "1.3.5",
+            "web3-eth-ens": "1.3.5",
+            "web3-eth-iban": "1.3.5",
+            "web3-eth-personal": "1.3.5",
+            "web3-net": "1.3.5",
+            "web3-utils": "1.3.5"
+          }
+        },
+        "web3-eth-abi": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.3.5.tgz",
+          "integrity": "sha512-bkbG2v/mOW5DH6rF/SEgqunusjYoEi2IBw+fkmD3rzWDaEY7+/i1xY94AeO257d06QMgld75GtV/N+aEs7A6vQ==",
+          "requires": {
+            "@ethersproject/abi": "5.0.7",
+            "underscore": "1.9.1",
+            "web3-utils": "1.3.5"
+          }
+        },
+        "web3-eth-accounts": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-1.3.5.tgz",
+          "integrity": "sha512-r3WOR21rgm6Cd6OFnifr3Tizdm5K+g2TsSOPySwX4FrgLrYDL6ck4zr5VXUPz+llpSExb/JztpE8pqEHr3U2NA==",
+          "requires": {
+            "crypto-browserify": "3.12.0",
+            "eth-lib": "0.2.8",
+            "ethereumjs-common": "^1.3.2",
+            "ethereumjs-tx": "^2.1.1",
+            "scrypt-js": "^3.0.1",
+            "underscore": "1.9.1",
+            "uuid": "3.3.2",
+            "web3-core": "1.3.5",
+            "web3-core-helpers": "1.3.5",
+            "web3-core-method": "1.3.5",
+            "web3-utils": "1.3.5"
+          },
+          "dependencies": {
+            "uuid": {
+              "version": "3.3.2",
+              "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+              "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
+            }
+          }
+        },
+        "web3-eth-contract": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.3.5.tgz",
+          "integrity": "sha512-WfGVeQquN3D7Qm+KEIN9EI7yrm/fL2V9Y4+YhDWiKA/ns1pX1LYcEWojTOnBXCnPF3tcvoKKL+KBxXg1iKm38A==",
+          "requires": {
+            "@types/bn.js": "^4.11.5",
+            "underscore": "1.9.1",
+            "web3-core": "1.3.5",
+            "web3-core-helpers": "1.3.5",
+            "web3-core-method": "1.3.5",
+            "web3-core-promievent": "1.3.5",
+            "web3-core-subscriptions": "1.3.5",
+            "web3-eth-abi": "1.3.5",
+            "web3-utils": "1.3.5"
+          }
+        },
+        "web3-eth-ens": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-1.3.5.tgz",
+          "integrity": "sha512-5bkpFTXV18CvaVP8kCbLZZm2r1TWUv9AsXH+80yz8bTZulUGvXsBMRfK6e5nfEr2Yv59xlIXCFoalmmySI9EJw==",
+          "requires": {
+            "content-hash": "^2.5.2",
+            "eth-ens-namehash": "2.0.8",
+            "underscore": "1.9.1",
+            "web3-core": "1.3.5",
+            "web3-core-helpers": "1.3.5",
+            "web3-core-promievent": "1.3.5",
+            "web3-eth-abi": "1.3.5",
+            "web3-eth-contract": "1.3.5",
+            "web3-utils": "1.3.5"
+          }
+        },
+        "web3-eth-iban": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.3.5.tgz",
+          "integrity": "sha512-x+BI/d2Vt0J1cKK8eFd4W0f1TDjgEOYCwiViTb28lLE+tqrgyPqWDA+l6UlKYLF/yMFX3Dym4ofcCOtgcn4q4g==",
+          "requires": {
+            "bn.js": "^4.11.9",
+            "web3-utils": "1.3.5"
+          }
+        },
+        "web3-eth-personal": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.3.5.tgz",
+          "integrity": "sha512-xELQHNZ8p3VoO1582ghCaq+Bx7pSkOOalc6/ACOCGtHDMelqgVejrmSIZGScYl+k0HzngmQAzURZWQocaoGM1g==",
+          "requires": {
+            "@types/node": "^12.12.6",
+            "web3-core": "1.3.5",
+            "web3-core-helpers": "1.3.5",
+            "web3-core-method": "1.3.5",
+            "web3-net": "1.3.5",
+            "web3-utils": "1.3.5"
+          }
+        },
+        "web3-net": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-1.3.5.tgz",
+          "integrity": "sha512-usbFbuUpKK8s7jPLGoUzi/WpNnefGFPTj948aJv8BZ04UQA4L/XS5NNkkhk358zNMmhGfEFW8wrWy+0Oy0njtA==",
+          "requires": {
+            "web3-core": "1.3.5",
+            "web3-core-method": "1.3.5",
+            "web3-utils": "1.3.5"
+          }
+        },
+        "web3-providers-http": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-1.3.5.tgz",
+          "integrity": "sha512-ZQOmceFjcajEZdiuqciXjijwIYWNmEJ1oxMtbrwB2eGxHRCMXEH2xGRUZuhOFNF88yQC/VXVi14yvYg5ZlFJlA==",
+          "requires": {
+            "web3-core-helpers": "1.3.5",
+            "xhr2-cookies": "1.1.0"
+          }
+        },
+        "web3-providers-ipc": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.3.5.tgz",
+          "integrity": "sha512-cbZOeb/sALiHjzMolJjIyHla/J5wdL2JKUtRO66Nh/uLALBCpU8JUgzNvpAdJ1ae3+A33+EdFStdzuDYHKtQew==",
+          "requires": {
+            "oboe": "2.1.5",
+            "underscore": "1.9.1",
+            "web3-core-helpers": "1.3.5"
+          }
+        },
+        "web3-providers-ws": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.3.5.tgz",
+          "integrity": "sha512-zeZ4LMvKhYaJBDCqA//Bzgp4r/T0tNq5U/xvN0axA4YflzF7yqlsbzGwCkcZYDbrUaK3Ltl2uOmvwjbWALOZ1A==",
+          "requires": {
+            "eventemitter3": "4.0.4",
+            "underscore": "1.9.1",
+            "web3-core-helpers": "1.3.5",
+            "websocket": "^1.0.32"
+          }
+        },
+        "web3-shh": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/web3-shh/-/web3-shh-1.3.5.tgz",
+          "integrity": "sha512-aRwzCduXvuGVslLL/Y15VcOHa70Qr2kxZI7UwOzQVhaaOdxuRRvo3AK/cmyln1Tsd54/n93Yk8I3qg5I2+6alw==",
+          "requires": {
+            "web3-core": "1.3.5",
+            "web3-core-method": "1.3.5",
+            "web3-core-subscriptions": "1.3.5",
+            "web3-net": "1.3.5"
+          }
+        },
+        "web3-utils": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.3.5.tgz",
+          "integrity": "sha512-5apMRm8ElYjI/92GHqijmaLC+s+d5lgjpjHft+rJSs/dsnX8I8tQreqev0dmU+wzU+2EEe4Sx9a/OwGWHhQv3A==",
+          "requires": {
+            "bn.js": "^4.11.9",
+            "eth-lib": "0.2.8",
+            "ethereum-bloom-filters": "^1.0.6",
+            "ethjs-unit": "0.1.6",
+            "number-to-bn": "1.7.0",
+            "randombytes": "^2.1.0",
+            "underscore": "1.9.1",
+            "utf8": "3.0.0"
+          }
+        }
       }
     },
     "@oceanprotocol/typographies": {
@@ -27202,6 +27496,11 @@
         }
       }
     },
+    "node-abort-controller": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-1.2.1.tgz",
+      "integrity": "sha512-79PYeJuj6S9+yOHirR0JBLFOgjB6sQCir10uN6xRx25iD+ZD4ULqgRn3MwWBRaQGB0vEgReJzWwJo42T1R6YbQ=="
+    },
     "node-addon-api": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz",

package.json

@@ -27,7 +27,7 @@
     "@coingecko/cryptoformat": "^0.4.2",
     "@loadable/component": "^5.14.1",
     "@oceanprotocol/art": "^3.0.0",
-    "@oceanprotocol/lib": "^0.12.1",
+    "@oceanprotocol/lib": "^0.13.0",
     "@oceanprotocol/typographies": "^0.1.0",
     "@portis/web3": "^3.0.3",
     "@sindresorhus/slugify": "^1.0.0",

src/components/atoms/ExplorerLink.tsx

@@ -1,7 +1,7 @@
 import React, { ReactElement, ReactNode, useEffect, useState } from 'react'
 import { ReactComponent as External } from '../../images/external.svg'
 import styles from './ExplorerLink.module.css'
-import { ConfigHelperConfig } from '@oceanprotocol/lib/dist/node/utils/ConfigHelper'
+import { ConfigHelperConfig } from '@oceanprotocol/lib'
 import { useOcean } from '../../providers/Ocean'
 
 export default function ExplorerLink({

src/components/molecules/Bookmarks.tsx

@@ -1,11 +1,10 @@
 import { useUserPreferences } from '../../providers/UserPreferences'
 import React, { ReactElement, useEffect, useState } from 'react'
 import Table from '../atoms/Table'
-import { DDO, Logger } from '@oceanprotocol/lib'
+import { DDO, Logger, ConfigHelperConfig } from '@oceanprotocol/lib'
 import { useOcean } from '../../providers/Ocean'
 import Price from '../atoms/Price'
 import Tooltip from '../atoms/Tooltip'
-import { ConfigHelperConfig } from '@oceanprotocol/lib/dist/node/utils/ConfigHelper'
 import AssetTitle from './AssetListTitle'
 import { queryMetadata } from '../../utils/aquarius'
 import axios, { CancelToken } from 'axios'

src/components/molecules/UserPreferences/Chain.tsx

@@ -1,4 +1,4 @@
-import { ConfigHelperConfig } from '@oceanprotocol/lib/dist/node/utils/ConfigHelper'
+import { ConfigHelperConfig } from '@oceanprotocol/lib'
 import React, { ReactElement } from 'react'
 import { useOcean } from '../../../providers/Ocean'
 import { useWeb3 } from '../../../providers/Web3'

src/components/molecules/Wallet/Network.tsx

@@ -1,8 +1,7 @@
 import React, { useState, useEffect, ReactElement } from 'react'
 import { useOcean } from '../../../providers/Ocean'
 import Status from '../../atoms/Status'
-import { ConfigHelper } from '@oceanprotocol/lib'
+import { ConfigHelper, ConfigHelperConfig } from '@oceanprotocol/lib'
-import { ConfigHelperConfig } from '@oceanprotocol/lib/dist/node/utils/ConfigHelper'
 import styles from './Network.module.css'
 import Badge from '../../atoms/Badge'
 import Tooltip from '../../atoms/Tooltip'

src/components/organisms/AssetContent/Bookmark.tsx

@@ -2,7 +2,7 @@ import { useUserPreferences } from '../../../providers/UserPreferences'
 import React, { ReactElement } from 'react'
 import styles from './Bookmark.module.css'
 import { ReactComponent as BookmarkIcon } from '../../../images/bookmark.svg'
-import { ConfigHelperConfig } from '@oceanprotocol/lib/dist/node/utils/ConfigHelper'
+import { ConfigHelperConfig } from '@oceanprotocol/lib'
 import { useOcean } from '../../../providers/Ocean'
 
 export default function Bookmark({ did }: { did: string }): ReactElement {

src/components/pages/History/ComputeDetails.tsx

@@ -33,6 +33,8 @@ export default function ComputeDetailsModal({
         const job = await ocean.compute.status(
           account,
           computeJob.did,
+          undefined,
+          undefined,
           computeJob.jobId
         )
         if (job?.length > 0) {

src/components/pages/History/ComputeJobs.tsx

@@ -97,7 +97,9 @@ export default function ComputeJobs(): ReactElement {
             account,
             orderHistory[i].did,
             undefined,
+            undefined,
             orderHistory[i].transactionHash,
+            undefined,
             false
           )
           computeJob.forEach((item) => {

src/providers/ApolloClientProvider.tsx

@@ -5,8 +5,7 @@ import {
   InMemoryCache,
   NormalizedCacheObject
 } from '@apollo/client'
-import { Logger } from '@oceanprotocol/lib'
+import { Logger, ConfigHelperConfig } from '@oceanprotocol/lib'
-import { ConfigHelperConfig } from '@oceanprotocol/lib/dist/node/utils/ConfigHelper'
 import { useOcean } from './Ocean'
 import fetch from 'cross-fetch'
 import React, { useState, useEffect, ReactNode, ReactElement } from 'react'

src/providers/Ocean.tsx

@@ -7,8 +7,14 @@ import React, {
   ReactNode,
   useEffect
 } from 'react'
-import { Ocean, Logger, Account, Config } from '@oceanprotocol/lib'
+import {
-import { ConfigHelperConfig } from '@oceanprotocol/lib/dist/node/utils/ConfigHelper'
+  Ocean,
+  Logger,
+  Account,
+  Config,
+  ConfigHelperConfig
+} from '@oceanprotocol/lib'
+
 import { useWeb3 } from './Web3'
 import {
   getDevelopmentConfig,

src/providers/UserPreferences.tsx

@@ -6,10 +6,8 @@ import React, {
   useState,
   useEffect
 } from 'react'
-import { Logger } from '@oceanprotocol/lib'
+import { Logger, LogLevel, ConfigHelperConfig } from '@oceanprotocol/lib'
-import { LogLevel } from '@oceanprotocol/lib/dist/node/utils/Logger'
 import { useOcean } from './Ocean'
-import { ConfigHelperConfig } from '@oceanprotocol/lib/dist/node/utils/ConfigHelper'
 import { isBrowser } from '../utils'
 
 interface UserPreferencesValue {

src/utils/ocean.ts

@@ -1,11 +1,14 @@
-import { Account, Logger, Ocean } from '@oceanprotocol/lib'
-import contractAddresses from '@oceanprotocol/contracts/artifacts/address.json'
 import {
+  Account,
+  Logger,
+  Ocean,
   ConfigHelper,
   ConfigHelperConfig,
   ConfigHelperNetworkId,
   ConfigHelperNetworkName
-} from '@oceanprotocol/lib/dist/node/utils/ConfigHelper'
+} from '@oceanprotocol/lib'
+import contractAddresses from '@oceanprotocol/contracts/artifacts/address.json'
+
 import { UserBalance } from '../@types/TokenBalance'
 
 export function getOceanConfig(

src/utils/web3.ts

@@ -1,5 +1,4 @@
-import { Logger } from '@oceanprotocol/lib'
+import { Logger, ConfigHelperConfig } from '@oceanprotocol/lib'
-import { ConfigHelperConfig } from '@oceanprotocol/lib/dist/node/utils/ConfigHelper'
 
 export interface EthereumListsChain {
   name: string