wallet-core: remove kyc and wad fee

This commit is contained in:
Florian Dold 2022-11-01 17:16:36 +01:00
parent ab48d3df6e
commit 504d9f09b4
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
7 changed files with 0 additions and 23 deletions

View File

@ -1070,8 +1070,6 @@ export interface BackupExchangeWireFee {
*/ */
wire_fee: string; wire_fee: string;
wad_fee: string;
/** /**
* Fees to close and refund a reserve. * Fees to close and refund a reserve.
*/ */
@ -1101,7 +1099,6 @@ export interface BackupExchangeGlobalFees {
startDate: TalerProtocolTimestamp; startDate: TalerProtocolTimestamp;
endDate: TalerProtocolTimestamp; endDate: TalerProtocolTimestamp;
kycFee: BackupAmountString;
historyFee: BackupAmountString; historyFee: BackupAmountString;
accountFee: BackupAmountString; accountFee: BackupAmountString;
purseFee: BackupAmountString; purseFee: BackupAmountString;

View File

@ -726,11 +726,6 @@ export interface WireFee {
*/ */
closingFee: AmountJson; closingFee: AmountJson;
/**
* Fees for inter-exchange transfers from P2P payments.
*/
wadFee: AmountJson;
/** /**
* Start date of the fee. * Start date of the fee.
*/ */
@ -766,7 +761,6 @@ export interface ExchangeGlobalFees {
startDate: TalerProtocolTimestamp; startDate: TalerProtocolTimestamp;
endDate: TalerProtocolTimestamp; endDate: TalerProtocolTimestamp;
kycFee: AmountJson;
historyFee: AmountJson; historyFee: AmountJson;
accountFee: AmountJson; accountFee: AmountJson;
purseFee: AmountJson; purseFee: AmountJson;
@ -790,7 +784,6 @@ const codecForWireFee = (): Codec<WireFee> =>
buildCodecForObject<WireFee>() buildCodecForObject<WireFee>()
.property("sig", codecForString()) .property("sig", codecForString())
.property("wireFee", codecForAmountJson()) .property("wireFee", codecForAmountJson())
.property("wadFee", codecForAmountJson())
.property("closingFee", codecForAmountJson()) .property("closingFee", codecForAmountJson())
.property("startStamp", codecForTimestamp) .property("startStamp", codecForTimestamp)
.property("endStamp", codecForTimestamp) .property("endStamp", codecForTimestamp)

View File

@ -896,7 +896,6 @@ export const nativeCryptoR: TalerCryptoInterfaceR = {
.put(timestampRoundedToBuffer(wf.endStamp)) .put(timestampRoundedToBuffer(wf.endStamp))
.put(amountToBuffer(wf.wireFee)) .put(amountToBuffer(wf.wireFee))
.put(amountToBuffer(wf.closingFee)) .put(amountToBuffer(wf.closingFee))
.put(amountToBuffer(wf.wadFee))
.build(); .build();
const sig = decodeCrock(wf.sig); const sig = decodeCrock(wf.sig);
const pub = decodeCrock(masterPub); const pub = decodeCrock(masterPub);

View File

@ -322,7 +322,6 @@ export async function exportBackup(
wireFees.push({ wireFees.push({
wire_type: x, wire_type: x,
closing_fee: Amounts.stringify(f.closingFee), closing_fee: Amounts.stringify(f.closingFee),
wad_fee: Amounts.stringify(f.wadFee),
end_stamp: f.endStamp, end_stamp: f.endStamp,
sig: f.sig, sig: f.sig,
start_stamp: f.startStamp, start_stamp: f.startStamp,
@ -363,7 +362,6 @@ export async function exportBackup(
global_fees: ex.globalFees.map((x) => ({ global_fees: ex.globalFees.map((x) => ({
accountFee: Amounts.stringify(x.accountFee), accountFee: Amounts.stringify(x.accountFee),
historyFee: Amounts.stringify(x.historyFee), historyFee: Amounts.stringify(x.historyFee),
kycFee: Amounts.stringify(x.kycFee),
purseFee: Amounts.stringify(x.purseFee), purseFee: Amounts.stringify(x.purseFee),
kycTimeout: x.kycTimeout, kycTimeout: x.kycTimeout,
endDate: x.endDate, endDate: x.endDate,

View File

@ -384,7 +384,6 @@ export async function importBackup(
sig: fee.sig, sig: fee.sig,
startStamp: fee.start_stamp, startStamp: fee.start_stamp,
wireFee: Amounts.parseOrThrow(fee.wire_fee), wireFee: Amounts.parseOrThrow(fee.wire_fee),
wadFee: Amounts.parseOrThrow(fee.wad_fee),
}); });
} }
let tosAccepted = undefined; let tosAccepted = undefined;
@ -414,7 +413,6 @@ export async function importBackup(
globalFees: backupExchangeDetails.global_fees.map((x) => ({ globalFees: backupExchangeDetails.global_fees.map((x) => ({
accountFee: Amounts.parseOrThrow(x.accountFee), accountFee: Amounts.parseOrThrow(x.accountFee),
historyFee: Amounts.parseOrThrow(x.historyFee), historyFee: Amounts.parseOrThrow(x.historyFee),
kycFee: Amounts.parseOrThrow(x.kycFee),
purseFee: Amounts.parseOrThrow(x.purseFee), purseFee: Amounts.parseOrThrow(x.purseFee),
kycTimeout: x.kycTimeout, kycTimeout: x.kycTimeout,
endDate: x.endDate, endDate: x.endDate,

View File

@ -270,7 +270,6 @@ async function validateWireInfo(
sig: x.sig, sig: x.sig,
startStamp, startStamp,
wireFee: Amounts.parseOrThrow(x.wire_fee), wireFee: Amounts.parseOrThrow(x.wire_fee),
wadFee: Amounts.parseOrThrow(x.wad_fee),
}; };
let isValid = false; let isValid = false;
if (ws.insecureTrustExchange) { if (ws.insecureTrustExchange) {
@ -323,7 +322,6 @@ async function validateGlobalFees(
accountFee: Amounts.parseOrThrow(gf.account_fee), accountFee: Amounts.parseOrThrow(gf.account_fee),
historyFee: Amounts.parseOrThrow(gf.history_fee), historyFee: Amounts.parseOrThrow(gf.history_fee),
purseFee: Amounts.parseOrThrow(gf.purse_fee), purseFee: Amounts.parseOrThrow(gf.purse_fee),
kycFee: Amounts.parseOrThrow(gf.kyc_fee),
startDate: gf.start_date, startDate: gf.start_date,
endDate: gf.end_date, endDate: gf.end_date,
signature: gf.master_sig, signature: gf.master_sig,

View File

@ -770,7 +770,6 @@ async function getExchangeDetailedInfo(
fee: w.closingFee, fee: w.closingFee,
group: "closing", group: "closing",
})), })),
...infoForType.map((w) => ({ ...w, fee: w.wadFee, group: "wad" })),
...infoForType.map((w) => ({ ...w, fee: w.wireFee, group: "wire" })), ...infoForType.map((w) => ({ ...w, fee: w.wireFee, group: "wire" })),
]; ];
prev[wireType] = createTimeline( prev[wireType] = createTimeline(
@ -796,11 +795,6 @@ async function getExchangeDetailedInfo(
fee: w.historyFee, fee: w.historyFee,
group: "history", group: "history",
})), })),
...exchange.info.globalFees.map((w) => ({
...w,
fee: w.kycFee,
group: "kyc",
})),
...exchange.info.globalFees.map((w) => ({ ...exchange.info.globalFees.map((w) => ({
...w, ...w,
fee: w.purseFee, fee: w.purseFee,