JJ: Description from the destination commit:
rename JJ: Description from source commit: .
This commit is contained in:
parent
24b9adc300
commit
2a4467a5aa
10 changed files with 414 additions and 467 deletions
|
|
@ -32,7 +32,7 @@ include struct
|
|||
|
||||
let fullpayto_hash = FullPaytoHash.caqti
|
||||
let nomalizaedpayto_hash = NormalizedPaytoHash.caqti
|
||||
let denomination_hash = DenominationHash.caqti
|
||||
let denom_hash = DenominationHash.caqti
|
||||
let privatecontract_hash = PrivateContractHash.caqti
|
||||
let extensionspolicy_hash = ExtensionsPolicyHash.caqti
|
||||
let merchantwire_hash = MerchantWireHash.caqti
|
||||
|
|
@ -48,24 +48,13 @@ let signkey_data =
|
|||
let revoked_sig = option Signatures.MasterSigningKeyRevocation.caqti in
|
||||
custom
|
||||
~encode:(fun
|
||||
Signkey_data.
|
||||
Signkey.
|
||||
{ pub; stamp_start; stamp_expire; stamp_end; master_sig; revoked_sig }
|
||||
->
|
||||
match master_sig with
|
||||
| None -> Error "signkey_data master_sig is none"
|
||||
| Some master_sig ->
|
||||
Ok (pub, stamp_start, stamp_expire, stamp_end, master_sig, revoked_sig))
|
||||
Ok (pub, stamp_start, stamp_expire, stamp_end, master_sig, revoked_sig))
|
||||
~decode:(fun
|
||||
(pub, stamp_start, stamp_expire, stamp_end, master_sig, revoked_sig) ->
|
||||
Ok
|
||||
{
|
||||
pub;
|
||||
stamp_start;
|
||||
stamp_expire;
|
||||
stamp_end;
|
||||
master_sig= Some master_sig;
|
||||
revoked_sig;
|
||||
})
|
||||
Ok { pub; stamp_start; stamp_expire; stamp_end; master_sig; revoked_sig })
|
||||
(t6 eddsa_pub time time time master_sig revoked_sig)
|
||||
|
||||
let denom_data =
|
||||
|
|
@ -73,7 +62,7 @@ let denom_data =
|
|||
let revoked_sig = option Signatures.MasterDenominationKeyRevocation.caqti in
|
||||
custom
|
||||
~encode:(fun
|
||||
Denom_data.
|
||||
Denomination.
|
||||
{
|
||||
pub;
|
||||
value;
|
||||
|
|
@ -91,22 +80,19 @@ let denom_data =
|
|||
revoked_sig;
|
||||
}
|
||||
->
|
||||
match master_sig with
|
||||
| None -> Error "denom_data master_sig is none"
|
||||
| Some master_sig ->
|
||||
Ok
|
||||
( pub,
|
||||
value,
|
||||
stamp_start,
|
||||
stamp_expire_withdraw,
|
||||
stamp_expire_deposit,
|
||||
stamp_expire_legal,
|
||||
fee_withdraw,
|
||||
fee_deposit,
|
||||
fee_refresh,
|
||||
fee_refund,
|
||||
age_mask,
|
||||
(h_pub, master_sig, revoked_sig) ))
|
||||
Ok
|
||||
( pub,
|
||||
value,
|
||||
stamp_start,
|
||||
stamp_expire_withdraw,
|
||||
stamp_expire_deposit,
|
||||
stamp_expire_legal,
|
||||
fee_withdraw,
|
||||
fee_deposit,
|
||||
fee_refresh,
|
||||
fee_refund,
|
||||
age_mask,
|
||||
(h_pub, master_sig, revoked_sig) ))
|
||||
~decode:(fun
|
||||
( pub,
|
||||
value,
|
||||
|
|
@ -135,11 +121,11 @@ let denom_data =
|
|||
fee_refund;
|
||||
age_mask;
|
||||
h_pub;
|
||||
master_sig= Some master_sig;
|
||||
master_sig;
|
||||
revoked_sig;
|
||||
})
|
||||
(t12 rsa_pub amount time time time time amount amount amount amount int
|
||||
(t3 denomination_hash master_sig revoked_sig))
|
||||
(t3 denom_hash master_sig revoked_sig))
|
||||
|
||||
let account_restrictions =
|
||||
custom
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue