wip wire-fee & global-fees
This commit is contained in:
parent
af09c697b8
commit
0e46ea162a
5 changed files with 212 additions and 9 deletions
13
src/api.ml
13
src/api.ml
|
|
@ -572,8 +572,8 @@ module WireFeeSetupMessage = struct
|
|||
Signature using the exchange's offline key
|
||||
with purpose TALER_SIGNATURE_MASTER_WIRE_FEES *)
|
||||
master_sig_wire: MasterWireFee.t;
|
||||
fee_start: Amount.t;
|
||||
fee_end: Amount.t;
|
||||
fee_start: Timestamp.t;
|
||||
fee_end: Timestamp.t;
|
||||
closing_fee: Amount.t;
|
||||
wire_fee: Amount.t;
|
||||
}
|
||||
|
|
@ -599,8 +599,8 @@ module WireFeeSetupMessage = struct
|
|||
map ~kind:"WireFeeSetupMessage" make
|
||||
|> mem "wire_method" Jsont.string ~enc:wire_method
|
||||
|> mem "master_sig_wire" MasterWireFee.jsont ~enc:master_sig_wire
|
||||
|> mem "fee_start" Amount.jsont ~enc:fee_start
|
||||
|> mem "fee_end" Amount.jsont ~enc:fee_end
|
||||
|> mem "fee_start" Timestamp.jsont ~enc:fee_start
|
||||
|> mem "fee_end" Timestamp.jsont ~enc:fee_end
|
||||
|> mem "closing_fee" Amount.jsont ~enc:closing_fee
|
||||
|> mem "wire_fee" Amount.jsont ~enc:wire_fee
|
||||
|> finish
|
||||
|
|
@ -614,9 +614,8 @@ module GlobalFees = struct
|
|||
account_fee: Amount.t;
|
||||
purse_fee: Amount.t;
|
||||
history_expiration: RelativeTime.t;
|
||||
purse_account_limit: int;
|
||||
purse_account_limit: int32;
|
||||
purse_timeout: RelativeTime.t;
|
||||
(* Signature of TALER_GlobalFeesPS. *)
|
||||
master_sig: GlobalFees.t;
|
||||
}
|
||||
|
||||
|
|
@ -651,7 +650,7 @@ module GlobalFees = struct
|
|||
|> mem "account_fee" Amount.jsont ~enc:account_fee
|
||||
|> mem "purse_fee" Amount.jsont ~enc:purse_fee
|
||||
|> mem "history_expiration" RelativeTime.jsont ~enc:history_expiration
|
||||
|> mem "purse_account_limit" Jsont.int ~enc:purse_account_limit
|
||||
|> mem "purse_account_limit" Jsont.int32 ~enc:purse_account_limit
|
||||
|> mem "purse_timeout" RelativeTime.jsont ~enc:purse_timeout
|
||||
|> mem "master_sig" GlobalFees.jsont ~enc:master_sig
|
||||
|> finish
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue