taler/wallet-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

wallet: round timestamps in db-less requests to the exchange

Browse Source
This commit is contained in:
Florian Dold 2022-03-17 11:08:53 +01:00
parent 151aa904e0
commit 05838080f5
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/taler-util/src/time.ts
View File

@ -87,6 +87,7 @@ export namespace Timestamp {
export const now = getTimestampNow; export const now = getTimestampNow;
export const min = timestampMin; export const min = timestampMin;
export const isExpired = isTimestampExpired; export const isExpired = isTimestampExpired;
export const truncateToSecond = timestampTruncateToSecond;
} }
export function timestampMin(t1: Timestamp, t2: Timestamp): Timestamp { export function timestampMin(t1: Timestamp, t2: Timestamp): Timestamp {

9
packages/taler-wallet-core/src/dbless.ts
View File

@ -41,10 +41,10 @@ import {
ExchangeProtocolVersion, ExchangeProtocolVersion,
ExchangeWithdrawRequest, ExchangeWithdrawRequest,
getRandomBytes, getRandomBytes,
getTimestampNow,
hashWire, hashWire,
Logger, Logger,
parsePaytoUri, parsePaytoUri,
Timestamp,
UnblindedSignature, UnblindedSignature,
} from "@gnu-taler/taler-util"; } from "@gnu-taler/taler-util";
import { DenominationRecord } from "./db.js"; import { DenominationRecord } from "./db.js";
@ -223,8 +223,9 @@ export async function depositCoin(args: {
args.depositPayto ?? "payto://x-taler-bank/localhost/foo"; args.depositPayto ?? "payto://x-taler-bank/localhost/foo";
const wireSalt = encodeCrock(getRandomBytes(16)); const wireSalt = encodeCrock(getRandomBytes(16));
const contractTermsHash = encodeCrock(getRandomBytes(64)); const contractTermsHash = encodeCrock(getRandomBytes(64));
const depositTimestamp = getTimestampNow(); const depositTimestamp = Timestamp.truncateToSecond(Timestamp.now());
const refundDeadline = getTimestampNow(); const refundDeadline = Timestamp.truncateToSecond(Timestamp.now());
const wireTransferDeadline = Timestamp.truncateToSecond(Timestamp.now());
const merchantPub = encodeCrock(getRandomBytes(32)); const merchantPub = encodeCrock(getRandomBytes(32));
const dp = await cryptoApi.signDepositPermission({ const dp = await cryptoApi.signDepositPermission({
coinPriv: coin.coinPriv, coinPriv: coin.coinPriv,
@ -248,7 +249,7 @@ export async function depositCoin(args: {
h_contract_terms: contractTermsHash, h_contract_terms: contractTermsHash,
ub_sig: coin.denomSig, ub_sig: coin.denomSig,
timestamp: depositTimestamp, timestamp: depositTimestamp,
wire_transfer_deadline: getTimestampNow(), wire_transfer_deadline: wireTransferDeadline,
refund_deadline: refundDeadline, refund_deadline: refundDeadline,
coin_sig: dp.coin_sig, coin_sig: dp.coin_sig,
denom_pub_hash: dp.h_denom, denom_pub_hash: dp.h_denom,