Governance: Voters put money where mouth is (#1183)

* Referendums only gett enacted after a delay; successful voters must lock funds up until enactment. * Build fixes. * Configurable council enact delay, fix test builds. * Fix spelling * Remove TODO
paritytech · Dec 10, 2018 · 18d818b · 18d818b
1 parent 0c918a7
commit 18d818b
Show file tree

Hide file tree

Showing 12 changed files with 768 additions and 481 deletions.
diff --git a/core/test-runtime/wasm/Cargo.lock b/core/test-runtime/wasm/Cargo.lock
diff --git a/...st-runtime/wasm/target/wasm32-unknown-unknown/release/substrate_test_runtime.compact.wasm b/...st-runtime/wasm/target/wasm32-unknown-unknown/release/substrate_test_runtime.compact.wasm
diff --git a/node/cli/src/chain_spec.rs b/node/cli/src/chain_spec.rs
@@ -91,6 +91,7 @@ fn staging_testnet_config_genesis() -> GenesisConfig {
 			launch_period: 5 * MINUTES,    // 1 day per public referendum
 			voting_period: 5 * MINUTES,    // 3 days to discuss & vote on an active referendum
 			minimum_deposit: 50 * DOLLARS,    // 12000 as the minimum deposit for a referendum
+			public_delay: 0,
 		}),
 		council_seats: Some(CouncilSeatsConfig {
 			active_council: vec![],
@@ -107,6 +108,7 @@ fn staging_testnet_config_genesis() -> GenesisConfig {
 		council_voting: Some(CouncilVotingConfig {
 			cooloff_period: 4 * DAYS,
 			voting_period: 1 * DAYS,
+			enact_delay_period: 0,
 		}),
 		timestamp: Some(TimestampConfig {
 			period: SECS_PER_BLOCK,
@@ -210,6 +212,7 @@ pub fn testnet_genesis(
 			launch_period: 9,
 			voting_period: 18,
 			minimum_deposit: 10,
+			public_delay: 0,
 		}),
 		council_seats: Some(CouncilSeatsConfig {
 			active_council: endowed_accounts.iter()
@@ -228,6 +231,7 @@ pub fn testnet_genesis(
 		council_voting: Some(CouncilVotingConfig {
 			cooloff_period: 75,
 			voting_period: 20,
+			enact_delay_period: 0,
 		}),
 		timestamp: Some(TimestampConfig {
 			period: 5,                    // 5 second block time.

diff --git a/node/executor/src/lib.rs b/node/executor/src/lib.rs
@@ -311,9 +311,9 @@ mod tests {
 			1,
 			GENESIS_HASH.into(),
 			if support_changes_trie {
-				hex!("df90128fe9ee27bd61d90308cc25ad262e518d4ba09e5077558be2389780d8e5").into()
+				hex!("7c00d30974b6d709766e5b231295b6b5ff7ffd42ef1385853c0a29859723d147").into()
 			} else {
-				hex!("3cb0654b6c47c6532108695327fc68e22f2e67a4b20029c3c9d05a285f9e80a2").into()
+				hex!("e96a29fe7f7aba0e4a06837d4a5a4201f60bf613b9947ce5772559ef525f4268").into()
 			},
 			if support_changes_trie {
 				vec![changes_trie_log(
@@ -339,7 +339,7 @@ mod tests {
 		construct_block(
 			2,
 			block1(false).1,
-			hex!("612d3e3c542b4ce62105f2f1fbc4fef1652d5ba38401795115042bee56a50752").into(),
+			hex!("80e77e443da5f81fab7265acae6cbdfff79e02eaa90306d9dd14dabddad5f99d").into(),
 			vec![ // session changes here, so we add a grandpa change signal log.
 				Log::from(::grandpa::RawLog::AuthoritiesChangeSignal(0, vec![
 					(Keyring::One.to_raw_public().into(), 1),
@@ -368,7 +368,7 @@ mod tests {
 		construct_block(
 			1,
 			GENESIS_HASH.into(),
-			hex!("17df8f360a4a1bd8d5dc23f05b044f5b14ece43555f97d2058ded47d5e7fb64d").into(),
+			hex!("337c94adf2041fa953d5afaf8919032e3b88ee440c88c48a231856306991dca1").into(),
 			vec![],
 			vec![
 				CheckedExtrinsic {
@@ -658,7 +658,7 @@ mod tests {
 		let b = construct_block(
 			1,
 			GENESIS_HASH.into(),
-			hex!("81f45b36d1c8f667ac948bc48f8fb61d12aae87d841b6303ab0320ca906d01d2").into(),
+			hex!("10cb18e5a4e000690aaa3e2f0165c1cc563d38eb6736aa79c5a0ea4868042671").into(),
 			vec![],
 			vec![
 				CheckedExtrinsic {

diff --git a/node/runtime/src/lib.rs b/node/runtime/src/lib.rs
@@ -124,8 +124,8 @@ impl system::Trait for Runtime {
 impl balances::Trait for Runtime {
 	type Balance = Balance;
 	type AccountIndex = AccountIndex;
-	type OnFreeBalanceZero = (Staking, Contract);
-	type EnsureAccountLiquid = Staking;
+	type OnFreeBalanceZero = ((Staking, Contract), Democracy);
+	type EnsureAccountLiquid = (Staking, Democracy);
 	type Event = Event;
 }