git.delta.rocks / unique-network / refs/commits / b9c463cad09c

--- a/node/cli/Cargo.toml
+++ b/node/cli/Cargo.toml
@@ -340,7 +340,7 @@
     'opal-runtime?/try-runtime',
     'try-runtime-cli/try-runtime',
 ]
-sapphire-runtime = ['opal-runtime', 'opal-runtime/become-sapphire']
+sapphire-runtime = ['quartz-runtime', 'quartz-runtime/become-sapphire']
 pov-estimate = [
     'unique-runtime?/pov-estimate',
     'quartz-runtime?/pov-estimate',

--- a/runtime/opal/Cargo.toml
+++ b/runtime/opal/Cargo.toml
@@ -44,7 +44,7 @@
     'sp-runtime/runtime-benchmarks',
     'xcm-builder/runtime-benchmarks',
     'pallet-maintenance/runtime-benchmarks',
-    'cumulus-pallet-parachain-system/runtime-benchmarks'
+    'cumulus-pallet-parachain-system/runtime-benchmarks',
 ]
 try-runtime = [
     'frame-try-runtime',
@@ -185,7 +185,6 @@
     'foreign-assets',
     'pallet-test-utils',
 ]
-become-sapphire = []
 pov-estimate = []
 
 refungible = []

--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -44,14 +44,7 @@
 
 pub use runtime_common::*;
 
-#[cfg(feature = "become-sapphire")]
-pub const RUNTIME_NAME: &str = "sapphire";
-#[cfg(feature = "become-sapphire")]
-pub const TOKEN_SYMBOL: &str = "QTZ";
-
-#[cfg(not(feature = "become-sapphire"))]
 pub const RUNTIME_NAME: &str = "opal";
-#[cfg(not(feature = "become-sapphire"))]
 pub const TOKEN_SYMBOL: &str = "OPL";
 
 /// This runtime version.
@@ -68,15 +61,6 @@
 
 parameter_types! {
 	pub const Version: RuntimeVersion = VERSION;
-}
-#[cfg(feature = "become-sapphire")]
-parameter_types! {
-	pub const SS58Prefix: u16 = 8883;
-	pub const ChainId: u64 = 8883;
-}
-
-#[cfg(not(feature = "become-sapphire"))]
-parameter_types! {
 	pub const SS58Prefix: u16 = 42;
 	pub const ChainId: u64 = 8882;
 }

--- a/runtime/quartz/Cargo.toml
+++ b/runtime/quartz/Cargo.toml
@@ -171,6 +171,7 @@
 ]
 limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']
 quartz-runtime = ['refungible', 'app-promotion', 'foreign-assets']
+become-sapphire = []
 pov-estimate = []
 
 refungible = []

4444
45pub use runtime_common::*;45pub use runtime_common::*;
4646
47#[cfg(feature = "become-sapphire")]
48pub const RUNTIME_NAME: &str = "sapphire";
49#[cfg(not(feature = "become-sapphire"))]
47pub const RUNTIME_NAME: &str = "quartz";50pub const RUNTIME_NAME: &str = "quartz";
48pub const TOKEN_SYMBOL: &str = "QTZ";51pub const TOKEN_SYMBOL: &str = "QTZ";
4952
59	state_version: 0,62	state_version: 0,
60};63};
6164
62parameter_types! {65parameter_types! {
63	pub const Version: RuntimeVersion = VERSION;66	pub const Version: RuntimeVersion = VERSION;
67}
68#[cfg(feature = "become-sapphire")]
69parameter_types! {
64	pub const SS58Prefix: u8 = 255;70	pub const SS58Prefix: u16 = 8883;
71	pub const ChainId: u64 = 8883;
72}
73
74#[cfg(not(feature = "become-sapphire"))]
75parameter_types! {
76	pub const SS58Prefix: u8 = 255;
65	pub const ChainId: u64 = 8881;77	pub const ChainId: u64 = 8881;
66}78}
6779
68construct_runtime!(quartz);80construct_runtime!(quartz);
6981