Merge #666

666: Problem (CRO-578 WIP): Wallet keep loading and decrypt global state r=tomtau a=yihuang

Solution:
- No need to encrypt global state
- Store `lite::TrustedState` in global state
- Cache global state in memory when syncing.

Make some less controversial changes first.

Co-authored-by: yihuang <[email protected]>

Author: bors[bot]

client-common/src/tendermint/lite.rs

@@ -1,5 +1,7 @@
 //! Lite tendermint client
+use parity_scale_codec::{Decode, Encode, Error, Input, Output};
 use serde::{Deserialize, Serialize};
+use serde_json;
 use tendermint::{block::Header, validator};
 
 use crate::tendermint::client::Client;
@@ -14,6 +16,29 @@ pub struct TrustedState {
     pub validators: validator::Set,
 }
 
+impl TrustedState {
+    /// construct genesis trusted state
+    pub fn genesis(genesis_validators: Vec<validator::Info>) -> TrustedState {
+        TrustedState {
+            header: None,
+            validators: validator::Set::new(genesis_validators),
+        }
+    }
+}
+
+impl Encode for TrustedState {
+    fn encode_to<T: Output>(&self, dest: &mut T) {
+        serde_json::to_string(self).unwrap().encode_to(dest)
+    }
+}
+
+impl Decode for TrustedState {
+    fn decode<I: Input>(value: &mut I) -> Result<Self, Error> {
+        serde_json::from_str(&String::decode(value)?)
+            .map_err(|_| "fail to encode trusted_state to json ".into())
+    }
+}
+
 /// get genesis validator set
 pub fn get_genesis_validators<C>(client: &C) -> CommonResult<validator::Set>
 where

client-core/src/handler.rs

@@ -17,7 +17,7 @@ pub trait TransactionHandler: Send + Sync {
         &self,
         name: &str,
         passphrase: &SecUtf8,
-        transaction: Transaction,
+        transaction: &Transaction,
         block_height: u64,
         block_time: Time,
     ) -> Result<()>;
@@ -26,5 +26,5 @@ pub trait TransactionHandler: Send + Sync {
 /// Interface for handling stream of block headers in Crypto.com Chain
 pub trait BlockHandler: Send + Sync {
     /// Handles a block header in Crypto.com Chain
-    fn on_next(&self, name: &str, passphrase: &SecUtf8, block_header: BlockHeader) -> Result<()>;
+    fn on_next(&self, name: &str, passphrase: &SecUtf8, block_header: &BlockHeader) -> Result<()>;
 }

client-core/src/handler/default_block_handler.rs

@@ -3,7 +3,7 @@ use secstr::SecUtf8;
 use chain_core::tx::TransactionId;
 use client_common::{BlockHeader, ErrorKind, Result, ResultExt, Storage};
 
-use crate::service::{GlobalStateService, KeyService, WalletService};
+use crate::service::{KeyService, WalletService};
 use crate::{BlockHandler, TransactionHandler, TransactionObfuscation};
 
 /// Default implementation of `BlockHandler`
@@ -19,7 +19,6 @@ where
 
     key_service: KeyService<S>,
     wallet_service: WalletService<S>,
-    global_state_service: GlobalStateService<S>,
 }
 
 impl<O, H, S> DefaultBlockHandler<O, H, S>
@@ -36,7 +35,6 @@ where
             transaction_handler,
             key_service: KeyService::new(storage.clone()),
             wallet_service: WalletService::new(storage.clone()),
-            global_state_service: GlobalStateService::new(storage),
         }
     }
 }
