Updated hashed pallets to v0.1.11. Updated md5 collator manifests to update the image to the one with the ss58 fix. Developed set_default_ss58_version method in the node cmd module, and called it from the different commands so as to set the ss58 version accordingly. Developed the IdentifyVariant trait. Implemented the IdentifyVariant trait for the chain spec. Removed runtime upgrades. Increased spec version to number 4. Updated the ss58prefix for frame system.

Author: sebastianmontero

Cargo.lock

@@ -18,7 +18,7 @@ spec:
       containers:
       - name: md5-collator-1
         imagePullPolicy: IfNotPresent
-        image: sebastianmontero/hashed-substrate-collator-md5:da13ebb0abb495d17969f430906eb8dcc27cfb50
+        image: sebastianmontero/hashed-substrate-collator-md5:fad9867734381df739458102212fc2a118752c68
         command: ["/var/www/hashed-substrate/scripts/start_collator.sh"]
         args: ["md5", "/var/www/hashed/hashed"]
         volumeMounts:

k8-manifests/md5-collator-1-statefulset-aws.yml

@@ -18,7 +18,7 @@ spec:
       containers:
       - name: md5-collator-2
         imagePullPolicy: IfNotPresent
-        image: sebastianmontero/hashed-substrate-collator-md5:da13ebb0abb495d17969f430906eb8dcc27cfb50
+        image: sebastianmontero/hashed-substrate-collator-md5:fad9867734381df739458102212fc2a118752c68
         command: ["/var/www/hashed-substrate/scripts/start_collator.sh"]
         args: ["md5", "/var/www/hashed/hashed"]
         volumeMounts:

k8-manifests/md5-collator-2-statefulset-aws.yml

