From ef081eb1c78860e3690bac6608d6d72be3862731 Mon Sep 17 00:00:00 2001 From: shamb0 Date: Fri, 27 Nov 2020 12:25:53 +0530 Subject: [PATCH 01/20] wk2048 | D6 | issue-7143-treasury-refactor | integration --- runtime/kusama/Cargo.toml | 6 + runtime/kusama/src/weights/pallet_treasury.rs | 181 +++++++----------- 2 files changed, 70 insertions(+), 117 deletions(-) diff --git a/runtime/kusama/Cargo.toml b/runtime/kusama/Cargo.toml index 17ccfca08056..0014076f7291 100644 --- a/runtime/kusama/Cargo.toml +++ b/runtime/kusama/Cargo.toml @@ -34,6 +34,7 @@ pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } @@ -60,6 +61,7 @@ pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = " frame-system = {git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } @@ -107,6 +109,7 @@ std = [ "frame-support/std", "pallet-authorship/std", "pallet-balances/std", + "pallet-bounties/std", "pallet-transaction-payment/std", "pallet-transaction-payment-rpc-runtime-api/std", "pallet-collective/std", @@ -132,6 +135,7 @@ std = [ "frame-system/std", "frame-system-rpc-runtime-api/std", "pallet-timestamp/std", + "pallet-tips/std", "pallet-treasury/std", "sp-version/std", "pallet-utility/std", @@ -153,6 +157,7 @@ runtime-benchmarks = [ "sp-runtime/runtime-benchmarks", "pallet-babe/runtime-benchmarks", "pallet-balances/runtime-benchmarks", + "pallet-bounties/runtime-benchmarks", "pallet-collective/runtime-benchmarks", "pallet-democracy/runtime-benchmarks", "pallet-elections-phragmen/runtime-benchmarks", @@ -166,6 +171,7 @@ runtime-benchmarks = [ "pallet-society/runtime-benchmarks", "pallet-staking/runtime-benchmarks", "pallet-timestamp/runtime-benchmarks", + "pallet-tips/runtime-benchmarks", "pallet-treasury/runtime-benchmarks", "pallet-utility/runtime-benchmarks", "pallet-vesting/runtime-benchmarks", diff --git a/runtime/kusama/src/weights/pallet_treasury.rs b/runtime/kusama/src/weights/pallet_treasury.rs index 57b00385de15..a3f407523f1c 100644 --- a/runtime/kusama/src/weights/pallet_treasury.rs +++ b/runtime/kusama/src/weights/pallet_treasury.rs @@ -1,28 +1,30 @@ -// Copyright 2017-2020 Parity Technologies (UK) Ltd. -// This file is part of Polkadot. +// This file is part of Substrate. -// Polkadot 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. +// Copyright (C) 2020 Parity Technologies (UK) Ltd. +// SPDX-License-Identifier: Apache-2.0 -// Polkadot 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. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. -// You should have received a copy of the GNU General Public License -// along with Polkadot. If not, see . -//! Weights for pallet_treasury +//! Autogenerated weights for pallet_treasury +//! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0 -//! DATE: 2020-10-30, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: [] -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 128 +//! DATE: 2020-11-20, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: [] +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128 // Executed Command: -// ./target/release/polkadot +// target/release/substrate // benchmark -// --chain -// kusama-dev +// --chain=dev // --steps=50 // --repeat=20 // --pallet=pallet_treasury @@ -30,130 +32,75 @@ // --execution=wasm // --wasm-execution=compiled // --heap-pages=4096 -// --header -// ./file_header.txt -// --output=./runtime/kusama/src/weights/ +// --output=./frame/treasury/src/weights.rs +// --template=./.maintain/frame-weight-template.hbs #![allow(unused_parens)] #![allow(unused_imports)] -use frame_support::{traits::Get, weights::Weight}; +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; use sp_std::marker::PhantomData; -/// Weight functions for pallet_treasury. -pub struct WeightInfo(PhantomData); -impl pallet_treasury::WeightInfo for WeightInfo { +/// Weight functions needed for pallet_treasury. +pub trait WeightInfo { + fn propose_spend() -> Weight; + fn reject_proposal() -> Weight; + fn approve_proposal() -> Weight; + fn on_initialize_proposals(p: u32, ) -> Weight; +} + +/// Weights for pallet_treasury using the Substrate node and recommended hardware. +pub struct SubstrateWeight(PhantomData); +impl WeightInfo for SubstrateWeight { fn propose_spend() -> Weight { - (52_217_000 as Weight) + (55_957_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn reject_proposal() -> Weight { - (83_066_000 as Weight) + (45_616_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn approve_proposal() -> Weight { - (11_351_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } - fn report_awesome(r: u32, ) -> Weight { - (64_348_000 as Weight) - .saturating_add((2_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } - fn retract_tip() -> Weight { - (54_445_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } - fn tip_new(r: u32, t: u32, ) -> Weight { - (40_044_000 as Weight) - .saturating_add((2_000 as Weight).saturating_mul(r as Weight)) - .saturating_add((145_000 as Weight).saturating_mul(t as Weight)) + (13_362_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } - fn tip(t: u32, ) -> Weight { - (27_277_000 as Weight) - .saturating_add((688_000 as Weight).saturating_mul(t as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } - fn close_tip(t: u32, ) -> Weight { - (102_574_000 as Weight) - .saturating_add((360_000 as Weight).saturating_mul(t as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) - } - fn propose_bounty(d: u32, ) -> Weight { - (55_563_000 as Weight) - .saturating_add((1_000 as Weight).saturating_mul(d as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) - } - fn approve_bounty() -> Weight { - (15_019_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } - fn propose_curator() -> Weight { - (11_849_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn unassign_curator() -> Weight { - (66_601_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } - fn accept_curator() -> Weight { - (46_454_000 as Weight) + fn on_initialize_proposals(p: u32, ) -> Weight { + (74_689_000 as Weight) + .saturating_add((71_943_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(p as Weight))) .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(p as Weight))) } - fn award_bounty() -> Weight { - (32_599_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } - fn claim_bounty() -> Weight { - (155_219_000 as Weight) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(5 as Weight)) - } - fn close_bounty_proposed() -> Weight { - (65_443_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) +} + +// For backwards compatibility and tests +impl WeightInfo for () { + fn propose_spend() -> Weight { + (55_957_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(1 as Weight)) + .saturating_add(RocksDbWeight::get().writes(2 as Weight)) } - fn close_bounty_active() -> Weight { - (102_931_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + fn reject_proposal() -> Weight { + (45_616_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(2 as Weight)) + .saturating_add(RocksDbWeight::get().writes(2 as Weight)) } - fn extend_bounty_expiry() -> Weight { - (31_483_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + fn approve_proposal() -> Weight { + (13_362_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(2 as Weight)) + .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn on_initialize_proposals(p: u32, ) -> Weight { - (110_747_000 as Weight) - .saturating_add((69_650_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(p as Weight))) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) - .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(p as Weight))) - } - fn on_initialize_bounties(b: u32, ) -> Weight { - (102_988_000 as Weight) - .saturating_add((69_250_000 as Weight).saturating_mul(b as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(b as Weight))) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) - .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(b as Weight))) + (74_689_000 as Weight) + .saturating_add((71_943_000 as Weight).saturating_mul(p as Weight)) + .saturating_add(RocksDbWeight::get().reads(2 as Weight)) + .saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(p as Weight))) + .saturating_add(RocksDbWeight::get().writes(2 as Weight)) + .saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(p as Weight))) } } From fdffa1cd0eefd19fc428f52dc4b519d9159ff008 Mon Sep 17 00:00:00 2001 From: shamb0 Date: Fri, 27 Nov 2020 19:14:28 +0530 Subject: [PATCH 02/20] wk2048 | D6 | issue-7143-treasury-refactor | integration | p2 --- Cargo.lock | 1944 +++++++++++------ node/service/src/chain_spec.rs | 4 + runtime/kusama/Cargo.toml | 6 +- runtime/kusama/src/lib.rs | 41 +- runtime/kusama/src/weights/mod.rs | 2 + runtime/kusama/src/weights/pallet_bounties.rs | 185 ++ runtime/kusama/src/weights/pallet_tips.rs | 121 + runtime/polkadot/Cargo.toml | 6 +- runtime/polkadot/src/lib.rs | 44 +- runtime/polkadot/src/weights/mod.rs | 2 + .../polkadot/src/weights/pallet_bounties.rs | 185 ++ runtime/polkadot/src/weights/pallet_tips.rs | 121 + .../polkadot/src/weights/pallet_treasury.rs | 180 +- 13 files changed, 2008 insertions(+), 833 deletions(-) create mode 100644 runtime/kusama/src/weights/pallet_bounties.rs create mode 100644 runtime/kusama/src/weights/pallet_tips.rs create mode 100644 runtime/polkadot/src/weights/pallet_bounties.rs create mode 100644 runtime/polkadot/src/weights/pallet_tips.rs diff --git a/Cargo.lock b/Cargo.lock index 97f4c52ab9e1..52eedb320862 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1485,22 +1485,40 @@ dependencies = [ "parity-scale-codec", ] +[[package]] +name = "frame-benchmarking" +version = "2.0.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" +dependencies = [ + "frame-support 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "frame-system 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "linregress 0.4.0", + "parity-scale-codec", + "paste", + "sp-api 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-io 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-runtime 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-runtime-interface 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-std 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-storage 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", +] + [[package]] name = "frame-benchmarking" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-support", - "frame-system", - "linregress", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", + "linregress 0.1.7", "parity-scale-codec", "paste", - "sp-api", - "sp-io", - "sp-runtime", - "sp-runtime-interface", - "sp-std", - "sp-storage", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime-interface 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-storage 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -1509,7 +1527,7 @@ version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ "chrono", - "frame-benchmarking", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate)", "handlebars", "parity-scale-codec", "sc-cli", @@ -1517,11 +1535,11 @@ dependencies = [ "sc-executor", "sc-service", "serde", - "sp-core", - "sp-externalities", - "sp-keystore", - "sp-runtime", - "sp-state-machine", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-externalities 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-keystore 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-state-machine 0.8.0 (git+https://github.com/paritytech/substrate)", "structopt", ] @@ -1530,15 +1548,26 @@ name = "frame-executive" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-support", - "frame-system", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "parity-scale-codec", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "sp-tracing", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-tracing 2.0.0 (git+https://github.com/paritytech/substrate)", +] + +[[package]] +name = "frame-metadata" +version = "12.0.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" +dependencies = [ + "parity-scale-codec", + "serde", + "sp-core 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-std 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", ] [[package]] @@ -1548,8 +1577,33 @@ source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745 dependencies = [ "parity-scale-codec", "serde", - "sp-core", - "sp-std", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", +] + +[[package]] +name = "frame-support" +version = "2.0.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" +dependencies = [ + "bitflags", + "frame-metadata 12.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "frame-support-procedural 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "impl-trait-for-tuples 0.1.3", + "log", + "once_cell", + "parity-scale-codec", + "paste", + "serde", + "smallvec 1.5.0", + "sp-arithmetic 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-core 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-inherents 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-io 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-runtime 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-state-machine 0.8.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-std 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-tracing 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", ] [[package]] @@ -1558,8 +1612,8 @@ version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ "bitflags", - "frame-metadata", - "frame-support-procedural", + "frame-metadata 12.0.0 (git+https://github.com/paritytech/substrate)", + "frame-support-procedural 2.0.0 (git+https://github.com/paritytech/substrate)", "impl-trait-for-tuples 0.1.3", "log", "once_cell", @@ -1567,14 +1621,25 @@ dependencies = [ "paste", "serde", "smallvec 1.5.0", - "sp-arithmetic", - "sp-core", - "sp-inherents", - "sp-io", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-tracing", + "sp-arithmetic 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-state-machine 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-tracing 2.0.0 (git+https://github.com/paritytech/substrate)", +] + +[[package]] +name = "frame-support-procedural" +version = "2.0.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" +dependencies = [ + "frame-support-procedural-tools 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "proc-macro2 1.0.24", + "quote 1.0.7", + "syn 1.0.48", ] [[package]] @@ -1582,7 +1647,19 @@ name = "frame-support-procedural" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-support-procedural-tools", + "frame-support-procedural-tools 2.0.0 (git+https://github.com/paritytech/substrate)", + "proc-macro2 1.0.24", + "quote 1.0.7", + "syn 1.0.48", +] + +[[package]] +name = "frame-support-procedural-tools" +version = "2.0.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" +dependencies = [ + "frame-support-procedural-tools-derive 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "proc-macro-crate", "proc-macro2 1.0.24", "quote 1.0.7", "syn 1.0.48", @@ -1593,13 +1670,23 @@ name = "frame-support-procedural-tools" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-support-procedural-tools-derive", + "frame-support-procedural-tools-derive 2.0.0 (git+https://github.com/paritytech/substrate)", "proc-macro-crate", "proc-macro2 1.0.24", "quote 1.0.7", "syn 1.0.48", ] +[[package]] +name = "frame-support-procedural-tools-derive" +version = "2.0.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" +dependencies = [ + "proc-macro2 1.0.24", + "quote 1.0.7", + "syn 1.0.48", +] + [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0" @@ -1610,20 +1697,36 @@ dependencies = [ "syn 1.0.48", ] +[[package]] +name = "frame-system" +version = "2.0.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" +dependencies = [ + "frame-support 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "impl-trait-for-tuples 0.1.3", + "parity-scale-codec", + "serde", + "sp-core 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-io 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-runtime 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-std 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-version 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", +] + [[package]] name = "frame-system" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-support", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", "impl-trait-for-tuples 0.1.3", "parity-scale-codec", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "sp-version", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-version 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -1631,13 +1734,13 @@ name = "frame-system-benchmarking" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "parity-scale-codec", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -1646,7 +1749,7 @@ version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ "parity-scale-codec", - "sp-api", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -1876,6 +1979,15 @@ dependencies = [ "typenum", ] +[[package]] +name = "generic-array" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ed1e761351b56f54eb9dcd0cfaca9fd0daecf93918e1cfc01c8a3d26ee7adcd" +dependencies = [ + "typenum", +] + [[package]] name = "generic-array" version = "0.14.2" @@ -2594,10 +2706,10 @@ name = "kusama-runtime" version = "0.8.26" dependencies = [ "bitvec", - "frame-benchmarking", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate)", "frame-executive", - "frame-support", - "frame-system", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "hex-literal", @@ -2606,7 +2718,8 @@ dependencies = [ "pallet-authority-discovery", "pallet-authorship", "pallet-babe", - "pallet-balances", + "pallet-balances 2.0.0 (git+https://github.com/paritytech/substrate)", + "pallet-bounties", "pallet-collective", "pallet-democracy", "pallet-elections-phragmen", @@ -2629,9 +2742,10 @@ dependencies = [ "pallet-staking", "pallet-staking-reward-curve", "pallet-timestamp", + "pallet-tips", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", - "pallet-treasury", + "pallet-treasury 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", "pallet-utility", "pallet-vesting", "parity-scale-codec", @@ -2643,22 +2757,22 @@ dependencies = [ "serde_derive", "serde_json", "smallvec 1.5.0", - "sp-api", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core", - "sp-inherents", - "sp-io", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-keyring", "sp-offchain", - "sp-runtime", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-session", "sp-staking", - "sp-std", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-transaction-pool", - "sp-trie", - "sp-version", + "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-version 2.0.0 (git+https://github.com/paritytech/substrate)", "static_assertions", "substrate-wasm-builder", "tiny-keccak", @@ -3242,8 +3356,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9290cf6f928576eeb9c096c6fad9d8d452a0a1a70a2bbffa6e36064eedc0aac9" dependencies = [ "failure", - "nalgebra", - "statrs", + "nalgebra 0.18.1", + "statrs 0.10.0", +] + +[[package]] +name = "linregress" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d0ad4b5cc8385a881c561fac3501353d63d2a2b7a357b5064d71815c9a92724" +dependencies = [ + "nalgebra 0.21.1", + "statrs 0.12.0", ] [[package]] @@ -3559,6 +3683,24 @@ dependencies = [ "typenum", ] +[[package]] +name = "nalgebra" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6b6147c3d50b4f3cdabfe2ecc94a0191fd3d6ad58aefd9664cf396285883486" +dependencies = [ + "approx", + "generic-array 0.13.2", + "matrixmultiply", + "num-complex", + "num-rational", + "num-traits 0.2.12", + "rand 0.7.3", + "rand_distr", + "simba", + "typenum", +] + [[package]] name = "names" version = "0.11.0" @@ -3772,15 +3914,15 @@ name = "pallet-authority-discovery" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-support", - "frame-system", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "pallet-session", "parity-scale-codec", "serde", - "sp-application-crypto", + "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-authority-discovery", - "sp-runtime", - "sp-std", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -3788,14 +3930,14 @@ name = "pallet-authorship" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-support", - "frame-system", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "impl-trait-for-tuples 0.1.3", "parity-scale-codec", "sp-authorship", - "sp-inherents", - "sp-runtime", - "sp-std", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -3803,38 +3945,67 @@ name = "pallet-babe" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "pallet-authorship", "pallet-session", "pallet-timestamp", "parity-scale-codec", "serde", - "sp-application-crypto", + "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-consensus-babe", "sp-consensus-vrf", - "sp-inherents", - "sp-io", - "sp-runtime", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-session", "sp-staking", - "sp-std", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-timestamp", ] +[[package]] +name = "pallet-balances" +version = "2.0.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" +dependencies = [ + "frame-benchmarking 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "frame-support 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "frame-system 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "parity-scale-codec", + "serde", + "sp-runtime 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-std 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", +] + [[package]] name = "pallet-balances" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "parity-scale-codec", "serde", - "sp-runtime", - "sp-std", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", +] + +[[package]] +name = "pallet-bounties" +version = "2.0.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" +dependencies = [ + "frame-benchmarking 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "frame-support 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "frame-system 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "pallet-treasury 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "parity-scale-codec", + "serde", + "sp-runtime 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-std 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", ] [[package]] @@ -3842,15 +4013,15 @@ name = "pallet-collective" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "parity-scale-codec", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -3858,14 +4029,14 @@ name = "pallet-democracy" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "parity-scale-codec", "serde", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -3873,14 +4044,14 @@ name = "pallet-elections-phragmen" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "parity-scale-codec", "serde", "sp-npos-elections", - "sp-runtime", - "sp-std", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -3888,20 +4059,20 @@ name = "pallet-grandpa" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "pallet-authorship", "pallet-session", "parity-scale-codec", "serde", - "sp-application-crypto", - "sp-core", + "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-finality-grandpa", - "sp-runtime", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-session", "sp-staking", - "sp-std", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -3910,14 +4081,14 @@ version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ "enumflags2", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "parity-scale-codec", "serde", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -3925,19 +4096,19 @@ name = "pallet-im-online" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "pallet-authorship", "pallet-session", "parity-scale-codec", "serde", - "sp-application-crypto", - "sp-core", - "sp-io", - "sp-runtime", + "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-staking", - "sp-std", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -3945,16 +4116,16 @@ name = "pallet-indices" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "parity-scale-codec", "serde", - "sp-core", - "sp-io", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-keyring", - "sp-runtime", - "sp-std", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -3962,13 +4133,13 @@ name = "pallet-membership" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-support", - "frame-system", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "parity-scale-codec", "serde", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -3976,15 +4147,15 @@ name = "pallet-multisig" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "parity-scale-codec", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -3992,13 +4163,13 @@ name = "pallet-nicks" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-support", - "frame-system", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "parity-scale-codec", "serde", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -4006,14 +4177,14 @@ name = "pallet-offences" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-support", - "frame-system", - "pallet-balances", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", + "pallet-balances 2.0.0 (git+https://github.com/paritytech/substrate)", "parity-scale-codec", "serde", - "sp-runtime", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-staking", - "sp-std", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -4021,20 +4192,20 @@ name = "pallet-offences-benchmarking" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "pallet-babe", - "pallet-balances", + "pallet-balances 2.0.0 (git+https://github.com/paritytech/substrate)", "pallet-grandpa", "pallet-im-online", "pallet-offences", "pallet-session", "pallet-staking", "parity-scale-codec", - "sp-runtime", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-staking", - "sp-std", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -4042,15 +4213,15 @@ name = "pallet-proxy" version = "2.0.1" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "parity-scale-codec", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -4058,12 +4229,12 @@ name = "pallet-randomness-collective-flip" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-support", - "frame-system", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "parity-scale-codec", "safe-mix", - "sp-runtime", - "sp-std", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -4072,13 +4243,13 @@ version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ "enumflags2", - "frame-support", - "frame-system", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "parity-scale-codec", "serde", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -4086,14 +4257,14 @@ name = "pallet-scheduler" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "parity-scale-codec", "serde", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -4101,19 +4272,19 @@ name = "pallet-session" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-support", - "frame-system", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "impl-trait-for-tuples 0.1.3", "pallet-timestamp", "parity-scale-codec", "serde", - "sp-core", - "sp-io", - "sp-runtime", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-session", "sp-staking", - "sp-std", - "sp-trie", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -4121,15 +4292,15 @@ name = "pallet-session-benchmarking" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "pallet-session", "pallet-staking", "rand 0.7.3", - "sp-runtime", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-session", - "sp-std", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -4137,13 +4308,13 @@ name = "pallet-society" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-support", - "frame-system", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "parity-scale-codec", "rand_chacha 0.2.2", "serde", - "sp-runtime", - "sp-std", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -4151,20 +4322,20 @@ name = "pallet-staking" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "pallet-authorship", "pallet-session", "parity-scale-codec", "rand_chacha 0.2.2", "serde", - "sp-application-crypto", - "sp-io", + "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-npos-elections", - "sp-runtime", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-staking", - "sp-std", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", "static_assertions", ] @@ -4184,13 +4355,13 @@ name = "pallet-sudo" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-support", - "frame-system", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "parity-scale-codec", "serde", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -4198,34 +4369,49 @@ name = "pallet-timestamp" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "impl-trait-for-tuples 0.1.3", "parity-scale-codec", "serde", - "sp-inherents", - "sp-io", - "sp-runtime", - "sp-std", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-timestamp", ] +[[package]] +name = "pallet-tips" +version = "2.0.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" +dependencies = [ + "frame-benchmarking 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "frame-support 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "frame-system 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "pallet-treasury 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "parity-scale-codec", + "serde", + "sp-runtime 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-std 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", +] + [[package]] name = "pallet-transaction-payment" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-support", - "frame-system", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", "serde", "smallvec 1.5.0", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -4239,11 +4425,11 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", "serde", - "sp-api", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-blockchain", - "sp-core", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-rpc", - "sp-runtime", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -4251,12 +4437,28 @@ name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-support", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", "parity-scale-codec", "serde", - "sp-api", - "sp-runtime", - "sp-std", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", +] + +[[package]] +name = "pallet-treasury" +version = "2.0.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" +dependencies = [ + "frame-benchmarking 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "frame-support 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "frame-system 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "impl-trait-for-tuples 0.1.3", + "pallet-balances 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "parity-scale-codec", + "serde", + "sp-runtime 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-std 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", ] [[package]] @@ -4264,14 +4466,14 @@ name = "pallet-treasury" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", - "pallet-balances", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", + "pallet-balances 2.0.0 (git+https://github.com/paritytech/substrate)", "parity-scale-codec", "serde", - "sp-runtime", - "sp-std", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -4279,15 +4481,15 @@ name = "pallet-utility" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "parity-scale-codec", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -4296,13 +4498,13 @@ version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ "enumflags2", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "parity-scale-codec", "serde", - "sp-runtime", - "sp-std", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -4746,9 +4948,9 @@ dependencies = [ "polkadot-node-subsystem-test-helpers", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-application-crypto", - "sp-core", - "sp-keystore", + "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-keystore 0.8.0 (git+https://github.com/paritytech/substrate)", "tracing", "tracing-futures", ] @@ -4771,10 +4973,10 @@ dependencies = [ "polkadot-primitives", "sc-keystore", "smallvec 1.5.0", - "sp-application-crypto", - "sp-core", + "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-keyring", - "sp-keystore", + "sp-keystore 0.8.0 (git+https://github.com/paritytech/substrate)", "thiserror", "tracing", "tracing-futures", @@ -4791,8 +4993,8 @@ dependencies = [ "sc-cli", "sc-service", "sc-tracing", - "sp-core", - "sp-trie", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate)", "structopt", "substrate-browser-utils", "substrate-build-script-utils", @@ -4817,7 +5019,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "smallvec 1.5.0", - "sp-core", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-keyring", "thiserror", "tracing", @@ -4829,9 +5031,9 @@ name = "polkadot-core-primitives" version = "0.7.30" dependencies = [ "parity-scale-codec", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -4841,8 +5043,8 @@ dependencies = [ "parity-scale-codec", "polkadot-primitives", "reed-solomon-erasure", - "sp-core", - "sp-trie", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate)", "thiserror", ] @@ -4861,7 +5063,7 @@ dependencies = [ "polkadot-primitives", "sc-authority-discovery", "sc-network", - "sp-core", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-keyring", "tracing", "tracing-futures", @@ -4878,7 +5080,7 @@ dependencies = [ "polkadot-node-subsystem-test-helpers", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-core", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", "thiserror", "tracing", "tracing-futures", @@ -4905,7 +5107,7 @@ dependencies = [ "polkadot-primitives", "sc-service", "smallvec 1.5.0", - "sp-core", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", "thiserror", "tracing", "tracing-futures", @@ -4926,10 +5128,10 @@ dependencies = [ "polkadot-primitives", "polkadot-statement-table", "sc-keystore", - "sp-application-crypto", - "sp-core", + "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-keyring", - "sp-keystore", + "sp-keystore 0.8.0 (git+https://github.com/paritytech/substrate)", "thiserror", "tracing", "tracing-futures", @@ -4944,7 +5146,7 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-keystore", + "sp-keystore 0.8.0 (git+https://github.com/paritytech/substrate)", "thiserror", "tracing", "tracing-futures", @@ -4959,7 +5161,7 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-core", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", "thiserror", "tracing", "tracing-futures", @@ -4978,7 +5180,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-parachain", "polkadot-primitives", - "sp-core", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-keyring", "tracing", "tracing-futures", @@ -4995,7 +5197,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "sp-blockchain", - "sp-core", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", "tracing", "tracing-futures", ] @@ -5012,12 +5214,12 @@ dependencies = [ "sc-basic-authorship", "sc-block-builder", "sc-client-api", - "sp-api", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-inherents", - "sp-runtime", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-transaction-pool", "substrate-prometheus-endpoint", "tracing", @@ -5033,8 +5235,8 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-application-crypto", - "sp-keystore", + "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-keystore 0.8.0 (git+https://github.com/paritytech/substrate)", "thiserror", "tracing", "tracing-futures", @@ -5049,8 +5251,8 @@ dependencies = [ "polkadot-node-subsystem-test-helpers", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-api", - "sp-core", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", "tracing", "tracing-futures", ] @@ -5073,8 +5275,8 @@ dependencies = [ "parity-scale-codec", "polkadot-primitives", "polkadot-statement-table", - "sp-core", - "sp-runtime", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -5096,7 +5298,7 @@ dependencies = [ "polkadot-statement-table", "sc-network", "smallvec 1.5.0", - "sp-core", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", "substrate-prometheus-endpoint", "thiserror", "tracing", @@ -5121,7 +5323,7 @@ dependencies = [ "polkadot-statement-table", "sc-network", "smallvec 1.5.0", - "sp-core", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", "tracing", "tracing-futures", ] @@ -5144,9 +5346,9 @@ dependencies = [ "polkadot-node-subsystem-test-helpers", "polkadot-primitives", "sc-network", - "sp-application-crypto", - "sp-core", - "sp-keystore", + "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-keystore 0.8.0 (git+https://github.com/paritytech/substrate)", "streamunordered", "substrate-prometheus-endpoint", "thiserror", @@ -5169,7 +5371,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "sc-client-api", - "sp-core", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", "streamunordered", "tracing", "tracing-futures", @@ -5188,12 +5390,12 @@ dependencies = [ "sc-executor", "serde", "shared_memory", - "sp-core", - "sp-externalities", - "sp-io", - "sp-runtime", - "sp-std", - "sp-wasm-interface", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-externalities 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-wasm-interface 2.0.0 (git+https://github.com/paritytech/substrate)", "thiserror", ] @@ -5211,7 +5413,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "smallvec 1.5.0", - "sp-core", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-keyring", "thiserror", "tracing", @@ -5223,25 +5425,25 @@ name = "polkadot-primitives" version = "0.8.26" dependencies = [ "bitvec", - "frame-system", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain", "pretty_assertions", "serde", - "sp-api", - "sp-application-crypto", - "sp-arithmetic", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-arithmetic 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-authority-discovery", - "sp-core", - "sp-inherents", - "sp-keystore", - "sp-runtime", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-keystore 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-serializer", "sp-staking", - "sp-std", - "sp-trie", - "sp-version", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-version 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -5262,13 +5464,13 @@ dependencies = [ "sc-keystore", "sc-rpc", "sc-sync-state-rpc", - "sp-api", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-keystore", - "sp-runtime", + "sp-keystore 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-transaction-pool", "substrate-frame-rpc-system", ] @@ -5278,10 +5480,10 @@ name = "polkadot-runtime" version = "0.8.26" dependencies = [ "bitvec", - "frame-benchmarking", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate)", "frame-executive", - "frame-support", - "frame-system", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "hex-literal", @@ -5290,7 +5492,8 @@ dependencies = [ "pallet-authority-discovery", "pallet-authorship", "pallet-babe", - "pallet-balances", + "pallet-balances 2.0.0 (git+https://github.com/paritytech/substrate)", + "pallet-bounties", "pallet-collective", "pallet-democracy", "pallet-elections-phragmen", @@ -5311,9 +5514,10 @@ dependencies = [ "pallet-staking", "pallet-staking-reward-curve", "pallet-timestamp", + "pallet-tips", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", - "pallet-treasury", + "pallet-treasury 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", "pallet-utility", "pallet-vesting", "parity-scale-codec", @@ -5324,22 +5528,22 @@ dependencies = [ "serde_derive", "serde_json", "smallvec 1.5.0", - "sp-api", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core", - "sp-inherents", - "sp-io", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-keyring", "sp-offchain", - "sp-runtime", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-session", "sp-staking", - "sp-std", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-transaction-pool", - "sp-trie", - "sp-version", + "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-version 2.0.0 (git+https://github.com/paritytech/substrate)", "static_assertions", "substrate-wasm-builder", "tiny-keccak", @@ -5351,15 +5555,15 @@ name = "polkadot-runtime-common" version = "0.8.26" dependencies = [ "bitvec", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "hex-literal", "libsecp256k1", "log", "pallet-authorship", "pallet-babe", - "pallet-balances", + "pallet-balances 2.0.0 (git+https://github.com/paritytech/substrate)", "pallet-offences", "pallet-randomness-collective-flip", "pallet-session", @@ -5367,7 +5571,7 @@ dependencies = [ "pallet-staking-reward-curve", "pallet-timestamp", "pallet-transaction-payment", - "pallet-treasury", + "pallet-treasury 2.0.0 (git+https://github.com/paritytech/substrate)", "pallet-vesting", "parity-scale-codec", "polkadot-primitives", @@ -5376,17 +5580,17 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "sp-api", - "sp-application-crypto", - "sp-core", - "sp-inherents", - "sp-io", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-keyring", - "sp-runtime", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-session", "sp-staking", - "sp-std", - "sp-trie", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate)", "static_assertions", "trie-db", ] @@ -5397,9 +5601,9 @@ version = "0.8.0" dependencies = [ "bitvec", "derive_more", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "futures 0.3.8", "hex-literal", "libsecp256k1", @@ -5407,14 +5611,14 @@ dependencies = [ "pallet-authority-discovery", "pallet-authorship", "pallet-babe", - "pallet-balances", + "pallet-balances 2.0.0 (git+https://github.com/paritytech/substrate)", "pallet-offences", "pallet-randomness-collective-flip", "pallet-session", "pallet-staking", "pallet-staking-reward-curve", "pallet-timestamp", - "pallet-treasury", + "pallet-treasury 2.0.0 (git+https://github.com/paritytech/substrate)", "pallet-vesting", "parity-scale-codec", "polkadot-primitives", @@ -5424,19 +5628,19 @@ dependencies = [ "sc-keystore", "serde", "serde_json", - "sp-api", - "sp-application-crypto", - "sp-core", - "sp-inherents", - "sp-io", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-keyring", - "sp-keystore", - "sp-runtime", + "sp-keystore 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-session", "sp-staking", - "sp-std", - "sp-trie", - "sp-version", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-version 2.0.0 (git+https://github.com/paritytech/substrate)", "xcm", ] @@ -5445,7 +5649,7 @@ name = "polkadot-service" version = "0.8.3" dependencies = [ "env_logger 0.8.2", - "frame-benchmarking", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate)", "frame-system-rpc-runtime-api", "futures 0.3.8", "hex-literal", @@ -5498,23 +5702,23 @@ dependencies = [ "sc-transaction-pool", "serde", "slog", - "sp-api", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-authority-discovery", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-finality-grandpa", - "sp-inherents", - "sp-io", - "sp-keystore", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-keystore 0.8.0 (git+https://github.com/paritytech/substrate)", "sp-offchain", - "sp-runtime", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-session", - "sp-storage", + "sp-storage 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-transaction-pool", - "sp-trie", + "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate)", "substrate-prometheus-endpoint", "tracing", "tracing-futures", @@ -5536,10 +5740,10 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "sc-keystore", - "sp-application-crypto", - "sp-core", + "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-keyring", - "sp-keystore", + "sp-keystore 0.8.0 (git+https://github.com/paritytech/substrate)", "sp-staking", "tracing", "tracing-futures", @@ -5551,7 +5755,7 @@ version = "0.8.26" dependencies = [ "parity-scale-codec", "polkadot-primitives", - "sp-core", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -5566,14 +5770,14 @@ dependencies = [ "sc-block-builder", "sc-consensus", "sc-service", - "sp-api", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-inherents", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-keyring", - "sp-runtime", - "sp-state-machine", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-state-machine 0.8.0 (git+https://github.com/paritytech/substrate)", "sp-timestamp", "substrate-test-client", ] @@ -5584,8 +5788,8 @@ version = "0.8.26" dependencies = [ "bitvec", "frame-executive", - "frame-support", - "frame-system", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "frame-system-rpc-runtime-api", "hex-literal", "libsecp256k1", @@ -5593,7 +5797,7 @@ dependencies = [ "pallet-authority-discovery", "pallet-authorship", "pallet-babe", - "pallet-balances", + "pallet-balances 2.0.0 (git+https://github.com/paritytech/substrate)", "pallet-grandpa", "pallet-indices", "pallet-nicks", @@ -5617,22 +5821,22 @@ dependencies = [ "serde_derive", "serde_json", "smallvec 1.5.0", - "sp-api", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core", - "sp-inherents", - "sp-io", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-keyring", "sp-offchain", - "sp-runtime", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-session", "sp-staking", - "sp-std", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-transaction-pool", - "sp-trie", - "sp-version", + "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-version 2.0.0 (git+https://github.com/paritytech/substrate)", "substrate-wasm-builder", "tiny-keccak", ] @@ -5641,12 +5845,12 @@ dependencies = [ name = "polkadot-test-service" version = "0.8.26" dependencies = [ - "frame-benchmarking", - "frame-system", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "futures 0.1.29", "futures 0.3.8", "hex", - "pallet-balances", + "pallet-balances 2.0.0 (git+https://github.com/paritytech/substrate)", "pallet-staking", "pallet-transaction-payment", "polkadot-node-primitives", @@ -5672,17 +5876,17 @@ dependencies = [ "sc-service", "sc-transaction-pool", "serde_json", - "sp-arithmetic", + "sp-arithmetic 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-authority-discovery", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-finality-grandpa", - "sp-inherents", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-keyring", - "sp-runtime", - "sp-state-machine", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-state-machine 0.8.0 (git+https://github.com/paritytech/substrate)", "substrate-test-client", "substrate-test-utils", "tempfile", @@ -5704,17 +5908,17 @@ dependencies = [ "sc-block-builder", "sc-client-api", "sc-finality-grandpa", - "sp-api", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core", - "sp-inherents", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-keyring", - "sp-runtime", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-timestamp", "sp-transaction-pool", - "sp-trie", + "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate)", "substrate-prometheus-endpoint", "thiserror", ] @@ -6108,6 +6312,15 @@ dependencies = [ "getrandom", ] +[[package]] +name = "rand_distr" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96977acbdd3a6576fb1d27391900035bf3863d4a16422973a409b488cf29ffb2" +dependencies = [ + "rand 0.7.3", +] + [[package]] name = "rand_hc" version = "0.1.0" @@ -6382,13 +6595,13 @@ name = "rococo-runtime" version = "0.8.26" dependencies = [ "frame-executive", - "frame-support", - "frame-system", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "frame-system-rpc-runtime-api", "pallet-authority-discovery", "pallet-authorship", "pallet-babe", - "pallet-balances", + "pallet-balances 2.0.0 (git+https://github.com/paritytech/substrate)", "pallet-grandpa", "pallet-im-online", "pallet-indices", @@ -6408,20 +6621,20 @@ dependencies = [ "serde", "serde_derive", "smallvec 1.5.0", - "sp-api", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core", - "sp-inherents", - "sp-io", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-offchain", - "sp-runtime", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-session", "sp-staking", - "sp-std", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-transaction-pool", - "sp-version", + "sp-version 2.0.0 (git+https://github.com/paritytech/substrate)", "substrate-wasm-builder", ] @@ -6570,12 +6783,12 @@ dependencies = [ "sc-keystore", "sc-network", "serde_json", - "sp-api", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-authority-discovery", "sp-blockchain", - "sp-core", - "sp-keystore", - "sp-runtime", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-keystore 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "substrate-prometheus-endpoint", ] @@ -6592,12 +6805,12 @@ dependencies = [ "sc-client-api", "sc-proposer-metrics", "sc-telemetry", - "sp-api", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-inherents", - "sp-runtime", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-transaction-pool", "substrate-prometheus-endpoint", ] @@ -6609,14 +6822,14 @@ source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745 dependencies = [ "parity-scale-codec", "sc-client-api", - "sp-api", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-block-builder", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-state-machine", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-state-machine 0.8.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -6636,8 +6849,8 @@ dependencies = [ "serde_json", "sp-chain-spec", "sp-consensus-babe", - "sp-core", - "sp-runtime", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -6680,13 +6893,13 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-core", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-keyring", - "sp-keystore", - "sp-panic-handler", - "sp-runtime", + "sp-keystore 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-panic-handler 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-utils", - "sp-version", + "sp-version 2.0.0 (git+https://github.com/paritytech/substrate)", "structopt", "thiserror", "tiny-bip39", @@ -6724,23 +6937,23 @@ dependencies = [ "parking_lot 0.10.2", "sc-executor", "sc-telemetry", - "sp-api", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-blockchain", "sp-consensus", - "sp-core", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-database", - "sp-externalities", - "sp-inherents", + "sp-externalities 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-keyring", - "sp-keystore", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-storage", + "sp-keystore 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-state-machine 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-storage 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-transaction-pool", - "sp-trie", + "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-utils", - "sp-version", + "sp-version 2.0.0 (git+https://github.com/paritytech/substrate)", "substrate-prometheus-endpoint", ] @@ -6763,14 +6976,14 @@ dependencies = [ "sc-client-api", "sc-executor", "sc-state-db", - "sp-arithmetic", + "sp-arithmetic 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-blockchain", "sp-consensus", - "sp-core", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-database", - "sp-runtime", - "sp-state-machine", - "sp-trie", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-state-machine 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate)", "substrate-prometheus-endpoint", ] @@ -6782,7 +6995,7 @@ dependencies = [ "sc-client-api", "sp-blockchain", "sp-consensus", - "sp-runtime", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -6812,21 +7025,21 @@ dependencies = [ "sc-telemetry", "schnorrkel", "serde", - "sp-api", - "sp-application-crypto", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", "sp-consensus-vrf", - "sp-core", - "sp-inherents", - "sp-io", - "sp-keystore", - "sp-runtime", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-keystore 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-timestamp", "sp-utils", - "sp-version", + "sp-version 2.0.0 (git+https://github.com/paritytech/substrate)", "substrate-prometheus-endpoint", ] @@ -6844,14 +7057,14 @@ dependencies = [ "sc-consensus-epochs", "sc-rpc-api", "serde", - "sp-api", - "sp-application-crypto", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core", - "sp-keystore", - "sp-runtime", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-keystore 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -6864,7 +7077,7 @@ dependencies = [ "parking_lot 0.10.2", "sc-client-api", "sp-blockchain", - "sp-runtime", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -6879,17 +7092,17 @@ dependencies = [ "parking_lot 0.10.2", "sc-client-api", "sc-telemetry", - "sp-api", - "sp-application-crypto", - "sp-arithmetic", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-arithmetic 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-blockchain", "sp-consensus", "sp-consensus-slots", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-state-machine", - "sp-trie", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-state-machine 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -6901,9 +7114,9 @@ dependencies = [ "sc-client-api", "sp-authorship", "sp-consensus", - "sp-core", - "sp-inherents", - "sp-runtime", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -6921,17 +7134,17 @@ dependencies = [ "sc-executor-common", "sc-executor-wasmi", "sc-executor-wasmtime", - "sp-api", - "sp-core", - "sp-externalities", - "sp-io", - "sp-panic-handler", - "sp-runtime-interface", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-externalities 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-panic-handler 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime-interface 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-serializer", "sp-tasks", - "sp-trie", - "sp-version", - "sp-wasm-interface", + "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-version 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-wasm-interface 2.0.0 (git+https://github.com/paritytech/substrate)", "wasmi", ] @@ -6945,10 +7158,10 @@ dependencies = [ "parity-scale-codec", "parity-wasm 0.41.0", "sp-allocator", - "sp-core", - "sp-runtime-interface", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime-interface 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-serializer", - "sp-wasm-interface", + "sp-wasm-interface 2.0.0 (git+https://github.com/paritytech/substrate)", "wasmi", ] @@ -6961,9 +7174,9 @@ dependencies = [ "parity-scale-codec", "sc-executor-common", "sp-allocator", - "sp-core", - "sp-runtime-interface", - "sp-wasm-interface", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime-interface 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-wasm-interface 2.0.0 (git+https://github.com/paritytech/substrate)", "wasmi", ] @@ -6979,9 +7192,9 @@ dependencies = [ "sc-executor-common", "scoped-tls", "sp-allocator", - "sp-core", - "sp-runtime-interface", - "sp-wasm-interface", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime-interface 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-wasm-interface 2.0.0 (git+https://github.com/paritytech/substrate)", "wasmtime", ] @@ -7008,16 +7221,16 @@ dependencies = [ "sc-network-gossip", "sc-telemetry", "serde_json", - "sp-api", - "sp-application-crypto", - "sp-arithmetic", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-arithmetic 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-blockchain", "sp-consensus", - "sp-core", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-finality-grandpa", - "sp-inherents", - "sp-keystore", - "sp-runtime", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-keystore 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-utils", "substrate-prometheus-endpoint", ] @@ -7042,8 +7255,8 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-core", - "sp-runtime", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -7058,7 +7271,7 @@ dependencies = [ "sc-client-api", "sc-network", "sp-blockchain", - "sp-runtime", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-transaction-pool", "sp-utils", "wasm-timer", @@ -7078,9 +7291,9 @@ dependencies = [ "parking_lot 0.10.2", "rand 0.7.3", "serde_json", - "sp-application-crypto", - "sp-core", - "sp-keystore", + "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-keystore 0.8.0 (git+https://github.com/paritytech/substrate)", "subtle 2.2.3", ] @@ -7095,12 +7308,12 @@ dependencies = [ "parking_lot 0.10.2", "sc-client-api", "sc-executor", - "sp-api", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-blockchain", - "sp-core", - "sp-externalities", - "sp-runtime", - "sp-state-machine", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-externalities 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-state-machine 0.8.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -7143,11 +7356,11 @@ dependencies = [ "slog", "slog_derive", "smallvec 0.6.13", - "sp-arithmetic", + "sp-arithmetic 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-runtime", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-utils", "substrate-prometheus-endpoint", "thiserror", @@ -7168,7 +7381,7 @@ dependencies = [ "log", "lru", "sc-network", - "sp-runtime", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "wasm-timer", ] @@ -7191,10 +7404,10 @@ dependencies = [ "sc-client-api", "sc-keystore", "sc-network", - "sp-api", - "sp-core", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-offchain", - "sp-runtime", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-utils", "threadpool", ] @@ -7239,19 +7452,19 @@ dependencies = [ "sc-keystore", "sc-rpc-api", "serde_json", - "sp-api", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-blockchain", "sp-chain-spec", - "sp-core", - "sp-keystore", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-keystore 0.8.0 (git+https://github.com/paritytech/substrate)", "sp-offchain", "sp-rpc", - "sp-runtime", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-session", - "sp-state-machine", + "sp-state-machine 0.8.0 (git+https://github.com/paritytech/substrate)", "sp-transaction-pool", "sp-utils", - "sp-version", + "sp-version 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -7271,11 +7484,11 @@ dependencies = [ "serde", "serde_json", "sp-chain-spec", - "sp-core", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-rpc", - "sp-runtime", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-transaction-pool", - "sp-version", + "sp-version 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -7292,7 +7505,7 @@ dependencies = [ "log", "serde", "serde_json", - "sp-runtime", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "substrate-prometheus-endpoint", ] @@ -7335,24 +7548,24 @@ dependencies = [ "serde", "serde_json", "slog", - "sp-api", - "sp-application-crypto", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-block-builder", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-externalities", - "sp-inherents", - "sp-io", - "sp-keystore", - "sp-runtime", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-externalities 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-keystore 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-session", - "sp-state-machine", - "sp-tracing", + "sp-state-machine 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-tracing 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-transaction-pool", - "sp-trie", + "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-utils", - "sp-version", + "sp-version 2.0.0 (git+https://github.com/paritytech/substrate)", "substrate-prometheus-endpoint", "tempfile", "tracing", @@ -7371,7 +7584,7 @@ dependencies = [ "parity-util-mem-derive", "parking_lot 0.10.2", "sc-client-api", - "sp-core", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -7390,7 +7603,7 @@ dependencies = [ "sc-rpc-api", "serde_json", "sp-blockchain", - "sp-runtime", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -7427,7 +7640,7 @@ dependencies = [ "serde", "serde_json", "slog", - "sp-tracing", + "sp-tracing 2.0.0 (git+https://github.com/paritytech/substrate)", "tracing", "tracing-core", "tracing-subscriber", @@ -7447,8 +7660,8 @@ dependencies = [ "retain_mut", "serde", "sp-blockchain", - "sp-core", - "sp-runtime", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-transaction-pool", "sp-utils", "wasm-timer", @@ -7469,11 +7682,11 @@ dependencies = [ "parking_lot 0.10.2", "sc-client-api", "sc-transaction-graph", - "sp-api", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-blockchain", - "sp-core", - "sp-runtime", - "sp-tracing", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-tracing 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-transaction-pool", "sp-utils", "substrate-prometheus-endpoint", @@ -7798,6 +8011,18 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65211b7b6fc3f14ff9fc7a2011a434e3e6880585bd2e9e9396315ae24cbf7852" +[[package]] +name = "simba" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb931b1367faadea6b1ab1c306a860ec17aaa5fa39f367d0c744e69d971a1fb2" +dependencies = [ + "approx", + "num-complex", + "num-traits 0.2.12", + "paste", +] + [[package]] name = "slab" version = "0.4.2" @@ -7916,9 +8141,24 @@ source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745 dependencies = [ "derive_more", "log", - "sp-core", - "sp-std", - "sp-wasm-interface", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-wasm-interface 2.0.0 (git+https://github.com/paritytech/substrate)", +] + +[[package]] +name = "sp-api" +version = "2.0.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" +dependencies = [ + "hash-db", + "parity-scale-codec", + "sp-api-proc-macro 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-core 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-runtime 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-state-machine 0.8.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-std 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-version 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", ] [[package]] @@ -7928,12 +8168,24 @@ source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745 dependencies = [ "hash-db", "parity-scale-codec", - "sp-api-proc-macro", - "sp-core", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-version", + "sp-api-proc-macro 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-state-machine 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-version 2.0.0 (git+https://github.com/paritytech/substrate)", +] + +[[package]] +name = "sp-api-proc-macro" +version = "2.0.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" +dependencies = [ + "blake2-rfc", + "proc-macro-crate", + "proc-macro2 1.0.24", + "quote 1.0.7", + "syn 1.0.48", ] [[package]] @@ -7948,6 +8200,18 @@ dependencies = [ "syn 1.0.48", ] +[[package]] +name = "sp-application-crypto" +version = "2.0.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" +dependencies = [ + "parity-scale-codec", + "serde", + "sp-core 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-io 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-std 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", +] + [[package]] name = "sp-application-crypto" version = "2.0.0" @@ -7955,9 +8219,22 @@ source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745 dependencies = [ "parity-scale-codec", "serde", - "sp-core", - "sp-io", - "sp-std", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", +] + +[[package]] +name = "sp-arithmetic" +version = "2.0.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" +dependencies = [ + "integer-sqrt", + "num-traits 0.2.12", + "parity-scale-codec", + "serde", + "sp-debug-derive 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-std 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", ] [[package]] @@ -7969,8 +8246,8 @@ dependencies = [ "num-traits 0.2.12", "parity-scale-codec", "serde", - "sp-debug-derive", - "sp-std", + "sp-debug-derive 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -7979,10 +8256,10 @@ version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ "parity-scale-codec", - "sp-api", - "sp-application-crypto", - "sp-runtime", - "sp-std", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -7991,9 +8268,9 @@ version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ "parity-scale-codec", - "sp-inherents", - "sp-runtime", - "sp-std", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -8002,10 +8279,10 @@ version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ "parity-scale-codec", - "sp-api", - "sp-inherents", - "sp-runtime", - "sp-std", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -8020,8 +8297,8 @@ dependencies = [ "sp-block-builder", "sp-consensus", "sp-database", - "sp-runtime", - "sp-state-machine", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-state-machine 0.8.0 (git+https://github.com/paritytech/substrate)", "thiserror", ] @@ -8046,15 +8323,15 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.10.2", "serde", - "sp-api", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-trie", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-state-machine 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-utils", - "sp-version", + "sp-version 2.0.0 (git+https://github.com/paritytech/substrate)", "substrate-prometheus-endpoint", "thiserror", "wasm-timer", @@ -8067,16 +8344,16 @@ source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745 dependencies = [ "merlin", "parity-scale-codec", - "sp-api", - "sp-application-crypto", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-consensus", "sp-consensus-slots", "sp-consensus-vrf", - "sp-core", - "sp-inherents", - "sp-keystore", - "sp-runtime", - "sp-std", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-keystore 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-timestamp", ] @@ -8086,7 +8363,7 @@ version = "0.8.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ "parity-scale-codec", - "sp-runtime", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -8096,9 +8373,53 @@ source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745 dependencies = [ "parity-scale-codec", "schnorrkel", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", +] + +[[package]] +name = "sp-core" +version = "2.0.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" +dependencies = [ + "base58", + "blake2-rfc", + "byteorder", + "dyn-clonable", + "ed25519-dalek", + "futures 0.3.8", + "hash-db", + "hash256-std-hasher", + "hex", + "impl-serde", + "lazy_static", + "libsecp256k1", + "log", + "merlin", + "num-traits 0.2.12", + "parity-scale-codec", + "parity-util-mem", + "parking_lot 0.10.2", + "primitive-types", + "rand 0.7.3", + "regex", + "schnorrkel", + "secrecy", + "serde", + "sha2 0.8.2", + "sp-debug-derive 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-externalities 0.8.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-runtime-interface 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-std 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-storage 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "substrate-bip39", + "thiserror", + "tiny-bip39", + "tiny-keccak", + "twox-hash", + "wasmi", + "zeroize", ] [[package]] @@ -8131,11 +8452,11 @@ dependencies = [ "secrecy", "serde", "sha2 0.8.2", - "sp-debug-derive", - "sp-externalities", - "sp-runtime-interface", - "sp-std", - "sp-storage", + "sp-debug-derive 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-externalities 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime-interface 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-storage 2.0.0 (git+https://github.com/paritytech/substrate)", "substrate-bip39", "thiserror", "tiny-bip39", @@ -8154,6 +8475,16 @@ dependencies = [ "parking_lot 0.10.2", ] +[[package]] +name = "sp-debug-derive" +version = "2.0.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" +dependencies = [ + "proc-macro2 1.0.24", + "quote 1.0.7", + "syn 1.0.48", +] + [[package]] name = "sp-debug-derive" version = "2.0.0" @@ -8164,6 +8495,17 @@ dependencies = [ "syn 1.0.48", ] +[[package]] +name = "sp-externalities" +version = "0.8.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" +dependencies = [ + "environmental", + "parity-scale-codec", + "sp-std 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-storage 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", +] + [[package]] name = "sp-externalities" version = "0.8.0" @@ -8171,8 +8513,8 @@ source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745 dependencies = [ "environmental", "parity-scale-codec", - "sp-std", - "sp-storage", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-storage 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -8184,12 +8526,24 @@ dependencies = [ "log", "parity-scale-codec", "serde", - "sp-api", - "sp-application-crypto", - "sp-core", - "sp-keystore", - "sp-runtime", - "sp-std", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-keystore 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", +] + +[[package]] +name = "sp-inherents" +version = "2.0.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" +dependencies = [ + "parity-scale-codec", + "parking_lot 0.10.2", + "sp-core 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-std 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "thiserror", ] [[package]] @@ -8199,11 +8553,35 @@ source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745 dependencies = [ "parity-scale-codec", "parking_lot 0.10.2", - "sp-core", - "sp-std", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", "thiserror", ] +[[package]] +name = "sp-io" +version = "2.0.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" +dependencies = [ + "futures 0.3.8", + "hash-db", + "libsecp256k1", + "log", + "parity-scale-codec", + "parking_lot 0.10.2", + "sp-core 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-externalities 0.8.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-keystore 0.8.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-runtime-interface 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-state-machine 0.8.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-std 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-tracing 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-trie 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-wasm-interface 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "tracing", + "tracing-core", +] + [[package]] name = "sp-io" version = "2.0.0" @@ -8215,15 +8593,15 @@ dependencies = [ "log", "parity-scale-codec", "parking_lot 0.10.2", - "sp-core", - "sp-externalities", - "sp-keystore", - "sp-runtime-interface", - "sp-state-machine", - "sp-std", - "sp-tracing", - "sp-trie", - "sp-wasm-interface", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-externalities 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-keystore 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime-interface 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-state-machine 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-tracing 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-wasm-interface 2.0.0 (git+https://github.com/paritytech/substrate)", "tracing", "tracing-core", ] @@ -8234,11 +8612,27 @@ version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ "lazy_static", - "sp-core", - "sp-runtime", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "strum", ] +[[package]] +name = "sp-keystore" +version = "0.8.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" +dependencies = [ + "async-trait", + "derive_more", + "futures 0.3.8", + "merlin", + "parity-scale-codec", + "parking_lot 0.10.2", + "schnorrkel", + "sp-core 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-externalities 0.8.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", +] + [[package]] name = "sp-keystore" version = "0.8.0" @@ -8251,8 +8645,8 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.10.2", "schnorrkel", - "sp-core", - "sp-externalities", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-externalities 0.8.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -8262,9 +8656,9 @@ source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745 dependencies = [ "parity-scale-codec", "serde", - "sp-arithmetic", + "sp-arithmetic 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-npos-elections-compact", - "sp-std", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -8283,9 +8677,18 @@ name = "sp-offchain" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ - "sp-api", - "sp-core", - "sp-runtime", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", +] + +[[package]] +name = "sp-panic-handler" +version = "2.0.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" +dependencies = [ + "backtrace", + "log", ] [[package]] @@ -8303,7 +8706,29 @@ version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ "serde", - "sp-core", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", +] + +[[package]] +name = "sp-runtime" +version = "2.0.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" +dependencies = [ + "either", + "hash256-std-hasher", + "impl-trait-for-tuples 0.1.3", + "log", + "parity-scale-codec", + "parity-util-mem", + "paste", + "rand 0.7.3", + "serde", + "sp-application-crypto 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-arithmetic 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-core 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-inherents 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-io 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-std 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", ] [[package]] @@ -8320,12 +8745,28 @@ dependencies = [ "paste", "rand 0.7.3", "serde", - "sp-application-crypto", - "sp-arithmetic", - "sp-core", - "sp-inherents", - "sp-io", - "sp-std", + "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-arithmetic 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", +] + +[[package]] +name = "sp-runtime-interface" +version = "2.0.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" +dependencies = [ + "parity-scale-codec", + "primitive-types", + "sp-externalities 0.8.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-runtime-interface-proc-macro 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-std 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-storage 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-tracing 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-wasm-interface 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "static_assertions", ] [[package]] @@ -8335,15 +8776,27 @@ source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745 dependencies = [ "parity-scale-codec", "primitive-types", - "sp-externalities", - "sp-runtime-interface-proc-macro", - "sp-std", - "sp-storage", - "sp-tracing", - "sp-wasm-interface", + "sp-externalities 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime-interface-proc-macro 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-storage 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-tracing 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-wasm-interface 2.0.0 (git+https://github.com/paritytech/substrate)", "static_assertions", ] +[[package]] +name = "sp-runtime-interface-proc-macro" +version = "2.0.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" +dependencies = [ + "Inflector", + "proc-macro-crate", + "proc-macro2 1.0.24", + "quote 1.0.7", + "syn 1.0.48", +] + [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0" @@ -8371,11 +8824,11 @@ version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ "parity-scale-codec", - "sp-api", - "sp-core", - "sp-runtime", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-staking", - "sp-std", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -8384,8 +8837,30 @@ version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ "parity-scale-codec", - "sp-runtime", - "sp-std", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", +] + +[[package]] +name = "sp-state-machine" +version = "0.8.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" +dependencies = [ + "hash-db", + "log", + "num-traits 0.2.12", + "parity-scale-codec", + "parking_lot 0.10.2", + "rand 0.7.3", + "smallvec 1.5.0", + "sp-core 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-externalities 0.8.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-panic-handler 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-std 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-trie 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "thiserror", + "trie-db", + "trie-root", ] [[package]] @@ -8400,21 +8875,39 @@ dependencies = [ "parking_lot 0.10.2", "rand 0.7.3", "smallvec 1.5.0", - "sp-core", - "sp-externalities", - "sp-panic-handler", - "sp-std", - "sp-trie", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-externalities 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-panic-handler 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate)", "thiserror", "trie-db", "trie-root", ] +[[package]] +name = "sp-std" +version = "2.0.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" + [[package]] name = "sp-std" version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +[[package]] +name = "sp-storage" +version = "2.0.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" +dependencies = [ + "impl-serde", + "parity-scale-codec", + "ref-cast", + "serde", + "sp-debug-derive 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-std 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", +] + [[package]] name = "sp-storage" version = "2.0.0" @@ -8424,8 +8917,8 @@ dependencies = [ "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive", - "sp-std", + "sp-debug-derive 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -8434,11 +8927,11 @@ version = "2.0.0" source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" dependencies = [ "log", - "sp-core", - "sp-externalities", - "sp-io", - "sp-runtime-interface", - "sp-std", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-externalities 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime-interface 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -8448,13 +8941,26 @@ source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745 dependencies = [ "impl-trait-for-tuples 0.1.3", "parity-scale-codec", - "sp-api", - "sp-inherents", - "sp-runtime", - "sp-std", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", "wasm-timer", ] +[[package]] +name = "sp-tracing" +version = "2.0.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" +dependencies = [ + "log", + "parity-scale-codec", + "sp-std 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "tracing", + "tracing-core", + "tracing-subscriber", +] + [[package]] name = "sp-tracing" version = "2.0.0" @@ -8462,7 +8968,7 @@ source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745 dependencies = [ "log", "parity-scale-codec", - "sp-std", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", "tracing", "tracing-core", "tracing-subscriber", @@ -8478,9 +8984,23 @@ dependencies = [ "log", "parity-scale-codec", "serde", - "sp-api", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-blockchain", - "sp-runtime", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", +] + +[[package]] +name = "sp-trie" +version = "2.0.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" +dependencies = [ + "hash-db", + "memory-db", + "parity-scale-codec", + "sp-core 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-std 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "trie-db", + "trie-root", ] [[package]] @@ -8491,8 +9011,8 @@ dependencies = [ "hash-db", "memory-db", "parity-scale-codec", - "sp-core", - "sp-std", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", "trie-db", "trie-root", ] @@ -8509,6 +9029,18 @@ dependencies = [ "prometheus", ] +[[package]] +name = "sp-version" +version = "2.0.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" +dependencies = [ + "impl-serde", + "parity-scale-codec", + "serde", + "sp-runtime 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "sp-std 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", +] + [[package]] name = "sp-version" version = "2.0.0" @@ -8517,8 +9049,19 @@ dependencies = [ "impl-serde", "parity-scale-codec", "serde", - "sp-runtime", - "sp-std", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", +] + +[[package]] +name = "sp-wasm-interface" +version = "2.0.0" +source = "git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor#14c30eeccef5383acf88e860e3ad59759f58fd65" +dependencies = [ + "impl-trait-for-tuples 0.1.3", + "parity-scale-codec", + "sp-std 2.0.0 (git+https://github.com/shamb0/substrate.git?branch=issue-7143-pallet-treasury-refactor)", + "wasmi", ] [[package]] @@ -8528,7 +9071,7 @@ source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745 dependencies = [ "impl-trait-for-tuples 0.1.3", "parity-scale-codec", - "sp-std", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", "wasmi", ] @@ -8559,6 +9102,15 @@ dependencies = [ "rand 0.5.6", ] +[[package]] +name = "statrs" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cce16f6de653e88beca7bd13780d08e09d4489dbca1f9210e041bc4852481382" +dependencies = [ + "rand 0.7.3", +] + [[package]] name = "stream-cipher" version = "0.4.1" @@ -8712,11 +9264,11 @@ dependencies = [ "sc-client-api", "sc-rpc-api", "serde", - "sp-api", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-block-builder", "sp-blockchain", - "sp-core", - "sp-runtime", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-transaction-pool", ] @@ -8754,11 +9306,11 @@ dependencies = [ "serde_json", "sp-blockchain", "sp-consensus", - "sp-core", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-keyring", - "sp-keystore", - "sp-runtime", - "sp-state-machine", + "sp-keystore 0.8.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-state-machine 0.8.0 (git+https://github.com/paritytech/substrate)", ] [[package]] @@ -8896,8 +9448,8 @@ dependencies = [ "dlmalloc", "parity-scale-codec", "polkadot-parachain", - "sp-io", - "sp-std", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", "substrate-wasm-builder", "tiny-keccak", ] @@ -8920,7 +9472,7 @@ dependencies = [ "sc-authority-discovery", "sc-cli", "sc-service", - "sp-core", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-keyring", "structopt", "substrate-test-utils", @@ -8941,7 +9493,7 @@ version = "0.7.22" dependencies = [ "parity-scale-codec", "polkadot-parachain", - "sp-core", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", "test-parachain-adder", "test-parachain-halt", "tiny-keccak", @@ -10041,10 +10593,10 @@ name = "westend-runtime" version = "0.8.26" dependencies = [ "bitvec", - "frame-benchmarking", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate)", "frame-executive", - "frame-support", - "frame-system", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", + "frame-system 2.0.0 (git+https://github.com/paritytech/substrate)", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "hex-literal", @@ -10053,7 +10605,7 @@ dependencies = [ "pallet-authority-discovery", "pallet-authorship", "pallet-babe", - "pallet-balances", + "pallet-balances 2.0.0 (git+https://github.com/paritytech/substrate)", "pallet-collective", "pallet-democracy", "pallet-elections-phragmen", @@ -10079,7 +10631,7 @@ dependencies = [ "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", - "pallet-treasury", + "pallet-treasury 2.0.0 (git+https://github.com/paritytech/substrate)", "pallet-utility", "pallet-vesting", "parity-scale-codec", @@ -10091,22 +10643,22 @@ dependencies = [ "serde_derive", "serde_json", "smallvec 1.5.0", - "sp-api", + "sp-api 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core", - "sp-inherents", - "sp-io", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-keyring", "sp-offchain", - "sp-runtime", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-session", "sp-staking", - "sp-std", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", "sp-transaction-pool", - "sp-trie", - "sp-version", + "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-version 2.0.0 (git+https://github.com/paritytech/substrate)", "static_assertions", "substrate-wasm-builder", "tiny-keccak", @@ -10207,13 +10759,13 @@ dependencies = [ name = "xcm-builder" version = "0.8.22" dependencies = [ - "frame-support", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", "parity-scale-codec", "polkadot-parachain", - "sp-arithmetic", - "sp-io", - "sp-runtime", - "sp-std", + "sp-arithmetic 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", "xcm", "xcm-executor", ] @@ -10222,14 +10774,14 @@ dependencies = [ name = "xcm-executor" version = "0.8.22" dependencies = [ - "frame-support", + "frame-support 2.0.0 (git+https://github.com/paritytech/substrate)", "impl-trait-for-tuples 0.2.0", "parity-scale-codec", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-arithmetic 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-core 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-io 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate)", + "sp-std 2.0.0 (git+https://github.com/paritytech/substrate)", "xcm", ] diff --git a/node/service/src/chain_spec.rs b/node/service/src/chain_spec.rs index 03cb99c012d8..a21d5140428c 100644 --- a/node/service/src/chain_spec.rs +++ b/node/service/src/chain_spec.rs @@ -235,6 +235,7 @@ fn polkadot_staging_testnet_config_genesis(wasm_binary: &[u8]) -> polkadot::Gene vesting: vec![], }), pallet_vesting: Some(polkadot::VestingConfig { vesting: vec![] }), + pallet_treasury: Some(Default::default()), } } @@ -589,6 +590,7 @@ fn kusama_staging_testnet_config_genesis(wasm_binary: &[u8]) -> kusama::GenesisC vesting: vec![], }), pallet_vesting: Some(kusama::VestingConfig { vesting: vec![] }), + pallet_treasury: Some(Default::default()), } } @@ -1014,6 +1016,7 @@ pub fn polkadot_testnet_genesis( vesting: vec![], }), pallet_vesting: Some(polkadot::VestingConfig { vesting: vec![] }), + pallet_treasury: Some(Default::default()), } } @@ -1106,6 +1109,7 @@ pub fn kusama_testnet_genesis( vesting: vec![], }), pallet_vesting: Some(kusama::VestingConfig { vesting: vec![] }), + pallet_treasury: Some(Default::default()), } } diff --git a/runtime/kusama/Cargo.toml b/runtime/kusama/Cargo.toml index 0014076f7291..508bf9081b7e 100644 --- a/runtime/kusama/Cargo.toml +++ b/runtime/kusama/Cargo.toml @@ -34,7 +34,7 @@ pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-bounties = { git = "https://github.com/shamb0/substrate.git", branch = "issue-7143-pallet-treasury-refactor", default-features = false } pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } @@ -61,8 +61,8 @@ pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = " frame-system = {git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-tips = { git = "https://github.com/shamb0/substrate.git", branch = "issue-7143-pallet-treasury-refactor", default-features = false } +pallet-treasury = { git = "https://github.com/shamb0/substrate.git", branch = "issue-7143-pallet-treasury-refactor", default-features = false } pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 0aa1a4cadb9e..e42d9678e1fd 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -535,10 +535,6 @@ impl pallet_treasury::Trait for Runtime { type Currency = Balances; type ApproveOrigin = ApproveOrigin; type RejectOrigin = MoreThanHalfCouncil; - type Tippers = ElectionsPhragmen; - type TipCountdown = TipCountdown; - type TipFindersFee = TipFindersFee; - type TipReportDepositBase = TipReportDepositBase; type DataDepositPerByte = DataDepositPerByte; type Event = Event; type OnSlash = Treasury; @@ -546,14 +542,33 @@ impl pallet_treasury::Trait for Runtime { type ProposalBondMinimum = ProposalBondMinimum; type SpendPeriod = SpendPeriod; type Burn = Burn; + type MaximumReasonLength = MaximumReasonLength; + type BurnDestination = Society; + type SpendFunds = Bounties; + type WeightInfo = pallet_treasury::weights::SubstrateWeight; + // type WeightInfo = weights::pallet_treasury::WeightInfo; +} + +impl pallet_bounties::Trait for Runtime { + type Event = Event; type BountyDepositBase = BountyDepositBase; type BountyDepositPayoutDelay = BountyDepositPayoutDelay; type BountyUpdatePeriod = BountyUpdatePeriod; - type MaximumReasonLength = MaximumReasonLength; type BountyCuratorDeposit = BountyCuratorDeposit; type BountyValueMinimum = BountyValueMinimum; - type BurnDestination = Society; - type WeightInfo = weights::pallet_treasury::WeightInfo; + type WeightInfo = pallet_bounties::weights::SubstrateWeight; + // type WeightInfo = weights::pallet_bounties::WeightInfo; + +} + +impl pallet_tips::Trait for Runtime { + type Event = Event; + type Tippers = ElectionsPhragmen; + type TipCountdown = TipCountdown; + type TipFindersFee = TipFindersFee; + type TipReportDepositBase = TipReportDepositBase; + type WeightInfo = pallet_tips::weights::SubstrateWeight; + // type WeightInfo = weights::pallet_tips::WeightInfo; } parameter_types! { @@ -930,7 +945,8 @@ construct_runtime! { TechnicalCommittee: pallet_collective::::{Module, Call, Storage, Origin, Event, Config} = 15, ElectionsPhragmen: pallet_elections_phragmen::{Module, Call, Storage, Event, Config} = 16, TechnicalMembership: pallet_membership::::{Module, Call, Storage, Event, Config} = 17, - Treasury: pallet_treasury::{Module, Call, Storage, Event} = 18, + // Treasury: pallet_treasury::{Module, Call, Storage, Event} = 18, + Treasury: pallet_treasury::{Module, Call, Storage, Config, Event} = 18, // Claims. Usable initially. Claims: claims::{Module, Call, Storage, Event, Config, ValidateUnsigned} = 19, @@ -958,6 +974,12 @@ construct_runtime! { // Multisig module. Late addition. Multisig: pallet_multisig::{Module, Call, Storage, Event} = 31, + + // Bounties module. + Bounties: pallet_bounties::{Module, Call, Storage, Event} = 35, + + // Tips module. + Tips: pallet_tips::{Module, Call, Storage, Event} = 36, } } @@ -1291,6 +1313,9 @@ sp_api::impl_runtime_apis! { add_benchmark!(params, batches, pallet_utility, Utility); add_benchmark!(params, batches, pallet_vesting, Vesting); + add_benchmark!(params, batches, pallet_bounties, Bounties); + add_benchmark!(params, batches, pallet_tips, Tips); + if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) } Ok(batches) } diff --git a/runtime/kusama/src/weights/mod.rs b/runtime/kusama/src/weights/mod.rs index 19269d02611e..0411000b1c3f 100644 --- a/runtime/kusama/src/weights/mod.rs +++ b/runtime/kusama/src/weights/mod.rs @@ -32,3 +32,5 @@ pub mod pallet_timestamp; pub mod pallet_treasury; pub mod pallet_utility; pub mod pallet_vesting; +pub mod pallet_bounties; +pub mod pallet_tips; diff --git a/runtime/kusama/src/weights/pallet_bounties.rs b/runtime/kusama/src/weights/pallet_bounties.rs new file mode 100644 index 000000000000..fbe1a5964330 --- /dev/null +++ b/runtime/kusama/src/weights/pallet_bounties.rs @@ -0,0 +1,185 @@ +// This file is part of Substrate. + +// Copyright (C) 2020 Parity Technologies (UK) Ltd. +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +//! Autogenerated weights for pallet_bounties +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0 +//! DATE: 2020-11-20, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: [] +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128 + +// Executed Command: +// target/release/substrate +// benchmark +// --chain=dev +// --steps=50 +// --repeat=20 +// --pallet=pallet_bounties +// --extrinsic=* +// --execution=wasm +// --wasm-execution=compiled +// --heap-pages=4096 +// --output=./frame/bounties/src/weights.rs +// --template=./.maintain/frame-weight-template.hbs + + +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use sp_std::marker::PhantomData; + +/// Weight functions needed for pallet_bounties. +pub trait WeightInfo { + fn propose_bounty(d: u32, ) -> Weight; + fn approve_bounty() -> Weight; + fn propose_curator() -> Weight; + fn unassign_curator() -> Weight; + fn accept_curator() -> Weight; + fn award_bounty() -> Weight; + fn claim_bounty() -> Weight; + fn close_bounty_proposed() -> Weight; + fn close_bounty_active() -> Weight; + fn extend_bounty_expiry() -> Weight; + fn spend_funds(b: u32, ) -> Weight; +} + +/// Weights for pallet_bounties using the Substrate node and recommended hardware. +pub struct SubstrateWeight(PhantomData); +impl WeightInfo for SubstrateWeight { + fn propose_bounty(d: u32, ) -> Weight { + (59_931_000 as Weight) + .saturating_add((1_000 as Weight).saturating_mul(d as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(4 as Weight)) + } + fn approve_bounty() -> Weight { + (17_226_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) + } + fn propose_curator() -> Weight { + (13_314_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + fn unassign_curator() -> Weight { + (48_677_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) + } + fn accept_curator() -> Weight { + (48_727_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) + } + fn award_bounty() -> Weight { + (34_839_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + fn claim_bounty() -> Weight { + (64_883_000 as Weight) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) + } + fn close_bounty_proposed() -> Weight { + (48_003_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) + } + fn close_bounty_active() -> Weight { + (62_215_000 as Weight) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) + } + fn extend_bounty_expiry() -> Weight { + (33_748_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + fn spend_funds(b: u32, ) -> Weight { + (3_688_000 as Weight) + .saturating_add((70_129_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(b as Weight))) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(b as Weight))) + } +} + +// For backwards compatibility and tests +impl WeightInfo for () { + fn propose_bounty(d: u32, ) -> Weight { + (59_931_000 as Weight) + .saturating_add((1_000 as Weight).saturating_mul(d as Weight)) + .saturating_add(RocksDbWeight::get().reads(2 as Weight)) + .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + } + fn approve_bounty() -> Weight { + (17_226_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(2 as Weight)) + .saturating_add(RocksDbWeight::get().writes(2 as Weight)) + } + fn propose_curator() -> Weight { + (13_314_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(1 as Weight)) + .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } + fn unassign_curator() -> Weight { + (48_677_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(2 as Weight)) + .saturating_add(RocksDbWeight::get().writes(2 as Weight)) + } + fn accept_curator() -> Weight { + (48_727_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(2 as Weight)) + .saturating_add(RocksDbWeight::get().writes(2 as Weight)) + } + fn award_bounty() -> Weight { + (34_839_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(1 as Weight)) + .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } + fn claim_bounty() -> Weight { + (64_883_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(3 as Weight)) + .saturating_add(RocksDbWeight::get().writes(3 as Weight)) + } + fn close_bounty_proposed() -> Weight { + (48_003_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(2 as Weight)) + .saturating_add(RocksDbWeight::get().writes(3 as Weight)) + } + fn close_bounty_active() -> Weight { + (62_215_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(3 as Weight)) + .saturating_add(RocksDbWeight::get().writes(3 as Weight)) + } + fn extend_bounty_expiry() -> Weight { + (33_748_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(1 as Weight)) + .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } + fn spend_funds(b: u32, ) -> Weight { + (3_688_000 as Weight) + .saturating_add((70_129_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(RocksDbWeight::get().reads(1 as Weight)) + .saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(b as Weight))) + .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + .saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(b as Weight))) + } +} diff --git a/runtime/kusama/src/weights/pallet_tips.rs b/runtime/kusama/src/weights/pallet_tips.rs new file mode 100644 index 000000000000..f0e9aba44d54 --- /dev/null +++ b/runtime/kusama/src/weights/pallet_tips.rs @@ -0,0 +1,121 @@ +// This file is part of Substrate. + +// Copyright (C) 2020 Parity Technologies (UK) Ltd. +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +//! Autogenerated weights for pallet_tips +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0 +//! DATE: 2020-11-20, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: [] +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128 + +// Executed Command: +// target/release/substrate +// benchmark +// --chain=dev +// --steps=50 +// --repeat=20 +// --pallet=pallet_tips +// --extrinsic=* +// --execution=wasm +// --wasm-execution=compiled +// --heap-pages=4096 +// --output=./frame/tips/src/weights.rs +// --template=./.maintain/frame-weight-template.hbs + + +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use sp_std::marker::PhantomData; + +/// Weight functions needed for pallet_tips. +pub trait WeightInfo { + fn report_awesome(r: u32, ) -> Weight; + fn retract_tip() -> Weight; + fn tip_new(r: u32, t: u32, ) -> Weight; + fn tip(t: u32, ) -> Weight; + fn close_tip(t: u32, ) -> Weight; +} + +/// Weights for pallet_tips using the Substrate node and recommended hardware. +pub struct SubstrateWeight(PhantomData); +impl WeightInfo for SubstrateWeight { + fn report_awesome(r: u32, ) -> Weight { + (70_338_000 as Weight) + .saturating_add((2_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) + } + fn retract_tip() -> Weight { + (59_051_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) + } + fn tip_new(r: u32, t: u32, ) -> Weight { + (41_984_000 as Weight) + .saturating_add((2_000 as Weight).saturating_mul(r as Weight)) + .saturating_add((180_000 as Weight).saturating_mul(t as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) + } + fn tip(t: u32, ) -> Weight { + (33_313_000 as Weight) + .saturating_add((700_000 as Weight).saturating_mul(t as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + fn close_tip(t: u32, ) -> Weight { + (110_781_000 as Weight) + .saturating_add((364_000 as Weight).saturating_mul(t as Weight)) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) + } +} + +// For backwards compatibility and tests +impl WeightInfo for () { + fn report_awesome(r: u32, ) -> Weight { + (70_338_000 as Weight) + .saturating_add((2_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(RocksDbWeight::get().reads(2 as Weight)) + .saturating_add(RocksDbWeight::get().writes(2 as Weight)) + } + fn retract_tip() -> Weight { + (59_051_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(1 as Weight)) + .saturating_add(RocksDbWeight::get().writes(2 as Weight)) + } + fn tip_new(r: u32, t: u32, ) -> Weight { + (41_984_000 as Weight) + .saturating_add((2_000 as Weight).saturating_mul(r as Weight)) + .saturating_add((180_000 as Weight).saturating_mul(t as Weight)) + .saturating_add(RocksDbWeight::get().reads(2 as Weight)) + .saturating_add(RocksDbWeight::get().writes(2 as Weight)) + } + fn tip(t: u32, ) -> Weight { + (33_313_000 as Weight) + .saturating_add((700_000 as Weight).saturating_mul(t as Weight)) + .saturating_add(RocksDbWeight::get().reads(2 as Weight)) + .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } + fn close_tip(t: u32, ) -> Weight { + (110_781_000 as Weight) + .saturating_add((364_000 as Weight).saturating_mul(t as Weight)) + .saturating_add(RocksDbWeight::get().reads(3 as Weight)) + .saturating_add(RocksDbWeight::get().writes(3 as Weight)) + } +} diff --git a/runtime/polkadot/Cargo.toml b/runtime/polkadot/Cargo.toml index b6435b37810c..12af09cb3ebe 100644 --- a/runtime/polkadot/Cargo.toml +++ b/runtime/polkadot/Cargo.toml @@ -34,6 +34,7 @@ pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-bounties = { git = "https://github.com/shamb0/substrate.git", branch = "issue-7143-pallet-treasury-refactor", default-features = false } pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } @@ -58,7 +59,8 @@ pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", frame-system = {git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-tips = { git = "https://github.com/shamb0/substrate.git", branch = "issue-7143-pallet-treasury-refactor", default-features = false } +pallet-treasury = { git = "https://github.com/shamb0/substrate.git", branch = "issue-7143-pallet-treasury-refactor", default-features = false } pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } @@ -104,6 +106,7 @@ std = [ "frame-support/std", "pallet-authorship/std", "pallet-balances/std", + "pallet-bounties/std", "pallet-transaction-payment/std", "pallet-transaction-payment-rpc-runtime-api/std", "pallet-collective/std", @@ -128,6 +131,7 @@ std = [ "frame-system-rpc-runtime-api/std", "pallet-timestamp/std", "pallet-treasury/std", + "pallet-tips/std", "sp-version/std", "serde_derive", "serde/std", diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index 361f5240ff50..9e9068c96092 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -124,7 +124,8 @@ impl Filter for BaseFilter { Call::Session(_) | Call::Grandpa(_) | Call::ImOnline(_) | Call::AuthorityDiscovery(_) | Call::Utility(_) | Call::Claims(_) | Call::Vesting(_) | - Call::Identity(_) | Call::Proxy(_) | Call::Multisig(_) + Call::Identity(_) | Call::Proxy(_) | Call::Multisig(_) | + Call::Bounties(_) | Call::Tips(_) => true, } } @@ -581,10 +582,6 @@ impl pallet_treasury::Trait for Runtime { type Currency = Balances; type ApproveOrigin = ApproveOrigin; type RejectOrigin = MoreThanHalfCouncil; - type Tippers = ElectionsPhragmen; - type TipCountdown = TipCountdown; - type TipFindersFee = TipFindersFee; - type TipReportDepositBase = TipReportDepositBase; type DataDepositPerByte = DataDepositPerByte; type Event = Event; type OnSlash = Treasury; @@ -592,14 +589,32 @@ impl pallet_treasury::Trait for Runtime { type ProposalBondMinimum = ProposalBondMinimum; type SpendPeriod = SpendPeriod; type Burn = Burn; + type MaximumReasonLength = MaximumReasonLength; + type BurnDestination = (); + type SpendFunds = Bounties; + type WeightInfo = pallet_treasury::weights::SubstrateWeight; + // type WeightInfo = weights::pallet_treasury::WeightInfo; +} + +impl pallet_bounties::Trait for Runtime { + type Event = Event; type BountyDepositBase = BountyDepositBase; type BountyDepositPayoutDelay = BountyDepositPayoutDelay; type BountyUpdatePeriod = BountyUpdatePeriod; - type MaximumReasonLength = MaximumReasonLength; type BountyCuratorDeposit = BountyCuratorDeposit; type BountyValueMinimum = BountyValueMinimum; - type BurnDestination = (); - type WeightInfo = weights::pallet_treasury::WeightInfo; + type WeightInfo = pallet_bounties::weights::SubstrateWeight; + // type WeightInfo = weights::pallet_bounties::WeightInfo; +} + +impl pallet_tips::Trait for Runtime { + type Event = Event; + type Tippers = ElectionsPhragmen; + type TipCountdown = TipCountdown; + type TipFindersFee = TipFindersFee; + type TipReportDepositBase = TipReportDepositBase; + type WeightInfo = pallet_tips::weights::SubstrateWeight; + // type WeightInfo = weights::pallet_tips::WeightInfo; } parameter_types! { @@ -936,7 +951,8 @@ construct_runtime! { TechnicalCommittee: pallet_collective::::{Module, Call, Storage, Origin, Event, Config} = 16, ElectionsPhragmen: pallet_elections_phragmen::{Module, Call, Storage, Event, Config} = 17, TechnicalMembership: pallet_membership::::{Module, Call, Storage, Event, Config} = 18, - Treasury: pallet_treasury::{Module, Call, Storage, Event} = 19, + // Treasury: pallet_treasury::{Module, Call, Storage, Event} = 19, + Treasury: pallet_treasury::{Module, Call, Storage, Config, Event} = 19, // Claims. Usable initially. Claims: claims::{Module, Call, Storage, Event, Config, ValidateUnsigned} = 24, @@ -953,6 +969,13 @@ construct_runtime! { // Multisig dispatch. Late addition. Multisig: pallet_multisig::{Module, Call, Storage, Event} = 30, + + // Bounties module. + Bounties: pallet_bounties::{Module, Call, Storage, Event} = 34, + + // Tips module. + Tips: pallet_tips::{Module, Call, Storage, Event} = 35, + } } @@ -1286,6 +1309,9 @@ sp_api::impl_runtime_apis! { add_benchmark!(params, batches, pallet_utility, Utility); add_benchmark!(params, batches, pallet_vesting, Vesting); + add_benchmark!(params, batches, pallet_bounties, Bounties); + add_benchmark!(params, batches, pallet_tips, Tips); + if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) } Ok(batches) } diff --git a/runtime/polkadot/src/weights/mod.rs b/runtime/polkadot/src/weights/mod.rs index 19269d02611e..0411000b1c3f 100644 --- a/runtime/polkadot/src/weights/mod.rs +++ b/runtime/polkadot/src/weights/mod.rs @@ -32,3 +32,5 @@ pub mod pallet_timestamp; pub mod pallet_treasury; pub mod pallet_utility; pub mod pallet_vesting; +pub mod pallet_bounties; +pub mod pallet_tips; diff --git a/runtime/polkadot/src/weights/pallet_bounties.rs b/runtime/polkadot/src/weights/pallet_bounties.rs new file mode 100644 index 000000000000..fbe1a5964330 --- /dev/null +++ b/runtime/polkadot/src/weights/pallet_bounties.rs @@ -0,0 +1,185 @@ +// This file is part of Substrate. + +// Copyright (C) 2020 Parity Technologies (UK) Ltd. +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +//! Autogenerated weights for pallet_bounties +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0 +//! DATE: 2020-11-20, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: [] +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128 + +// Executed Command: +// target/release/substrate +// benchmark +// --chain=dev +// --steps=50 +// --repeat=20 +// --pallet=pallet_bounties +// --extrinsic=* +// --execution=wasm +// --wasm-execution=compiled +// --heap-pages=4096 +// --output=./frame/bounties/src/weights.rs +// --template=./.maintain/frame-weight-template.hbs + + +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use sp_std::marker::PhantomData; + +/// Weight functions needed for pallet_bounties. +pub trait WeightInfo { + fn propose_bounty(d: u32, ) -> Weight; + fn approve_bounty() -> Weight; + fn propose_curator() -> Weight; + fn unassign_curator() -> Weight; + fn accept_curator() -> Weight; + fn award_bounty() -> Weight; + fn claim_bounty() -> Weight; + fn close_bounty_proposed() -> Weight; + fn close_bounty_active() -> Weight; + fn extend_bounty_expiry() -> Weight; + fn spend_funds(b: u32, ) -> Weight; +} + +/// Weights for pallet_bounties using the Substrate node and recommended hardware. +pub struct SubstrateWeight(PhantomData); +impl WeightInfo for SubstrateWeight { + fn propose_bounty(d: u32, ) -> Weight { + (59_931_000 as Weight) + .saturating_add((1_000 as Weight).saturating_mul(d as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(4 as Weight)) + } + fn approve_bounty() -> Weight { + (17_226_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) + } + fn propose_curator() -> Weight { + (13_314_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + fn unassign_curator() -> Weight { + (48_677_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) + } + fn accept_curator() -> Weight { + (48_727_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) + } + fn award_bounty() -> Weight { + (34_839_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + fn claim_bounty() -> Weight { + (64_883_000 as Weight) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) + } + fn close_bounty_proposed() -> Weight { + (48_003_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) + } + fn close_bounty_active() -> Weight { + (62_215_000 as Weight) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) + } + fn extend_bounty_expiry() -> Weight { + (33_748_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + fn spend_funds(b: u32, ) -> Weight { + (3_688_000 as Weight) + .saturating_add((70_129_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(b as Weight))) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(b as Weight))) + } +} + +// For backwards compatibility and tests +impl WeightInfo for () { + fn propose_bounty(d: u32, ) -> Weight { + (59_931_000 as Weight) + .saturating_add((1_000 as Weight).saturating_mul(d as Weight)) + .saturating_add(RocksDbWeight::get().reads(2 as Weight)) + .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + } + fn approve_bounty() -> Weight { + (17_226_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(2 as Weight)) + .saturating_add(RocksDbWeight::get().writes(2 as Weight)) + } + fn propose_curator() -> Weight { + (13_314_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(1 as Weight)) + .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } + fn unassign_curator() -> Weight { + (48_677_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(2 as Weight)) + .saturating_add(RocksDbWeight::get().writes(2 as Weight)) + } + fn accept_curator() -> Weight { + (48_727_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(2 as Weight)) + .saturating_add(RocksDbWeight::get().writes(2 as Weight)) + } + fn award_bounty() -> Weight { + (34_839_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(1 as Weight)) + .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } + fn claim_bounty() -> Weight { + (64_883_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(3 as Weight)) + .saturating_add(RocksDbWeight::get().writes(3 as Weight)) + } + fn close_bounty_proposed() -> Weight { + (48_003_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(2 as Weight)) + .saturating_add(RocksDbWeight::get().writes(3 as Weight)) + } + fn close_bounty_active() -> Weight { + (62_215_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(3 as Weight)) + .saturating_add(RocksDbWeight::get().writes(3 as Weight)) + } + fn extend_bounty_expiry() -> Weight { + (33_748_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(1 as Weight)) + .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } + fn spend_funds(b: u32, ) -> Weight { + (3_688_000 as Weight) + .saturating_add((70_129_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(RocksDbWeight::get().reads(1 as Weight)) + .saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(b as Weight))) + .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + .saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(b as Weight))) + } +} diff --git a/runtime/polkadot/src/weights/pallet_tips.rs b/runtime/polkadot/src/weights/pallet_tips.rs new file mode 100644 index 000000000000..f0e9aba44d54 --- /dev/null +++ b/runtime/polkadot/src/weights/pallet_tips.rs @@ -0,0 +1,121 @@ +// This file is part of Substrate. + +// Copyright (C) 2020 Parity Technologies (UK) Ltd. +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +//! Autogenerated weights for pallet_tips +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0 +//! DATE: 2020-11-20, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: [] +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128 + +// Executed Command: +// target/release/substrate +// benchmark +// --chain=dev +// --steps=50 +// --repeat=20 +// --pallet=pallet_tips +// --extrinsic=* +// --execution=wasm +// --wasm-execution=compiled +// --heap-pages=4096 +// --output=./frame/tips/src/weights.rs +// --template=./.maintain/frame-weight-template.hbs + + +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use sp_std::marker::PhantomData; + +/// Weight functions needed for pallet_tips. +pub trait WeightInfo { + fn report_awesome(r: u32, ) -> Weight; + fn retract_tip() -> Weight; + fn tip_new(r: u32, t: u32, ) -> Weight; + fn tip(t: u32, ) -> Weight; + fn close_tip(t: u32, ) -> Weight; +} + +/// Weights for pallet_tips using the Substrate node and recommended hardware. +pub struct SubstrateWeight(PhantomData); +impl WeightInfo for SubstrateWeight { + fn report_awesome(r: u32, ) -> Weight { + (70_338_000 as Weight) + .saturating_add((2_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) + } + fn retract_tip() -> Weight { + (59_051_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) + } + fn tip_new(r: u32, t: u32, ) -> Weight { + (41_984_000 as Weight) + .saturating_add((2_000 as Weight).saturating_mul(r as Weight)) + .saturating_add((180_000 as Weight).saturating_mul(t as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) + } + fn tip(t: u32, ) -> Weight { + (33_313_000 as Weight) + .saturating_add((700_000 as Weight).saturating_mul(t as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + fn close_tip(t: u32, ) -> Weight { + (110_781_000 as Weight) + .saturating_add((364_000 as Weight).saturating_mul(t as Weight)) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) + } +} + +// For backwards compatibility and tests +impl WeightInfo for () { + fn report_awesome(r: u32, ) -> Weight { + (70_338_000 as Weight) + .saturating_add((2_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(RocksDbWeight::get().reads(2 as Weight)) + .saturating_add(RocksDbWeight::get().writes(2 as Weight)) + } + fn retract_tip() -> Weight { + (59_051_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(1 as Weight)) + .saturating_add(RocksDbWeight::get().writes(2 as Weight)) + } + fn tip_new(r: u32, t: u32, ) -> Weight { + (41_984_000 as Weight) + .saturating_add((2_000 as Weight).saturating_mul(r as Weight)) + .saturating_add((180_000 as Weight).saturating_mul(t as Weight)) + .saturating_add(RocksDbWeight::get().reads(2 as Weight)) + .saturating_add(RocksDbWeight::get().writes(2 as Weight)) + } + fn tip(t: u32, ) -> Weight { + (33_313_000 as Weight) + .saturating_add((700_000 as Weight).saturating_mul(t as Weight)) + .saturating_add(RocksDbWeight::get().reads(2 as Weight)) + .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } + fn close_tip(t: u32, ) -> Weight { + (110_781_000 as Weight) + .saturating_add((364_000 as Weight).saturating_mul(t as Weight)) + .saturating_add(RocksDbWeight::get().reads(3 as Weight)) + .saturating_add(RocksDbWeight::get().writes(3 as Weight)) + } +} diff --git a/runtime/polkadot/src/weights/pallet_treasury.rs b/runtime/polkadot/src/weights/pallet_treasury.rs index aa9c30c21bc6..a3f407523f1c 100644 --- a/runtime/polkadot/src/weights/pallet_treasury.rs +++ b/runtime/polkadot/src/weights/pallet_treasury.rs @@ -1,27 +1,30 @@ -// Copyright 2017-2020 Parity Technologies (UK) Ltd. -// This file is part of Polkadot. +// This file is part of Substrate. -// Polkadot 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. +// Copyright (C) 2020 Parity Technologies (UK) Ltd. +// SPDX-License-Identifier: Apache-2.0 -// Polkadot 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. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. -// You should have received a copy of the GNU General Public License -// along with Polkadot. If not, see . -//! Weights for pallet_treasury +//! Autogenerated weights for pallet_treasury +//! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0 -//! DATE: 2020-10-29, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: [] -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 128 +//! DATE: 2020-11-20, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: [] +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128 // Executed Command: -// ./target/release/polkadot +// target/release/substrate // benchmark -// --chain=polkadot-dev +// --chain=dev // --steps=50 // --repeat=20 // --pallet=pallet_treasury @@ -29,130 +32,75 @@ // --execution=wasm // --wasm-execution=compiled // --heap-pages=4096 -// --header -// ./file_header.txt -// --output=./runtime/polkadot/src/weights/ +// --output=./frame/treasury/src/weights.rs +// --template=./.maintain/frame-weight-template.hbs #![allow(unused_parens)] #![allow(unused_imports)] -use frame_support::{traits::Get, weights::Weight}; +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; use sp_std::marker::PhantomData; -/// Weight functions for pallet_treasury. -pub struct WeightInfo(PhantomData); -impl pallet_treasury::WeightInfo for WeightInfo { +/// Weight functions needed for pallet_treasury. +pub trait WeightInfo { + fn propose_spend() -> Weight; + fn reject_proposal() -> Weight; + fn approve_proposal() -> Weight; + fn on_initialize_proposals(p: u32, ) -> Weight; +} + +/// Weights for pallet_treasury using the Substrate node and recommended hardware. +pub struct SubstrateWeight(PhantomData); +impl WeightInfo for SubstrateWeight { fn propose_spend() -> Weight { - (52_150_000 as Weight) + (55_957_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn reject_proposal() -> Weight { - (82_349_000 as Weight) + (45_616_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn approve_proposal() -> Weight { - (11_101_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } - fn report_awesome(r: u32, ) -> Weight { - (64_551_000 as Weight) - .saturating_add((2_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } - fn retract_tip() -> Weight { - (54_970_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } - fn tip_new(r: u32, t: u32, ) -> Weight { - (40_231_000 as Weight) - .saturating_add((2_000 as Weight).saturating_mul(r as Weight)) - .saturating_add((149_000 as Weight).saturating_mul(t as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } - fn tip(t: u32, ) -> Weight { - (27_369_000 as Weight) - .saturating_add((695_000 as Weight).saturating_mul(t as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } - fn close_tip(t: u32, ) -> Weight { - (102_827_000 as Weight) - .saturating_add((362_000 as Weight).saturating_mul(t as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) - } - fn propose_bounty(d: u32, ) -> Weight { - (55_764_000 as Weight) - .saturating_add((1_000 as Weight).saturating_mul(d as Weight)) + (13_362_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) - } - fn approve_bounty() -> Weight { - (15_335_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } - fn propose_curator() -> Weight { - (11_888_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn unassign_curator() -> Weight { - (67_124_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } - fn accept_curator() -> Weight { - (46_414_000 as Weight) + fn on_initialize_proposals(p: u32, ) -> Weight { + (74_689_000 as Weight) + .saturating_add((71_943_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(p as Weight))) .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(p as Weight))) } - fn award_bounty() -> Weight { - (32_393_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } - fn claim_bounty() -> Weight { - (156_140_000 as Weight) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(5 as Weight)) - } - fn close_bounty_proposed() -> Weight { - (65_931_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) +} + +// For backwards compatibility and tests +impl WeightInfo for () { + fn propose_spend() -> Weight { + (55_957_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(1 as Weight)) + .saturating_add(RocksDbWeight::get().writes(2 as Weight)) } - fn close_bounty_active() -> Weight { - (102_999_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + fn reject_proposal() -> Weight { + (45_616_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(2 as Weight)) + .saturating_add(RocksDbWeight::get().writes(2 as Weight)) } - fn extend_bounty_expiry() -> Weight { - (31_493_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + fn approve_proposal() -> Weight { + (13_362_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(2 as Weight)) + .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn on_initialize_proposals(p: u32, ) -> Weight { - (65_761_000 as Weight) - .saturating_add((69_596_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(p as Weight))) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(p as Weight))) - } - fn on_initialize_bounties(b: u32, ) -> Weight { - (61_158_000 as Weight) - .saturating_add((69_154_000 as Weight).saturating_mul(b as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(b as Weight))) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(b as Weight))) + (74_689_000 as Weight) + .saturating_add((71_943_000 as Weight).saturating_mul(p as Weight)) + .saturating_add(RocksDbWeight::get().reads(2 as Weight)) + .saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(p as Weight))) + .saturating_add(RocksDbWeight::get().writes(2 as Weight)) + .saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(p as Weight))) } } From 88a60d76ff3bca88652449faf29321cd0a144bb3 Mon Sep 17 00:00:00 2001 From: Shawn Tabrizi Date: Mon, 30 Nov 2020 12:56:52 -0800 Subject: [PATCH 03/20] trait -> config --- runtime/kusama/src/lib.rs | 4 ++-- runtime/kusama/src/weights/pallet_bounties.rs | 2 +- runtime/kusama/src/weights/pallet_tips.rs | 2 +- runtime/kusama/src/weights/pallet_treasury.rs | 2 +- runtime/polkadot/src/lib.rs | 4 ++-- runtime/polkadot/src/weights/pallet_bounties.rs | 2 +- runtime/polkadot/src/weights/pallet_tips.rs | 2 +- runtime/polkadot/src/weights/pallet_treasury.rs | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 67d933d4e6e7..9cdb035ac5d1 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -549,7 +549,7 @@ impl pallet_treasury::Config for Runtime { // type WeightInfo = weights::pallet_treasury::WeightInfo; } -impl pallet_bounties::Trait for Runtime { +impl pallet_bounties::Config for Runtime { type Event = Event; type BountyDepositBase = BountyDepositBase; type BountyDepositPayoutDelay = BountyDepositPayoutDelay; @@ -561,7 +561,7 @@ impl pallet_bounties::Trait for Runtime { } -impl pallet_tips::Trait for Runtime { +impl pallet_tips::Config for Runtime { type Event = Event; type Tippers = ElectionsPhragmen; type TipCountdown = TipCountdown; diff --git a/runtime/kusama/src/weights/pallet_bounties.rs b/runtime/kusama/src/weights/pallet_bounties.rs index fbe1a5964330..b2835923e880 100644 --- a/runtime/kusama/src/weights/pallet_bounties.rs +++ b/runtime/kusama/src/weights/pallet_bounties.rs @@ -59,7 +59,7 @@ pub trait WeightInfo { /// Weights for pallet_bounties using the Substrate node and recommended hardware. pub struct SubstrateWeight(PhantomData); -impl WeightInfo for SubstrateWeight { +impl WeightInfo for SubstrateWeight { fn propose_bounty(d: u32, ) -> Weight { (59_931_000 as Weight) .saturating_add((1_000 as Weight).saturating_mul(d as Weight)) diff --git a/runtime/kusama/src/weights/pallet_tips.rs b/runtime/kusama/src/weights/pallet_tips.rs index f0e9aba44d54..6b15c1ec92a5 100644 --- a/runtime/kusama/src/weights/pallet_tips.rs +++ b/runtime/kusama/src/weights/pallet_tips.rs @@ -53,7 +53,7 @@ pub trait WeightInfo { /// Weights for pallet_tips using the Substrate node and recommended hardware. pub struct SubstrateWeight(PhantomData); -impl WeightInfo for SubstrateWeight { +impl WeightInfo for SubstrateWeight { fn report_awesome(r: u32, ) -> Weight { (70_338_000 as Weight) .saturating_add((2_000 as Weight).saturating_mul(r as Weight)) diff --git a/runtime/kusama/src/weights/pallet_treasury.rs b/runtime/kusama/src/weights/pallet_treasury.rs index a3f407523f1c..4290daa30477 100644 --- a/runtime/kusama/src/weights/pallet_treasury.rs +++ b/runtime/kusama/src/weights/pallet_treasury.rs @@ -52,7 +52,7 @@ pub trait WeightInfo { /// Weights for pallet_treasury using the Substrate node and recommended hardware. pub struct SubstrateWeight(PhantomData); -impl WeightInfo for SubstrateWeight { +impl WeightInfo for SubstrateWeight { fn propose_spend() -> Weight { (55_957_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index 3a541c516a40..ae3479d0eb2e 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -596,7 +596,7 @@ impl pallet_treasury::Config for Runtime { // type WeightInfo = weights::pallet_treasury::WeightInfo; } -impl pallet_bounties::Trait for Runtime { +impl pallet_bounties::Config for Runtime { type Event = Event; type BountyDepositBase = BountyDepositBase; type BountyDepositPayoutDelay = BountyDepositPayoutDelay; @@ -607,7 +607,7 @@ impl pallet_bounties::Trait for Runtime { // type WeightInfo = weights::pallet_bounties::WeightInfo; } -impl pallet_tips::Trait for Runtime { +impl pallet_tips::Config for Runtime { type Event = Event; type Tippers = ElectionsPhragmen; type TipCountdown = TipCountdown; diff --git a/runtime/polkadot/src/weights/pallet_bounties.rs b/runtime/polkadot/src/weights/pallet_bounties.rs index fbe1a5964330..b2835923e880 100644 --- a/runtime/polkadot/src/weights/pallet_bounties.rs +++ b/runtime/polkadot/src/weights/pallet_bounties.rs @@ -59,7 +59,7 @@ pub trait WeightInfo { /// Weights for pallet_bounties using the Substrate node and recommended hardware. pub struct SubstrateWeight(PhantomData); -impl WeightInfo for SubstrateWeight { +impl WeightInfo for SubstrateWeight { fn propose_bounty(d: u32, ) -> Weight { (59_931_000 as Weight) .saturating_add((1_000 as Weight).saturating_mul(d as Weight)) diff --git a/runtime/polkadot/src/weights/pallet_tips.rs b/runtime/polkadot/src/weights/pallet_tips.rs index f0e9aba44d54..6b15c1ec92a5 100644 --- a/runtime/polkadot/src/weights/pallet_tips.rs +++ b/runtime/polkadot/src/weights/pallet_tips.rs @@ -53,7 +53,7 @@ pub trait WeightInfo { /// Weights for pallet_tips using the Substrate node and recommended hardware. pub struct SubstrateWeight(PhantomData); -impl WeightInfo for SubstrateWeight { +impl WeightInfo for SubstrateWeight { fn report_awesome(r: u32, ) -> Weight { (70_338_000 as Weight) .saturating_add((2_000 as Weight).saturating_mul(r as Weight)) diff --git a/runtime/polkadot/src/weights/pallet_treasury.rs b/runtime/polkadot/src/weights/pallet_treasury.rs index a3f407523f1c..4290daa30477 100644 --- a/runtime/polkadot/src/weights/pallet_treasury.rs +++ b/runtime/polkadot/src/weights/pallet_treasury.rs @@ -52,7 +52,7 @@ pub trait WeightInfo { /// Weights for pallet_treasury using the Substrate node and recommended hardware. pub struct SubstrateWeight(PhantomData); -impl WeightInfo for SubstrateWeight { +impl WeightInfo for SubstrateWeight { fn propose_spend() -> Weight { (55_957_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) From 8144735d79f6007eeca81bb3ca2e31f6f945368f Mon Sep 17 00:00:00 2001 From: Shawn Tabrizi Date: Mon, 14 Dec 2020 18:16:41 -0800 Subject: [PATCH 04/20] fix weight files and import --- runtime/kusama/src/lib.rs | 9 +- runtime/kusama/src/weights/pallet_bounties.rs | 85 +------------- runtime/kusama/src/weights/pallet_tips.rs | 50 +------- runtime/kusama/src/weights/pallet_treasury.rs | 111 ++---------------- runtime/polkadot/src/lib.rs | 9 +- .../polkadot/src/weights/pallet_treasury.rs | 107 +---------------- 6 files changed, 24 insertions(+), 347 deletions(-) diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index cf5c11d41ddb..e5c56573b3bb 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -569,8 +569,7 @@ impl pallet_treasury::Config for Runtime { type MaximumReasonLength = MaximumReasonLength; type BurnDestination = Society; type SpendFunds = Bounties; - type WeightInfo = pallet_treasury::weights::SubstrateWeight; - // type WeightInfo = weights::pallet_treasury::WeightInfo; + type WeightInfo = weights::pallet_treasury::WeightInfo; } impl pallet_bounties::Config for Runtime { @@ -580,8 +579,7 @@ impl pallet_bounties::Config for Runtime { type BountyUpdatePeriod = BountyUpdatePeriod; type BountyCuratorDeposit = BountyCuratorDeposit; type BountyValueMinimum = BountyValueMinimum; - type WeightInfo = pallet_bounties::weights::SubstrateWeight; - // type WeightInfo = weights::pallet_bounties::WeightInfo; + type WeightInfo = weights::pallet_bounties::WeightInfo; } @@ -591,8 +589,7 @@ impl pallet_tips::Config for Runtime { type TipCountdown = TipCountdown; type TipFindersFee = TipFindersFee; type TipReportDepositBase = TipReportDepositBase; - type WeightInfo = pallet_tips::weights::SubstrateWeight; - // type WeightInfo = weights::pallet_tips::WeightInfo; + type WeightInfo = weights::pallet_tips::WeightInfo; } parameter_types! { diff --git a/runtime/kusama/src/weights/pallet_bounties.rs b/runtime/kusama/src/weights/pallet_bounties.rs index b2835923e880..c89c5a9a18c2 100644 --- a/runtime/kusama/src/weights/pallet_bounties.rs +++ b/runtime/kusama/src/weights/pallet_bounties.rs @@ -35,31 +35,15 @@ // --output=./frame/bounties/src/weights.rs // --template=./.maintain/frame-weight-template.hbs - #![allow(unused_parens)] #![allow(unused_imports)] -use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -/// Weight functions needed for pallet_bounties. -pub trait WeightInfo { - fn propose_bounty(d: u32, ) -> Weight; - fn approve_bounty() -> Weight; - fn propose_curator() -> Weight; - fn unassign_curator() -> Weight; - fn accept_curator() -> Weight; - fn award_bounty() -> Weight; - fn claim_bounty() -> Weight; - fn close_bounty_proposed() -> Weight; - fn close_bounty_active() -> Weight; - fn extend_bounty_expiry() -> Weight; - fn spend_funds(b: u32, ) -> Weight; -} - /// Weights for pallet_bounties using the Substrate node and recommended hardware. -pub struct SubstrateWeight(PhantomData); -impl WeightInfo for SubstrateWeight { +pub struct WeightInfo(PhantomData); +impl WeightInfo for WeightInfo { fn propose_bounty(d: u32, ) -> Weight { (59_931_000 as Weight) .saturating_add((1_000 as Weight).saturating_mul(d as Weight)) @@ -120,66 +104,3 @@ impl WeightInfo for SubstrateWeight { .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(b as Weight))) } } - -// For backwards compatibility and tests -impl WeightInfo for () { - fn propose_bounty(d: u32, ) -> Weight { - (59_931_000 as Weight) - .saturating_add((1_000 as Weight).saturating_mul(d as Weight)) - .saturating_add(RocksDbWeight::get().reads(2 as Weight)) - .saturating_add(RocksDbWeight::get().writes(4 as Weight)) - } - fn approve_bounty() -> Weight { - (17_226_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(2 as Weight)) - .saturating_add(RocksDbWeight::get().writes(2 as Weight)) - } - fn propose_curator() -> Weight { - (13_314_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(1 as Weight)) - .saturating_add(RocksDbWeight::get().writes(1 as Weight)) - } - fn unassign_curator() -> Weight { - (48_677_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(2 as Weight)) - .saturating_add(RocksDbWeight::get().writes(2 as Weight)) - } - fn accept_curator() -> Weight { - (48_727_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(2 as Weight)) - .saturating_add(RocksDbWeight::get().writes(2 as Weight)) - } - fn award_bounty() -> Weight { - (34_839_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(1 as Weight)) - .saturating_add(RocksDbWeight::get().writes(1 as Weight)) - } - fn claim_bounty() -> Weight { - (64_883_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(3 as Weight)) - .saturating_add(RocksDbWeight::get().writes(3 as Weight)) - } - fn close_bounty_proposed() -> Weight { - (48_003_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(2 as Weight)) - .saturating_add(RocksDbWeight::get().writes(3 as Weight)) - } - fn close_bounty_active() -> Weight { - (62_215_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(3 as Weight)) - .saturating_add(RocksDbWeight::get().writes(3 as Weight)) - } - fn extend_bounty_expiry() -> Weight { - (33_748_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(1 as Weight)) - .saturating_add(RocksDbWeight::get().writes(1 as Weight)) - } - fn spend_funds(b: u32, ) -> Weight { - (3_688_000 as Weight) - .saturating_add((70_129_000 as Weight).saturating_mul(b as Weight)) - .saturating_add(RocksDbWeight::get().reads(1 as Weight)) - .saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(b as Weight))) - .saturating_add(RocksDbWeight::get().writes(1 as Weight)) - .saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(b as Weight))) - } -} diff --git a/runtime/kusama/src/weights/pallet_tips.rs b/runtime/kusama/src/weights/pallet_tips.rs index 6b15c1ec92a5..e91744b139ad 100644 --- a/runtime/kusama/src/weights/pallet_tips.rs +++ b/runtime/kusama/src/weights/pallet_tips.rs @@ -35,25 +35,15 @@ // --output=./frame/tips/src/weights.rs // --template=./.maintain/frame-weight-template.hbs - #![allow(unused_parens)] #![allow(unused_imports)] -use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -/// Weight functions needed for pallet_tips. -pub trait WeightInfo { - fn report_awesome(r: u32, ) -> Weight; - fn retract_tip() -> Weight; - fn tip_new(r: u32, t: u32, ) -> Weight; - fn tip(t: u32, ) -> Weight; - fn close_tip(t: u32, ) -> Weight; -} - /// Weights for pallet_tips using the Substrate node and recommended hardware. -pub struct SubstrateWeight(PhantomData); -impl WeightInfo for SubstrateWeight { +pub struct WeightInfo(PhantomData); +impl WeightInfo for WeightInfo { fn report_awesome(r: u32, ) -> Weight { (70_338_000 as Weight) .saturating_add((2_000 as Weight).saturating_mul(r as Weight)) @@ -85,37 +75,3 @@ impl WeightInfo for SubstrateWeight { .saturating_add(T::DbWeight::get().writes(3 as Weight)) } } - -// For backwards compatibility and tests -impl WeightInfo for () { - fn report_awesome(r: u32, ) -> Weight { - (70_338_000 as Weight) - .saturating_add((2_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(RocksDbWeight::get().reads(2 as Weight)) - .saturating_add(RocksDbWeight::get().writes(2 as Weight)) - } - fn retract_tip() -> Weight { - (59_051_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(1 as Weight)) - .saturating_add(RocksDbWeight::get().writes(2 as Weight)) - } - fn tip_new(r: u32, t: u32, ) -> Weight { - (41_984_000 as Weight) - .saturating_add((2_000 as Weight).saturating_mul(r as Weight)) - .saturating_add((180_000 as Weight).saturating_mul(t as Weight)) - .saturating_add(RocksDbWeight::get().reads(2 as Weight)) - .saturating_add(RocksDbWeight::get().writes(2 as Weight)) - } - fn tip(t: u32, ) -> Weight { - (33_313_000 as Weight) - .saturating_add((700_000 as Weight).saturating_mul(t as Weight)) - .saturating_add(RocksDbWeight::get().reads(2 as Weight)) - .saturating_add(RocksDbWeight::get().writes(1 as Weight)) - } - fn close_tip(t: u32, ) -> Weight { - (110_781_000 as Weight) - .saturating_add((364_000 as Weight).saturating_mul(t as Weight)) - .saturating_add(RocksDbWeight::get().reads(3 as Weight)) - .saturating_add(RocksDbWeight::get().writes(3 as Weight)) - } -} diff --git a/runtime/kusama/src/weights/pallet_treasury.rs b/runtime/kusama/src/weights/pallet_treasury.rs index 73e1b6a82a35..43ed53f898b0 100644 --- a/runtime/kusama/src/weights/pallet_treasury.rs +++ b/runtime/kusama/src/weights/pallet_treasury.rs @@ -44,123 +44,26 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl pallet_treasury::WeightInfo for WeightInfo { fn propose_spend() -> Weight { - (53_899_000 as Weight) + (55_957_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn reject_proposal() -> Weight { - (84_208_000 as Weight) + (45_616_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn approve_proposal() -> Weight { - (11_576_000 as Weight) + (13_362_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn report_awesome(r: u32, ) -> Weight { - (66_679_000 as Weight) - // Standard Error: 0 - .saturating_add((2_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } - fn retract_tip() -> Weight { - (56_703_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } - fn tip_new(r: u32, t: u32, ) -> Weight { - (42_139_000 as Weight) - // Standard Error: 0 - .saturating_add((2_000 as Weight).saturating_mul(r as Weight)) - // Standard Error: 0 - .saturating_add((144_000 as Weight).saturating_mul(t as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } - fn tip(t: u32, ) -> Weight { - (27_980_000 as Weight) - // Standard Error: 1_000 - .saturating_add((691_000 as Weight).saturating_mul(t as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } - fn close_tip(t: u32, ) -> Weight { - (105_039_000 as Weight) - // Standard Error: 0 - .saturating_add((360_000 as Weight).saturating_mul(t as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) - } - fn propose_bounty(d: u32, ) -> Weight { - (57_452_000 as Weight) - // Standard Error: 0 - .saturating_add((1_000 as Weight).saturating_mul(d as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) - } - fn approve_bounty() -> Weight { - (15_509_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } - fn propose_curator() -> Weight { - (12_403_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } - fn unassign_curator() -> Weight { - (68_535_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } - fn accept_curator() -> Weight { - (48_001_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } - fn award_bounty() -> Weight { - (33_291_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } - fn claim_bounty() -> Weight { - (159_266_000 as Weight) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(5 as Weight)) - } - fn close_bounty_proposed() -> Weight { - (67_667_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) - } - fn close_bounty_active() -> Weight { - (105_482_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) - } - fn extend_bounty_expiry() -> Weight { - (32_502_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } fn on_initialize_proposals(p: u32, ) -> Weight { - (108_437_000 as Weight) - // Standard Error: 16_000 - .saturating_add((70_932_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) + (74_689_000 as Weight) + .saturating_add((71_943_000 as Weight).saturating_mul(p as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(p as Weight))) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(p as Weight))) } - fn on_initialize_bounties(b: u32, ) -> Weight { - (105_767_000 as Weight) - // Standard Error: 17_000 - .saturating_add((70_197_000 as Weight).saturating_mul(b as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(b as Weight))) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) - .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(b as Weight))) - } } diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index 012b1024e6e0..551b326ab08a 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -616,8 +616,7 @@ impl pallet_treasury::Config for Runtime { type MaximumReasonLength = MaximumReasonLength; type BurnDestination = (); type SpendFunds = Bounties; - type WeightInfo = pallet_treasury::weights::SubstrateWeight; - // type WeightInfo = weights::pallet_treasury::WeightInfo; + type WeightInfo = weights::pallet_treasury::WeightInfo; } impl pallet_bounties::Config for Runtime { @@ -627,8 +626,7 @@ impl pallet_bounties::Config for Runtime { type BountyUpdatePeriod = BountyUpdatePeriod; type BountyCuratorDeposit = BountyCuratorDeposit; type BountyValueMinimum = BountyValueMinimum; - type WeightInfo = pallet_bounties::weights::SubstrateWeight; - // type WeightInfo = weights::pallet_bounties::WeightInfo; + type WeightInfo = weights::pallet_bounties::WeightInfo; } impl pallet_tips::Config for Runtime { @@ -637,8 +635,7 @@ impl pallet_tips::Config for Runtime { type TipCountdown = TipCountdown; type TipFindersFee = TipFindersFee; type TipReportDepositBase = TipReportDepositBase; - type WeightInfo = pallet_tips::weights::SubstrateWeight; - // type WeightInfo = weights::pallet_tips::WeightInfo; + type WeightInfo = weights::pallet_tips::WeightInfo; } parameter_types! { diff --git a/runtime/polkadot/src/weights/pallet_treasury.rs b/runtime/polkadot/src/weights/pallet_treasury.rs index 1075855224af..6ab5b0e545f0 100644 --- a/runtime/polkadot/src/weights/pallet_treasury.rs +++ b/runtime/polkadot/src/weights/pallet_treasury.rs @@ -44,123 +44,26 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl pallet_treasury::WeightInfo for WeightInfo { fn propose_spend() -> Weight { - (54_574_000 as Weight) + (55_957_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn reject_proposal() -> Weight { - (85_554_000 as Weight) + (45_616_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn approve_proposal() -> Weight { - (11_791_000 as Weight) + (13_362_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn report_awesome(r: u32, ) -> Weight { - (67_174_000 as Weight) - // Standard Error: 0 - .saturating_add((2_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } - fn retract_tip() -> Weight { - (56_466_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } - fn tip_new(r: u32, t: u32, ) -> Weight { - (42_193_000 as Weight) - // Standard Error: 0 - .saturating_add((2_000 as Weight).saturating_mul(r as Weight)) - // Standard Error: 0 - .saturating_add((149_000 as Weight).saturating_mul(t as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } - fn tip(t: u32, ) -> Weight { - (28_405_000 as Weight) - // Standard Error: 1_000 - .saturating_add((705_000 as Weight).saturating_mul(t as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } - fn close_tip(t: u32, ) -> Weight { - (106_075_000 as Weight) - // Standard Error: 0 - .saturating_add((361_000 as Weight).saturating_mul(t as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) - } - fn propose_bounty(d: u32, ) -> Weight { - (58_025_000 as Weight) - // Standard Error: 0 - .saturating_add((1_000 as Weight).saturating_mul(d as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) - } - fn approve_bounty() -> Weight { - (15_338_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } - fn propose_curator() -> Weight { - (12_080_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } - fn unassign_curator() -> Weight { - (69_557_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } - fn accept_curator() -> Weight { - (47_745_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } - fn award_bounty() -> Weight { - (33_468_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } - fn claim_bounty() -> Weight { - (161_390_000 as Weight) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(5 as Weight)) - } - fn close_bounty_proposed() -> Weight { - (68_016_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) - } - fn close_bounty_active() -> Weight { - (106_292_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) - } - fn extend_bounty_expiry() -> Weight { - (32_515_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } fn on_initialize_proposals(p: u32, ) -> Weight { - (72_159_000 as Weight) - // Standard Error: 26_000 - .saturating_add((72_167_000 as Weight).saturating_mul(p as Weight)) + (74_689_000 as Weight) + .saturating_add((71_943_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(p as Weight))) .saturating_add(T::DbWeight::get().writes(2 as Weight)) .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(p as Weight))) } - fn on_initialize_bounties(b: u32, ) -> Weight { - (66_526_000 as Weight) - // Standard Error: 18_000 - .saturating_add((71_398_000 as Weight).saturating_mul(b as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(b as Weight))) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(b as Weight))) - } } From 4ebb981549bc56c092e7b9bfbdb1bce48b8743d6 Mon Sep 17 00:00:00 2001 From: Shawn Tabrizi Date: Mon, 14 Dec 2020 18:19:44 -0800 Subject: [PATCH 05/20] missed some --- .../polkadot/src/weights/pallet_bounties.rs | 84 +------------------ runtime/polkadot/src/weights/pallet_tips.rs | 49 +---------- 2 files changed, 6 insertions(+), 127 deletions(-) diff --git a/runtime/polkadot/src/weights/pallet_bounties.rs b/runtime/polkadot/src/weights/pallet_bounties.rs index b2835923e880..68c20726efa6 100644 --- a/runtime/polkadot/src/weights/pallet_bounties.rs +++ b/runtime/polkadot/src/weights/pallet_bounties.rs @@ -39,27 +39,12 @@ #![allow(unused_parens)] #![allow(unused_imports)] -use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -/// Weight functions needed for pallet_bounties. -pub trait WeightInfo { - fn propose_bounty(d: u32, ) -> Weight; - fn approve_bounty() -> Weight; - fn propose_curator() -> Weight; - fn unassign_curator() -> Weight; - fn accept_curator() -> Weight; - fn award_bounty() -> Weight; - fn claim_bounty() -> Weight; - fn close_bounty_proposed() -> Weight; - fn close_bounty_active() -> Weight; - fn extend_bounty_expiry() -> Weight; - fn spend_funds(b: u32, ) -> Weight; -} - /// Weights for pallet_bounties using the Substrate node and recommended hardware. -pub struct SubstrateWeight(PhantomData); -impl WeightInfo for SubstrateWeight { +pub struct WeightInfo(PhantomData); +impl WeightInfo for WeightInfo { fn propose_bounty(d: u32, ) -> Weight { (59_931_000 as Weight) .saturating_add((1_000 as Weight).saturating_mul(d as Weight)) @@ -120,66 +105,3 @@ impl WeightInfo for SubstrateWeight { .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(b as Weight))) } } - -// For backwards compatibility and tests -impl WeightInfo for () { - fn propose_bounty(d: u32, ) -> Weight { - (59_931_000 as Weight) - .saturating_add((1_000 as Weight).saturating_mul(d as Weight)) - .saturating_add(RocksDbWeight::get().reads(2 as Weight)) - .saturating_add(RocksDbWeight::get().writes(4 as Weight)) - } - fn approve_bounty() -> Weight { - (17_226_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(2 as Weight)) - .saturating_add(RocksDbWeight::get().writes(2 as Weight)) - } - fn propose_curator() -> Weight { - (13_314_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(1 as Weight)) - .saturating_add(RocksDbWeight::get().writes(1 as Weight)) - } - fn unassign_curator() -> Weight { - (48_677_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(2 as Weight)) - .saturating_add(RocksDbWeight::get().writes(2 as Weight)) - } - fn accept_curator() -> Weight { - (48_727_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(2 as Weight)) - .saturating_add(RocksDbWeight::get().writes(2 as Weight)) - } - fn award_bounty() -> Weight { - (34_839_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(1 as Weight)) - .saturating_add(RocksDbWeight::get().writes(1 as Weight)) - } - fn claim_bounty() -> Weight { - (64_883_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(3 as Weight)) - .saturating_add(RocksDbWeight::get().writes(3 as Weight)) - } - fn close_bounty_proposed() -> Weight { - (48_003_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(2 as Weight)) - .saturating_add(RocksDbWeight::get().writes(3 as Weight)) - } - fn close_bounty_active() -> Weight { - (62_215_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(3 as Weight)) - .saturating_add(RocksDbWeight::get().writes(3 as Weight)) - } - fn extend_bounty_expiry() -> Weight { - (33_748_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(1 as Weight)) - .saturating_add(RocksDbWeight::get().writes(1 as Weight)) - } - fn spend_funds(b: u32, ) -> Weight { - (3_688_000 as Weight) - .saturating_add((70_129_000 as Weight).saturating_mul(b as Weight)) - .saturating_add(RocksDbWeight::get().reads(1 as Weight)) - .saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(b as Weight))) - .saturating_add(RocksDbWeight::get().writes(1 as Weight)) - .saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(b as Weight))) - } -} diff --git a/runtime/polkadot/src/weights/pallet_tips.rs b/runtime/polkadot/src/weights/pallet_tips.rs index 6b15c1ec92a5..0c9026e1abb0 100644 --- a/runtime/polkadot/src/weights/pallet_tips.rs +++ b/runtime/polkadot/src/weights/pallet_tips.rs @@ -39,21 +39,12 @@ #![allow(unused_parens)] #![allow(unused_imports)] -use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -/// Weight functions needed for pallet_tips. -pub trait WeightInfo { - fn report_awesome(r: u32, ) -> Weight; - fn retract_tip() -> Weight; - fn tip_new(r: u32, t: u32, ) -> Weight; - fn tip(t: u32, ) -> Weight; - fn close_tip(t: u32, ) -> Weight; -} - /// Weights for pallet_tips using the Substrate node and recommended hardware. -pub struct SubstrateWeight(PhantomData); -impl WeightInfo for SubstrateWeight { +pub struct WeightInfo(PhantomData); +impl WeightInfo for WeightInfo { fn report_awesome(r: u32, ) -> Weight { (70_338_000 as Weight) .saturating_add((2_000 as Weight).saturating_mul(r as Weight)) @@ -85,37 +76,3 @@ impl WeightInfo for SubstrateWeight { .saturating_add(T::DbWeight::get().writes(3 as Weight)) } } - -// For backwards compatibility and tests -impl WeightInfo for () { - fn report_awesome(r: u32, ) -> Weight { - (70_338_000 as Weight) - .saturating_add((2_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(RocksDbWeight::get().reads(2 as Weight)) - .saturating_add(RocksDbWeight::get().writes(2 as Weight)) - } - fn retract_tip() -> Weight { - (59_051_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(1 as Weight)) - .saturating_add(RocksDbWeight::get().writes(2 as Weight)) - } - fn tip_new(r: u32, t: u32, ) -> Weight { - (41_984_000 as Weight) - .saturating_add((2_000 as Weight).saturating_mul(r as Weight)) - .saturating_add((180_000 as Weight).saturating_mul(t as Weight)) - .saturating_add(RocksDbWeight::get().reads(2 as Weight)) - .saturating_add(RocksDbWeight::get().writes(2 as Weight)) - } - fn tip(t: u32, ) -> Weight { - (33_313_000 as Weight) - .saturating_add((700_000 as Weight).saturating_mul(t as Weight)) - .saturating_add(RocksDbWeight::get().reads(2 as Weight)) - .saturating_add(RocksDbWeight::get().writes(1 as Weight)) - } - fn close_tip(t: u32, ) -> Weight { - (110_781_000 as Weight) - .saturating_add((364_000 as Weight).saturating_mul(t as Weight)) - .saturating_add(RocksDbWeight::get().reads(3 as Weight)) - .saturating_add(RocksDbWeight::get().writes(3 as Weight)) - } -} From 8d385510b6161bd4f1f61058ccb85f972f5081e9 Mon Sep 17 00:00:00 2001 From: Shawn Tabrizi Date: Mon, 14 Dec 2020 23:30:17 -0800 Subject: [PATCH 06/20] fix import --- runtime/kusama/src/weights/pallet_bounties.rs | 2 +- runtime/kusama/src/weights/pallet_tips.rs | 2 +- runtime/polkadot/src/weights/pallet_bounties.rs | 2 +- runtime/polkadot/src/weights/pallet_tips.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/runtime/kusama/src/weights/pallet_bounties.rs b/runtime/kusama/src/weights/pallet_bounties.rs index c89c5a9a18c2..758924d70071 100644 --- a/runtime/kusama/src/weights/pallet_bounties.rs +++ b/runtime/kusama/src/weights/pallet_bounties.rs @@ -43,7 +43,7 @@ use sp_std::marker::PhantomData; /// Weights for pallet_bounties using the Substrate node and recommended hardware. pub struct WeightInfo(PhantomData); -impl WeightInfo for WeightInfo { +impl pallet_bounties::WeightInfo for WeightInfo { fn propose_bounty(d: u32, ) -> Weight { (59_931_000 as Weight) .saturating_add((1_000 as Weight).saturating_mul(d as Weight)) diff --git a/runtime/kusama/src/weights/pallet_tips.rs b/runtime/kusama/src/weights/pallet_tips.rs index e91744b139ad..1f1a59faba74 100644 --- a/runtime/kusama/src/weights/pallet_tips.rs +++ b/runtime/kusama/src/weights/pallet_tips.rs @@ -43,7 +43,7 @@ use sp_std::marker::PhantomData; /// Weights for pallet_tips using the Substrate node and recommended hardware. pub struct WeightInfo(PhantomData); -impl WeightInfo for WeightInfo { +impl pallet_tips::WeightInfo for WeightInfo { fn report_awesome(r: u32, ) -> Weight { (70_338_000 as Weight) .saturating_add((2_000 as Weight).saturating_mul(r as Weight)) diff --git a/runtime/polkadot/src/weights/pallet_bounties.rs b/runtime/polkadot/src/weights/pallet_bounties.rs index 68c20726efa6..3ca242efc87a 100644 --- a/runtime/polkadot/src/weights/pallet_bounties.rs +++ b/runtime/polkadot/src/weights/pallet_bounties.rs @@ -44,7 +44,7 @@ use sp_std::marker::PhantomData; /// Weights for pallet_bounties using the Substrate node and recommended hardware. pub struct WeightInfo(PhantomData); -impl WeightInfo for WeightInfo { +impl pallet_bounties::WeightInfo for WeightInfo { fn propose_bounty(d: u32, ) -> Weight { (59_931_000 as Weight) .saturating_add((1_000 as Weight).saturating_mul(d as Weight)) diff --git a/runtime/polkadot/src/weights/pallet_tips.rs b/runtime/polkadot/src/weights/pallet_tips.rs index 0c9026e1abb0..d9689abb0537 100644 --- a/runtime/polkadot/src/weights/pallet_tips.rs +++ b/runtime/polkadot/src/weights/pallet_tips.rs @@ -44,7 +44,7 @@ use sp_std::marker::PhantomData; /// Weights for pallet_tips using the Substrate node and recommended hardware. pub struct WeightInfo(PhantomData); -impl WeightInfo for WeightInfo { +impl pallet_tips::WeightInfo for WeightInfo { fn report_awesome(r: u32, ) -> Weight { (70_338_000 as Weight) .saturating_add((2_000 as Weight).saturating_mul(r as Weight)) From c5412721dde7762028b2e27b2c04a27585fbe656 Mon Sep 17 00:00:00 2001 From: Shawn Tabrizi Date: Mon, 14 Dec 2020 23:32:05 -0800 Subject: [PATCH 07/20] fix imports --- runtime/kusama/Cargo.toml | 6 +++--- runtime/polkadot/Cargo.toml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/runtime/kusama/Cargo.toml b/runtime/kusama/Cargo.toml index d6bf2276adc0..2af5811f6cc6 100644 --- a/runtime/kusama/Cargo.toml +++ b/runtime/kusama/Cargo.toml @@ -34,7 +34,7 @@ pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-bounties = { git = "https://github.com/shamb0/substrate.git", branch = "issue-7143-pallet-treasury-refactor", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } @@ -61,8 +61,8 @@ pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = " frame-system = {git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-tips = { git = "https://github.com/shamb0/substrate.git", branch = "issue-7143-pallet-treasury-refactor", default-features = false } -pallet-treasury = { git = "https://github.com/shamb0/substrate.git", branch = "issue-7143-pallet-treasury-refactor", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } diff --git a/runtime/polkadot/Cargo.toml b/runtime/polkadot/Cargo.toml index b3ef39dd6dfc..b2307159a79d 100644 --- a/runtime/polkadot/Cargo.toml +++ b/runtime/polkadot/Cargo.toml @@ -34,7 +34,7 @@ pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-bounties = { git = "https://github.com/shamb0/substrate.git", branch = "issue-7143-pallet-treasury-refactor", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } @@ -59,8 +59,8 @@ pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", frame-system = {git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-tips = { git = "https://github.com/shamb0/substrate.git", branch = "issue-7143-pallet-treasury-refactor", default-features = false } -pallet-treasury = { git = "https://github.com/shamb0/substrate.git", branch = "issue-7143-pallet-treasury-refactor", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } From b63e7a228175d7c7bc07cb5ad3ae7b731b36daf5 Mon Sep 17 00:00:00 2001 From: Shawn Tabrizi Date: Mon, 14 Dec 2020 23:36:14 -0800 Subject: [PATCH 08/20] alphabetize --- runtime/kusama/src/lib.rs | 5 ++--- runtime/kusama/src/weights/mod.rs | 4 ++-- runtime/polkadot/src/lib.rs | 5 ++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index e5c56573b3bb..dd3ba2cfac4d 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -1547,6 +1547,7 @@ sp_api::impl_runtime_apis! { add_benchmark!(params, batches, claims, Claims); // Substrate add_benchmark!(params, batches, pallet_balances, Balances); + add_benchmark!(params, batches, pallet_bounties, Bounties); add_benchmark!(params, batches, pallet_collective, Council); add_benchmark!(params, batches, pallet_democracy, Democracy); add_benchmark!(params, batches, pallet_elections_phragmen, ElectionsPhragmen); @@ -1561,13 +1562,11 @@ sp_api::impl_runtime_apis! { add_benchmark!(params, batches, pallet_staking, Staking); add_benchmark!(params, batches, frame_system, SystemBench::); add_benchmark!(params, batches, pallet_timestamp, Timestamp); + add_benchmark!(params, batches, pallet_tips, Tips); add_benchmark!(params, batches, pallet_treasury, Treasury); add_benchmark!(params, batches, pallet_utility, Utility); add_benchmark!(params, batches, pallet_vesting, Vesting); - add_benchmark!(params, batches, pallet_bounties, Bounties); - add_benchmark!(params, batches, pallet_tips, Tips); - if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) } Ok(batches) } diff --git a/runtime/kusama/src/weights/mod.rs b/runtime/kusama/src/weights/mod.rs index 0411000b1c3f..f8c7cb230bfc 100644 --- a/runtime/kusama/src/weights/mod.rs +++ b/runtime/kusama/src/weights/mod.rs @@ -17,6 +17,7 @@ pub mod frame_system; pub mod pallet_balances; +pub mod pallet_bounties; pub mod pallet_collective; pub mod pallet_democracy; pub mod pallet_elections_phragmen; @@ -29,8 +30,7 @@ pub mod pallet_scheduler; pub mod pallet_session; pub mod pallet_staking; pub mod pallet_timestamp; +pub mod pallet_tips; pub mod pallet_treasury; pub mod pallet_utility; pub mod pallet_vesting; -pub mod pallet_bounties; -pub mod pallet_tips; diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index 551b326ab08a..1f97d8220ed2 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -1321,6 +1321,7 @@ sp_api::impl_runtime_apis! { add_benchmark!(params, batches, claims, Claims); // Substrate add_benchmark!(params, batches, pallet_balances, Balances); + add_benchmark!(params, batches, pallet_bounties, Bounties); add_benchmark!(params, batches, pallet_collective, Council); add_benchmark!(params, batches, pallet_democracy, Democracy); add_benchmark!(params, batches, pallet_elections_phragmen, ElectionsPhragmen); @@ -1335,13 +1336,11 @@ sp_api::impl_runtime_apis! { add_benchmark!(params, batches, pallet_staking, Staking); add_benchmark!(params, batches, frame_system, SystemBench::); add_benchmark!(params, batches, pallet_timestamp, Timestamp); + add_benchmark!(params, batches, pallet_tips, Tips); add_benchmark!(params, batches, pallet_treasury, Treasury); add_benchmark!(params, batches, pallet_utility, Utility); add_benchmark!(params, batches, pallet_vesting, Vesting); - add_benchmark!(params, batches, pallet_bounties, Bounties); - add_benchmark!(params, batches, pallet_tips, Tips); - if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) } Ok(batches) } From 12143580bf283a7afa5e59f47b5be0d52b9ac67b Mon Sep 17 00:00:00 2001 From: Shawn Tabrizi Date: Mon, 14 Dec 2020 23:50:25 -0800 Subject: [PATCH 09/20] fix config traits --- runtime/common/src/crowdfund.rs | 11 ----------- runtime/common/src/impls.rs | 10 ---------- runtime/kusama/src/lib.rs | 3 ++- runtime/polkadot/src/lib.rs | 3 ++- 4 files changed, 4 insertions(+), 23 deletions(-) diff --git a/runtime/common/src/crowdfund.rs b/runtime/common/src/crowdfund.rs index 865dbcc6fc4d..cc6d4dbfc7b6 100644 --- a/runtime/common/src/crowdfund.rs +++ b/runtime/common/src/crowdfund.rs @@ -646,7 +646,6 @@ mod tests { pub const BountyDepositBase: u64 = 1; pub const BountyDepositPayoutDelay: u64 = 1; pub const BountyUpdatePeriod: u64 = 1; - pub const MaximumReasonLength: u32 = 16384; pub const BountyCuratorDeposit: Permill = Permill::from_percent(50); pub const BountyValueMinimum: u64 = 1; } @@ -672,17 +671,7 @@ mod tests { type SpendPeriod = SpendPeriod; type Burn = Burn; type BurnDestination = (); - type Tippers = Nobody; - type TipCountdown = TipCountdown; - type TipFindersFee = TipFindersFee; - type TipReportDepositBase = TipReportDepositBase; type DataDepositPerByte = DataDepositPerByte; - type BountyDepositBase = BountyDepositBase; - type BountyDepositPayoutDelay = BountyDepositPayoutDelay; - type BountyUpdatePeriod = BountyUpdatePeriod; - type MaximumReasonLength = MaximumReasonLength; - type BountyCuratorDeposit = BountyCuratorDeposit; - type BountyValueMinimum = BountyValueMinimum; type ModuleId = TreasuryModuleId; type WeightInfo = (); } diff --git a/runtime/common/src/impls.rs b/runtime/common/src/impls.rs index b9bace009822..488bc9722026 100644 --- a/runtime/common/src/impls.rs +++ b/runtime/common/src/impls.rs @@ -165,17 +165,7 @@ mod tests { type SpendPeriod = (); type Burn = (); type BurnDestination = (); - type Tippers = Nobody; - type TipCountdown = (); - type TipFindersFee = (); - type TipReportDepositBase = (); type DataDepositPerByte = (); - type BountyDepositBase = (); - type BountyDepositPayoutDelay = (); - type BountyUpdatePeriod = (); - type MaximumReasonLength = (); - type BountyCuratorDeposit = (); - type BountyValueMinimum = (); type ModuleId = TreasuryModuleId; type WeightInfo = (); } diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index dd3ba2cfac4d..cd5b8363d4ad 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -566,7 +566,6 @@ impl pallet_treasury::Config for Runtime { type ProposalBondMinimum = ProposalBondMinimum; type SpendPeriod = SpendPeriod; type Burn = Burn; - type MaximumReasonLength = MaximumReasonLength; type BurnDestination = Society; type SpendFunds = Bounties; type WeightInfo = weights::pallet_treasury::WeightInfo; @@ -579,12 +578,14 @@ impl pallet_bounties::Config for Runtime { type BountyUpdatePeriod = BountyUpdatePeriod; type BountyCuratorDeposit = BountyCuratorDeposit; type BountyValueMinimum = BountyValueMinimum; + type MaximumReasonLength = MaximumReasonLength; type WeightInfo = weights::pallet_bounties::WeightInfo; } impl pallet_tips::Config for Runtime { type Event = Event; + type MaximumReasonLength = MaximumReasonLength; type Tippers = ElectionsPhragmen; type TipCountdown = TipCountdown; type TipFindersFee = TipFindersFee; diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index 1f97d8220ed2..fe9224ef7b04 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -613,7 +613,6 @@ impl pallet_treasury::Config for Runtime { type ProposalBondMinimum = ProposalBondMinimum; type SpendPeriod = SpendPeriod; type Burn = Burn; - type MaximumReasonLength = MaximumReasonLength; type BurnDestination = (); type SpendFunds = Bounties; type WeightInfo = weights::pallet_treasury::WeightInfo; @@ -626,11 +625,13 @@ impl pallet_bounties::Config for Runtime { type BountyUpdatePeriod = BountyUpdatePeriod; type BountyCuratorDeposit = BountyCuratorDeposit; type BountyValueMinimum = BountyValueMinimum; + type MaximumReasonLength = MaximumReasonLength; type WeightInfo = weights::pallet_bounties::WeightInfo; } impl pallet_tips::Config for Runtime { type Event = Event; + type MaximumReasonLength = MaximumReasonLength; type Tippers = ElectionsPhragmen; type TipCountdown = TipCountdown; type TipFindersFee = TipFindersFee; From 53d36c6284819af4064e41e095666abf7f2df8aa Mon Sep 17 00:00:00 2001 From: Shawn Tabrizi Date: Tue, 15 Dec 2020 00:30:47 -0800 Subject: [PATCH 10/20] fix trait --- runtime/common/src/crowdfund.rs | 1 + runtime/common/src/impls.rs | 1 + 2 files changed, 2 insertions(+) diff --git a/runtime/common/src/crowdfund.rs b/runtime/common/src/crowdfund.rs index cc6d4dbfc7b6..06c6e556850d 100644 --- a/runtime/common/src/crowdfund.rs +++ b/runtime/common/src/crowdfund.rs @@ -673,6 +673,7 @@ mod tests { type BurnDestination = (); type DataDepositPerByte = DataDepositPerByte; type ModuleId = TreasuryModuleId; + type SpendFunds = (); type WeightInfo = (); } diff --git a/runtime/common/src/impls.rs b/runtime/common/src/impls.rs index 488bc9722026..1b7cf9148f74 100644 --- a/runtime/common/src/impls.rs +++ b/runtime/common/src/impls.rs @@ -167,6 +167,7 @@ mod tests { type BurnDestination = (); type DataDepositPerByte = (); type ModuleId = TreasuryModuleId; + type SpendFunds = (); type WeightInfo = (); } From 3590ad72d69165af68a66187155a772055a9281c Mon Sep 17 00:00:00 2001 From: Shawn Tabrizi Date: Tue, 15 Dec 2020 21:59:14 -0800 Subject: [PATCH 11/20] update traits --- runtime/common/src/crowdfund.rs | 10 ---------- runtime/common/src/impls.rs | 1 - runtime/kusama/src/lib.rs | 3 ++- runtime/polkadot/src/lib.rs | 3 ++- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/runtime/common/src/crowdfund.rs b/runtime/common/src/crowdfund.rs index 06c6e556850d..7ad72530769c 100644 --- a/runtime/common/src/crowdfund.rs +++ b/runtime/common/src/crowdfund.rs @@ -638,16 +638,7 @@ mod tests { pub const ProposalBondMinimum: u64 = 1; pub const SpendPeriod: u64 = 2; pub const Burn: Permill = Permill::from_percent(50); - pub const TipCountdown: u64 = 1; - pub const TipFindersFee: Percent = Percent::from_percent(20); - pub const TipReportDepositBase: u64 = 1; pub const TreasuryModuleId: ModuleId = ModuleId(*b"py/trsry"); - pub const DataDepositPerByte: u64 = 1; - pub const BountyDepositBase: u64 = 1; - pub const BountyDepositPayoutDelay: u64 = 1; - pub const BountyUpdatePeriod: u64 = 1; - pub const BountyCuratorDeposit: Permill = Permill::from_percent(50); - pub const BountyValueMinimum: u64 = 1; } pub struct Nobody; impl Contains for Nobody { @@ -671,7 +662,6 @@ mod tests { type SpendPeriod = SpendPeriod; type Burn = Burn; type BurnDestination = (); - type DataDepositPerByte = DataDepositPerByte; type ModuleId = TreasuryModuleId; type SpendFunds = (); type WeightInfo = (); diff --git a/runtime/common/src/impls.rs b/runtime/common/src/impls.rs index 1b7cf9148f74..d9d5463fba7a 100644 --- a/runtime/common/src/impls.rs +++ b/runtime/common/src/impls.rs @@ -165,7 +165,6 @@ mod tests { type SpendPeriod = (); type Burn = (); type BurnDestination = (); - type DataDepositPerByte = (); type ModuleId = TreasuryModuleId; type SpendFunds = (); type WeightInfo = (); diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index cd5b8363d4ad..648632d8c4ee 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -559,7 +559,6 @@ impl pallet_treasury::Config for Runtime { type Currency = Balances; type ApproveOrigin = ApproveOrigin; type RejectOrigin = MoreThanHalfCouncil; - type DataDepositPerByte = DataDepositPerByte; type Event = Event; type OnSlash = Treasury; type ProposalBond = ProposalBond; @@ -578,6 +577,7 @@ impl pallet_bounties::Config for Runtime { type BountyUpdatePeriod = BountyUpdatePeriod; type BountyCuratorDeposit = BountyCuratorDeposit; type BountyValueMinimum = BountyValueMinimum; + type DataDepositPerByte = DataDepositPerByte; type MaximumReasonLength = MaximumReasonLength; type WeightInfo = weights::pallet_bounties::WeightInfo; @@ -585,6 +585,7 @@ impl pallet_bounties::Config for Runtime { impl pallet_tips::Config for Runtime { type Event = Event; + type DataDepositPerByte = DataDepositPerByte; type MaximumReasonLength = MaximumReasonLength; type Tippers = ElectionsPhragmen; type TipCountdown = TipCountdown; diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index fe9224ef7b04..0df5ce69c527 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -606,7 +606,6 @@ impl pallet_treasury::Config for Runtime { type Currency = Balances; type ApproveOrigin = ApproveOrigin; type RejectOrigin = MoreThanHalfCouncil; - type DataDepositPerByte = DataDepositPerByte; type Event = Event; type OnSlash = Treasury; type ProposalBond = ProposalBond; @@ -625,12 +624,14 @@ impl pallet_bounties::Config for Runtime { type BountyUpdatePeriod = BountyUpdatePeriod; type BountyCuratorDeposit = BountyCuratorDeposit; type BountyValueMinimum = BountyValueMinimum; + type DataDepositPerByte = DataDepositPerByte; type MaximumReasonLength = MaximumReasonLength; type WeightInfo = weights::pallet_bounties::WeightInfo; } impl pallet_tips::Config for Runtime { type Event = Event; + type DataDepositPerByte = DataDepositPerByte; type MaximumReasonLength = MaximumReasonLength; type Tippers = ElectionsPhragmen; type TipCountdown = TipCountdown; From ad656925ec7ab38bc949284d6f5f99b0ab61e63e Mon Sep 17 00:00:00 2001 From: Shawn Tabrizi Date: Tue, 15 Dec 2020 22:49:21 -0800 Subject: [PATCH 12/20] update weights --- runtime/kusama/src/weights/pallet_bounties.rs | 32 ++++++++++--------- .../polkadot/src/weights/pallet_bounties.rs | 32 ++++++++++--------- 2 files changed, 34 insertions(+), 30 deletions(-) diff --git a/runtime/kusama/src/weights/pallet_bounties.rs b/runtime/kusama/src/weights/pallet_bounties.rs index 758924d70071..562e13c4b980 100644 --- a/runtime/kusama/src/weights/pallet_bounties.rs +++ b/runtime/kusama/src/weights/pallet_bounties.rs @@ -45,59 +45,61 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl pallet_bounties::WeightInfo for WeightInfo { fn propose_bounty(d: u32, ) -> Weight { - (59_931_000 as Weight) + (64_778_000 as Weight) + // Standard Error: 0 .saturating_add((1_000 as Weight).saturating_mul(d as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } fn approve_bounty() -> Weight { - (17_226_000 as Weight) + (18_293_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn propose_curator() -> Weight { - (13_314_000 as Weight) + (14_248_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn unassign_curator() -> Weight { - (48_677_000 as Weight) + (52_100_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn accept_curator() -> Weight { - (48_727_000 as Weight) + (52_564_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn award_bounty() -> Weight { - (34_839_000 as Weight) + (37_426_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn claim_bounty() -> Weight { - (64_883_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + (176_077_000 as Weight) + .saturating_add(T::DbWeight::get().reads(4 as Weight)) + .saturating_add(T::DbWeight::get().writes(5 as Weight)) } fn close_bounty_proposed() -> Weight { - (48_003_000 as Weight) + (51_162_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn close_bounty_active() -> Weight { - (62_215_000 as Weight) + (116_907_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(4 as Weight)) } fn extend_bounty_expiry() -> Weight { - (33_748_000 as Weight) + (36_419_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn spend_funds(b: u32, ) -> Weight { - (3_688_000 as Weight) - .saturating_add((70_129_000 as Weight).saturating_mul(b as Weight)) + (7_562_000 as Weight) + // Standard Error: 16_000 + .saturating_add((77_328_000 as Weight).saturating_mul(b as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(b as Weight))) .saturating_add(T::DbWeight::get().writes(1 as Weight)) diff --git a/runtime/polkadot/src/weights/pallet_bounties.rs b/runtime/polkadot/src/weights/pallet_bounties.rs index 3ca242efc87a..75756c905f20 100644 --- a/runtime/polkadot/src/weights/pallet_bounties.rs +++ b/runtime/polkadot/src/weights/pallet_bounties.rs @@ -46,59 +46,61 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl pallet_bounties::WeightInfo for WeightInfo { fn propose_bounty(d: u32, ) -> Weight { - (59_931_000 as Weight) + (64_778_000 as Weight) + // Standard Error: 0 .saturating_add((1_000 as Weight).saturating_mul(d as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } fn approve_bounty() -> Weight { - (17_226_000 as Weight) + (18_293_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn propose_curator() -> Weight { - (13_314_000 as Weight) + (14_248_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn unassign_curator() -> Weight { - (48_677_000 as Weight) + (52_100_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn accept_curator() -> Weight { - (48_727_000 as Weight) + (52_564_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn award_bounty() -> Weight { - (34_839_000 as Weight) + (37_426_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn claim_bounty() -> Weight { - (64_883_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + (176_077_000 as Weight) + .saturating_add(T::DbWeight::get().reads(4 as Weight)) + .saturating_add(T::DbWeight::get().writes(5 as Weight)) } fn close_bounty_proposed() -> Weight { - (48_003_000 as Weight) + (51_162_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn close_bounty_active() -> Weight { - (62_215_000 as Weight) + (116_907_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(4 as Weight)) } fn extend_bounty_expiry() -> Weight { - (33_748_000 as Weight) + (36_419_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn spend_funds(b: u32, ) -> Weight { - (3_688_000 as Weight) - .saturating_add((70_129_000 as Weight).saturating_mul(b as Weight)) + (7_562_000 as Weight) + // Standard Error: 16_000 + .saturating_add((77_328_000 as Weight).saturating_mul(b as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(b as Weight))) .saturating_add(T::DbWeight::get().writes(1 as Weight)) From 4af2b68d2135270b9d24c987363e8dd89b2299a4 Mon Sep 17 00:00:00 2001 From: parity-processbot <> Date: Wed, 16 Dec 2020 10:32:36 +0000 Subject: [PATCH 13/20] "Update Substrate" --- Cargo.lock | 347 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 195 insertions(+), 152 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 549cf4467042..8b22292513df 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -318,9 +318,9 @@ checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" [[package]] name = "async-tls" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0d8b6fc362bebff7502479fb5e9aed00c8cc3abc5af755536e73a128f0cb88" +checksum = "2f23d769dbf1838d5df5156e7b1ad404f4c463d1ac2c6aeb6cd943630f8a8400" dependencies = [ "futures-core", "futures-io", @@ -1489,7 +1489,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "parity-scale-codec", ] @@ -1507,7 +1507,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-support", "frame-system", @@ -1525,8 +1525,9 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ + "Inflector", "chrono", "frame-benchmarking", "handlebars", @@ -1547,7 +1548,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-support", "frame-system", @@ -1563,7 +1564,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "12.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "parity-scale-codec", "serde", @@ -1574,7 +1575,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "bitflags", "frame-metadata", @@ -1599,7 +1600,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-support-procedural-tools", "proc-macro2 1.0.24", @@ -1610,7 +1611,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1622,7 +1623,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", @@ -1632,7 +1633,7 @@ dependencies = [ [[package]] name = "frame-system" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-support", "impl-trait-for-tuples 0.1.3", @@ -1648,7 +1649,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-benchmarking", "frame-support", @@ -1662,7 +1663,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "parity-scale-codec", "sp-api", @@ -2199,6 +2200,12 @@ version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" +[[package]] +name = "httpdate" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" + [[package]] name = "humantime" version = "1.3.0" @@ -2246,9 +2253,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.13.6" +version = "0.13.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e7655b9594024ad0ee439f3b5a7299369dc2a3f459b47c696f9ff676f9aa1f" +checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf" dependencies = [ "bytes 0.5.6", "futures-channel", @@ -2258,13 +2265,13 @@ dependencies = [ "http 0.2.1", "http-body 0.3.1", "httparse", + "httpdate", "itoa", - "log", - "pin-project 0.4.23", + "pin-project 1.0.2", "socket2", - "time", "tokio 0.2.21", "tower-service", + "tracing", "want 0.3.0", ] @@ -2277,7 +2284,7 @@ dependencies = [ "bytes 0.5.6", "ct-logs", "futures-util", - "hyper 0.13.6", + "hyper 0.13.9", "log", "rustls 0.18.0", "rustls-native-certs", @@ -2670,6 +2677,7 @@ dependencies = [ "pallet-authorship", "pallet-babe", "pallet-balances", + "pallet-bounties", "pallet-collective", "pallet-democracy", "pallet-elections-phragmen", @@ -2692,6 +2700,7 @@ dependencies = [ "pallet-staking", "pallet-staking-reward-curve", "pallet-timestamp", + "pallet-tips", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-treasury", @@ -2834,9 +2843,9 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" [[package]] name = "libp2p" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "941af10b45fd27d15e94aea83002c4a21521849fad8aad78d1cdbf00a60b0a17" +checksum = "022cdac4ab124be12de581e591796d4dfb7d1f1eef94669d2c1eaa0e98dd2f0e" dependencies = [ "atomic", "bytes 0.5.6", @@ -3210,9 +3219,9 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8a0af4ea43104a01c634ee1b8026ce11f9ee3766a894a44f9e1da5a0eb74fc0" +checksum = "522a877ce42ededf1f5dd011dbc40ea116f1776818f09dacb3d7a206f3ad6305" dependencies = [ "async-tls", "either", @@ -3886,7 +3895,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b" [[package]] name = "pallet-authority-discovery" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-support", "frame-system", @@ -3902,7 +3911,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-support", "frame-system", @@ -3917,7 +3926,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-benchmarking", "frame-support", @@ -3942,11 +3951,26 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "parity-scale-codec", + "serde", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-bounties" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "pallet-treasury", "parity-scale-codec", "serde", "sp-runtime", @@ -3956,7 +3980,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-benchmarking", "frame-support", @@ -3972,7 +3996,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-benchmarking", "frame-support", @@ -3987,7 +4011,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-benchmarking", "frame-support", @@ -4002,7 +4026,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-benchmarking", "frame-support", @@ -4023,7 +4047,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4039,7 +4063,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-benchmarking", "frame-support", @@ -4059,7 +4083,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-benchmarking", "frame-support", @@ -4076,7 +4100,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-support", "frame-system", @@ -4090,7 +4114,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-benchmarking", "frame-support", @@ -4106,7 +4130,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-support", "frame-system", @@ -4120,7 +4144,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-support", "frame-system", @@ -4135,7 +4159,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-benchmarking", "frame-support", @@ -4156,7 +4180,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-benchmarking", "frame-support", @@ -4172,7 +4196,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-support", "frame-system", @@ -4185,7 +4209,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "enumflags2", "frame-support", @@ -4200,7 +4224,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-benchmarking", "frame-support", @@ -4215,7 +4239,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-support", "frame-system", @@ -4235,7 +4259,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-benchmarking", "frame-support", @@ -4251,7 +4275,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-support", "frame-system", @@ -4265,7 +4289,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-benchmarking", "frame-support", @@ -4287,7 +4311,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", @@ -4298,7 +4322,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-support", "frame-system", @@ -4312,7 +4336,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-benchmarking", "frame-support", @@ -4327,10 +4351,25 @@ dependencies = [ "sp-timestamp", ] +[[package]] +name = "pallet-tips" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "pallet-treasury", + "parity-scale-codec", + "serde", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-transaction-payment" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-support", "frame-system", @@ -4347,7 +4386,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4365,7 +4404,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-support", "parity-scale-codec", @@ -4378,11 +4417,12 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "impl-trait-for-tuples 0.1.3", "pallet-balances", "parity-scale-codec", "serde", @@ -4393,7 +4433,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-benchmarking", "frame-support", @@ -4409,7 +4449,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5411,6 +5451,7 @@ dependencies = [ "pallet-authorship", "pallet-babe", "pallet-balances", + "pallet-bounties", "pallet-collective", "pallet-democracy", "pallet-elections-phragmen", @@ -5431,6 +5472,7 @@ dependencies = [ "pallet-staking", "pallet-staking-reward-curve", "pallet-timestamp", + "pallet-tips", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-treasury", @@ -6682,7 +6724,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "async-trait", "derive_more", @@ -6710,7 +6752,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -6733,7 +6775,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -6750,7 +6792,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "impl-trait-for-tuples 0.1.3", "parity-scale-codec", @@ -6771,7 +6813,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", @@ -6782,7 +6824,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "atty", "chrono", @@ -6825,7 +6867,7 @@ dependencies = [ [[package]] name = "sc-cli-proc-macro" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", @@ -6836,7 +6878,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "derive_more", "fnv", @@ -6870,7 +6912,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "blake2-rfc", "hash-db", @@ -6900,7 +6942,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "sc-client-api", "sp-blockchain", @@ -6911,7 +6953,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "derive_more", "fork-tree", @@ -6956,7 +6998,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "derive_more", "futures 0.3.8", @@ -6980,7 +7022,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "fork-tree", "parity-scale-codec", @@ -6993,7 +7035,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -7019,7 +7061,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "log", "sc-client-api", @@ -7033,7 +7075,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "derive_more", "lazy_static", @@ -7062,7 +7104,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "derive_more", "parity-scale-codec", @@ -7078,7 +7120,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "log", "parity-scale-codec", @@ -7093,7 +7135,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "log", "parity-scale-codec", @@ -7111,7 +7153,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "derive_more", "finality-grandpa", @@ -7148,7 +7190,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "derive_more", "finality-grandpa", @@ -7172,7 +7214,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "ansi_term 0.12.1", "futures 0.3.8", @@ -7190,7 +7232,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "async-trait", "derive_more", @@ -7210,7 +7252,7 @@ dependencies = [ [[package]] name = "sc-light" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "hash-db", "lazy_static", @@ -7229,7 +7271,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "async-std", "async-trait", @@ -7283,7 +7325,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -7298,13 +7340,13 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "bytes 0.5.6", "fnv", "futures 0.3.8", "futures-timer 3.0.2", - "hyper 0.13.6", + "hyper 0.13.9", "hyper-rustls", "log", "num_cpus", @@ -7325,7 +7367,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "futures 0.3.8", "libp2p", @@ -7338,7 +7380,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -7347,7 +7389,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "futures 0.3.8", "hash-db", @@ -7381,7 +7423,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "derive_more", "futures 0.3.8", @@ -7405,7 +7447,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "futures 0.1.29", "jsonrpc-core", @@ -7423,7 +7465,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "directories 3.0.1", "exit-future", @@ -7487,7 +7529,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "log", "parity-scale-codec", @@ -7502,7 +7544,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -7522,7 +7564,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -7543,7 +7585,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "ansi_term 0.12.1", "erased-serde", @@ -7567,7 +7609,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "derive_more", "futures 0.3.8", @@ -7589,7 +7631,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "futures 0.3.8", "futures-diagnose", @@ -8055,7 +8097,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "log", "sp-core", @@ -8067,7 +8109,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "hash-db", "parity-scale-codec", @@ -8083,7 +8125,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -8095,7 +8137,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "parity-scale-codec", "serde", @@ -8107,7 +8149,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "integer-sqrt", "num-traits 0.2.12", @@ -8120,7 +8162,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "parity-scale-codec", "sp-api", @@ -8132,7 +8174,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -8143,7 +8185,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "parity-scale-codec", "sp-api", @@ -8155,7 +8197,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "futures 0.3.8", "log", @@ -8173,7 +8215,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "serde", "serde_json", @@ -8182,7 +8224,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -8208,7 +8250,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "merlin", "parity-scale-codec", @@ -8228,7 +8270,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -8237,7 +8279,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -8249,7 +8291,7 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "base58", "blake2-rfc", @@ -8293,7 +8335,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -8302,7 +8344,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", @@ -8312,7 +8354,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "environmental", "parity-scale-codec", @@ -8323,7 +8365,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "finality-grandpa", "log", @@ -8340,7 +8382,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "parity-scale-codec", "parking_lot 0.10.2", @@ -8352,7 +8394,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "futures 0.3.8", "hash-db", @@ -8376,7 +8418,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "lazy_static", "sp-core", @@ -8387,7 +8429,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "async-trait", "derive_more", @@ -8404,7 +8446,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "parity-scale-codec", "serde", @@ -8416,7 +8458,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", @@ -8427,7 +8469,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "sp-api", "sp-core", @@ -8437,7 +8479,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "backtrace", ] @@ -8445,7 +8487,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "serde", "sp-core", @@ -8454,7 +8496,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "either", "hash256-std-hasher", @@ -8475,7 +8517,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "impl-trait-for-tuples 0.1.3", "parity-scale-codec", @@ -8492,7 +8534,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "Inflector", "proc-macro-crate", @@ -8504,7 +8546,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "serde", "serde_json", @@ -8513,7 +8555,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "parity-scale-codec", "sp-api", @@ -8526,7 +8568,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -8536,7 +8578,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "hash-db", "log", @@ -8558,12 +8600,12 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" [[package]] name = "sp-storage" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8576,7 +8618,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "log", "sp-core", @@ -8589,7 +8631,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "impl-trait-for-tuples 0.1.3", "parity-scale-codec", @@ -8603,7 +8645,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "log", "parity-scale-codec", @@ -8616,7 +8658,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "derive_more", "futures 0.3.8", @@ -8632,7 +8674,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "hash-db", "memory-db", @@ -8646,7 +8688,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "futures 0.3.8", "futures-core", @@ -8658,7 +8700,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8670,7 +8712,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "impl-trait-for-tuples 0.1.3", "parity-scale-codec", @@ -8812,7 +8854,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "chrono", "console_error_panic_hook", @@ -8838,7 +8880,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "platforms", ] @@ -8846,7 +8888,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.8", @@ -8869,12 +8911,12 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "async-std", "derive_more", "futures-util", - "hyper 0.13.6", + "hyper 0.13.9", "log", "prometheus", "tokio 0.2.21", @@ -8883,7 +8925,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "futures 0.1.29", "futures 0.3.8", @@ -8910,7 +8952,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "futures 0.3.8", "substrate-test-utils-derive", @@ -8920,7 +8962,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#6b600cdeb4043e512bc5f342eb02a5a17d26797a" +source = "git+https://github.com/paritytech/substrate#987a9723920217917f2708388d150add5ef52ef7" dependencies = [ "proc-macro-crate", "quote 1.0.7", @@ -9493,6 +9535,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3" dependencies = [ "cfg-if 1.0.0", + "log", "pin-project-lite 0.2.0", "tracing-attributes", "tracing-core", @@ -10386,9 +10429,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f33972566adbd2d3588b0491eb94b98b43695c4ef897903470ede4f3f5a28a" +checksum = "81a974bcdd357f0dca4d41677db03436324d45a4c9ed2d0b873a5a360ce41c36" dependencies = [ "zeroize_derive", ] From 73d84fa9d0f01005041231db186a682c87de5be1 Mon Sep 17 00:00:00 2001 From: thiolliere Date: Wed, 16 Dec 2020 11:53:49 +0100 Subject: [PATCH 14/20] fix features --- runtime/polkadot/Cargo.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/runtime/polkadot/Cargo.toml b/runtime/polkadot/Cargo.toml index b2307159a79d..f13b4b0069ac 100644 --- a/runtime/polkadot/Cargo.toml +++ b/runtime/polkadot/Cargo.toml @@ -165,6 +165,8 @@ runtime-benchmarks = [ "pallet-staking/runtime-benchmarks", "pallet-timestamp/runtime-benchmarks", "pallet-treasury/runtime-benchmarks", + "pallet-bounties/runtime-benchmarks", + "pallet-tips/runtime-benchmarks", "pallet-utility/runtime-benchmarks", "pallet-vesting/runtime-benchmarks", "pallet-offences-benchmarking", From 3564c8fffd90c342ae8da08242aecfb234193608 Mon Sep 17 00:00:00 2001 From: Guillaume Thiolliere Date: Wed, 16 Dec 2020 12:05:27 +0100 Subject: [PATCH 15/20] Update runtime/kusama/src/lib.rs --- runtime/kusama/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 648632d8c4ee..0a4a9b6ca6fb 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -1199,7 +1199,6 @@ construct_runtime! { TechnicalCommittee: pallet_collective::::{Module, Call, Storage, Origin, Event, Config} = 15, ElectionsPhragmen: pallet_elections_phragmen::{Module, Call, Storage, Event, Config} = 16, TechnicalMembership: pallet_membership::::{Module, Call, Storage, Event, Config} = 17, - // Treasury: pallet_treasury::{Module, Call, Storage, Event} = 18, Treasury: pallet_treasury::{Module, Call, Storage, Config, Event} = 18, // Claims. Usable initially. From f2d4ae7fd8d3e4fdbf4bcecd3fb2d44dcdba8578 Mon Sep 17 00:00:00 2001 From: Guillaume Thiolliere Date: Wed, 16 Dec 2020 12:05:36 +0100 Subject: [PATCH 16/20] Update runtime/polkadot/src/lib.rs --- runtime/polkadot/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index 0df5ce69c527..6d17b8134147 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -983,7 +983,6 @@ construct_runtime! { TechnicalCommittee: pallet_collective::::{Module, Call, Storage, Origin, Event, Config} = 16, ElectionsPhragmen: pallet_elections_phragmen::{Module, Call, Storage, Event, Config} = 17, TechnicalMembership: pallet_membership::::{Module, Call, Storage, Event, Config} = 18, - // Treasury: pallet_treasury::{Module, Call, Storage, Event} = 19, Treasury: pallet_treasury::{Module, Call, Storage, Config, Event} = 19, // Claims. Usable initially. From 332984102764ca66fe9a529091b62cf033e9fb1c Mon Sep 17 00:00:00 2001 From: thiolliere Date: Wed, 16 Dec 2020 12:07:06 +0100 Subject: [PATCH 17/20] add bounties and tips in proxy filters --- runtime/kusama/src/lib.rs | 4 ++++ runtime/polkadot/src/lib.rs | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 648632d8c4ee..0c19c69c1797 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -864,6 +864,8 @@ impl InstanceFilter for ProxyType { Call::ElectionsPhragmen(..) | Call::TechnicalMembership(..) | Call::Treasury(..) | + Call::Bounties(..) | + Call::Tips(..) | Call::Claims(..) | Call::Utility(..) | Call::Identity(..) | @@ -888,6 +890,8 @@ impl InstanceFilter for ProxyType { Call::TechnicalCommittee(..) | Call::ElectionsPhragmen(..) | Call::Treasury(..) | + Call::Bounties(..) | + Call::Tips(..) | Call::Utility(..) ), ProxyType::Staking => matches!(c, diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index 0df5ce69c527..d183c92bb564 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -878,6 +878,8 @@ impl InstanceFilter for ProxyType { Call::ElectionsPhragmen(..) | Call::TechnicalMembership(..) | Call::Treasury(..) | + Call::Bounties(..) | + Call::Tips(..) | Call::Claims(..) | Call::Vesting(pallet_vesting::Call::vest(..)) | Call::Vesting(pallet_vesting::Call::vest_other(..)) | @@ -893,6 +895,8 @@ impl InstanceFilter for ProxyType { Call::TechnicalCommittee(..) | Call::ElectionsPhragmen(..) | Call::Treasury(..) | + Call::Bounties(..) | + Call::Tips(..) | Call::Utility(..) ), ProxyType::Staking => matches!(c, From ccb5aeff34291aca90b6575bae2c5769dda857ae Mon Sep 17 00:00:00 2001 From: thiolliere Date: Wed, 16 Dec 2020 12:23:00 +0100 Subject: [PATCH 18/20] remove unused --- runtime/common/src/crowdfund.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/common/src/crowdfund.rs b/runtime/common/src/crowdfund.rs index 7ad72530769c..2dc5448e4c46 100644 --- a/runtime/common/src/crowdfund.rs +++ b/runtime/common/src/crowdfund.rs @@ -579,7 +579,7 @@ mod tests { // The testing primitives are very useful for avoiding having to work with signatures // or public keys. `u64` is used as the `AccountId` and no `Signature`s are requried. use sp_runtime::{ - Permill, Percent, testing::Header, DispatchResult, + Permill, testing::Header, DispatchResult, traits::{BlakeTwo256, IdentityLookup}, }; use crate::slots::Registrar; From db586c46ca2ed12e6a417f56225588c7418b9304 Mon Sep 17 00:00:00 2001 From: thiolliere Date: Wed, 16 Dec 2020 14:24:08 +0100 Subject: [PATCH 19/20] remove unused --- runtime/common/src/crowdfund.rs | 11 ----------- runtime/common/src/impls.rs | 12 ------------ 2 files changed, 23 deletions(-) diff --git a/runtime/common/src/crowdfund.rs b/runtime/common/src/crowdfund.rs index 2dc5448e4c46..b3be613667c4 100644 --- a/runtime/common/src/crowdfund.rs +++ b/runtime/common/src/crowdfund.rs @@ -640,17 +640,6 @@ mod tests { pub const Burn: Permill = Permill::from_percent(50); pub const TreasuryModuleId: ModuleId = ModuleId(*b"py/trsry"); } - pub struct Nobody; - impl Contains for Nobody { - fn contains(_: &u64) -> bool { false } - fn sorted_members() -> Vec { vec![] } - #[cfg(feature = "runtime-benchmarks")] - fn add(_: &u64) { unimplemented!() } - } - impl ContainsLengthBound for Nobody { - fn min_len() -> usize { 0 } - fn max_len() -> usize { 0 } - } impl pallet_treasury::Config for Test { type Currency = pallet_balances::Module; type ApproveOrigin = frame_system::EnsureRoot; diff --git a/runtime/common/src/impls.rs b/runtime/common/src/impls.rs index d9d5463fba7a..185dee74a7d5 100644 --- a/runtime/common/src/impls.rs +++ b/runtime/common/src/impls.rs @@ -138,18 +138,6 @@ mod tests { type WeightInfo = (); } - pub struct Nobody; - impl frame_support::traits::Contains for Nobody { - fn contains(_: &AccountId) -> bool { false } - fn sorted_members() -> Vec { vec![] } - #[cfg(feature = "runtime-benchmarks")] - fn add(_: &AccountId) { unimplemented!() } - } - impl frame_support::traits::ContainsLengthBound for Nobody { - fn min_len() -> usize { 0 } - fn max_len() -> usize { 0 } - } - parameter_types! { pub const TreasuryModuleId: ModuleId = ModuleId(*b"py/trsry"); } From ce5e2216605a92c15c8d4c399210302b54debdb7 Mon Sep 17 00:00:00 2001 From: thiolliere Date: Wed, 16 Dec 2020 15:07:32 +0100 Subject: [PATCH 20/20] remove unused --- runtime/common/src/crowdfund.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/runtime/common/src/crowdfund.rs b/runtime/common/src/crowdfund.rs index b3be613667c4..8e856087bd07 100644 --- a/runtime/common/src/crowdfund.rs +++ b/runtime/common/src/crowdfund.rs @@ -573,7 +573,6 @@ mod tests { impl_outer_origin, assert_ok, assert_noop, parameter_types, traits::{OnInitialize, OnFinalize}, }; - use frame_support::traits::{Contains, ContainsLengthBound}; use sp_core::H256; use primitives::v1::{Id as ParaId, ValidationCode}; // The testing primitives are very useful for avoiding having to work with signatures