Merge pull request #4916 from mnaamani/master-node-embed-mainnet-chai…

…nspec Joystream-node embed mainnet chainspec
Joystream · Nov 7, 2023 · 30ecf0f · 30ecf0f
2 parents bcddf45 + 949b629
commit 30ecf0f
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/node/Cargo.toml b/bin/node/Cargo.toml
@@ -3,7 +3,7 @@ authors = ['Joystream contributors']
 build = 'build.rs'
 edition = '2018'
 name = 'joystream-node'
-version = '8.3.1'
+version = '8.4.0'
 default-run = "joystream-node"
 
 [[bin]]

diff --git a/bin/node/src/chain_spec/mod.rs b/bin/node/src/chain_spec/mod.rs
@@ -56,6 +56,10 @@ pub use node_runtime::GenesisConfig;
 
 type AccountPublic = <Signature as Verify>::Signer;
 
+pub fn joystream_mainnet_config() -> Result<ChainSpec, String> {
+    ChainSpec::from_json_bytes(&include_bytes!("../../../../joy-mainnet.json")[..])
+}
+
 /// Node `ChainSpec` extensions.
 ///
 /// Additional parameters for some Substrate core modules,

diff --git a/bin/node/src/command.rs b/bin/node/src/command.rs
@@ -63,11 +63,11 @@ impl SubstrateCli for Cli {
     fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {
         let spec = match id {
             "" => {
-                return Err(
-                    "Please specify which chain you want to run, e.g. --dev or --chain=local or --chain=prod-test"
-                        .into(),
-                )
+                return Err("Please specify which chain you want to run, eg. --dev or
+                    --chain=joy-mainnet or --chain=local or --chain=prod-test"
+                    .into())
             }
+            "joy-mainnet" => Box::new(chain_spec::joystream_mainnet_config()?),
             "dev" => Box::new(chain_spec::development_config()),
             "prod-test" => Box::new(chain_spec::prod_test_config()),
             "local" => Box::new(chain_spec::local_testnet_config()),

diff --git a/joystream-node.Dockerfile b/joystream-node.Dockerfile
@@ -20,6 +20,7 @@ COPY Cargo.lock .
 COPY bin ./bin
 COPY runtime ./runtime
 COPY runtime-modules ./runtime-modules
+COPY joy-mainnet.json .
 RUN cargo chef prepare --recipe-path /joystream/recipe.json
 
 FROM rust AS cacher
@@ -38,6 +39,7 @@ COPY Cargo.lock .
 COPY bin ./bin
 COPY runtime ./runtime
 COPY runtime-modules ./runtime-modules
+COPY joy-mainnet.json .
 # Copy over the cached dependencies
 COPY --from=cacher /joystream/target target
 COPY --from=cacher $CARGO_HOME $CARGO_HOME

diff --git a/scripts/runtime-code-shasum.sh b/scripts/runtime-code-shasum.sh
@@ -21,6 +21,7 @@ ${TAR} -c --sort=name --owner=root:0 --group=root:0 --mode 644 --mtime='UTC 2020
     runtime-modules \
     joystream-node.Dockerfile \
     bin \
+    joy-mainnet.json \
     | if [[ -n "$RUNTIME_PROFILE" ]]; then ${SED} '$a'"$RUNTIME_PROFILE"; else tee; fi \
     | shasum \
     | cut -d " " -f 1
diff --git a/scripts/runtime-code-tarball.sh b/scripts/runtime-code-tarball.sh
@@ -9,4 +9,5 @@ tar -czf joystream.tar.gz \
     runtime \
     runtime-modules \
     joystream-node.Dockerfile \
-    bin
+    bin \
+    joy-mainnet.json