Merge branch 'master' into v2.0-testnet

Conflux-Chain · Feb 27, 2024 · e39032d · e39032d
2 parents f0988c7 + b518e3e
commit e39032d
Show file tree

Hide file tree

Showing 6 changed files with 286 additions and 280 deletions.
diff --git a/core/executor/src/state/state_object/collateral.rs b/core/executor/src/state/state_object/collateral.rs
@@ -100,6 +100,7 @@ impl State {
         let prop: U256 = self.storage_point_prop()?;
         let mut account =
             self.write_account_or_new_lock(&address.with_native_space())?;
+        return_if!(!account.is_contract());
         return_if!(account.is_cip_107_initialized());
 
         let (from_balance, from_collateral) = account.initialize_cip107(prop);

diff --git a/core/src/pos/consensus/consensus_provider.rs b/core/src/pos/consensus/consensus_provider.rs
@@ -19,7 +19,7 @@ use diem_types::{
     account_address::AccountAddress, on_chain_config::OnChainConfigPayload,
     transaction::SignedTransaction,
 };
-use executor::{vm::FakeVM, Executor};
+use executor::{vm::PosVM, Executor};
 use storage_interface::DbReader;
 
 use crate::pos::{
@@ -74,7 +74,7 @@ pub fn start_consensus(
         runtime.handle().clone(),
         consensus_db.clone(),
     ));
-    let executor = Box::new(Executor::<FakeVM>::new(
+    let executor = Box::new(Executor::<PosVM>::new(
         db_with_cache,
         pow_handler.clone(),
         consensus_db.clone() as Arc<dyn LedgerBlockRW>,