[FlexiDAG] fix force upgrade test

Cargo.toml

@@ -451,7 +451,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 = "2966e3f6a04aef43a0e29e0cfc04d2d11290716d" }
+starcoin-framework = { git = "https://github.com/starcoinorg/starcoin-framework", rev = "85a333bb1d12331581a8cd03a8b661f37101bf64" }
 starcoin-genesis = { path = "genesis" }
 starcoin-logger = { path = "commons/logger" }
 starcoin-metrics = { path = "commons/metrics" }

chain/src/chain.rs

@@ -1247,8 +1247,9 @@ impl BlockChain {
         verify_block!(
             VerifyBlockField::State,
             state_root == header.state_root(),
-            "verify legacy block:{:?} state_root fail",
+            "verify legacy block:{:?} state_root fail, executed_accumulator_root:{:?}, header.txn_accumulator_root(): {:?}",
             block_id,
+            state_root, header.txn_accumulator_root()
         );
         let block_gas_used = vec_transaction_info
             .iter()
@@ -1283,7 +1284,8 @@ impl BlockChain {
         verify_block!(
             VerifyBlockField::State,
             executed_accumulator_root == header.txn_accumulator_root(),
-            "verify block: txn accumulator root mismatch"
+            "verify block: txn accumulator root mismatch! executed_accumulator_root: {:?}, header.txn_accumulator_root(): {:?} ",
+            executed_accumulator_root, header.txn_accumulator_root()
         );
 
         watch(CHAIN_WATCH_NAME, "n23");

chain/tests/test_force_upgrade.rs.bak → chain/tests/test_force_upgrade.rs

@@ -13,11 +13,33 @@ use starcoin_vm_types::{account_config, state_view::StateReaderExt};
 use std::str::FromStr;
 use test_helper::executor::get_balance;
 
+#[stest::test]
+pub fn test_force_upgrade_generate_block() -> anyhow::Result<()> {
+    let mut genesis_config = BuiltinNetworkID::Test.genesis_config().clone();
+    genesis_config.stdlib_version = StdlibVersion::Version(11);
+    let net = ChainNetwork::new(
+        BuiltinNetworkID::Test.into(),
+        genesis_config,
+    );
+
+    let force_upgrade_height = get_force_upgrade_block_number(&net.chain_id());
+    assert!(force_upgrade_height >= 2);
+    let initial_blocks = force_upgrade_height - 2;
+
+    let block_chain = test_helper::gen_blockchain_with_blocks_for_test(initial_blocks, &net)?;
+    assert_eq!(block_chain.current_header().number(), initial_blocks);
+
+    Ok(())
+}
+
 #[stest::test]
 pub fn test_force_upgrade_1() -> anyhow::Result<()> {
     let mut genesis_config = BuiltinNetworkID::Test.genesis_config().clone();
     genesis_config.stdlib_version = StdlibVersion::Version(11);
-    let net = ChainNetwork::new(BuiltinNetworkID::Test.into(), genesis_config);
+    let net = ChainNetwork::new(
+        BuiltinNetworkID::Test.into(),
+        genesis_config,
+    );
 
     let force_upgrade_height = get_force_upgrade_block_number(&net.chain_id());
     assert!(force_upgrade_height >= 2);

config/src/genesis_config.rs

@@ -757,7 +757,7 @@ pub static G_TEST_CONFIG: Lazy<GenesisConfig> = Lazy::new(|| {
         ),
         genesis_key_pair: Some((Arc::new(genesis_private_key), genesis_public_key)),
         time_service_type: TimeServiceType::MockTimeService,
-        stdlib_version: StdlibVersion::Version(12),
+        stdlib_version: StdlibVersion::Latest,
         dao_config: DaoConfig {
             voting_delay: 60_000,          // 1min
             voting_period: 60 * 60 * 1000, // 1h
@@ -775,7 +775,7 @@ pub static G_DEV_CONFIG: Lazy<GenesisConfig> = Lazy::new(|| {
     let mut gas_constant = G_TEST_GAS_CONSTANTS.clone();
     gas_constant.min_price_per_gas_unit = 1;
 
-    let stdlib_version = StdlibVersion::Version(12);
+    let stdlib_version = StdlibVersion::Latest;
     GenesisConfig {
         genesis_block_parameter: GenesisBlockParameterConfig::Static(GenesisBlockParameter {
             parent_hash: HashValue::sha3_256_of(b"starcoin_dev"),

scripts/build_stdlib.sh

@@ -33,4 +33,7 @@ for arg in "${args[@]}"; do
     cmd+=" --arg ${arg}"
 done
 
-eval $cmd
+eval $cmd
+
+# build genesises
+cargo run --bin starcoin-genesis

vm/vm-runtime/src/force_upgrade_management.rs

@@ -9,7 +9,7 @@ pub const FORCE_UPGRADE_BLOCK_NUMBER: u64 = 17500000;
 
 pub fn get_force_upgrade_block_number(chain_id: &ChainId) -> u64 {
     if chain_id.is_test() {
-        50
+        10
     } else if chain_id.is_dev() {
         60
     } else if chain_id.is_halley() || chain_id.is_proxima() {