Merge pull request #99 from aionnetwork/dev

Dev

Cargo.toml

@@ -2,7 +2,7 @@
 description = "aion network rust implementation"
 name = "aionr"
 # NOTE Make sure to update util/version/Cargo.toml as well
-version = "1.0.2"
+version = "1.0.3"
 license = "GPL-3.0"
 authors = ["aion foundation <[email protected]>"]
 

core/src/db/state_db.rs

@@ -480,6 +480,14 @@ impl state::Backend for StateDB {
             .map(|a| a.as_ref().map(|a| a.clone_basic()))
     }
 
+    fn force_update(&mut self, addr: &Address, account: &AionVMAccount) {
+        let mut cache = self.account_cache.lock();
+
+        if let Some(&mut Some(ref mut existing)) = cache.accounts.get_mut(addr) {
+            existing.overwrite_with(account.clone());
+        }
+    }
+
     fn get_cached_code(&self, hash: &H256) -> Option<Arc<Vec<u8>>> {
         let mut cache = self.code_cache.lock();
 

core/src/engine/unity_engine/header_validators.rs

@@ -163,7 +163,7 @@ impl HeaderValidator for FutureTimestampValidator {
             .unwrap()
             .as_secs();
         if timestamp > timestamp_now + FUTURE_TIME_TOLERANCE {
-            error!(target: "validator", "block timestamp ({}) > local system time ({}) + {}", timestamp, timestamp_now, FUTURE_TIME_TOLERANCE);
+            debug!(target: "validator", "block timestamp ({}) > local system time ({}) + {}", timestamp, timestamp_now, FUTURE_TIME_TOLERANCE);
             return Err(BlockError::InvalidFutureTimestamp(OutOfBounds {
                 min: None,
                 max: Some(timestamp_now + FUTURE_TIME_TOLERANCE),

core/src/state/account/account.rs

@@ -832,6 +832,8 @@ impl AionVMAccount {
         None
     }
 
+    pub fn is_removed(&self, key: &Bytes) -> bool { return self.storage_removable.contains(key); }
+
     pub fn set_storage(&mut self, key: Bytes, value: Bytes) {
         // update removable set
         if self.storage_removable.contains(&key) {

core/src/state/backend.rs

@@ -71,6 +71,8 @@ pub trait Backend: Send {
     /// Check whether an account is known to be empty. Returns true if known to be
     /// empty, false otherwise.
     fn is_known_null(&self, address: &Address) -> bool;
+
+    fn force_update(&mut self, address: &Address, account: &AionVMAccount);
 }
 
 /// A raw backend used to check proofs of execution.
@@ -127,6 +129,7 @@ impl Backend for ProofCheck {
     fn get_cached_code(&self, _hash: &H256) -> Option<Arc<Vec<u8>>> { None }
     fn note_non_null_account(&self, _address: &Address) {}
     fn is_known_null(&self, _address: &Address) -> bool { false }
+    fn force_update(&mut self, _addr: &Address, _account: &AionVMAccount) {}
 }
 
 /// Proving state backend.
@@ -190,6 +193,7 @@ impl<H: AsHashStore + Send + Sync> Backend for Proving<H> {
     fn get_cached_code(&self, _: &H256) -> Option<Arc<Vec<u8>>> { None }
     fn note_non_null_account(&self, _: &Address) {}
     fn is_known_null(&self, _: &Address) -> bool { false }
+    fn force_update(&mut self, _addr: &Address, _account: &AionVMAccount) {}
 }
 
 impl<H: AsHashStore + Clone> Clone for Proving<H> {
@@ -225,4 +229,5 @@ impl<H: AsHashStore + Send + Sync> Backend for Basic<H> {
     fn get_cached_code(&self, _: &H256) -> Option<Arc<Vec<u8>>> { None }
     fn note_non_null_account(&self, _: &Address) {}
     fn is_known_null(&self, _: &Address) -> bool { false }
+    fn force_update(&mut self, _addr: &Address, _account: &AionVMAccount) {}
 }

core/src/state/mod.rs

@@ -410,6 +410,8 @@ impl<B: Backend> State<B> {
                         if let Some(value) = account.cached_storage_at(key) {
                             // println!("TT: 1");
                             return Ok(Some(value));
+                        } else if account.is_removed(key) {
+                            return Ok(None);
                         } else {
                             // storage not cached, will try local search later
                             local_account = Some(maybe_acc);
@@ -907,10 +909,18 @@ impl<B: Backend> State<B> {
                         }
                     }
                 }
+
                 if !account.is_empty() {
                     self.db.note_non_null_account(address);
                 }
             }
+
+            // TODO: I wonder whether we rely on this
+            // if let Some(ref mut account) = a.account {
+            //     if account.acc_type() == AccType::AVM {
+            //         self.db.force_update(address, account);
+            //     }
+            // }
         }
 
         {

core/src/sync/handler/broadcast.rs

@@ -180,7 +180,7 @@ pub fn handle_broadcast_block(
                         }
                         Err(e) => {
                             // ignore this batch if any invalidated header
-                            error!(target: "sync", "Invalid header: {:?}, header: {}", e, to_hex(header_rlp.as_raw()));
+                            debug!(target: "sync", "Invalid header: {:?}, header: {}", e, to_hex(header_rlp.as_raw()));
                         }
                     }
                 }

core/src/sync/handler/headers.rs

@@ -269,12 +269,12 @@ pub fn receive_res(p2p: Mgr, hash: u64, cb_in: ChannelBuffer, storage: Arc<SyncS
                 }
                 Err(e) => {
                     // ignore this batch if any invalidated header
-                    error!(target: "sync", "Invalid header: {:?}, header: {}", e, to_hex(header_rlp.as_raw()));
+                    debug!(target: "sync", "Invalid header: {:?}, header: {}", e, to_hex(header_rlp.as_raw()));
                     break;
                 }
             }
         } else {
-            error!(target: "sync", "Invalid header: {}", to_hex(header_rlp.as_raw()));
+            debug!(target: "sync", "Invalid header: {}", to_hex(header_rlp.as_raw()));
             break;
         }
     }

release

@@ -1 +1 @@
-1.0.2
+1.0.3

util/version/Cargo.toml

@@ -3,7 +3,7 @@
 [package]
 name = "aion-version"
 # NOTE: this value is used for Aion version string (via env CARGO_PKG_VERSION)
-version = "1.0.2"
+version = "1.0.3"
 authors = ["Aion Foundation <[email protected]>"]
 build = "build.rs"