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

wallet-core: fix peer-pull-credit long-polling and peer-pull-debit pending operation status

Browse Source
This commit is contained in:
Florian Dold 2023-02-21 20:31:23 +01:00
parent 2677140749
commit a3c7da975b
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/taler-wallet-core/src/operations/pay-peer.ts
View File

@ -1155,7 +1155,7 @@ export async function acceptIncomingPeerPullPayment(
* Look up information about an incoming peer pull payment.
* Store the results in the wallet DB.
*/
export async function preparePeerPullCredit(
export async function preparePeerPullDebit(
ws: InternalWalletState,
req: PreparePeerPullDebitRequest,
): Promise<PreparePeerPullDebitResponse> {
@ -1279,7 +1279,7 @@ export async function queryPurseForPeerPullCredit(
cancellationToken: CancellationToken,
): Promise<LongpollResult> {
const purseDepositUrl = new URL(
`purses/${pullIni.pursePub}/merge`,
`purses/${pullIni.pursePub}/deposit`,
pullIni.exchangeBaseUrl,
);
purseDepositUrl.searchParams.set("timeout_ms", "30000");
@ -1380,6 +1380,8 @@ export async function processPeerPullCredit(
};
}
logger.trace(`processing ${retryTag}, status=${pullIni.status}`);
switch (pullIni.status) {
case PeerPullPaymentInitiationStatus.PurseDeposited: {
// We implement this case so that the "retry" action on a peer-pull-credit transaction

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

@ -390,8 +390,13 @@ async function gatherPeerPullDebitPending(
resp: PendingOperationsResponse,
): Promise<void> {
await tx.peerPullPaymentIncoming.iter().forEachAsync(async (pi) => {
if (pi.status === PeerPullPaymentIncomingStatus.Paid) {
return;
switch (pi.status) {
case PeerPullPaymentIncomingStatus.Paid:
return;
case PeerPullPaymentIncomingStatus.Proposed:
return;
case PeerPullPaymentIncomingStatus.Accepted:
break;
}
const opId = TaskIdentifiers.forPeerPullPaymentDebit(pi);
const retryRecord = await tx.operationRetries.get(opId);

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

@ -199,7 +199,7 @@ import {
import {
acceptIncomingPeerPullPayment,
confirmPeerPushPayment,
preparePeerPullCredit,
preparePeerPullDebit,
preparePeerPushCredit,
initiatePeerPullPayment,
initiatePeerPushPayment,
@ -1462,7 +1462,7 @@ async function dispatchRequestInternal<Op extends WalletApiOperation>(
}
case WalletApiOperation.PreparePeerPullDebit: {
const req = codecForCheckPeerPullPaymentRequest().decode(payload);
return await preparePeerPullCredit(ws, req);
return await preparePeerPullDebit(ws, req);
}
case WalletApiOperation.ConfirmPeerPullDebit: {
const req = codecForAcceptPeerPullPaymentRequest().decode(payload);