Merge branch 'master' into age-withdraw

1 files changed, 8 insertions, 8 deletions

diff --git a/packages/taler-wallet-core/src/operations/pay-peer-push-debit.ts b/packages/taler-wallet-core/src/operations/pay-peer-push-debit.ts
index e80ffc059..50ae8d41b 100644
--- a/packages/taler-wallet-core/src/operations/pay-peer-push-debit.ts
+++ b/packages/taler-wallet-core/src/operations/pay-peer-push-debit.ts
@@ -55,10 +55,14 @@ import {
   PeerPushDebitStatus,
   RefreshOperationStatus,
   createRefreshGroup,
+  timestampPreciseToDb,
+  timestampProtocolFromDb,
+  timestampProtocolToDb,
 } from "../index.js";
 import { InternalWalletState } from "../internal-wallet-state.js";
 import { PendingTaskType } from "../pending-types.js";
 import { assertUnreachable } from "../util/assertUnreachable.js";
+import { PeerCoinRepair, selectPeerCoins } from "../util/coinSelection.js";
 import { checkLogicInvariant } from "../util/invariants.js";
 import {
   TaskRunResult,
@@ -77,7 +81,6 @@ import {
   notifyTransition,
   stopLongpolling,
 } from "./transactions.js";
-import { PeerCoinRepair, selectPeerCoins } from "../util/coinSelection.js";
 
 const logger = new Logger("pay-peer-push-debit.ts");
 
@@ -207,7 +210,7 @@ async function processPeerPushDebitCreateReserve(
     mergePub: peerPushInitiation.mergePub,
     minAge: 0,
     purseAmount: peerPushInitiation.amount,
-    purseExpiration,
+    purseExpiration: timestampProtocolFromDb(purseExpiration),
     pursePriv: peerPushInitiation.pursePriv,
   });
 
@@ -242,8 +245,6 @@ async function processPeerPushDebitCreateReserve(
     hash(decodeCrock(econtractResp.econtract.econtract)),
   );
 
-  logger.info(`econtract hash: ${econtractHash}`);
-
   const createPurseUrl = new URL(
     `purses/${peerPushInitiation.pursePub}/create`,
     peerPushInitiation.exchangeBaseUrl,
@@ -254,7 +255,7 @@ async function processPeerPushDebitCreateReserve(
     merge_pub: peerPushInitiation.mergePub,
     purse_sig: purseSigResp.sig,
     h_contract_terms: hContractTerms,
-    purse_expiration: purseExpiration,
+    purse_expiration: timestampProtocolFromDb(purseExpiration),
     deposits: depositSigsResp.deposits,
     min_age: 0,
     econtract: econtractResp.econtract,
@@ -646,7 +647,6 @@ export async function initiatePeerPushDebit(
       // we might want to mark the coins as used and spend them
       // after we've been able to create the purse.
       await spendCoins(ws, tx, {
-        // allocationId: `txn:peer-push-debit:${pursePair.pub}`,
         allocationId: constructTransactionIdentifier({
           tag: TransactionType.PeerPushDebit,
           pursePub: pursePair.pub,
@@ -666,10 +666,10 @@ export async function initiatePeerPushDebit(
         exchangeBaseUrl: sel.exchangeBaseUrl,
         mergePriv: mergePair.priv,
         mergePub: mergePair.pub,
-        purseExpiration: purseExpiration,
+        purseExpiration: timestampProtocolToDb(purseExpiration),
         pursePriv: pursePair.priv,
         pursePub: pursePair.pub,
-        timestampCreated: TalerPreciseTimestamp.now(),
+        timestampCreated: timestampPreciseToDb(TalerPreciseTimestamp.now()),
         status: PeerPushDebitStatus.PendingCreatePurse,
         contractEncNonce,
         coinSel: {