difftreelog
Pallet Democracy
in: master
3 files changed
node/src/chain_spec.rsdiffbeforeafterboth--- a/node/src/chain_spec.rs
+++ b/node/src/chain_spec.rs
@@ -147,12 +147,24 @@
pallet_aura: Some(AuraConfig {
authorities: initial_authorities.iter().map(|x| (x.0.clone())).collect(),
}),
- pallet_grandpa: Some(GrandpaConfig {
+ pallet_collective_Instance1: Some(CouncilConfig {
+ members: vec![],
+ phantom: Default::default(),
+ }),
+ pallet_collective_Instance2: Some(TechnicalCommitteeConfig {
+ members: vec![],
+ phantom: Default::default(),
+ }),
+ pallet_democracy: Some(DemocracyConfig::default()),
+ pallet_grandpa: Some(GrandpaConfig {
authorities: initial_authorities
.iter()
.map(|x| (x.1.clone(), 1))
.collect(),
- }),
+ }),
+ pallet_elections_phragmen: Some(Default::default()),
+ pallet_membership: Some(Default::default()),
+ pallet_treasury: Some(Default::default()),
pallet_sudo: Some(SudoConfig { key: root_key }),
pallet_nft: Some(NftConfig {
collection: vec![(
runtime/Cargo.tomldiffbeforeafterboth--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -57,6 +57,13 @@
sp-transaction-pool = { default-features = false, version = '2.0.0' , git = 'https://github.com/usetech-llc/substrate.git', branch = 'v2.0.0_release' }
sp-version = { default-features = false, version = '2.0.0' , git = 'https://github.com/usetech-llc/substrate.git', branch = 'v2.0.0_release' }
+pallet-membership = { version = "2.0.0", default-features = false, git = 'https://github.com/usetech-llc/substrate.git', branch = 'v2.0.0_release' }
+pallet-collective = { default-features = false, version = '2.0.0' , git = 'https://github.com/usetech-llc/substrate.git', branch = 'v2.0.0_release' }
+pallet-democracy = { default-features = false, version = '2.0.0' , git = 'https://github.com/usetech-llc/substrate.git', branch = 'v2.0.0_release' }
+pallet-elections-phragmen = { version = "2.0.0", default-features = false, git = 'https://github.com/usetech-llc/substrate.git', branch = 'v2.0.0_release' }
+pallet-treasury = { version = "2.0.0", default-features = false, git = 'https://github.com/usetech-llc/substrate.git', branch = 'v2.0.0_release' }
+pallet-scheduler = { version = "2.0.0", default-features = false, git = 'https://github.com/usetech-llc/substrate.git', branch = 'v2.0.0_release' }
+
[features]
default = ['std']
runtime-benchmarks = [
@@ -100,4 +107,11 @@
'sp-std/std',
'sp-transaction-pool/std',
'sp-version/std',
+
+ 'pallet-collective/std',
+ 'pallet-democracy/std',
+ 'pallet-elections-phragmen/std',
+ 'pallet-membership/std',
+ 'pallet-treasury/std',
+ 'pallet-scheduler/std',
]
runtime/src/lib.rsdiffbeforeafterboth1//! The Substrate Node Template runtime. This can be compiled with `#[no_std]`, ready for Wasm.23#![cfg_attr(not(feature = "std"), no_std)]4// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.5#![recursion_limit = "256"]67// Make the WASM binary available.8#[cfg(feature = "std")]9include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));1011use pallet_contracts_rpc_runtime_api::ContractExecResult;12use pallet_grandpa::fg_primitives;13use pallet_grandpa::{AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList};14use sp_api::impl_runtime_apis;15use sp_consensus_aura::sr25519::AuthorityId as AuraId;16use sp_core::{crypto::KeyTypeId, OpaqueMetadata};17use sp_runtime::{18 create_runtime_str, generic, impl_opaque_keys,19 traits::{20 BlakeTwo256, Block as BlockT, IdentifyAccount, IdentityLookup, NumberFor, Saturating,21 Verify,22 },23 transaction_validity::{TransactionSource, TransactionValidity},24 ApplyExtrinsicResult, MultiSignature,25};26use sp_std::prelude::*;27#[cfg(feature = "std")]28use sp_version::NativeVersion;29use sp_version::RuntimeVersion;3031// A few exports that help ease life for downstream crates.32pub use pallet_balances::Call as BalancesCall;33pub use pallet_contracts::Schedule as ContractsSchedule;34pub use frame_support::{35 construct_runtime,36 dispatch::DispatchResult,37 parameter_types,38 traits::{39 Currency, ExistenceRequirement, Get, KeyOwnerProofSystem, OnUnbalanced, Randomness,40 WithdrawReason,41 },42 weights::{43 constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},44 DispatchInfo, GetDispatchInfo, IdentityFee, Pays, PostDispatchInfo, Weight,45 WeightToFeePolynomial,46 },47 StorageValue,48};49#[cfg(any(feature = "std", test))]50pub use sp_runtime::BuildStorage;51use sp_runtime::Perbill;52use frame_system::{self as system};5354pub use pallet_timestamp::Call as TimestampCall;5556/// Re-export a nft pallet57/// TODO: Check this re-export. Is this safe and good style?58extern crate pallet_nft;59pub use pallet_nft::*;6061/// An index to a block.62pub type BlockNumber = u32;6364/// Alias to 512-bit hash when used in the context of a transaction signature on the chain.65pub type Signature = MultiSignature;6667/// Some way of identifying an account on the chain. We intentionally make it equivalent68/// to the public key of our transaction signing scheme.69pub type AccountId = <<Signature as Verify>::Signer as IdentifyAccount>::AccountId;7071/// The type for looking up accounts. We don't expect more than 4 billion of them, but you72/// never know...73pub type AccountIndex = u32;7475/// Balance of an account.76pub type Balance = u128;7778/// Index of a transaction in the chain.79pub type Index = u32;8081/// A hash of some data used by the chain.82pub type Hash = sp_core::H256;8384/// Digest item type.85pub type DigestItem = generic::DigestItem<Hash>;8687mod nft_weights;8889/// Opaque types. These are used by the CLI to instantiate machinery that don't need to know90/// the specifics of the runtime. They can then be made to be agnostic over specific formats91/// of data like extrinsics, allowing for them to continue syncing the network through upgrades92/// to even the core data structures.93pub mod opaque {94 use super::*;9596 pub use sp_runtime::OpaqueExtrinsic as UncheckedExtrinsic;9798 /// Opaque block header type.99 pub type Header = generic::Header<BlockNumber, BlakeTwo256>;100 /// Opaque block type.101 pub type Block = generic::Block<Header, UncheckedExtrinsic>;102 /// Opaque block identifier type.103 pub type BlockId = generic::BlockId<Block>;104105 impl_opaque_keys! {106 pub struct SessionKeys {107 pub aura: Aura,108 pub grandpa: Grandpa,109 }110 }111}112113/// This runtime version.114pub const VERSION: RuntimeVersion = RuntimeVersion {115 spec_name: create_runtime_str!("nft"),116 impl_name: create_runtime_str!("nft"),117 authoring_version: 1,118 spec_version: 2,119 impl_version: 1,120 apis: RUNTIME_API_VERSIONS,121 transaction_version: 1,122};123124pub const MILLISECS_PER_BLOCK: u64 = 6000;125126pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK;127128// These time units are defined in number of blocks.129pub const MINUTES: BlockNumber = 60_000 / (MILLISECS_PER_BLOCK as BlockNumber);130pub const HOURS: BlockNumber = MINUTES * 60;131pub const DAYS: BlockNumber = HOURS * 24;132133/// The version information used to identify this runtime when compiled natively.134#[cfg(feature = "std")]135pub fn native_version() -> NativeVersion {136 NativeVersion {137 runtime_version: VERSION,138 can_author_with: Default::default(),139 }140}141142parameter_types! {143 pub const BlockHashCount: BlockNumber = 2400;144 /// We allow for 2 seconds of compute with a 6 second average block time.145 pub const MaximumBlockWeight: Weight = 2 * WEIGHT_PER_SECOND;146 pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);147 /// Assume 10% of weight for average on_initialize calls.148 pub MaximumExtrinsicWeight: Weight = AvailableBlockRatio::get()149 .saturating_sub(Perbill::from_percent(10)) * MaximumBlockWeight::get();150 pub const MaximumBlockLength: u32 = 5 * 1024 * 1024;151 pub const Version: RuntimeVersion = VERSION;152}153154impl system::Trait for Runtime {155 /// The basic call filter to use in dispatchable.156 type BaseCallFilter = ();157 /// The identifier used to distinguish between accounts.158 type AccountId = AccountId;159 /// The aggregated dispatch type that is available for extrinsics.160 type Call = Call;161 /// The lookup mechanism to get account ID from whatever is passed in dispatchers.162 type Lookup = IdentityLookup<AccountId>;163 /// The index type for storing how many extrinsics an account has signed.164 type Index = Index;165 /// The index type for blocks.166 type BlockNumber = BlockNumber;167 /// The type for hashing blocks and tries.168 type Hash = Hash;169 /// The hashing algorithm used.170 type Hashing = BlakeTwo256;171 /// The header type.172 type Header = generic::Header<BlockNumber, BlakeTwo256>;173 /// The ubiquitous event type.174 type Event = Event;175 /// The ubiquitous origin type.176 type Origin = Origin;177 /// Maximum number of block number to block hash mappings to keep (oldest pruned first).178 type BlockHashCount = BlockHashCount;179 /// Maximum weight of each block.180 type MaximumBlockWeight = MaximumBlockWeight;181 /// The weight of database operations that the runtime can invoke.182 type DbWeight = RocksDbWeight;183 /// The weight of the overhead invoked on the block import process, independent of the184 /// extrinsics included in that block.185 type BlockExecutionWeight = BlockExecutionWeight;186 /// The base weight of any extrinsic processed by the runtime, independent of the187 /// logic of that extrinsic. (Signature verification, nonce increment, fee, etc...)188 type ExtrinsicBaseWeight = ExtrinsicBaseWeight;189 /// The maximum weight that a single extrinsic of `Normal` dispatch class can have,190 /// idependent of the logic of that extrinsics. (Roughly max block weight - average on191 /// initialize cost).192 type MaximumExtrinsicWeight = MaximumExtrinsicWeight;193 /// Maximum size of all encoded transactions (in bytes) that are allowed in one block.194 type MaximumBlockLength = MaximumBlockLength;195 /// Portion of the block weight that is available to all normal transactions.196 type AvailableBlockRatio = AvailableBlockRatio;197 /// Version of the runtime.198 type Version = Version;199 /// This type is being generated by `construct_runtime!`.200 type PalletInfo = PalletInfo;201 /// What to do if a new account is created.202 type OnNewAccount = ();203 /// What to do if an account is fully reaped from the system.204 type OnKilledAccount = ();205 /// The data to be stored in an account.206 type AccountData = pallet_balances::AccountData<Balance>;207 /// Weight information for the extrinsics of this pallet.208 type SystemWeightInfo = ();209}210211impl pallet_aura::Trait for Runtime {212 type AuthorityId = AuraId;213}214215impl pallet_grandpa::Trait for Runtime {216 type Event = Event;217 type Call = Call;218219 type KeyOwnerProofSystem = ();220221 type KeyOwnerProof =222 <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(KeyTypeId, GrandpaId)>>::Proof;223224 type KeyOwnerIdentification = <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(225 KeyTypeId,226 GrandpaId,227 )>>::IdentificationTuple;228229 type HandleEquivocation = ();230231 type WeightInfo = ();232}233234parameter_types! {235 pub const MinimumPeriod: u64 = SLOT_DURATION / 2;236}237238impl pallet_timestamp::Trait for Runtime {239 /// A timestamp: milliseconds since the unix epoch.240 type Moment = u64;241 type OnTimestampSet = Aura;242 type MinimumPeriod = MinimumPeriod;243 type WeightInfo = ();244}245246parameter_types! {247 // pub const ExistentialDeposit: u128 = 500;248 pub const ExistentialDeposit: u128 = 0;249 pub const MaxLocks: u32 = 50;250}251252impl pallet_balances::Trait for Runtime {253 type MaxLocks = MaxLocks;254 /// The type for recording an account's balance.255 type Balance = Balance;256 /// The ubiquitous event type.257 type Event = Event;258 type DustRemoval = ();259 type ExistentialDeposit = ExistentialDeposit;260 type AccountStore = System;261 type WeightInfo = ();262}263264pub const MILLICENTS: Balance = 1_000_000_000;265pub const CENTS: Balance = 1_000 * MILLICENTS;266pub const DOLLARS: Balance = 100 * CENTS;267268parameter_types! {269 pub const TombstoneDeposit: Balance = 16 * MILLICENTS;270 pub const RentByteFee: Balance = 4 * MILLICENTS;271 pub const RentDepositOffset: Balance = 1000 * MILLICENTS;272 pub const SurchargeReward: Balance = 150 * MILLICENTS;273}274275impl pallet_contracts::Trait for Runtime {276 type Time = Timestamp;277 type Randomness = RandomnessCollectiveFlip;278 type Currency = Balances;279 type Event = Event;280 type DetermineContractAddress = pallet_contracts::SimpleAddressDeterminer<Runtime>;281 type TrieIdGenerator = pallet_contracts::TrieIdFromParentCounter<Runtime>;282 type RentPayment = ();283 type SignedClaimHandicap = pallet_contracts::DefaultSignedClaimHandicap;284 type TombstoneDeposit = TombstoneDeposit;285 type StorageSizeOffset = pallet_contracts::DefaultStorageSizeOffset;286 type RentByteFee = RentByteFee;287 type RentDepositOffset = RentDepositOffset;288 type SurchargeReward = SurchargeReward;289 type MaxDepth = pallet_contracts::DefaultMaxDepth;290 type MaxValueSize = pallet_contracts::DefaultMaxValueSize;291 type WeightPrice = pallet_transaction_payment::Module<Self>;292}293294parameter_types! {295 pub const TransactionByteFee: Balance = 10 * MILLICENTS;296}297298impl pallet_transaction_payment::Trait for Runtime {299 type Currency = pallet_balances::Module<Runtime>;300 type OnTransactionPayment = ();301 type TransactionByteFee = TransactionByteFee;302 type WeightToFee = IdentityFee<Balance>;303 type FeeMultiplierUpdate = ();304}305306impl pallet_sudo::Trait for Runtime {307 type Event = Event;308 type Call = Call;309}310311/// Used for the module nft in `./nft.rs`312impl pallet_nft::Trait for Runtime {313 type Event = Event;314 type WeightInfo = nft_weights::WeightInfo;315}316317construct_runtime!(318 pub enum Runtime where319 Block = Block,320 NodeBlock = opaque::Block,321 UncheckedExtrinsic = UncheckedExtrinsic322 {323 System: system::{Module, Call, Config, Storage, Event<T>},324 RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Module, Call, Storage},325 Contracts: pallet_contracts::{Module, Call, Config, Storage, Event<T>},326 Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent},327 Aura: pallet_aura::{Module, Config<T>, Inherent},328 Grandpa: pallet_grandpa::{Module, Call, Storage, Config, Event},329 Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},330 TransactionPayment: pallet_transaction_payment::{Module, Storage},331 Sudo: pallet_sudo::{Module, Call, Config<T>, Storage, Event<T>},332 Nft: pallet_nft::{Module, Call, Config<T>, Storage, Event<T>},333 }334);335336/// The address format for describing accounts.337pub type Address = AccountId;338/// Block header type as expected by this runtime.339pub type Header = generic::Header<BlockNumber, BlakeTwo256>;340/// Block type as expected by this runtime.341pub type Block = generic::Block<Header, UncheckedExtrinsic>;342/// A Block signed with a Justification343pub type SignedBlock = generic::SignedBlock<Block>;344/// BlockId type as expected by this runtime.345pub type BlockId = generic::BlockId<Block>;346/// The SignedExtension to the basic transaction logic.347pub type SignedExtra = (348 system::CheckSpecVersion<Runtime>,349 system::CheckTxVersion<Runtime>,350 system::CheckGenesis<Runtime>,351 system::CheckEra<Runtime>,352 system::CheckNonce<Runtime>,353 system::CheckWeight<Runtime>,354 pallet_nft::ChargeTransactionPayment<Runtime>,355);356/// Unchecked extrinsic type as expected by this runtime.357pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;358/// Extrinsic type that has already been checked.359pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, Call, SignedExtra>;360/// Executive: handles dispatch to the various modules.361pub type Executive =362 frame_executive::Executive<Runtime, Block, system::ChainContext<Runtime>, Runtime, AllModules>;363364impl_runtime_apis! {365366 impl pallet_contracts_rpc_runtime_api::ContractsApi<Block, AccountId, Balance, BlockNumber>367 for Runtime368 {369 fn call(370 origin: AccountId,371 dest: AccountId,372 value: Balance,373 gas_limit: u64,374 input_data: Vec<u8>,375 ) -> ContractExecResult {376 let (exec_result, gas_consumed) =377 Contracts::bare_call(origin, dest.into(), value, gas_limit, input_data);378 match exec_result {379 Ok(v) => ContractExecResult::Success {380 flags: v.flags.bits(),381 data: v.data,382 gas_consumed: gas_consumed,383 },384 Err(_) => ContractExecResult::Error,385 }386 }387388 fn get_storage(389 address: AccountId,390 key: [u8; 32],391 ) -> pallet_contracts_primitives::GetStorageResult {392 Contracts::get_storage(address, key)393 }394395 fn rent_projection(396 address: AccountId,397 ) -> pallet_contracts_primitives::RentProjectionResult<BlockNumber> {398 Contracts::rent_projection(address)399 }400 }401402 impl sp_api::Core<Block> for Runtime {403 fn version() -> RuntimeVersion {404 VERSION405 }406407 fn execute_block(block: Block) {408 Executive::execute_block(block)409 }410411 fn initialize_block(header: &<Block as BlockT>::Header) {412 Executive::initialize_block(header)413 }414 }415416 impl sp_api::Metadata<Block> for Runtime {417 fn metadata() -> OpaqueMetadata {418 Runtime::metadata().into()419 }420 }421422 impl sp_block_builder::BlockBuilder<Block> for Runtime {423 fn apply_extrinsic(extrinsic: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult {424 Executive::apply_extrinsic(extrinsic)425 }426427 fn finalize_block() -> <Block as BlockT>::Header {428 Executive::finalize_block()429 }430431 fn inherent_extrinsics(data: sp_inherents::InherentData) -> Vec<<Block as BlockT>::Extrinsic> {432 data.create_extrinsics()433 }434435 fn check_inherents(436 block: Block,437 data: sp_inherents::InherentData,438 ) -> sp_inherents::CheckInherentsResult {439 data.check_extrinsics(&block)440 }441442 fn random_seed() -> <Block as BlockT>::Hash {443 RandomnessCollectiveFlip::random_seed()444 }445 }446447 impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {448 fn validate_transaction(449 source: TransactionSource,450 tx: <Block as BlockT>::Extrinsic,451 ) -> TransactionValidity {452 Executive::validate_transaction(source, tx)453 }454 }455456 impl sp_offchain::OffchainWorkerApi<Block> for Runtime {457 fn offchain_worker(header: &<Block as BlockT>::Header) {458 Executive::offchain_worker(header)459 }460 }461462 impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {463 fn slot_duration() -> u64 {464 Aura::slot_duration()465 }466467 fn authorities() -> Vec<AuraId> {468 Aura::authorities()469 }470 }471472 impl sp_session::SessionKeys<Block> for Runtime {473 fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {474 opaque::SessionKeys::generate(seed)475 }476477 fn decode_session_keys(478 encoded: Vec<u8>,479 ) -> Option<Vec<(Vec<u8>, KeyTypeId)>> {480 opaque::SessionKeys::decode_into_raw_public_keys(&encoded)481 }482 }483484 impl fg_primitives::GrandpaApi<Block> for Runtime {485 fn grandpa_authorities() -> GrandpaAuthorityList {486 Grandpa::grandpa_authorities()487 }488489 fn submit_report_equivocation_unsigned_extrinsic(490 _equivocation_proof: fg_primitives::EquivocationProof<491 <Block as BlockT>::Hash,492 NumberFor<Block>,493 >,494 _key_owner_proof: fg_primitives::OpaqueKeyOwnershipProof,495 ) -> Option<()> {496 None497 }498499 fn generate_key_ownership_proof(500 _set_id: fg_primitives::SetId,501 _authority_id: GrandpaId,502 ) -> Option<fg_primitives::OpaqueKeyOwnershipProof> {503 // NOTE: this is the only implementation possible since we've504 // defined our key owner proof type as a bottom type (i.e. a type505 // with no values).506 None507 }508 }509 510 impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Index> for Runtime {511 fn account_nonce(account: AccountId) -> Index {512 System::account_nonce(account)513 }514 }515516 impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance> for Runtime {517 fn query_info(518 uxt: <Block as BlockT>::Extrinsic,519 len: u32,520 ) -> pallet_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo<Balance> {521 TransactionPayment::query_info(uxt, len)522 }523 }524525 #[cfg(feature = "runtime-benchmarks")]526 impl frame_benchmarking::Benchmark<Block> for Runtime {527 fn dispatch_benchmark(528 config: frame_benchmarking::BenchmarkConfig529 ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {530 use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey};531532 let whitelist: Vec<TrackedStorageKey> = vec![533 // Alice account534 hex_literal::hex!("d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d").to_vec().into(),535 // // Total Issuance536 // hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(),537 // // Execution Phase538 // hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(),539 // // Event Count540 // hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),541 // // System Events542 // hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),543 ];544545 let mut batches = Vec::<BenchmarkBatch>::new();546 let params = (&config, &whitelist);547548 add_benchmark!(params, batches, pallet_nft, Nft);549550 if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) }551 Ok(batches)552 }553 }554}