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

factor out helper function

Browse Source
This commit is contained in:
Florian Dold 2016-11-14 03:01:42 +01:00
parent fdf4b1408f
commit 8fdbfeea59
1 changed files with 40 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/wallet.ts
View File

@ -241,6 +241,40 @@ interface KeyUpdateInfo {
removedDenominations: Denomination[]; removedDenominations: Denomination[];
} }
export type CoinSelectionResult = {exchangeUrl: string, cds: CoinWithDenom[]}|undefined;
export function selectCoins(cds: CoinWithDenom[], paymentAmount: AmountJson, depositFeeLimit: AmountJson): CoinWithDenom[]|undefined {
if (cds.length == 0) {
return undefined;
}
// Sort by ascending deposit fee
cds.sort((o1, o2) => Amounts.cmp(o1.denom.fee_deposit,
o2.denom.fee_deposit));
let currency = cds[0].denom.value.currency;
let cdsResult: CoinWithDenom[] = [];
let accFee: AmountJson = Amounts.getZero(currency);
let accAmount: AmountJson = Amounts.getZero(currency);
let isBelowFee = false;
let coversAmount = false;
let coversAmountWithFee = false;
for (let i = 0; i < cds.length; i++) {
let {coin,denom} = cds[i];
cdsResult.push(cds[i]);
if (Amounts.cmp(denom.fee_deposit, coin.currentAmount) >= 0) {
continue;
}
accFee = Amounts.add(denom.fee_deposit, accFee).amount;
accAmount = Amounts.add(coin.currentAmount, accAmount).amount;
coversAmount = Amounts.cmp(accAmount, paymentAmount) >= 0;
coversAmountWithFee = Amounts.cmp(accAmount, Amounts.add(paymentAmount, denom.fee_deposit).amount) >= 0;
isBelowFee = Amounts.cmp(accFee, depositFeeLimit) <= 0;
if ((coversAmount && isBelowFee) || coversAmountWithFee) {
return cdsResult;
}
}
return undefined;
}
/** /**
* Get a list of denominations (with repetitions possible) * Get a list of denominations (with repetitions possible)
@ -439,7 +473,7 @@ export class Wallet {
*/ */
private async getCoinsForPayment(paymentAmount: AmountJson, private async getCoinsForPayment(paymentAmount: AmountJson,
depositFeeLimit: AmountJson, depositFeeLimit: AmountJson,
allowedExchanges: ExchangeHandle[]): Promise<{exchangeUrl: string, cds: CoinWithDenom[]}|undefined> { allowedExchanges: ExchangeHandle[]): Promise<CoinSelectionResult> {
for (let exchangeHandle of allowedExchanges) { for (let exchangeHandle of allowedExchanges) {
let exchange = await this.q().get(Stores.exchanges, exchangeHandle.url); let exchange = await this.q().get(Stores.exchanges, exchangeHandle.url);
@ -475,35 +509,13 @@ export class Wallet {
cds.push({coin, denom}); cds.push({coin, denom});
} }
// Sort by ascending deposit fee let res = selectCoins(cds, paymentAmount, depositFeeLimit);
cds.sort((o1, o2) => Amounts.cmp(o1.denom.fee_deposit, if (res) {
o2.denom.fee_deposit)); return {
exchangeUrl: exchangeHandle.url,
let cdsResult: CoinWithDenom[] = []; cds: res,
let accFee: AmountJson = Amounts.getZero(currency);
let accAmount: AmountJson = Amounts.getZero(currency);
let isBelowFee = false;
let coversAmount = false;
let coversAmountWithFee = false;
for (let i = 0; i < cds.length; i++) {
let {coin,denom} = cds[i];
cdsResult.push(cds[i]);
if (Amounts.cmp(denom.fee_deposit, coin.currentAmount) >= 0) {
continue;
}
accFee = Amounts.add(denom.fee_deposit, accFee).amount;
accAmount = Amounts.add(coin.currentAmount, accAmount).amount;
coversAmount = Amounts.cmp(accAmount, paymentAmount) >= 0;
coversAmountWithFee = Amounts.cmp(accAmount, Amounts.add(paymentAmount, denom.fee_deposit).amount) >= 0;
isBelowFee = Amounts.cmp(accFee, depositFeeLimit) <= 0;
if ((coversAmount && isBelowFee) || coversAmountWithFee) {
return {
exchangeUrl: exchangeHandle.url,
cds: cdsResult,
};
} }
} }
} }
return undefined; return undefined;
} }