freeverseio · asiniscalchi · Sep 12, 2024 · Sep 23, 2024 · Sep 23, 2024 · Sep 23, 2024
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -183,6 +183,8 @@ cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/pol
 cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false }
 cumulus-primitives-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false }
 cumulus-primitives-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false }
+cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false }
+cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false }
 parachain-info = { package = "staging-parachain-info", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false }
 parachains-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false }
 
@@ -191,6 +193,7 @@ cumulus-client-cli = { git = "https://github.com/paritytech/polkadot-sdk", branc
 cumulus-client-collator = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
 cumulus-client-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
 cumulus-client-consensus-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
+cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
 cumulus-client-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
 cumulus-client-consensus-proposer = {git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0"}
 cumulus-client-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }

diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -63,8 +63,11 @@ cumulus-client-collator = { workspace = true }
 cumulus-client-consensus-aura = { workspace = true }
 cumulus-client-consensus-common = { workspace = true }
 cumulus-client-consensus-proposer = { workspace = true }
+cumulus-client-consensus-relay-chain = { workspace = true }
 cumulus-client-service = { workspace = true }
 cumulus-primitives-core = { workspace = true }
+cumulus-primitives-parachain-inherent = { workspace = true }
+cumulus-test-relay-sproof-builder = { workspace = true }
 cumulus-relay-chain-interface = { workspace = true }
 
 # Frontier

diff --git a/node/src/service.rs b/node/src/service.rs
@@ -50,9 +50,11 @@ use sc_network_sync::SyncingService;
 use sc_service::{Configuration, PartialComponents, TFullBackend, TFullClient, TaskManager};
 use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle};
 use sc_transaction_pool_api::OffchainTransactionPoolFactory;
+use sp_consensus_aura::{Slot, SlotDuration};
 use sp_core::U256;
 use sp_keystore::KeystorePtr;
 use substrate_prometheus_endpoint::Registry;
