diff options
author | Sebastian <sebasjm@gmail.com> | 2023-06-20 11:50:04 -0300 |
---|---|---|
committer | Sebastian <sebasjm@gmail.com> | 2023-06-20 11:50:34 -0300 |
commit | 9f07ab8d4a13d52d7fd61a3e9b8ddc423fee164e (patch) | |
tree | b14a56a1e1e46c89b4e8d7090bf2f4380f31be18 /packages | |
parent | ac9b4bfd0edc8d4f8c396837d2192fb6895e5b29 (diff) | |
download | wallet-core-9f07ab8d4a13d52d7fd61a3e9b8ddc423fee164e.tar.xz |
remove from float
Diffstat (limited to 'packages')
-rw-r--r-- | packages/taler-util/src/amounts.ts | 26 | ||||
-rw-r--r-- | packages/taler-util/src/wallet-types.ts | 36 |
2 files changed, 43 insertions, 19 deletions
diff --git a/packages/taler-util/src/amounts.ts b/packages/taler-util/src/amounts.ts index a998c8f63..a8df3679f 100644 --- a/packages/taler-util/src/amounts.ts +++ b/packages/taler-util/src/amounts.ts @@ -147,8 +147,10 @@ export class Amounts { throw Error(`incompatible currency (${am1.currency} vs${am2.currency})`); } - const x1 = BigInt(am1.value) * BigInt(amountFractionalBase) + BigInt(am1.fraction); - const x2 = BigInt(am2.value) * BigInt(amountFractionalBase) + BigInt(am2.fraction); + const x1 = + BigInt(am1.value) * BigInt(amountFractionalBase) + BigInt(am1.fraction); + const x2 = + BigInt(am2.value) * BigInt(amountFractionalBase) + BigInt(am2.fraction); const quotient = x1 / x2; const remainderScaled = x1 % x2; @@ -158,9 +160,9 @@ export class Amounts { remainder: { currency: am1.currency, value: Number(remainderScaled / BigInt(amountFractionalBase)), - fraction: Number(remainderScaled % BigInt(amountFractionalBase)) - } - } + fraction: Number(remainderScaled % BigInt(amountFractionalBase)), + }, + }; } static sum(amounts: AmountLike[]): Result { @@ -391,20 +393,6 @@ export class Amounts { } } - /** - * Convert a float to a Taler amount. - * Loss of precision possible. - */ - static fromFloat(floatVal: number, currency: string): AmountJson { - return { - currency, - fraction: Math.floor( - (floatVal - Math.floor(floatVal)) * amountFractionalBase, - ), - value: Math.floor(floatVal), - }; - } - static min(a: AmountLike, b: AmountLike): AmountJson { const cr = Amounts.cmp(a, b); if (cr >= 0) { diff --git a/packages/taler-util/src/wallet-types.ts b/packages/taler-util/src/wallet-types.ts index b17860fc8..5a87864fc 100644 --- a/packages/taler-util/src/wallet-types.ts +++ b/packages/taler-util/src/wallet-types.ts @@ -187,6 +187,31 @@ interface GetPlanForWalletInitiatedOperation { mode: TransactionAmountMode; } +export interface ConvertAmountRequest { + amount: AmountString; + type: TransactionAmountMode; +} + +export const codecForConvertAmountRequest = + buildCodecForObject<ConvertAmountRequest>() + .property("amount", codecForAmountString()) + .property( + "type", + codecForEither( + codecForConstString(TransactionAmountMode.Raw), + codecForConstString(TransactionAmountMode.Effective), + ), + ) + .build("ConvertAmountRequest"); + +export interface GetAmountRequest { + currency: string; +} + +export const codecForGetAmountRequest = buildCodecForObject<GetAmountRequest>() + .property("currency", codecForString()) + .build("GetAmountRequest"); + interface GetPlanToCompleteOperation { instructedAmount: AmountString; } @@ -328,6 +353,17 @@ export const codecForGetPlanForOperationResponse = .property("counterPartyAmount", codecOptional(codecForAmountString())) .build("GetPlanForOperationResponse"); +export interface AmountResponse { + effectiveAmount: AmountString; + rawAmount: AmountString; +} + +export const codecForAmountResponse = (): Codec<AmountResponse> => + buildCodecForObject<AmountResponse>() + .property("effectiveAmount", codecForAmountString()) + .property("rawAmount", codecForAmountString()) + .build("AmountResponse"); + export interface Balance { scopeInfo: ScopeInfo; available: AmountString; |