diff --git a/Cargo.lock b/Cargo.lock index 903b39535..5c22fa88e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7544,7 +7544,7 @@ dependencies = [ [[package]] name = "pallet-ecdsa-claims" -version = "0.3.3" +version = "0.3.4" dependencies = [ "frame-support", "frame-system", @@ -8222,7 +8222,7 @@ dependencies = [ [[package]] name = "pallet-transaction-pause" -version = "0.3.3" +version = "0.3.4" dependencies = [ "frame-support", "frame-system", @@ -13603,7 +13603,7 @@ dependencies = [ [[package]] name = "tangle-primitives" -version = "0.3.3" +version = "0.3.4" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -13614,7 +13614,7 @@ dependencies = [ [[package]] name = "tangle-standalone" -version = "0.3.3" +version = "0.3.4" dependencies = [ "clap 4.3.11", "dkg-gadget", @@ -13683,7 +13683,7 @@ dependencies = [ [[package]] name = "tangle-standalone-runtime" -version = "0.3.3" +version = "0.3.4" dependencies = [ "dkg-runtime-primitives", "fp-account", diff --git a/Cargo.toml b/Cargo.toml index 6075ec318..70ea72aca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace.package] -version = "0.3.3" +version = "0.3.4" authors = ["Webb Technologies Inc."] edition = "2021" license = "Unlicense" diff --git a/standalone/node/src/chain_spec.rs b/standalone/node/src/chain_spec.rs index 143545a5a..c9e75ba4e 100644 --- a/standalone/node/src/chain_spec.rs +++ b/standalone/node/src/chain_spec.rs @@ -677,6 +677,36 @@ fn testnet_genesis( code: vec![0x00], }, ); + map.insert( + H160::from_str("46Bf9B20A8144BaA7C2BB76303b6a17eB8755408") + .expect("internal H160 is valid; qed"), + fp_evm::GenesisAccount { + nonce: U256::from(1), + balance: U256::from(1_000_000_000_000_000_000_000_000u128), + storage: Default::default(), + code: vec![0x00], + }, + ); + map.insert( + H160::from_str("bFAc59575FeC3d1b33C7685eE6b3a2BfC155bdF3") + .expect("internal H160 is valid; qed"), + fp_evm::GenesisAccount { + nonce: U256::from(1), + balance: U256::from(1_000_000_000_000_000_000_000_000u128), + storage: Default::default(), + code: vec![0x00], + }, + ); + map.insert( + H160::from_str("c65351122A5dc7881559DeE52e025678212C615C") + .expect("internal H160 is valid; qed"), + fp_evm::GenesisAccount { + nonce: U256::from(1), + balance: U256::from(1_000_000_000_000_000_000_000_000u128), + storage: Default::default(), + code: vec![0x00], + }, + ); map.insert( H160::from_str("2ecceed83d6d2908cf4d67c76984e0bbcbfebbc1") .expect("internal H160 is valid; qed"), diff --git a/standalone/node/src/command.rs b/standalone/node/src/command.rs index 58ed6e1fc..7a2907ec6 100644 --- a/standalone/node/src/command.rs +++ b/standalone/node/src/command.rs @@ -51,15 +51,15 @@ impl SubstrateCli for Cli { fn load_spec(&self, id: &str) -> Result, String> { Ok(match id { - "dev" => Box::new(chain_spec::development_config(3884533460)?), - "relayer" => Box::new(chain_spec::relayer_testnet_config(3884533460)?), - "" | "local" => Box::new(chain_spec::local_testnet_config(3884533460)?), + "dev" => Box::new(chain_spec::development_config(4006)?), + "relayer" => Box::new(chain_spec::relayer_testnet_config(4006)?), + "" | "local" => Box::new(chain_spec::local_testnet_config(4006)?), // generates the standalone spec for testing locally - "standalone-local" => Box::new(chain_spec::standalone_local_config(3884533460)?), + "standalone-local" => Box::new(chain_spec::standalone_local_config(4006)?), // generates the standalone spec for testnet - "standalone-alpha" => Box::new(chain_spec::standalone_testnet_config(3884533460)?), + "standalone-alpha" => Box::new(chain_spec::standalone_testnet_config(4006)?), // generates the standalone spec for longterm testnet - "standalone" => Box::new(chain_spec::standalone_live_config(3884533460)?), + "standalone" => Box::new(chain_spec::standalone_live_config(4006)?), path => Box::new(chain_spec::ChainSpec::from_json_file(std::path::PathBuf::from(path))?), }) diff --git a/standalone/runtime/src/frontier_evm.rs b/standalone/runtime/src/frontier_evm.rs index a472b9677..51fe1f678 100644 --- a/standalone/runtime/src/frontier_evm.rs +++ b/standalone/runtime/src/frontier_evm.rs @@ -110,9 +110,7 @@ impl pallet_evm_precompile_proxy::EvmProxyCallFilter for ProxyType { /// Current approximation of the gas/s consumption considering /// EVM execution over compiled WASM (on 4.4Ghz CPU). -/// Given the 500ms Weight, from which 75% only are used for transactions, -/// the total EVM execution gas limit is: GAS_PER_SECOND * 0.500 * 0.75 ~= 15_000_000. -pub const GAS_PER_SECOND: u64 = 40_000_000; +pub const GAS_PER_SECOND: u64 = 400_000_000; /// Approximate ratio of the amount of Weight per Gas. /// u64 works for approximations because Weight is a very small unit compared to gas. diff --git a/standalone/runtime/src/lib.rs b/standalone/runtime/src/lib.rs index a926bba96..6878e6b8a 100644 --- a/standalone/runtime/src/lib.rs +++ b/standalone/runtime/src/lib.rs @@ -116,7 +116,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("tangle-standalone"), impl_name: create_runtime_str!("tangle-standalone"), authoring_version: 1, - spec_version: 303, // v0.3.3 + spec_version: 304, // v0.3.4 impl_version: 1, apis: RUNTIME_API_VERSIONS, transaction_version: 1, @@ -134,8 +134,8 @@ pub fn native_version() -> NativeVersion { NativeVersion { runtime_version: VERSION, can_author_with: Default::default() } } -/// We allow for 2000ms of compute with a 6 second average block time. -pub const WEIGHT_MILLISECS_PER_BLOCK: u64 = 2000; +/// We allow for 2500ms of compute with a 6 second average block time. +pub const WEIGHT_MILLISECS_PER_BLOCK: u64 = 2500; pub const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_parts(WEIGHT_MILLISECS_PER_BLOCK * WEIGHT_REF_TIME_PER_MILLIS, u64::MAX); pub const MAXIMUM_BLOCK_LENGTH: u32 = 5 * 1024 * 1024;