@@ -15,6 +15,7 @@ use crate::{
 	chain_spec,
 	cli::{Cli, RelayChainCli, Subcommand},
 	service::new_partial,
+	service::IdentifyVariant
 };
 
 fn load_spec(id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {
@@ -100,6 +101,22 @@ impl SubstrateCli for RelayChainCli {
 	}
 }
 
+
+fn set_default_ss58_version(spec: &Box<dyn sc_service::ChainSpec>) {
+
+	let ss58_version: u16 = if spec.is_luhn() {
+		11486
+	} else if spec.is_hashed() {
+		9072
+	} else if spec.is_md5(){
+		5000
+	} else {
+		42
+	};
+
+	sp_core::crypto::set_default_ss58_version(ss58_version.into());
+}
+
 macro_rules! construct_async_run {
 	(|$components:ident, $cli:ident, $cmd:ident, $config:ident| $( $code:tt )* ) => {{
 		let runner = $cli.create_runner($cmd)?;
@@ -121,26 +138,47 @@ pub fn run() -> Result<()> {
 			runner.sync_run(|config| cmd.run(config.chain_spec, config.network))
 		},
 		Some(Subcommand::CheckBlock(cmd)) => {
+			let runner = cli.create_runner(cmd)?;
+			let chain_spec = &runner.config().chain_spec;
+
+			set_default_ss58_version(chain_spec);
 			construct_async_run!(|components, cli, cmd, config| {
 				Ok(cmd.run(components.client, components.import_queue))
 			})
 		},
 		Some(Subcommand::ExportBlocks(cmd)) => {
+			let runner = cli.create_runner(cmd)?;
+			let chain_spec = &runner.config().chain_spec;
+
+			set_default_ss58_version(chain_spec);
 			construct_async_run!(|components, cli, cmd, config| {
 				Ok(cmd.run(components.client, config.database))
 			})
 		},
 		Some(Subcommand::ExportState(cmd)) => {
+			let runner = cli.create_runner(cmd)?;
+			let chain_spec = &runner.config().chain_spec;
+
+			set_default_ss58_version(chain_spec);
 			construct_async_run!(|components, cli, cmd, config| {
 				Ok(cmd.run(components.client, config.chain_spec))
 			})
 		},
 		Some(Subcommand::ImportBlocks(cmd)) => {
+			let runner = cli.create_runner(cmd)?;
+			let chain_spec = &runner.config().chain_spec;
+
+			set_default_ss58_version(chain_spec);
+
 			construct_async_run!(|components, cli, cmd, config| {
 				Ok(cmd.run(components.client, components.import_queue))
 			})
 		},
 		Some(Subcommand::Revert(cmd)) => {
+			let runner = cli.create_runner(cmd)?;
+			let chain_spec = &runner.config().chain_spec;
+
+			set_default_ss58_version(chain_spec);
 			construct_async_run!(|components, cli, cmd, config| {
 				Ok(cmd.run(components.client, components.backend, None))
 			})
@@ -181,6 +219,9 @@ pub fn run() -> Result<()> {
 		},
 		Some(Subcommand::Benchmark(cmd)) => {
 			let runner = cli.create_runner(cmd)?;
+			let chain_spec = &runner.config().chain_spec;
+
+			set_default_ss58_version(chain_spec);
 			// Switch on the concrete benchmark sub-command-
 			match cmd {
 				BenchmarkCmd::Pallet(cmd) =>
@@ -222,6 +263,9 @@ pub fn run() -> Result<()> {
 		None => {
 			let runner = cli.create_runner(&cli.run.normalize())?;
 			let collator_options = cli.run.collator_options();
+			let chain_spec = &runner.config().chain_spec;
+
+			set_default_ss58_version(chain_spec);
 
 			runner.run_node_until_exit(|config| async move {
 				let hwbench = (!cli.no_hardware_benchmarks)

node/src/command.rs

@@ -30,7 +30,7 @@ use sc_executor::{
 };
 use sc_network::NetworkBlock;
 use sc_network_sync::SyncingService;
-use sc_service::{Configuration, PartialComponents, TFullBackend, TFullClient, TaskManager};
+use sc_service::{ChainSpec,Configuration, PartialComponents, TFullBackend, TFullClient, TaskManager};
 use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle};
 use sc_transaction_pool_api::OffchainTransactionPoolFactory;
 use sp_keystore::KeystorePtr;
@@ -433,3 +433,38 @@ pub async fn start_parachain_node(
 ) -> sc_service::error::Result<(TaskManager, Arc<ParachainClient>)> {
 	start_node_impl(parachain_config, polkadot_config, collator_options, para_id, hwbench).await
 }
+
+
+/// Can be called for a `Configuration` to check if it is a configuration for
+/// the `Hashed` network.
+pub trait IdentifyVariant {
+	/// Returns `true` if this is a configuration for the `Hashed` network.
+	fn is_hashed(&self) -> bool;
+
+	/// Returns `true` if this is a configuration for the `Luhn` network.
+	fn is_luhn(&self) -> bool;
+
+	/// Returns `true` if this is a configuration for the `MD5` network.
+	fn is_md5(&self) -> bool;
+
+	/// Returns `true` if this is a configuration for the dev network.
+	fn is_dev(&self) -> bool;
+}
+
+impl IdentifyVariant for Box<dyn ChainSpec> {
+	fn is_hashed(&self) -> bool {
+		self.id().starts_with("hashed")
+	}
+
+	fn is_luhn(&self) -> bool {
+		self.id().starts_with("luhn")
+	}
+
+	fn is_md5(&self) -> bool {
+		self.id().starts_with("md5")
+	}
+
+	fn is_dev(&self) -> bool {
+		self.id().ends_with("dev")
+	}
+}

node/src/service.rs

@@ -23,17 +23,17 @@ scale-info = { version = "2.10.0", default-features = false, features = ["derive
 smallvec = "1.11.0"
 
 # Hashed Dependencies
-pallet-template = { git = "https://github.com/hashed-io/hashed-pallets", tag ="0.1.10", default-features = false }
-pallet-fruniques = { git = "https://github.com/hashed-io/hashed-pallets", tag ="0.1.10", default-features = false }
-pallet-bitcoin-vaults = { git = "https://github.com/hashed-io/hashed-pallets", tag ="0.1.10", default-features = false }
+pallet-template = { git = "https://github.com/hashed-io/hashed-pallets", tag ="0.1.11", default-features = false }
+pallet-fruniques = { git = "https://github.com/hashed-io/hashed-pallets", tag ="0.1.11", default-features = false }
+pallet-bitcoin-vaults = { git = "https://github.com/hashed-io/hashed-pallets", tag ="0.1.11", default-features = false }
 # pallet-bitcoin-vaults = { path = "../../hashed-pallets/pallets/bitcoin-vaults", default-features = false }
-pallet-gated-marketplace = { git = "https://github.com/hashed-io/hashed-pallets", tag ="0.1.10", default-features = false }
-pallet-rbac = { git = "https://github.com/hashed-io/hashed-pallets", tag ="0.1.10", default-features = false }
-pallet-confidential-docs = { git = "https://github.com/hashed-io/hashed-pallets", tag ="0.1.10", default-features = false }
+pallet-gated-marketplace = { git = "https://github.com/hashed-io/hashed-pallets", tag ="0.1.11", default-features = false }
+pallet-rbac = { git = "https://github.com/hashed-io/hashed-pallets", tag ="0.1.11", default-features = false }
+pallet-confidential-docs = { git = "https://github.com/hashed-io/hashed-pallets", tag ="0.1.11", default-features = false }
 # pallet-confidential-docs = { path = "../../hashed-pallets/pallets/confidential-docs", default-features = false }
-pallet-afloat = { git = "https://github.com/hashed-io/hashed-pallets", tag ="0.1.10", default-features = false }
-pallet-mapped-assets = { git = "https://github.com/hashed-io/hashed-pallets", tag ="0.1.10", default-features = false }
-pallet-fund-admin-records = { git = "https://github.com/hashed-io/hashed-pallets", tag ="0.1.10", default-features = false }
+pallet-afloat = { git = "https://github.com/hashed-io/hashed-pallets", tag ="0.1.11", default-features = false }
+pallet-mapped-assets = { git = "https://github.com/hashed-io/hashed-pallets", tag ="0.1.11", default-features = false }
+pallet-fund-admin-records = { git = "https://github.com/hashed-io/hashed-pallets", tag ="0.1.11", default-features = false }
 
 # Prebuilt Pallets
 pallet-alliance = { git = "https://github.com/paritytech/polkadot-sdk", tag = "v1.3.0-rc1", default-features = false }

runtime/Cargo.toml

@@ -128,42 +128,14 @@ parameter_types! {
 	pub const InactiveAccounts: Vec<AccountId> = Vec::new();
 	pub TestAccount: AccountId = hex_literal::hex!["d8033c4d04a502901d24a789da32940085c62eba881c4701a73411288445cc46"].into();
 }
-pub type RuntimeUpgrades = (
-	migrations::parachain_system::v1::Migrate,
-	cumulus_pallet_parachain_system::migration::Migration<Runtime>,
-	pallet_collator_selection::migration::v1::MigrateToV1<Runtime>,
-	pallet_xcm::migration::v1::VersionCheckedMigrateToV1<Runtime>,
-	cumulus_pallet_dmp_queue::migration::Migration<Runtime>,
-	cumulus_pallet_xcmp_queue::migration::Migration<Runtime>,
-	pallet_balances::migration::MigrateManyToTrackInactive<Runtime, InactiveAccounts>,
-	pallet_assets::migration::v1::MigrateToV1<Runtime>,
-	pallet_multisig::migrations::v1::MigrateToV1<Runtime>,
-	pallet_preimage::migration::v1::Migration<Runtime>,
-	migrations::transaction_payment::v0::Migrate,
-	migrations::uniques::v0::MigrateToV1,
-	migrations::vesting::v0::MigrateToV1,
-	migrations::authorship::v0::Migrate,
-	pallet_fruniques::migration::v0::MigrateToV1<Runtime>,
-	migrations::general::GeneralMigration,
-	migrations::system_verifier::Migrate,
-	migrations::identity_verifier::Migrate,
-	migrations::aura_verifier::Migrate,
-	migrations::balances_verifier::Migrate,
-	migrations::collator_selection_verifier::Migrate,
-	migrations::dmp_queue_verifier::Migrate,
-	migrations::proxy_verifier::Migrate,
-	migrations::society_verifier::Migrate,
-	migrations::xcmp_queue_verifier::Migrate
-);
 
 /// Executive: handles dispatch to the various modules.
 pub type Executive = frame_executive::Executive<
 	Runtime,
 	Block,
 	frame_system::ChainContext<Runtime>,
 	Runtime,
-	AllPalletsWithSystem,
-	RuntimeUpgrades
+	AllPalletsWithSystem
 >;
 
 pub type RootOrThreeFifthsOfCouncil = EitherOfDiverse<
@@ -229,12 +201,12 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	impl_name: create_runtime_str!("luhn"),
 	// spec_name: create_runtime_str!("hashed"), // for md5 rococo
 	// impl_name: create_runtime_str!("hashed"),
-	authoring_version: 3,
-	spec_version: 3,
-	impl_version: 3,
+	authoring_version: 4,
+	spec_version: 4,
+	impl_version: 4,
 	apis: RUNTIME_API_VERSIONS,
-	transaction_version: 3,
-	state_version: 3,
+	transaction_version: 4,
+	state_version: 4,
 };
 
 /// This determines the average expected block time that we are targeting.
@@ -318,7 +290,7 @@ parameter_types! {
 		})
 		.avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)
 		.build_or_panic();
-	pub const SS58Prefix: u16 = 42;
+	pub const SS58Prefix: u16 = 9072;
 }
 
 // Configure FRAME pallets to include in runtime.

runtime/src/lib.rs

@@ -0,0 +1,31 @@
+# HOW TO RUN: zombienet-linux-x64 spawn --provider native small_network.toml
+[relaychain]
+default_image = "parity/polkadot:latest"
+default_command = "polkadot"
+chain = "rococo-local"
+
+  [[relaychain.nodes]]
+  name = "alice"
+  validator = true
+
+  [[relaychain.nodes]]
+  name = "bob"
+  validator = true
+
+[[parachains]]
+id = 2000
+cumulus_based = true
+chain = "md5"
+# genesis_wasm_path = "/home/sebastian/vsc-workspace/hashed-substrate/resources/md5-wasm"
+# chain_spec_path = "/home/sebastian/vsc-workspace/hashed-substrate-parachain/resources/md5-collator-raw-spec.json"
+
+  # run charlie as parachain collator
+  [[parachains.collators]]
+  name = "charlie"
+  validator = true
+#   image = "sebastianmontero/hashed-substrate-collator:latest"
+  command = "../target/release/hashed-parachain"
+  args = ["-lparachain=debug"]
+#   args = ["--force-authoring"]
+#   args = ["--chain", "/var/www/hashed-substrate/md5-collator-raw-spec.json", "--force-authoring"]
+#   args = ["--chain", "/var/www/hashed-substrate/md5-collator-raw-spec.json"]