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

check for re-payment (fix #4525)

Browse Source
This commit is contained in:
Florian Dold 2016-05-24 01:53:56 +02:00
parent 50fb0f2beb
commit 741dff2706
2 changed files with 81 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/emscripten/libwrapper.js
View File

File diff suppressed because one or more lines are too long

103
lib/wallet/wallet.ts
View File

@ -21,7 +21,14 @@
* @author Florian Dold * @author Florian Dold
*/ */
import {AmountJson, CreateReserveResponse, IExchangeInfo, Denomination, Notifier, WireInfo} from "./types"; import {
AmountJson,
CreateReserveResponse,
IExchangeInfo,
Denomination,
Notifier,
WireInfo
} from "./types";
import {HttpResponse, RequestException} from "./http"; import {HttpResponse, RequestException} from "./http";
import {Query} from "./query"; import {Query} from "./query";
import {Checkable} from "./checkable"; import {Checkable} from "./checkable";
@ -139,7 +146,10 @@ class ExchangeInfo implements IExchangeInfo {
.isValidDenom(newDenom, this.masterPublicKey) .isValidDenom(newDenom, this.masterPublicKey)
.then((valid) => { .then((valid) => {
if (!valid) { if (!valid) {
console.error("invalid denomination", newDenom, "with key", this.masterPublicKey); console.error("invalid denomination",
newDenom,
"with key",
this.masterPublicKey);
throw Error("signature on denomination invalid"); throw Error("signature on denomination invalid");
} }
return cryptoApi.hashRsaPub(newDenom.denom_pub); return cryptoApi.hashRsaPub(newDenom.denom_pub);
@ -422,10 +432,12 @@ export class Wallet {
} }
handledExchanges.add(info.url); handledExchanges.add(info.url);
console.log("Checking for merchant's exchange", JSON.stringify(info)); console.log("Checking for merchant's exchange", JSON.stringify(info));
return [Query(this.db) return [
.iter("exchanges", {indexName: "pubKey", only: info.master_pub}) Query(this.db)
.indexJoin("coins", "exchangeBaseUrl", (exchange) => exchange.baseUrl) .iter("exchanges", {indexName: "pubKey", only: info.master_pub})
.reduce((x) => storeExchangeCoin(x, info.url))]; .indexJoin("coins", "exchangeBaseUrl", (exchange) => exchange.baseUrl)
.reduce((x) => storeExchangeCoin(x, info.url))
];
}); });
return Promise.all(ps).then(() => { return Promise.all(ps).then(() => {
@ -536,23 +548,32 @@ export class Wallet {
*/ */
confirmPay(offer: Offer): Promise<any> { confirmPay(offer: Offer): Promise<any> {
console.log("executing confirmPay"); console.log("executing confirmPay");
return Promise.resolve().then(() => {
return this.getPossibleExchangeCoins(offer.contract.amount,
offer.contract.max_fee,
offer.contract.exchanges)
}).then((mcs) => {
if (Object.keys(mcs).length == 0) {
console.log("not confirming payment, insufficient coins");
return {
error: "coins-insufficient",
};
}
let exchangeUrl = Object.keys(mcs)[0];
return this.cryptoApi.signDeposit(offer, mcs[exchangeUrl]) return Query(this.db)
.then((ds) => this.recordConfirmPay(offer, ds, exchangeUrl)) .get("transactions", offer.H_contract)
.then(() => ({})); .then((transaction) => {
}); if (transaction) {
// Already payed ...
return {};
}
return Promise.resolve().then(() => {
return this.getPossibleExchangeCoins(offer.contract.amount,
offer.contract.max_fee,
offer.contract.exchanges)
}).then((mcs) => {
if (Object.keys(mcs).length == 0) {
console.log("not confirming payment, insufficient coins");
return {
error: "coins-insufficient",
};
}
let exchangeUrl = Object.keys(mcs)[0];
return this.cryptoApi.signDeposit(offer, mcs[exchangeUrl])
.then((ds) => this.recordConfirmPay(offer, ds, exchangeUrl))
.then(() => ({}));
});
});
} }
@ -562,19 +583,31 @@ export class Wallet {
*/ */
checkPay(offer: Offer): Promise<any> { checkPay(offer: Offer): Promise<any> {
console.log("executing checkPay"); console.log("executing checkPay");
return Promise.resolve().then(() => {
return this.getPossibleExchangeCoins(offer.contract.amount, // First check if we already payed for it.
offer.contract.max_fee, return Query(this.db)
offer.contract.exchanges) .get("transactions", offer.H_contract)
}).then((mcs) => { .then((transaction) => {
if (Object.keys(mcs).length == 0) { if (transaction) {
console.log("not confirming payment, insufficient coins"); return {isPayed: true};
return { }
error: "coins-insufficient",
}; // If not already payed, check if we could pay for it.
} return Promise.resolve().then(() => {
return {}; return this.getPossibleExchangeCoins(offer.contract.amount,
}); offer.contract.max_fee,
offer.contract.exchanges)
}).then((mcs) => {
if (Object.keys(mcs).length == 0) {
console.log("not confirming payment, insufficient coins");
return {
error: "coins-insufficient",
};
}
return {isPayed: false};
});
});
} }