From 35cbcce79e22d7c3cd9ac1c676ad9b3480bd3fe1 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Mon, 8 Jan 2024 15:03:15 +0100
Subject: wallet-core: fix query for nonfinal payment transactions

---
 .../taler-harness/src/integrationtests/test-payment-abort.ts   |  4 +---
 packages/taler-wallet-core/src/db.ts                           | 10 ++++++++++
 packages/taler-wallet-core/src/operations/pending.ts           |  6 ++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'packages')

diff --git a/packages/taler-harness/src/integrationtests/test-payment-abort.ts b/packages/taler-harness/src/integrationtests/test-payment-abort.ts
index fe7ecbcd7..17e2705a4 100644
--- a/packages/taler-harness/src/integrationtests/test-payment-abort.ts
+++ b/packages/taler-harness/src/integrationtests/test-payment-abort.ts
@@ -98,8 +98,6 @@ export async function runPaymentAbortTest(t: GlobalTestState) {
 
   t.assertTrue(preparePayResp.status === PreparePayResultType.PaymentPossible);
 
-  const proposalId = preparePayResp.proposalId;
-
   publicOrderStatusResp = await harnessHttpLib.fetch(publicOrderStatusUrl);
 
   if (publicOrderStatusResp.status != 402) {
@@ -132,7 +130,7 @@ export async function runPaymentAbortTest(t: GlobalTestState) {
   const confirmPayResp = await walletClient.call(
     WalletApiOperation.ConfirmPay,
     {
-      proposalId,
+      transactionId: preparePayResp.transactionId,
     },
   );
 
diff --git a/packages/taler-wallet-core/src/db.ts b/packages/taler-wallet-core/src/db.ts
index 6f6aad256..d13e30cc6 100644
--- a/packages/taler-wallet-core/src/db.ts
+++ b/packages/taler-wallet-core/src/db.ts
@@ -254,6 +254,16 @@ export function timestampOptionalAbsoluteFromDb(
  * nnnn=0000 should always be the most generic minor state for the major state
  */
 
+/**
+ * First possible operation status in the active range (inclusive).
+ */
+export const OPERATION_STATUS_ACTIVE_FIRST = 0x0100_0000;
+
+/**
+ * LAST possible operation status in the active range (inclusive).
+ */
+export const OPERATION_STATUS_ACTIVE_LAST = 0x0113_FFFF;
+
 /**
  * Status of a withdrawal.
  */
diff --git a/packages/taler-wallet-core/src/operations/pending.ts b/packages/taler-wallet-core/src/operations/pending.ts
index 76b9fd801..560031ad1 100644
--- a/packages/taler-wallet-core/src/operations/pending.ts
+++ b/packages/taler-wallet-core/src/operations/pending.ts
@@ -34,6 +34,8 @@ import {
   DepositElementStatus,
   DepositGroupRecord,
   ExchangeEntryDbUpdateStatus,
+  OPERATION_STATUS_ACTIVE_FIRST,
+  OPERATION_STATUS_ACTIVE_LAST,
   PeerPullCreditRecord,
   PeerPullDebitRecordStatus,
   PeerPullPaymentCreditStatus,
@@ -418,8 +420,8 @@ export async function iterRecordsForPurchase(
 ): Promise<void> {
   if (filter.onlyState === "nonfinal") {
     const keyRange = GlobalIDB.KeyRange.bound(
-      PurchaseStatus.PendingDownloadingProposal,
-      PurchaseStatus.PendingAcceptRefund,
+      OPERATION_STATUS_ACTIVE_FIRST,
+      OPERATION_STATUS_ACTIVE_LAST,
     );
     await tx.purchases.indexes.byStatus.iter(keyRange).forEachAsync(f);
   } else {
-- 
cgit v1.2.3