From f8d12f7b0d4af1b1769b89e80c87f9c169678564 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Fri, 18 Mar 2022 15:32:41 +0100
Subject: wallet: t_s/d_us migration

---
 .../taler-wallet-core/src/crypto/workers/cryptoApi.ts    |  2 +-
 .../src/crypto/workers/cryptoImplementation.ts           | 16 ++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'packages/taler-wallet-core/src/crypto')

diff --git a/packages/taler-wallet-core/src/crypto/workers/cryptoApi.ts b/packages/taler-wallet-core/src/crypto/workers/cryptoApi.ts
index 820397346..d91aa08a2 100644
--- a/packages/taler-wallet-core/src/crypto/workers/cryptoApi.ts
+++ b/packages/taler-wallet-core/src/crypto/workers/cryptoApi.ts
@@ -207,7 +207,7 @@ export class CryptoApi {
       }
     };
     ws.terminationTimerHandle = timer.after(15 * 1000, destroy);
-    ws.terminationTimerHandle.unref();
+    //ws.terminationTimerHandle.unref();
   }
 
   handleWorkerError(ws: WorkerState, e: any): void {
diff --git a/packages/taler-wallet-core/src/crypto/workers/cryptoImplementation.ts b/packages/taler-wallet-core/src/crypto/workers/cryptoImplementation.ts
index b51d499d5..b27067885 100644
--- a/packages/taler-wallet-core/src/crypto/workers/cryptoImplementation.ts
+++ b/packages/taler-wallet-core/src/crypto/workers/cryptoImplementation.ts
@@ -67,13 +67,11 @@ import {
   setupWithdrawPlanchet,
   stringToBytes,
   TalerSignaturePurpose,
-  Timestamp,
-  timestampTruncateToSecond,
-  typedArrayConcat,
+  AbsoluteTime,
   BlindedDenominationSignature,
-  RsaUnblindedSignature,
   UnblindedSignature,
   PlanchetUnblindInfo,
+  TalerProtocolTimestamp,
 } from "@gnu-taler/taler-util";
 import bigint from "big-integer";
 import { DenominationRecord, WireFee } from "../../db.js";
@@ -110,18 +108,16 @@ function amountToBuffer(amount: AmountJson): Uint8Array {
   return u8buf;
 }
 
-function timestampRoundedToBuffer(ts: Timestamp): Uint8Array {
+function timestampRoundedToBuffer(ts: TalerProtocolTimestamp): Uint8Array {
   const b = new ArrayBuffer(8);
   const v = new DataView(b);
-  const tsRounded = timestampTruncateToSecond(ts);
+  // The buffer we sign over represents the timestamp in microseconds.
   if (typeof v.setBigUint64 !== "undefined") {
-    const s = BigInt(tsRounded.t_ms) * BigInt(1000);
+    const s = BigInt(ts.t_s) * BigInt(1000 * 1000);
     v.setBigUint64(0, s);
   } else {
     const s =
-      tsRounded.t_ms === "never"
-        ? bigint.zero
-        : bigint(tsRounded.t_ms).times(1000);
+      ts.t_s === "never" ? bigint.zero : bigint(ts.t_s).multiply(1000 * 1000);
     const arr = s.toArray(2 ** 8).value;
     let offset = 8 - arr.length;
     for (let i = 0; i < arr.length; i++) {
-- 
cgit v1.2.3