Merge branch 'master' into age-withdraw

1 files changed, 13 insertions, 33 deletions

diff --git a/packages/taler-wallet-core/src/operations/pay-peer-push-credit.ts b/packages/taler-wallet-core/src/operations/pay-peer-push-credit.ts
index 89d9e3b49..e4698c203 100644
--- a/packages/taler-wallet-core/src/operations/pay-peer-push-credit.ts
+++ b/packages/taler-wallet-core/src/operations/pay-peer-push-credit.ts
@@ -59,6 +59,7 @@ import {
   PendingTaskType,
   WithdrawalGroupStatus,
   WithdrawalRecordType,
+  timestampPreciseToDb,
 } from "../index.js";
 import { assertUnreachable } from "../util/assertUnreachable.js";
 import { checkDbInvariant } from "../util/invariants.js";
@@ -129,12 +130,10 @@ export async function preparePeerPushCredit(
       amountEffective: existing.existingPushInc.estimatedAmountEffective,
       amountRaw: existing.existingContractTerms.amount,
       contractTerms: existing.existingContractTerms,
-      peerPushCreditId:
-        existing.existingPushInc.peerPushCreditId,
+      peerPushCreditId: existing.existingPushInc.peerPushCreditId,
       transactionId: constructTransactionIdentifier({
         tag: TransactionType.PeerPushCredit,
-        peerPushCreditId:
-          existing.existingPushInc.peerPushCreditId,
+        peerPushCreditId: existing.existingPushInc.peerPushCreditId,
       }),
     };
   }
@@ -196,7 +195,7 @@ export async function preparePeerPushCredit(
         exchangeBaseUrl: exchangeBaseUrl,
         mergePriv: dec.mergePriv,
         pursePub: pursePub,
-        timestamp: TalerPreciseTimestamp.now(),
+        timestamp: timestampPreciseToDb(TalerPreciseTimestamp.now()),
         contractTermsHash,
         status: PeerPushCreditStatus.DialogProposed,
         withdrawalGroupId,
@@ -263,16 +262,11 @@ async function longpollKycStatus(
       const transitionInfo = await ws.db
         .mktx((x) => [x.peerPushCredit])
         .runReadWrite(async (tx) => {
-          const peerInc = await tx.peerPushCredit.get(
-            peerPushCreditId,
-          );
+          const peerInc = await tx.peerPushCredit.get(peerPushCreditId);
           if (!peerInc) {
             return;
           }
-          if (
-            peerInc.status !==
-            PeerPushCreditStatus.PendingMergeKycRequired
-          ) {
+          if (peerInc.status !== PeerPushCreditStatus.PendingMergeKycRequired) {
             return;
           }
           const oldTxState = computePeerPushCreditTransactionState(peerInc);
@@ -333,9 +327,7 @@ async function processPeerPushCreditKycRequired(
     const { transitionInfo, result } = await ws.db
       .mktx((x) => [x.peerPushCredit])
       .runReadWrite(async (tx) => {
-        const peerInc = await tx.peerPushCredit.get(
-          peerPushCreditId,
-        );
+        const peerInc = await tx.peerPushCredit.get(peerPushCreditId);
         if (!peerInc) {
           return {
             transitionInfo: undefined,
@@ -466,9 +458,7 @@ async function handlePendingMerge(
       x.exchangeDetails,
     ])
     .runReadWrite(async (tx) => {
-      const peerInc = await tx.peerPushCredit.get(
-        peerPushCreditId,
-      );
+      const peerInc = await tx.peerPushCredit.get(peerPushCreditId);
       if (!peerInc) {
         return undefined;
       }
@@ -520,9 +510,7 @@ async function handlePendingWithdrawing(
   const transitionInfo = await ws.db
     .mktx((x) => [x.peerPushCredit, x.withdrawalGroups])
     .runReadWrite(async (tx) => {
-      const ppi = await tx.peerPushCredit.get(
-        peerInc.peerPushCreditId,
-      );
+      const ppi = await tx.peerPushCredit.get(peerInc.peerPushCreditId);
       if (!ppi) {
         finished = true;
         return;
@@ -631,9 +619,7 @@ export async function confirmPeerPushCredit(
     }
     peerPushCreditId = parsedTx.peerPushCreditId;
   } else {
-    throw Error(
-      "no transaction ID (or deprecated peerPushCreditId) provided",
-    );
+    throw Error("no transaction ID (or deprecated peerPushCreditId) provided");
   }
 
   await ws.db
@@ -683,9 +669,7 @@ export async function suspendPeerPushCreditTransaction(
   const transitionInfo = await ws.db
     .mktx((x) => [x.peerPushCredit])
     .runReadWrite(async (tx) => {
-      const pushCreditRec = await tx.peerPushCredit.get(
-        peerPushCreditId,
-      );
+      const pushCreditRec = await tx.peerPushCredit.get(peerPushCreditId);
       if (!pushCreditRec) {
         logger.warn(`peer push credit ${peerPushCreditId} not found`);
         return;
@@ -746,9 +730,7 @@ export async function abortPeerPushCreditTransaction(
   const transitionInfo = await ws.db
     .mktx((x) => [x.peerPushCredit])
     .runReadWrite(async (tx) => {
-      const pushCreditRec = await tx.peerPushCredit.get(
-        peerPushCreditId,
-      );
+      const pushCreditRec = await tx.peerPushCredit.get(peerPushCreditId);
       if (!pushCreditRec) {
         logger.warn(`peer push credit ${peerPushCreditId} not found`);
         return;
@@ -820,9 +802,7 @@ export async function resumePeerPushCreditTransaction(
   const transitionInfo = await ws.db
     .mktx((x) => [x.peerPushCredit])
     .runReadWrite(async (tx) => {
-      const pushCreditRec = await tx.peerPushCredit.get(
-        peerPushCreditId,
-      );
+      const pushCreditRec = await tx.peerPushCredit.get(peerPushCreditId);
       if (!pushCreditRec) {
         logger.warn(`peer push credit ${peerPushCreditId} not found`);
         return;