From cd8f76db61f4a1ab1a8a8a4d29b2f3e863b59854 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Fri, 26 May 2023 12:19:32 +0200 Subject: taler-util,wallet-core: implement TalerPreciseTimestamp Fixes #7703 --- packages/taler-wallet-core/src/util/coinSelection.ts | 4 ++-- packages/taler-wallet-core/src/util/denominations.test.ts | 2 +- packages/taler-wallet-core/src/util/denominations.ts | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'packages/taler-wallet-core/src/util') diff --git a/packages/taler-wallet-core/src/util/coinSelection.ts b/packages/taler-wallet-core/src/util/coinSelection.ts index af6dab2bb..f4066bf51 100644 --- a/packages/taler-wallet-core/src/util/coinSelection.ts +++ b/packages/taler-wallet-core/src/util/coinSelection.ts @@ -577,8 +577,8 @@ export async function selectCandidates( ]?.find((x) => { return AbsoluteTime.isBetween( AbsoluteTime.now(), - AbsoluteTime.fromTimestamp(x.startStamp), - AbsoluteTime.fromTimestamp(x.endStamp), + AbsoluteTime.fromProtocolTimestamp(x.startStamp), + AbsoluteTime.fromProtocolTimestamp(x.endStamp), ); })?.wireFee; if (wireFeeStr) { diff --git a/packages/taler-wallet-core/src/util/denominations.test.ts b/packages/taler-wallet-core/src/util/denominations.test.ts index 551e06a33..25dbda081 100644 --- a/packages/taler-wallet-core/src/util/denominations.test.ts +++ b/packages/taler-wallet-core/src/util/denominations.test.ts @@ -42,7 +42,7 @@ const VALUES: AmountString[] = Array.from({ length: 10 }).map( (undef, t) => `USD:${t}`, ); const TIMESTAMPS = Array.from({ length: 20 }).map((undef, t_s) => ({ t_s })); -const ABS_TIME = TIMESTAMPS.map((m) => AbsoluteTime.fromTimestamp(m)); +const ABS_TIME = TIMESTAMPS.map((m) => AbsoluteTime.fromProtocolTimestamp(m)); function normalize( list: DenominationInfo[], diff --git a/packages/taler-wallet-core/src/util/denominations.ts b/packages/taler-wallet-core/src/util/denominations.ts index 5cc57bdab..ecf8c5671 100644 --- a/packages/taler-wallet-core/src/util/denominations.ts +++ b/packages/taler-wallet-core/src/util/denominations.ts @@ -326,7 +326,7 @@ export function createTimeline( fee: Amounts.stringify(fee), group, id, - moment: AbsoluteTime.fromTimestamp(stampStart), + moment: AbsoluteTime.fromProtocolTimestamp(stampStart), denom, }); ps.push({ @@ -334,7 +334,7 @@ export function createTimeline( fee: Amounts.stringify(fee), group, id, - moment: AbsoluteTime.fromTimestamp(stampEnd), + moment: AbsoluteTime.fromProtocolTimestamp(stampEnd), denom, }); return ps; @@ -457,8 +457,8 @@ export function isWithdrawableDenom( denomselAllowLate?: boolean, ): boolean { const now = AbsoluteTime.now(); - const start = AbsoluteTime.fromTimestamp(d.stampStart); - const withdrawExpire = AbsoluteTime.fromTimestamp(d.stampExpireWithdraw); + const start = AbsoluteTime.fromProtocolTimestamp(d.stampStart); + const withdrawExpire = AbsoluteTime.fromProtocolTimestamp(d.stampExpireWithdraw); const started = AbsoluteTime.cmp(now, start) >= 0; let lastPossibleWithdraw: AbsoluteTime; if (denomselAllowLate) { -- cgit v1.2.3