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

make verbose details an option

Browse Source
This commit is contained in:
Florian Dold 2020-01-22 12:22:57 +01:00
parent 21194fa781
commit 14103aa075
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
4 changed files with 77 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/headless/integrationtest.ts
View File

@ -187,7 +187,7 @@ export async function runIntegrationTest(args: IntegrationTestArgs) {
await myWallet.runUntilDone();
const history = await myWallet.getHistory();
const history = await myWallet.getHistory({ verboseDetails: true });
console.log("history after integration test:", JSON.stringify(history, undefined, 2));
}

107
src/operations/history.ts
View File

@ -215,15 +215,16 @@ export async function getHistory(
cs.push(x);
}
});
const verboseDetails: VerboseWithdrawDetails = {
coins: cs.map((x) => ({
value: Amounts.toString(x.coinValue),
denomPub: x.denomPub,
})),
};
const coins = cs.map((x) => ({
value: x.coinValue
}));
let verboseDetails: VerboseWithdrawDetails | undefined = undefined;
if (historyQuery?.verboseDetails) {
verboseDetails = {
coins: cs.map((x) => ({
value: Amounts.toString(x.coinValue),
denomPub: x.denomPub,
})),
};
}
history.push({
type: HistoryEventType.Withdrawn,
@ -257,29 +258,32 @@ export async function getHistory(
if (!orderShortInfo) {
return;
}
const coins: {
value: string,
contribution: string;
denomPub: string;
}[] = [];
for (const x of purchase.payReq.coins) {
const c = await tx.get(Stores.coins, x.coin_pub);
if (!c) {
// FIXME: what to do here??
continue;
let verboseDetails: VerbosePayCoinDetails | undefined = undefined;
if (historyQuery?.verboseDetails) {
const coins: {
value: string,
contribution: string;
denomPub: string;
}[] = [];
for (const x of purchase.payReq.coins) {
const c = await tx.get(Stores.coins, x.coin_pub);
if (!c) {
// FIXME: what to do here??
continue;
}
const d = await tx.get(Stores.denominations, [c.exchangeBaseUrl, c.denomPub]);
if (!d) {
// FIXME: what to do here??
continue;
}
coins.push({
contribution: x.contribution,
denomPub: c.denomPub,
value: Amounts.toString(d.value),
});
}
const d = await tx.get(Stores.denominations, [c.exchangeBaseUrl, c.denomPub]);
if (!d) {
// FIXME: what to do here??
continue;
}
coins.push({
contribution: x.contribution,
denomPub: c.denomPub,
value: Amounts.toString(d.value),
});
verboseDetails = { coins };
}
const verboseDetails: VerbosePayCoinDetails = { coins };
const amountPaidWithFees = Amounts.sum(
purchase.payReq.coins.map(x => Amounts.parseOrThrow(x.contribution)),
).amount;
@ -331,30 +335,33 @@ export async function getHistory(
} else {
amountRefreshedEffective = Amounts.sum(amountsEffective).amount;
}
const outputCoins: {
value: string;
denomPub: string,
}[] = [];
for (const rs of rg.refreshSessionPerCoin) {
if (!rs) {
continue;
}
for (const nd of rs.newDenoms) {
if (!nd) {
let verboseDetails: VerboseRefreshDetails | undefined = undefined;
if (historyQuery?.verboseDetails) {
const outputCoins: {
value: string;
denomPub: string,
}[] = [];
for (const rs of rg.refreshSessionPerCoin) {
if (!rs) {
continue;
}
const d = await tx.get(Stores.denominations, [rs.exchangeBaseUrl, nd]);
if (!d) {
continue;
for (const nd of rs.newDenoms) {
if (!nd) {
continue;
}
const d = await tx.get(Stores.denominations, [rs.exchangeBaseUrl, nd]);
if (!d) {
continue;
}
outputCoins.push({
denomPub: d.denomPub,
value: Amounts.toString(d.value),
});
}
outputCoins.push({
denomPub: d.denomPub,
value: Amounts.toString(d.value),
});
}
}
const verboseDetails: VerboseRefreshDetails = {
outputCoins: outputCoins,
verboseDetails = {
outputCoins: outputCoins,
}
}
history.push({
type: HistoryEventType.Refreshed,

15
src/types/history.ts
View File

@ -509,7 +509,7 @@ export interface HistoryPaymentSent {
*/
sessionId: string | undefined;
verboseDetails: VerbosePayCoinDetails;
verboseDetails?: VerbosePayCoinDetails;
}
/**
@ -590,7 +590,7 @@ export interface HistoryRefreshedEvent {
*/
refreshGroupId: string;
verboseDetails: VerboseRefreshDetails;
verboseDetails?: VerboseRefreshDetails;
}
export interface VerboseWithdrawDetails {
@ -630,7 +630,10 @@ export interface HistoryWithdrawnEvent {
*/
amountWithdrawnEffective: string;
verboseDetails: VerboseWithdrawDetails;
/**
* Verbose details of the operations, only generated when requested.
*/
verboseDetails?: VerboseWithdrawDetails;
}
/**
@ -684,5 +687,9 @@ export type HistoryEvent = HistoryEventBase &
);
export interface HistoryQuery {
// TBD
/**
* Output extra verbose details, intended for debugging
* and not for end users.
*/
verboseDetails?: boolean;
}

8
src/types/pending.ts
View File

@ -60,6 +60,9 @@ export type PendingOperationInfo = PendingOperationInfoCommon &
| PendingWithdrawOperation
);
/**
* The wallet is currently updating information about an exchange.
*/
export interface PendingExchangeUpdateOperation {
type: PendingOperationType.ExchangeUpdate;
stage: string;
@ -68,6 +71,11 @@ export interface PendingExchangeUpdateOperation {
lastError: OperationError | undefined;
}
/**
* Some interal error happened in the wallet. This pending operation
* should *only* be reported for problems in the wallet, not when
* a problem with a merchant/exchange/etc. occurs.
*/
export interface PendingBugOperation {
type: PendingOperationType.Bug;
message: string;