tools/offline_impl.ml

@@ -52,7 +52,7 @@ let sign ~master_key ~input ~output =
     Offline_sig.verify_future_keys_response master_pub future_keys_response
   in
   let master_signatures =
-    Offline_sig.make_master_signatures ~master_key future_keys_response
+    Offline_sig.mk_future_keys ~master_key future_keys_response
   in
   let* s = Api.encode Api.MasterSignatures.jsont master_signatures in
   let* () = write_file output s in
@@ -61,18 +61,29 @@ let sign ~master_key ~input ~output =
 let revoke_denom ~output ~master_key ~h_denom =
   let* key = read_master_key_file master_key in
   let* h_denom = B32.decode h_denom in
-  let h_denom = Bin_type.DenominationHash.of_octets h_denom in
-  let denom_revoke = Offline_sig.mk_denom_revoke ~key h_denom in
+  let h_denom_pub = Bin_type.DenominationHash.of_octets h_denom in
+  let denom_revoke =
+    let master_sig =
+      let open Bin_sig.MasterDenominationKeyRevocation in
+      sign_f ~f:(Crypto.EddsaSignature.sign ~key) { h_denom_pub }
+    in
+    Api.DenomRevocationSignature.{ master_sig }
+  in
   let* s = Api.encode Api.DenomRevocationSignature.jsont denom_revoke in
   let* () = write_file output s in
   Ok ()
 
 let revoke_signkey ~output ~master_key ~signkey =
-  let open Crypto in
   let* key = read_master_key_file master_key in
-  let* signkey = EddsaPublicKey.of_b32 signkey in
-  let v = Offline_sig.mk_signkey_revoke ~key signkey in
-  let* s = Api.encode Api.SignkeyRevocationSignature.jsont v in
+  let* exchange_pub = Crypto.EddsaPublicKey.of_b32 signkey in
+  let signkey_revoke =
+    let master_sig =
+      let open Bin_sig.MasterSigningKeyRevocation in
+      sign_f ~f:(Crypto.EddsaSignature.sign ~key) { exchange_pub }
+    in
+    Api.SignkeyRevocationSignature.{ master_sig }
+  in
+  let* s = Api.encode Api.SignkeyRevocationSignature.jsont signkey_revoke in
   let* () = write_file output s in
   Ok ()