difftreelog
Re-add CheckTxVersion signed extension and a test
in: master
2 files changed
runtime/common/mod.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617pub mod config;18pub mod construct_runtime;19pub mod dispatch;20pub mod ethereum;21pub mod instance;22pub mod runtime_apis;23pub mod scheduler;24pub mod sponsoring;25pub mod weights;2627use sp_core::H160;28use frame_support::traits::{Currency, OnUnbalanced, Imbalance};29use sp_runtime::{30 generic,31 traits::{BlakeTwo256, BlockNumberProvider},32 impl_opaque_keys,33};34use sp_std::vec::Vec;3536#[cfg(feature = "std")]37use sp_version::NativeVersion;3839use crate::{40 Runtime, Call, Balances, Treasury, Aura, Signature, AllPalletsReversedWithSystemFirst,41 InherentDataExt,42};43use up_common::types::{AccountId, BlockNumber};4445#[macro_export]46macro_rules! unsupported {47 () => {48 pallet_common::unsupported!($crate::Runtime)49 };50}5152/// The address format for describing accounts.53pub type Address = sp_runtime::MultiAddress<AccountId, ()>;54/// Block header type as expected by this runtime.55pub type Header = generic::Header<BlockNumber, BlakeTwo256>;56/// Block type as expected by this runtime.57pub type Block = generic::Block<Header, UncheckedExtrinsic>;58/// A Block signed with a Justification59pub type SignedBlock = generic::SignedBlock<Block>;60/// BlockId type as expected by this runtime.61pub type BlockId = generic::BlockId<Block>;6263impl_opaque_keys! {64 pub struct SessionKeys {65 pub aura: Aura,66 }67}6869/// The version information used to identify this runtime when compiled natively.70#[cfg(feature = "std")]71pub fn native_version() -> NativeVersion {72 NativeVersion {73 runtime_version: crate::VERSION,74 can_author_with: Default::default(),75 }76}7778pub type ChargeTransactionPayment = pallet_charge_transaction::ChargeTransactionPayment<Runtime>;7980pub type SignedExtra = (81 frame_system::CheckSpecVersion<Runtime>,82 // system::CheckTxVersion<Runtime>,83 frame_system::CheckGenesis<Runtime>,84 frame_system::CheckEra<Runtime>,85 frame_system::CheckNonce<Runtime>,86 frame_system::CheckWeight<Runtime>,87 ChargeTransactionPayment,88 //pallet_contract_helpers::ContractHelpersExtension<Runtime>,89 pallet_ethereum::FakeTransactionFinalizer<Runtime>,90);9192/// Unchecked extrinsic type as expected by this runtime.93pub type UncheckedExtrinsic =94 fp_self_contained::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;9596/// Extrinsic type that has already been checked.97pub type CheckedExtrinsic = fp_self_contained::CheckedExtrinsic<AccountId, Call, SignedExtra, H160>;9899/// Executive: handles dispatch to the various modules.100pub type Executive = frame_executive::Executive<101 Runtime,102 Block,103 frame_system::ChainContext<Runtime>,104 Runtime,105 AllPalletsReversedWithSystemFirst,106>;107108type NegativeImbalance = <Balances as Currency<AccountId>>::NegativeImbalance;109110pub struct DealWithFees;111impl OnUnbalanced<NegativeImbalance> for DealWithFees {112 fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item = NegativeImbalance>) {113 if let Some(fees) = fees_then_tips.next() {114 // for fees, 100% to treasury115 let mut split = fees.ration(100, 0);116 if let Some(tips) = fees_then_tips.next() {117 // for tips, if any, 100% to treasury118 tips.ration_merge_into(100, 0, &mut split);119 }120 Treasury::on_unbalanced(split.0);121 // Author::on_unbalanced(split.1);122 }123 }124}125126pub struct RelayChainBlockNumberProvider<T>(sp_std::marker::PhantomData<T>);127128impl<T: cumulus_pallet_parachain_system::Config> BlockNumberProvider129 for RelayChainBlockNumberProvider<T>130{131 type BlockNumber = BlockNumber;132133 fn current_block_number() -> Self::BlockNumber {134 cumulus_pallet_parachain_system::Pallet::<T>::validation_data()135 .map(|d| d.relay_parent_number)136 .unwrap_or_default()137 }138}139140pub(crate) struct CheckInherents;141142impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {143 fn check_inherents(144 block: &Block,145 relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,146 ) -> sp_inherents::CheckInherentsResult {147 let relay_chain_slot = relay_state_proof148 .read_slot()149 .expect("Could not read the relay chain slot from the proof");150151 let inherent_data =152 cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(153 relay_chain_slot,154 sp_std::time::Duration::from_secs(6),155 )156 .create_inherent_data()157 .expect("Could not create the timestamp inherent data");158159 inherent_data.check_extrinsics(block)160 }161}162163#[derive(codec::Encode, codec::Decode)]164pub enum XCMPMessage<XAccountId, XBalance> {165 /// Transfer tokens to the given account from the Parachain account.166 TransferToken(XAccountId, XBalance),167}1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617pub mod config;18pub mod construct_runtime;19pub mod dispatch;20pub mod ethereum;21pub mod instance;22pub mod runtime_apis;23pub mod scheduler;24pub mod sponsoring;25pub mod weights;2627use sp_core::H160;28use frame_support::traits::{Currency, OnUnbalanced, Imbalance};29use sp_runtime::{30 generic,31 traits::{BlakeTwo256, BlockNumberProvider},32 impl_opaque_keys,33};34use sp_std::vec::Vec;3536#[cfg(feature = "std")]37use sp_version::NativeVersion;3839use crate::{40 Runtime, Call, Balances, Treasury, Aura, Signature, AllPalletsReversedWithSystemFirst,41 InherentDataExt,42};43use up_common::types::{AccountId, BlockNumber};4445#[macro_export]46macro_rules! unsupported {47 () => {48 pallet_common::unsupported!($crate::Runtime)49 };50}5152/// The address format for describing accounts.53pub type Address = sp_runtime::MultiAddress<AccountId, ()>;54/// Block header type as expected by this runtime.55pub type Header = generic::Header<BlockNumber, BlakeTwo256>;56/// Block type as expected by this runtime.57pub type Block = generic::Block<Header, UncheckedExtrinsic>;58/// A Block signed with a Justification59pub type SignedBlock = generic::SignedBlock<Block>;60/// BlockId type as expected by this runtime.61pub type BlockId = generic::BlockId<Block>;6263impl_opaque_keys! {64 pub struct SessionKeys {65 pub aura: Aura,66 }67}6869/// The version information used to identify this runtime when compiled natively.70#[cfg(feature = "std")]71pub fn native_version() -> NativeVersion {72 NativeVersion {73 runtime_version: crate::VERSION,74 can_author_with: Default::default(),75 }76}7778pub type ChargeTransactionPayment = pallet_charge_transaction::ChargeTransactionPayment<Runtime>;7980pub type SignedExtra = (81 frame_system::CheckSpecVersion<Runtime>,82 frame_system::CheckTxVersion<Runtime>,83 frame_system::CheckGenesis<Runtime>,84 frame_system::CheckEra<Runtime>,85 frame_system::CheckNonce<Runtime>,86 frame_system::CheckWeight<Runtime>,87 ChargeTransactionPayment,88 //pallet_contract_helpers::ContractHelpersExtension<Runtime>,89 pallet_ethereum::FakeTransactionFinalizer<Runtime>,90);9192/// Unchecked extrinsic type as expected by this runtime.93pub type UncheckedExtrinsic =94 fp_self_contained::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;9596/// Extrinsic type that has already been checked.97pub type CheckedExtrinsic = fp_self_contained::CheckedExtrinsic<AccountId, Call, SignedExtra, H160>;9899/// Executive: handles dispatch to the various modules.100pub type Executive = frame_executive::Executive<101 Runtime,102 Block,103 frame_system::ChainContext<Runtime>,104 Runtime,105 AllPalletsReversedWithSystemFirst,106>;107108type NegativeImbalance = <Balances as Currency<AccountId>>::NegativeImbalance;109110pub struct DealWithFees;111impl OnUnbalanced<NegativeImbalance> for DealWithFees {112 fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item = NegativeImbalance>) {113 if let Some(fees) = fees_then_tips.next() {114 // for fees, 100% to treasury115 let mut split = fees.ration(100, 0);116 if let Some(tips) = fees_then_tips.next() {117 // for tips, if any, 100% to treasury118 tips.ration_merge_into(100, 0, &mut split);119 }120 Treasury::on_unbalanced(split.0);121 // Author::on_unbalanced(split.1);122 }123 }124}125126pub struct RelayChainBlockNumberProvider<T>(sp_std::marker::PhantomData<T>);127128impl<T: cumulus_pallet_parachain_system::Config> BlockNumberProvider129 for RelayChainBlockNumberProvider<T>130{131 type BlockNumber = BlockNumber;132133 fn current_block_number() -> Self::BlockNumber {134 cumulus_pallet_parachain_system::Pallet::<T>::validation_data()135 .map(|d| d.relay_parent_number)136 .unwrap_or_default()137 }138}139140pub(crate) struct CheckInherents;141142impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {143 fn check_inherents(144 block: &Block,145 relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,146 ) -> sp_inherents::CheckInherentsResult {147 let relay_chain_slot = relay_state_proof148 .read_slot()149 .expect("Could not read the relay chain slot from the proof");150151 let inherent_data =152 cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(153 relay_chain_slot,154 sp_std::time::Duration::from_secs(6),155 )156 .create_inherent_data()157 .expect("Could not create the timestamp inherent data");158159 inherent_data.check_extrinsics(block)160 }161}162163#[derive(codec::Encode, codec::Decode)]164pub enum XCMPMessage<XAccountId, XBalance> {165 /// Transfer tokens to the given account from the Parachain account.166 TransferToken(XAccountId, XBalance),167}tests/src/tx-version-presence.test.tsdiffbeforeafterboth--- /dev/null
+++ b/tests/src/tx-version-presence.test.ts
@@ -0,0 +1,32 @@
+// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
+// This file is part of Unique Network.
+
+// Unique Network 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.
+
+// Unique Network 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 Unique Network. If not, see <http://www.gnu.org/licenses/>.
+
+import { Metadata } from '@polkadot/types';
+import {itSub, usingPlaygrounds, expect} from './util/playgrounds';
+
+let metadata: Metadata;
+
+describe('TxVersion is present', () => {
+ before(async () => {
+ await usingPlaygrounds(async helper => {
+ metadata = await helper.api!.rpc.state.getMetadata();
+ });
+ });
+
+ itSub('Signed extension CheckTxVersion is present', async () => {
+ expect(metadata.asLatest.extrinsic.signedExtensions.map(se => se.identifier.toString())).to.include('CheckTxVersion');
+ });
+});