aboutsummaryrefslogtreecommitdiff
path: root/packages/taler-wallet-core
diff options
context:
space:
mode:
authorFlorian Dold <florian@dold.me>2023-09-15 12:51:57 +0200
committerFlorian Dold <florian@dold.me>2023-09-15 12:51:57 +0200
commit5de329e653bb1e2a0b6ad8247cb76d285a98fdc0 (patch)
tree71475c681ca187883776bccc0e724bf312d02909 /packages/taler-wallet-core
parent1d9d63b341e825728120ec7b4eefda496ad32428 (diff)
downloadwallet-core-5de329e653bb1e2a0b6ad8247cb76d285a98fdc0.tar.xz
wallet-core: fix type error in purse_expiration
Diffstat (limited to 'packages/taler-wallet-core')
-rw-r--r--packages/taler-wallet-core/src/operations/pay-peer-pull-credit.ts2
-rw-r--r--packages/taler-wallet-core/src/operations/pay-peer-push-debit.ts5
2 files changed, 2 insertions, 5 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 6ec8822ab..54b78957f 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
@@ -392,7 +392,7 @@ async function handlePeerPullCreditCreatePurse(
const econtractResp = await ws.cryptoApi.encryptContractForDeposit({
contractPriv: pullIni.contractPriv,
contractPub: pullIni.contractPub,
- contractTerms: contractTermsRecord,
+ contractTerms: contractTermsRecord.contractTermsRaw,
pursePriv: pullIni.pursePriv,
pursePub: pullIni.pursePub,
nonce: pullIni.contractEncNonce,
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 a7b9f79eb..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
@@ -245,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,
@@ -257,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,
@@ -649,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,