From 6544d4faf1413ebf61cd3fb35ecd8855b39f5ce6 Mon Sep 17 00:00:00 2001 From: nk_ysg Date: Sat, 12 Oct 2024 10:21:06 +0800 Subject: [PATCH] refactor: move starcoin-force-upgrade --- Cargo.lock | 4 +--- Cargo.toml | 6 +++--- benchmarks/Cargo.toml | 1 - chain/Cargo.toml | 2 +- chain/open-block/Cargo.toml | 1 - chain/open-block/src/lib.rs | 7 +++---- chain/src/chain.rs | 4 ++-- chain/tests/test_force_upgrade.rs.ignored | 2 +- executor/Cargo.toml | 3 +-- executor/src/block_executor.rs | 6 +++--- {chain => vm}/force-upgrade/Cargo.toml | 5 ++++- .../src/force_upgrade_management.rs | 0 {chain => vm}/force-upgrade/src/lib.rs | 3 +++ vm/vm-runtime/src/lib.rs | 2 -- 14 files changed, 22 insertions(+), 24 deletions(-) rename {chain => vm}/force-upgrade/Cargo.toml (95%) rename vm/{vm-runtime => force-upgrade}/src/force_upgrade_management.rs (100%) rename {chain => vm}/force-upgrade/src/lib.rs (96%) diff --git a/Cargo.lock b/Cargo.lock index 3f9172f633..3434c406d2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -712,7 +712,6 @@ dependencies = [ "starcoin-storage", "starcoin-transaction-builder", "starcoin-types", - "starcoin-vm-runtime", "starcoin-vm-types", ] @@ -9855,6 +9854,7 @@ dependencies = [ "async-trait", "bcs-ext", "futures 0.3.26", + "hex", "include_dir", "parking_lot 0.12.1", "starcoin-accumulator", @@ -9867,7 +9867,6 @@ dependencies = [ "starcoin-statedb", "starcoin-storage", "starcoin-types", - "starcoin-vm-runtime", "starcoin-vm-types", "stdlib", "stest", @@ -10471,7 +10470,6 @@ dependencies = [ "starcoin-statedb", "starcoin-storage", "starcoin-types", - "starcoin-vm-runtime", "starcoin-vm-types", "stest", ] diff --git a/Cargo.toml b/Cargo.toml index 1761803000..90c08f7f00 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,7 +40,7 @@ members = [ "chain", "chain/api", "chain/open-block", - "chain/force-upgrade", + "vm/force-upgrade", "chain/mock", "chain/chain-notify", "chain/service", @@ -154,7 +154,7 @@ default-members = [ "chain", "chain/api", "chain/open-block", - "chain/force-upgrade", + "vm/force-upgrade", "chain/mock", "chain/chain-notify", "chain/service", @@ -472,7 +472,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-force-upgrade = { path = "vm/force-upgrade" } starcoin-resource-viewer = { path = "vm/resource-viewer" } starcoin-rpc-api = { path = "rpc/api" } starcoin-rpc-client = { path = "rpc/client" } diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml index a394d8e602..719d486e20 100644 --- a/benchmarks/Cargo.toml +++ b/benchmarks/Cargo.toml @@ -35,7 +35,6 @@ starcoin-state-store-api = { workspace = true } starcoin-state-tree = { workspace = true } starcoin-storage = { workspace = true } starcoin-transaction-builder = { workspace = true } -starcoin-vm-runtime = { workspace = true } starcoin-vm-types = { workspace = true } starcoin-types = { workspace = true } starcoin-executor-benchmark = { workspace = true } diff --git a/chain/Cargo.toml b/chain/Cargo.toml index 6b635e1eb4..ec844022c4 100644 --- a/chain/Cargo.toml +++ b/chain/Cargo.toml @@ -51,7 +51,7 @@ starcoin-force-upgrade = { workspace = true } [features] default = [] fuzzing = ["proptest", "proptest-derive", "starcoin-types/fuzzing"] -force-deploy = ["starcoin-vm-runtime/force-deploy", "starcoin-vm-runtime", "starcoin-executor/force-deploy"] +force-deploy = ["starcoin-force-upgrade/force-deploy", "starcoin-executor/force-deploy"] [package] authors = { workspace = true } diff --git a/chain/open-block/Cargo.toml b/chain/open-block/Cargo.toml index af463bdf3b..c0642296c2 100644 --- a/chain/open-block/Cargo.toml +++ b/chain/open-block/Cargo.toml @@ -14,7 +14,6 @@ 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] diff --git a/chain/open-block/src/lib.rs b/chain/open-block/src/lib.rs index fde4da88fe..89d9f752bf 100644 --- a/chain/open-block/src/lib.rs +++ b/chain/open-block/src/lib.rs @@ -27,11 +27,10 @@ use std::{convert::TryInto, sync::Arc}; #[cfg(feature = "force-deploy")] use { - starcoin_force_upgrade::ForceUpgrade, - starcoin_types::{account::DEFAULT_EXPIRATION_TIME, identifier::Identifier}, - starcoin_vm_runtime::force_upgrade_management::{ - get_force_upgrade_account, get_force_upgrade_block_number, + starcoin_force_upgrade::force_upgrade_management::{ + get_force_upgrade_account, get_force_upgrade_block_number, ForceUpgrade, }, + starcoin_types::{account::DEFAULT_EXPIRATION_TIME, identifier::Identifier}, starcoin_vm_types::{ access_path::AccessPath, account_config::{genesis_address, ModuleUpgradeStrategy}, diff --git a/chain/src/chain.rs b/chain/src/chain.rs index 5262d01b12..f2e208dadb 100644 --- a/chain/src/chain.rs +++ b/chain/src/chain.rs @@ -21,6 +21,8 @@ use starcoin_dag::consensusdb::consenses_state::DagState; use starcoin_dag::consensusdb::prelude::StoreError; use starcoin_dag::consensusdb::schemadb::GhostdagStoreReader; use starcoin_executor::VMMetrics; +#[cfg(feature = "force-deploy")] +use starcoin_force_upgrade::force_upgrade_management::get_force_upgrade_block_number; use starcoin_logger::prelude::*; use starcoin_open_block::OpenedBlock; use starcoin_state_api::{AccountStateReader, ChainStateReader, ChainStateWriter}; @@ -40,8 +42,6 @@ use starcoin_types::{ transaction::{SignedUserTransaction, Transaction}, U256, }; -#[cfg(feature = "force-deploy")] -use starcoin_vm_runtime::force_upgrade_management::get_force_upgrade_block_number; use starcoin_vm_types::access_path::AccessPath; use starcoin_vm_types::account_config::genesis_address; use starcoin_vm_types::genesis_config::{ChainId, ConsensusStrategy}; diff --git a/chain/tests/test_force_upgrade.rs.ignored b/chain/tests/test_force_upgrade.rs.ignored index 2ac9decbf8..df92e6629c 100644 --- a/chain/tests/test_force_upgrade.rs.ignored +++ b/chain/tests/test_force_upgrade.rs.ignored @@ -6,7 +6,7 @@ use starcoin_consensus::Consensus; use starcoin_statedb::ChainStateDB; use starcoin_transaction_builder::{build_transfer_from_association, DEFAULT_EXPIRATION_TIME}; use starcoin_types::account_address::AccountAddress; -use starcoin_vm_runtime::force_upgrade_management::get_force_upgrade_block_number; +use starcoin_force_upgrade::force_upgrade_management::get_force_upgrade_block_number; use starcoin_vm_types::genesis_config::StdlibVersion; use starcoin_vm_types::on_chain_config::Version; use starcoin_vm_types::{account_config, state_view::StateReaderExt}; diff --git a/executor/Cargo.toml b/executor/Cargo.toml index 524ac0aab1..217dbb3c9a 100644 --- a/executor/Cargo.toml +++ b/executor/Cargo.toml @@ -28,7 +28,6 @@ starcoin-transaction-builder = { workspace = true } starcoin-state-tree = { workspace = true } starcoin-statedb = { workspace = true } starcoin-vm-runtime = { workspace = true } -starcoin-force-upgrade = { workspace = true } stdlib = { workspace = true } stest = { workspace = true } tempfile = { workspace = true } @@ -38,7 +37,7 @@ move-transactional-test-runner = { workspace = true } [features] default = [] fuzzing = ["starcoin-types/fuzzing"] -force-deploy = ["starcoin-vm-runtime/force-deploy"] +force-deploy = ["starcoin-force-upgrade/force-deploy"] [package] authors = { workspace = true } diff --git a/executor/src/block_executor.rs b/executor/src/block_executor.rs index 407687092d..25978e5f90 100644 --- a/executor/src/block_executor.rs +++ b/executor/src/block_executor.rs @@ -20,12 +20,12 @@ use { crate::execute_transactions, anyhow::bail, log::info, + starcoin_force_upgrade::force_upgrade_management::{ + get_force_upgrade_account, get_force_upgrade_block_number, + }, starcoin_force_upgrade::ForceUpgrade, starcoin_types::account::DEFAULT_EXPIRATION_TIME, starcoin_types::identifier::Identifier, - starcoin_vm_runtime::force_upgrade_management::{ - get_force_upgrade_account, get_force_upgrade_block_number, - }, starcoin_vm_types::{ access_path::AccessPath, account_config::{genesis_address, ModuleUpgradeStrategy}, diff --git a/chain/force-upgrade/Cargo.toml b/vm/force-upgrade/Cargo.toml similarity index 95% rename from chain/force-upgrade/Cargo.toml rename to vm/force-upgrade/Cargo.toml index 9a4a06fe2f..8dddaa3a92 100644 --- a/chain/force-upgrade/Cargo.toml +++ b/vm/force-upgrade/Cargo.toml @@ -25,11 +25,14 @@ 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 } stdlib = { workspace = true } include_dir = { workspace = true } +hex = "0.4.3" [dev-dependencies] starcoin-genesis = { workspace = true } stest = { workspace = true } + +[features] +force-deploy = [] diff --git a/vm/vm-runtime/src/force_upgrade_management.rs b/vm/force-upgrade/src/force_upgrade_management.rs similarity index 100% rename from vm/vm-runtime/src/force_upgrade_management.rs rename to vm/force-upgrade/src/force_upgrade_management.rs diff --git a/chain/force-upgrade/src/lib.rs b/vm/force-upgrade/src/lib.rs similarity index 96% rename from chain/force-upgrade/src/lib.rs rename to vm/force-upgrade/src/lib.rs index e2a6672eb9..5a9ed191f8 100644 --- a/chain/force-upgrade/src/lib.rs +++ b/vm/force-upgrade/src/lib.rs @@ -18,6 +18,9 @@ use starcoin_vm_types::{ }; use stdlib::COMPILED_MOVE_CODE_DIR; +#[cfg(feature = "force-deploy")] +pub mod force_upgrade_management; + pub struct ForceUpgrade; impl ForceUpgrade { diff --git a/vm/vm-runtime/src/lib.rs b/vm/vm-runtime/src/lib.rs index 5d047a6df3..a4b66c7e81 100644 --- a/vm/vm-runtime/src/lib.rs +++ b/vm/vm-runtime/src/lib.rs @@ -11,8 +11,6 @@ use move_core_types::vm_status::VMStatus; pub use move_vm_runtime::{move_vm, session}; mod access_path_cache; mod errors; -#[cfg(feature = "force-deploy")] -pub mod force_upgrade_management; pub mod move_vm_ext; pub mod parallel_executor; mod verifier;