Council motions for approving treasury proposals (#694)

* Treasury in runtime, generic approve/reject

* Add logic for council origin

* Add tests.

* Configurable number of members in EnsureMembers

* Fix grumbles

* Fix spelling

* Comment

substrate/demo/runtime/Cargo.toml

@@ -27,6 +27,7 @@ substrate-runtime-session = { path = "../../substrate/runtime/session" }
 substrate-runtime-staking = { path = "../../substrate/runtime/staking" }
 substrate-runtime-system = { path = "../../substrate/runtime/system" }
 substrate-runtime-timestamp = { path = "../../substrate/runtime/timestamp" }
+substrate-runtime-treasury = { path = "../../substrate/runtime/treasury" }
 substrate-runtime-version = { path = "../../substrate/runtime/version" }
 demo-primitives = { path = "../primitives" }
 
@@ -48,6 +49,7 @@ std = [
 	"substrate-runtime-staking/std",
 	"substrate-runtime-system/std",
 	"substrate-runtime-timestamp/std",
+	"substrate-runtime-treasury/std",
 	"substrate-runtime-version/std",
 	"demo-primitives/std",
 	"serde_derive",

substrate/demo/runtime/src/lib.rs

@@ -35,6 +35,7 @@ extern crate serde_derive;
 extern crate serde;
 
 extern crate substrate_codec as codec;
+extern crate substrate_primitives;
 
 #[macro_use]
 extern crate substrate_codec_derive;
@@ -49,6 +50,7 @@ extern crate substrate_runtime_session as session;
 extern crate substrate_runtime_staking as staking;
 extern crate substrate_runtime_system as system;
 extern crate substrate_runtime_timestamp as timestamp;
+extern crate substrate_runtime_treasury as treasury;
 #[macro_use]
 extern crate substrate_runtime_version as version;
 extern crate demo_primitives;
@@ -57,9 +59,11 @@ use demo_primitives::{AccountId, AccountIndex, Balance, BlockNumber, Hash, Index
 use runtime_primitives::generic;
 use runtime_primitives::traits::{Convert, BlakeTwo256, DigestItem};
 use version::RuntimeVersion;
+use council::motions as council_motions;
+use substrate_primitives::u32_trait::{_2, _4};
 
 #[cfg(any(feature = "std", test))]
-pub use runtime_primitives::BuildStorage;
+pub use runtime_primitives::{BuildStorage, Permill};
 
 // Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted.
 #[derive(Clone, Copy, PartialEq, Eq)]
@@ -161,9 +165,27 @@ pub type Council = council::Module<Runtime>;
 /// Council voting module for this concrete runtime.
 pub type CouncilVoting = council::voting::Module<Runtime>;
 
+impl council::motions::Trait for Runtime {
+	type Origin = Origin;
+	type Proposal = Call;
+	type Event = Event;
+}
+
+/// Council motions module for this concrete runtime.
+pub type CouncilMotions = council_motions::Module<Runtime>;
+
+impl treasury::Trait for Runtime {
+	type ApproveOrigin = council_motions::EnsureMembers<_4>;
+	type RejectOrigin = council_motions::EnsureMembers<_2>;
+	type Event = Event;
+}
+
+/// Treasury module for this concrete runtime.
+pub type Treasury = treasury::Module<Runtime>;
+
 impl_outer_event! {
 	pub enum Event for Runtime {
-		balances, session, staking, democracy
+		balances, session, staking, democracy, treasury, council_motions
 	}
 }
 
@@ -175,6 +197,7 @@ impl_outer_log! {
 
 impl_outer_origin! {
 	pub enum Origin for Runtime {
+		council_motions
 	}
 }
 
@@ -188,6 +211,8 @@ impl_outer_dispatch! {
 		Democracy,
 		Council,
 		CouncilVoting,
+		CouncilMotions,
+		Treasury,
 	}
 }
 
@@ -201,6 +226,7 @@ impl_outer_config! {
 		DemocracyConfig => democracy,
 		CouncilConfig => council,
 		TimestampConfig => timestamp,
+		TreasuryConfig => treasury,
 	}
 }
 
@@ -228,7 +254,7 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<Address, Index, Call,
 pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, Index, Call>;
 /// Executive: handles dispatch to the various modules.
 pub type Executive = executive::Executive<Runtime, Block, Balances, Balances,
-	(((((), Council), Democracy), Staking), Session)>;
+	((((((), Treasury), Council), Democracy), Staking), Session)>;
 
 pub mod api {
 	impl_stubs!(

substrate/demo/runtime/wasm/Cargo.lock

@@ -111,6 +111,7 @@ dependencies = [
  "substrate-runtime-support 0.1.0",
  "substrate-runtime-system 0.1.0",
  "substrate-runtime-timestamp 0.1.0",
+ "substrate-runtime-treasury 0.1.0",
  "substrate-runtime-version 0.1.0",
 ]
 
@@ -648,6 +649,7 @@ dependencies = [
  "serde 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)",
  "substrate-codec 0.1.0",
+ "substrate-codec-derive 0.1.0",
  "substrate-keyring 0.1.0",
  "substrate-primitives 0.1.0",
  "substrate-runtime-balances 0.1.0",
@@ -842,6 +844,24 @@ dependencies = [
  "substrate-runtime-system 0.1.0",
 ]
 
+[[package]]
+name = "substrate-runtime-treasury"
+version = "0.1.0"
+dependencies = [
+ "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)",
+ "substrate-codec 0.1.0",
+ "substrate-codec-derive 0.1.0",
+ "substrate-primitives 0.1.0",
+ "substrate-runtime-balances 0.1.0",
+ "substrate-runtime-io 0.1.0",
+ "substrate-runtime-primitives 0.1.0",
+ "substrate-runtime-std 0.1.0",
+ "substrate-runtime-support 0.1.0",
+ "substrate-runtime-system 0.1.0",
+]
+
 [[package]]
 name = "substrate-runtime-version"
 version = "0.1.0"

substrate/demo/runtime/wasm/Cargo.toml

@@ -25,6 +25,7 @@ substrate-runtime-session = { path = "../../../substrate/runtime/session", defau
 substrate-runtime-staking = { path = "../../../substrate/runtime/staking", default-features = false }
 substrate-runtime-system = { path = "../../../substrate/runtime/system", default-features = false }
 substrate-runtime-timestamp = { path = "../../../substrate/runtime/timestamp", default-features = false }
+substrate-runtime-treasury = { path = "../../../substrate/runtime/treasury", default-features = false }
 substrate-runtime-version = { path = "../../../substrate/runtime/version", default-features = false }
 demo-primitives = { path = "../../primitives", default-features = false }
 
@@ -47,6 +48,7 @@ std = [
 	"substrate-runtime-staking/std",
 	"substrate-runtime-system/std",
 	"substrate-runtime-timestamp/std",
+	"substrate-runtime-treasury/std",
 	"substrate-runtime-version/std",
 	"demo-primitives/std",
 ]