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

wallet-core: handle reserve retries better

Browse Source 
We now always increment the next retry timeout before doing anything
else, so that it is impossible to accidentally retry immediately.

This fixes a bug where we previously made many, very frequent requests
to the bank integration API.
This commit is contained in:
Florian Dold 2022-03-08 20:39:52 +01:00
parent 1d1c847b79
commit d5a933e4cb
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
8 changed files with 146 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/taler-util/src/time.ts
View File

@ -23,7 +23,7 @@
*/ */
import { Codec, renderContext, Context } from "./codec.js"; import { Codec, renderContext, Context } from "./codec.js";
export class Timestamp { export interface Timestamp {
/** /**
* Timestamp in milliseconds. * Timestamp in milliseconds.
*/ */
@ -81,7 +81,9 @@ export namespace Duration {
} }
export namespace Timestamp { export namespace Timestamp {
export const now = getTimestampNow;
export const min = timestampMin; export const min = timestampMin;
export const isExpired = isTimestampExpired;
} }
export function timestampMin(t1: Timestamp, t2: Timestamp): Timestamp { export function timestampMin(t1: Timestamp, t2: Timestamp): Timestamp {

23
packages/taler-wallet-core/src/db.ts
View File

@ -75,31 +75,31 @@ export enum ReserveRecordStatus {
/** /**
* Reserve must be registered with the bank. * Reserve must be registered with the bank.
*/ */
REGISTERING_BANK = "registering-bank", RegisteringBank = "registering-bank",
/** /**
* We've registered reserve's information with the bank * We've registered reserve's information with the bank
* and are now waiting for the user to confirm the withdraw * and are now waiting for the user to confirm the withdraw
* with the bank (typically 2nd factor auth). * with the bank (typically 2nd factor auth).
*/ */
WAIT_CONFIRM_BANK = "wait-confirm-bank", WaitConfirmBank = "wait-confirm-bank",
/** /**
* Querying reserve status with the exchange. * Querying reserve status with the exchange.
*/ */
QUERYING_STATUS = "querying-status", QueryingStatus = "querying-status",
/** /**
* The corresponding withdraw record has been created. * The corresponding withdraw record has been created.
* No further processing is done, unless explicitly requested * No further processing is done, unless explicitly requested
* by the user. * by the user.
*/ */
DORMANT = "dormant", Dormant = "dormant",
/** /**
* The bank aborted the withdrawal. * The bank aborted the withdrawal.
*/ */
BANK_ABORTED = "bank-aborted", BankAborted = "bank-aborted",
} }
/** /**
@ -212,7 +212,8 @@ export interface ReserveRecord {
/** /**
* Is there any work to be done for this reserve? * Is there any work to be done for this reserve?
* *
* FIXME: Technically redundant, since the reserveStatus would indicate this. * Technically redundant, since the reserveStatus would indicate this.
* However, we use the operationStatus for DB indexing of pending operations.
*/ */
operationStatus: OperationStatus; operationStatus: OperationStatus;
@ -222,11 +223,11 @@ export interface ReserveRecord {
lastSuccessfulStatusQuery: Timestamp | undefined; lastSuccessfulStatusQuery: Timestamp | undefined;
/** /**
* Retry info. This field is present even if no retry is scheduled, * Retry info, in case the reserve needs to be processed again
* because we need it to be present for the index on the object store * later, either due to an error or because the wallet needs to
* to work. * wait for something.
*/ */
retryInfo: RetryInfo; retryInfo: RetryInfo | undefined;
/** /**
* Last error that happened in a reserve operation * Last error that happened in a reserve operation
@ -830,6 +831,8 @@ export interface ProposalRecord {
/** /**
* Retry info, even present when the operation isn't active to allow indexing * Retry info, even present when the operation isn't active to allow indexing
* on the next retry timestamp. * on the next retry timestamp.
*
* FIXME: Clarify what we even retry.
*/ */
retryInfo?: RetryInfo; retryInfo?: RetryInfo;

2
packages/taler-wallet-core/src/operations/backup/import.ts
View File

@ -472,7 +472,7 @@ export async function importBackup(
initialWithdrawalStarted: initialWithdrawalStarted:
backupReserve.withdrawal_groups.length > 0, backupReserve.withdrawal_groups.length > 0,
// FIXME! // FIXME!
reserveStatus: ReserveRecordStatus.QUERYING_STATUS, reserveStatus: ReserveRecordStatus.QueryingStatus,
initialDenomSel: await getDenomSelStateFromBackup( initialDenomSel: await getDenomSelStateFromBackup(
tx, tx,
backupExchangeDetails.base_url, backupExchangeDetails.base_url,

12
packages/taler-wallet-core/src/operations/pending.ts
View File

@ -48,7 +48,6 @@ async function gatherExchangePending(
resp: PendingOperationsResponse, resp: PendingOperationsResponse,
): Promise<void> { ): Promise<void> {
await tx.exchanges.iter().forEachAsync(async (e) => { await tx.exchanges.iter().forEachAsync(async (e) => {
resp.pendingOperations.push({ resp.pendingOperations.push({
type: PendingTaskType.ExchangeUpdate, type: PendingTaskType.ExchangeUpdate,
givesLifeness: false, givesLifeness: false,
@ -79,16 +78,16 @@ async function gatherReservePending(
? ReserveType.TalerBankWithdraw ? ReserveType.TalerBankWithdraw
: ReserveType.Manual; : ReserveType.Manual;
switch (reserve.reserveStatus) { switch (reserve.reserveStatus) {
case ReserveRecordStatus.DORMANT: case ReserveRecordStatus.Dormant:
// nothing to report as pending // nothing to report as pending
break; break;
case ReserveRecordStatus.WAIT_CONFIRM_BANK: case ReserveRecordStatus.WaitConfirmBank:
case ReserveRecordStatus.QUERYING_STATUS: case ReserveRecordStatus.QueryingStatus:
case ReserveRecordStatus.REGISTERING_BANK: case ReserveRecordStatus.RegisteringBank: {
resp.pendingOperations.push({ resp.pendingOperations.push({
type: PendingTaskType.Reserve, type: PendingTaskType.Reserve,
givesLifeness: true, givesLifeness: true,
timestampDue: reserve.retryInfo.nextRetry, timestampDue: reserve.retryInfo?.nextRetry ?? Timestamp.now(),
stage: reserve.reserveStatus, stage: reserve.reserveStatus,
timestampCreated: reserve.timestampCreated, timestampCreated: reserve.timestampCreated,
reserveType, reserveType,
@ -96,6 +95,7 @@ async function gatherReservePending(
retryInfo: reserve.retryInfo, retryInfo: reserve.retryInfo,
}); });
break; break;
}
default: default:
// FIXME: report problem! // FIXME: report problem!
break; break;

2
packages/taler-wallet-core/src/operations/recoup.ts
View File

@ -233,7 +233,7 @@ async function recoupWithdrawCoin(
updatedCoin.status = CoinStatus.Dormant; updatedCoin.status = CoinStatus.Dormant;
const currency = updatedCoin.currentAmount.currency; const currency = updatedCoin.currentAmount.currency;
updatedCoin.currentAmount = Amounts.getZero(currency); updatedCoin.currentAmount = Amounts.getZero(currency);
updatedReserve.reserveStatus = ReserveRecordStatus.QUERYING_STATUS; updatedReserve.reserveStatus = ReserveRecordStatus.QueryingStatus;
updatedReserve.retryInfo = initRetryInfo(); updatedReserve.retryInfo = initRetryInfo();
updatedReserve.operationStatus = OperationStatus.Pending; updatedReserve.operationStatus = OperationStatus.Pending;
await tx.coins.put(updatedCoin); await tx.coins.put(updatedCoin);

207
packages/taler-wallet-core/src/operations/reserves.ts
View File

@ -37,6 +37,7 @@ import {
ReserveTransactionType, ReserveTransactionType,
TalerErrorCode, TalerErrorCode,
TalerErrorDetails, TalerErrorDetails,
Timestamp,
URL, URL,
} from "@gnu-taler/taler-util"; } from "@gnu-taler/taler-util";
import { InternalWalletState } from "../common.js"; import { InternalWalletState } from "../common.js";
@ -76,8 +77,12 @@ import {
updateWithdrawalDenoms, updateWithdrawalDenoms,
} from "./withdraw.js"; } from "./withdraw.js";
const logger = new Logger("reserves.ts"); const logger = new Logger("taler-wallet-core:reserves.ts");
/**
* Reset the retry counter for the reserve
* and reset the last error.
*/
async function resetReserveRetry( async function resetReserveRetry(
ws: InternalWalletState, ws: InternalWalletState,
reservePub: string, reservePub: string,
@ -90,11 +95,72 @@ async function resetReserveRetry(
const x = await tx.reserves.get(reservePub); const x = await tx.reserves.get(reservePub);
if (x) { if (x) {
x.retryInfo = initRetryInfo(); x.retryInfo = initRetryInfo();
delete x.lastError;
await tx.reserves.put(x); await tx.reserves.put(x);
} }
}); });
} }
/**
* Increment the retry counter for the reserve and
* reset the last eror.
*/
async function incrementReserveRetry(
ws: InternalWalletState,
reservePub: string,
): Promise<void> {
await ws.db
.mktx((x) => ({
reserves: x.reserves,
}))
.runReadWrite(async (tx) => {
const r = await tx.reserves.get(reservePub);
if (!r) {
return;
}
if (!r.retryInfo) {
r.retryInfo = initRetryInfo();
} else {
r.retryInfo.retryCounter++;
updateRetryInfoTimeout(r.retryInfo);
}
delete r.lastError;
await tx.reserves.put(r);
});
}
/**
* Report an error that happened while processing the reserve.
*
* Logs the error via a notification and by storing it in the database.
*/
async function reportReserveError(
ws: InternalWalletState,
reservePub: string,
err: TalerErrorDetails,
): Promise<void> {
await ws.db
.mktx((x) => ({
reserves: x.reserves,
}))
.runReadWrite(async (tx) => {
const r = await tx.reserves.get(reservePub);
if (!r) {
return;
}
if (!r.retryInfo) {
logger.error(`got reserve error for inactive reserve (no retryInfo)`);
return;
}
r.lastError = err;
await tx.reserves.put(r);
});
ws.notify({
type: NotificationType.ReserveOperationError,
error: err,
});
}
/** /**
* Create a reserve, but do not flag it as confirmed yet. * Create a reserve, but do not flag it as confirmed yet.
* *
@ -111,9 +177,9 @@ export async function createReserve(
let reserveStatus; let reserveStatus;
if (req.bankWithdrawStatusUrl) { if (req.bankWithdrawStatusUrl) {
reserveStatus = ReserveRecordStatus.REGISTERING_BANK; reserveStatus = ReserveRecordStatus.RegisteringBank;
} else { } else {
reserveStatus = ReserveRecordStatus.QUERYING_STATUS; reserveStatus = ReserveRecordStatus.QueryingStatus;
} }
let bankInfo: ReserveBankInfo | undefined; let bankInfo: ReserveBankInfo | undefined;
@ -249,14 +315,14 @@ export async function forceQueryReserve(
} }
// Only force status query where it makes sense // Only force status query where it makes sense
switch (reserve.reserveStatus) { switch (reserve.reserveStatus) {
case ReserveRecordStatus.DORMANT: case ReserveRecordStatus.Dormant:
reserve.reserveStatus = ReserveRecordStatus.QUERYING_STATUS; reserve.reserveStatus = ReserveRecordStatus.QueryingStatus;
reserve.operationStatus = OperationStatus.Pending; reserve.operationStatus = OperationStatus.Pending;
reserve.retryInfo = initRetryInfo();
break; break;
default: default:
break; break;
} }
reserve.retryInfo = initRetryInfo();
await tx.reserves.put(reserve); await tx.reserves.put(reserve);
}); });
await processReserve(ws, reservePub, true); await processReserve(ws, reservePub, true);
@ -267,7 +333,7 @@ export async function forceQueryReserve(
* then deplete the reserve, withdrawing coins until it is empty. * then deplete the reserve, withdrawing coins until it is empty.
* *
* The returned promise resolves once the reserve is set to the * The returned promise resolves once the reserve is set to the
* state DORMANT. * state "Dormant".
*/ */
export async function processReserve( export async function processReserve(
ws: InternalWalletState, ws: InternalWalletState,
@ -276,7 +342,7 @@ export async function processReserve(
): Promise<void> { ): Promise<void> {
return ws.memoProcessReserve.memo(reservePub, async () => { return ws.memoProcessReserve.memo(reservePub, async () => {
const onOpError = (err: TalerErrorDetails): Promise<void> => const onOpError = (err: TalerErrorDetails): Promise<void> =>
incrementReserveRetry(ws, reservePub, err); reportReserveError(ws, reservePub, err);
await guardOperationException( await guardOperationException(
() => processReserveImpl(ws, reservePub, forceNow), () => processReserveImpl(ws, reservePub, forceNow),
onOpError, onOpError,
@ -296,8 +362,8 @@ async function registerReserveWithBank(
return await tx.reserves.get(reservePub); return await tx.reserves.get(reservePub);
}); });
switch (reserve?.reserveStatus) { switch (reserve?.reserveStatus) {
case ReserveRecordStatus.WAIT_CONFIRM_BANK: case ReserveRecordStatus.WaitConfirmBank:
case ReserveRecordStatus.REGISTERING_BANK: case ReserveRecordStatus.RegisteringBank:
break; break;
default: default:
return; return;
@ -331,14 +397,14 @@ async function registerReserveWithBank(
return; return;
} }
switch (r.reserveStatus) { switch (r.reserveStatus) {
case ReserveRecordStatus.REGISTERING_BANK: case ReserveRecordStatus.RegisteringBank:
case ReserveRecordStatus.WAIT_CONFIRM_BANK: case ReserveRecordStatus.WaitConfirmBank:
break; break;
default: default:
return; return;
} }
r.timestampReserveInfoPosted = getTimestampNow(); r.timestampReserveInfoPosted = getTimestampNow();
r.reserveStatus = ReserveRecordStatus.WAIT_CONFIRM_BANK; r.reserveStatus = ReserveRecordStatus.WaitConfirmBank;
r.operationStatus = OperationStatus.Pending; r.operationStatus = OperationStatus.Pending;
if (!r.bankInfo) { if (!r.bankInfo) {
throw Error("invariant failed"); throw Error("invariant failed");
@ -350,18 +416,6 @@ async function registerReserveWithBank(
return processReserveBankStatus(ws, reservePub); return processReserveBankStatus(ws, reservePub);
} }
async function processReserveBankStatus(
ws: InternalWalletState,
reservePub: string,
): Promise<void> {
const onOpError = (err: TalerErrorDetails): Promise<void> =>
incrementReserveRetry(ws, reservePub, err);
await guardOperationException(
() => processReserveBankStatusImpl(ws, reservePub),
onOpError,
);
}
export function getReserveRequestTimeout(r: ReserveRecord): Duration { export function getReserveRequestTimeout(r: ReserveRecord): Duration {
return durationMax( return durationMax(
{ d_ms: 60000 }, { d_ms: 60000 },
@ -369,7 +423,7 @@ export function getReserveRequestTimeout(r: ReserveRecord): Duration {
); );
} }
async function processReserveBankStatusImpl( async function processReserveBankStatus(
ws: InternalWalletState, ws: InternalWalletState,
reservePub: string, reservePub: string,
): Promise<void> { ): Promise<void> {
@ -381,8 +435,8 @@ async function processReserveBankStatusImpl(
return tx.reserves.get(reservePub); return tx.reserves.get(reservePub);
}); });
switch (reserve?.reserveStatus) { switch (reserve?.reserveStatus) {
case ReserveRecordStatus.WAIT_CONFIRM_BANK: case ReserveRecordStatus.WaitConfirmBank:
case ReserveRecordStatus.REGISTERING_BANK: case ReserveRecordStatus.RegisteringBank:
break; break;
default: default:
return; return;
@ -412,15 +466,15 @@ async function processReserveBankStatusImpl(
return; return;
} }
switch (r.reserveStatus) { switch (r.reserveStatus) {
case ReserveRecordStatus.REGISTERING_BANK: case ReserveRecordStatus.RegisteringBank:
case ReserveRecordStatus.WAIT_CONFIRM_BANK: case ReserveRecordStatus.WaitConfirmBank:
break; break;
default: default:
return; return;
} }
const now = getTimestampNow(); const now = getTimestampNow();
r.timestampBankConfirmed = now; r.timestampBankConfirmed = now;
r.reserveStatus = ReserveRecordStatus.BANK_ABORTED; r.reserveStatus = ReserveRecordStatus.BankAborted;
r.operationStatus = OperationStatus.Finished; r.operationStatus = OperationStatus.Finished;
r.retryInfo = initRetryInfo(); r.retryInfo = initRetryInfo();
await tx.reserves.put(r); await tx.reserves.put(r);
@ -429,7 +483,7 @@ async function processReserveBankStatusImpl(
} }
if (status.selection_done) { if (status.selection_done) {
if (reserve.reserveStatus === ReserveRecordStatus.REGISTERING_BANK) { if (reserve.reserveStatus === ReserveRecordStatus.RegisteringBank) {
await registerReserveWithBank(ws, reservePub); await registerReserveWithBank(ws, reservePub);
return await processReserveBankStatus(ws, reservePub); return await processReserveBankStatus(ws, reservePub);
} }
@ -449,20 +503,20 @@ async function processReserveBankStatusImpl(
} }
if (status.transfer_done) { if (status.transfer_done) {
switch (r.reserveStatus) { switch (r.reserveStatus) {
case ReserveRecordStatus.REGISTERING_BANK: case ReserveRecordStatus.RegisteringBank:
case ReserveRecordStatus.WAIT_CONFIRM_BANK: case ReserveRecordStatus.WaitConfirmBank:
break; break;
default: default:
return; return;
} }
const now = getTimestampNow(); const now = getTimestampNow();
r.timestampBankConfirmed = now; r.timestampBankConfirmed = now;
r.reserveStatus = ReserveRecordStatus.QUERYING_STATUS; r.reserveStatus = ReserveRecordStatus.QueryingStatus;
r.operationStatus = OperationStatus.Pending; r.operationStatus = OperationStatus.Pending;
r.retryInfo = initRetryInfo(); r.retryInfo = initRetryInfo();
} else { } else {
switch (r.reserveStatus) { switch (r.reserveStatus) {
case ReserveRecordStatus.WAIT_CONFIRM_BANK: case ReserveRecordStatus.WaitConfirmBank:
break; break;
default: default:
return; return;
@ -475,36 +529,6 @@ async function processReserveBankStatusImpl(
}); });
} }
async function incrementReserveRetry(
ws: InternalWalletState,
reservePub: string,
err: TalerErrorDetails | undefined,
): Promise<void> {
await ws.db
.mktx((x) => ({
reserves: x.reserves,
}))
.runReadWrite(async (tx) => {
const r = await tx.reserves.get(reservePub);
if (!r) {
return;
}
if (!r.retryInfo) {
return;
}
r.retryInfo.retryCounter++;
updateRetryInfoTimeout(r.retryInfo);
r.lastError = err;
await tx.reserves.put(r);
});
if (err) {
ws.notify({
type: NotificationType.ReserveOperationError,
error: err,
});
}
}
/** /**
* Update the information about a reserve that is stored in the wallet * Update the information about a reserve that is stored in the wallet
* by querying the reserve's exchange. * by querying the reserve's exchange.
@ -528,7 +552,7 @@ async function updateReserve(
throw Error("reserve not in db"); throw Error("reserve not in db");
} }
if (reserve.reserveStatus !== ReserveRecordStatus.QUERYING_STATUS) { if (reserve.reserveStatus !== ReserveRecordStatus.QueryingStatus) {
return { ready: true }; return { ready: true };
} }
@ -554,7 +578,6 @@ async function updateReserve(
type: NotificationType.ReserveNotYetFound, type: NotificationType.ReserveNotYetFound,
reservePub, reservePub,
}); });
await incrementReserveRetry(ws, reservePub, undefined);
return { ready: false }; return { ready: false };
} else { } else {
throwUnexpectedRequestError(resp, result.talerErrorResponse); throwUnexpectedRequestError(resp, result.talerErrorResponse);
@ -661,10 +684,10 @@ async function updateReserve(
); );
if (denomSelInfo.selectedDenoms.length === 0) { if (denomSelInfo.selectedDenoms.length === 0) {
newReserve.reserveStatus = ReserveRecordStatus.DORMANT; newReserve.reserveStatus = ReserveRecordStatus.Dormant;
newReserve.operationStatus = OperationStatus.Finished; newReserve.operationStatus = OperationStatus.Finished;
newReserve.lastError = undefined; delete newReserve.lastError;
newReserve.retryInfo = initRetryInfo(); delete newReserve.retryInfo;
await tx.reserves.put(newReserve); await tx.reserves.put(newReserve);
return; return;
} }
@ -692,9 +715,9 @@ async function updateReserve(
operationStatus: OperationStatus.Pending, operationStatus: OperationStatus.Pending,
}; };
newReserve.lastError = undefined; delete newReserve.lastError;
newReserve.retryInfo = initRetryInfo(); delete newReserve.retryInfo;
newReserve.reserveStatus = ReserveRecordStatus.DORMANT; newReserve.reserveStatus = ReserveRecordStatus.Dormant;
newReserve.operationStatus = OperationStatus.Finished; newReserve.operationStatus = OperationStatus.Finished;
await tx.reserves.put(newReserve); await tx.reserves.put(newReserve);
@ -727,38 +750,41 @@ async function processReserveImpl(
return tx.reserves.get(reservePub); return tx.reserves.get(reservePub);
}); });
if (!reserve) { if (!reserve) {
logger.trace("not processing reserve: reserve does not exist"); logger.error(
`not processing reserve: reserve ${reservePub} does not exist`,
);
return; return;
} }
if (!forceNow) { if (forceNow) {
const now = getTimestampNow(); await resetReserveRetry(ws, reservePub);
if (reserve.retryInfo.nextRetry.t_ms > now.t_ms) { } else if (
reserve.retryInfo &&
!Timestamp.isExpired(reserve.retryInfo.nextRetry)
) {
logger.trace("processReserve retry not due yet"); logger.trace("processReserve retry not due yet");
return; return;
} }
} else { await incrementReserveRetry(ws, reservePub);
await resetReserveRetry(ws, reservePub);
}
logger.trace( logger.trace(
`Processing reserve ${reservePub} with status ${reserve.reserveStatus}`, `Processing reserve ${reservePub} with status ${reserve.reserveStatus}`,
); );
switch (reserve.reserveStatus) { switch (reserve.reserveStatus) {
case ReserveRecordStatus.REGISTERING_BANK: case ReserveRecordStatus.RegisteringBank:
await processReserveBankStatus(ws, reservePub); await processReserveBankStatus(ws, reservePub);
return await processReserveImpl(ws, reservePub, true); return await processReserveImpl(ws, reservePub, true);
case ReserveRecordStatus.QUERYING_STATUS: case ReserveRecordStatus.QueryingStatus:
const res = await updateReserve(ws, reservePub); const res = await updateReserve(ws, reservePub);
if (res.ready) { if (res.ready) {
return await processReserveImpl(ws, reservePub, true); return await processReserveImpl(ws, reservePub, true);
} }
break; break;
case ReserveRecordStatus.DORMANT: case ReserveRecordStatus.Dormant:
// nothing to do // nothing to do
break; break;
case ReserveRecordStatus.WAIT_CONFIRM_BANK: case ReserveRecordStatus.WaitConfirmBank:
await processReserveBankStatus(ws, reservePub); await processReserveBankStatus(ws, reservePub);
break; break;
case ReserveRecordStatus.BANK_ABORTED: case ReserveRecordStatus.BankAborted:
break; break;
default: default:
console.warn("unknown reserve record status:", reserve.reserveStatus); console.warn("unknown reserve record status:", reserve.reserveStatus);
@ -766,6 +792,11 @@ async function processReserveImpl(
break; break;
} }
} }
/**
* Create a reserve for a bank-integrated withdrawal from
* a taler://withdraw URI.
*/
export async function createTalerWithdrawReserve( export async function createTalerWithdrawReserve(
ws: InternalWalletState, ws: InternalWalletState,
talerWithdrawUri: string, talerWithdrawUri: string,
@ -795,7 +826,7 @@ export async function createTalerWithdrawReserve(
.runReadOnly(async (tx) => { .runReadOnly(async (tx) => {
return tx.reserves.get(reserve.reservePub); return tx.reserves.get(reserve.reservePub);
}); });
if (processedReserve?.reserveStatus === ReserveRecordStatus.BANK_ABORTED) { if (processedReserve?.reserveStatus === ReserveRecordStatus.BankAborted) {
throw OperationFailedError.fromCode( throw OperationFailedError.fromCode(
TalerErrorCode.WALLET_WITHDRAWAL_OPERATION_ABORTED_BY_BANK, TalerErrorCode.WALLET_WITHDRAWAL_OPERATION_ABORTED_BY_BANK,
"withdrawal aborted by bank", "withdrawal aborted by bank",
@ -809,7 +840,7 @@ export async function createTalerWithdrawReserve(
} }
/** /**
* Get payto URIs needed to fund a reserve. * Get payto URIs that can be used to fund a reserve.
*/ */
export async function getFundingPaytoUris( export async function getFundingPaytoUris(
tx: GetReadOnlyAccess<{ tx: GetReadOnlyAccess<{

2
packages/taler-wallet-core/src/operations/transactions.ts
View File

@ -194,7 +194,7 @@ export async function getTransactions(
if (r.initialWithdrawalStarted) { if (r.initialWithdrawalStarted) {
return; return;
} }
if (r.reserveStatus === ReserveRecordStatus.BANK_ABORTED) { if (r.reserveStatus === ReserveRecordStatus.BankAborted) {
return; return;
} }
let withdrawalDetails: WithdrawalDetails; let withdrawalDetails: WithdrawalDetails;

2
packages/taler-wallet-core/src/wallet.ts
View File

@ -574,7 +574,7 @@ export async function handleNotifyReserve(
return tx.reserves.iter().toArray(); return tx.reserves.iter().toArray();
}); });
for (const r of reserves) { for (const r of reserves) {
if (r.reserveStatus === ReserveRecordStatus.WAIT_CONFIRM_BANK) { if (r.reserveStatus === ReserveRecordStatus.WaitConfirmBank) {
try { try {
processReserve(ws, r.reservePub); processReserve(ws, r.reservePub);
} catch (e) { } catch (e) {