swrup/mte
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rm suffix

Browse source
This commit is contained in:
swrup 2025-12-07 05:43:04 +01:00
parent 4fc9a96fde
commit 588b38d66f
9 changed files with 122 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

92
src/api.ml
View file

@ -325,7 +325,7 @@ module FutureSignKey = struct
stamp_start: Timestamp.t;
stamp_expire: Timestamp.t;
stamp_end: Timestamp.t;
signkey_secmod_sig: SigningKeyAnnouncementPS.t;
signkey_secmod_sig: SigningKeyAnnouncement.t;
}
let jsont =
@ -342,7 +342,7 @@ module FutureSignKey = struct
|> mem "stamp_start" Timestamp.jsont ~enc:stamp_start
|> mem "stamp_expire" Timestamp.jsont ~enc:stamp_expire
|> mem "stamp_end" Timestamp.jsont ~enc:stamp_end
|> mem "signkey_secmod_sig" SigningKeyAnnouncementPS.jsont
|> mem "signkey_secmod_sig" SigningKeyAnnouncement.jsont
~enc:signkey_secmod_sig
|> finish
end
@ -360,7 +360,7 @@ module FutureDenom = struct
fee_deposit: Amount.t;
fee_refresh: Amount.t;
fee_refund: Amount.t;
denom_secmod_sig: DenominationKeyAnnouncementPS.t;
denom_secmod_sig: DenominationKeyAnnouncement.t;
}
let jsont =
@ -406,7 +406,7 @@ module FutureDenom = struct
|> mem "fee_deposit" Amount.jsont ~enc:fee_deposit
|> mem "fee_refresh" Amount.jsont ~enc:fee_refresh
|> mem "fee_refund" Amount.jsont ~enc:fee_refund
|> mem "denom_secmod_sig" DenominationKeyAnnouncementPS.jsont
|> mem "denom_secmod_sig" DenominationKeyAnnouncement.jsont
~enc:denom_secmod_sig
|> finish
end
@ -452,7 +452,7 @@ end
module SignKeySignature = struct
type t = {
key: EddsaPublicKey.t;
master_sig: ExchangeSigningKeyValidityPS.t;
master_sig: ExchangeSigningKeyValidity.t;
}
let jsont =
@ -461,14 +461,14 @@ module SignKeySignature = struct
let master_sig v = v.master_sig in
map ~kind:"SignKeySignature" make
|> mem "key" EddsaPublicKey.jsont ~enc:key
|> mem "master_sig" ExchangeSigningKeyValidityPS.jsont ~enc:master_sig
|> mem "master_sig" ExchangeSigningKeyValidity.jsont ~enc:master_sig
|> finish
end
module DenomSignature = struct
type t = {
h_denom_pub: HashCode.t;
master_sig: DenominationKeyValidityPS.t;
master_sig: DenominationKeyValidity.t;
}
let jsont =
@ -477,7 +477,7 @@ module DenomSignature = struct
let master_sig v = v.master_sig in
map ~kind:"DenomSignature" make
|> mem "h_denom_pub" HashCode.jsont ~enc:h_denom_pub
|> mem "master_sig" DenominationKeyValidityPS.jsont ~enc:master_sig
|> mem "master_sig" DenominationKeyValidity.jsont ~enc:master_sig
|> finish
end
@ -498,24 +498,24 @@ module MasterSignatures = struct
end
module DenomRevocationSignature = struct
type t = { master_sig: MasterDenominationKeyRevocationPS.t }
type t = { master_sig: MasterDenominationKeyRevocation.t }
let jsont =
let make master_sig = { master_sig } in
let enc v = v.master_sig in
map ~kind:"DenomRevocationSignature" make
|> mem "master_sig" MasterDenominationKeyRevocationPS.jsont ~enc
|> mem "master_sig" MasterDenominationKeyRevocation.jsont ~enc
|> finish
end
module SignkeyRevocationSignature = struct
type t = { master_sig: MasterSigningKeyRevocationPS.t }
type t = { master_sig: MasterSigningKeyRevocation.t }
let jsont =
let make master_sig = { master_sig } in
let enc v = v.master_sig in
map ~kind:"SignkeyRevocationSignature" make
|> mem "master_sig" MasterSigningKeyRevocationPS.jsont ~enc
|> mem "master_sig" MasterSigningKeyRevocation.jsont ~enc
|> finish
end
@ -524,7 +524,7 @@ module AuditorSetupMessage = struct
auditor_url: string;
auditor_name: string;
auditor_pub: EddsaPublicKey.t;
master_sig: MasterAddAuditorPS.t;
master_sig: MasterAddAuditor.t;
(* TODO monotonic time
something about using monotonic system time here! *)
validity_start: Timestamp.t;
@ -543,14 +543,14 @@ module AuditorSetupMessage = struct
|> mem "auditor_url" Jsont.string ~enc:auditor_url
|> mem "auditor_name" Jsont.string ~enc:auditor_name
|> mem "auditor_pub" EddsaPublicKey.jsont ~enc:auditor_pub
|> mem "master_sig" MasterAddAuditorPS.jsont ~enc:master_sig
|> mem "master_sig" MasterAddAuditor.jsont ~enc:master_sig
|> mem "validity_start" Timestamp.jsont ~enc:validity_start
|> finish
end
module AuditorTeardownMessage = struct
type t = {
master_sig: MasterDelAuditorPS.t;
master_sig: MasterDelAuditor.t;
(* TODO monotonic time *)
validity_end: Timestamp.t;
}
@ -560,7 +560,7 @@ module AuditorTeardownMessage = struct
let master_sig v = v.master_sig in
let validity_end v = v.validity_end in
map ~kind:"AuditorTeardownMessage" make
|> mem "master_sig" MasterDelAuditorPS.jsont ~enc:master_sig
|> mem "master_sig" MasterDelAuditor.jsont ~enc:master_sig
|> mem "validity_end" Timestamp.jsont ~enc:validity_end
|> finish
end
@ -571,7 +571,7 @@ module WireFeeSetupMessage = struct
(* TODO over which struct?
Signature using the exchange's offline key
with purpose TALER_SIGNATURE_MASTER_WIRE_FEES *)
master_sig_wire: MasterWireFeePS.t;
master_sig_wire: MasterWireFee.t;
fee_start: Amount.t;
fee_end: Amount.t;
closing_fee: Amount.t;
@ -598,7 +598,7 @@ module WireFeeSetupMessage = struct
let wire_fee v = v.wire_fee in
map ~kind:"WireFeeSetupMessage" make
|> mem "wire_method" Jsont.string ~enc:wire_method
|> mem "master_sig_wire" MasterWireFeePS.jsont ~enc:master_sig_wire
|> 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 "closing_fee" Amount.jsont ~enc:closing_fee
@ -617,7 +617,7 @@ module GlobalFees = struct
purse_account_limit: int;
purse_timeout: RelativeTime.t;
(* Signature of TALER_GlobalFeesPS. *)
master_sig: GlobalFeesPS.t;
master_sig: GlobalFees.t;
}
let jsont =
@ -653,15 +653,15 @@ module GlobalFees = struct
|> mem "history_expiration" RelativeTime.jsont ~enc:history_expiration
|> mem "purse_account_limit" Jsont.int ~enc:purse_account_limit
|> mem "purse_timeout" RelativeTime.jsont ~enc:purse_timeout
|> mem "master_sig" GlobalFeesPS.jsont ~enc:master_sig
|> mem "master_sig" GlobalFees.jsont ~enc:master_sig
|> finish
end
module WireSetupMessage = struct
type t = {
payto_uri: string;
master_sig_wire: MasterWireDetailsPS.t;
master_sig_add: MasterAddWirePS.t;
master_sig_wire: MasterWireDetails.t;
master_sig_add: MasterAddWire.t;
(* TODO monotonic time *)
validity_start: Timestamp.t;
bank_label: string option;
@ -688,8 +688,8 @@ module WireSetupMessage = struct
let priority v = v.priority in
map ~kind:"WireSetupMessage" make
|> mem "payto_uri" Jsont.string ~enc:payto_uri
|> mem "master_sig_wire" MasterWireDetailsPS.jsont ~enc:master_sig_wire
|> mem "master_sig_add" MasterAddWirePS.jsont ~enc:master_sig_add
|> mem "master_sig_wire" MasterWireDetails.jsont ~enc:master_sig_wire
|> mem "master_sig_add" MasterAddWire.jsont ~enc:master_sig_add
|> mem "validity_start" Timestamp.jsont ~enc:validity_start
|> mem "bank_label" (Jsont.option Jsont.string) ~enc:bank_label
|> mem "priority" (Jsont.option Jsont.int) ~enc:priority
@ -699,7 +699,7 @@ end
module WireTeardownMessage = struct
type t = {
payto_uri: string;
master_sig_del: MasterDelWirePS.t;
master_sig_del: MasterDelWire.t;
(* TODO monotonic time *)
validity_end: Timestamp.t;
}
@ -713,7 +713,7 @@ module WireTeardownMessage = struct
let validity_end v = v.validity_end in
map ~kind:"WireTeardownMessage" make
|> mem "payto_uri" Jsont.string ~enc:payto_uri
|> mem "master_sig_del" MasterDelWirePS.jsont ~enc:master_sig_del
|> mem "master_sig_del" MasterDelWire.jsont ~enc:master_sig_del
|> mem "validity_end" Timestamp.jsont ~enc:validity_end
|> finish
end
@ -723,7 +723,7 @@ module DrainProfitsMessage = struct
debit_account_section: string;
credit_payto_uri: string;
wtid: B32.t;
master_sig: MasterDrainProfitPS.t;
master_sig: MasterDrainProfit.t;
date: Timestamp.t;
amount: Amount.t;
}
@ -750,7 +750,7 @@ module DrainProfitsMessage = struct
|> mem "debit_account_section" Jsont.string ~enc:debit_account_section
|> mem "credit_payto_uri" Jsont.string ~enc:credit_payto_uri
|> mem "wtid" B32.jsont ~enc:wtid
|> mem "master_sig" MasterDrainProfitPS.jsont ~enc:master_sig
|> mem "master_sig" MasterDrainProfit.jsont ~enc:master_sig
|> mem "date" Timestamp.jsont ~enc:date
|> mem "amount" Amount.jsont ~enc:amount
|> finish
@ -762,7 +762,7 @@ module AmlOfficerSetup = struct
officer_name: string;
is_active: bool;
read_only: bool;
master_sig: MasterAmlOfficerStatusPS.t;
master_sig: MasterAmlOfficerStatus.t;
change_date: Timestamp.t;
}
@ -789,7 +789,7 @@ module AmlOfficerSetup = struct
|> mem "officer_name" Jsont.string ~enc:officer_name
|> mem "is_active" Jsont.bool ~enc:is_active
|> mem "read_only" Jsont.bool ~enc:read_only
|> mem "master_sig" MasterAmlOfficerStatusPS.jsont ~enc:master_sig
|> mem "master_sig" MasterAmlOfficerStatus.jsont ~enc:master_sig
|> mem "change_date" Timestamp.jsont ~enc:change_date
|> finish
end
@ -799,7 +799,7 @@ module ExchangePartnerSetupRequest = struct
partner_base_url: string;
partner_pub: EddsaPublicKey.t;
wad_frequency: RelativeTime.t;
master_sig: PartnerConfigurationPS.t;
master_sig: PartnerConfiguration.t;
start_date: Timestamp.t;
end_date: Timestamp.t;
wad_fee: Amount.t;
@ -829,7 +829,7 @@ module ExchangePartnerSetupRequest = struct
|> mem "partner_base_url" Jsont.string ~enc:partner_base_url
|> mem "partner_pub" EddsaPublicKey.jsont ~enc:partner_pub
|> mem "wad_frequency" RelativeTime.jsont ~enc:wad_frequency
|> mem "master_sig" PartnerConfigurationPS.jsont ~enc:master_sig
|> mem "master_sig" PartnerConfiguration.jsont ~enc:master_sig
|> mem "start_date" Timestamp.jsont ~enc:start_date
|> mem "end_date" Timestamp.jsont ~enc:end_date
|> mem "wad_fee" Amount.jsont ~enc:wad_fee
@ -846,7 +846,7 @@ module ExchangePartnerListEntry = struct
wad_frequency: RelativeTime.t;
start_date: Timestamp.t;
end_date: Timestamp.t;
master_sig: WadPartnerSignaturePS.t;
master_sig: WadPartnerSignature.t;
}
let jsont =
@ -876,7 +876,7 @@ module ExchangePartnerListEntry = struct
|> mem "wad_frequency" RelativeTime.jsont ~enc:wad_frequency
|> mem "start_date" Timestamp.jsont ~enc:start_date
|> mem "end_date" Timestamp.jsont ~enc:end_date
|> mem "master_sig" WadPartnerSignaturePS.jsont ~enc:master_sig
|> mem "master_sig" WadPartnerSignature.jsont ~enc:master_sig
|> finish
end
@ -886,7 +886,7 @@ module AggregateTransferFee = struct
closing_fee: Amount.t;
start_date: Timestamp.t;
end_date: Timestamp.t;
sig_: MasterWireFeePS.t;
sig_: MasterWireFee.t;
}
let jsont =
@ -903,14 +903,14 @@ module AggregateTransferFee = struct
|> mem "closing_fee" Amount.jsont ~enc:closing_fee
|> mem "start_date" Timestamp.jsont ~enc:start_date
|> mem "end_date" Timestamp.jsont ~enc:end_date
|> mem "sig" MasterWireFeePS.jsont ~enc:sig_
|> mem "sig" MasterWireFee.jsont ~enc:sig_
|> finish
end
module AuditorDenominationKey = struct
type t = {
denom_pub_h: HashCode.t;
auditor_sig: ExchangeKeyValidityPS.t;
auditor_sig: ExchangeKeyValidity.t;
}
let jsont =
@ -919,7 +919,7 @@ module AuditorDenominationKey = struct
let auditor_sig v = v.auditor_sig in
map ~kind:"AuditorDenominationKey" make
|> mem "denom_pub_h" HashCode.jsont ~enc:denom_pub_h
|> mem "auditor_sig" ExchangeKeyValidityPS.jsont ~enc:auditor_sig
|> mem "auditor_sig" ExchangeKeyValidity.jsont ~enc:auditor_sig
|> finish
end
@ -955,7 +955,7 @@ module SignKey = struct
stamp_start: Timestamp.t;
stamp_expire: Timestamp.t;
stamp_end: Timestamp.t;
master_sig: ExchangeSigningKeyValidityPS.t;
master_sig: ExchangeSigningKeyValidity.t;
}
let jsont =
@ -972,7 +972,7 @@ module SignKey = struct
|> mem "stamp_start" Timestamp.jsont ~enc:stamp_start
|> mem "stamp_expire" Timestamp.jsont ~enc:stamp_expire
|> mem "stamp_end" Timestamp.jsont ~enc:stamp_end
|> mem "master_sig" ExchangeSigningKeyValidityPS.jsont ~enc:master_sig
|> mem "master_sig" ExchangeSigningKeyValidity.jsont ~enc:master_sig
|> finish
end
@ -991,7 +991,7 @@ module RsaDenom = struct
(* correspond to: ({ rsa_pub: RsaPublicKey;} & DenomCommon) *)
type t = {
rsa_pub: RsaPublicKey.t;
master_sig: DenominationKeyValidityPS.t;
master_sig: DenominationKeyValidity.t;
stamp_start: Timestamp.t;
stamp_expire_withdraw: Timestamp.t;
stamp_expire_deposit: Timestamp.t;
@ -1021,7 +1021,7 @@ module RsaDenom = struct
let lost v = v.lost in
map ~kind:"RsaDenom" make
|> mem "rsa_pub" RsaPublicKey.jsont ~enc:rsa_pub
|> mem "master_sig" DenominationKeyValidityPS.jsont ~enc:master_sig
|> mem "master_sig" DenominationKeyValidity.jsont ~enc:master_sig
|> mem "stamp_start" Timestamp.jsont ~enc:stamp_start
|> mem "stamp_expire_withdraw" Timestamp.jsont ~enc:stamp_expire_withdraw
|> mem "stamp_expire_deposit" Timestamp.jsont ~enc:stamp_expire_deposit
@ -1173,7 +1173,7 @@ module ExchangeWireAccount = struct
conversion_url: string option;
credit_restrictions: AccountRestriction.t list;
debit_restrictions: AccountRestriction.t list;
master_sig: MasterWireDetailsPS.t;
master_sig: MasterWireDetails.t;
bank_label: string option;
priority: int option;
}
@ -1207,7 +1207,7 @@ module ExchangeWireAccount = struct
|> mem "debit_restrictions"
(Jsont.list AccountRestriction.jsont)
~enc:debit_restrictions
|> mem "master_sig" MasterWireDetailsPS.jsont ~enc:master_sig
|> mem "master_sig" MasterWireDetails.jsont ~enc:master_sig
|> opt_mem "bank_label" Jsont.string ~enc:bank_label
|> opt_mem "priority" Jsont.int ~enc:priority
|> finish
@ -1264,7 +1264,7 @@ module ExchangeKeysResponse = struct
contatentation of all of the master_sigs (in reverse
chronological order by group) in the arrays under
"denominations" *)
exchange_sig: ExchangeKeySetPS.t;
exchange_sig: ExchangeKeySet.t;
exchange_pub: EddsaPublicKey.t;
recoup: RecoupDenoms.t list;
global_fees: GlobalFees.t list;
@ -1390,7 +1390,7 @@ module ExchangeKeysResponse = struct
(Jsont.list ZeroLimitedOperation.jsont)
~enc:zero_limits
|> mem "denominations" (Jsont.list DenomGroup.jsont) ~enc:denominations
|> mem "exchange_sig" ExchangeKeySetPS.jsont ~enc:exchange_sig
|> mem "exchange_sig" ExchangeKeySet.jsont ~enc:exchange_sig
|> mem "exchange_pub" EddsaPublicKey.jsont ~enc:exchange_pub
|> mem "recoup" (Jsont.list RecoupDenoms.jsont) ~enc:recoup
|> mem "global_fees" (Jsont.list GlobalFees.jsont) ~enc:global_fees