difftreelog
cargo fmt
in: master
18 files changed
common-types/src/lib.rsdiffbeforeafterboth--- a/common-types/src/lib.rs
+++ b/common-types/src/lib.rs
@@ -17,8 +17,9 @@
#![cfg_attr(not(feature = "std"), no_std)]
use sp_runtime::{
- generic,
- traits::{Verify, IdentifyAccount}, MultiSignature,
+ generic,
+ traits::{Verify, IdentifyAccount},
+ MultiSignature,
};
/// Opaque types. These are used by the CLI to instantiate machinery that don't need to know
@@ -26,33 +27,29 @@
/// of data like extrinsics, allowing for them to continue syncing the network through upgrades
/// to even the core data structures.
pub mod opaque {
- pub use sp_runtime::{
- generic,
- traits::BlakeTwo256,
- OpaqueExtrinsic as UncheckedExtrinsic
- };
+ pub use sp_runtime::{generic, traits::BlakeTwo256, OpaqueExtrinsic as UncheckedExtrinsic};
pub use super::{BlockNumber, Signature, AccountId, Balance, Index, Hash, AuraId};
- /// Opaque block header type.
- pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
+ /// Opaque block header type.
+ pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
- /// Opaque block type.
- pub type Block = generic::Block<Header, UncheckedExtrinsic>;
+ /// Opaque block type.
+ pub type Block = generic::Block<Header, UncheckedExtrinsic>;
- pub trait RuntimeInstance {
- type CrossAccountId: pallet_evm::account::CrossAccountId<sp_runtime::AccountId32>
- + Send
- + Sync
- + 'static;
+ pub trait RuntimeInstance {
+ type CrossAccountId: pallet_evm::account::CrossAccountId<sp_runtime::AccountId32>
+ + Send
+ + Sync
+ + 'static;
- type TransactionConverter: fp_rpc::ConvertTransaction<UncheckedExtrinsic>
- + Send
- + Sync
- + 'static;
+ type TransactionConverter: fp_rpc::ConvertTransaction<UncheckedExtrinsic>
+ + Send
+ + Sync
+ + 'static;
- fn get_transaction_converter() -> Self::TransactionConverter;
- }
+ fn get_transaction_converter() -> Self::TransactionConverter;
+ }
}
pub type SessionHandlers = ();
node/rpc/src/lib.rsdiffbeforeafterboth--- a/node/rpc/src/lib.rs
+++ b/node/rpc/src/lib.rs
@@ -40,9 +40,7 @@
use sc_service::TransactionPool;
use std::{collections::BTreeMap, sync::Arc};
-use common_types::opaque::{
- Hash, AccountId, RuntimeInstance, Index, Block, BlockNumber, Balance,
-};
+use common_types::opaque::{Hash, AccountId, RuntimeInstance, Index, Block, BlockNumber, Balance};
// RMRK
use up_data_structs::{
runtime/common/config/ethereum.rsdiffbeforeafterboth--- a/runtime/common/config/ethereum.rs
+++ b/runtime/common/config/ethereum.rs
@@ -1,28 +1,18 @@
use sp_core::{U256, H160};
use frame_support::{
- weights::{Weight, constants::WEIGHT_PER_SECOND},
- traits::{FindAuthor},
- parameter_types, ConsensusEngineId,
+ weights::{Weight, constants::WEIGHT_PER_SECOND},
+ traits::{FindAuthor},
+ parameter_types, ConsensusEngineId,
};
use sp_runtime::{RuntimeAppPublic, Perbill};
use crate::{
- runtime_common::{
- constants::*,
- dispatch::CollectionDispatchT,
- ethereum::sponsoring::EvmSponsorshipHandler,
- config::sponsoring::DefaultSponsoringRateLimit,
- DealWithFees,
- },
- Runtime,
- Aura,
- Balances,
- Event,
- ChainId,
+ runtime_common::{
+ constants::*, dispatch::CollectionDispatchT, ethereum::sponsoring::EvmSponsorshipHandler,
+ config::sponsoring::DefaultSponsoringRateLimit, DealWithFees,
+ },
+ Runtime, Aura, Balances, Event, ChainId,
};
-use pallet_evm::{
- EnsureAddressTruncated,
- HashedAddressMapping,
-};
+use pallet_evm::{EnsureAddressTruncated, HashedAddressMapping};
pub type CrossAccountId = pallet_evm::account::BasicCrossAccountId<Runtime>;
@@ -116,7 +106,7 @@
}
parameter_types! {
- // 0x842899ECF380553E8a4de75bF534cdf6fBF64049
+ // 0x842899ECF380553E8a4de75bF534cdf6fBF64049
pub const HelpersContractAddress: H160 = H160([
0x84, 0x28, 0x99, 0xec, 0xf3, 0x80, 0x55, 0x3e, 0x8a, 0x4d, 0xe7, 0x5b, 0xf5, 0x34, 0xcd, 0xf6, 0xfb, 0xf6, 0x40, 0x49,
]);
runtime/common/config/mod.rsdiffbeforeafterboth--- a/runtime/common/config/mod.rs
+++ b/runtime/common/config/mod.rs
@@ -14,10 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
-pub mod substrate;
pub mod ethereum;
-pub mod sponsoring;
+pub mod orml;
pub mod pallets;
pub mod parachain;
+pub mod sponsoring;
+pub mod substrate;
pub mod xcm;
-pub mod orml;
runtime/common/config/orml.rsdiffbeforeafterboth--- a/runtime/common/config/orml.rs
+++ b/runtime/common/config/orml.rs
@@ -16,10 +16,7 @@
use frame_support::parameter_types;
use frame_system::EnsureSigned;
-use crate::{
- runtime_common::constants::*,
- Runtime, Event, RelayChainBlockNumberProvider,
-};
+use crate::{runtime_common::constants::*, Runtime, Event, RelayChainBlockNumberProvider};
use common_types::{AccountId, Balance};
parameter_types! {
runtime/common/config/pallets/mod.rsdiffbeforeafterboth--- a/runtime/common/config/pallets/mod.rs
+++ b/runtime/common/config/pallets/mod.rs
@@ -17,24 +17,18 @@
use frame_support::parameter_types;
use sp_runtime::traits::AccountIdConversion;
use crate::{
- runtime_common::{
- constants::*,
- dispatch::CollectionDispatchT,
- config::{
- substrate::TreasuryModuleId,
- ethereum::EvmCollectionHelpersAddress,
- },
- weights::CommonWeights,
- RelayChainBlockNumberProvider,
- },
- Runtime,
- Event,
- Call,
- Balances,
+ runtime_common::{
+ constants::*,
+ dispatch::CollectionDispatchT,
+ config::{substrate::TreasuryModuleId, ethereum::EvmCollectionHelpersAddress},
+ weights::CommonWeights,
+ RelayChainBlockNumberProvider,
+ },
+ Runtime, Event, Call, Balances,
};
use common_types::{AccountId, Balance, BlockNumber};
use up_data_structs::{
- mapping::{EvmTokenAddressMapping, CrossTokenAddressMapping},
+ mapping::{EvmTokenAddressMapping, CrossTokenAddressMapping},
};
#[cfg(feature = "rmrk")]
runtime/common/config/pallets/scheduler.rsdiffbeforeafterboth--- a/runtime/common/config/pallets/scheduler.rs
+++ b/runtime/common/config/pallets/scheduler.rs
@@ -14,20 +14,13 @@
// You should have received a copy of the GNU General Public License
// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
-use frame_support::{
- traits::PrivilegeCmp,
- weights::Weight,
- parameter_types
-};
+use frame_support::{traits::PrivilegeCmp, weights::Weight, parameter_types};
use frame_system::EnsureSigned;
use sp_runtime::Perbill;
use sp_std::cmp::Ordering;
use crate::{
- runtime_common::{
- scheduler::SchedulerPaymentExecutor,
- config::substrate::RuntimeBlockWeights,
- },
- Runtime, Call, Event, Origin, OriginCaller, Balances
+ runtime_common::{scheduler::SchedulerPaymentExecutor, config::substrate::RuntimeBlockWeights},
+ Runtime, Call, Event, Origin, OriginCaller, Balances,
};
use common_types::AccountId;
@@ -36,7 +29,7 @@
RuntimeBlockWeights::get().max_block;
pub const MaxScheduledPerBlock: u32 = 50;
- pub const NoPreimagePostponement: Option<u32> = Some(10);
+ pub const NoPreimagePostponement: Option<u32> = Some(10);
pub const Preimage: Option<u32> = Some(10);
}
runtime/common/config/parachain.rsdiffbeforeafterboth--- a/runtime/common/config/parachain.rs
+++ b/runtime/common/config/parachain.rs
@@ -14,17 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
-use frame_support::{
- weights::Weight,
- parameter_types,
-};
-use crate::{
- runtime_common::constants::*,
- Runtime,
- Event,
- XcmpQueue,
- DmpQueue,
-};
+use frame_support::{weights::Weight, parameter_types};
+use crate::{runtime_common::constants::*, Runtime, Event, XcmpQueue, DmpQueue};
parameter_types! {
pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;
runtime/common/config/sponsoring.rsdiffbeforeafterboth--- a/runtime/common/config/sponsoring.rs
+++ b/runtime/common/config/sponsoring.rs
@@ -16,16 +16,13 @@
use frame_support::parameter_types;
use crate::{
- runtime_common::{
- constants::*,
- sponsoring::UniqueSponsorshipHandler,
- },
- Runtime,
+ runtime_common::{constants::*, sponsoring::UniqueSponsorshipHandler},
+ Runtime,
};
use common_types::BlockNumber;
parameter_types! {
- pub const DefaultSponsoringRateLimit: BlockNumber = 1 * DAYS;
+ pub const DefaultSponsoringRateLimit: BlockNumber = 1 * DAYS;
}
type SponsorshipHandler = (
runtime/common/config/substrate.rsdiffbeforeafterboth--- a/runtime/common/config/substrate.rs
+++ b/runtime/common/config/substrate.rs
@@ -18,11 +18,10 @@
traits::{Everything, ConstU32},
weights::{
constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight},
- DispatchClass, WeightToFeePolynomial, WeightToFeeCoefficients,
- ConstantMultiplier, WeightToFeeCoefficient,
+ DispatchClass, WeightToFeePolynomial, WeightToFeeCoefficients, ConstantMultiplier,
+ WeightToFeeCoefficient,
},
- parameter_types,
- PalletId,
+ parameter_types, PalletId,
};
use sp_runtime::{
generic,
@@ -36,20 +35,8 @@
use sp_arithmetic::traits::{BaseArithmetic, Unsigned};
use smallvec::smallvec;
use crate::{
- runtime_common::{
- DealWithFees,
- constants::*,
- },
- Runtime,
- Event,
- Call,
- Origin,
- PalletInfo,
- System,
- Balances,
- Treasury,
- SS58Prefix,
- Version,
+ runtime_common::{DealWithFees, constants::*},
+ Runtime, Event, Call, Origin, PalletInfo, System, Balances, Treasury, SS58Prefix, Version,
};
use common_types::*;
runtime/common/config/xcm.rsdiffbeforeafterboth--- a/runtime/common/config/xcm.rs
+++ b/runtime/common/config/xcm.rs
@@ -15,19 +15,15 @@
// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
use frame_support::{
- traits::{
- tokens::currency::Currency as CurrencyT,
- OnUnbalanced as OnUnbalancedT,
- Get, Everything
- },
- weights::{Weight, WeightToFeePolynomial, WeightToFee},
- parameter_types, match_types,
+ traits::{
+ tokens::currency::Currency as CurrencyT, OnUnbalanced as OnUnbalancedT, Get, Everything,
+ },
+ weights::{Weight, WeightToFeePolynomial, WeightToFee},
+ parameter_types, match_types,
};
use frame_system::EnsureRoot;
use sp_runtime::{
- traits::{
- Saturating, CheckedConversion, Zero,
- },
+ traits::{Saturating, CheckedConversion, Zero},
SaturatedConversion,
};
use pallet_xcm::XcmPassthrough;
@@ -36,8 +32,7 @@
use xcm::latest::{
AssetId::{Concrete},
Fungibility::Fungible as XcmFungible,
- MultiAsset,
- Error as XcmError,
+ MultiAsset, Error as XcmError,
};
use xcm_executor::traits::{MatchesFungible, WeightTrader};
use xcm_builder::{
@@ -49,19 +44,8 @@
use xcm_executor::{Config, XcmExecutor, Assets};
use sp_std::marker::PhantomData;
use crate::{
- runtime_common::{
- constants::*,
- config::substrate::LinearFee
- },
- Runtime,
- Call,
- Event,
- Origin,
- Balances,
- ParachainInfo,
- ParachainSystem,
- PolkadotXcm,
- XcmpQueue,
+ runtime_common::{constants::*, config::substrate::LinearFee},
+ Runtime, Call, Event, Origin, Balances, ParachainInfo, ParachainSystem, PolkadotXcm, XcmpQueue,
};
use common_types::{AccountId, Balance};
runtime/common/ethereum/mod.rsdiffbeforeafterboth--- a/runtime/common/ethereum/mod.rs
+++ b/runtime/common/ethereum/mod.rs
@@ -14,6 +14,6 @@
// You should have received a copy of the GNU General Public License
// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
+pub mod self_contained_call;
pub mod sponsoring;
pub mod transaction_converter;
-pub mod self_contained_call;
runtime/common/ethereum/self_contained_call.rsdiffbeforeafterboth--- a/runtime/common/ethereum/self_contained_call.rs
+++ b/runtime/common/ethereum/self_contained_call.rs
@@ -16,8 +16,8 @@
use sp_core::H160;
use sp_runtime::{
- traits::{Dispatchable, DispatchInfoOf, PostDispatchInfoOf},
- transaction_validity::{TransactionValidityError, TransactionValidity},
+ traits::{Dispatchable, DispatchInfoOf, PostDispatchInfoOf},
+ transaction_validity::{TransactionValidityError, TransactionValidity},
};
use crate::{Origin, Call};
runtime/common/ethereum/sponsoring.rsdiffbeforeafterboth--- a/runtime/common/ethereum/sponsoring.rs
+++ b/runtime/common/ethereum/sponsoring.rs
@@ -27,10 +27,7 @@
use up_data_structs::{TokenId, CreateItemData, CreateNftData, CollectionMode};
use pallet_unique::Config as UniqueConfig;
-use crate::{
- Runtime,
- runtime_common::sponsoring::*
-};
+use crate::{Runtime, runtime_common::sponsoring::*};
use pallet_nonfungible::erc::{
UniqueNFTCall, ERC721UniqueExtensionsCall, ERC721MintableCall, ERC721Call, TokenPropertiesCall,
runtime/common/ethereum/transaction_converter.rsdiffbeforeafterboth--- a/runtime/common/ethereum/transaction_converter.rs
+++ b/runtime/common/ethereum/transaction_converter.rs
@@ -15,11 +15,7 @@
// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
use codec::{Encode, Decode};
-use crate::{
- opaque,
- Runtime,
- UncheckedExtrinsic,
-};
+use crate::{opaque, Runtime, UncheckedExtrinsic};
pub struct TransactionConverter;
runtime/common/instance.rsdiffbeforeafterboth--- a/runtime/common/instance.rs
+++ b/runtime/common/instance.rs
@@ -1,9 +1,8 @@
use crate::{
- runtime_common::{
- config::ethereum::CrossAccountId,
- ethereum::transaction_converter::TransactionConverter
- },
- Runtime,
+ runtime_common::{
+ config::ethereum::CrossAccountId, ethereum::transaction_converter::TransactionConverter,
+ },
+ Runtime,
};
use common_types::opaque::RuntimeInstance;
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 constants;18pub mod construct_runtime;19pub mod dispatch;20pub mod runtime_apis;21pub mod sponsoring;22pub mod weights;23pub mod config;24pub mod instance;25pub mod ethereum;26pub mod scheduler;2728use sp_core::H160;29use frame_support::traits::{Currency, OnUnbalanced, Imbalance};30use sp_runtime::{31 generic,32 traits::{BlakeTwo256, BlockNumberProvider},33 impl_opaque_keys,34};35use sp_std::vec::Vec;3637#[cfg(feature = "std")]38use sp_version::NativeVersion;3940use crate::{41 Runtime, Call, Balances, Treasury, Aura, Signature, AllPalletsReversedWithSystemFirst,42 InherentDataExt,43};44use common_types::{AccountId, BlockNumber};4546pub type CommonError = pallet_common::Error<Runtime>;4748/// The address format for describing accounts.49pub type Address = sp_runtime::MultiAddress<AccountId, ()>;50/// Block header type as expected by this runtime.51pub type Header = generic::Header<BlockNumber, BlakeTwo256>;52/// Block type as expected by this runtime.53pub type Block = generic::Block<Header, UncheckedExtrinsic>;54/// A Block signed with a Justification55pub type SignedBlock = generic::SignedBlock<Block>;56/// BlockId type as expected by this runtime.57pub type BlockId = generic::BlockId<Block>;5859impl_opaque_keys! {60 pub struct SessionKeys {61 pub aura: Aura,62 }63}6465/// The version information used to identify this runtime when compiled natively.66#[cfg(feature = "std")]67pub fn native_version() -> NativeVersion {68 NativeVersion {69 runtime_version: crate::VERSION,70 can_author_with: Default::default(),71 }72}7374pub type ChargeTransactionPayment = pallet_charge_transaction::ChargeTransactionPayment<Runtime>;7576pub type SignedExtra = (77 frame_system::CheckSpecVersion<Runtime>,78 // system::CheckTxVersion<Runtime>,79 frame_system::CheckGenesis<Runtime>,80 frame_system::CheckEra<Runtime>,81 frame_system::CheckNonce<Runtime>,82 frame_system::CheckWeight<Runtime>,83 ChargeTransactionPayment,84 //pallet_contract_helpers::ContractHelpersExtension<Runtime>,85 pallet_ethereum::FakeTransactionFinalizer<Runtime>,86);8788/// Unchecked extrinsic type as expected by this runtime.89pub type UncheckedExtrinsic =90 fp_self_contained::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;9192/// Extrinsic type that has already been checked.93pub type CheckedExtrinsic = fp_self_contained::CheckedExtrinsic<AccountId, Call, SignedExtra, H160>;9495/// Executive: handles dispatch to the various modules.96pub type Executive = frame_executive::Executive<97 Runtime,98 Block,99 frame_system::ChainContext<Runtime>,100 Runtime,101 AllPalletsReversedWithSystemFirst,102>;103104type NegativeImbalance = <Balances as Currency<AccountId>>::NegativeImbalance;105106pub struct DealWithFees;107impl OnUnbalanced<NegativeImbalance> for DealWithFees {108 fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item = NegativeImbalance>) {109 if let Some(fees) = fees_then_tips.next() {110 // for fees, 100% to treasury111 let mut split = fees.ration(100, 0);112 if let Some(tips) = fees_then_tips.next() {113 // for tips, if any, 100% to treasury114 tips.ration_merge_into(100, 0, &mut split);115 }116 Treasury::on_unbalanced(split.0);117 // Author::on_unbalanced(split.1);118 }119 }120}121122pub struct RelayChainBlockNumberProvider<T>(sp_std::marker::PhantomData<T>);123124impl<T: cumulus_pallet_parachain_system::Config> BlockNumberProvider125 for RelayChainBlockNumberProvider<T>126{127 type BlockNumber = BlockNumber;128129 fn current_block_number() -> Self::BlockNumber {130 cumulus_pallet_parachain_system::Pallet::<T>::validation_data()131 .map(|d| d.relay_parent_number)132 .unwrap_or_default()133 }134}135136pub(crate) struct CheckInherents;137138impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {139 fn check_inherents(140 block: &Block,141 relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,142 ) -> sp_inherents::CheckInherentsResult {143 let relay_chain_slot = relay_state_proof144 .read_slot()145 .expect("Could not read the relay chain slot from the proof");146147 let inherent_data =148 cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(149 relay_chain_slot,150 sp_std::time::Duration::from_secs(6),151 )152 .create_inherent_data()153 .expect("Could not create the timestamp inherent data");154155 inherent_data.check_extrinsics(block)156 }157}158159#[derive(codec::Encode, codec::Decode)]160pub enum XCMPMessage<XAccountId, XBalance> {161 /// Transfer tokens to the given account from the Parachain account.162 TransferToken(XAccountId, XBalance),163}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 constants;19pub mod construct_runtime;20pub mod dispatch;21pub mod ethereum;22pub mod instance;23pub mod runtime_apis;24pub mod scheduler;25pub mod sponsoring;26pub mod weights;2728use sp_core::H160;29use frame_support::traits::{Currency, OnUnbalanced, Imbalance};30use sp_runtime::{31 generic,32 traits::{BlakeTwo256, BlockNumberProvider},33 impl_opaque_keys,34};35use sp_std::vec::Vec;3637#[cfg(feature = "std")]38use sp_version::NativeVersion;3940use crate::{41 Runtime, Call, Balances, Treasury, Aura, Signature, AllPalletsReversedWithSystemFirst,42 InherentDataExt,43};44use common_types::{AccountId, BlockNumber};4546pub type CommonError = pallet_common::Error<Runtime>;4748/// The address format for describing accounts.49pub type Address = sp_runtime::MultiAddress<AccountId, ()>;50/// Block header type as expected by this runtime.51pub type Header = generic::Header<BlockNumber, BlakeTwo256>;52/// Block type as expected by this runtime.53pub type Block = generic::Block<Header, UncheckedExtrinsic>;54/// A Block signed with a Justification55pub type SignedBlock = generic::SignedBlock<Block>;56/// BlockId type as expected by this runtime.57pub type BlockId = generic::BlockId<Block>;5859impl_opaque_keys! {60 pub struct SessionKeys {61 pub aura: Aura,62 }63}6465/// The version information used to identify this runtime when compiled natively.66#[cfg(feature = "std")]67pub fn native_version() -> NativeVersion {68 NativeVersion {69 runtime_version: crate::VERSION,70 can_author_with: Default::default(),71 }72}7374pub type ChargeTransactionPayment = pallet_charge_transaction::ChargeTransactionPayment<Runtime>;7576pub type SignedExtra = (77 frame_system::CheckSpecVersion<Runtime>,78 // system::CheckTxVersion<Runtime>,79 frame_system::CheckGenesis<Runtime>,80 frame_system::CheckEra<Runtime>,81 frame_system::CheckNonce<Runtime>,82 frame_system::CheckWeight<Runtime>,83 ChargeTransactionPayment,84 //pallet_contract_helpers::ContractHelpersExtension<Runtime>,85 pallet_ethereum::FakeTransactionFinalizer<Runtime>,86);8788/// Unchecked extrinsic type as expected by this runtime.89pub type UncheckedExtrinsic =90 fp_self_contained::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;9192/// Extrinsic type that has already been checked.93pub type CheckedExtrinsic = fp_self_contained::CheckedExtrinsic<AccountId, Call, SignedExtra, H160>;9495/// Executive: handles dispatch to the various modules.96pub type Executive = frame_executive::Executive<97 Runtime,98 Block,99 frame_system::ChainContext<Runtime>,100 Runtime,101 AllPalletsReversedWithSystemFirst,102>;103104type NegativeImbalance = <Balances as Currency<AccountId>>::NegativeImbalance;105106pub struct DealWithFees;107impl OnUnbalanced<NegativeImbalance> for DealWithFees {108 fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item = NegativeImbalance>) {109 if let Some(fees) = fees_then_tips.next() {110 // for fees, 100% to treasury111 let mut split = fees.ration(100, 0);112 if let Some(tips) = fees_then_tips.next() {113 // for tips, if any, 100% to treasury114 tips.ration_merge_into(100, 0, &mut split);115 }116 Treasury::on_unbalanced(split.0);117 // Author::on_unbalanced(split.1);118 }119 }120}121122pub struct RelayChainBlockNumberProvider<T>(sp_std::marker::PhantomData<T>);123124impl<T: cumulus_pallet_parachain_system::Config> BlockNumberProvider125 for RelayChainBlockNumberProvider<T>126{127 type BlockNumber = BlockNumber;128129 fn current_block_number() -> Self::BlockNumber {130 cumulus_pallet_parachain_system::Pallet::<T>::validation_data()131 .map(|d| d.relay_parent_number)132 .unwrap_or_default()133 }134}135136pub(crate) struct CheckInherents;137138impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {139 fn check_inherents(140 block: &Block,141 relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,142 ) -> sp_inherents::CheckInherentsResult {143 let relay_chain_slot = relay_state_proof144 .read_slot()145 .expect("Could not read the relay chain slot from the proof");146147 let inherent_data =148 cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(149 relay_chain_slot,150 sp_std::time::Duration::from_secs(6),151 )152 .create_inherent_data()153 .expect("Could not create the timestamp inherent data");154155 inherent_data.check_extrinsics(block)156 }157}158159#[derive(codec::Encode, codec::Decode)]160pub enum XCMPMessage<XAccountId, XBalance> {161 /// Transfer tokens to the given account from the Parachain account.162 TransferToken(XAccountId, XBalance),163}runtime/common/scheduler.rsdiffbeforeafterboth--- a/runtime/common/scheduler.rs
+++ b/runtime/common/scheduler.rs
@@ -15,19 +15,16 @@
// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
use frame_support::{
- traits::NamedReservableCurrency,
- weights::{GetDispatchInfo, PostDispatchInfo, DispatchInfo},
+ traits::NamedReservableCurrency,
+ weights::{GetDispatchInfo, PostDispatchInfo, DispatchInfo},
};
use sp_runtime::{
- traits::{Dispatchable, Applyable, Member},
+ traits::{Dispatchable, Applyable, Member},
generic::Era,
- transaction_validity::TransactionValidityError,
+ transaction_validity::TransactionValidityError,
DispatchErrorWithPostInfo, DispatchError,
-};
-use crate::{
- Runtime, Call, Origin, Balances,
- ChargeTransactionPayment,
};
+use crate::{Runtime, Call, Origin, Balances, ChargeTransactionPayment};
use common_types::{AccountId, Balance};
use fp_self_contained::SelfContainedCall;
use pallet_unique_scheduler::DispatchCall;
@@ -85,11 +82,11 @@
SignedExtraScheduler,
SelfContainedSignedInfo,
> {
- signed:
- fp_self_contained::CheckedSignature::<AccountId, SignedExtraScheduler, SelfContainedSignedInfo>::Signed(
- signer.clone().into(),
- get_signed_extras(signer.into()),
- ),
+ signed: fp_self_contained::CheckedSignature::<
+ AccountId,
+ SignedExtraScheduler,
+ SelfContainedSignedInfo,
+ >::Signed(signer.clone().into(), get_signed_extras(signer.into())),
function: call.into(),
};