From 1d270c5bc4ad446f3c028732d0f09440484b154b Mon Sep 17 00:00:00 2001
From: Stewart Ye <16131485+StewartYe@users.noreply.github.com>
Date: Mon, 28 Mar 2022 17:35:10 +0800
Subject: [PATCH] fix bug about submit proofs (#69)

* fix bug about submit proofs

* format code

* remove unused code
---
 .gitignore               |  2 +-
 rustfmt.toml             |  5 +++++
 src/fusotao/connector.rs | 35 ++++++++++++++++++++++-------------
 src/fusotao/mod.rs       | 10 +++++++---
 4 files changed, 35 insertions(+), 17 deletions(-)
 create mode 100644 rustfmt.toml

diff --git a/.gitignore b/.gitignore
index b9810c6..00b687e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 /target
 Cargo.lock
-*.toml
+galois.toml
 !Cargo.toml
 .idea
\ No newline at end of file
diff --git a/rustfmt.toml b/rustfmt.toml
new file mode 100644
index 0000000..103182c
--- /dev/null
+++ b/rustfmt.toml
@@ -0,0 +1,5 @@
+edition = "2021"
+unstable_features = true
+use_field_init_shorthand = true
+reorder_impl_items = true
+newline_style = "Unix"
\ No newline at end of file
diff --git a/src/fusotao/connector.rs b/src/fusotao/connector.rs
index d1a45b9..d4a57ab 100644
--- a/src/fusotao/connector.rs
+++ b/src/fusotao/connector.rs
@@ -16,6 +16,7 @@ use crate::{config::C, fusotao::*, sequence};
 use anyhow::anyhow;
 use memmap::MmapMut;
 use parity_scale_codec::Decode;
+use sp_core::sr25519::Public;
 use sp_core::Pair;
 use std::{
     convert::TryInto,
@@ -30,9 +31,9 @@ use std::{
 use sub_api::events::{EventsDecoder, Raw};
 
 pub struct FusoConnector {
-    api: FusoApi,
-    signer: Sr25519Key,
-    proved_event_id: Arc<AtomicU64>,
+    pub api: FusoApi,
+    pub signer: Sr25519Key,
+    pub proved_event_id: Arc<AtomicU64>,
 }
 
 #[derive(Clone, Decode, Debug, Default)]
@@ -74,24 +75,21 @@ impl FusoConnector {
         })
     }
 
-    pub fn sync_proving_progress(&self) -> anyhow::Result<Arc<AtomicU64>> {
-        let who = self.signer.public();
-        let key = self
-            .api
+    pub fn sync_proving_progress(who: &Public, api: &FusoApi) -> anyhow::Result<u64> {
+        let key = api
             .metadata
-            .storage_map_key::<FusoAccountId, Option<Dominator>>("Verifier", "Dominators", who)?;
-        let payload = self.api.get_opaque_storage_by_key_hash(key, None)?.unwrap();
+            .storage_map_key::<FusoAccountId, Option<Dominator>>("Verifier", "Dominators", *who)?;
+        let payload = api.get_opaque_storage_by_key_hash(key, None)?.unwrap();
         let result = Dominator::decode(&mut payload.as_slice()).unwrap();
-        self.proved_event_id
-            .store(result.sequence.0, Ordering::Relaxed);
         log::info!("synchronizing proving progress: {}", result.sequence.0);
-        Ok(self.proved_event_id.clone())
+        Ok(result.sequence.0)
     }
 
     pub fn start_submitting(&self) -> anyhow::Result<()> {
         let api = self.api.clone();
         let proved_event_id = self.proved_event_id.clone();
         let mut in_block = proved_event_id.load(Ordering::Relaxed);
+        let who = self.signer.public();
         std::thread::spawn(move || loop {
             let proofs = persistence::fetch_raw_after(in_block);
             if proofs.is_empty() {
@@ -123,7 +121,18 @@ impl FusoConnector {
                     proved_event_id.store(in_block, Ordering::Relaxed);
                     log::info!("rotate proved event to {}", in_block);
                 }
-                Err(e) => log::error!("error occur while submitting proofs, {:?}", e),
+                Err(e) => {
+                    log::error!("error occur while submitting proofs, {:?}", e);
+                    loop {
+                        let event_id = Self::sync_proving_progress(&who, &api);
+                        if event_id.is_ok() {
+                            in_block = event_id.unwrap();
+                            proved_event_id.store(in_block, Ordering::Relaxed);
+                            break;
+                        }
+                        std::thread::sleep(Duration::from_millis(100u64));
+                    }
+                }
             }
         });
         Ok(())
diff --git a/src/fusotao/mod.rs b/src/fusotao/mod.rs
index 332451c..456bc37 100644
--- a/src/fusotao/mod.rs
+++ b/src/fusotao/mod.rs
@@ -27,7 +27,10 @@ use std::{
 
 pub use prover::Prover;
 
+use crate::fusotao::connector::FusoConnector;
 use crate::{config::C, core::*, event::*};
+use sp_core::Pair;
+use std::sync::atomic::Ordering;
 
 mod connector;
 mod persistence;
@@ -122,12 +125,13 @@ impl WrapperTypeEncode for UserId {}
 /// 2. new or from public
 pub fn init(rx: Receiver<Proof>) -> anyhow::Result<Arc<AtomicU64>> {
     persistence::init(rx);
-    let connector = connector::FusoConnector::new()?;
-    let proved = connector.sync_proving_progress()?;
+    let connector = FusoConnector::new()?;
+    let proved = FusoConnector::sync_proving_progress(&connector.signer.public(), &connector.api)?;
+    connector.proved_event_id.store(proved, Ordering::Relaxed);
     connector.start_submitting()?;
     connector.start_scanning()?;
     log::info!("fusotao prover initialized");
-    Ok(proved)
+    Ok(connector.proved_event_id.clone())
 }
 
 #[derive(Clone, Encode, Decode, Eq, PartialEq, Debug)]