From 888f9864653a63b4562a4b025e6c5676bd6e340d Mon Sep 17 00:00:00 2001
From: Maxime Levillain <maxime.levillain@functori.com>
Date: Wed, 4 Jun 2025 09:27:12 +0200
Subject: [PATCH] feedback

---
 Makefile                       |   1 +
 interface/api/api.ml           |  19 +++-
 interface/common/i.ml          |   4 +-
 interface/common/serv.ml       |   2 +-
 interface/ui/error.html        |   9 +-
 interface/ui/index.html        | 171 ++++++++++++++++-----------------
 interface/ui/notarization.html |   2 +-
 interface/ui/ui.ml             | 166 ++++++++++++++++++++------------
 8 files changed, 211 insertions(+), 163 deletions(-)

diff --git a/Makefile b/Makefile
index 82d5828..de87069 100644
--- a/Makefile
+++ b/Makefile
@@ -52,6 +52,7 @@ check:
 clean:
 	@rm -f pandora.wasm pandora_debug.wasm
 	@cargo clean
+	@dune clean
 
 format-ocaml:
 	@dune build @fmt --auto-promote --display=quiet 2> /dev/null || exit 0
diff --git a/interface/api/api.ml b/interface/api/api.ml
index c3e2b1b..15b8508 100644
--- a/interface/api/api.ml
+++ b/interface/api/api.ml
@@ -34,9 +34,21 @@ let connect [%req] () =
 
 let notarize [%req] (n: notarization) =
   let>? account, _ = auth req in
-  let>? () = Serv.Proxy.(wrap @@ post_notarize ~input:n.hash !proxy) in
-  let>? status = Serv.Proxy.(wrap @@ post_status ~input:n.hash !proxy) in
-  Db.register_notarization ~account {n with status}
+  let> r = Db.notarization n.hash in
+  match r with
+  | Ok { status = Some _; _ } -> rok None
+  | Ok n ->
+    let>? status = Serv.Proxy.(wrap @@ post_status ~input:n.hash !proxy) in
+    let n = {n with status} in
+    let>? _ = Db.register_notarization n in
+    rok None
+  | Error NotFound _ ->
+    let>? () = Serv.Proxy.(wrap @@ post_notarize ~input:n.hash !proxy) in
+    let>? status = Serv.Proxy.(wrap @@ post_status ~input:n.hash !proxy) in
+    let n = { n with status } in
+    let>? id = Db.register_notarization ~account n in
+    rok (Some id)
+  | Error e -> rerr e
 [@@service Serv.Api.notarize]
 
 let get_account_param req =
@@ -92,7 +104,6 @@ let verify_proof [%req] input =
 [@@service Serv.Api.verify_proof]
 
 
-
 let openapi () =
   rok (snd @@ EzOpenAPI.make ~pretty:true ~sections:Serv.sections ~title:"Pandora App API" "")
 [@@service Serv.Api.openapi]
diff --git a/interface/common/i.ml b/interface/common/i.ml
index 19bd216..e83cabb 100644
--- a/interface/common/i.ml
+++ b/interface/common/i.ml
@@ -53,7 +53,8 @@ type error +=
   | ServerError of server_error [@encoding server_error_enc] [@nowrap]
   | BadGateway of bad_gateway [@code 502] [@nowrap]
   | InvalidProof of string [@code 422]
