This commit is contained in:
parent
e870972808
commit
3cd967146e
3 changed files with 31 additions and 5 deletions
|
|
@ -74,8 +74,13 @@ module Keys_get = struct
|
||||||
let future_denoms =
|
let future_denoms =
|
||||||
Secmod.get_denoms_data sm
|
Secmod.get_denoms_data sm
|
||||||
|> List.filter (fun k -> Option.is_none k.Denom_data.master_sig)
|
|> List.filter (fun k -> Option.is_none k.Denom_data.master_sig)
|
||||||
|> List.map (fun denom ->
|
|> List.map (fun dn_data ->
|
||||||
mk_future_denom ~sm ~section_name:"TODO section_name" denom)
|
let opt =
|
||||||
|
Secmod.find_denom_section_name sm dn_data.Denom_data.h_pub
|
||||||
|
in
|
||||||
|
match opt with
|
||||||
|
| None -> Fmt.failwith "section_name not found."
|
||||||
|
| Some section_name -> mk_future_denom ~sm ~section_name dn_data)
|
||||||
in
|
in
|
||||||
let master_pub = Config.Exchange.master_public_key in
|
let master_pub = Config.Exchange.master_public_key in
|
||||||
let denom_secmod_public_key = Secmod.get_sm_key_pub sm in
|
let denom_secmod_public_key = Secmod.get_sm_key_pub sm in
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,7 @@ type t = {
|
||||||
sk_revoked_ht:
|
sk_revoked_ht:
|
||||||
(eddsa_pub, signkey * Bin_sig.MasterSigningKeyRevocation.t) Hashtbl.t;
|
(eddsa_pub, signkey * Bin_sig.MasterSigningKeyRevocation.t) Hashtbl.t;
|
||||||
dn_ht: (denomination_hash, denom) Hashtbl.t;
|
dn_ht: (denomination_hash, denom) Hashtbl.t;
|
||||||
|
dn_section_name_ht: (denomination_hash, string) Hashtbl.t;
|
||||||
dn_revoked_ht:
|
dn_revoked_ht:
|
||||||
( denomination_hash,
|
( denomination_hash,
|
||||||
denom * Bin_sig.MasterDenominationKeyRevocation.t )
|
denom * Bin_sig.MasterDenominationKeyRevocation.t )
|
||||||
|
|
@ -83,6 +84,10 @@ let find_signkey_data t pub =
|
||||||
let find_denom_data t h_denom =
|
let find_denom_data t h_denom =
|
||||||
find_denom t h_denom |> Option.map (fun v -> v.dn_data)
|
find_denom t h_denom |> Option.map (fun v -> v.dn_data)
|
||||||
|
|
||||||
|
let find_denom_section_name t h_denom =
|
||||||
|
Miou.Mutex.protect t.lock @@ fun () ->
|
||||||
|
Hashtbl.find_opt t.dn_section_name_ht h_denom
|
||||||
|
|
||||||
let add_signkey_master_signatures conn t l =
|
let add_signkey_master_signatures conn t l =
|
||||||
Miou.Mutex.protect t.lock @@ fun () ->
|
Miou.Mutex.protect t.lock @@ fun () ->
|
||||||
list_iter
|
list_iter
|
||||||
|
|
@ -223,6 +228,7 @@ let load conn =
|
||||||
let* l = list_map (fun fname -> load_signkey conn fname) l in
|
let* l = list_map (fun fname -> load_signkey conn fname) l in
|
||||||
match opt_list l with Error () -> error_invalid_state | Ok opt -> Ok opt
|
match opt_list l with Error () -> error_invalid_state | Ok opt -> Ok opt
|
||||||
in
|
in
|
||||||
|
let dn_section_name_ht = Hashtbl.create 0xff in
|
||||||
let* denoms =
|
let* denoms =
|
||||||
let* l =
|
let* l =
|
||||||
let open Config.Coin in
|
let open Config.Coin in
|
||||||
|
|
@ -236,6 +242,7 @@ let load conn =
|
||||||
| Some priv ->
|
| Some priv ->
|
||||||
(* todo: could check that coin config match db values *)
|
(* todo: could check that coin config match db values *)
|
||||||
let* dn_data = db_lookup_denom_data conn ~section_name priv in
|
let* dn_data = db_lookup_denom_data conn ~section_name priv in
|
||||||
|
Hashtbl.replace dn_section_name_ht dn_data.h_pub section_name;
|
||||||
let denom = { priv; dn_data } in
|
let denom = { priv; dn_data } in
|
||||||
Ok (Some denom))
|
Ok (Some denom))
|
||||||
all_coins
|
all_coins
|
||||||
|
|
@ -272,6 +279,7 @@ let load conn =
|
||||||
sk_ht;
|
sk_ht;
|
||||||
sk_revoked_ht;
|
sk_revoked_ht;
|
||||||
dn_ht;
|
dn_ht;
|
||||||
|
dn_section_name_ht;
|
||||||
dn_revoked_ht;
|
dn_revoked_ht;
|
||||||
})
|
})
|
||||||
| _, _, _ -> error_invalid_state
|
| _, _, _ -> error_invalid_state
|
||||||
|
|
@ -349,16 +357,28 @@ let make_new () =
|
||||||
|> List.to_seq
|
|> List.to_seq
|
||||||
|> Hashtbl.of_seq
|
|> Hashtbl.of_seq
|
||||||
in
|
in
|
||||||
|
let dn_section_name_ht = Hashtbl.create 0xff in
|
||||||
let dn_ht =
|
let dn_ht =
|
||||||
Config.Coin.all_coins
|
Config.Coin.all_coins
|
||||||
|> List.map make_new_denom
|
|> List.map (fun coin ->
|
||||||
|> List.map (fun v -> (v.dn_data.h_pub, v))
|
let denom = make_new_denom coin in
|
||||||
|
Hashtbl.replace dn_section_name_ht denom.dn_data.h_pub coin.section_name;
|
||||||
|
(denom.dn_data.h_pub, denom))
|
||||||
|> List.to_seq
|
|> List.to_seq
|
||||||
|> Hashtbl.of_seq
|
|> Hashtbl.of_seq
|
||||||
in
|
in
|
||||||
let sk_revoked_ht = Hashtbl.create 0xff in
|
let sk_revoked_ht = Hashtbl.create 0xff in
|
||||||
let dn_revoked_ht = Hashtbl.create 0xff in
|
let dn_revoked_ht = Hashtbl.create 0xff in
|
||||||
{ lock; sm_key_priv; sm_key_pub; sk_ht; sk_revoked_ht; dn_ht; dn_revoked_ht }
|
{
|
||||||
|
lock;
|
||||||
|
sm_key_priv;
|
||||||
|
sm_key_pub;
|
||||||
|
sk_ht;
|
||||||
|
sk_revoked_ht;
|
||||||
|
dn_ht;
|
||||||
|
dn_section_name_ht;
|
||||||
|
dn_revoked_ht;
|
||||||
|
}
|
||||||
|
|
||||||
let init conn =
|
let init conn =
|
||||||
match load conn with
|
match load conn with
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,7 @@ val get_signkeys_data : t -> Signkey_data.t list
|
||||||
val get_denoms_data : t -> Denom_data.t list
|
val get_denoms_data : t -> Denom_data.t list
|
||||||
val find_signkey_data : t -> eddsa_pub -> Signkey_data.t option
|
val find_signkey_data : t -> eddsa_pub -> Signkey_data.t option
|
||||||
val find_denom_data : t -> denomination_hash -> Denom_data.t option
|
val find_denom_data : t -> denomination_hash -> Denom_data.t option
|
||||||
|
val find_denom_section_name : t -> denomination_hash -> string option
|
||||||
|
|
||||||
(* - management operations - *)
|
(* - management operations - *)
|
||||||
val init : (module Pg.CONN) -> t
|
val init : (module Pg.CONN) -> t
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue