, } -impl ConsensusDataProvider for NimbusManualSealConsensusDataProvider +impl ConsensusDataProvider for NimbusManualSealConsensusDataProvider where B: BlockT, C: ProvideRuntimeApi + Send + Sync, C::Api: NimbusApi, DP: DigestsProvider::Hash> + Send + Sync, - P: Send + Sync, { - type Proof = P; - fn create_digest(&self, parent: &B::Header, inherents: &InherentData) -> Result { // Retrieve the relay chain block number to use as the slot number from the parachain inherent let slot_number = inherents @@ -102,7 +98,7 @@ where _parent: &B::Header, params: &mut BlockImportParams, _inherents: &InherentData, - _proof: Self::Proof, + _proof: StorageProof, ) -> Result<(), Error> { // We have to reconstruct the type-public pair which is only communicated through the pre-runtime digest let claimed_author = params diff --git a/client/consensus/nimbus-consensus/src/proposer.rs b/client/consensus/nimbus-consensus/src/proposer.rs new file mode 100644 index 0000000..0ef44de --- /dev/null +++ b/client/consensus/nimbus-consensus/src/proposer.rs @@ -0,0 +1,125 @@ +// Copyright Moonsong Labs +// This file is part of Moonkit. + +// Moonkit is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Moonkit is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Moonkit. If not, see . + +//! Moonkit-local replacement for the upstream `cumulus-client-consensus-proposer`, +//! which was removed in `polkadot-stable2603` (paritytech/polkadot-sdk#9947). +//! +//! Provides a thin extension of the Substrate [`ProposerFactory`] tailored to +//! parachain block production. The caller owns the `ProofRecorder` and drains +//! the resulting storage proof after this proposer returns. + +use async_trait::async_trait; +use cumulus_primitives_parachain_inherent::ParachainInherentData; +use sc_basic_authorship::ProposerFactory; +use sc_block_builder::BlockBuilderApi; +use sc_transaction_pool_api::TransactionPool; +use sp_api::{ApiExt, CallApiAt, ProofRecorder, ProvideRuntimeApi}; +use sp_blockchain::HeaderBackend; +use sp_consensus::{Environment, Proposal, ProposeArgs, Proposer}; +use sp_externalities::Extensions; +use sp_inherents::{InherentData, InherentDataProvider}; +use sp_runtime::{traits::Block as BlockT, Digest}; +use std::time::Duration; + +/// Errors that can occur when proposing a parachain block. +#[derive(thiserror::Error, Debug)] +#[error(transparent)] +pub struct Error { + inner: anyhow::Error, +} + +impl Error { + /// Create an error tied to the creation of a proposer. + pub fn proposer_creation(err: impl Into) -> Self { + Error { + inner: err.into().context("Proposer Creation"), + } + } + + /// Create an error tied to the proposing logic itself. + pub fn proposing(err: impl Into) -> Self { + Error { + inner: err.into().context("Proposing"), + } + } +} + +/// An interface for proposers. +#[async_trait] +pub trait ProposerInterface { + /// Propose a collation using the supplied `InherentData` and the provided + /// `ParachainInherentData`. + /// + /// `storage_proof_recorder` and `extra_extensions` are forwarded into the + /// underlying [`ProposeArgs`] so the caller can drive proof recording and + /// register extra runtime extensions; see paritytech/polkadot-sdk#9947 for + /// background. + async fn propose( + &mut self, + parent_header: &Block::Header, + paras_inherent_data: &ParachainInherentData, + other_inherent_data: InherentData, + inherent_digests: Digest, + max_duration: Duration, + block_size_limit: Option, + storage_proof_recorder: Option>, + extra_extensions: Extensions, + ) -> Result, Error>; +} + +#[async_trait] +impl ProposerInterface for ProposerFactory +where + A: TransactionPool + 'static, + C: HeaderBackend + ProvideRuntimeApi + CallApiAt + Send + Sync + 'static, + C::Api: ApiExt + BlockBuilderApi, + Block: sp_runtime::traits::Block, +{ + async fn propose( + &mut self, + parent_header: &Block::Header, + paras_inherent_data: &ParachainInherentData, + other_inherent_data: InherentData, + inherent_digests: Digest, + max_duration: Duration, + block_size_limit: Option, + storage_proof_recorder: Option>, + extra_extensions: Extensions, + ) -> Result, Error> { + let proposer = self + .init(parent_header) + .await + .map_err(|e| Error::proposer_creation(anyhow::Error::new(e)))?; + + let mut inherent_data = other_inherent_data; + paras_inherent_data + .provide_inherent_data(&mut inherent_data) + .await + .map_err(|e| Error::proposing(anyhow::Error::new(e)))?; + + proposer + .propose(ProposeArgs { + inherent_data, + inherent_digests, + max_duration, + block_size_limit, + storage_proof_recorder, + extra_extensions, + }) + .await + .map_err(|e| Error::proposing(anyhow::Error::new(e))) + } +} diff --git a/pallets/author-inherent/src/exec.rs b/pallets/author-inherent/src/exec.rs index 9823d3e..6964567 100644 --- a/pallets/author-inherent/src/exec.rs +++ b/pallets/author-inherent/src/exec.rs @@ -46,7 +46,7 @@ where Block: BlockT, I: ExecuteBlock, { - fn execute_block(mut block: Block::LazyBlock) { + fn verify_and_remove_seal(block: &mut Block::LazyBlock) { let header = block.header_mut(); debug!(target: "executive", "In hacked Executive. Initial digests are {:?}", header.digest()); @@ -94,9 +94,11 @@ where if !valid_signature { panic!("Block signature invalid"); } + } - // Now that we've verified the signature, hand execution off to the inner executor - // which is probably the normal frame executive. - I::execute_block(block); + fn execute_verified_block(block: Block::LazyBlock) { + // Hand execution off to the inner executor (typically the normal frame + // executive) once the seal has been stripped and verified above. + I::execute_verified_block(block); } } diff --git a/pallets/author-mapping/src/mock.rs b/pallets/author-mapping/src/mock.rs index 31233a5..6a27448 100644 --- a/pallets/author-mapping/src/mock.rs +++ b/pallets/author-mapping/src/mock.rs @@ -25,11 +25,11 @@ use serde::{Deserialize, Serialize}; use sp_core::{ByteArray, H256}; use sp_runtime::{ traits::{BlakeTwo256, IdentityLookup}, - BuildStorage, Perbill, RuntimeDebug, + BuildStorage, Debug, Perbill, }; #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] -#[derive(Eq, PartialEq, Clone, Copy, Encode, Decode, RuntimeDebug, TypeInfo, Default)] +#[derive(Eq, PartialEq, Clone, Copy, Encode, Decode, Debug, TypeInfo, Default)] pub enum TestAuthor { #[default] Alice, diff --git a/pallets/randomness/src/types.rs b/pallets/randomness/src/types.rs index f480a60..f322247 100644 --- a/pallets/randomness/src/types.rs +++ b/pallets/randomness/src/types.rs @@ -71,7 +71,7 @@ impl From> for RequestType { } } -#[derive(PartialEq, Clone, Encode, Decode, RuntimeDebug, TypeInfo)] +#[derive(PartialEq, Clone, Encode, Decode, Debug, TypeInfo)] /// Raw randomness snapshot, the unique value for a `RequestType` in `RandomnessResults` map pub struct RandomnessResult { /// Randomness once available diff --git a/precompiles/assets-erc20/src/lib.rs b/precompiles/assets-erc20/src/lib.rs index 784e5da..4a3b90a 100644 --- a/precompiles/assets-erc20/src/lib.rs +++ b/precompiles/assets-erc20/src/lib.rs @@ -17,7 +17,7 @@ #![cfg_attr(not(feature = "std"), no_std)] use core::fmt::Display; -use fp_evm::{ExitError, PrecompileHandle}; +use fp_evm::PrecompileHandle; use frame_support::traits::fungibles::Inspect; use frame_support::traits::fungibles::{ approvals::Inspect as ApprovalInspect, metadata::Inspect as MetadataInspect, diff --git a/precompiles/assets-erc20/src/mock.rs b/precompiles/assets-erc20/src/mock.rs index 3b97e17..8fda731 100644 --- a/precompiles/assets-erc20/src/mock.rs +++ b/precompiles/assets-erc20/src/mock.rs @@ -186,6 +186,7 @@ impl pallet_evm::Config for Runtime { type ChainId = (); type OnChargeTransaction = (); type BlockGasLimit = BlockGasLimit; + type TransactionGasLimit = (); type BlockHashMapping = pallet_evm::SubstrateBlockHashMapping; type FindAuthor = (); type OnCreate = (); diff --git a/precompiles/assets-erc20/src/tests.rs b/precompiles/assets-erc20/src/tests.rs index 6c88232..0c6f1c8 100644 --- a/precompiles/assets-erc20/src/tests.rs +++ b/precompiles/assets-erc20/src/tests.rs @@ -245,7 +245,7 @@ fn approve() { value: 500.into(), }, ) - .expect_cost(34977756) + .expect_cost(43861756) .expect_log(log3( ForeignAssetId(0u128), SELECTOR_LOG_APPROVAL, @@ -286,7 +286,7 @@ fn approve_saturating() { value: U256::MAX, }, ) - .expect_cost(34977756) + .expect_cost(43861756) .expect_log(log3( ForeignAssetId(0u128), SELECTOR_LOG_APPROVAL, @@ -415,7 +415,7 @@ fn transfer() { value: 400.into(), }, ) - .expect_cost(47773756) // 1 weight => 1 gas in mock + .expect_cost(57627756) // 1 weight => 1 gas in mock .expect_log(log3( ForeignAssetId(0u128), SELECTOR_LOG_TRANSFER, @@ -542,7 +542,7 @@ fn transfer_from() { value: 400.into(), }, ) - .expect_cost(69479756) // 1 weight => 1 gas in mock + .expect_cost(82914756) // 1 weight => 1 gas in mock .expect_log(log3( ForeignAssetId(0u128), SELECTOR_LOG_TRANSFER, @@ -620,7 +620,7 @@ fn transfer_from_non_incremental_approval() { value: 500.into(), }, ) - .expect_cost(34977756) + .expect_cost(43861756) .expect_log(log3( ForeignAssetId(0u128), SELECTOR_LOG_APPROVAL, @@ -643,7 +643,7 @@ fn transfer_from_non_incremental_approval() { value: 300.into(), }, ) - .expect_cost(71860756) + .expect_cost(88848756) .expect_log(log3( ForeignAssetId(0u128), SELECTOR_LOG_APPROVAL, @@ -751,7 +751,7 @@ fn transfer_from_self() { value: 400.into(), }, ) - .expect_cost(47773756) // 1 weight => 1 gas in mock + .expect_cost(57627756) // 1 weight => 1 gas in mock .expect_log(log3( ForeignAssetId(0u128), SELECTOR_LOG_TRANSFER, @@ -898,7 +898,7 @@ fn permit_valid() { s: H256::from(rs.s.b32()), }, ) - .expect_cost(34976000) + .expect_cost(43860000) .expect_log(log3( ForeignAssetId(0u128), SELECTOR_LOG_APPROVAL, @@ -1007,7 +1007,7 @@ fn permit_valid_named_asset() { s: H256::from(rs.s.b32()), }, ) - .expect_cost(34976000) + .expect_cost(43860000) .expect_log(log3( ForeignAssetId(0u128), SELECTOR_LOG_APPROVAL, @@ -1485,7 +1485,7 @@ fn permit_valid_with_metamask_signed_data() { s: H256::from(s_real), }, ) - .expect_cost(34976000) + .expect_cost(43860000) .expect_log(log3( ForeignAssetId(1u128), SELECTOR_LOG_APPROVAL, diff --git a/precompiles/balances-erc20/src/mock.rs b/precompiles/balances-erc20/src/mock.rs index 5bba223..3a9554e 100644 --- a/precompiles/balances-erc20/src/mock.rs +++ b/precompiles/balances-erc20/src/mock.rs @@ -135,6 +135,7 @@ impl pallet_evm::Config for Runtime { type ChainId = (); type OnChargeTransaction = (); type BlockGasLimit = BlockGasLimit; + type TransactionGasLimit = (); type BlockHashMapping = pallet_evm::SubstrateBlockHashMapping; type FindAuthor = (); type OnCreate = (); diff --git a/precompiles/batch/src/mock.rs b/precompiles/batch/src/mock.rs index 6f481aa..147180b 100644 --- a/precompiles/batch/src/mock.rs +++ b/precompiles/batch/src/mock.rs @@ -150,6 +150,7 @@ impl pallet_evm::Config for Runtime { type ChainId = (); type OnChargeTransaction = (); type BlockGasLimit = BlockGasLimit; + type TransactionGasLimit = (); type BlockHashMapping = pallet_evm::SubstrateBlockHashMapping; type FindAuthor = (); type OnCreate = (); diff --git a/precompiles/call-permit/src/mock.rs b/precompiles/call-permit/src/mock.rs index 5bbb349..ab95af2 100644 --- a/precompiles/call-permit/src/mock.rs +++ b/precompiles/call-permit/src/mock.rs @@ -136,6 +136,7 @@ impl pallet_evm::Config for Runtime { type ChainId = (); type OnChargeTransaction = (); type BlockGasLimit = (); + type TransactionGasLimit = (); type BlockHashMapping = pallet_evm::SubstrateBlockHashMapping; type FindAuthor = (); type OnCreate = (); diff --git a/precompiles/pallet-xcm/src/mock.rs b/precompiles/pallet-xcm/src/mock.rs index f199984..b4ef673 100644 --- a/precompiles/pallet-xcm/src/mock.rs +++ b/precompiles/pallet-xcm/src/mock.rs @@ -268,6 +268,7 @@ impl pallet_evm::Config for Runtime { type ChainId = (); type OnChargeTransaction = (); type BlockGasLimit = BlockGasLimit; + type TransactionGasLimit = (); type BlockHashMapping = pallet_evm::SubstrateBlockHashMapping; type FindAuthor = (); type OnCreate = (); @@ -433,7 +434,11 @@ impl SendXcm for DoNothingRouter { pub struct DummyAssetTransactor; impl TransactAsset for DummyAssetTransactor { - fn deposit_asset(_what: &Asset, _who: &Location, _context: Option<&XcmContext>) -> XcmResult { + fn deposit_asset( + _what: AssetsInHolding, + _who: &Location, + _context: Option<&XcmContext>, + ) -> Result<(), (AssetsInHolding, XcmError)> { Ok(()) } @@ -442,7 +447,7 @@ impl TransactAsset for DummyAssetTransactor { _who: &Location, _maybe_context: Option<&XcmContext>, ) -> Result { - Ok(AssetsInHolding::default()) + Ok(AssetsInHolding::new()) } } @@ -457,8 +462,8 @@ impl WeightTrader for DummyWeightTrader { _weight: Weight, _payment: AssetsInHolding, _context: &XcmContext, - ) -> Result { - Ok(AssetsInHolding::default()) + ) -> Result { + Ok(AssetsInHolding::new()) } } @@ -509,7 +514,6 @@ impl xcm_executor::Config for XcmConfig { type ResponseHandler = (); type SubscriptionService = (); type AssetTrap = (); - type AssetClaims = (); type CallDispatcher = RuntimeCall; type AssetLocker = (); type AssetExchanger = (); diff --git a/precompiles/proxy/src/mock.rs b/precompiles/proxy/src/mock.rs index 6562da9..4a7e82d 100644 --- a/precompiles/proxy/src/mock.rs +++ b/precompiles/proxy/src/mock.rs @@ -172,6 +172,7 @@ impl pallet_evm::Config for Runtime { type ChainId = (); type OnChargeTransaction = (); type BlockGasLimit = BlockGasLimit; + type TransactionGasLimit = (); type BlockHashMapping = SubstrateBlockHashMapping; type FindAuthor = (); type OnCreate = (); diff --git a/precompiles/xcm-utils/src/holding.rs b/precompiles/xcm-utils/src/holding.rs new file mode 100644 index 0000000..55087ae --- /dev/null +++ b/precompiles/xcm-utils/src/holding.rs @@ -0,0 +1,82 @@ +// Copyright Moonsong Labs +// This file is part of Moonkit. + +// Moonkit is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Moonkit is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Moonkit. If not, see . + +//! Moonkit-local glue for building [`xcm_executor::AssetsInHolding`] values +//! from raw [`Asset`]s, for use by fee-estimation queries that need to invoke +//! [`xcm_executor::traits::WeightTrader::buy_weight`] without ever withdrawing +//! the resulting holding. +//! +//! In stable2603 the holding register tracks dynamic `ImbalanceAccounting` +//! credits rather than raw `u128` amounts, so a concrete credit type is +//! needed. The upstream equivalent lives in `xcm_executor::test_helpers`, +//! which is documented as testing/internal-only and may be feature-gated or +//! removed without a deprecation cycle. + +use frame_support::traits::tokens::imbalance::{ + ImbalanceAccounting, UnsafeConstructorDestructor, UnsafeManualAccounting, +}; +use sp_std::boxed::Box; +use xcm::latest::prelude::*; + +/// A minimal fungible credit. The query never withdraws the holding it builds — +/// it only reads back the unused amount — so faithfully tracking a `u128` +/// balance is sufficient. +struct HoldingCredit(u128); + +impl UnsafeConstructorDestructor for HoldingCredit { + fn unsafe_clone(&self) -> Box> { + Box::new(HoldingCredit(self.0)) + } + fn forget_imbalance(&mut self) -> u128 { + let amount = self.0; + self.0 = 0; + amount + } +} + +impl UnsafeManualAccounting for HoldingCredit { + fn saturating_subsume(&mut self, mut other: Box>) { + self.0 = self.0.saturating_add(other.forget_imbalance()); + } +} + +impl ImbalanceAccounting for HoldingCredit { + fn amount(&self) -> u128 { + self.0 + } + fn saturating_take(&mut self, amount: u128) -> Box> { + let taken = self.0.min(amount); + self.0 -= taken; + Box::new(HoldingCredit(taken)) + } +} + +/// Convert an [`Asset`] into the [`xcm_executor::AssetsInHolding`] expected by +/// [`xcm_executor::traits::WeightTrader::buy_weight`]. +/// +/// Stable, moonkit-local replacement for +/// `xcm_executor::test_helpers::mock_asset_to_holding`. +pub(crate) fn asset_to_holding(asset: Asset) -> xcm_executor::AssetsInHolding { + match asset.fun { + Fungible(amount) => xcm_executor::AssetsInHolding::new_from_fungible_credit( + asset.id, + Box::new(HoldingCredit(amount)), + ), + NonFungible(instance) => { + xcm_executor::AssetsInHolding::new_from_non_fungible(asset.id, instance) + } + } +} diff --git a/precompiles/xcm-utils/src/lib.rs b/precompiles/xcm-utils/src/lib.rs index 1f5a654..0207e35 100644 --- a/precompiles/xcm-utils/src/lib.rs +++ b/precompiles/xcm-utils/src/lib.rs @@ -31,9 +31,7 @@ use precompile_utils::precompile_set::SelectorFilter; use precompile_utils::prelude::*; use sp_core::{H160, U256}; use sp_runtime::traits::Dispatchable; -use sp_std::boxed::Box; use sp_std::marker::PhantomData; -use sp_std::vec; use sp_std::vec::Vec; use sp_weights::Weight; use xcm::{latest::prelude::*, VersionedXcm, MAX_XCM_DECODE_DEPTH}; @@ -41,6 +39,9 @@ use xcm_executor::traits::ConvertOrigin; use xcm_executor::traits::WeightBounds; use xcm_executor::traits::WeightTrader; +mod holding; +use holding::asset_to_holding; + const DEFAULT_PROOF_SIZE: u64 = 256 * 1024; pub type XcmOriginOf = @@ -159,22 +160,29 @@ where message_id: XcmHash::default(), topic: None, }; - // buy_weight returns unused assets + // `AssetsInHolding` no longer implements `From>` in + // stable2603 — the holding now tracks `ImbalanceAccounting` credits + // rather than raw amounts. Since this is a fee-estimation query + // (we never actually withdraw anything), the moonkit-local + // `asset_to_holding` adapter is a faithful minimum-diff equivalent to + // the previous behaviour, without depending on upstream test helpers. let unused = trader .buy_weight( Weight::from_parts(weight_per_second, DEFAULT_PROOF_SIZE), - vec![multiasset.clone()].into(), + asset_to_holding(multiasset.clone()), &ctx, ) .map_err(|_| { RevertReason::custom("Asset not supported as fee payment").in_field("location") })?; - // we just need to substract from u128::MAX the unused assets + // we just need to substract from u128::MAX the unused assets. + // In stable2603, holdings store `ImbalanceAccounting` credits rather + // than raw `u128` values; call `.amount()` to recover the balance. if let Some(amount) = unused .fungible .get(&multiasset.id) - .map(|&value| u128::MAX.saturating_sub(value)) + .map(|credit| u128::MAX.saturating_sub(credit.amount())) { Ok(amount.into()) } else { diff --git a/precompiles/xcm-utils/src/mock.rs b/precompiles/xcm-utils/src/mock.rs index 7058f0f..83c7727 100644 --- a/precompiles/xcm-utils/src/mock.rs +++ b/precompiles/xcm-utils/src/mock.rs @@ -270,6 +270,7 @@ impl pallet_evm::Config for Runtime { type ChainId = (); type OnChargeTransaction = (); type BlockGasLimit = BlockGasLimit; + type TransactionGasLimit = (); type BlockHashMapping = pallet_evm::SubstrateBlockHashMapping; type FindAuthor = (); type OnCreate = (); @@ -323,7 +324,11 @@ impl SendXcm for TestSendXcm { pub struct DummyAssetTransactor; impl TransactAsset for DummyAssetTransactor { - fn deposit_asset(_what: &Asset, _who: &Location, _context: Option<&XcmContext>) -> XcmResult { + fn deposit_asset( + _what: AssetsInHolding, + _who: &Location, + _context: Option<&XcmContext>, + ) -> Result<(), (AssetsInHolding, XcmError)> { Ok(()) } @@ -332,7 +337,7 @@ impl TransactAsset for DummyAssetTransactor { _who: &Location, _maybe_context: Option<&XcmContext>, ) -> Result { - Ok(AssetsInHolding::default()) + Ok(AssetsInHolding::new()) } } @@ -345,15 +350,14 @@ impl WeightTrader for DummyWeightTrader { fn buy_weight( &mut self, weight: Weight, - payment: AssetsInHolding, + mut payment: AssetsInHolding, _context: &XcmContext, - ) -> Result { + ) -> Result { let asset_to_charge: Asset = (Location::parent(), weight.ref_time() as u128).into(); - let unused = payment - .checked_sub(asset_to_charge) - .map_err(|_| XcmError::TooExpensive)?; - - Ok(unused) + match payment.try_take(asset_to_charge.into()) { + Ok(_) => Ok(payment), + Err(_) => Err((payment, XcmError::TooExpensive)), + } } } @@ -404,7 +408,6 @@ impl xcm_executor::Config for XcmConfig { type ResponseHandler = (); type SubscriptionService = (); type AssetTrap = (); - type AssetClaims = (); type CallDispatcher = RuntimeCall; type AssetLocker = (); type AssetExchanger = (); diff --git a/primitives/session-keys/src/digest.rs b/primitives/session-keys/src/digest.rs index 637ddf5..7f5e49f 100644 --- a/primitives/session-keys/src/digest.rs +++ b/primitives/session-keys/src/digest.rs @@ -18,10 +18,10 @@ use crate::vrf::{VrfSignature, VRF_ENGINE_ID}; use parity_scale_codec::{Decode, Encode}; use sp_core::sr25519::vrf::{VrfPreOutput, VrfProof}; -use sp_runtime::{generic::DigestItem, RuntimeDebug}; +use sp_runtime::{generic::DigestItem, Debug}; /// Raw VRF pre-digest. -#[derive(Clone, RuntimeDebug, Encode, Decode)] +#[derive(Clone, Debug, Encode, Decode)] pub struct PreDigest { /// VRF output pub vrf_output: VrfPreOutput, diff --git a/template/README.md b/template/README.md index e2a19cf..0eaee6c 100644 --- a/template/README.md +++ b/template/README.md @@ -55,7 +55,7 @@ docker build . -t polkadot-sdk-parachain-template ### Local Development Chain 🧟 This project uses [Zombienet](https://github.com/paritytech/zombienet) to orchestrate the relaychain and parachain nodes. -You can grab a [released binary](https://github.com/paritytech/zombienet/releases/latest) or use an [npm version](https://www.npmjs.com/package/@zombienet/cli). +You can grab a [released binary](https://github.com/paritytech/zombienet/releases/latest) or use an [npm version](https://paritytech.github.io/zombienet/install.html#using-npm). This template produces a parachain node. You still need a relaychain node - you can download the `polkadot` diff --git a/template/node/Cargo.toml b/template/node/Cargo.toml index ed94d75..51919ba 100644 --- a/template/node/Cargo.toml +++ b/template/node/Cargo.toml @@ -81,7 +81,6 @@ sp-consensus-slots = { workspace = true } cumulus-client-cli = { workspace = true } cumulus-client-collator = { workspace = true } cumulus-client-consensus-common = { workspace = true } -cumulus-client-consensus-proposer = { workspace = true } cumulus-client-network = { workspace = true } cumulus-client-service = { workspace = true } cumulus-client-parachain-inherent = { workspace = true } diff --git a/template/node/src/service.rs b/template/node/src/service.rs index 9312e98..e63af23 100644 --- a/template/node/src/service.rs +++ b/template/node/src/service.rs @@ -128,6 +128,7 @@ pub fn new_partial( config, telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()), executor, + Vec::new(), )?; let client = Arc::new(client); @@ -273,6 +274,7 @@ where client: client.clone(), transaction_pool: transaction_pool.clone(), spawn_handle: task_manager.spawn_handle(), + spawn_essential_handle: task_manager.spawn_essential_handle(), import_queue: params.import_queue, block_announce_validator_builder: Some(Box::new(|_| { Box::new(block_announce_validator) @@ -385,7 +387,7 @@ fn start_consensus( force_authoring: bool, max_pov_percentage: u8, ) -> Result<(), sc_service::Error> { - let proposer = sc_basic_authorship::ProposerFactory::with_proof_recording( + let proposer = sc_basic_authorship::ProposerFactory::new( task_manager.spawn_handle(), client.clone(), transaction_pool, @@ -505,6 +507,7 @@ where client: client.clone(), transaction_pool: transaction_pool.clone(), spawn_handle: task_manager.spawn_handle(), + spawn_essential_handle: task_manager.spawn_essential_handle(), import_queue, block_announce_validator_builder: None, warp_sync_config: None, @@ -595,7 +598,6 @@ where keystore: keystore_container.keystore(), client: client.clone(), additional_digests_provider: (), - _phantom: Default::default(), })), create_inherent_data_providers: move |block, _extra_args| { let downward_xcm_receiver = downward_xcm_receiver.clone(); @@ -628,6 +630,7 @@ where current_para_block: 0, current_para_block_head: None, relay_offset: 0, + relay_parent_offset: 0, relay_blocks_per_para_block: 0, para_blocks_per_relay_epoch: 0, relay_randomness_config: (), diff --git a/template/runtime/src/lib.rs b/template/runtime/src/lib.rs index 54544e7..d0e2ae9 100644 --- a/template/runtime/src/lib.rs +++ b/template/runtime/src/lib.rs @@ -29,7 +29,7 @@ use frame_support::{ dispatch::DispatchClass, genesis_builder_helper::{build_state, get_preset}, parameter_types, - traits::{ConstBool, Contains, Everything, Nothing, OnInitialize, TransformOrigin}, + traits::{ConstBool, Contains, Everything, Get, Nothing, OnInitialize, TransformOrigin}, weights::{ constants::{ BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_REF_TIME_PER_SECOND, @@ -265,8 +265,10 @@ parameter_types! { // The `RuntimeBlockLength` and `RuntimeBlockWeights` exist here because the // `DeletionWeightLimit` and `DeletionQueueDepth` depend on those to parameterize // the lazy contract deletion. - pub RuntimeBlockLength: BlockLength = - BlockLength::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO); + pub RuntimeBlockLength: BlockLength = BlockLength::builder() + .max_length(5 * 1024 * 1024) + .modify_max_length_for_class(DispatchClass::Normal, |m| *m = NORMAL_DISPATCH_RATIO * *m) + .build(); pub RuntimeBlockWeights: BlockWeights = BlockWeights::builder() .base_block(BlockExecutionWeight::get()) .for_class(DispatchClass::all(), |weights| { @@ -541,7 +543,6 @@ impl Config for XcmConfig { type Trader = UsingComponents, RocLocation, AccountId, Balances, ()>; type ResponseHandler = PolkadotXcm; type AssetTrap = PolkadotXcm; - type AssetClaims = PolkadotXcm; type SubscriptionService = PolkadotXcm; type AssetLocker = PolkadotXcm; type AssetExchanger = (); @@ -778,8 +779,8 @@ impl_runtime_apis! { } impl sp_session::SessionKeys for Runtime { - fn generate_session_keys(seed: Option>) -> Vec { - SessionKeys::generate(seed) + fn generate_session_keys(owner: Vec, seed: Option>) -> sp_session::OpaqueGeneratedSessionKeys { + SessionKeys::generate(&owner, seed).into() } fn decode_session_keys( @@ -861,7 +862,7 @@ impl_runtime_apis! { impl cumulus_primitives_core::RelayParentOffsetApi for Runtime { fn relay_parent_offset() -> u32 { - 2 + ::RelayParentOffset::get() } } @@ -886,7 +887,7 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig - ) -> Result, sp_runtime::RuntimeString> { + ) -> Result, scale_info::prelude::string::String> { use frame_benchmarking::{BenchmarkBatch, add_benchmark}; use frame_support::traits::TrackedStorageKey;