2 files changed, 18 insertions, 1 deletions
diff --git a/packages/taler-wallet-core/src/db.ts b/packages/taler-wallet-core/src/db.ts
index 04c3ce723..abfb02445 100644
--- a/packages/taler-wallet-core/src/db.ts
+++ b/packages/taler-wallet-core/src/db.ts
@@ -647,6 +647,7 @@ export interface PlanchetRecord {
    */
   coinIdx: number;
 
+
   planchetStatus: PlanchetStatus;
 
   lastError: TalerErrorDetail | undefined;
@@ -661,6 +662,12 @@ export interface PlanchetRecord {
 
   coinEvHash: string;
 
+  /**
+   * Index into the kappa-many planchet commitments per coin
+   * for the age-withdraw operation. 
+   */
+  ageWithdrawIdx?: number;
+
   ageCommitmentProof?: AgeCommitmentProof;
 }
 
@@ -1352,7 +1359,7 @@ export interface KycPendingInfo {
 }
 /**
  * Group of withdrawal operations that need to be executed.
- * (Either for a normal withdrawal or from a reward.)
+ * (Either for a normal {single-|batch-|age-} withdrawal or from a reward.)
  *
  * The withdrawal group record is only created after we know
  * the coin selection we want to withdraw.
@@ -2377,6 +2384,11 @@ export const WalletStoresV1 = {
     "planchets",
     describeContents<PlanchetRecord>({ keyPath: "coinPub" }),
     {
+      byGroupAgeCoin: describeIndex("byGroupAgeCoin", [
+        "withdrawalGroupId",
+        "ageWithdrawIdx",
+        "coinIdx",
+      ]),
       byGroupAndIndex: describeIndex("byGroupAndIndex", [
         "withdrawalGroupId",
         "coinIdx",
diff --git a/packages/taler-wallet-core/src/operations/withdraw.ts b/packages/taler-wallet-core/src/operations/withdraw.ts
index 32e63f4f6..bae348dc1 100644
--- a/packages/taler-wallet-core/src/operations/withdraw.ts
+++ b/packages/taler-wallet-core/src/operations/withdraw.ts
@@ -62,6 +62,10 @@ import {
   ExchangeWithdrawResponse,
   WithdrawUriInfoResponse,
   ExchangeBatchWithdrawRequest,
+  ExchangeAgeWithdrawRequest,
+  ExchangeAgeWithdrawRevealRequest,
+  ExchangeAgeWithdrawResponse,
+  ExchangeAgeWithdrawRevealResponse,
   TransactionState,
   TransactionMajorState,
   TransactionMinorState,
@@ -864,6 +868,7 @@ async function processPlanchetExchangeBatchRequest(
         coinIdx < wgContext.numPlanchets;
         coinIdx++
       ) {
+        // FIXME[oec]: Add lookup of planchet for age-withdraw here
         let planchet = await tx.planchets.indexes.byGroupAndIndex.get([
           withdrawalGroup.withdrawalGroupId,
           coinIdx,