summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorFlorian Dold <florian@dold.me>2024-03-28 12:14:13 +0100
committerFlorian Dold <florian@dold.me>2024-03-28 12:14:13 +0100
commit53faa440d146b4658fdad48ef545092325dda475 (patch)
tree0f54da90ad4c44a45ad9a07144bd55f5a6036313 /packages
parent59d677daf210c3765ae8544edd5d7e5dba97a873 (diff)
downloadwallet-core-53faa440d146b4658fdad48ef545092325dda475.tar.gz
wallet-core-53faa440d146b4658fdad48ef545092325dda475.tar.bz2
wallet-core-53faa440d146b4658fdad48ef545092325dda475.zip
wallet-core: treat minimum_age=0 as no age restriction
Diffstat (limited to 'packages')
-rw-r--r--packages/taler-wallet-core/src/crypto/cryptoImplementation.ts4
-rw-r--r--packages/taler-wallet-core/src/pay-merchant.ts12
2 files changed, 5 insertions, 11 deletions
diff --git a/packages/taler-wallet-core/src/crypto/cryptoImplementation.ts b/packages/taler-wallet-core/src/crypto/cryptoImplementation.ts
index 7c6b142fb..77ee65e52 100644
--- a/packages/taler-wallet-core/src/crypto/cryptoImplementation.ts
+++ b/packages/taler-wallet-core/src/crypto/cryptoImplementation.ts
@@ -1134,7 +1134,7 @@ export const nativeCryptoR: TalerCryptoInterfaceR = {
depositInfo.ageCommitmentProof.commitment,
);
hAgeCommitment = decodeCrock(ach);
- if (depositInfo.requiredMinimumAge != null) {
+ if (depositInfo.requiredMinimumAge) {
minimumAgeSig = encodeCrock(
AgeRestriction.commitmentAttest(
depositInfo.ageCommitmentProof,
@@ -1184,7 +1184,7 @@ export const nativeCryptoR: TalerCryptoInterfaceR = {
},
};
- if (depositInfo.requiredMinimumAge != null) {
+ if (depositInfo.requiredMinimumAge) {
// These are only required by the merchant
s.minimum_age_sig = minimumAgeSig;
s.age_commitment =
diff --git a/packages/taler-wallet-core/src/pay-merchant.ts b/packages/taler-wallet-core/src/pay-merchant.ts
index 62309a300..812d32429 100644
--- a/packages/taler-wallet-core/src/pay-merchant.ts
+++ b/packages/taler-wallet-core/src/pay-merchant.ts
@@ -1621,11 +1621,6 @@ export async function generateDepositPermissions(
const { coin, denom } = coinWithDenom[i];
let wireInfoHash: string;
wireInfoHash = contractData.wireInfoHash;
- logger.trace(
- `signing deposit permission for coin with ageRestriction=${j2s(
- coin.ageCommitmentProof,
- )}`,
- );
const dp = await wex.cryptoApi.signDepositPermission({
coinPriv: coin.coinPriv,
coinPub: coin.coinPub,
@@ -2075,10 +2070,9 @@ async function processPurchasePay(
session_id: purchase.lastSessionId,
};
- logger.trace(
- "making pay request ... ",
- JSON.stringify(reqBody, undefined, 2),
- );
+ if (logger.shouldLogTrace()) {
+ logger.trace(`making pay request ... ${j2s(reqBody)}`);
+ }
const resp = await wex.ws.runSequentialized([EXCHANGE_COINS_LOCK], () =>
wex.http.fetch(payUrl, {