tools/offline.ml

@@ -31,7 +31,7 @@ let sign ~input ~output ~master_key =
   let master_key = EddsaPrivateKey.of_octets master_key in
   let* future_key_response = Api.decode Api.FutureKeysResponse.jsont input in
   let master_signatures =
-    Offline_signature.sign_future_keys ~master_key future_key_response
+    Offline_signature.master_signatures ~master_key future_key_response
   in
   let* s = Api.encode Api.MasterSignatures.jsont master_signatures in
   let* () = File.write output s |> unwrap_err_msg in

tools/offline_signature.ml

@@ -1,4 +1,4 @@
-let _denom_signature ~key ~key_pub
+let denom_signature ~master_key
     Api.FutureDenom.
       {
         section_name= _;
@@ -28,8 +28,10 @@ let _denom_signature ~key ~key_pub
   let master_sig =
     let open Bin_type in
     let open Bin_signature.DenominationKeyValidityPS in
+    let master = Crypto.EddsaPrivateKey.(pub_of_priv master_key) in
+    let denom_hash = DenominationHash.hash pub_octets in
     {
-      master= key_pub;
+      master;
       start= stamp_start;
       expire_withdraw= stamp_expire_withdraw;
       expire_spend= stamp_expire_deposit;
@@ -38,17 +40,46 @@ let _denom_signature ~key ~key_pub
       fee_withdraw;
       fee_deposit;
       fee_refresh;
-      denom_hash= DenominationHash.hash pub_octets;
+      denom_hash;
     }
     |> Bin.to_string bin
-    |> Crypto.EddsaSignature.sign ~key
+    |> Crypto.EddsaSignature.sign ~key:master_key
   in
   Api.DenomSignature.{ h_denom_pub; master_sig }
 
-let sign_future_keys ~master_key:_ _future_key_response =
-  (*
-  let open Syntax in
-  let open Crypto in
-*)
-  (* TODO sign *)
-  assert false
+let signkey_signature ~master_key
+    Api.FutureSignKey.
+      {
+        key;
+        stamp_start;
+        stamp_expire;
+        stamp_end;
+        (* TODO check sigs *)
+        signkey_secmod_sig= _;
+      } =
+  let master_sig =
+    let open Bin_signature.ExchangeSigningKeyValidityPS in
+    {
+      start= stamp_start;
+      expire= stamp_expire;
+      end_= stamp_end;
+      signkey_pub= key;
+    }
+    |> Bin.to_string bin
+    |> Crypto.EddsaSignature.sign ~key:master_key
+  in
+  Api.SignKeySignature.{ key; master_sig }
+
+let master_signatures ~master_key
+    Api.FutureKeysResponse.
+      {
+        future_denoms;
+        future_signkeys;
+        (* TODO check sigs *)
+        master_pub= _;
+        denom_secmod_public_key= _;
+        signkey_secmod_public_key= _;
+      } =
+  let denom_sigs = List.map (denom_signature ~master_key) future_denoms in
+  let signkey_sigs = List.map (signkey_signature ~master_key) future_signkeys in
+  Api.MasterSignatures.{ denom_sigs; signkey_sigs }