OpenGov experiment (#1292)

* OpenGov Signed-off-by: Xavier Lau <xavier@inv.cafe> * Restructure * Add migration * Correct dependencies * Fix compile * Fix test * Adjust time --------- Signed-off-by: Xavier Lau <xavier@inv.cafe>
darwinia-network · Oct 13, 2023 · f3a7edd · f3a7edd
1 parent 7e4d35a
commit f3a7edd
Show file tree

Hide file tree

Showing 42 changed files with 653 additions and 850 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,6 +27,7 @@ libsecp256k1      = { version = "0.7", default-features = false }
 scale-info        = { version = "2.9", default-features = false }
 sha3              = { version = "0.10" }
 static_assertions = { version = "1.1" }
+strum             = { version = "0.25", default-features = false }
 
 # cumulus
 cumulus-client-cli                    = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" }

diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -48,10 +48,10 @@ fp-evm          = { workspace = true, features = ["std"] }
 fp-rpc          = { workspace = true, features = ["std"] }
 
 # moonbeam
-moonbeam-primitives-ext        = { workspace = true, optional = true, features = ["std"] }
-moonbeam-rpc-debug             = { workspace = true }
-moonbeam-rpc-primitives-debug  = { workspace = true, features = ["std"] }
-moonbeam-rpc-trace             = { workspace = true }
+moonbeam-primitives-ext       = { workspace = true, optional = true, features = ["std"] }
+moonbeam-rpc-debug            = { workspace = true }
+moonbeam-rpc-primitives-debug = { workspace = true, features = ["std"] }
+moonbeam-rpc-trace            = { workspace = true }
 
 # polkadot
 polkadot-cli        = { workspace = true }
@@ -106,7 +106,6 @@ fast-runtime = [
 	"crab-runtime?/fast-runtime",
 	"darwinia-runtime?/fast-runtime",
 	"pangolin-runtime?/fast-runtime",
-	"pangoro-runtime?/fast-runtime",
 ]
 
 evm-tracing = [

diff --git a/node/src/chain_spec/crab.rs b/node/src/chain_spec/crab.rs
@@ -53,9 +53,10 @@ fn session_keys(keys: AuraId) -> SessionKeys {
 
 pub fn development_config() -> ChainSpec {
 	ChainSpec::from_genesis(
-		"Crab2 Development",
-		"crab2-development",
-		ChainType::Development,
+		// Fulfill Polkadot.JS metadata upgrade requirements.
+		"Crab2 D",
+		"crab2-d",
+		ChainType::Live,
 		move || {
 			testnet_genesis(
 				vec![
@@ -90,9 +91,10 @@ pub fn development_config() -> ChainSpec {
 
 pub fn local_config() -> ChainSpec {
 	ChainSpec::from_genesis(
-		"Crab2 Local",
-		"crab2-local",
-		ChainType::Local,
+		// Fulfill Polkadot.JS metadata upgrade requirements.
+		"Crab2 L",
+		"crab2-l",
+		ChainType::Live,
 		move || {
 			testnet_genesis(
 				vec![

diff --git a/node/src/chain_spec/darwinia.rs b/node/src/chain_spec/darwinia.rs
@@ -53,9 +53,10 @@ fn session_keys(keys: AuraId) -> SessionKeys {
 
 pub fn development_config() -> ChainSpec {
 	ChainSpec::from_genesis(
-		"Darwinia2 Development",
-		"darwinia2-development",
-		ChainType::Development,
+		// Fulfill Polkadot.JS metadata upgrade requirements.
+		"Darwinia2 D",
+		"darwinia2-d",
+		ChainType::Live,
 		move || {
 			testnet_genesis(
 				vec![
@@ -90,9 +91,10 @@ pub fn development_config() -> ChainSpec {
 
 pub fn local_config() -> ChainSpec {
 	ChainSpec::from_genesis(
-		"Darwinia2 Local",
-		"darwinia2-local",
-		ChainType::Local,
+		// Fulfill Polkadot.JS metadata upgrade requirements.
+		"Darwinia2 L",
+		"darwinia2-l",
+		ChainType::Live,
 		move || {
 			testnet_genesis(
 				vec![

diff --git a/node/src/chain_spec/pangolin.rs b/node/src/chain_spec/pangolin.rs
@@ -53,9 +53,10 @@ fn session_keys(keys: AuraId) -> SessionKeys {
 
 pub fn development_config() -> ChainSpec {
 	ChainSpec::from_genesis(
-		"Pangolin2 Development",
-		"pangolin2-development",
-		ChainType::Development,
+		// Fulfill Polkadot.JS metadata upgrade requirements.
+		"Pangolin2 D",
+		"pangolin2-d",
+		ChainType::Live,
 		move || {
 			testnet_genesis(
 				vec![
@@ -90,9 +91,11 @@ pub fn development_config() -> ChainSpec {
 
 pub fn local_config() -> ChainSpec {
 	ChainSpec::from_genesis(
-		"Pangolin2 Local",
-		"pangolin2-local",
-		ChainType::Local,
+		// Fulfill Polkadot.JS metadata upgrade requirements.
+		"Pangolin2 L",
+		"pangolin2-l",
+		// Fulfill Polkadot.JS metadata upgrade requirements.
+		ChainType::Live,
 		move || {
 			testnet_genesis(
 				vec![
@@ -209,12 +212,10 @@ pub fn genesis_config() -> ChainSpec {
 				ecdsa_authority: Default::default(),
 
 				// Governance stuff.
-				democracy: Default::default(),
 				council: Default::default(),
 				technical_committee: Default::default(),
-				phragmen_election: Default::default(),
-				technical_membership: Default::default(),
 				treasury: Default::default(),
+				democracy: Default::default(),
 
 				// Utility stuff.
 				sudo: SudoConfig { key: Some(array_bytes::hex_n_into_unchecked(SUDO)) },
@@ -319,12 +320,22 @@ fn testnet_genesis(
 		ecdsa_authority: Default::default(),
 
 		// Governance stuff.
-		democracy: Default::default(),
-		council: Default::default(),
-		technical_committee: Default::default(),
-		phragmen_election: Default::default(),
-		technical_membership: Default::default(),
+		council: CouncilConfig {
+			members: vec![
+				array_bytes::hex_n_into_unchecked(ALITH),
+				array_bytes::hex_n_into_unchecked(BALTATHAR),
+			],
+			..Default::default()
+		},
+		technical_committee: TechnicalCommitteeConfig {
+			members: vec![
+				array_bytes::hex_n_into_unchecked(ALITH),
+				array_bytes::hex_n_into_unchecked(BALTATHAR),
+			],
+			..Default::default()
+		},
 		treasury: Default::default(),
+		democracy: Default::default(),
 
 		// Utility stuff.
 		sudo: SudoConfig { key: Some(array_bytes::hex_n_into_unchecked(ALITH)) },

diff --git a/node/src/chain_spec/pangoro.rs b/node/src/chain_spec/pangoro.rs
@@ -53,9 +53,10 @@ fn session_keys(keys: AuraId) -> SessionKeys {
 
 pub fn development_config() -> ChainSpec {
 	ChainSpec::from_genesis(
-		"Pangoro2 Development",
-		"pangoro2-development",
-		ChainType::Development,
+		// Fulfill Polkadot.JS metadata upgrade requirements.
+		"Pangoro2 D",
+		"pangoro2-d",
+		ChainType::Live,
 		move || {
 			testnet_genesis(
 				vec![
@@ -90,9 +91,10 @@ pub fn development_config() -> ChainSpec {
 
 pub fn local_config() -> ChainSpec {
 	ChainSpec::from_genesis(
-		"Pangoro2 Local",
-		"pangoro2-local",
-		ChainType::Local,
+		// Fulfill Polkadot.JS metadata upgrade requirements.
+		"Pangoro2 L",
+		"pangoro2-l",
+		ChainType::Live,
 		move || {
 			testnet_genesis(
 				vec![

diff --git a/node/src/service/mod.rs b/node/src/service/mod.rs
@@ -86,7 +86,8 @@ pub trait IdentifyVariant {
 
 	/// Returns true if this configuration is for a development network.
 	fn is_dev(&self) -> bool {
-		self.id().ends_with("development")
+		// Fulfill Polkadot.JS metadata upgrade requirements.
+		self.id().ends_with("-d")
 	}
 }
 impl IdentifyVariant for Box<dyn sc_service::ChainSpec> {