src/http_management.ml

@@ -200,27 +200,23 @@ module Auditors_disable = struct
     match opt with
     | None -> Error "auditor not found"
     | Some auditor -> (
-        match Timestamp.geq auditor.last_change validity_end with
+        if Timestamp.geq auditor.last_change validity_end then
-        | true ->
+          Error
-            Error
+            "database has more recent auditor data for this auditor public key"
-              "database has more recent auditor data for this auditor public \
+        else
-               key"
+          match auditor.is_active with
-        | false -> (
+          | false ->
-            match auditor.is_active with
+              Logs.info (fun m -> m "auditor was already revoked");
-            | false ->
+              Ok ()
-                Logs.info (fun m -> m "auditor was already revoked");
+          | true ->
-                Ok ()
+              let auditor =
-            | true ->
+                { auditor with last_change= validity_end; is_active= false }
-                let auditor =
+              in
-                  { auditor with last_change= validity_end; is_active= false }
+              let+ () = Pg.update_auditor db_conn auditor |> unwrap_err_caqti in
-                in
+              Logs.info (fun m ->
-                let+ () =
+                  m "revoked auditor `%s`"
-                  Pg.update_auditor db_conn auditor |> unwrap_err_caqti
+                    (Crypto.EddsaPublicKey.to_b32 auditor_pub));
-                in
+              ())
-                Logs.info (fun m ->
-                    m "revoked auditor `%s`"
-                      (Crypto.EddsaPublicKey.to_b32 auditor_pub));
-                ()))
 
   let jsont = AuditorTeardownMessage.jsont
 
@@ -436,14 +432,6 @@ module Wire = struct
         } =
     let* opt = Pg.find_wire db_conn ~payto_uri |> unwrap_err_caqti in
     match opt with
-    | Some wire ->
-        let+ () =
-          Pg.update_wire db_conn ~is_active:true ~last_change:validity_start
-            wire
-          |> unwrap_err_caqti
-        in
-        Logs.info (fun m -> m "updated wire method");
-        ()
     | None ->
         let wire =
           ExchangeWireAccount.
@@ -464,6 +452,17 @@ module Wire = struct
         in
         Logs.info (fun m -> m "added wire method");
         ()
+    | Some (wire, _is_active, last_change) ->
+        if Timestamp.geq last_change validity_start then
+          Error "database has more recent wire data"
+        else
+          let+ () =
+            Pg.update_wire db_conn ~is_active:true ~last_change:validity_start
+              wire
+            |> unwrap_err_caqti
+          in
+          Logs.info (fun m -> m "updated wire method");
+          ()
 
   let jsont = WireSetupMessage.jsont
 
@@ -492,13 +491,17 @@ module Wire_disable = struct
     let* opt = Pg.find_wire db_conn ~payto_uri |> unwrap_err_caqti in
     match opt with
     | None -> Error "wire not found"
-    | Some wire ->
+    | Some (wire, _is_active, last_change) ->
-        let+ () =
+        if Timestamp.geq last_change validity_end then
-          Pg.update_wire db_conn ~is_active:false ~last_change:validity_end wire
+          Error "database has more recent wire data"
-          |> unwrap_err_caqti
+        else
-        in
+          let+ () =
-        Logs.info (fun m -> m "disabled wire method");
+            Pg.update_wire db_conn ~is_active:false ~last_change:validity_end
-        ()
+              wire
+            |> unwrap_err_caqti
+          in
+          Logs.info (fun m -> m "disabled wire method");
+          ()
 
   let jsont = WireTeardownMessage.jsont
 

src/pg.ml

@@ -257,10 +257,10 @@ let insert_global_fees =
 
 let find_wire =
   let req =
-    Caqti_type.(payto_uri ->? exchange_wire_account)
+    Caqti_type.(payto_uri ->? t3 exchange_wire_account bool time)
       "SELECT payto_uri, conversion_url, debit_restrictions::TEXT, \
-       credit_restrictions::TEXT, master_sig, bank_label, priority FROM \
+       credit_restrictions::TEXT, master_sig, bank_label, priority, is_active, \
-       wire_accounts WHERE payto_uri=$1"
+       last_change FROM wire_accounts WHERE payto_uri=$1"
   in
   fun (module Conn : CONN) ~payto_uri -> Conn.find_opt req payto_uri
 

tools/offline_impl.ml

@@ -299,7 +299,14 @@ let enable_auditor ~output ~master_key ~auditor_url ~auditor_name ~auditor_pub =
 let disable_auditor ~output ~master_key ~auditor_pub =
   let* key = read_master_key_file master_key in
   let ns = Mtime_clock.now_ns () in
-  let validity_end = Timestamp.of_s @@ Int64.unsigned_div ns 1_000_000_000L in
+  let open Time in
+  let validity_end =
+    TimeAbsolute.of_s @@ Int64.unsigned_div ns 1_000_000_000L
+  in
+  (* hack for tests: +1sec to be sure it overwrite previous timestamp *)
+  let validity_end =
+    Timestamp.of_absolute (TimeAbsolute.add validity_end TimeRelative.(of_s 1L))
+  in
   let master_sig =
     let open Signatures.MasterDelAuditor in
     signf (EddsaSignature.sign ~key) { end_date= validity_end; auditor_pub }
@@ -397,7 +404,14 @@ let enable_wire ~output ~master_key ~payto_uri ~bank_label ~priority =
 let disable_wire ~output ~master_key ~payto_uri =
   let* key = read_master_key_file master_key in
   let ns = Mtime_clock.now_ns () in
-  let validity_end = Timestamp.of_s @@ Int64.unsigned_div ns 1_000_000_000L in
+  let open Time in
+  let validity_end =
+    TimeAbsolute.of_s @@ Int64.unsigned_div ns 1_000_000_000L
+  in
+  (* hack for tests: +1sec to be sure it overwrite previous timestamp *)
+  let validity_end =
+    Timestamp.of_absolute (TimeAbsolute.add validity_end TimeRelative.(of_s 1L))
+  in
   let h_wire = Hash.FullPaytoHash.hash payto_uri in
   let master_sig_del =
     let open Signatures.MasterDelWire in