remove FF wallet link

This commit is contained in:
Florian Dold 2016-02-19 13:03:45 +01:00
parent 29dfafaa12
commit bbd20cd80a
5 changed files with 146147 additions and 19 deletions

File diff suppressed because one or more lines are too long

View File

@ -381,6 +381,10 @@ export class Amount extends ArenaObject {
} }
cmp(a: Amount) { cmp(a: Amount) {
// If we don't check this, the c code aborts.
if (this.currency !== a.currency) {
throw Error(`incomparable currencies (${this.currency} and ${a.currency})`);
}
return emsc.amount_cmp(this.nativePtr, a.nativePtr); return emsc.amount_cmp(this.nativePtr, a.nativePtr);
} }

View File

@ -513,7 +513,7 @@ export class Wallet {
function storeMintCoin(mc) { function storeMintCoin(mc) {
let mint: IMintInfo = mc[0]; let mint: IMintInfo = mc[0];
let coin = mc[1]; let coin: Coin = mc[1];
let cd = { let cd = {
coin: coin, coin: coin,
denom: mint.denoms.find((e) => e.denom_pub === coin.denomPub) denom: mint.denoms.find((e) => e.denom_pub === coin.denomPub)
@ -521,6 +521,10 @@ export class Wallet {
if (!cd.denom) { if (!cd.denom) {
throw Error("denom not found (database inconsistent)"); throw Error("denom not found (database inconsistent)");
} }
if (cd.denom.value.currency !== paymentAmount.currency) {
console.warn("same pubkey for different currencies");
return;
}
let x = m[mint.baseUrl]; let x = m[mint.baseUrl];
if (!x) { if (!x) {
m[mint.baseUrl] = [cd]; m[mint.baseUrl] = [cd];

View File

@ -139,7 +139,8 @@ function dispatch(handlers, req, sendResponse) {
}) })
}) })
.catch((e) => { .catch((e) => {
console.log("exception during wallet handler"); console.log(`exception during wallet handler for '${req.type}'`);
console.log("request", req);
console.error(e); console.error(e);
sendResponse({ sendResponse({
error: "exception", error: "exception",
@ -205,7 +206,8 @@ export function wxMain() {
try { try {
return dispatch(handlers, req, sendResponse) return dispatch(handlers, req, sendResponse)
} catch (e) { } catch (e) {
console.log("exception during wallet handler (dispatch)"); console.log(`exception during wallet handler (dispatch)`);
console.log("request", req);
console.error(e); console.error(e);
sendResponse({ sendResponse({
error: "exception", error: "exception",

View File

@ -2,7 +2,7 @@
"description": "Privacy preserving and transparent payments", "description": "Privacy preserving and transparent payments",
"manifest_version": 2, "manifest_version": 2,
"name": "GNU Taler Wallet (git)", "name": "GNU Taler Wallet (git)",
"version": "0.5.9", "version": "0.5.10",
"applications": { "applications": {
"gecko": { "gecko": {