diff --git a/example/src/App.tsx b/example/src/App.tsx
index 7f61ccf..53390d7 100644
--- a/example/src/App.tsx
+++ b/example/src/App.tsx
@@ -53,7 +53,11 @@ function App() {
   }, [])
 
   return (
-    <OceanProvider initialConfig={configRinkeby} web3ModalOpts={web3ModalOpts} marketFeeAddress={'0x4D156A2ef69ffdDC55838176C6712C90f60a2285'}>
+    <OceanProvider
+      initialConfig={configRinkeby}
+      web3ModalOpts={web3ModalOpts}
+      marketFeeAddress={'0x4D156A2ef69ffdDC55838176C6712C90f60a2285'}
+    >
       <div className="container">
         <NetworkMonitor />
         <div>
diff --git a/package-lock.json b/package-lock.json
index 814f253..5348d9f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1628,9 +1628,9 @@
       "dev": true
     },
     "@types/react": {
-      "version": "16.9.45",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.45.tgz",
-      "integrity": "sha512-vv950slTF5UZ5eDOf13b8qC1SD4rTvkqg3HfaUKzr17U97oeJZAa+dUaIHn0QoOJflNTIt6Pem9MmapULs9dkA==",
+      "version": "16.9.44",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.44.tgz",
+      "integrity": "sha512-BtLoJrXdW8DVZauKP+bY4Kmiq7ubcJq+H/aCpRfvPF7RAT3RwR73Sg8szdc2YasbAlWBDrQ6Q+AFM0KwtQY+WQ==",
       "dev": true,
       "requires": {
         "@types/prop-types": "*",
@@ -1664,12 +1664,12 @@
       }
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.8.0.tgz",
-      "integrity": "sha512-lFb4VCDleFSR+eo4Ew+HvrJ37ZH1Y9ZyE+qyP7EiwBpcCVxwmUc5PAqhShCQ8N8U5vqYydm74nss+a0wrrCErw==",
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.7.1.tgz",
+      "integrity": "sha512-3DB9JDYkMrc8Au00rGFiJLK2Ja9CoMP6Ut0sHsXp3ZtSugjNxvSSHTnKLfo4o+QmjYBJqEznDqsG1zj4F2xnsg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/experimental-utils": "3.8.0",
+        "@typescript-eslint/experimental-utils": "3.7.1",
         "debug": "^4.1.1",
         "functional-red-black-tree": "^1.0.1",
         "regexpp": "^3.0.0",
@@ -1677,50 +1677,6 @@
         "tsutils": "^3.17.1"
       },
       "dependencies": {
-        "@typescript-eslint/experimental-utils": {
-          "version": "3.8.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.8.0.tgz",
-          "integrity": "sha512-o8T1blo1lAJE0QDsW7nSyvZHbiDzQDjINJKyB44Z3sSL39qBy5L10ScI/XwDtaiunoyKGLiY9bzRk4YjsUZl8w==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.3",
-            "@typescript-eslint/types": "3.8.0",
-            "@typescript-eslint/typescript-estree": "3.8.0",
-            "eslint-scope": "^5.0.0",
-            "eslint-utils": "^2.0.0"
-          }
-        },
-        "@typescript-eslint/types": {
-          "version": "3.8.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.8.0.tgz",
-          "integrity": "sha512-8kROmEQkv6ss9kdQ44vCN1dTrgu4Qxrd2kXr10kz2NP5T8/7JnEfYNxCpPkArbLIhhkGLZV3aVMplH1RXQRF7Q==",
-          "dev": true
-        },
-        "@typescript-eslint/typescript-estree": {
-          "version": "3.8.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.8.0.tgz",
-          "integrity": "sha512-MTv9nPDhlKfclwnplRNDL44mP2SY96YmPGxmMbMy6x12I+pERcxpIUht7DXZaj4mOKKtet53wYYXU0ABaiXrLw==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "3.8.0",
-            "@typescript-eslint/visitor-keys": "3.8.0",
-            "debug": "^4.1.1",
-            "glob": "^7.1.6",
-            "is-glob": "^4.0.1",
-            "lodash": "^4.17.15",
-            "semver": "^7.3.2",
-            "tsutils": "^3.17.1"
-          }
-        },
-        "@typescript-eslint/visitor-keys": {
-          "version": "3.8.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.8.0.tgz",
-          "integrity": "sha512-gfqQWyVPpT9NpLREXNR820AYwgz+Kr1GuF3nf1wxpHD6hdxI62tq03ToomFnDxY0m3pUB39IF7sil7D5TQexLA==",
-          "dev": true,
-          "requires": {
-            "eslint-visitor-keys": "^1.1.0"
-          }
-        },
         "debug": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -1758,83 +1714,16 @@
       }
     },
     "@typescript-eslint/parser": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.8.0.tgz",
