From c2ee8fd9ab6754275d7423152681236a46cf36a9 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Mon, 16 Dec 2019 16:59:09 +0100 Subject: cleanup, avoid some circular deps --- src/types/ReserveStatus.ts | 61 +++++++++ src/types/ReserveTransaction.ts | 273 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 334 insertions(+) create mode 100644 src/types/ReserveStatus.ts create mode 100644 src/types/ReserveTransaction.ts (limited to 'src/types') diff --git a/src/types/ReserveStatus.ts b/src/types/ReserveStatus.ts new file mode 100644 index 000000000..d9b5d9496 --- /dev/null +++ b/src/types/ReserveStatus.ts @@ -0,0 +1,61 @@ +/* + This file is part of GNU Taler + (C) 2019 Taler Systems S.A. + + GNU Taler is free software; you can redistribute it and/or modify it under the + terms of the GNU General Public License as published by the Free Software + Foundation; either version 3, or (at your option) any later version. + + GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + GNU Taler; see the file COPYING. If not, see + */ + +/** + * @author Florian Dold + */ + +/** + * Imports. + */ +import { + codecForString, + typecheckedCodec, + makeCodecForObject, + makeCodecForConstString, + makeCodecForUnion, + makeCodecForList, +} from "../util/codec"; +import { runBlock } from "../util/helpers"; +import { AmountString } from "./talerTypes"; +import { ReserveTransaction, codecForReserveTransaction } from "./ReserveTransaction"; + + +/** + * Status of a reserve. + * + * Schema type for the exchange's response to "/reserve/status". + */ +export interface ReserveStatus { + /** + * Balance left in the reserve. + */ + balance: AmountString; + + /** + * Transaction history for the reserve. + */ + history: ReserveTransaction[]; +} + +export const codecForReserveStatus = runBlock(() => ( + typecheckedCodec( + makeCodecForObject() + .property("balance", codecForString) + .property("history", makeCodecForList(codecForReserveTransaction)) + .build("ReserveStatus") + ) +)); \ No newline at end of file diff --git a/src/types/ReserveTransaction.ts b/src/types/ReserveTransaction.ts new file mode 100644 index 000000000..2ec859498 --- /dev/null +++ b/src/types/ReserveTransaction.ts @@ -0,0 +1,273 @@ +/* + This file is part of GNU Taler + (C) 2019 Taler Systems S.A. + + GNU Taler is free software; you can redistribute it and/or modify it under the + terms of the GNU General Public License as published by the Free Software + Foundation; either version 3, or (at your option) any later version. + + GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + GNU Taler; see the file COPYING. If not, see + */ + +/** + * @author Florian Dold + */ + +/** + * Imports. + */ +import { + codecForString, + typecheckedCodec, + makeCodecForObject, + makeCodecForConstString, + makeCodecForUnion, +} from "../util/codec"; +import { runBlock } from "../util/helpers"; +import { + AmountString, + Base32String, + EddsaSignatureString, + TimestampString, + EddsaPublicKeyString, + CoinPublicKeyString, +} from "./talerTypes"; + +export const enum ReserveTransactionType { + Withdraw = "WITHDRAW", + Deposit = "DEPOSIT", + Payback = "PAYBACK", + Closing = "CLOSING", +} + +export interface ReserveWithdrawTransaction { + type: ReserveTransactionType.Withdraw; + + /** + * Amount withdrawn. + */ + amount: AmountString; + + /** + * Hash of the denomination public key of the coin. + */ + h_denom_pub: Base32String; + + /** + * Hash of the blinded coin to be signed + */ + h_coin_envelope: Base32String; + + /** + * Signature of 'TALER_WithdrawRequestPS' created with the reserves's + * private key. + */ + reserve_sig: EddsaSignatureString; + + /** + * Fee that is charged for withdraw. + */ + withdraw_fee: AmountString; +} + +export interface ReserveDepositTransaction { + type: ReserveTransactionType.Deposit; + + /** + * Amount withdrawn. + */ + amount: AmountString; + + /** + * Sender account payto://-URL + */ + sender_account_url: string; + + /** + * Transfer details uniquely identifying the transfer. + */ + wire_reference: string; + + /** + * Timestamp of the incoming wire transfer. + */ + timestamp: TimestampString; +} + +export interface ReserveClosingTransaction { + type: ReserveTransactionType.Closing; + + /** + * Closing balance. + */ + amount: AmountString; + + /** + * Closing fee charged by the exchange. + */ + closing_fee: AmountString; + + /** + * Wire transfer subject. + */ + wtid: string; + + /** + * Hash of the wire account into which the funds were returned to. + */ + h_wire: string; + + /** + * This is a signature over a + * struct TALER_ReserveCloseConfirmationPS with purpose + * TALER_SIGNATURE_EXCHANGE_RESERVE_CLOSED. + */ + exchange_sig: EddsaSignatureString; + + /** + * Public key used to create exchange_sig. + */ + exchange_pub: EddsaPublicKeyString; + + /** + * Time when the reserve was closed. + */ + timestamp: TimestampString; +} + +export interface ReservePaybackTransaction { + type: ReserveTransactionType.Payback; + + /** + * Amount paid back. + */ + amount: AmountString; + + /** + * Receiver account details. + */ + receiver_account_details: any; + + /** + * Wire transfer identifier. + */ + wire_transfer: any; + + /** + * This is a signature over + * a struct TALER_PaybackConfirmationPS with purpose + * TALER_SIGNATURE_EXCHANGE_CONFIRM_PAYBACK. + */ + exchange_sig: EddsaSignatureString; + + /** + * Public key used to create exchange_sig. + */ + exchange_pub: EddsaPublicKeyString; + + /** + * Time when the funds were paid back into the reserve. + */ + timestamp: TimestampString; + + /** + * Public key of the coin that was paid back. + */ + coin_pub: CoinPublicKeyString; +} + +/** + * Format of the exchange's transaction history for a reserve. + */ +export type ReserveTransaction = + | ReserveWithdrawTransaction + | ReserveDepositTransaction + | ReserveClosingTransaction + | ReservePaybackTransaction; + +export const codecForReserveWithdrawTransaction = runBlock(() => + typecheckedCodec( + makeCodecForObject() + .property("amount", codecForString) + .property("h_coin_envelope", codecForString) + .property("h_denom_pub", codecForString) + .property("reserve_sig", codecForString) + .property( + "type", + makeCodecForConstString(ReserveTransactionType.Withdraw), + ) + .property("withdraw_fee", codecForString) + .build("ReserveWithdrawTransaction"), + ), +); + +export const codecForReserveDepositTransaction = runBlock(() => + typecheckedCodec( + makeCodecForObject() + .property("amount", codecForString) + .property("sender_account_url", codecForString) + .property("timestamp", codecForString) + .property("wire_reference", codecForString) + .property("type", makeCodecForConstString(ReserveTransactionType.Deposit)) + .build("ReserveDepositTransaction"), + ), +); + +export const codecForReserveClosingTransaction = runBlock(() => + typecheckedCodec( + makeCodecForObject() + .property("amount", codecForString) + .property("closing_fee", codecForString) + .property("exchange_pub", codecForString) + .property("exchange_sig", codecForString) + .property("h_wire", codecForString) + .property("timestamp", codecForString) + .property("type", makeCodecForConstString(ReserveTransactionType.Closing)) + .property("wtid", codecForString) + .build("ReserveClosingTransaction"), + ), +); + +export const codecForReservePaybackTransaction = runBlock(() => + typecheckedCodec( + makeCodecForObject() + .property("amount", codecForString) + .property("coin_pub", codecForString) + .property("exchange_pub", codecForString) + .property("exchange_sig", codecForString) + .property("receiver_account_details", codecForString) + .property("timestamp", codecForString) + .property("type", makeCodecForConstString(ReserveTransactionType.Payback)) + .property("wire_transfer", codecForString) + .build("ReservePaybackTransaction"), + ), +); + +export const codecForReserveTransaction = runBlock(() => + typecheckedCodec( + makeCodecForUnion() + .discriminateOn("type") + .alternative( + ReserveTransactionType.Withdraw, + codecForReserveWithdrawTransaction, + ) + .alternative( + ReserveTransactionType.Closing, + codecForReserveClosingTransaction, + ) + .alternative( + ReserveTransactionType.Payback, + codecForReservePaybackTransaction, + ) + .alternative( + ReserveTransactionType.Deposit, + codecForReserveDepositTransaction, + ) + .build("ReserveTransaction"), + ), +); -- cgit v1.2.3