Force deploy

Cargo.toml

@@ -40,6 +40,7 @@ members = [
     "chain",
     "chain/api",
     "chain/open-block",
+    "chain/force-upgrade",
     "chain/mock",
     "chain/chain-notify",
     "chain/service",
@@ -152,6 +153,7 @@ default-members = [
     "chain",
     "chain/api",
     "chain/open-block",
+    "chain/force-upgrade",
     "chain/mock",
     "chain/chain-notify",
     "chain/service",
@@ -442,7 +444,7 @@ starcoin-crypto = { git = "https://github.com/starcoinorg/starcoin-crypto", rev
 starcoin-decrypt = { path = "commons/decrypt" }
 starcoin-dev = { path = "vm/dev" }
 starcoin-executor = { path = "executor" }
-starcoin-framework = { git = "https://github.com/starcoinorg/starcoin-framework", rev = "345a3900a0064dc57a9560235bc72c12f03448b1" }
+starcoin-framework = { git = "https://github.com/starcoinorg/starcoin-framework", rev = "82270f389e91418321b0dd8785d63ee9d0470505" }
 starcoin-genesis = { path = "genesis" }
 starcoin-logger = { path = "commons/logger" }
 starcoin-metrics = { path = "commons/metrics" }
@@ -460,6 +462,7 @@ starcoin-network-rpc-api = { path = "network-rpc/api" }
 starcoin-node = { path = "node" }
 starcoin-node-api = { path = "node/api" }
 starcoin-open-block = { path = "chain/open-block" }
+starcoin-force-upgrade = { path = "chain/force-upgrade" }
 starcoin-resource-viewer = { path = "vm/resource-viewer" }
 starcoin-rpc-api = { path = "rpc/api" }
 starcoin-rpc-client = { path = "rpc/client" }

chain/Cargo.toml

@@ -21,6 +21,8 @@ starcoin-statedb = { workspace = true }
 starcoin-time-service = { workspace = true }
 starcoin-types = { package = "starcoin-types", workspace = true }
 starcoin-vm-types = { workspace = true }
+starcoin-vm-runtime = { workspace = true }
+starcoin-force-upgrade = { workspace = true }
 starcoin-storage = { workspace = true }
 thiserror = { workspace = true }
 once_cell = { workspace = true }
@@ -41,6 +43,7 @@ stdlib = { workspace = true }
 stest = { workspace = true }
 test-helper = { workspace = true }
 tokio = { features = ["full"], workspace = true }
+starcoin-force-upgrade = { workspace = true }
 
 [features]
 default = []

chain/force-upgrade/Cargo.toml

@@ -0,0 +1,34 @@
+[package]
+authors = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
+name = "starcoin-force-upgrade"
+publish = { workspace = true }
+version = "1.13.10"
+homepage = { workspace = true }
+repository = { workspace = true }
+rust-version = { workspace = true }
+
+
+[dependencies]
+anyhow = { workspace = true }
+async-trait = { workspace = true }
+bcs-ext = { package = "bcs-ext", workspace = true }
+starcoin-crypto = { workspace = true }
+futures = { workspace = true }
+starcoin-logger = { workspace = true }
+parking_lot = { workspace = true }
+starcoin-accumulator = { workspace = true }
+starcoin-chain-api = { workspace = true }
+starcoin-state-api = { workspace = true }
+starcoin-statedb = { workspace = true }
+starcoin-storage = { workspace = true }
+starcoin-types = { workspace = true }
+starcoin-vm-types = { workspace = true }
+starcoin-vm-runtime = { workspace = true }
+starcoin-move-compiler = { workspace = true }
+include_dir = { workspace = true }
+
+[dev-dependencies]
+starcoin-genesis = { workspace = true }
+stest = { workspace = true }

chain/force-upgrade/src/lib.rs

@@ -0,0 +1,45 @@
+use anyhow::format_err;
+
+use starcoin_types::{
+    account::{Account, DEFAULT_MAX_GAS_AMOUNT},
+    transaction::SignedUserTransaction,
+};
+
+use include_dir::{include_dir, Dir};
+use starcoin_vm_types::{
+    account_config::STC_TOKEN_CODE_STR,
+    genesis_config::ChainId,
+    transaction::{Package, RawUserTransaction, TransactionPayload},
+};
+
+pub const FORCE_UPGRADE_PACKAGE: Dir = include_dir!("package");
+
+pub struct ForceUpgrade;
+
+impl ForceUpgrade {
+    pub fn force_deploy_txn(
+        account: Account,
+        sequence_number: u64,
+        chain_id: &ChainId,
+    ) -> anyhow::Result<SignedUserTransaction> {
+        let package_file = "stdlib.blob".to_string();
+        let package = FORCE_UPGRADE_PACKAGE
+            .get_file(package_file.clone())
+            .map(|file| {
+                bcs_ext::from_bytes::<Package>(file.contents())
+                    .expect("Decode package should success")
+            })
+            .ok_or_else(|| format_err!("Can not find upgrade package {}", package_file))?;
+
+        Ok(account.sign_txn(RawUserTransaction::new(
+            account.address().clone(),
+            sequence_number,
+            TransactionPayload::Package(package),
+            DEFAULT_MAX_GAS_AMOUNT,
+            1,
+            3600,
+            chain_id.clone(),
+            STC_TOKEN_CODE_STR.to_string(),
+        )))
+    }
+}

chain/open-block/Cargo.toml

@@ -13,6 +13,9 @@ starcoin-state-api = { workspace = true }
 starcoin-statedb = { workspace = true }
 starcoin-storage = { workspace = true }
 starcoin-types = { workspace = true }
+starcoin-vm-types = { workspace = true }
+starcoin-vm-runtime = { workspace = true }
+starcoin-force-upgrade = { workspace = true }
 
 [dev-dependencies]
 starcoin-genesis = { workspace = true }

chain/open-block/src/lib.rs

@@ -6,6 +6,7 @@ use starcoin_accumulator::{node::AccumulatorStoreType, Accumulator, MerkleAccumu
 use starcoin_chain_api::ExcludedTxns;
 use starcoin_crypto::HashValue;
 use starcoin_executor::{execute_block_transactions, execute_transactions, VMMetrics};
+use starcoin_force_upgrade::ForceUpgrade;
 use starcoin_logger::prelude::*;
 use starcoin_state_api::{ChainStateReader, ChainStateWriter};
 use starcoin_statedb::ChainStateDB;
@@ -23,6 +24,13 @@ use starcoin_types::{
     },
     U256,
 };
+use starcoin_vm_runtime::force_upgrade_data_cache::{
+    get_force_upgrade_account, get_force_upgrade_block_number,
+};
+use starcoin_vm_types::access_path::AccessPath;
+use starcoin_vm_types::account_config::{genesis_address, ModuleUpgradeStrategy};
+use starcoin_vm_types::move_resource::MoveResource;
+use starcoin_vm_types::state_view::StateReaderExt;
 use std::{convert::TryInto, sync::Arc};
 
 pub struct OpenedBlock {
@@ -40,6 +48,7 @@ pub struct OpenedBlock {
     difficulty: U256,
     strategy: ConsensusStrategy,
     vm_metrics: Option<VMMetrics>,
+    extra_txn: Option<SignedUserTransaction>,
 }
 
 impl OpenedBlock {
@@ -77,11 +86,23 @@ impl OpenedBlock {
             chain_id,
             previous_header.gas_used(),
         );
+
+        let extra_txn = if block_meta.number() == get_force_upgrade_block_number(&chain_id) {
+            let account = get_force_upgrade_account(&chain_id)?;
+            let seqence_number = chain_state.get_sequence_number(account.address().clone())?;
+            Some(ForceUpgrade::force_deploy_txn(
+                account,
+                seqence_number,
+                &chain_id,
+            )?)
+        } else {
+            None
+        };
+
         let mut opened_block = Self {
             previous_block_info: block_info,
             block_meta,
             gas_limit: block_gas_limit,
-
             state: chain_state,
             txn_accumulator,
             gas_used: 0,
@@ -91,7 +112,9 @@ impl OpenedBlock {
             difficulty,
             strategy,
             vm_metrics,
+            extra_txn,
         };
+
         opened_block.initialize()?;
         Ok(opened_block)
     }
@@ -131,6 +154,14 @@ impl OpenedBlock {
         &self.state
     }
 
+    pub fn state_writer(&self) -> &impl ChainStateWriter {
+        &self.state
+    }
+
+    pub fn chain_id(&self) -> ChainId {
+        self.chain_id
+    }
+
     /// Try to add `user_txns` into this block.
     /// Return any txns  not included, either txn is discarded, or block gas limit is reached.
     /// If error occurs during the processing, the `open_block` should be dropped,
@@ -198,6 +229,7 @@ impl OpenedBlock {
                 }
             };
         }
+
         Ok(ExcludedTxns {
             discarded_txns: discard_txns,
             untouched_txns: untouched_user_txns,
@@ -271,6 +303,8 @@ impl OpenedBlock {
 
     /// Construct a block template for mining.
     pub fn finalize(self) -> Result<BlockTemplate> {
+        self.execute_extra_txn()?;
+
         let accumulator_root = self.txn_accumulator.root_hash();
         let state_root = self.state.state_root();
         let uncles = if !self.uncles.is_empty() {
@@ -294,7 +328,47 @@ impl OpenedBlock {
         );
         Ok(block_template)
     }
+
+    /// The logic for handling the forced upgrade will be processed.
+    /// First, set the account policy in `0x1::PackageTxnManager` to 100,
+    /// Second, after the contract deployment is successful, revert it back.
+    fn execute_extra_txn(&self) -> Result<()> {
+        if self.extra_txn.is_none() {
+            return Ok(());
+        }
+
+        let gas_left = self.gas_limit.checked_sub(self.gas_used).ok_or_else(|| {
+            format_err!(
+                "block gas_used {} exceed block gas_limit:{}",
+                self.gas_used,
+                self.gas_limit
+            )
+        })?;
+
+        let strategy_path = AccessPath::resource_access_path(
+            genesis_address(),
+            ModuleUpgradeStrategy::struct_tag(),
+        );
+
+        // Set strategy to 100
+        self.state.set(&strategy_path, vec![100])?;
+
+        execute_block_transactions(
+            &self.state,
+            vec![Transaction::UserTransaction(
+                self.extra_txn.as_ref().unwrap().clone(),
+            )],
+            gas_left,
+            self.vm_metrics.clone(),
+        )?;
+
+        // Set strategy to 1
+        self.state.set(&strategy_path, vec![1])?;
+
+        Ok(())
+    }
 }
+
 pub struct AddressFilter;
 //static BLACKLIST: [&str; 0] = [];
 impl AddressFilter {