update example

example/.gitignore

@@ -1,23 +0,0 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-
-# production
-/build
-
-# misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*

example/README.md

@@ -0,0 +1,8 @@
+# Example
+
+Simple example app based on Create React App.
+
+```bash
+npm install
+npm start
+```

example/package.json

@@ -5,22 +5,19 @@
   "dependencies": {
     "-": "0.0.1",
     "@oceanprotocol/react": "file:../",
-    "@testing-library/jest-dom": "^4.2.4",
-    "@testing-library/react": "^9.5.0",
-    "@testing-library/user-event": "^7.2.1",
-    "@toruslabs/torus-embed": "^1.7.3",
+    "@toruslabs/torus-embed": "^1.8.2",
     "@types/jest": "^24.9.1",
     "@types/node": "^12.12.47",
     "@types/react": "^16.9.41",
     "@types/react-dom": "^16.9.8",
-    "@types/shortid": "0.0.29",
-    "@walletconnect/web3-provider": "^1.0.14",
+    "@types/shortid": "^0.0.29",
+    "@walletconnect/web3-provider": "^1.1.0",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-scripts": "3.4.1",
     "shortid": "^2.2.15",
-    "typescript": "^3.7.5",
-    "web3-eth-contract": "^1.2.9"
+    "typescript": "^3.9.7",
+    "web3-eth-contract": "^1.2.11"
   },
   "scripts": {
     "start": "react-scripts start",
@@ -31,16 +28,10 @@
   "eslintConfig": {
     "extends": "react-app"
   },
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
-  }
+  "browserslist": [
+    ">0.2%",
+    "not dead",
+    "not ie <= 11",
+    "not op_mini all"
+  ]
 }

example/public/index.html

@@ -10,11 +10,6 @@
       content="Web site created using create-react-app"
     />
     <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
-    <!--
-      manifest.json provides metadata used when your web app is installed on a
-      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-    -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.

example/public/manifest.json

@@ -1,25 +0,0 @@
-{
-  "short_name": "React App",
-  "name": "Create React App Sample",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    },
-    {
-      "src": "logo192.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "logo512.png",
-      "type": "image/png",
-      "sizes": "512x512"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}

example/src/App.tsx

@@ -7,29 +7,58 @@ import { Config } from '@oceanprotocol/lib'
 import { AllDdos } from './AllDdos'
 import { ConsumeDdo } from './ConsumeDdo'
 
-function App() {
-  // factory Address needs to be updated each time you deploy the contract on local network
-  const config = {
-    metadataStoreUri: 'http://aquarius:5000',
-    providerUri: 'http://localhost:8030',
-    nodeUri: `http://localhost:8545`,
-    factoryAddress: '0x2fC1fd21cb222Dc180Ef817dE4c426fd9230b5A5'
-  } as Config
+import WalletConnectProvider from '@walletconnect/web3-provider'
+import Torus from '@toruslabs/torus-embed'
 
-  const configRinkeby = {
-    metadataStoreUri: 'https://aquarius.rinkeby.v3.dev-ocean.com',
-    providerUri: 'https://provider.rinkeby.v3.dev-ocean.com',
-    nodeUri: `https://rinkeby.infura.io/a983b53583044593956054de049922fd`,
-    factoryAddress: '0xB9d406D24B310A7D821D0b782a36909e8c925471'
-  } as Config
+// factory Address needs to be updated each time you deploy the contract on local network
+const config = {
+  metadataStoreUri: 'http://aquarius:5000',
+  providerUri: 'http://localhost:8030',
+  nodeUri: `http://localhost:8545`,
+  factoryAddress: '0x2fC1fd21cb222Dc180Ef817dE4c426fd9230b5A5'
+} as Config
+
+const configRinkeby = {
+  metadataStoreUri: 'https://aquarius.rinkeby.v3.dev-ocean.com',
+  providerUri: 'https://provider.rinkeby.v3.dev-ocean.com',
+  nodeUri: `https://rinkeby.infura.io/a983b53583044593956054de049922fd`,
+  factoryAddress: '0xB9d406D24B310A7D821D0b782a36909e8c925471'
+} as Config
+
+const providerOptions = {
+  walletconnect: {
+    package: WalletConnectProvider,
+    options: {
+      infuraId: ''
+    }
+  },
+  torus: {
+    package: Torus,
+    options: {
+      networkParams: {
+        host: config.nodeUri // optional
+        // chainId: 1337, // optional
+        // networkId: 1337 // optional
+      }
+    }
+  }
+}
+
+export const web3ModalOpts = {
+  cacheProvider: true,
+  providerOptions
+}
+
+function App() {
   const init = async () => {}
+
   useEffect(() => {
     init()
   }, [])
 
   return (
     <div className="app">
-      <OceanProvider config={config}>
+      <OceanProvider config={config} web3ModalOpts={web3ModalOpts}>
         <div className="container">
           <div>
             <Wallet />

example/src/Publish.tsx

@@ -29,10 +29,8 @@ export function Publish() {
     }
   }
 
-  const marketAddress = '0x4D156A2ef69ffdDC55838176C6712C90f60a2285'
-
   const publishAsset = async () => {
-    const ddo = await publish(asset as Metadata, '4', marketAddress, [
+    const ddo = await publish(asset as Metadata, '4', [
       { serviceType: 'access', cost: '1' },
       { serviceType: 'compute', cost: '1' }
     ])

example/src/Wallet.tsx

@@ -3,29 +3,19 @@ import { useOcean } from '@oceanprotocol/react'
 import { useEffect } from 'react'
 
 export function Wallet() {
-  const { web3, ocean, connect, logout, accountId } = useOcean()
-  const conn = async () => {
-    const { default: WalletConnectProvider } = await import(
-      '@walletconnect/web3-provider'
-    )
-    const providerOptions = {
-      /* See Provider Options Section */
-      walletconnect: {
-        package: WalletConnectProvider, // required
-        options: {
-          infuraId: 'INFURA_ID' // required
-        }
-      }
-    }
+  const { ocean, connect, logout, accountId } = useOcean()
 
-    await connect({ cacheProvider: true, providerOptions })
+  const conn = async () => {
+    await connect()
   }
+
   const init = async () => {
     if (ocean === undefined || accountId === undefined) return
 
     const assets = await ocean.assets.ownerAssets(accountId)
     console.log(assets)
   }
+
   useEffect(() => {
     init()
   }, [ocean, accountId])
@@ -34,6 +24,7 @@ export function Wallet() {
     await logout()
     await conn()
   }
+
   return (
     <>
       <div>wallet</div>

package.json

@@ -27,7 +27,6 @@
   "dependencies": {
     "@oceanprotocol/lib": "^0.1.10",
     "axios": "^0.19.2",
-    "react": "^16.13.1",
     "web3": "^1.2.11",
     "web3modal": "^1.9.0"
   },