Reborn Shibuya on 0.9.16 relay (#575)

* [CI] use latest nix channel * Added Osaka relay chainspec * Added Osaka relay bootnodes * Update Osaka relay bootnodes
AstarNetwork · Feb 21, 2022 · a341846 · a341846
1 parent 16a03dd
commit a341846
Show file tree

Hide file tree

Showing 8 changed files with 353 additions and 381 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -86,7 +86,7 @@ jobs:
         submodules: true
     - uses: cachix/install-nix-action@v12
       with:
-        nix_path: nixpkgs=channel:nixos-20.09
+        nix_path: nixpkgs=channel:nixos-21.11
     - run: nix-shell third-party/nix/shell.nix --run "cargo build --release"
 
   docker:

diff --git a/bin/collator/res/osaka.json b/bin/collator/res/osaka.json
diff --git a/bin/collator/res/osaka.raw.json b/bin/collator/res/osaka.raw.json
diff --git a/bin/collator/res/shibuya.json b/bin/collator/res/shibuya.json
@@ -13,7 +13,7 @@
     "tokenDecimals": 18,
     "tokenSymbol": "SBY"
   },
-  "relayChain": "tokyo",
+  "relayChain": "osaka",
   "paraId": 1000,
   "consensusEngine": null,
   "codeSubstitutes": {},

diff --git a/bin/collator/res/shibuya.raw.json b/bin/collator/res/shibuya.raw.json
@@ -13,7 +13,7 @@
     "tokenDecimals": 18,
     "tokenSymbol": "SBY"
   },
-  "relayChain": "tokyo",
+  "relayChain": "osaka",
   "paraId": 1000,
   "consensusEngine": null,
   "codeSubstitutes": {},

diff --git a/bin/collator/res/tokyo.json b/bin/collator/res/tokyo.json
diff --git a/bin/collator/res/tokyo.raw.json b/bin/collator/res/tokyo.raw.json
diff --git a/bin/collator/src/command.rs b/bin/collator/src/command.rs
@@ -178,10 +178,10 @@ impl SubstrateCli for RelayChainCli {
                 )
                 .unwrap(),
             ))
-        } else if id == "tokyo" {
+        } else if id == "osaka" {
             Ok(Box::new(
                 polkadot_service::WestendChainSpec::from_json_bytes(
-                    &include_bytes!("../res/tokyo.raw.json")[..],
+                    &include_bytes!("../res/osaka.raw.json")[..],
                 )
                 .unwrap(),
             ))