diff options
Diffstat (limited to 'packages/taler-wallet-core/src')
| -rw-r--r-- | packages/taler-wallet-core/src/operations/pay.ts | 8 | ||||
| -rw-r--r-- | packages/taler-wallet-core/src/util/time.ts | 7 |
2 files changed, 12 insertions, 3 deletions
diff --git a/packages/taler-wallet-core/src/operations/pay.ts b/packages/taler-wallet-core/src/operations/pay.ts index 6452a11ae..50f863e48 100644 --- a/packages/taler-wallet-core/src/operations/pay.ts +++ b/packages/taler-wallet-core/src/operations/pay.ts @@ -68,6 +68,8 @@ import { durationMax, durationMin, isTimestampExpired, + durationMul, + durationAdd, } from "../util/time"; import { strcmp, canonicalJson } from "../util/helpers"; import { @@ -614,8 +616,8 @@ function getProposalRequestTimeout(proposal: ProposalRecord): Duration { ); } -function getPurchaseRequestTimeout(purchase: PurchaseRecord): Duration { - return { d_ms: 5000 }; +function getPayRequestTimeout(purchase: PurchaseRecord): Duration { + return durationMul({ d_ms: 5000 }, 1 + purchase.payCoinSelection.coinPubs.length / 20); } async function processDownloadProposalImpl( @@ -936,7 +938,7 @@ export async function submitPay( const resp = await ws.runSequentialized([EXCHANGE_COINS_LOCK], () => ws.http.postJson(payUrl, reqBody, { - timeout: getPurchaseRequestTimeout(purchase), + timeout: getPayRequestTimeout(purchase), }), ); diff --git a/packages/taler-wallet-core/src/util/time.ts b/packages/taler-wallet-core/src/util/time.ts index 5a5e9c608..be63aef6b 100644 --- a/packages/taler-wallet-core/src/util/time.ts +++ b/packages/taler-wallet-core/src/util/time.ts @@ -151,6 +151,13 @@ export function durationMul(d: Duration, n: number): Duration { return { d_ms: Math.round(d.d_ms * n) }; } +export function durationAdd(d1: Duration, d2: Duration): Duration { + if (d1.d_ms === "forever" || d2.d_ms === "forever") { + return { d_ms: "forever" }; + } + return { d_ms: d1.d_ms + d2.d_ms }; +} + export function timestampCmp(t1: Timestamp, t2: Timestamp): number { if (t1.t_ms === "never") { if (t2.t_ms === "never") { |