-      "integrity": "sha512-u5vjOBaCsnMVQOvkKCXAmmOhyyMmFFf5dbkM3TIbg3MZ2pyv5peE4gj81UAbTHwTOXEwf7eCQTUMKrDl/+qGnA==",
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.7.1.tgz",
+      "integrity": "sha512-W4QV/gXvfIsccN8225784LNOorcm7ch68Fi3V4Wg7gmkWSQRKevO4RrRqWo6N/Z/myK1QAiGgeaXN57m+R/8iQ==",
       "dev": true,
       "requires": {
         "@types/eslint-visitor-keys": "^1.0.0",
-        "@typescript-eslint/experimental-utils": "3.8.0",
-        "@typescript-eslint/types": "3.8.0",
-        "@typescript-eslint/typescript-estree": "3.8.0",
+        "@typescript-eslint/experimental-utils": "3.7.1",
+        "@typescript-eslint/types": "3.7.1",
+        "@typescript-eslint/typescript-estree": "3.7.1",
         "eslint-visitor-keys": "^1.1.0"
-      },
-      "dependencies": {
-        "@typescript-eslint/experimental-utils": {
-          "version": "3.8.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.8.0.tgz",
-          "integrity": "sha512-o8T1blo1lAJE0QDsW7nSyvZHbiDzQDjINJKyB44Z3sSL39qBy5L10ScI/XwDtaiunoyKGLiY9bzRk4YjsUZl8w==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.3",
-            "@typescript-eslint/types": "3.8.0",
-            "@typescript-eslint/typescript-estree": "3.8.0",
-            "eslint-scope": "^5.0.0",
-            "eslint-utils": "^2.0.0"
-          }
-        },
-        "@typescript-eslint/types": {
-          "version": "3.8.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.8.0.tgz",
-          "integrity": "sha512-8kROmEQkv6ss9kdQ44vCN1dTrgu4Qxrd2kXr10kz2NP5T8/7JnEfYNxCpPkArbLIhhkGLZV3aVMplH1RXQRF7Q==",
-          "dev": true
-        },
-        "@typescript-eslint/typescript-estree": {
-          "version": "3.8.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.8.0.tgz",
-          "integrity": "sha512-MTv9nPDhlKfclwnplRNDL44mP2SY96YmPGxmMbMy6x12I+pERcxpIUht7DXZaj4mOKKtet53wYYXU0ABaiXrLw==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "3.8.0",
-            "@typescript-eslint/visitor-keys": "3.8.0",
-            "debug": "^4.1.1",
-            "glob": "^7.1.6",
-            "is-glob": "^4.0.1",
-            "lodash": "^4.17.15",
-            "semver": "^7.3.2",
-            "tsutils": "^3.17.1"
-          }
-        },
-        "@typescript-eslint/visitor-keys": {
-          "version": "3.8.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.8.0.tgz",
-          "integrity": "sha512-gfqQWyVPpT9NpLREXNR820AYwgz+Kr1GuF3nf1wxpHD6hdxI62tq03ToomFnDxY0m3pUB39IF7sil7D5TQexLA==",
-          "dev": true,
-          "requires": {
-            "eslint-visitor-keys": "^1.1.0"
-          }
-        },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "semver": {
-          "version": "7.3.2",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-          "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-          "dev": true
-        }
       }
     },
     "@typescript-eslint/types": {
@@ -9101,6 +8990,14 @@
         "rollup-pluginutils": "^2.8.2",
         "serialize-javascript": "^2.1.2",
         "terser": "^4.6.2"
+      },
+      "dependencies": {
+        "serialize-javascript": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz",
+          "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==",
+          "dev": true
+        }
       }
     },
     "rollup-plugin-typescript2": {
@@ -9315,10 +9212,13 @@
       }
     },
     "serialize-javascript": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz",
-      "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==",
-      "dev": true
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+      "dev": true,
+      "requires": {
+        "randombytes": "^2.1.0"
+      }
     },
     "serve-static": {
       "version": "1.14.1",
diff --git a/package.json b/package.json
index 1f8bfd7..f7eb571 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,8 @@
     "microbundle": "^0.12.3",
     "prettier": "^2.0.5",
     "release-it": "^13.6.6",
-    "typescript": "^3.9.7"
+    "typescript": "^3.9.7",
+    "serialize-javascript": ">=3.1.0"
   },
   "peerDependencies": {
     "react": ">=16.8.0"
diff --git a/src/providers/OceanProvider/OceanProvider.tsx b/src/providers/OceanProvider/OceanProvider.tsx
index f87b7d2..b6630ed 100644
--- a/src/providers/OceanProvider/OceanProvider.tsx
+++ b/src/providers/OceanProvider/OceanProvider.tsx
@@ -28,7 +28,6 @@ interface OceanProviderValue {
   balance: Balance
   chainId: number | undefined
   status: ProviderStatus
-  marketFeeAddress: string
   connect: (config?: Config) => Promise<void>
   logout: () => Promise<void>
   refreshBalance: () => Promise<void>
@@ -39,12 +38,10 @@ const OceanContext = createContext(null)
 function OceanProvider({
   initialConfig,
   web3ModalOpts,
-  marketFeeAddress,
   children
 }: {
   initialConfig: Config
   web3ModalOpts?: Partial<ICoreOptions>
-  marketFeeAddress: string
   children: any
 }): ReactElement {
   const [web3, setWeb3] = useState<Web3 | undefined>()
@@ -172,7 +169,6 @@ function OceanProvider({
           chainId,
           status,
           config,
-          marketFeeAddress,
           connect,
           logout,
           refreshBalance