taler/wallet-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

proper rounding for amount operations

Browse Source
This commit is contained in:
Florian Dold 2017-08-27 05:57:39 +02:00
parent 63914ab53b
commit b47522c11b
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/types.ts
View File

@ -1312,7 +1312,7 @@ export namespace Amounts {
} }
value = value + x.value + Math.floor((fraction + x.fraction) / fractionalBase); value = value + x.value + Math.floor((fraction + x.fraction) / fractionalBase);
fraction = (fraction + x.fraction) % fractionalBase; fraction = Math.floor((fraction + x.fraction) % fractionalBase);
if (value > Number.MAX_SAFE_INTEGER) { if (value > Number.MAX_SAFE_INTEGER) {
return { amount: getMaxAmount(currency), saturated: true }; return { amount: getMaxAmount(currency), saturated: true };
} }
@ -1440,7 +1440,7 @@ export namespace Amounts {
export function fromFloat(floatVal: number, currency: string) { export function fromFloat(floatVal: number, currency: string) {
return { return {
currency, currency,
fraction: (floatVal - Math.floor(floatVal)) * fractionalBase, fraction: Math.floor((floatVal - Math.floor(floatVal)) * fractionalBase),
value: Math.floor(floatVal), value: Math.floor(floatVal),
}; };
} }

4
src/wallet.ts
View File

@ -413,6 +413,8 @@ export function selectPayCoins(cds: CoinWithDenom[], paymentAmount: AmountJson,
denom.feeDeposit).amount) >= 0; denom.feeDeposit).amount) >= 0;
isBelowFee = Amounts.cmp(accFee, depositFeeLimit) <= 0; isBelowFee = Amounts.cmp(accFee, depositFeeLimit) <= 0;
console.log("coin selection", { coversAmount, isBelowFee, accFee, accAmount, paymentAmount });
if ((coversAmount && isBelowFee) || coversAmountWithFee) { if ((coversAmount && isBelowFee) || coversAmountWithFee) {
return cdsResult; return cdsResult;
} }
@ -759,6 +761,8 @@ export class Wallet {
cds.push({coin, denom}); cds.push({coin, denom});
} }
console.log("coin return: selecting from possible coins", { cds, amount } );
return selectPayCoins(cds, amount, amount); return selectPayCoins(cds, amount, amount);
} }