From 9ad8c69782b69e2565bf6cdcb8cca555fced1292 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Fri, 17 Jan 2020 22:25:33 +0100 Subject: [PATCH] fix amount format (how did this ever work before?) --- src/operations/pending.ts | 1 + src/operations/refresh.ts | 9 ++++++++- src/types/pending.ts | 6 ++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/operations/pending.ts b/src/operations/pending.ts index f3cca9f24..3ae44692a 100644 --- a/src/operations/pending.ts +++ b/src/operations/pending.ts @@ -403,6 +403,7 @@ export async function getPendingOperations( ): Promise { const resp: PendingOperationsResponse = { nextRetryDelay: { d_ms: Number.MAX_SAFE_INTEGER }, + onlyDue: onlyDue, pendingOperations: [], }; const now = getTimestampNow(); diff --git a/src/operations/refresh.ts b/src/operations/refresh.ts index 87d81cb2d..418ec0469 100644 --- a/src/operations/refresh.ts +++ b/src/operations/refresh.ts @@ -236,11 +236,18 @@ async function refreshMelt( denom_pub_hash: coin.denomPubHash, denom_sig: coin.denomSig, rc: refreshSession.hash, - value_with_fee: refreshSession.amountRefreshInput, + value_with_fee: Amounts.toString(refreshSession.amountRefreshInput), }; logger.trace("melt request:", meltReq); const resp = await ws.http.postJson(reqUrl.href, meltReq); if (resp.status !== 200) { + console.log(`got status ${resp.status} for refresh/melt`); + try { + const respJson = await resp.json(); + console.log(`body of refresh/melt error response:`, JSON.stringify(respJson, undefined, 2)); + } catch (e) { + console.log(`body of refresh/melt error response is not JSON`); + } throw Error(`unexpected status code ${resp.status} for refresh/melt`); } diff --git a/src/types/pending.ts b/src/types/pending.ts index f3979ac81..15299dec4 100644 --- a/src/types/pending.ts +++ b/src/types/pending.ts @@ -177,4 +177,10 @@ export interface PendingOperationInfoCommon { export interface PendingOperationsResponse { pendingOperations: PendingOperationInfo[]; nextRetryDelay: Duration; + + /** + * Does this response only include pending operations that + * are due to be executed right now? + */ + onlyDue: boolean; }