[taler-wallet-core] branch master updated (9b38047b4 -> b911412ac)

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a change to branch master
in repository wallet-core.

    from 9b38047b4 don't show login if query to management instances returns 200
     new 23681bb25 -fix multiexchange test
     new b911412ac wallet-core: make age restricted deposits work

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ...test-deposit.ts => test-age-restrictions-deposit.ts} | 13 ++++++++++---
 .../taler-harness/src/integrationtests/test-deposit.ts  |  1 +
 .../src/integrationtests/test-multiexchange.ts          | 17 +++++++++++++----
 .../taler-harness/src/integrationtests/testrunner.ts    |  2 ++
 packages/taler-util/src/taler-types.ts                  |  2 ++
 packages/taler-wallet-core/src/operations/deposits.ts   |  1 +
 6 files changed, 29 insertions(+), 7 deletions(-)
 copy packages/taler-harness/src/integrationtests/{test-deposit.ts => 
test-age-restrictions-deposit.ts} (89%)

diff --git a/packages/taler-harness/src/integrationtests/test-deposit.ts 
b/packages/taler-harness/src/integrationtests/test-age-restrictions-deposit.ts
similarity index 89%
copy from packages/taler-harness/src/integrationtests/test-deposit.ts
copy to 
packages/taler-harness/src/integrationtests/test-age-restrictions-deposit.ts
index 1f50377f2..d36ba0e61 100644
--- a/packages/taler-harness/src/integrationtests/test-deposit.ts
+++ 
b/packages/taler-harness/src/integrationtests/test-age-restrictions-deposit.ts
@@ -29,15 +29,22 @@ import {
   createSimpleTestkudosEnvironmentV2,
   withdrawViaBankV2,
 } from "../harness/helpers.js";
+import { defaultCoinConfig } from "../harness/denomStructures.js";
 
 /**
  * Run test for basic, bank-integrated withdrawal and payment.
  */
-export async function runDepositTest(t: GlobalTestState) {
+export async function runAgeRestrictionsDepositTest(t: GlobalTestState) {
   // Set up test environment
 
   const { walletClient, bank, exchange } =
-    await createSimpleTestkudosEnvironmentV2(t);
+    await createSimpleTestkudosEnvironmentV2(
+      t,
+      defaultCoinConfig.map((x) => x("TESTKUDOS")),
+      {
+        ageMaskSpec: "8:10:12:14:16:18:21",
+      },
+    );
 
   // Withdraw digital cash into the wallet.
 
@@ -104,4 +111,4 @@ export async function runDepositTest(t: GlobalTestState) {
   t.assertDeepEqual(transactions.transactions[1].amountRaw, "TESTKUDOS:9.79");
 }
 
-runDepositTest.suites = ["wallet"];
+runAgeRestrictionsDepositTest.suites = ["wallet"];
diff --git a/packages/taler-harness/src/integrationtests/test-deposit.ts 
b/packages/taler-harness/src/integrationtests/test-deposit.ts
index 1f50377f2..4339e75db 100644
--- a/packages/taler-harness/src/integrationtests/test-deposit.ts
+++ b/packages/taler-harness/src/integrationtests/test-deposit.ts
@@ -29,6 +29,7 @@ import {
   createSimpleTestkudosEnvironmentV2,
   withdrawViaBankV2,
 } from "../harness/helpers.js";
+import { defaultCoinConfig } from "../harness/denomStructures.js";
 
 /**
  * Run test for basic, bank-integrated withdrawal and payment.
diff --git a/packages/taler-harness/src/integrationtests/test-multiexchange.ts 
b/packages/taler-harness/src/integrationtests/test-multiexchange.ts
index 119c21b4d..aeda035a8 100644
--- a/packages/taler-harness/src/integrationtests/test-multiexchange.ts
+++ b/packages/taler-harness/src/integrationtests/test-multiexchange.ts
@@ -74,13 +74,22 @@ export async function runMultiExchangeTest(t: 
GlobalTestState) {
     database: dbDefault.connStr,
   });
 
-  const exchangeBankAccount = await bank.createExchangeAccount(
+  const exchangeOneBankAccount = await bank.createExchangeAccount(
     "myexchange",
     "x",
   );
-  await exchangeOne.addBankAccount("1", exchangeBankAccount);
+  await exchangeOne.addBankAccount("1", exchangeOneBankAccount);
 
-  bank.setSuggestedExchange(exchangeOne, exchangeBankAccount.accountPaytoUri);
+  const exchangeTwoBankAccount = await bank.createExchangeAccount(
+    "myexchange2",
+    "x",
+  );
+  await exchangeTwo.addBankAccount("1", exchangeTwoBankAccount);
+
+  bank.setSuggestedExchange(
+    exchangeOne,
+    exchangeOneBankAccount.accountPaytoUri,
+  );
 
   await bank.start();
 
@@ -100,7 +109,7 @@ export async function runMultiExchangeTest(t: 
GlobalTestState) {
 
   // Start and configure merchant
 
-  //merchant.addExchange(exchangeOne);
+  merchant.addExchange(exchangeOne);
   merchant.addExchange(exchangeTwo);
 
   await merchant.start();
diff --git a/packages/taler-harness/src/integrationtests/testrunner.ts 
b/packages/taler-harness/src/integrationtests/testrunner.ts
index 968204d78..25bce5712 100644
--- a/packages/taler-harness/src/integrationtests/testrunner.ts
+++ b/packages/taler-harness/src/integrationtests/testrunner.ts
@@ -94,6 +94,7 @@ import { runWithdrawalManualTest } from 
"./test-withdrawal-manual.js";
 import { runWalletGenDbTest } from "./test-wallet-gendb.js";
 import { runLibeufinBankTest } from "./test-libeufin-bank.js";
 import { runMultiExchangeTest } from "./test-multiexchange.js";
+import { runAgeRestrictionsDepositTest } from 
"./test-age-restrictions-deposit.js";
 
 /**
  * Test runner.
@@ -114,6 +115,7 @@ const allTests: TestMainFunction[] = [
   runAgeRestrictionsMerchantTest,
   runAgeRestrictionsMixedMerchantTest,
   runAgeRestrictionsPeerTest,
+  runAgeRestrictionsDepositTest,
   runBankApiTest,
   runClaimLoopTest,
   runClauseSchnorrTest,
diff --git a/packages/taler-util/src/taler-types.ts 
b/packages/taler-util/src/taler-types.ts
index 87925a3a4..c0c8cc17d 100644
--- a/packages/taler-util/src/taler-types.ts
+++ b/packages/taler-util/src/taler-types.ts
@@ -2275,6 +2275,8 @@ export interface BatchDepositRequestCoin {
   // Signature over `TALER_DepositRequestPS`, made by the customer with the
   // `coin's private key <coin-priv>`.
   coin_sig: EddsaSignatureString;
+
+  h_age_commitment?: string;
 }
 
 export interface WalletKycUuid {
diff --git a/packages/taler-wallet-core/src/operations/deposits.ts 
b/packages/taler-wallet-core/src/operations/deposits.ts
index 111d15989..de413a514 100644
--- a/packages/taler-wallet-core/src/operations/deposits.ts
+++ b/packages/taler-wallet-core/src/operations/deposits.ts
@@ -954,6 +954,7 @@ async function processDepositGroupPendingDeposit(
         contribution: Amounts.stringify(perm.contribution),
         denom_pub_hash: perm.h_denom,
         ub_sig: perm.ub_sig,
+        h_age_commitment: perm.h_age_commitment,
       });
       batchIndexes.push(i);
     }

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.