@@ -47,8 +45,8 @@ where
     H: TransactionHandler,
     S: Storage,
 {
-    fn on_next(&self, name: &str, passphrase: &SecUtf8, block_header: BlockHeader) -> Result<()> {
-        for transaction in block_header.unencrypted_transactions {
+    fn on_next(&self, name: &str, passphrase: &SecUtf8, block_header: &BlockHeader) -> Result<()> {
+        for transaction in block_header.unencrypted_transactions.iter() {
             if block_header.transaction_ids.contains(&transaction.id()) {
                 self.transaction_handler.on_next(
                     name,
@@ -83,7 +81,7 @@ where
                 .transaction_obfuscation
                 .decrypt(&block_header.enclave_transaction_ids, &private_key)?;
 
-            for transaction in transactions {
+            for transaction in transactions.iter() {
                 self.transaction_handler.on_next(
                     name,
                     passphrase,
@@ -93,13 +91,7 @@ where
                 )?;
             }
         }
-
-        self.global_state_service.set_global_state(
-            name,
-            passphrase,
-            block_header.block_height,
-            block_header.app_hash,
-        )
+        Ok(())
     }
 }
 
@@ -150,11 +142,11 @@ mod tests {
             &self,
             _name: &str,
             _passphrase: &SecUtf8,
-            transaction: Transaction,
+            transaction: &Transaction,
             block_height: u64,
             block_time: Time,
         ) -> Result<()> {
-            if transaction != transfer_transaction() && transaction != unbond_transaction() {
+            if transaction != &transfer_transaction() && transaction != &unbond_transaction() {
                 panic!("Invalid transaction")
             }
             assert_eq!(1, block_height);
@@ -228,24 +220,8 @@ mod tests {
             storage.clone(),
         );
 
-        let global_state_service = GlobalStateService::new(storage);
-
-        assert_eq!(
-            0,
-            global_state_service
-                .last_block_height(name, passphrase)
-                .unwrap()
-        );
-
         block_handler
-            .on_next(name, passphrase, block_header)
+            .on_next(name, passphrase, &block_header)
             .unwrap();
-
-        assert_eq!(
-            1,
-            global_state_service
-                .last_block_height(name, passphrase)
-                .unwrap()
-        );
     }
 }

client-core/src/handler/default_transaction_handler.rs

@@ -47,14 +47,14 @@ where
         &self,
         name: &str,
         passphrase: &SecUtf8,
-        transaction: Transaction,
+        transaction: &Transaction,
         block_height: u64,
         block_time: Time,
     ) -> Result<()> {
         let transaction_id = transaction.id();
         let inputs = self.decorate_inputs(name, passphrase, transaction.inputs().to_vec())?;
         let outputs = transaction.outputs().to_vec();
-        let transaction_type = TransactionType::from(&transaction);
+        let transaction_type = TransactionType::from(transaction);
         let balance_change =
             self.calculate_balance_change(name, passphrase, &transaction_id, &inputs, &outputs)?;
 
@@ -333,7 +333,7 @@ mod tests {
             .on_next(
                 name1,
                 passphrase1,
-                transactions[0].clone(),
+                &transactions[0],
                 0,
                 Time::from_str("2019-04-09T09:38:41.735577Z").unwrap(),
             )
@@ -358,7 +358,7 @@ mod tests {
             .on_next(
                 name1,
                 passphrase1,
-                transactions[1].clone(),
+                &transactions[1],
                 1,
                 Time::from_str("2019-04-09T09:38:41.735577Z").unwrap(),
             )
@@ -382,7 +382,7 @@ mod tests {
             .on_next(
                 name2,
                 passphrase2,
-                transactions[0].clone(),
+                &transactions[0],
                 0,
                 Time::from_str("2019-04-09T09:38:41.735577Z").unwrap(),
             )
@@ -407,7 +407,7 @@ mod tests {
             .on_next(
                 name2,
                 passphrase2,
-                transactions[1].clone(),
+                &transactions[1],
                 1,
                 Time::from_str("2019-04-09T09:38:41.735577Z").unwrap(),
             )

client-core/src/service.rs

@@ -11,7 +11,7 @@ mod wallet_state_service;
 #[doc(hidden)]
 pub use self::wallet_state_service::WalletStateMemento;
 
-pub use self::global_state_service::GlobalStateService;
+pub use self::global_state_service::{GlobalState, GlobalStateService};
 pub use self::hd_key_service::HdKeyService;
 pub use self::key_service::KeyService;
 pub use self::multi_sig_session_service::MultiSigSessionService;