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

logging, cosmetic fixes

Browse Source
This commit is contained in:
Florian Dold 2021-01-14 18:00:00 +01:00
parent 6293de7bfa
commit 19eb72e277
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
6 changed files with 45 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/taler-wallet-core/src/operations/exchanges.ts
View File

@ -31,7 +31,7 @@ import {
ExchangeUpdateReason,
MetaStores,
} from "../types/dbTypes";
import { canonicalizeBaseUrl } from "../util/helpers";
import { canonicalizeBaseUrl, j2s } from "../util/helpers";
import * as Amounts from "../util/amounts";
import { parsePaytoUri } from "../util/payto";
import {
@ -145,6 +145,7 @@ async function updateExchangeWithKeys(
);
logger.info("received /keys response");
logger.trace(j2s(exchangeKeysJson));
if (exchangeKeysJson.denoms.length === 0) {
const opErr = makeErrorDetails(

6
packages/taler-wallet-core/src/operations/reserves.ts
View File

@ -50,7 +50,7 @@ import {
denomSelectionInfoToState,
updateWithdrawalDenoms,
selectWithdrawalDenominations,
getPossibleWithdrawalDenoms,
getCandidateWithdrawalDenoms,
} from "./withdraw";
import {
guardOperationException,
@ -135,7 +135,7 @@ export async function createReserve(
const initialWithdrawalGroupId = encodeCrock(getRandomBytes(32));
await updateWithdrawalDenoms(ws, canonExchange);
const denoms = await getPossibleWithdrawalDenoms(ws, canonExchange);
const denoms = await getCandidateWithdrawalDenoms(ws, canonExchange);
const denomSelInfo = selectWithdrawalDenominations(req.amount, denoms);
const initialDenomSel = denomSelectionInfoToState(denomSelInfo);
@ -528,7 +528,7 @@ async function updateReserve(
const currency = balance.currency;
await updateWithdrawalDenoms(ws, reserve.exchangeBaseUrl);
const denoms = await getPossibleWithdrawalDenoms(ws, reserve.exchangeBaseUrl);
const denoms = await getCandidateWithdrawalDenoms(ws, reserve.exchangeBaseUrl);
const newWithdrawalGroup = await ws.db.runWithWriteTransaction(
[Stores.coins, Stores.planchets, Stores.withdrawalGroups, Stores.reserves],

4
packages/taler-wallet-core/src/operations/tip.ts
View File

@ -34,7 +34,7 @@ import {
getExchangeWithdrawalInfo,
denomSelectionInfoToState,
updateWithdrawalDenoms,
getPossibleWithdrawalDenoms,
getCandidateWithdrawalDenoms,
selectWithdrawalDenominations,
} from "./withdraw";
import { updateExchangeFromUrl } from "./exchanges";
@ -95,7 +95,7 @@ export async function prepareTip(
const walletTipId = encodeCrock(getRandomBytes(32));
await updateWithdrawalDenoms(ws, tipPickupStatus.exchange_url);
const denoms = await getPossibleWithdrawalDenoms(
const denoms = await getCandidateWithdrawalDenoms(
ws,
tipPickupStatus.exchange_url,
);

15
packages/taler-wallet-core/src/operations/withdraw-test.ts
View File

@ -17,6 +17,7 @@
import test from "ava";
import { selectWithdrawalDenominations } from "./withdraw";
import { Amounts } from "../util/amounts";
import { DenominationRecord, DenominationStatus } from "../types/dbTypes";
test("withdrawal selection bug repro", (t) => {
const amount = {
@ -25,7 +26,7 @@ test("withdrawal selection bug repro", (t) => {
value: 23,
};
const denoms = [
const denoms: DenominationRecord[] = [
{
denomPub:
"040000XT67C8KBD6B75TTQ3SK8FWXMNQW4372T3BDDGPAMB9RFCA03638W8T3F71WFEFK9NP32VKYVNFXPYRWQ1N1HDKV5J0DFEKHBPJCYSWCBJDRNWD7G8BN8PT97FA9AMV75MYEK4X54D1HGJ207JSVJBGFCATSPNTEYNHEQF1F220W00TBZR1HNPDQFD56FG0DJQ9KGHM8EC33H6AY9YN9CNX5R3Z4TZ4Q23W47SBHB13H6W74FQJG1F50X38VRSC4SR8RWBAFB7S4K8D2H4NMRFSQT892A3T0BTBW7HM5C0H2CK6FRKG31F7W9WP1S29013K5CXYE55CT8TH6N8J9B780R42Y5S3ZB6J6E9H76XBPSGH4TGYSR2VZRB98J417KCQMZKX1BB67E7W5KVE37TC9SJ904002",
@ -68,7 +69,7 @@ test("withdrawal selection bug repro", (t) => {
stampStart: {
t_ms: 1585229388000,
},
status: 0,
status: DenominationStatus.Unverified,
value: {
currency: "KUDOS",
fraction: 0,
@ -117,7 +118,7 @@ test("withdrawal selection bug repro", (t) => {
stampStart: {
t_ms: 1585229388000,
},
status: 0,
status: DenominationStatus.Unverified,
value: {
currency: "KUDOS",
fraction: 0,
@ -166,7 +167,7 @@ test("withdrawal selection bug repro", (t) => {
stampStart: {
t_ms: 1585229388000,
},
status: 0,
status: DenominationStatus.Unverified,
value: {
currency: "KUDOS",
fraction: 0,
@ -215,7 +216,7 @@ test("withdrawal selection bug repro", (t) => {
stampStart: {
t_ms: 1585229388000,
},
status: 0,
status: DenominationStatus.Unverified,
value: {
currency: "KUDOS",
fraction: 0,
@ -264,7 +265,7 @@ test("withdrawal selection bug repro", (t) => {
stampStart: {
t_ms: 1585229388000,
},
status: 0,
status: DenominationStatus.Unverified,
value: {
currency: "KUDOS",
fraction: 10000000,
@ -313,7 +314,7 @@ test("withdrawal selection bug repro", (t) => {
stampStart: {
t_ms: 1585229388000,
},
status: 0,
status: DenominationStatus.Unverified,
value: {
currency: "KUDOS",
fraction: 0,

30
packages/taler-wallet-core/src/operations/withdraw.ts
View File

@ -67,6 +67,7 @@ import { TalerErrorCode } from "../TalerErrorCode";
import { encodeCrock } from "../crypto/talerCrypto";
import { updateRetryInfoTimeout, initRetryInfo } from "../util/retries";
import { compare } from "../util/libtoolVersion";
import { j2s } from "../util/helpers";
const logger = new Logger("withdraw.ts");
@ -207,7 +208,7 @@ export async function getBankWithdrawalInfo(
/**
* Return denominations that can potentially used for a withdrawal.
*/
export async function getPossibleWithdrawalDenoms(
export async function getCandidateWithdrawalDenoms(
ws: InternalWalletState,
exchangeBaseUrl: string,
): Promise<DenominationRecord[]> {
@ -544,7 +545,7 @@ export async function updateWithdrawalDenoms(
logger.error("exchange details not available");
throw Error(`exchange ${exchangeBaseUrl} details not available`);
}
const denominations = await getPossibleWithdrawalDenoms(ws, exchangeBaseUrl);
const denominations = await getCandidateWithdrawalDenoms(ws, exchangeBaseUrl);
for (const denom of denominations) {
if (denom.status === DenominationStatus.Unverified) {
const valid = await ws.cryptoApi.isValidDenom(
@ -559,6 +560,29 @@ export async function updateWithdrawalDenoms(
await ws.db.put(Stores.denominations, denom);
}
}
// FIXME: This debug info should either be made conditional on some flag
// or put into some wallet-core API.
logger.trace("updated withdrawable denominations");
const nextDenominations = await getCandidateWithdrawalDenoms(
ws,
exchangeBaseUrl,
);
const now = getTimestampNow();
for (const denom of nextDenominations) {
const started = timestampCmp(now, denom.stampStart) >= 0;
const lastPossibleWithdraw = timestampSubtractDuraction(
denom.stampExpireWithdraw,
{ d_ms: 50 * 1000 },
);
const remaining = getDurationRemaining(lastPossibleWithdraw, now);
logger.trace(
`Denom ${denom.denomPubHash} ${denom.status} revoked ${
denom.isRevoked
} offered ${denom.isOffered} remaining ${
(remaining.d_ms as number) / 1000
}sec started ${started}`,
);
}
}
async function incrementWithdrawalRetry(
@ -725,7 +749,7 @@ export async function getExchangeWithdrawalInfo(
}
await updateWithdrawalDenoms(ws, baseUrl);
const denoms = await getPossibleWithdrawalDenoms(ws, baseUrl);
const denoms = await getCandidateWithdrawalDenoms(ws, baseUrl);
const selectedDenoms = selectWithdrawalDenominations(amount, denoms);
const exchangeWireAccounts: string[] = [];
for (const account of exchangeWireInfo.accounts) {

6
packages/taler-wallet-core/src/types/dbTypes.ts
View File

@ -261,15 +261,15 @@ export enum DenominationStatus {
/**
* Verification was delayed.
*/
Unverified,
Unverified = "unverified",
/**
* Verified as valid.
*/
VerifiedGood,
VerifiedGood = "verified-good",
/**
* Verified as invalid.
*/
VerifiedBad,
VerifiedBad = "verified-bad",
}
/**