diff --git a/example/src/Pricing.tsx b/example/src/Pricing.tsx index c4d63f8..6448cea 100644 --- a/example/src/Pricing.tsx +++ b/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() 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') - console.log(tx) + const tx = await buyDT(datatoken, '1') + 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() {
IsLoading: {pricingIsLoading.toString()} || Status: {pricingStepText}
- ) } diff --git a/example/src/Publish.tsx b/example/src/Publish.tsx index 6e7e46c..6270db9 100644 --- a/example/src/Publish.tsx +++ b/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() 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 ( <>
Publish
@@ -51,7 +53,6 @@ export function Publish() { IsLoading: {isLoading.toString()} || Status: {publishStepText}
DID: {ddo && ddo.id}
- ) } 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 2d2f7f4..478a3a2 100644 --- a/package.json +++ b/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", 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..4509330 100644 --- a/src/hooks/usePricing/usePricing.ts +++ b/src/hooks/usePricing/usePricing.ts @@ -201,7 +201,14 @@ 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 +231,7 @@ function usePricing(ddo: DDO): UsePricing { dataToken, `${dtAmount}`, weightOnDataToken, + `${oceanAmount}`, swapFee ) .next((step: number) => setStep(step, 'pool'))