From d0d7de83f8931aed86df1ba17b4ac8e4137cc250 Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Tue, 27 Oct 2020 09:16:34 -0700 Subject: [PATCH 1/4] fix mint --- src/hooks/usePricing/usePricing.ts | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/hooks/usePricing/usePricing.ts b/src/hooks/usePricing/usePricing.ts index 4509330..08ec640 100644 --- a/src/hooks/usePricing/usePricing.ts +++ b/src/hooks/usePricing/usePricing.ts @@ -83,10 +83,16 @@ function usePricing(ddo: DDO): UsePricing { setPricingStepText(messages[index]) } - async function mint(tokensToMint: string): Promise { + async function mint( + tokensToMint: string + ): Promise { Logger.log('mint function', dataToken, accountId) - const tx = await ocean.datatokens.mint(dataToken, accountId, tokensToMint) - return tx + const balance = await ocean.datatokens.balance(dataToken, accountId) + if (parseFloat(tokensToMint) > parseFloat(balance)) { + tokensToMint = String(parseFloat(tokensToMint) - parseFloat(balance)) + const tx = await ocean.datatokens.mint(dataToken, accountId, tokensToMint) + return tx + } } async function buyDT( From f1934fec3ea5930c7883b17b61cc2598c0132498 Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Tue, 27 Oct 2020 09:22:22 -0700 Subject: [PATCH 2/4] use Decimal --- src/hooks/usePricing/usePricing.ts | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/hooks/usePricing/usePricing.ts b/src/hooks/usePricing/usePricing.ts index 08ec640..6a50848 100644 --- a/src/hooks/usePricing/usePricing.ts +++ b/src/hooks/usePricing/usePricing.ts @@ -87,10 +87,17 @@ function usePricing(ddo: DDO): UsePricing { tokensToMint: string ): Promise { Logger.log('mint function', dataToken, accountId) - const balance = await ocean.datatokens.balance(dataToken, accountId) - if (parseFloat(tokensToMint) > parseFloat(balance)) { - tokensToMint = String(parseFloat(tokensToMint) - parseFloat(balance)) - const tx = await ocean.datatokens.mint(dataToken, accountId, tokensToMint) + const balance = new Decimal( + await ocean.datatokens.balance(dataToken, accountId) + ) + const tokens = new Decimal(tokensToMint) + if (tokens > balance) { + const mintAmount = tokens.minus(balance) + const tx = await ocean.datatokens.mint( + dataToken, + accountId, + mintAmount.toString() + ) return tx } } From 6549f6ee9f2ee4e254e1b499103634eb71887bda Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Tue, 27 Oct 2020 09:23:52 -0700 Subject: [PATCH 3/4] fix Decimal compare --- src/hooks/usePricing/usePricing.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hooks/usePricing/usePricing.ts b/src/hooks/usePricing/usePricing.ts index 6a50848..457b128 100644 --- a/src/hooks/usePricing/usePricing.ts +++ b/src/hooks/usePricing/usePricing.ts @@ -91,7 +91,7 @@ function usePricing(ddo: DDO): UsePricing { await ocean.datatokens.balance(dataToken, accountId) ) const tokens = new Decimal(tokensToMint) - if (tokens > balance) { + if (tokens.greaterThan(balance)) { const mintAmount = tokens.minus(balance) const tx = await ocean.datatokens.mint( dataToken, From 77b172573ca81adb79ddea046daca5050bd16765 Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Tue, 27 Oct 2020 09:29:09 -0700 Subject: [PATCH 4/4] fix lint --- src/hooks/usePricing/usePricing.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hooks/usePricing/usePricing.ts b/src/hooks/usePricing/usePricing.ts index 457b128..7b2b588 100644 --- a/src/hooks/usePricing/usePricing.ts +++ b/src/hooks/usePricing/usePricing.ts @@ -22,7 +22,7 @@ interface UsePricing { ) => Promise buyDT: (dtAmount: number | string) => Promise sellDT: (dtAmount: number | string) => Promise - mint: (tokensToMint: string) => Promise + mint: (tokensToMint: string) => Promise pricingStep?: number pricingStepText?: string pricingError?: string