Development Genesis Config has Mainnet Schemas (#2057)

# Goal The goal of this PR is to add the Schemas in at Genesis from Mainnet when on a development chain Closes #2041 # Discussion - Adds a tool `tools/genesis-schemas` that downloads the schemas from mainnet and stuffs them into a json file - GenesisConfig for Schemas Pallet that loads from a json file schemas to start with at genesis ## How to Test - You can test the pulling yourself with: - `cd tools/genesis-data && npm i && npm run schemas` or use `make genesis-schemas` - Otherwise just run `make start` and see that it has the same schemas as mainnet with the same names. # Checklist - [x] Tests added
frequency-chain · Jul 11, 2024 · c8b60fb · c8b60fb
1 parent 3ebbb71
commit c8b60fb
Show file tree

Hide file tree

Showing 27 changed files with 2,161 additions and 172 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -891,16 +891,12 @@ jobs:
       fail-fast: true
       matrix:
         arch: [amd64]
-        node: [collator-node-local, instant-seal-node, standalone-node]
+        node: [collator-node-local, standalone-node]
         include:
           - node: collator-node-local
             network: local
             build-profile: release
             release-file-name-prefix: frequency-local
-          - node: instant-seal-node
-            network: dev
-            build-profile: release
-            release-file-name-prefix: frequency-dev
           - node: standalone-node
             network: dev
             build-profile: release

diff --git a/.github/workflows/verify-pr-commit.yml b/.github/workflows/verify-pr-commit.yml
@@ -475,14 +475,6 @@ jobs:
           platforms: "amd64"
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      - name: Build collator image in instant seal mode
-        env:
-          IMAGE_NAME: instant-seal-node
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: false
-          file: ./docker/${{env.IMAGE_NAME}}.dockerfile
       - name: Build collator standalone
         env:
           IMAGE_NAME: standalone-node

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Makefile b/Makefile
@@ -345,3 +345,9 @@ endif
 .PHONY: version-reset
 version-reset:
 	find ./ -type f -name 'Cargo.toml' -exec sed -i '' 's/^version = \".*+polkadot.*\"/version = \"0.0.0\"/g' {} \;
+
+.PHONY: genesis-schemas
+genesis-schemas:
+	cd tools/genesis-data && \
+	npm i && \
+	npm run --silent schemas > ../../resources/genesis-schemas.json
diff --git a/README.md b/README.md
@@ -158,6 +158,9 @@ _Note, Running Frequency via following options does not require binary to be bui
 
 This option runs just one collator node without the need for a relay chain.
 
+This preloads into genesis all the schemas from mainnet.
+Use `make genesis-schemas` if the genesis is out of date.
+
 ### Manual Sealing
 
 a. Blocks can be triggered by calling the `engine_createBlock` RPC
@@ -187,17 +190,17 @@ Great for most testing.
 make start
 ```
 
-Also available as a Docker image: [`frequencychain/instant-seal-node`](https://hub.docker.com/r/frequencychain/instant-seal-node)
+Also available as a Docker image: [`frequencychain/standalone-node`](https://hub.docker.com/r/frequencychain/standalone-node)
 
 ```sh
-docker run --rm -p 9944:9944 -p 30333:30333 frequencychain/instant-seal-node
+docker run --rm -p 9944:9944 frequencychain/standalone-node
 ```
 
 To stop running chain hit [Ctrl+C] in terminal where the chain was started.
 
-| **Node**                |           **Ports**            | **Explorer URL**                                                                          |
-| ----------------------- | :----------------------------: | ----------------------------------------------------------------------------------------- |
-| Frequency Collator Node | ws and rpc:`9944`, p2p:`30333` | [127.0.0.1:9944](https://polkadot.js.org/apps/?rpc=ws%3A%2F%2F127.0.0.1%3A9944#/explorer) |
+| **Node**                |     **Ports**     | **Explorer URL**                                                                          |
+| ----------------------- | :---------------: | ----------------------------------------------------------------------------------------- |
+| Frequency Collator Node | ws and rpc:`9944` | [127.0.0.1:9944](https://polkadot.js.org/apps/?rpc=ws%3A%2F%2F127.0.0.1%3A9944#/explorer) |
 
 ### Interval Sealing
 

diff --git a/common/primitives/src/handles.rs b/common/primitives/src/handles.rs
@@ -4,6 +4,7 @@ use crate::utils::*;
 use frame_support::BoundedVec;
 use parity_scale_codec::{Decode, Encode};
 use scale_info::TypeInfo;
+#[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 use sp_core::ConstU32;
 use sp_std::vec::Vec;

diff --git a/common/primitives/src/schema.rs b/common/primitives/src/schema.rs
@@ -4,7 +4,6 @@ use crate::utils;
 use enumflags2::{bitflags, BitFlags};
 use parity_scale_codec::{Decode, Encode, EncodeLike, MaxEncodedLen};
 use scale_info::{build::Fields, meta_type, Path, Type, TypeInfo, TypeParameter};
-#[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 use sp_runtime::RuntimeDebug;
 use sp_std::prelude::*;
@@ -18,8 +17,19 @@ pub type SchemaId = u16;
 pub type SchemaVersion = u8;
 
 /// Types of modeling in which a message payload may be defined
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-#[derive(Copy, Clone, Encode, Decode, PartialEq, Debug, TypeInfo, Eq, MaxEncodedLen)]
+#[derive(
+	Copy,
+	Clone,
+	Encode,
+	Decode,
+	PartialEq,
+	Debug,
+	TypeInfo,
+	Eq,
+	MaxEncodedLen,
+	Serialize,
+	Deserialize,
+)]
 pub enum ModelType {
 	/// Message payload modeled with Apache Avro: <https://avro.apache.org/docs/current/spec.html>
 	AvroBinary,
@@ -28,8 +38,19 @@ pub enum ModelType {
 }
 
 /// Types of payload locations
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-#[derive(Copy, Clone, Encode, Decode, PartialEq, Debug, TypeInfo, Eq, MaxEncodedLen)]
+#[derive(
+	Copy,
+	Clone,
+	Encode,
+	Decode,
+	PartialEq,
+	Debug,
+	TypeInfo,
+	Eq,
+	MaxEncodedLen,
+	Serialize,
+	Deserialize,
+)]
 pub enum PayloadLocation {
 	/// Message payload is located on chain
 	OnChain,
@@ -44,8 +65,19 @@ pub enum PayloadLocation {
 /// Support for up to 16 user-enabled features on a collection.
 #[bitflags]
 #[repr(u16)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-#[derive(Copy, Clone, RuntimeDebug, PartialEq, Eq, Encode, Decode, MaxEncodedLen, TypeInfo)]
+#[derive(
+	Copy,
+	Clone,
+	RuntimeDebug,
+	PartialEq,
+	Eq,
+	Encode,
+	Decode,
+	MaxEncodedLen,
+	TypeInfo,
+	Serialize,
+	Deserialize,
+)]
 pub enum SchemaSetting {
 	/// Schema setting to enforce append-only behavior on payload.
 	/// Applied to schemas of type `PayloadLocation::Itemized`.

diff --git a/docker/instant-seal-node.dockerfile b/docker/instant-seal-node.dockerfile
diff --git a/docker/instant-seal-node.overview.md b/docker/instant-seal-node.overview.md
diff --git a/node/cli/src/cli.rs b/node/cli/src/cli.rs
@@ -81,14 +81,6 @@ pub struct Cli {
 	#[clap(raw = true)]
 	pub relay_chain_args: Vec<String>,
 
-	#[cfg(feature = "frequency-no-relay")]
-	#[clap(long = "instant-sealing", help = "Deprecated.  Use --sealing=instant instead.")]
-	pub instant_sealing: bool,
-
-	#[cfg(feature = "frequency-no-relay")]
-	#[clap(long = "manual-sealing", help = "Deprecated.  Use --sealing=manual instead.")]
-	pub manual_sealing: bool,
-
 	/// Instant block sealing
 	/// Blocks are triggered to be formed each time a transaction hits the validated transaction pool
 	/// Empty blocks can also be formed using the `engine_createBlock` RPC

diff --git a/node/cli/src/run_as_localchain.rs b/node/cli/src/run_as_localchain.rs
@@ -1,23 +1,11 @@
 use crate::cli::Cli;
 use frequency_service::block_sealing::frequency_dev_sealing;
 use sc_cli::SubstrateCli;
-use std::process;
 
 pub fn run_as_localchain(cli: Cli) -> sc_service::Result<(), sc_cli::Error> {
 	let runner = cli.create_runner(&cli.run.normalize())?;
 
 	runner.run_node_until_exit(|config| async move {
-		if cli.instant_sealing {
-			log::error!(
-				"The --instant-sealing option is deprecated.  Use --sealing=instant instead."
-			);
-			process::exit(1);
-		} else if cli.manual_sealing {
-			log::error!(
-				"The --manual-sealing option is deprecated.  Use --sealing=manual instead."
-			);
-			process::exit(1);
-		}
 		frequency_dev_sealing(
 			config,
 			cli.sealing,

diff --git a/node/service/src/chain_spec/frequency_dev.rs b/node/service/src/chain_spec/frequency_dev.rs
@@ -86,6 +86,11 @@ fn template_session_keys(keys: AuraId) -> frequency_runtime::SessionKeys {
 	frequency_runtime::SessionKeys { aura: keys }
 }
 
+#[allow(clippy::unwrap_used)]
+fn load_genesis_schemas() -> Vec<frequency_runtime::pallet_schemas::GenesisSchema> {
+	serde_json::from_slice(include_bytes!("../../../../resources/genesis-schemas.json")).unwrap()
+}
+
 #[allow(clippy::unwrap_used)]
 fn development_genesis(
 	invulnerables: Vec<(AccountId, AuraId)>,
@@ -131,7 +136,10 @@ fn development_genesis(
 			// Assign network admin rights.
 			key: root_key,
 		},
-		schemas: Default::default(),
+		schemas: frequency_runtime::pallet_schemas::GenesisConfig {
+			initial_schemas: load_genesis_schemas(),
+			..Default::default()
+		},
 		time_release: Default::default(),
 		democracy: Default::default(),
 		treasury: Default::default(),

diff --git a/pallets/passkey/src/types.rs b/pallets/passkey/src/types.rs
@@ -19,7 +19,7 @@ pub type PasskeyAuthenticatorData = BoundedVec<u8, ConstU32<128>>;
 /// Passkey ClientDataJson type
 /// Note: The `challenge` field inside this json MUST be replaced with `CHALLENGE_PLACEHOLDER`
 /// before submission to the chain
-/// https://w3c.github.io/webauthn/#dictdef-collectedclientdata
+/// <https://w3c.github.io/webauthn/#dictdef-collectedclientdata>
 pub type PasskeyClientDataJson = BoundedVec<u8, ConstU32<256>>;
 /// PassKey Public Key type in compressed encoded point format
 /// the first byte is the tag indicating compressed format

diff --git a/pallets/schemas/Cargo.toml b/pallets/schemas/Cargo.toml
@@ -21,6 +21,7 @@ frame-support = { workspace = true }
 frame-system = { workspace = true }
 numtoa = { workspace = true, optional = true }
 scale-info = { workspace = true, features = ["derive"] }
+serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true, features = ["alloc"] }
 smallvec = { workspace = true }
 sp-core = { workspace = true }