secmod: use lock + ht + .mli
This commit is contained in:
parent
846122b49c
commit
0d17d2a675
7 changed files with 141 additions and 71 deletions
|
|
@ -1,16 +1,29 @@
|
|||
open Syntax
|
||||
|
||||
type t = {
|
||||
lock: Miou.Mutex.t;
|
||||
sm_key: Signkey.t;
|
||||
(* TODO rename *)
|
||||
keys: Denomination.t list;
|
||||
denom_ht: (Bin_type.DenominationHash.t, Denomination.t) Hashtbl.t;
|
||||
}
|
||||
|
||||
let get_sm_key t = t.sm_key
|
||||
|
||||
let get_denoms t =
|
||||
Miou.Mutex.protect t.lock @@ fun () ->
|
||||
Hashtbl.to_seq_values t.denom_ht |> List.of_seq
|
||||
|
||||
(* TODO *)
|
||||
let update_denoms _conn t denoms =
|
||||
Miou.Mutex.protect t.lock @@ fun () ->
|
||||
List.iter
|
||||
(fun denom -> Hashtbl.replace t.denom_ht denom.Denomination.h_pub denom)
|
||||
denoms
|
||||
|
||||
let dir = Fpath.(v "data" / "secmod_signkey")
|
||||
|
||||
let store_secmod_data t =
|
||||
let _store_secmod_data t =
|
||||
let* () = Data_file.write_eddsa Fpath.(dir / "sm_key") t.sm_key.priv in
|
||||
t.keys
|
||||
get_denoms t
|
||||
|> List.mapi (fun i key ->
|
||||
let fname = Fpath.(dir / string_of_int i) in
|
||||
(fname, key.Denomination.priv))
|
||||
|
|
@ -21,7 +34,7 @@ let load conn =
|
|||
Fmt.error_msg "secmod_denom load error: invalid store state."
|
||||
in
|
||||
let* sm_key = Data_file.load_signkey conn Fpath.(dir / "sm_key") in
|
||||
let* keys =
|
||||
let* denoms =
|
||||
let* l =
|
||||
let open Config.Coin in
|
||||
Syntax.list_map
|
||||
|
|
@ -36,12 +49,38 @@ let load conn =
|
|||
| Error () -> error_invalid_state
|
||||
| Ok opt -> Ok opt
|
||||
in
|
||||
match (sm_key, keys) with
|
||||
match (sm_key, denoms) with
|
||||
| None, None -> Ok None
|
||||
| Some sm_key, Some keys -> Ok (Some { sm_key; keys })
|
||||
| Some sm_key, Some denoms ->
|
||||
let lock = Miou.Mutex.create () in
|
||||
let denom_ht =
|
||||
denoms
|
||||
|> List.map (fun v -> (v.Denomination.h_pub, v))
|
||||
|> List.to_seq
|
||||
|> Hashtbl.of_seq
|
||||
in
|
||||
Ok (Some { lock; sm_key; denom_ht })
|
||||
| _, _ -> error_invalid_state
|
||||
|
||||
let make_new () =
|
||||
let lock = Miou.Mutex.create () in
|
||||
let sm_key = Signkey.make () in
|
||||
let keys = List.map Denomination.make Config.Coin.all_coins in
|
||||
{ sm_key; keys }
|
||||
let denoms = List.map Denomination.make Config.Coin.all_coins in
|
||||
let denom_ht =
|
||||
denoms
|
||||
|> List.map (fun v -> (v.Denomination.h_pub, v))
|
||||
|> List.to_seq
|
||||
|> Hashtbl.of_seq
|
||||
in
|
||||
{ lock; sm_key; denom_ht }
|
||||
|
||||
let init conn =
|
||||
match load conn with
|
||||
| Ok None ->
|
||||
let t = make_new () in
|
||||
Logs.info (fun m -> m "secmod_denom initialized with fresh keys");
|
||||
t
|
||||
| Ok (Some v) ->
|
||||
Logs.info (fun m -> m "secmod_denom initialized from storage");
|
||||
v
|
||||
| Error _ -> Fmt.failwith "secmod_denom init failure."
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue