update genesis config (starcoinorg#2960)

- update halley vm config.
- add a diff when submit vm config proposal

Author: nanne007

Cargo.lock

@@ -54,6 +54,7 @@ starcoin-network-rpc-api = {path = "../../network-rpc/api"}
 short-hex-str = { git = "https://github.com/starcoinorg/diem", rev="6ff224f42a408f584acbcd37eebac14de619b16f"  }
 starcoin-abi-decoder = {path = "../../abi/decoder"}
 starcoin-abi-types = {path = "../../abi/types"}
+move-command-line-common = {git = "https://github.com/starcoinorg/diem", rev="6ff224f42a408f584acbcd37eebac14de619b16f" }
 
 [dev-dependencies]
 test-helper= {path = "../../test-helper"}

cmd/starcoin/Cargo.toml

@@ -6,9 +6,12 @@ use crate::dev::sign_txn_helper::get_dao_config;
 use crate::view::{ExecuteResultView, TransactionOptions};
 use crate::StarcoinOpt;
 use anyhow::Result;
+use move_command_line_common::testing::format_diff;
 use scmd::{CommandAction, ExecContext};
 use starcoin_config::BuiltinNetworkID;
+use starcoin_rpc_client::StateRootOption;
 use starcoin_transaction_builder::build_vm_config_upgrade_proposal;
+use starcoin_vm_types::on_chain_config::{OnChainConfig, VMConfig};
 use starcoin_vm_types::transaction::TransactionPayload;
 use structopt::StructOpt;
 
@@ -41,6 +44,18 @@ impl CommandAction for UpgradeVMConfigProposalCommand {
         let opt = ctx.opt();
 
         let genesis_config = opt.net.genesis_config().clone();
+        let onchain_vm_config = {
+            let client = ctx.state().client();
+            let reader = client.state_reader(StateRootOption::Latest)?;
+            VMConfig::fetch_config(&reader)?.unwrap()
+        };
+        let diff = {
+            let current_config = serde_json::to_string_pretty(&onchain_vm_config)?;
+            let new_config = serde_json::to_string_pretty(&genesis_config.vm_config)?;
+            format_diff(current_config, new_config)
+        };
+        println!("{}", diff);
+
         let min_action_delay = get_dao_config(ctx.state())?.min_action_delay;
         let vm_config_upgrade_proposal =
             build_vm_config_upgrade_proposal(genesis_config.vm_config, min_action_delay);

cmd/starcoin/src/dev/upgrade_vm_config_proposal_cmd.rs

@@ -1 +1 @@
-{"genesis_block_parameter":{"Static":{"parent_hash":"0xc8a9a33364a451f6cfe088c000a2b38626974fc9a242d8633a8b54530dd939d7","timestamp":1616415168000,"difficulty":"0x64"}},"version":{"major":1},"reward_delay":3,"pre_mine_amount":159256800000000000,"time_mint_amount":477770400000000000,"time_mint_period":2678400,"vm_config":{"gas_schedule":{"instruction_table":[{"instruction_gas":1,"memory_gas":1},{"instruction_gas":638,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":2,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1132,"memory_gas":1},{"instruction_gas":2,"memory_gas":1},{"instruction_gas":2,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":3,"memory_gas":1},{"instruction_gas":2,"memory_gas":1},{"instruction_gas":2,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":2,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":2,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":41,"memory_gas":1},{"instruction_gas":21,"memory_gas":1},{"instruction_gas":23,"memory_gas":1},{"instruction_gas":459,"memory_gas":1},{"instruction_gas":13,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":2,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":2,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":582,"memory_gas":1},{"instruction_gas":2,"memory_gas":1},{"instruction_gas":2,"memory_gas":1},{"instruction_gas":34,"memory_gas":1},{"instruction_gas":15,"memory_gas":1},{"instruction_gas":14,"memory_gas":1},{"instruction_gas":13,"memory_gas":1},{"instruction_gas":27,"memory_gas":1}],"native_table":[{"instruction_gas":21,"memory_gas":1},{"instruction_gas":64,"memory_gas":1},{"instruction_gas":61,"memory_gas":1},{"instruction_gas":3351,"memory_gas":1},{"instruction_gas":181,"memory_gas":1},{"instruction_gas":98,"memory_gas":1},{"instruction_gas":84,"memory_gas":1},{"instruction_gas":1334,"memory_gas":1},{"instruction_gas":1902,"memory_gas":1},{"instruction_gas":53,"memory_gas":1},{"instruction_gas":227,"memory_gas":1},{"instruction_gas":572,"memory_gas":1},{"instruction_gas":1436,"memory_gas":1},{"instruction_gas":26,"memory_gas":1},{"instruction_gas":353,"memory_gas":1},{"instruction_gas":24,"memory_gas":1},{"instruction_gas":212,"memory_gas":1},{"instruction_gas":52,"memory_gas":1},{"instruction_gas":26,"memory_gas":1},{"instruction_gas":2002,"memory_gas":1},{"instruction_gas":64,"memory_gas":1}],"gas_constants":{"global_memory_per_byte_cost":4,"global_memory_per_byte_write_cost":9,"min_transaction_gas_units":600,"large_transaction_cutoff":600,"intrinsic_gas_per_byte":8,"maximum_number_of_gas_units":40000000,"min_price_per_gas_unit":1,"max_price_per_gas_unit":10000,"max_transaction_size_in_bytes":60000,"gas_unit_scaling_factor":1,"default_account_size":800}}},"publishing_option":{"script_allowed":true,"module_publishing_allowed":true},"consensus_config":{"uncle_rate_target":240,"base_block_time_target":10000,"base_reward_per_block":10000000000,"base_reward_per_uncle_percent":10,"epoch_block_count":240,"base_block_difficulty_window":24,"min_block_time_target":5000,"max_block_time_target":60000,"base_max_uncles_per_block":2,"base_block_gas_limit":50000000,"strategy":3},"association_key_pair":[null,"0xfde53c76807c8a5ec5855ed6200868be8653c34a0f18c6b01f60040ead5daa87b1157be91c2637b709c09ed5d420976c0d4df79537372d69a272fc4869c1364ce3700a1ed3f00ea87c015028cd4a03a4881f6fe203b02f7059db906b764cd23202"],"genesis_key_pair":null,"stdlib_version":"Latest","dao_config":{"voting_delay":60000,"voting_period":3600000,"voting_quorum_rate":4,"min_action_delay":3600000},"time_service_type":"RealTimeService","transaction_timeout":86400}
+{"genesis_block_parameter":{"Static":{"parent_hash":"0xc8a9a33364a451f6cfe088c000a2b38626974fc9a242d8633a8b54530dd939d7","timestamp":1616415168000,"difficulty":"0x64"}},"version":{"major":1},"reward_delay":3,"pre_mine_amount":159256800000000000,"time_mint_amount":477770400000000000,"time_mint_period":2678400,"vm_config":{"gas_schedule":{"instruction_table":[{"instruction_gas":1,"memory_gas":1},{"instruction_gas":638,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":2,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1132,"memory_gas":1},{"instruction_gas":2,"memory_gas":1},{"instruction_gas":2,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":3,"memory_gas":1},{"instruction_gas":2,"memory_gas":1},{"instruction_gas":2,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":2,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":2,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":41,"memory_gas":1},{"instruction_gas":21,"memory_gas":1},{"instruction_gas":23,"memory_gas":1},{"instruction_gas":459,"memory_gas":1},{"instruction_gas":13,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":2,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":2,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":1,"memory_gas":1},{"instruction_gas":582,"memory_gas":1},{"instruction_gas":2,"memory_gas":1},{"instruction_gas":2,"memory_gas":1},{"instruction_gas":34,"memory_gas":1},{"instruction_gas":15,"memory_gas":1},{"instruction_gas":14,"memory_gas":1},{"instruction_gas":13,"memory_gas":1},{"instruction_gas":27,"memory_gas":1}],"native_table":[{"instruction_gas":21,"memory_gas":1},{"instruction_gas":64,"memory_gas":1},{"instruction_gas":61,"memory_gas":1},{"instruction_gas":3351,"memory_gas":1},{"instruction_gas":181,"memory_gas":1},{"instruction_gas":98,"memory_gas":1},{"instruction_gas":84,"memory_gas":1},{"instruction_gas":1334,"memory_gas":1},{"instruction_gas":1902,"memory_gas":1},{"instruction_gas":53,"memory_gas":1},{"instruction_gas":227,"memory_gas":1},{"instruction_gas":572,"memory_gas":1},{"instruction_gas":1436,"memory_gas":1},{"instruction_gas":26,"memory_gas":1},{"instruction_gas":353,"memory_gas":1},{"instruction_gas":24,"memory_gas":1},{"instruction_gas":212,"memory_gas":1},{"instruction_gas":52,"memory_gas":1},{"instruction_gas":26,"memory_gas":1},{"instruction_gas":2002,"memory_gas":1},{"instruction_gas":64,"memory_gas":1}],"gas_constants":{"global_memory_per_byte_cost":4,"global_memory_per_byte_write_cost":9,"min_transaction_gas_units":600,"large_transaction_cutoff":600,"intrinsic_gas_per_byte":8,"maximum_number_of_gas_units":40000000,"min_price_per_gas_unit":1,"max_price_per_gas_unit":10000,"max_transaction_size_in_bytes":131072,"gas_unit_scaling_factor":1,"default_account_size":800}}},"publishing_option":{"script_allowed":true,"module_publishing_allowed":true},"consensus_config":{"uncle_rate_target":240,"base_block_time_target":10000,"base_reward_per_block":10000000000,"base_reward_per_uncle_percent":10,"epoch_block_count":240,"base_block_difficulty_window":24,"min_block_time_target":5000,"max_block_time_target":60000,"base_max_uncles_per_block":2,"base_block_gas_limit":50000000,"strategy":3},"association_key_pair":[null,"0xfde53c76807c8a5ec5855ed6200868be8653c34a0f18c6b01f60040ead5daa87b1157be91c2637b709c09ed5d420976c0d4df79537372d69a272fc4869c1364ce3700a1ed3f00ea87c015028cd4a03a4881f6fe203b02f7059db906b764cd23202"],"genesis_key_pair":null,"stdlib_version":"Latest","dao_config":{"voting_delay":60000,"voting_period":3600000,"voting_quorum_rate":4,"min_action_delay":3600000},"time_service_type":"RealTimeService","transaction_timeout":86400}

config/example/halley/genesis_config.json

@@ -699,7 +699,6 @@ pub static BASE_BLOCK_GAS_LIMIT: u64 = 50_000_000; //must big than maximum_numbe
 
 pub static MAX_TRANSACTION_SIZE_IN_BYTES: u64 = 4096 * 10;
 pub static MAX_TRANSACTION_SIZE_IN_BYTES_V2: u64 = 60000;
-pub static MAX_TRANSACTION_SIZE_IN_BYTES_V3: u64 = 4096 * 32; // 128k
 
 /// For V1 all accounts will be ~800 bytes
 static DEFAULT_ACCOUNT_SIZE: Lazy<AbstractMemorySize<GasCarrier>> =
@@ -751,7 +750,7 @@ pub static TEST_GAS_CONSTANTS: Lazy<GasConstants> = Lazy::new(|| {
         maximum_number_of_gas_units: GasUnits::new(40_000_000), //must less than base_block_gas_limit
         min_price_per_gas_unit: GasPrice::new(0),
         max_price_per_gas_unit: GasPrice::new(10_000),
-        max_transaction_size_in_bytes: MAX_TRANSACTION_SIZE_IN_BYTES_V3, // to pass stdlib_upgrade
+        max_transaction_size_in_bytes: 4096 * 32, // 128k, to pass stdlib_upgrade
         gas_unit_scaling_factor: 1,
         default_account_size: *DEFAULT_ACCOUNT_SIZE,
     }
@@ -891,7 +890,23 @@ pub static HALLEY_CONFIG: Lazy<GenesisConfig> = Lazy::new(|| {
         time_mint_amount: DEFAULT_TIME_LOCKED_AMOUNT.scaling(),
         time_mint_period: 3600 * 24 * 31,
         vm_config: VMConfig {
-            gas_schedule: INITIAL_GAS_SCHEDULE.clone(),
+            gas_schedule: CostTable {
+                instruction_table: initial_instruction_table(),
+                native_table: initial_native_table(),
+                gas_constants: GasConstants {
+                    global_memory_per_byte_cost: InternalGasUnits::new(4),
+                    global_memory_per_byte_write_cost: InternalGasUnits::new(9),
+                    min_transaction_gas_units: InternalGasUnits::new(600),
+                    large_transaction_cutoff: *LARGE_TRANSACTION_CUTOFF,
+                    intrinsic_gas_per_byte: InternalGasUnits::new(8),
+                    maximum_number_of_gas_units: GasUnits::new(40_000_000), //must less than base_block_gas_limit
+                    min_price_per_gas_unit: GasPrice::new(1),
+                    max_price_per_gas_unit: GasPrice::new(10_000),
+                    max_transaction_size_in_bytes: 4096 * 32, // 128k
+                    gas_unit_scaling_factor: 1,
+                    default_account_size: *DEFAULT_ACCOUNT_SIZE,
+                }
+            },
         },
         publishing_option: TransactionPublishOption::open(),
         consensus_config: ConsensusConfig {