diff options
Diffstat (limited to 'packages/taler-wallet-core')
-rw-r--r-- | packages/taler-wallet-core/src/db.ts | 4 | ||||
-rw-r--r-- | packages/taler-wallet-core/src/operations/withdraw.ts | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/packages/taler-wallet-core/src/db.ts b/packages/taler-wallet-core/src/db.ts index dd21aa037..4b031ace3 100644 --- a/packages/taler-wallet-core/src/db.ts +++ b/packages/taler-wallet-core/src/db.ts @@ -609,8 +609,6 @@ export interface PlanchetRecord { coinEvHash: string; - maxAge: number; - ageCommitmentProof?: AgeCommitmentProof; } @@ -719,7 +717,7 @@ export interface CoinRecord { /** * Maximum age of purchases that can be made with this coin. * - * FIXME: Not used for indexing, isn't it redundant? + * (Used for indexing, redundant with {@link ageCommitmentProof}). */ maxAge: number; diff --git a/packages/taler-wallet-core/src/operations/withdraw.ts b/packages/taler-wallet-core/src/operations/withdraw.ts index 1520dfc0a..1113fb87a 100644 --- a/packages/taler-wallet-core/src/operations/withdraw.ts +++ b/packages/taler-wallet-core/src/operations/withdraw.ts @@ -433,7 +433,6 @@ async function processPlanchetGenerate( planchetStatus: PlanchetStatus.Pending, withdrawSig: r.withdrawSig, withdrawalGroupId: withdrawalGroup.withdrawalGroupId, - maxAge: withdrawalGroup.restrictAge ?? AgeRestriction.AGE_UNRESTRICTED, ageCommitmentProof: r.ageCommitmentProof, lastError: undefined, }; @@ -746,7 +745,7 @@ async function processPlanchetVerifyAndStoreCoin( reservePub: withdrawalGroup.reservePub, withdrawalGroupId: withdrawalGroup.withdrawalGroupId, }, - maxAge: planchet.maxAge, + maxAge: withdrawalGroup.restrictAge ?? AgeRestriction.AGE_UNRESTRICTED, ageCommitmentProof: planchet.ageCommitmentProof, spendAllocation: undefined, }; @@ -1360,7 +1359,10 @@ export async function getWithdrawalDetailsForUri( .runReadOnly(async (tx) => { const exchangeRecords = await tx.exchanges.iter().toArray(); for (const r of exchangeRecords) { - const exchangeDetails = await ws.exchangeOps.getExchangeDetails(tx, r.baseUrl); + const exchangeDetails = await ws.exchangeOps.getExchangeDetails( + tx, + r.baseUrl, + ); const denominations = await tx.denominations.indexes.byExchangeBaseUrl .iter(r.baseUrl) .toArray(); @@ -1372,7 +1374,9 @@ export async function getWithdrawalDetailsForUri( exchanges.push({ exchangeBaseUrl: exchangeDetails.exchangeBaseUrl, currency: exchangeDetails.currency, - paytoUris: exchangeDetails.wireInfo.accounts.map((x) => x.payto_uri), + paytoUris: exchangeDetails.wireInfo.accounts.map( + (x) => x.payto_uri, + ), tosStatus: getExchangeTosStatus(exchangeDetails), }); } |