Error Report Not Found

This page is supposed to display an error reported by the GNU Taler wallet, but the corresponding error report can't be found.

@@ -46,15 +48,47 @@ class ErrorView extends React.Component {

); } - switch (report.name) { - default: + try { + switch (report.name) { + case "pay-post-failed": { + const summary = report.contractTerms.summary || report.contractTerms.order_id; + return ( +

Failed to send payment

Failed to send payment for {summary} to merchant {report.contractTerms.merchant.name}.

You can retry the payment. If this problem persists, + please contact the mechant with the error details below.

+ +

+                  {JSON.stringify(report, null, " ")}
+

+ +

+ ); + } + default: + return ( +

Unknown Error

+ The GNU Taler wallet reported an unknown error. Here are the details: +

+                {JSON.stringify(report, null, " ")}
+

+ ); + } + } catch (e) { return ( -

Unknown Error

- The GNU Taler wallet reported an unknown error. Here are the details: +

Error

+ The GNU Taler wallet reported an error. Here are the details:

               {JSON.stringify(report, null, " ")}

+ A detailed error report could not be generated: +

+              {e.toString()}
+

); } diff --git a/src/webex/renderHtml.tsx b/src/webex/renderHtml.tsx index fe964e68a..2a5b50533 100644 --- a/src/webex/renderHtml.tsx +++ b/src/webex/renderHtml.tsx @@ -91,3 +91,40 @@ export function abbrev(s: string, n: number = 5) { ); } + + + +interface CollapsibleState { + collapsed: boolean; +} + +interface CollapsibleProps { + initiallyCollapsed: boolean; + title: string; +} + +export class Collapsible extends React.Component { + constructor(props: CollapsibleProps) { + super(props); + this.state = { collapsed: props.initiallyCollapsed }; + } + render() { + const doOpen = (e: any) => { + this.setState({collapsed: false}); + e.preventDefault(); + }; + const doClose = (e: any) => { + this.setState({collapsed: true}); + e.preventDefault(); + }; + if (this.state.collapsed) { + return

{this.props.title}

; + } + return ( +

{this.props.title}

+ {this.props.children} +

+ ); + } +} -- cgit v1.2.3 From ccc6d822424be9b257e63b0d71f2d46f2523fe3e Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sun, 27 Aug 2017 04:35:24 +0200 Subject: canonicalize account info JSON when collecting them --- src/wallet.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/wallet.ts b/src/wallet.ts index b892e2e4b..72c8a70f8 100644 --- a/src/wallet.ts +++ b/src/wallet.ts @@ -2413,7 +2413,7 @@ export class Wallet { const senderWiresSet = new Set(); await this.q().iter(Stores.reserves).map((x) => { if (x.senderWire) { - senderWiresSet.add(JSON.stringify(x.senderWire)); + senderWiresSet.add(canonicalJson(x.senderWire)); } }).run(); const senderWires = Array.from(senderWiresSet).map((x) => JSON.parse(x)); -- cgit v1.2.3 From 63914ab53b18ec29269c2c3fe4e01ac9b36330e5 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sun, 27 Aug 2017 05:42:46 +0200 Subject: make sure that refreshing works after refund --- src/query.ts | 18 ++++++++++++++++-- src/types.ts | 5 +++++ src/wallet.ts | 37 +++++++++++++++++++++---------------- 3 files changed, 42 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/query.ts b/src/query.ts index ee1ac2603..d7689f2bc 100644 --- a/src/query.ts +++ b/src/query.ts @@ -547,9 +547,18 @@ export class QueryRoot { private finished: boolean = false; + private keys: { [keyName: string]: IDBValidKey } = {}; + constructor(public db: IDBDatabase) { } + /** + * Get a named key that was created during the query. + */ + key(keyName: string): IDBValidKey|undefined { + return this.keys[keyName]; + } + private checkFinished() { if (this.finished) { throw Error("Can't add work to query after it was started"); @@ -627,10 +636,15 @@ export class QueryRoot { * Overrides if an existing object with the same key exists * in the store. */ - put(store: Store, val: T): QueryRoot { + put(store: Store, val: T, keyName?: string): QueryRoot { this.checkFinished(); const doPut = (tx: IDBTransaction) => { - tx.objectStore(store.name).put(val); + const req = tx.objectStore(store.name).put(val); + if (keyName) { + req.onsuccess = () => { + this.keys[keyName] = req.result; + }; + } }; this.scheduleFinish(); this.addWork(doPut, store.name, true); diff --git a/src/types.ts b/src/types.ts index aabf4ffc0..9492d1a75 100644 --- a/src/types.ts +++ b/src/types.ts @@ -759,6 +759,11 @@ export interface RefreshSessionRecord { * Is this session finished? */ finished: boolean; + + /** + * Record ID when retrieved from the DB. + */ + id?: number; } diff --git a/src/wallet.ts b/src/wallet.ts index 72c8a70f8..e7a36f7b7 100644 --- a/src/wallet.ts +++ b/src/wallet.ts @@ -555,7 +555,7 @@ export namespace Stores { export const nonces = new NonceStore(); export const precoins = new Store("precoins", {keyPath: "coinPub"}); export const proposals = new ProposalsStore(); - export const refresh = new Store("refresh", {keyPath: "meltCoinPub"}); + export const refresh = new Store("refresh", {keyPath: "id", autoIncrement: true}); export const reserves = new Store("reserves", {keyPath: "reserve_pub"}); export const purchases = new PurchasesStore(); } @@ -1836,7 +1836,7 @@ export class Wallet { if (c.suspended) { return balance; } - if (!(c.status === CoinStatus.Dirty || c.status === CoinStatus.Fresh)) { + if (!(c.status === CoinStatus.Fresh)) { return balance; } console.log("collecting balance"); @@ -1999,25 +1999,30 @@ export class Wallet { // Store refresh session and subtract refreshed amount from // coin in the same transaction. - await this.q() - .put(Stores.refresh, refreshSession) - .mutate(Stores.coins, coin.coinPub, mutateCoin) - .finish(); + const query = this.q(); + query.put(Stores.refresh, refreshSession, "refreshKey") + .mutate(Stores.coins, coin.coinPub, mutateCoin); + await query.finish(); + + const key = query.key("refreshKey"); + if (!key || typeof key !== "number") { + throw Error("insert failed"); + } + + refreshSession.id = key; return refreshSession; } async refresh(oldCoinPub: string): Promise { - let refreshSession: RefreshSessionRecord|undefined; - const oldSession = await this.q().get(Stores.refresh, oldCoinPub); - if (oldSession) { - console.log("got old session for", oldCoinPub); - console.log(oldSession); - refreshSession = oldSession; - } else { - refreshSession = await this.createRefreshSession(oldCoinPub); + + const oldRefreshSessions = await this.q().iter(Stores.refresh).toArray(); + for (const session of oldRefreshSessions) { + console.log("got old session for", oldCoinPub, session); + this.continueRefreshSession(session); } + let refreshSession = await this.createRefreshSession(oldCoinPub); if (!refreshSession) { // refreshing not necessary console.log("not refreshing", oldCoinPub); @@ -2031,9 +2036,8 @@ export class Wallet { return; } if (typeof refreshSession.norevealIndex !== "number") { - const coinPub = refreshSession.meltCoinPub; await this.refreshMelt(refreshSession); - const r = await this.q().get(Stores.refresh, coinPub); + const r = await this.q().get(Stores.refresh, refreshSession.id); if (!r) { throw Error("refresh session does not exist anymore"); } @@ -2441,6 +2445,7 @@ export class Wallet { console.error(`Exchange ${req.exchange} not known to the wallet`); return; } + console.log("selecting coins for return:", req); const cds = await this.getCoinsForReturn(req.exchange, req.amount); console.log(cds); -- cgit v1.2.3 From b47522c11bf5c426f998254f9dc61f0018229b44 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sun, 27 Aug 2017 05:57:39 +0200 Subject: proper rounding for amount operations --- src/types.ts | 4 ++-- src/wallet.ts | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/types.ts b/src/types.ts index 9492d1a75..d016b7fea 100644 --- a/src/types.ts +++ b/src/types.ts @@ -1312,7 +1312,7 @@ export namespace Amounts { } 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) { return { amount: getMaxAmount(currency), saturated: true }; } @@ -1440,7 +1440,7 @@ export namespace Amounts { export function fromFloat(floatVal: number, currency: string) { return { currency, - fraction: (floatVal - Math.floor(floatVal)) * fractionalBase, + fraction: Math.floor((floatVal - Math.floor(floatVal)) * fractionalBase), value: Math.floor(floatVal), }; } diff --git a/src/wallet.ts b/src/wallet.ts index e7a36f7b7..3d095fc06 100644 --- a/src/wallet.ts +++ b/src/wallet.ts @@ -413,6 +413,8 @@ export function selectPayCoins(cds: CoinWithDenom[], paymentAmount: AmountJson, denom.feeDeposit).amount) >= 0; isBelowFee = Amounts.cmp(accFee, depositFeeLimit) <= 0; + console.log("coin selection", { coversAmount, isBelowFee, accFee, accAmount, paymentAmount }); + if ((coversAmount && isBelowFee) || coversAmountWithFee) { return cdsResult; } @@ -759,6 +761,8 @@ export class Wallet { cds.push({coin, denom}); } + console.log("coin return: selecting from possible coins", { cds, amount } ); + return selectPayCoins(cds, amount, amount); } -- cgit v1.2.3 From 43575b591921e994761fd531bcfe95239119b695 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sun, 27 Aug 2017 06:47:13 +0200 Subject: show error in create reserve dialog --- src/webex/pages/confirm-create-reserve.tsx | 11 ++++------- src/webex/wxBackend.ts | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/webex/pages/confirm-create-reserve.tsx b/src/webex/pages/confirm-create-reserve.tsx index f957364c4..7d543860f 100644 --- a/src/webex/pages/confirm-create-reserve.tsx +++ b/src/webex/pages/confirm-create-reserve.tsx @@ -371,7 +371,7 @@ class ExchangeSelection extends ImplicitStateComponent { if (this.statusString()) { return (

- {i18n.str`A problem occured, see below. ${this.statusString()}`} + {this.statusString()}

); } @@ -515,12 +515,9 @@ class ExchangeSelection extends ImplicitStateComponent { console.dir(r); } catch (e) { console.log("get exchange info rejected", e); - if (e.hasOwnProperty("httpStatus")) { - this.statusString(`Error: request failed with status ${e.httpStatus}`); - } else if (e.hasOwnProperty("errorResponse")) { - const resp = e.errorResponse; - this.statusString(`Error: ${resp.error} (${resp.hint})`); - } + this.statusString(`Error: ${e.message}`); + // Re-try every 5 seconds as long as there is a problem + setTimeout(() => this.statusString() ? this.forceReserveUpdate() : undefined, 5000); } } diff --git a/src/webex/wxBackend.ts b/src/webex/wxBackend.ts index 0d1c2d8ca..2f249af44 100644 --- a/src/webex/wxBackend.ts +++ b/src/webex/wxBackend.ts @@ -352,7 +352,7 @@ async function dispatch(req: any, sender: any, sendResponse: any): Promise try { sendResponse({ error: "exception", - hint: e.message, + message: e.message, stack, }); } catch (e) { -- cgit v1.2.3

Error Report Not Found

Unknown Error

Refund Status

{this.props.title}

{this.props.title}

Error Report Not Found

Failed to send payment

Unknown Error

Unknown Error

Error

{this.props.title}

{this.props.title}