-[@@deriving err_case {code=500}]
+  | UiError of string list
+[@@deriving err_case {code=500; debug}]
 
 let error_enc = Json_encoding.union (List.map snd !_error_cases_error)
 [@@@jsoo
@@ -158,6 +159,7 @@ let pp_error fmt = function
   | ServerError DestructError s -> Format.fprintf fmt "destruct error: %s" s
   | ServerError Exn exn -> Format.fprintf fmt "exception: %s" (Printexc.to_string exn)
   | ServerError PsqlError {msg; _} -> Format.fprintf fmt "psql error: %s" msg
+  | UiError l -> Format.fprintf fmt "ui error: %s" @@ String.concat "\n" l
   | _ -> Format.fprintf fmt "unknown error"
 
 let print_error e = Format.eprintf "%a@." pp_error e
diff --git a/interface/common/serv.ml b/interface/common/serv.ml
index 4d167a6..2f851fc 100644
--- a/interface/common/serv.ml
+++ b/interface/common/serv.ml
@@ -56,7 +56,7 @@ module Api = struct
     | Ok x -> Ok x) p
   let%get connect = { path = "/connect"; errors; security; section=notarization_section }
   let%put notarize = {
-    path = "/notarization"; input=notarization_enc; output=int53;
+    path = "/notarization"; input=notarization_enc; output=(option int53);
     errors; security; section=notarization_section }
   let%get notarization = {
     path = "/notarization/{arg_hash}"; output=notarization_enc;
diff --git a/interface/ui/error.html b/interface/ui/error.html
index 694106b..1ffaaa5 100644
--- a/interface/ui/error.html
+++ b/interface/ui/error.html
@@ -2,19 +2,24 @@
   <div class="card-body">
     <h5 class="card-title">
       <div class="d-flex justify-content-between mb-1">
-        <span>Error</span>
+        <span v-if="error.not_found==undefined">Error</span>
+        <span v-else></span>
         <button class="ms-4 py-0 btn btn-sm" @click="close()">&#x2715</button>
       </div>
     </h5>
     <div class="card-text bg-danger-subtle text-danger-emphasis p-3">
       <div v-if="error.not_found">
-        <span>Unknown hash:</span>
+        <span>Hash not notarized:</span>
         <hash :hash="error.not_found" size="md" :len="20" class="ms-4"></hash>
       </div>
       <div v-else-if="error.bad_gateway!==undefined">
         <span>Proxy error:</span>
         <span>{{ error.bad_gateway }}</span>
       </div>
+      <div v-else-if="error.ui_error">
+        <div>Interface error:</div>
+        <div v-for="e in error.ui_error">{{ e }}</div>
+      </div>
       <div v-else>{{ error }}</div>
     </div>
   </div>
diff --git a/interface/ui/index.html b/interface/ui/index.html
index d0dd0b8..7f1b149 100644
--- a/interface/ui/index.html
+++ b/interface/ui/index.html
@@ -16,15 +16,12 @@
     <div id="app" style="display:none">
 
       <!-- navbar -->
-      <nav class="navbar fixed-bottom">
+      <nav class="navbar fixed-bottom bg-light">
         <div class="container-fluid">
           <a class="navbar-brand" @click="init()" role="button">
             <img src="logo.svg" alt="Pandora" witdh="180" height="30"/>
           </a>
-          <ul class="ms-auto navbar-nav flex-row">
-            <li class="nav-item me-3" v-if="token">
-              <a class="nav-link" @click="section='proof'" role="button">Proofs</a>
-            </li>
+          <ul class="ms-auto navbar-nav">
             <li class="nav-item">
               <div class="input-group" v-if="token">
                 <span class="input-group-text">{{ login }}</span>
@@ -61,30 +58,90 @@
       <!-- home section -->
       <div class="container" v-else-if="section=='home'">
 
-        <!-- wide -->
-        <div class="input-group d-none d-sm-flex my-5">
-          <input type="file" class="form-control" multiple @change="hash_files" ref="files-input-wide"/>
-          <hash :hash="hash" v-if="hash" len="8" class="mx-2"></hash>
-          <input type="text" class="form-control" v-if="hash && token" placeholder="name" v-model="hash_name"/>
-          <button class="btn btn-dark" type="button" @click="check()" :disabled="hash==undefined">check</button>
-          <button class="btn btn-dark" type="button" @click="notarize()" :disabled="hash==undefined" v-if="token">notarize</button>
-        </div>
-        <!-- narrow -->
-        <div class="d-sm-none my-3">
+        <div class="d-flex my-5 mx-auto flex-column" style="max-width: 500px">
           <div class="input-group">
-            <input type="file" class="form-control" multiple @change="hash_files" ref="files-input-narrow"/>
-            <hash :hash="hash" v-if="hash" len="8" class="mx-2"></hash>
-            <input type="text" class="form-control" v-if="hash && token" placeholder="name" v-model="hash_name"/>
+            <select v-model="action" class="form-select" style="max-width: 140px" @change="change_action">
+              <option value="notarize">notarize</option>
+              <option value="check_file">check file</option>
+              <option value="check_hash">check hash</option>
+              <option value="check_proof">check proof</option>
+            </select>
+            <input type="file" class="form-control" multiple @change="hash_files" ref="notarize-files-input" v-if="action=='notarize' || action=='check_file'" style="max-width: 400px"/>
+            <input type="text" class="form-control" v-else-if="action=='check_hash'" v-model="hash" placeholder="hash" style="max-width: 400px"/>
+            <input type="file" class="form-control" @change="load_proof" ref="proof-file-input" v-else-if="action=='check_proof'" style="max-width: 400px"/>
           </div>
-          <div class="input-group">
-            <button class="btn btn-dark flex-fill" type="button" @click="check()" :disabled="hash==undefined">check</button>
-            <button class="btn btn-dark flex-fill" type="button" @click="notarize()" :disabled="hash==undefined" v-if="token">notarize</button>
+          <div class="input-group mt-3 mx-auto" v-if="hash && (action=='notarize' || action=='check_file')">
+            <span class="input-group-text text-bg-secondary" style="width: 100px">hash</span>
+            <hash :hash="hash" len="8" class="mx-2 flex-grow-1"></hash>
           </div>
+          <div class="input-group mx-auto" v-if="action=='notarize' && hash && token">
+            <span class="input-group-text text-bg-secondary" style="width: 100px">name</span>
+            <input type="text" class="form-control" v-model="hash_name"/>
+          </div>
+          <div class="progress mt-1" role="progressbar" v-if="hashing_percent!=undefined" :aria-valuenow="hashing_percent" aria-valuemin="0" aria-valuemax="100">
+            <div class="progress-bar bg-dark" :style="'width:'+hashing_percent+'%'">{{ (parseInt(hashing_percent) > 10) ? hashing_percent + '%' : '' }}</div>
+          </div>
+
+          <button class="btn btn-dark mt-3" type="button" @click="check_proof()" v-if="action=='check_proof' && proof_file">check</button>
+          <button class="btn btn-dark mt-3" type="button" @click="check()" v-else-if="(action=='check_file' || action=='check_hash') && hash">check</button>
+          <button class="btn btn-dark mt-3" type="button" @click="notarize()" v-if="token && hash && action=='notarize'">notarize</button>
         </div>
 
         <notarization :notarization="notarization" :token="token" v-if="notarization" class="mt-4" @close_notarization="close_notarization()" @completed="get_notarizations(undefined)">
         </notarization>
 
+        <div class="card border-dark" v-if="proof_verified">
+          <div class="card-body">
+            <h5 class="card-title">
+              <!-- wide -->
+              <div class="d-none d-sm-flex justify-content-between mb-1">
+                <span>
+                  <span>Proof verified:</span>
+                  <hash :hash="proof.hash" len="8" class="mx-4" size="md"></hash>
+                  <span class="badge text-bg-success">
+                    {{ proof_verified.toLocaleString('en-GB') }}
+                  </span>
+                </span>
+                <button class="ms-4 py-0 btn btn-sm" @click="close_proof()">&#x2715</button>
+              </div>
+              <!-- narrow -->
+              <div class="d-sm-none">
+                <div class="d-flex justify-content-between mb-3">
+                  <span>Proof verified:</span>
+                  <button class="ms-4 py-0 btn btn-sm" @click="close_proof()">&#x2715</button>
+                </div>
+              </div>
+            </h5>
+            <!-- narrow -->
+            <div class="d-sm-none">
+              <div><strong>Notarization</strong></div>
+              <div class="d-flex justify-content-between">
+                <hash :hash="proof.hash" len="8" size="md"></hash>
+                <span class="badge text-bg-success">
+                  {{ proof_verified.toLocaleString('en-GB') }}
+                </span>
+              </div>
+            </div>
+            <div class="my-2">
+              <div v-if="proof.commitment.status=='uncommitted'" class="badge text-bg-warning">
+                {{ proof.commitment.status }}
+              </div>
+              <div v-else>
+                <div><strong>Commitment</strong></div>
+                <div class="d-flex justify-content-between">
+                  <span>
+                    <hash :hash="proof.commitment.hash" len="8" size="md"></hash>
+                    <a class="btn btn-secondary btn-sm mx-2" :href="commitments_page" target="_blank" v-if="commitments_page" role="button">
+                      <i class="bi bi-box-arrow-right"></i>
+                    </a>
+                  </span>
+                  <a class="btn btn-sm" :class="(proof.commitment.status=='cemented') ? 'btn-success' : 'btn-warning'" :href="commitment_page+'?hash='+proof.commitment.hash" target="_blank" role="button">{{ proof.commitment.status }}</a>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+
         <error v-if="error" class="mt-4" :error="error" @close_error="close_error()">
         </error>
 
@@ -125,11 +182,11 @@
                   <td>{{ n.info.files?.reduce((acc, x) => acc + ', ' + x) || '--' }}</td>
                   <td>
                     <span class="badge" :class="(n.status) ? 'text-bg-success' : 'text-bg-warning'">
-                      {{ (n.status) ? n.status.notarized.toLocaleString('en-GB') : 'pending' }}
+                      {{ (n.status) ? 'notarized at ' + n.status.notarized.toLocaleString('en-GB') : 'pending' }}
                     </span>
                   </td>
                   <td>
-                    <a @click="proof(n)" class="btn btn-outline-secondary btn-sm" role="button"><i class="bi bi-download"></i></a>
+                    <a @click="download_proof(n)" class="btn btn-outline-secondary btn-sm" role="button"><i class="bi bi-download"></i></a>
                   </td>
                 </tr>
               </tbody>
@@ -165,7 +222,7 @@
                       <tr>
                         <th scope="row">proof</th>
                         <td>
-                          <button @click="proof(n)" class="btn btn-outline-secondary btn-sm"><i class="bi bi-download"></i></button>
+                          <button @click="download_proof(n)" class="btn btn-outline-secondary btn-sm"><i class="bi bi-download"></i></button>
                         </td>
                       </tr>
                     </tbody>
@@ -176,72 +233,6 @@
           </div>
         </div>
       </div>
-
-      <!-- proof section -->
-      <div class="container" v-else-if="section=='proof'">
-        <div class="input-group my-5">
-          <input type="file" class="form-control" @change="check_proof" ref="proof-file"/>
-          <span class="input-group-text text-bg-dark">check proof</span>
-        </div>
-        <div class="card" v-if="proof_error || proof_verified">
-          <div class="card-body">
-            <h5 class="card-title">
-              <!-- wide -->
-              <div class="d-none d-sm-flex justify-content-between mb-1">
-                <span v-if="proof_error">Error</span>
-                <span v-else>
-                  <span>Proof verified:</span>
-                  <hash :hash="proof_hash" len="8" class="mx-4" size="md"></hash>
-                  <span class="badge text-bg-success">
-                    {{ proof_verified.toLocaleString('en-GB') }}
-                  </span>
-                </span>
-                <button class="ms-4 py-0 btn btn-sm" @click="close_proof()">&#x2715</button>
-              </div>
-              <!-- narrow -->
-              <div class="d-sm-none">
-                <div class="d-flex justify-content-between mb-3">
-                  <span>
-                    <span v-if="proof_error">Error</span>
-                    <span v-else>Proof verified:</span>
-                  </span>
-                  <button class="ms-4 py-0 btn btn-sm" @click="close_proof()">&#x2715</button>
-                </div>
-              </div>
-            </h5>
-            <div class="card-text bg-danger-subtle text-danger-emphasis p-3" v-if="proof_error">
-              <div v-for="e in proof_error">{{ e }}</div>
-            </div>
-            <!-- narrow -->
-            <div class="d-sm-none" v-if="proof_verified">
-              <div><strong>Notarization</strong></div>
-              <div class="d-flex justify-content-between">
-                <hash :hash="proof_hash" len="8" size="md"></hash>
-                <span class="badge text-bg-success">
-                  {{ proof_verified.toLocaleString('en-GB') }}
-                </span>
-              </div>
-            </div>
-            <div class="my-2" v-if="proof_verified">
-              <div v-if="commitment_status=='uncommitted'" class="badge text-bg-warning">
-                {{ commitment_status }}
-              </div>
-              <div v-else>
-                <div><strong>Commitment</strong></div>
-                <div class="d-flex justify-content-between">
-                  <span>
-                    <hash :hash="commitment_hash" len="8" size="md"></hash>
-                    <a class="btn btn-secondary btn-sm mx-2" :href="commitments_page" target="_blank" v-if="commitments_page" role="button">
-                      <i class="bi bi-box-arrow-right"></i>
-                    </a>
-                  </span>
-                  <a class="btn btn-sm" :class="(commitment_status=='cemented') ? 'btn-success' : 'btn-warning'" :href="commitment_json" target="_blank" role="button">{{ commitment_status }}</a>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
     </div>
   </body>
 </html>
diff --git a/interface/ui/notarization.html b/interface/ui/notarization.html
index 37ad1aa..4c0c471 100644
--- a/interface/ui/notarization.html
+++ b/interface/ui/notarization.html
@@ -1,4 +1,4 @@
-<div class="card">
+<div class="card border-dark">
   <div class="card-body">
     <h5 class="card-title">
       <!-- wide -->
diff --git a/interface/ui/ui.ml b/interface/ui/ui.ml
index 19a8639..51fc829 100644
--- a/interface/ui/ui.ml
+++ b/interface/ui/ui.ml
@@ -10,14 +10,15 @@ type config = {
   rollup: string option;
 } [@@deriving encoding, jsoo]
 
-type section = [ `load | `signin | `home | `proof ] [@@deriving jsoo]
+type section = [ `load | `signin | `home ] [@@deriving jsoo]
+type action = [ `check_file | `notarize | `check_hash | `check_proof ] [@@deriving jsoo]
 
 let config = ref {
   api = "http://localhost:8080";
   page_size = 10;
   wait = 2.;
   explorer = "https://ghostnet.tzkt.io";
-  explorer_api = "https://ghostnet.tzkt.io";
+  explorer_api = "https://api.ghostnet.tzkt.io/v1";
   rollup = None;
 }
 
@@ -102,19 +103,19 @@ and notarizations_count = 0
 and notarizations: notarization list = []
 and page = 1
 and total_pages = 1
+and action : action = `check_file
 and hash: string option = None
 and hash_name: string = ""
+and hashing_percent: string option = None
 and files: string list = []
 and notarization: notarization option = None
 and error: I.error option = None
 and section : section = `load
-and proof_hash : string option = None
-and proof_error : string list option = None
-and proof_verified : I.Cal.t option = None
+and commitment_page : string option = None
 and commitments_page : string option = None
-and commitment_json : string option = None
-and commitment_status : commitment_status option = None
-and commitment_hash : string option = None
+and proof_file : string option = None
+and proof : proof_with_hash option = None
+and proof_verified : I.Cal.t option = None
 
 let storage () = Option.get @@ Optdef.to_option Dom_html.window##.localStorage
 
@@ -173,8 +174,7 @@ let read_file file =
       _false);
   Lwt.on_cancel w (fun () -> reader##abort);
   reader##readAsArrayBuffer file;
-  let|> a = w in
-  Typed_array.Bigstring.of_arrayBuffer a
+  w
 
 let load_config app =
   let|> r = EzReq_lwt.get (EzAPI.URL "/config.json") in
@@ -188,7 +188,8 @@ let load_config app =
   Option.iter (fun c -> config := c) c;
   Option.iter (fun rollup ->
     app##.commitments_page_ := def (string (Format.sprintf "%s/%s/commitments" !config.explorer rollup))
-  ) !config.rollup
+  ) !config.rollup;
+  app##.commitment_page_ := def (string (Format.sprintf "%s/smart_rollups/commitments" !config.explorer_api))
 
 let load_token ?st app =
   let storage = match st with None -> storage () | Some st -> st in
@@ -235,20 +236,15 @@ let clean_notarization app =
   app##.hash_name_ := string "";
   app##.files := array [||];
   app##.notarization := undefined;
-  Optdef.iter [%ref app "files-input-narrow"] (fun elt -> (Unsafe.coerce elt)##.value := null);
-  Optdef.iter [%ref app "files-input-wide"] (fun elt -> (Unsafe.coerce elt)##.value := null)
+  Optdef.iter [%ref app "notarize-files-input"] (fun elt -> (Unsafe.coerce elt)##.value := null)
 
 let clean app =
   clean_notarization app;
   clean_notarizations app
 
 let clean_proof app =
-  app##.proof_error_ := undefined;
-  app##.proof_verified_ := undefined;
-  app##.proof_hash_ := undefined;
-  app##.commitment_json_ := undefined;
-  app##.commitment_status_ := undefined;
-  app##.commitment_hash_ := undefined
+  app##.proof_file_ := undefined;
+  app##.proof := undefined
 
 let%meth signin app =
   EzLwtSys.run @@ fun () ->
@@ -269,19 +265,38 @@ and signout app =
 and [@noconv] hash_files app (event: Dom_html.inputElement Dom.event t) =
   EzLwtSys.run @@ fun () ->
   match Opt.to_option event##.target with
-  | None -> app##.hash := undefined; Lwt.return_unit
+  | None -> app##.hashing_percent_ := undefined; app##.hash := undefined; Lwt.return_unit
   | Some target ->
     let files = Dom.list_of_nodeList target##.files in
+    let> l, n = Lwt_list.fold_left_s (fun (acc, n) f ->
+      let|> a = read_file f in
+      ((f##.name, a) :: acc), n + a##.byteLength
+    ) ([], 0) files in
+    let l = List.rev l in
+    let names, l = List.split l in
+    let step = max 1024 (n / 200) in
+    app##.hashing_percent_ := def (string "0");
+    let rec aux_file ctx a tl n_a m x =
+      let> () = EzLwtSys.sleep 0.0001 in
+      let y = x + step in
+      let ctx = Digestif.SHA256.feed_string ctx (Typed_array.String.of_arrayBuffer (a##slice x y)) in
+      let percent = Int64.(to_int @@ div (mul (of_int (m + y)) 100L) (of_int n)) in
+      app##.hashing_percent_ := def (string (string_of_int percent));
+      if y >= n_a then aux ctx tl (m+n_a)
+      else aux_file ctx a tl n_a m y
+    and aux ctx l m = match l with
+      | [] ->
+        let `Hex hash = Hex.of_string Digestif.SHA256.(to_raw_string @@ get ctx) in
+        app##.hash := def (string hash);
+        app##.notarization := undefined;
+        app##.files := of_list (List.rev names);
+        app##.hashing_percent_ := undefined;
+        Lwt.return_unit
+      | a :: tl ->
+        let n_a = a##.byteLength in
+        aux_file ctx a tl n_a m 0 in
     let ctx = Digestif.SHA256.init () in
-    let|> files, ctx = Lwt_list.fold_left_s (fun (files, ctx) f ->
-      let|> s = read_file f in
-      let ctx = Digestif.SHA256.feed_bigstring ctx s in
-      f##.name :: files, ctx
-    ) ([], ctx) files in
-    let `Hex hash = Hex.of_string Digestif.SHA256.(to_raw_string @@ get ctx) in
-    app##.notarization := undefined;
-    app##.hash := def (string hash);
-    app##.files := of_list (List.rev files)
+    aux ctx l 0
 
 and notarize app =
   match to_optdef to_string app##.hash with
@@ -300,19 +315,31 @@ and notarize app =
     clean_notarization app;
     match r with
     | Error e -> print_error e; app##.error := def (error_to_jsoo e)
-    | Ok _id -> app##.notarization := def (notarization_to_jsoo input)
+    | Ok _n -> app##.notarization := def (notarization_to_jsoo input)
 
 and check app =
   match to_optdef to_string app##.hash with
   | None -> log_str "no hash to notarize"
   | Some hash ->
-    EzLwtSys.run @@ fun () ->
-    let headers = headers app in
-    let|> r = Serv.Api.(wrap @@ get_notarization ~headers (EzAPI.BASE !config.api) hash) in
-    clean_notarization app;
-    match r with
-    | Error e -> print_error e; app##.error := def (error_to_jsoo e)
-    | Ok n -> app##.notarization := def (notarization_to_jsoo n)
+    let n = String.length hash in
+    let e = UiError [ "wrong hash format" ] in
+    if n < 64 then (
+      print_error e;
+      app##.error := def (error_to_jsoo e))
+    else
+    let hash, n = if String.sub hash 0 2 = "0x" then String.sub hash 2 (n-2), n-2 else hash, n in
+    if n <> 64 || String.exists (fun c ->
+      let code = Char.code c in
+      code < 48 || (code > 57 && code < 65) || (code > 70 && code < 97) || code > 102) hash then (
+      print_error e;
+      app##.error := def (error_to_jsoo e))
+    else EzLwtSys.run @@ fun () ->
+      let headers = headers app in
+      let|> r = Serv.Api.(wrap @@ get_notarization ~headers (EzAPI.BASE !config.api) hash) in
+      clean_notarization app;
+      match r with
+      | Error e -> print_error e; app##.error := def (error_to_jsoo e)
+      | Ok n -> app##.notarization := def (notarization_to_jsoo n)
 
 and refresh app =
   clean app;
@@ -330,7 +357,7 @@ and get_notarizations app page =
 
 and init app = init app
 
-and [@noconv] proof app (n: notarization_jsoo t) =
+and [@noconv] download_proof app (n: notarization_jsoo t) =
   let open Ezjs_fetch_lwt in
   EzLwtSys.run @@ fun () ->
   let headers = headers app in
@@ -368,7 +395,7 @@ and [@noconv] proof app (n: notarization_jsoo t) =
         let e = EzEncoding.destruct enc (to_string s) in
         js_log e
 
-and [@noconv] check_proof app (event: Dom_html.inputElement Dom.event t) =
+and [@noconv] load_proof app (event: Dom_html.inputElement Dom.event t) =
   clean_proof app;
   EzLwtSys.run @@ fun () ->
   match Opt.to_option event##.target with
@@ -379,35 +406,46 @@ and [@noconv] check_proof app (event: Dom_html.inputElement Dom.event t) =
     match files with
     | [] -> Lwt.return_unit
     | f :: _ ->
-      let> s = read_file f in
-      let s = Typed_array.String.of_arrayBuffer @@ Typed_array.Bigstring.to_arrayBuffer s in
-      try
-        let input = EzEncoding.destruct proof_with_hash_enc s in
-        app##.proof_hash_ := def (string input.hash);
-        let headers = headers app in
-        let|> r = Serv.Api.(wrap @@ put_verify_proof ~headers ~input (EzAPI.BASE !config.api)) in
-        begin match r with
-          | Error e -> app##.proof_error_ := def (of_list [string (Format.asprintf "%a" pp_error e)])
-          | Ok tsp ->
-            app##.proof_verified_ := def (Cal.to_jsoo tsp);
-            app##.commitment_status_ := def (commitment_status_to_jsoo input.commitment.status);
-            Option.iter (fun hash ->
-              app##.commitment_json_ := def (string (Format.sprintf "%s/smart_rollups/commitments?hash=%s" !config.explorer_api hash));
-              app##.commitment_hash_ := def (string hash)
-            ) input.commitment.hash
-        end
-      with _ ->
-        app##.proof_error_ :=
-          def (of_listf string [
-            "invalid file";
-            "it should be of the form:";
-            {|{ "hash": "...", "commitment": { ... }, "proof": { ... } }|};
-          ]);
-        Lwt.return_unit
+      let> a = read_file f in
+      let s = Typed_array.String.of_arrayBuffer a in
+      app##.proof_file_ := def (string s);
+      Lwt.return_unit
+
+and [@noconv] check_proof app =
+  EzLwtSys.run @@ fun () ->
+  match to_optdef to_string app##.proof_file_ with
+  | None -> log_str "no proof file"; Lwt.return_unit
+  | Some s ->
+    Optdef.iter [%ref app "proof-file-input"] (fun elt -> (Unsafe.coerce elt)##.value := null);
+    try
+      let input = EzEncoding.destruct proof_with_hash_enc s in
+      app##.proof := def (proof_with_hash_to_jsoo input);
+      let headers = headers app in
+      let|> r = Serv.Api.(wrap @@ put_verify_proof ~headers ~input (EzAPI.BASE !config.api)) in
+      begin match r with
+        | Error e ->
+          print_error e;
+          app##.error := def (error_to_jsoo e);
+        | Ok tsp ->
+          app##.proof_verified_ := def (Cal.to_jsoo tsp)
+      end
+    with _ ->
+      let e = UiError [
+        "invalid file";
+        "it should be of the form:";
+        {|{ "hash": "...", "commitment": { ... }, "proof": { ... } }|};
+      ] in
+      print_error e;
+      app##.error := def (error_to_jsoo e);
+      Lwt.return_unit
 
 and close_proof app =
   clean_proof app
 
+and [@noconv] change_action app = match action_of_jsoo app##.action with
+  | `check_proof -> clean_notarization app
+  | _ -> clean_proof app
+
 [%%mounted fun app -> init app]
 
 [%%app {conv; mount; components=[Notarization; Hash; Error]; modules=[I, Ijsoo]; unhide}]
-- 
GitLab