-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove seedling runtime Update Virto runtime to match Kreivo Add pallet_asset_tx_payment
- Loading branch information
1 parent
d4ce364
commit 1df5667
Showing
34 changed files
with
2,116 additions
and
3,559 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,170 @@ | ||
| use std::{sync::Arc, time::Duration}; | ||
|
|
||
| use codec::Encode; | ||
| use cumulus_primitives_parachain_inherent::MockValidationDataInherentDataProvider; | ||
| use sc_client_api::BlockBackend; | ||
| use sp_core::Pair; | ||
| use sp_inherents::{InherentData, InherentDataProvider}; | ||
| use sp_keyring::Sr25519Keyring; | ||
| use sp_runtime::{generic, OpaqueExtrinsic, SaturatedConversion}; | ||
|
|
||
| use crate::service::ParachainClient; | ||
|
|
||
| /// Generates `System::Remark` extrinsics for the benchmarks. | ||
| /// | ||
| /// Note: Should only be used for benchmarking. | ||
| pub struct RemarkBuilder<RuntimeApi> { | ||
| client: Arc<ParachainClient<RuntimeApi>>, | ||
| } | ||
|
|
||
| impl<RuntimeApi> RemarkBuilder<RuntimeApi> { | ||
| /// Creates a new [`Self`] from the given client. | ||
| pub fn new(client: Arc<ParachainClient<RuntimeApi>>) -> Self { | ||
| Self { client } | ||
| } | ||
| } | ||
|
|
||
| impl frame_benchmarking_cli::ExtrinsicBuilder for RemarkBuilder<kreivo_runtime::RuntimeApi> { | ||
| fn pallet(&self) -> &str { | ||
| "system" | ||
| } | ||
|
|
||
| fn extrinsic(&self) -> &str { | ||
| "remark" | ||
| } | ||
|
|
||
| fn build(&self, nonce: u32) -> Result<OpaqueExtrinsic, &'static str> { | ||
| use kreivo_runtime as runtime; | ||
|
|
||
| let call: runtime::RuntimeCall = runtime::SystemCall::remark { remark: vec![] }.into(); | ||
| let period = runtime::BlockHashCount::get() | ||
| .checked_next_power_of_two() | ||
| .map(|c| c / 2) | ||
| .unwrap_or(2) as u64; | ||
| let best_block = self.client.chain_info().best_number; | ||
| let tip = 0; | ||
| let extra: runtime::SignedExtra = ( | ||
| frame_system::CheckNonZeroSender::<runtime::Runtime>::new(), | ||
| frame_system::CheckSpecVersion::<runtime::Runtime>::new(), | ||
| frame_system::CheckTxVersion::<runtime::Runtime>::new(), | ||
| frame_system::CheckGenesis::<runtime::Runtime>::new(), | ||
| frame_system::CheckEra::<runtime::Runtime>::from(generic::Era::mortal(period, best_block.saturated_into())), | ||
| frame_system::CheckNonce::<runtime::Runtime>::from(nonce), | ||
| frame_system::CheckWeight::<runtime::Runtime>::new(), | ||
| pallet_asset_tx_payment::ChargeAssetTxPayment::<runtime::Runtime>::from(tip, None), | ||
| ); | ||
|
|
||
| let genesis_hash = self.client.block_hash(0).ok().flatten().expect("Genesis block exists"); | ||
| let best_hash = self.client.chain_info().best_hash; | ||
| let payload = runtime::SignedPayload::from_raw( | ||
| call.clone(), | ||
| extra.clone(), | ||
| ( | ||
| (), | ||
| runtime::VERSION.spec_version, | ||
| runtime::VERSION.transaction_version, | ||
| genesis_hash, | ||
| best_hash, | ||
| (), | ||
| (), | ||
| (), | ||
| ), | ||
| ); | ||
|
|
||
| let sender = Sr25519Keyring::Bob.pair(); | ||
| let signature = payload.using_encoded(|x| sender.sign(x)); | ||
| let extrinsic = runtime::UncheckedExtrinsic::new_signed( | ||
| call, | ||
| sp_runtime::AccountId32::from(sender.public()).into(), | ||
| runtime::Signature::Sr25519(signature), | ||
| extra, | ||
| ); | ||
|
|
||
| Ok(extrinsic.into()) | ||
| } | ||
| } | ||
|
|
||
| impl frame_benchmarking_cli::ExtrinsicBuilder for RemarkBuilder<virto_runtime::RuntimeApi> { | ||
| fn pallet(&self) -> &str { | ||
| "system" | ||
| } | ||
|
|
||
| fn extrinsic(&self) -> &str { | ||
| "remark" | ||
| } | ||
|
|
||
| fn build(&self, nonce: u32) -> Result<OpaqueExtrinsic, &'static str> { | ||
| use virto_runtime as runtime; | ||
|
|
||
| let call: runtime::RuntimeCall = runtime::SystemCall::remark { remark: vec![] }.into(); | ||
| let period = runtime::BlockHashCount::get() | ||
| .checked_next_power_of_two() | ||
| .map(|c| c / 2) | ||
| .unwrap_or(2) as u64; | ||
| let best_block = self.client.chain_info().best_number; | ||
| let tip = 0; | ||
| let extra: runtime::SignedExtra = ( | ||
| frame_system::CheckNonZeroSender::<runtime::Runtime>::new(), | ||
| frame_system::CheckSpecVersion::<runtime::Runtime>::new(), | ||
| frame_system::CheckTxVersion::<runtime::Runtime>::new(), | ||
| frame_system::CheckGenesis::<runtime::Runtime>::new(), | ||
| frame_system::CheckEra::<runtime::Runtime>::from(generic::Era::mortal(period, best_block.saturated_into())), | ||
| frame_system::CheckNonce::<runtime::Runtime>::from(nonce), | ||
| frame_system::CheckWeight::<runtime::Runtime>::new(), | ||
| pallet_asset_tx_payment::ChargeAssetTxPayment::<runtime::Runtime>::from(tip, None), | ||
| ); | ||
|
|
||
| let genesis_hash = self.client.block_hash(0).ok().flatten().expect("Genesis block exists"); | ||
| let best_hash = self.client.chain_info().best_hash; | ||
| let payload = runtime::SignedPayload::from_raw( | ||
| call.clone(), | ||
| extra.clone(), | ||
| ( | ||
| (), | ||
| runtime::VERSION.spec_version, | ||
| runtime::VERSION.transaction_version, | ||
| genesis_hash, | ||
| best_hash, | ||
| (), | ||
| (), | ||
| (), | ||
| ), | ||
| ); | ||
|
|
||
| let sender = Sr25519Keyring::Bob.pair(); | ||
| let signature = payload.using_encoded(|x| sender.sign(x)); | ||
| let extrinsic = runtime::UncheckedExtrinsic::new_signed( | ||
| call, | ||
| sp_runtime::AccountId32::from(sender.public()).into(), | ||
| runtime::Signature::Sr25519(signature), | ||
| extra, | ||
| ); | ||
|
|
||
| Ok(extrinsic.into()) | ||
| } | ||
| } | ||
|
|
||
| /// Generates inherent data for the `benchmark overhead` command. | ||
| pub fn inherent_benchmark_data() -> sc_cli::Result<InherentData> { | ||
| let mut inherent_data = InherentData::new(); | ||
|
|
||
| let timestamp = sp_timestamp::InherentDataProvider::new(Duration::ZERO.into()); | ||
| futures::executor::block_on(timestamp.provide_inherent_data(&mut inherent_data)) | ||
| .map_err(|e| format!("creating inherent data: {e:?}"))?; | ||
|
|
||
| let parachain_inherent = MockValidationDataInherentDataProvider { | ||
| current_para_block: 1, | ||
| relay_offset: 0, | ||
| relay_blocks_per_para_block: 1, | ||
| para_blocks_per_relay_epoch: 0, | ||
| relay_randomness_config: (), | ||
| xcm_config: Default::default(), | ||
| raw_downward_messages: Default::default(), | ||
| raw_horizontal_messages: Default::default(), | ||
| }; | ||
|
|
||
| futures::executor::block_on(parachain_inherent.provide_inherent_data(&mut inherent_data)) | ||
| .map_err(|e| format!("creating inherent data: {e:?}"))?; | ||
|
|
||
| Ok(inherent_data) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.