+
 // Frontier
 use crate::eth::{
 	db_config_dir, new_frontier_partial, spawn_frontier_tasks, BackendType, EthConfiguration,
@@ -310,8 +312,6 @@ async fn start_node_impl(
 		fc_mapping_sync::EthereumBlockNotification<Block>,
 	> = Default::default();
 	let pubsub_notification_sinks = Arc::new(pubsub_notification_sinks);
-	let slot_duration = sc_consensus_aura::slot_duration(&*client)?;
-	let target_gas_price = eth_config.target_gas_price;
 
 	// for ethereum-compatibility rpc.
 	parachain_config.rpc_id_provider = Some(Box::new(fc_rpc::EthereumSubIdProvider));
@@ -344,15 +344,33 @@ async fn start_node_impl(
 		execute_gas_limit_multiplier: eth_config.execute_gas_limit_multiplier,
 		forced_parent_hashes: None,
 		pending_create_inherent_data_providers: move |_, ()| async move {
-			let current = sp_timestamp::InherentDataProvider::from_system_time();
-			let next_slot = current.timestamp().as_millis() + slot_duration.as_millis();
-			let timestamp = sp_timestamp::InherentDataProvider::new(next_slot.into());
-			let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
-				*timestamp,
-				slot_duration,
+			// Patch from https://github.com/darwinia-network/darwinia/pull/1608
+			let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
+			let relay_chain_slot = Slot::from_timestamp(
+				timestamp.timestamp(),
+				SlotDuration::from_millis(6000_u64), // RELAY_CHAIN_SLOT_DURATION_MILLIS
 			);
-			let dynamic_fee = fp_dynamic_fee::InherentDataProvider(U256::from(target_gas_price));
-			Ok((slot, timestamp, dynamic_fee))
+
+			let state_proof_builder = cumulus_test_relay_sproof_builder::RelayStateSproofBuilder {
+				para_id,
+				current_slot: relay_chain_slot,
+				included_para_head: Some(polkadot_primitives::HeadData(vec![])),
+				..Default::default()
+			};
+			let (relay_parent_storage_root, relay_chain_state) =
+				state_proof_builder.into_state_root_and_proof();
+			let parachain_inherent_data =
+				cumulus_primitives_parachain_inherent::ParachainInherentData {
+					validation_data: cumulus_primitives_core::PersistedValidationData {
+						relay_parent_number: u32::MAX,
+						relay_parent_storage_root,
+						..Default::default()
+					},
+					relay_chain_state,
+					downward_messages: Default::default(),
+					horizontal_messages: Default::default(),
+				};
+			Ok((timestamp, parachain_inherent_data))
 		},
 	};
 

diff --git a/primitives/src/lib.rs b/primitives/src/lib.rs
@@ -19,12 +19,18 @@
 #![warn(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use frame_support::weights::IdentityFee;
+use frame_support::weights::{constants::WEIGHT_REF_TIME_PER_SECOND, IdentityFee, Weight};
 use frame_system::limits;
-pub use parachains_common::{MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO};
+pub use parachains_common::NORMAL_DISPATCH_RATIO;
 use sp_core::Hasher as HasherT;
 use sp_runtime::traits::{BlakeTwo256, IdentifyAccount, Verify};
 
+/// We allow for 2 seconds of compute with a 6 second average block.
+pub const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_parts(
+	WEIGHT_REF_TIME_PER_SECOND.saturating_mul(2),
+	cumulus_primitives_core::relay_chain::MAX_POV_SIZE as u64,
+);
+
 /// Authority ID used in parachain.
 pub type AuraId = sp_consensus_aura::sr25519::AuthorityId;
 
@@ -78,12 +84,12 @@ mod tests {
 		let weights = RuntimeBlockWeights::get();
 
 		assert_eq!(weights.base_block, Weight::from_parts(453383000, 0));
-		assert_eq!(weights.max_block, Weight::from_parts(500000000000, 5242880));
+		assert_eq!(weights.max_block, Weight::from_parts(2000000000000, 5242880));
 
 		let normal = weights.per_class.get(DispatchClass::Normal);
 		assert_eq!(normal.base_extrinsic, Weight::from_parts(107074000, 0));
-		assert_eq!(normal.max_extrinsic, Some(Weight::from_parts(324892926000, 3407872)));
-		assert_eq!(normal.max_total, Some(Weight::from_parts(375000000000, 3932160)));
+		assert_eq!(normal.max_extrinsic, Some(Weight::from_parts(1299892926000, 3407872)));
+		assert_eq!(normal.max_total, Some(Weight::from_parts(1500000000000, 3932160)));
 		assert_eq!(normal.reserved, Some(Weight::from_parts(0, 0)));
 
 		let mandatory = weights.per_class.get(DispatchClass::Mandatory);
@@ -94,8 +100,8 @@ mod tests {
 
 		let operational = weights.per_class.get(DispatchClass::Operational);
 		assert_eq!(operational.base_extrinsic, Weight::from_parts(107074000, 0));
-		assert_eq!(operational.max_extrinsic, Some(Weight::from_parts(449892926000, 4718592)));
-		assert_eq!(operational.max_total, Some(Weight::from_parts(500000000000, 5242880)));
-		assert_eq!(operational.reserved, Some(Weight::from_parts(125000000000, 1310720)));
+		assert_eq!(operational.max_extrinsic, Some(Weight::from_parts(1799892926000, 4718592)));
+		assert_eq!(operational.max_total, Some(Weight::from_parts(2000000000000, 5242880)));
+		assert_eq!(operational.reserved, Some(Weight::from_parts(500000000000, 1310720)));
 	}
 }
diff --git a/runtime/laos/src/configs/aura.rs b/runtime/laos/src/configs/aura.rs
@@ -20,7 +20,7 @@ use sp_core::ConstU64;
 
 parameter_types! {
 	pub const MaxAuthorities : u32 = 100_000;
-	pub const AllowMultipleBlocksPerSlot: bool = false;
+	pub const AllowMultipleBlocksPerSlot: bool = true;
 }
 
 impl pallet_aura::Config for Runtime {

diff --git a/runtime/laos/src/configs/cumulus_parachain_system.rs b/runtime/laos/src/configs/cumulus_parachain_system.rs
@@ -38,7 +38,8 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type ReservedDmpWeight = ReservedDmpWeight;
 	type XcmpMessageHandler = XcmpQueue;
 	type ReservedXcmpWeight = ReservedXcmpWeight;
-	type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
+	type CheckAssociatedRelayNumber =
+		cumulus_pallet_parachain_system::RelayNumberMonotonicallyIncreases;
 	type ConsensusHook = ConsensusHook;
 	type DmpQueue = frame_support::traits::EnqueueWithOrigin<MessageQueue, RelayOrigin>;
 	type WeightInfo = weights::cumulus_pallet_parachain_system::WeightInfo<Runtime>;

diff --git a/runtime/laos/src/configs/timestamp.rs b/runtime/laos/src/configs/timestamp.rs
@@ -14,11 +14,11 @@
 // You should have received a copy of the GNU General Public License
 // along with LAOS.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::{weights, Aura, Runtime, MILLISECS_PER_BLOCK};
+use crate::{weights, Aura, Runtime};
 use frame_support::parameter_types;
 
 parameter_types! {
-	pub const MinimumPeriod: u64 = MILLISECS_PER_BLOCK / 2;
+	pub const MinimumPeriod: u64 = 0;
 }
 
 impl pallet_timestamp::Config for Runtime {

diff --git a/runtime/laos/src/lib.rs b/runtime/laos/src/lib.rs
@@ -91,7 +91,7 @@ impl_opaque_keys! {
 }
 
 /// This determines the average expected block time that we are targeting.
-pub const MILLISECS_PER_BLOCK: u64 = 12000;
+pub const MILLISECS_PER_BLOCK: u64 = 6000;
 
 /// Version of the runtime
 #[sp_version::runtime_version]

diff --git a/zombienet/download_polkadot.sh b/zombienet/download_polkadot.sh
@@ -2,7 +2,7 @@
 
 # Default version and download directory
 VERSION=${1:-"v1.11.0"}
-DOWNLOAD_DIR=${2:-"./tmp"}  # Default is the current directory
+DOWNLOAD_DIR=${2:-"./tmp"}  # Default is tmp
 
 BASE_URL="https://github.com/paritytech/polkadot-sdk/releases/download/polkadot-$VERSION"