Misc PoS cleanup and improvements (#1207)

* Add grandpa RPCs * Enable warp sync * Add BadBlocks to chain spec extensions * Add PoS devnet chainspec * Remove commented out line * Appease version check * Add grandpa RPC sanity integration test * Auto-update creditcoin-js type definitions * Make grandpa test a little bit more substantive * Appease clippy --------- Co-authored-by: gluwa-bot <[email protected]>
gluwa · Aug 15, 2023 · bb10ec2 · bb10ec2
1 parent 61f98b9
commit bb10ec2
Show file tree

Hide file tree

Showing 16 changed files with 289 additions and 53 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,7 +23,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = '2.225.0'
+version = '2.225.1'
 authors = ['Gluwa Inc.', 'Nathan Whitaker <[email protected]>']
 edition = '2021'
 license = 'Unlicense'
@@ -133,6 +133,7 @@ sp-keyring = { branch = "pos-keep-history-polkadot-v0.9.41", git = "https://gith
 sc-consensus-babe = { branch = "pos-keep-history-polkadot-v0.9.41", git = "https://github.com/gluwa/substrate.git" }
 sp-consensus-babe = { branch = "pos-keep-history-polkadot-v0.9.41", git = "https://github.com/gluwa/substrate.git", default-features = false }
 sc-consensus-grandpa = { branch = "pos-keep-history-polkadot-v0.9.41", git = "https://github.com/gluwa/substrate.git" }
+sc-consensus-grandpa-rpc = { branch = "pos-keep-history-polkadot-v0.9.41", git = "https://github.com/gluwa/substrate.git" }
 sp-consensus-grandpa = { branch = "pos-keep-history-polkadot-v0.9.41", git = "https://github.com/gluwa/substrate.git", default-features = false }
 pallet-babe = { branch = "pos-keep-history-polkadot-v0.9.41", git = "https://github.com/gluwa/substrate.git", default-features = false }
 pallet-grandpa = { branch = "pos-keep-history-polkadot-v0.9.41", git = "https://github.com/gluwa/substrate.git", default-features = false }

diff --git a/chainspecs/devSpec.json b/chainspecs/devSpec.json
@@ -15,6 +15,7 @@
     "5HHSXsD5zaMb9o4H7JzxUiAYpjArE4CANKbUBiFRVEwn6WPF"
   ],
   "codeSubstitutes": {},
+  "badBlocks": null,
   "genesis": {
     "raw": {
       "top": {

diff --git a/chainspecs/mainnetSpec.json b/chainspecs/mainnetSpec.json
@@ -13,6 +13,7 @@
   "consensusEngine": null,
   "grandpaInitialAuthorities": [],
   "codeSubstitutes": {},
+  "badBlocks": null,
   "genesis": {
     "raw": {
       "top": {

diff --git a/chainspecs/posDevSpec.json b/chainspecs/posDevSpec.json
diff --git a/chainspecs/posSwitchSpec.json b/chainspecs/posSwitchSpec.json
@@ -11,6 +11,7 @@
   },
   "grandpaInitialAuthorities": [],
   "codeSubstitutes": {},
+  "badBlocks": null,
   "genesis": {
     "raw": {
       "top": {

diff --git a/chainspecs/posTestnetSpec.json b/chainspecs/posTestnetSpec.json
@@ -15,6 +15,7 @@
     "5FA9nQDVg267DEd8m1ZypXLBnvN7SFxYwV7ndqSYGiN9TTpu"
   ],
   "codeSubstitutes": {},
+  "badBlocks": null,
   "genesis": {
     "raw": {
       "top": {

diff --git a/chainspecs/testnetSpec.json b/chainspecs/testnetSpec.json
@@ -13,6 +13,7 @@
   "consensusEngine": null,
   "grandpaInitialAuthorities": [],
   "codeSubstitutes": {},
+  "badBlocks": null,
   "genesis": {
     "raw": {
       "top": {

diff --git a/creditcoin-js/creditcoin.json b/creditcoin-js/creditcoin.json
diff --git a/integration-tests/src/test/rpc/grandpa.test.ts b/integration-tests/src/test/rpc/grandpa.test.ts
@@ -0,0 +1,23 @@
+// Copyright 2022 Gluwa, Inc. & contributors
+// SPDX-License-Identifier: The Unlicense
+
+import { ApiPromise, WsProvider } from 'creditcoin-js';
+
+describe('Grandpa RPC sanity test', (): void => {
+    let api: ApiPromise;
+
+    beforeEach(async () => {
+        const provider = new WsProvider((global as any).CREDITCOIN_API_URL);
+
+        api = await ApiPromise.create({ provider });
+    });
+
+    afterEach(async () => {
+        await api.disconnect();
+    });
+
+    it('rpc.grandpa.roundState() works', async (): Promise<void> => {
+        const result = await api.rpc.grandpa.roundState();
+        expect(result.best.round.toNumber()).toBeGreaterThanOrEqual(0);
+    });
+});
diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -74,6 +74,8 @@ sc-network = { workspace = true }
 sc-consensus-slots = { workspace = true }
 sp-consensus-grandpa = { workspace = true }
 sc-consensus-grandpa = { workspace = true }
+sc-consensus-grandpa-rpc = { workspace = true }
+sc-rpc = { workspace = true }
 sp-session = { workspace = true }
 sc-network-sync = { workspace = true }
 serde = { workspace = true }

diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs
@@ -20,11 +20,14 @@ use sp_runtime::{
 // const STAGING_TELEMETRY_URL: &str = "wss://telemetry.polkadot.io/submit/";
 
 /// Specialized `ChainSpec`. This is a specialization of the general Substrate ChainSpec type.
-pub type ChainSpec = sc_service::GenericChainSpec<GenesisConfig, GrandpaInitialAuthorities>;
+pub type ChainSpec = sc_service::GenericChainSpec<GenesisConfig, Extensions>;
 
 #[derive(Clone, Debug, Deserialize, Serialize, ChainSpecExtension)]
 #[serde(rename_all = "camelCase")]
-pub struct GrandpaInitialAuthorities {
+pub struct Extensions {
+	/// Known bad block hashes.
+	pub bad_blocks: sc_client_api::BadBlocks<creditcoin_node_runtime::Block>,
+	/// The public keys for the authorities of the initial round of GRANDPA.
 	pub grandpa_initial_authorities: Option<Vec<GrandpaId>>,
 }
 
@@ -80,10 +83,11 @@ pub fn development_config() -> Result<ChainSpec, String> {
 
 	let initial_authorities = vec![get_authority_keys_from_seed("Alice")];
 
-	let grandpa_initial_authorities = GrandpaInitialAuthorities {
+	let extensions = Extensions {
 		grandpa_initial_authorities: Some(
 			initial_authorities.clone().into_iter().map(|x| x.2).collect(),
 		),
+		bad_blocks: None,
 	};
 
 	Ok(ChainSpec::from_genesis(
@@ -121,18 +125,19 @@ pub fn development_config() -> Result<ChainSpec, String> {
 		// Properties
 		Some(chain_properties()),
 		// Extensions
-		grandpa_initial_authorities,
+		extensions,
 	))
 }
 
 pub fn local_testnet_config() -> Result<ChainSpec, String> {
 	let wasm_binary = WASM_BINARY.ok_or_else(|| "Development wasm not available".to_string())?;
 	let initial_authorities = vec![get_authority_keys_from_seed("Alice")];
 
-	let grandpa_initial_authorities = GrandpaInitialAuthorities {
+	let extensions = Extensions {
 		grandpa_initial_authorities: Some(
 			initial_authorities.clone().into_iter().map(|x| x.2).collect(),
 		),
+		bad_blocks: None,
 	};
 
 	Ok(ChainSpec::from_genesis(
@@ -178,7 +183,7 @@ pub fn local_testnet_config() -> Result<ChainSpec, String> {
 		// Properties
 		Some(chain_properties()),
 		// Extensions
-		grandpa_initial_authorities,
+		extensions,
 	))
 }
 
@@ -246,7 +251,6 @@ fn testnet_genesis(
 			invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(),
 			force_era: pallet_staking_substrate::Forcing::NotForcing,
 			slash_reward_fraction: Perbill::from_percent(10),
-			// min_validator_bond: 1000 * CTC,
 			..Default::default()
 		},
 		session: SessionConfig {
@@ -262,13 +266,3 @@ fn testnet_genesis(
 		nomination_pools: Default::default(),
 	}
 }
-
-// #[test]
-// fn encode_keys_hack() {
-// 	use parity_scale_codec::Encode;
-// 	let keys = vec![get_authority_keys_from_seed("Alice")];
-
-// 	let encoded = keys.encode();
-
-// 	panic!("Encoded: {:?}", encoded);
-// }