Merge pull request #164 from oceanprotocol/update/ocean.js-bump

Update/ocean.js bump

example/src/Pricing.tsx

@@ -7,21 +7,30 @@ import { Metadata } from '@oceanprotocol/lib/dist/node/ddo/interfaces/Metadata'
 
 export function Trade() {
   const { ocean, accountId } = useOcean()
-  const { createPricing,buyDT,sellDT,mint,pricingStep,pricingStepText,pricingIsLoading, pricingError} = usePricing()
+  const {
+    createPricing,
+    buyDT,
+    sellDT,
+    mint,
+    pricingStep,
+    pricingStepText,
+    pricingIsLoading,
+    pricingError
+  } = usePricing()
   const [datatoken, setDatatoken] = useState<string | undefined>()
   const handleBuy = async () => {
-    const tx = await buyDT(datatoken,'1')
+    const tx = await buyDT(datatoken, '1')
     console.log(tx)
   }
   const handleSell = async () => {
-      const tx = await buyDT(datatoken,'1')
+    const tx = await buyDT(datatoken, '1')
-      console.log(tx)
+    console.log(tx)
   }
   const handleChange = (e: any) => {
     setDatatoken(e.target.value)
   }
   const handlePostForSale = async () => {
-    if(datatoken){
+    if (datatoken) {
       const priceOptions = {
         price: 7,
         dtAmount: 10,
@@ -29,7 +38,7 @@ export function Trade() {
         weightOnDataToken: '',
         swapFee: ''
       }
-      const tx = await createPricing(datatoken,priceOptions)
+      const tx = await createPricing(datatoken, priceOptions)
       console.log(tx)
     }
   }
@@ -51,7 +60,6 @@ export function Trade() {
       <div>
         IsLoading: {pricingIsLoading.toString()} || Status: {pricingStepText}
       </div>
-      
     </>
   )
 }

example/src/Publish.tsx

@@ -6,7 +6,13 @@ import { Metadata } from '@oceanprotocol/lib/dist/node/ddo/interfaces/Metadata'
 
 export function Publish() {
   const { publish, publishStepText, isLoading } = usePublish()
-  const { createPricing, pricingStep, pricingStepText, pricingIsLoading, pricingError} = usePricing()
+  const {
+    createPricing,
+    pricingStep,
+    pricingStepText,
+    pricingIsLoading,
+    pricingError
+  } = usePricing()
   const [ddo, setDdo] = useState<DDO | undefined | null>()
 
   const asset = {
@@ -31,16 +37,12 @@ export function Publish() {
   }
 
   const publishAsset = async () => {
-    
+    const datatokenOptions = {}
-    const datatokenOptions = {
-      
-    }
     const ddo = await publish(asset as Metadata, 'access', datatokenOptions)
     console.log(ddo)
     setDdo(ddo)
   }
 
-  
   return (
     <>
       <div>Publish</div>
@@ -51,7 +53,6 @@ export function Publish() {
         IsLoading: {isLoading.toString()} || Status: {publishStepText}
       </div>
       <div>DID: {ddo && ddo.id} </div>
-      
     </>
   )
 }

package-lock.json

@@ -1521,9 +1521,9 @@
       "integrity": "sha512-p0oOHXr60hXZuLNsQ/PsOQtCfia79thm7MjPxTrnnBvD+csJoHzARYMB0IFj/KTw6U5vLXODgjJAn8x6QksLwg=="
     },
     "@oceanprotocol/lib": {
-      "version": "0.8.0",
+      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-0.8.0.tgz",
+      "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-0.9.0.tgz",
-      "integrity": "sha512-FZALOw3LMAPo2US+YjJv5Fkz7IDS9m89PZzF7uKZKYT8V3xB/m0PV91vV1pEPC0eVWk3Sl1IXyT0L3ASFEUjvg==",
+      "integrity": "sha512-BI00ZXTdGXJZNTJhwtqsnXjKtlcl1PXB18e26aCo5g1VT9S19urPLT04k9Zkz4k+3HepSc5QdOu+yo47MS1I7g==",
       "requires": {
         "@ethereum-navigator/navigator": "^0.5.0",
         "@oceanprotocol/contracts": "^0.5.7",

package.json

@@ -25,7 +25,7 @@
     "dist/"
   ],
   "dependencies": {
-    "@oceanprotocol/lib": "^0.8.0",
+    "@oceanprotocol/lib": "^0.9.0",
     "axios": "^0.21.0",
     "decimal.js": "^10.2.1",
     "web3": "^1.3.0",

src/hooks/usePricing/PriceOptions.ts

@@ -1,6 +1,7 @@
 export interface PriceOptions {
   price: number
   dtAmount: number
+  oceanAmount: number
   type: 'fixed' | 'dynamic' | string
   weightOnDataToken: string
   swapFee: string

src/hooks/usePricing/usePricing.ts

@@ -201,7 +201,14 @@ function usePricing(ddo: DDO): UsePricing {
   ): Promise<TransactionReceipt | void> {
     if (!ocean || !accountId || !dtSymbol) return
 
-    const { type, dtAmount, price, weightOnDataToken, swapFee } = priceOptions
+    const {
+      type,
+      dtAmount,
+      oceanAmount,
+      price,
+      weightOnDataToken,
+      swapFee
+    } = priceOptions
     const isPool = type === 'dynamic'
 
     if (!isPool && !config.fixedRateExchangeAddress) {
@@ -224,6 +231,7 @@ function usePricing(ddo: DDO): UsePricing {
               dataToken,
               `${dtAmount}`,
               weightOnDataToken,
+              `${oceanAmount}`,
               swapFee
             )
             .next((step: number) => setStep(step, 'pool'))