aboutsummaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/taler-util/src/backup-types.ts3
-rw-r--r--packages/taler-util/src/wallet-types.ts7
-rw-r--r--packages/taler-wallet-core/src/crypto/cryptoImplementation.ts1
-rw-r--r--packages/taler-wallet-core/src/operations/backup/export.ts2
-rw-r--r--packages/taler-wallet-core/src/operations/backup/import.ts2
-rw-r--r--packages/taler-wallet-core/src/operations/exchanges.ts2
-rw-r--r--packages/taler-wallet-core/src/wallet.ts6
7 files changed, 0 insertions, 23 deletions
diff --git a/packages/taler-util/src/backup-types.ts b/packages/taler-util/src/backup-types.ts
index f44a8ba3f..6c9c7b424 100644
--- a/packages/taler-util/src/backup-types.ts
+++ b/packages/taler-util/src/backup-types.ts
@@ -1070,8 +1070,6 @@ export interface BackupExchangeWireFee {
*/
wire_fee: string;
- wad_fee: string;
-
/**
* Fees to close and refund a reserve.
*/
@@ -1101,7 +1099,6 @@ export interface BackupExchangeGlobalFees {
startDate: TalerProtocolTimestamp;
endDate: TalerProtocolTimestamp;
- kycFee: BackupAmountString;
historyFee: BackupAmountString;
accountFee: BackupAmountString;
purseFee: BackupAmountString;
diff --git a/packages/taler-util/src/wallet-types.ts b/packages/taler-util/src/wallet-types.ts
index 24a97ba12..fc173f1e9 100644
--- a/packages/taler-util/src/wallet-types.ts
+++ b/packages/taler-util/src/wallet-types.ts
@@ -727,11 +727,6 @@ export interface WireFee {
closingFee: AmountJson;
/**
- * Fees for inter-exchange transfers from P2P payments.
- */
- wadFee: AmountJson;
-
- /**
* Start date of the fee.
*/
startStamp: TalerProtocolTimestamp;
@@ -766,7 +761,6 @@ export interface ExchangeGlobalFees {
startDate: TalerProtocolTimestamp;
endDate: TalerProtocolTimestamp;
- kycFee: AmountJson;
historyFee: AmountJson;
accountFee: AmountJson;
purseFee: AmountJson;
@@ -790,7 +784,6 @@ const codecForWireFee = (): Codec<WireFee> =>
buildCodecForObject<WireFee>()
.property("sig", codecForString())
.property("wireFee", codecForAmountJson())
- .property("wadFee", codecForAmountJson())
.property("closingFee", codecForAmountJson())
.property("startStamp", codecForTimestamp)
.property("endStamp", codecForTimestamp)
diff --git a/packages/taler-wallet-core/src/crypto/cryptoImplementation.ts b/packages/taler-wallet-core/src/crypto/cryptoImplementation.ts
index 892d3fc8f..593574eb7 100644
--- a/packages/taler-wallet-core/src/crypto/cryptoImplementation.ts
+++ b/packages/taler-wallet-core/src/crypto/cryptoImplementation.ts
@@ -896,7 +896,6 @@ export const nativeCryptoR: TalerCryptoInterfaceR = {
.put(timestampRoundedToBuffer(wf.endStamp))
.put(amountToBuffer(wf.wireFee))
.put(amountToBuffer(wf.closingFee))
- .put(amountToBuffer(wf.wadFee))
.build();
const sig = decodeCrock(wf.sig);
const pub = decodeCrock(masterPub);
diff --git a/packages/taler-wallet-core/src/operations/backup/export.ts b/packages/taler-wallet-core/src/operations/backup/export.ts
index 1b2a7f637..b344aa362 100644
--- a/packages/taler-wallet-core/src/operations/backup/export.ts
+++ b/packages/taler-wallet-core/src/operations/backup/export.ts
@@ -322,7 +322,6 @@ export async function exportBackup(
wireFees.push({
wire_type: x,
closing_fee: Amounts.stringify(f.closingFee),
- wad_fee: Amounts.stringify(f.wadFee),
end_stamp: f.endStamp,
sig: f.sig,
start_stamp: f.startStamp,
@@ -363,7 +362,6 @@ export async function exportBackup(
global_fees: ex.globalFees.map((x) => ({
accountFee: Amounts.stringify(x.accountFee),
historyFee: Amounts.stringify(x.historyFee),
- kycFee: Amounts.stringify(x.kycFee),
purseFee: Amounts.stringify(x.purseFee),
kycTimeout: x.kycTimeout,
endDate: x.endDate,
diff --git a/packages/taler-wallet-core/src/operations/backup/import.ts b/packages/taler-wallet-core/src/operations/backup/import.ts
index ad3676ef8..187acc5d4 100644
--- a/packages/taler-wallet-core/src/operations/backup/import.ts
+++ b/packages/taler-wallet-core/src/operations/backup/import.ts
@@ -384,7 +384,6 @@ export async function importBackup(
sig: fee.sig,
startStamp: fee.start_stamp,
wireFee: Amounts.parseOrThrow(fee.wire_fee),
- wadFee: Amounts.parseOrThrow(fee.wad_fee),
});
}
let tosAccepted = undefined;
@@ -414,7 +413,6 @@ export async function importBackup(
globalFees: backupExchangeDetails.global_fees.map((x) => ({
accountFee: Amounts.parseOrThrow(x.accountFee),
historyFee: Amounts.parseOrThrow(x.historyFee),
- kycFee: Amounts.parseOrThrow(x.kycFee),
purseFee: Amounts.parseOrThrow(x.purseFee),
kycTimeout: x.kycTimeout,
endDate: x.endDate,
diff --git a/packages/taler-wallet-core/src/operations/exchanges.ts b/packages/taler-wallet-core/src/operations/exchanges.ts
index 63e71c36c..8e68074d5 100644
--- a/packages/taler-wallet-core/src/operations/exchanges.ts
+++ b/packages/taler-wallet-core/src/operations/exchanges.ts
@@ -270,7 +270,6 @@ async function validateWireInfo(
sig: x.sig,
startStamp,
wireFee: Amounts.parseOrThrow(x.wire_fee),
- wadFee: Amounts.parseOrThrow(x.wad_fee),
};
let isValid = false;
if (ws.insecureTrustExchange) {
@@ -323,7 +322,6 @@ async function validateGlobalFees(
accountFee: Amounts.parseOrThrow(gf.account_fee),
historyFee: Amounts.parseOrThrow(gf.history_fee),
purseFee: Amounts.parseOrThrow(gf.purse_fee),
- kycFee: Amounts.parseOrThrow(gf.kyc_fee),
startDate: gf.start_date,
endDate: gf.end_date,
signature: gf.master_sig,
diff --git a/packages/taler-wallet-core/src/wallet.ts b/packages/taler-wallet-core/src/wallet.ts
index 04645a4e8..dbab6607e 100644
--- a/packages/taler-wallet-core/src/wallet.ts
+++ b/packages/taler-wallet-core/src/wallet.ts
@@ -770,7 +770,6 @@ async function getExchangeDetailedInfo(
fee: w.closingFee,
group: "closing",
})),
- ...infoForType.map((w) => ({ ...w, fee: w.wadFee, group: "wad" })),
...infoForType.map((w) => ({ ...w, fee: w.wireFee, group: "wire" })),
];
prev[wireType] = createTimeline(
@@ -798,11 +797,6 @@ async function getExchangeDetailedInfo(
})),
...exchange.info.globalFees.map((w) => ({
...w,
- fee: w.kycFee,
- group: "kyc",
- })),
- ...exchange.info.globalFees.map((w) => ({
- ...w,
fee: w.purseFee,
group: "purse",
})),