From 9791450b48bcd129acedff6f0d880dd17ccb47a8 Mon Sep 17 00:00:00 2001 From: mihaisc Date: Mon, 26 Oct 2020 16:36:35 +0200 Subject: [PATCH] update to new ocean.js Signed-off-by: mihaisc --- package-lock.json | 6 +++--- package.json | 2 +- src/hooks/usePricing/PriceOptions.ts | 1 + src/hooks/usePricing/usePricing.ts | 3 ++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4473ebf..ace990d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1521,9 +1521,9 @@ "integrity": "sha512-p0oOHXr60hXZuLNsQ/PsOQtCfia79thm7MjPxTrnnBvD+csJoHzARYMB0IFj/KTw6U5vLXODgjJAn8x6QksLwg==" }, "@oceanprotocol/lib": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-0.8.0.tgz", - "integrity": "sha512-FZALOw3LMAPo2US+YjJv5Fkz7IDS9m89PZzF7uKZKYT8V3xB/m0PV91vV1pEPC0eVWk3Sl1IXyT0L3ASFEUjvg==", + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-0.9.0.tgz", + "integrity": "sha512-BI00ZXTdGXJZNTJhwtqsnXjKtlcl1PXB18e26aCo5g1VT9S19urPLT04k9Zkz4k+3HepSc5QdOu+yo47MS1I7g==", "requires": { "@ethereum-navigator/navigator": "^0.5.0", "@oceanprotocol/contracts": "^0.5.7", diff --git a/package.json b/package.json index 0c6a24e..478a3a2 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "dist/" ], "dependencies": { - "@oceanprotocol/lib": "^0.8.1", + "@oceanprotocol/lib": "^0.9.0", "axios": "^0.21.0", "decimal.js": "^10.2.1", "web3": "^1.3.0", diff --git a/src/hooks/usePricing/PriceOptions.ts b/src/hooks/usePricing/PriceOptions.ts index a30b665..5899bd7 100644 --- a/src/hooks/usePricing/PriceOptions.ts +++ b/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 diff --git a/src/hooks/usePricing/usePricing.ts b/src/hooks/usePricing/usePricing.ts index 1834ec3..1592eb3 100644 --- a/src/hooks/usePricing/usePricing.ts +++ b/src/hooks/usePricing/usePricing.ts @@ -201,7 +201,7 @@ function usePricing(ddo: DDO): UsePricing { ): Promise { 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 +224,7 @@ function usePricing(ddo: DDO): UsePricing { dataToken, `${dtAmount}`, weightOnDataToken, + `${oceanAmount}`, swapFee ) .next((step: number) => setStep(step, 'pool'))