uptate libs

example/src/AllDdos.tsx

@@ -9,7 +9,6 @@ export function AllDdos() {
 
   const [ddos, setDdos] = useState<DDO[] | undefined>()
 
-
   useEffect(() => {
     async function init() {
       if (ocean === undefined) return
@@ -28,8 +27,14 @@ export function AllDdos() {
   return (
     <>
       <div>Assets</div> <br />
-            <div style={{flexDirection: "column"}}>{ddos?.map((ddo) => {
+      <div style={{ flexDirection: 'column' }}>
-                return <div key={shortid.generate()}><span  >{ddo.id} / {ddo.dataToken }</span><br/></div>
+        {ddos?.map((ddo) => {
+          return (
+            <div key={shortid.generate()}>
+              {ddo.id}
+              <br />
+            </div>
+          )
         })}
       </div>
     </>

example/src/App.css

@@ -12,5 +12,5 @@
 .container div {
   display: flex;
   padding: 10px;
-  margin-top: 40px;
+  margin-bottom: 10px;
 }

example/src/ConsumeDdo.tsx

@@ -9,9 +9,7 @@ export function ConsumeDdo() {
   const { consumeStepText, consume, consumeError } = useConsume()
   const [did, setDid] = useState<string | undefined>()
   useEffect(() => {
-        async function init() {
+    async function init() {}
-
-        }
     init()
   }, [ocean])
 
@@ -22,13 +20,17 @@ export function ConsumeDdo() {
   }
 
   const handleChange = (e: any) => {
-        setDid(e.target.value);
+    setDid(e.target.value)
   }
   return (
     <>
       <div>Consume</div>
-            <div>DID <input onChange={handleChange}></input></div>
+      <div>
-            <div><button onClick={consumeDid}>Consume did</button></div>
+        DID <input onChange={handleChange}></input>
+      </div>
+      <div>
+        <button onClick={consumeDid}>Consume did</button>
+      </div>
       <div>{consumeStepText}</div>
       <div>{consumeError}</div>
     </>

example/src/Publish.tsx

@@ -32,7 +32,7 @@ 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', marketAddress)
     console.log(ddo)
     setDdo(ddo)
   }

example/src/Wallet.tsx

@@ -9,7 +9,6 @@ export function Wallet() {
       '@walletconnect/web3-provider'
     )
     const providerOptions = {
-
       /* See Provider Options Section */
       walletconnect: {
         package: WalletConnectProvider, // required
@@ -25,7 +24,6 @@ export function Wallet() {
   const init = async () => {
     if (ocean === undefined || accountId === undefined) return
 
-
     const assets = await ocean.assets.ownerAssets(accountId)
     console.log(assets)
   }

example/src/index.tsx

@@ -9,4 +9,3 @@ ReactDOM.render(
   </React.StrictMode>,
   document.getElementById('root')
 )
-

package-lock.json

@@ -371,18 +371,18 @@
       }
     },
     "@oceanprotocol/contracts": {
-      "version": "0.2.2",
+      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-0.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-0.2.3.tgz",
-      "integrity": "sha512-wu5Ub5F50vCAON0GKyv4anPPLm+oWfHViksiAewVS/xvbbnSCt4gHws2Uc1ct25tiO/2AHAyJkqEiC0ep8SHeQ=="
+      "integrity": "sha512-5Oohzno3tnISMYG1jhtHxKMMkcIypTZAPlIoFjE5vDlAW51tyuxwYxBXHYQ2/FLRVFkmUmy5yASKg9zbnKKwQw=="
     },
     "@oceanprotocol/lib": {
-      "version": "0.1.2",
+      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-0.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-0.1.4.tgz",
-      "integrity": "sha512-v4Y0u7WnhhA33uIMuGKlWqGdlZLen7xRcwCBMvTlLp13Z3K+lOcg7UTByVxnKy2Tg2//wMYUWfuhSsk4nDA/DA==",
+      "integrity": "sha512-H+soD+W+fOdKXgFxM8pkhAs9JoJDMWxudvTJxT696Ch+z1CvbcEh4bFNlUpjWhVgwjMTVCigYum3BG+V1mqN1Q==",
       "requires": {
         "@ethereum-navigator/navigator": "^0.5.0",
+        "@oceanprotocol/contracts": "^0.2.3",
         "bignumber.js": "^9.0.0",
-        "deprecated-decorator": "^0.1.6",
         "fs": "0.0.1-security",
         "node-fetch": "^2.6.0",
         "save-file": "^2.3.1",
@@ -390,6 +390,13 @@
         "web3": "^1.2.9",
         "web3-eth-contract": "^1.2.9",
         "whatwg-url": "^8.0.0"
+      },
+      "dependencies": {
+        "@oceanprotocol/contracts": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-0.2.3.tgz",
+          "integrity": "sha512-5Oohzno3tnISMYG1jhtHxKMMkcIypTZAPlIoFjE5vDlAW51tyuxwYxBXHYQ2/FLRVFkmUmy5yASKg9zbnKKwQw=="
+        }
       }
     },
     "@octokit/auth-token": {
@@ -2000,11 +2007,6 @@
       "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
       "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
     },
-    "deprecated-decorator": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/deprecated-decorator/-/deprecated-decorator-0.1.6.tgz",
-      "integrity": "sha1-AJZjF7ehL+kvPMgx91g68ym4bDc="
-    },
     "deprecated-obj": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/deprecated-obj/-/deprecated-obj-1.0.1.tgz",

package.json

@@ -21,8 +21,8 @@
     "dist/"
   ],
   "dependencies": {
-    "@oceanprotocol/contracts": "^0.2.2",
+    "@oceanprotocol/contracts": "^0.2.3",
-    "@oceanprotocol/lib": "^0.1.2",
+    "@oceanprotocol/lib": "^0.1.4",
     "@walletconnect/web3-provider": "^1.0.15",
     "axios": "^0.19.2",
     "react": "^16.9.41",

src/hooks/useConsume/useConsume.ts

@@ -27,7 +27,6 @@ function useConsume(): UseConsume {
   const [consumeStepText, setConsumeStepText] = useState<string | undefined>()
   const [consumeError, setConsumeError] = useState<string | undefined>()
 
-
   function setStep(index: number) {
     setConsumeStep(index)
     setConsumeStepText(consumeFeedback[index])
@@ -47,10 +46,11 @@ function useConsume(): UseConsume {
       setStep(2)
       const res = JSON.parse(order)
       Logger.log('order parsed', res)
+      Logger.log('ocean.datatokens before transfer', ocean.datatokens)
       const tokenTransfer = await ocean.datatokens.transferWei(
         res.dataToken,
         res.to,
-        res.numTokens,
+        String(res.numTokens),
         res.from
       )
       Logger.log('token transfered', tokenTransfer)

src/hooks/usePublish/usePublish.ts

@@ -7,52 +7,62 @@ import { Service } from '@oceanprotocol/lib/dist/node/ddo/interfaces/Service'
 interface UsePublish {
   publish: (
     asset: Metadata,
-    tokensToMint: number,
+    tokensToMint: string,
     marketAddress: string,
-    cost?: number
+    cost?: string
   ) => Promise<DDO>
-  mint: (tokenAddress: string, tokensToMint: number) => void
+  mint: (tokenAddress: string, tokensToMint: string) => void
 }
 
 function usePublish(): UsePublish {
   const { web3, ocean, status, account, accountId, config } = useOcean()
 
+  function createDataToken() {
+    return new DataTokens(
+      ocean.datatokens.factoryAddress,
+      ocean.datatokens.factoryABI.abi,
+      ocean.datatokens.datatokensABI.abi,
+      web3
+    )
+  }
+
   async function publish(
     asset: Metadata,
-    tokensToMint: number,
+    tokensToMint: string,
     marketAddress: string,
-    cost = 1
+    cost = '1'
   ): Promise<DDO> {
     if (status !== ProviderStatus.CONNECTED) return
 
-    const datatoken = new DataTokens(
+    const datatoken = createDataToken()
-      ocean.datatokens.factoryAddress,
-      (ocean.datatokens.factoryABI as any).abi,
-      (ocean.datatokens.datatokensABI as any).abi,
-      web3
-    )
 
-    Logger.log('datatoken created', datatoken)
+    Logger.log('datatokens created', datatoken)
+    Logger.log('ocean dt', ocean.datatokens)
     const data = { t: 1, url: config.metadataStoreUri }
     const blob = JSON.stringify(data)
     const tokenAddress = await datatoken.create(blob, accountId)
-
+    Logger.log('datatoken created', datatoken)
     Logger.log('tokensto mint', tokensToMint)
 
-   
     await mint(tokenAddress, tokensToMint, datatoken)
 
     Logger.log('giving allowance to ', marketAddress)
-    await giveMarketAllowance(tokenAddress,marketAddress, tokensToMint,datatoken)
+    await giveMarketAllowance(
+      tokenAddress,
+      marketAddress,
+      tokensToMint,
+      datatoken
+    )
     Logger.log('tokenAddress created', tokenAddress)
     const publishedDate = new Date(Date.now()).toISOString().split('.')[0] + 'Z'
     const timeout = 0
     let services: Service[] = []
+    const price = datatoken.toWei(cost)
     switch (asset.main.type) {
       case 'dataset': {
         const accessService = await ocean.assets.createAccessServiceAttributes(
           account,
-          cost.toString(),
+          price,
           publishedDate,
           timeout
         )
@@ -77,16 +87,10 @@ function usePublish(): UsePublish {
 
   async function mint(
     tokenAddress: string,
-    tokensToMint: number,
+    tokensToMint: string,
     datatoken?: DataTokens
   ) {
-    if (datatoken === undefined)
+    if (datatoken === undefined) datatoken = createDataToken()
-      datatoken = new DataTokens(
-        ocean.datatokens.factoryAddress,
-        (ocean.datatokens.factoryABI as any).abi,
-        (ocean.datatokens.datatokensABI as any).abi,
-        web3
-      )
     Logger.log('mint function', tokenAddress, accountId)
     await datatoken.mint(tokenAddress, accountId, tokensToMint)
   }
@@ -94,18 +98,11 @@ function usePublish(): UsePublish {
   async function giveMarketAllowance(
     tokenAddress: string,
     marketAddress: string,
-    tokens: number,
+    tokens: string,
     datatoken?: DataTokens
   ) {
-    if (datatoken === undefined)
+    if (datatoken === undefined) datatoken = createDataToken()
-      datatoken = new DataTokens(
-        ocean.datatokens.factoryAddress,
-        (ocean.datatokens.factoryABI as any).abi,
-        (ocean.datatokens.datatokensABI as any).abi,
-        web3
-      )
     await datatoken.approve(tokenAddress, marketAddress, tokens, accountId)
-
   }
 
   return {

src/providers/OceanProvider/OceanProvider.tsx

@@ -62,6 +62,10 @@ function OceanProvider({
     const web3 = new Web3(provider)
     setWeb3(web3)
 
+    // const factory = require('@oceanprotocol/contracts/artifacts/development/Factory.json')
+    // const datatokensTemplate = require('@oceanprotocol/contracts/artifacts/development/DataTokenTemplate.json')
+    // config.factoryABI = factory.abi
+    // config.datatokensABI = datatokensTemplate.abi
     config.web3Provider = web3
     const ocean = await Ocean.getInstance(config)
 

src/providers/OceanProvider/getDefaultProviders.ts

@@ -10,7 +10,6 @@ export async function getDefaultProviders(){
         infuraId: 'INFURA_ID' // required
       }
     }
-      
   }
 
   return { cacheProvider: true, providerOptions }