wallet-core: store contract terms in separate object store only

1 files changed, 20 insertions, 13 deletions

diff --git a/packages/taler-wallet-core/src/operations/pay-peer-pull-credit.ts b/packages/taler-wallet-core/src/operations/pay-peer-pull-credit.ts
index edadad1fc..0355eb152 100644
--- a/packages/taler-wallet-core/src/operations/pay-peer-pull-credit.ts
+++ b/packages/taler-wallet-core/src/operations/pay-peer-pull-credit.ts
@@ -27,6 +27,7 @@ import {
   InitiatePeerPullCreditResponse,
   Logger,
   NotificationType,
+  PeerContractTerms,
   TalerErrorCode,
   TalerPreciseTimestamp,
   TalerProtocolTimestamp,
@@ -143,7 +144,6 @@ async function queryPurseForPeerPullCredit(
     amount: Amounts.parseOrThrow(pullIni.amount),
     wgInfo: {
       withdrawalType: WithdrawalRecordType.PeerPullCredit,
-      contractTerms: pullIni.contractTerms,
       contractPriv: pullIni.contractPriv,
     },
     forcedWithdrawalGroupId: pullIni.withdrawalGroupId,
@@ -283,9 +283,7 @@ async function processPeerPullCreditAbortingDeletePurse(
       if (!ppiRec) {
         return undefined;
       }
-      if (
-        ppiRec.status !== PeerPullPaymentCreditStatus.AbortingDeletePurse
-      ) {
+      if (ppiRec.status !== PeerPullPaymentCreditStatus.AbortingDeletePurse) {
         return undefined;
       }
       const oldTxState = computePeerPullCreditTransactionState(ppiRec);
@@ -371,6 +369,18 @@ async function handlePeerPullCreditCreatePurse(
     throw Error("merge reserve for peer pull payment not found in database");
   }
 
+  const contractTermsRecord = await ws.db
+    .mktx((x) => [x.contractTerms])
+    .runReadOnly(async (tx) => {
+      return tx.contractTerms.get(pullIni.contractTermsHash);
+    });
+
+  if (!contractTermsRecord) {
+    throw Error("contract terms for peer pull payment not found in database");
+  }
+
+  const contractTerms: PeerContractTerms = contractTermsRecord.contractTermsRaw;
+
   const reservePayto = talerPaytoFromExchangeReserve(
     pullIni.exchangeBaseUrl,
     mergeReserve.reservePub,
@@ -379,19 +389,19 @@ async function handlePeerPullCreditCreatePurse(
   const econtractResp = await ws.cryptoApi.encryptContractForDeposit({
     contractPriv: pullIni.contractPriv,
     contractPub: pullIni.contractPub,
-    contractTerms: pullIni.contractTerms,
+    contractTerms: contractTermsRecord,
     pursePriv: pullIni.pursePriv,
     pursePub: pullIni.pursePub,
     nonce: pullIni.contractEncNonce,
   });
 
-  const purseExpiration = pullIni.contractTerms.purse_expiration;
+  const purseExpiration = contractTerms.purse_expiration;
   const sigRes = await ws.cryptoApi.signReservePurseCreate({
     contractTermsHash: pullIni.contractTermsHash,
     flags: WalletAccountMergeFlags.CreateWithPurseFee,
     mergePriv: pullIni.mergePriv,
     mergeTimestamp: TalerPreciseTimestamp.round(pullIni.mergeTimestamp),
-    purseAmount: pullIni.contractTerms.amount,
+    purseAmount: pullIni.amount,
     purseExpiration: purseExpiration,
     purseFee: purseFee,
     pursePriv: pullIni.pursePriv,
@@ -410,7 +420,7 @@ async function handlePeerPullCreditCreatePurse(
     purse_fee: purseFee,
     purse_pub: pullIni.pursePub,
     purse_sig: sigRes.purseSig,
-    purse_value: pullIni.contractTerms.amount,
+    purse_value: pullIni.amount,
     reserve_sig: sigRes.accountSig,
     econtract: econtractResp.econtract,
   };
@@ -585,8 +595,7 @@ async function processPeerPullCreditKycRequired(
           requirementRow: kycPending.requirement_row,
         };
         peerInc.kycUrl = kycStatus.kyc_url;
-        peerInc.status =
-          PeerPullPaymentCreditStatus.PendingMergeKycRequired;
+        peerInc.status = PeerPullPaymentCreditStatus.PendingMergeKycRequired;
         const newTxState = computePeerPullCreditTransactionState(peerInc);
         await tx.peerPullCredit.put(peerInc);
         // We'll remove this eventually!  New clients should rely on the
@@ -769,7 +778,6 @@ export async function initiatePeerPullPayment(
         mergePriv: mergePair.priv,
         mergePub: mergePair.pub,
         status: PeerPullPaymentCreditStatus.PendingCreatePurse,
-        contractTerms: contractTerms,
         mergeTimestamp,
         contractEncNonce,
         mergeReserveRowId: mergeReserveRowId,
@@ -848,8 +856,7 @@ export async function suspendPeerPullCreditTransaction(
           newStatus = PeerPullPaymentCreditStatus.SuspendedReady;
           break;
         case PeerPullPaymentCreditStatus.AbortingDeletePurse:
-          newStatus =
-            PeerPullPaymentCreditStatus.SuspendedAbortingDeletePurse;
+          newStatus = PeerPullPaymentCreditStatus.SuspendedAbortingDeletePurse;
           break;
         case PeerPullPaymentCreditStatus.Done:
         case PeerPullPaymentCreditStatus.SuspendedCreatePurse: