Companion for paritytech/cumulus#1241

darwinia-network · Jun 29, 2022 · 1cb1992 · 1cb1992
1 parent e240015
commit 1cb1992
Show file tree

Hide file tree

Showing 31 changed files with 68 additions and 53 deletions.
diff --git a/.github/purge-large-cache.sh b/.github/purge-large-cache.sh
@@ -1,14 +1,14 @@
 #!/bin/sh
 
-cargo clean -p darwinia-collator 2> /dev/null || true
+cargo clean -p darwinia-parachain 2> /dev/null || true
 cargo clean -p polkadot-runtime 2> /dev/null || true
 cargo clean -p kusama-runtime 2> /dev/null || true
 cargo clean -p darwinia-parachain-runtime 2> /dev/null || true
 cargo clean -p crab-parachain-runtime 2> /dev/null || true
 cargo clean -p pangolin-parachain-runtime 2> /dev/null || true
 rm -rf target/debug/wbuild 2> /dev/null || true
 
-cargo clean --release -p darwinia-collator 2> /dev/null || true
+cargo clean --release -p darwinia-parachain 2> /dev/null || true
 cargo clean --release -p polkadot-runtime 2> /dev/null || true
 cargo clean --release -p kusama-runtime 2> /dev/null || true
 cargo clean --release -p darwinia-parachain-runtime 2> /dev/null || true

diff --git a/.github/release-template.md b/.github/release-template.md
@@ -12,16 +12,16 @@ Darwinia Parachain
 ### Pre-built Binary
 |  OS   |  Arch  | Glibc | LLVM  |                                                                                                                                      Download                                                                                                                                      |
 | :---: | :----: | :---: | :---: | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
-| Linux | x86_64 | 2.23  |  4.0  | [tar.bz2](https://github.com/darwinia-network/darwinia-parachain/releases/download/{{ tag }}/darwinia-collator-x86_64-linux-gnu.tar.bz2), [tar.zst](https://github.com/darwinia-network/darwinia-parachain/releases/download/{{ tag }}/darwinia-collator-x86_64-linux-gnu.tar.zst) |
+| Linux | x86_64 | 2.23  |  4.0  | [tar.bz2](https://github.com/darwinia-network/darwinia-parachain/releases/download/{{ tag }}/darwinia-parachain-x86_64-linux-gnu.tar.bz2), [tar.zst](https://github.com/darwinia-network/darwinia-parachain/releases/download/{{ tag }}/darwinia-parachain-x86_64-linux-gnu.tar.zst) |
 
 ### Docker
 #### Pull with the Git Tag
 ```docker
-docker pull quay.io/darwinia-network/darwinia-collator:{{ tag }}
+docker pull quay.io/darwinia-network/darwinia-parachain:{{ tag }}
 ```
 #### Pull with the Git Commit SHA
 ```docker
-docker pull quay.io/darwinia-network/darwinia-collator:sha-{{ sha }}
+docker pull quay.io/darwinia-network/darwinia-parachain:sha-{{ sha }}
 ```
 
 ## Proposal Hashes

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -40,7 +40,7 @@ jobs:
       matrix:
         action: [build, test]
         task:
-          - target: darwinia-collator
+          - target: darwinia-parachain
             repository: darwinia-network/darwinia-parachain
           - target: subalfred
             repository: hack-ink/subalfred
@@ -102,7 +102,7 @@ jobs:
           path: ${{ matrix.task.target }}.tar.zst
 
       - name: Purge large cache
-        if: matrix.task.target == 'darwinia-collator'
+        if: matrix.task.target == 'darwinia-parachain'
         run: .github/purge-large-cache.sh
 
   code-checks:
@@ -136,6 +136,6 @@ jobs:
         uses: geekyeggo/delete-artifact@v1
         with:
           name: |
-            darwinia-collator
+            darwinia-parachain
             subalfred
     runs-on: ubuntu-latest
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -39,12 +39,12 @@ jobs:
         run: |
           mkdir -p shared/crab-parachain-runtime
           mkdir -p shared/darwinia-parachain-runtime
-          tar cjSf shared/darwinia-collator-x86_64-linux-gnu.tar.bz2 \
+          tar cjSf shared/darwinia-parachain-x86_64-linux-gnu.tar.bz2 \
             -C target/x86_64-unknown-linux-gnu/release \
-            darwinia-collator
-          tar cf shared/darwinia-collator-x86_64-linux-gnu.tar.zst \
+            darwinia-parachain
+          tar cf shared/darwinia-parachain-x86_64-linux-gnu.tar.zst \
             -C target/x86_64-unknown-linux-gnu/release \
-            darwinia-collator -I pzstd
+            darwinia-parachain -I pzstd
 
           mv target/x86_64-unknown-linux-gnu/release/wbuild/crab-parachain-runtime/*.wasm shared/crab-parachain-runtime
           mv target/x86_64-unknown-linux-gnu/release/wbuild/darwinia-parachain-runtime/*.wasm shared/darwinia-parachain-runtime
@@ -128,11 +128,11 @@ jobs:
       - name: Extract package
         run: |
           mkdir -p dist
-          tar -xvf shared/darwinia-collator-x86_64-linux-gnu.tar.bz2 -C dist/
+          tar -xvf shared/darwinia-parachain-x86_64-linux-gnu.tar.bz2 -C dist/
 
       - name: Build and publish docker image
         run: |
-          IMAGE_NAME=darwinia-collator
+          IMAGE_NAME=darwinia-parachain
           IMAGE_PREFIX=quay.io/darwinia-network
           IMAGE_PUSH_NAME_TAG=${IMAGE_PREFIX}/${IMAGE_NAME}:${GIT_TAG_NAME}
           IMAGE_PUSH_NAME_SHA=${IMAGE_PREFIX}/${IMAGE_NAME}:sha-${SHA}
@@ -160,8 +160,8 @@ jobs:
         run: |
           mkdir -p deploy
 
-          mv shared/darwinia-collator-x86_64-linux-gnu.tar.bz2 deploy/
-          mv shared/darwinia-collator-x86_64-linux-gnu.tar.zst deploy/
+          mv shared/darwinia-parachain-x86_64-linux-gnu.tar.bz2 deploy/
+          mv shared/darwinia-parachain-x86_64-linux-gnu.tar.zst deploy/
 
           mv shared/crab-parachain-runtime/*.compact.compressed.wasm deploy/
           mv shared/crab-parachain-runtime/*.compact.compressed.json deploy/

diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -34,9 +34,9 @@ jobs:
       - name: Collect shared
         run: |
           mkdir -p shared
-          tar cjSf shared/darwinia-collator-x86_64-linux-gnu.tar.bz2 \
+          tar cjSf shared/darwinia-parachain-x86_64-linux-gnu.tar.bz2 \
             -C target/x86_64-unknown-linux-gnu/release \
-            darwinia-collator
+            darwinia-parachain
 
       - name: Upload shared
         uses: actions/upload-artifact@v2
@@ -71,11 +71,11 @@ jobs:
       - name: Extract package
         run: |
           mkdir -p dist
-          tar -xvf shared/darwinia-collator-x86_64-linux-gnu.tar.bz2 -C dist/
+          tar -xvf shared/darwinia-parachain-x86_64-linux-gnu.tar.bz2 -C dist/
 
       - name: Build and publish docker image
         run: |
-          IMAGE_NAME=darwinia-collator
+          IMAGE_NAME=darwinia-parachain
           IMAGE_PREFIX=quay.io/darwinia-network
           IMAGE_PUSH_NAME_SHA=${IMAGE_PREFIX}/${IMAGE_NAME}:sha-${SHA}
           docker build \

diff --git a/.maintain/docker/Dockerfile b/.maintain/docker/Dockerfile
@@ -4,4 +4,4 @@ COPY dist/ /usr/local/bin
 
 EXPOSE 9933 9944
 
-ENTRYPOINT [ "/usr/local/bin/darwinia-collator" ]
+ENTRYPOINT [ "/usr/local/bin/darwinia-parachain" ]
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,17 +1,17 @@
 [package]
 authors     = ["Darwinia Network <hello@darwinia.network>"]
 build       = "build.rs"
-description = "Darwinia Collator"
+description = "Darwinia Parachain"
 edition     = "2018"
 homepage    = "https://darwinia.network"
 license     = "GPL-3.0"
-name        = "darwinia-collator"
+name        = "darwinia-parachain"
 readme      = "README.md"
 repository  = "https://github.com/darwinia-network/darwinia-parachain"
 version     = "5.2.2-rc1"
 
 [[bin]]
-name = "darwinia-collator"
+name = "darwinia-parachain"
 path = "src/main.rs"
 
 [features]
@@ -118,3 +118,18 @@ members = [
 	"rpc",
 	"runtime/*",
 ]
+
+[patch."https://github.com/darwinia-network/darwinia-messages-substrate"]
+bp-message-dispatch    = { path = "/home/workspace/darwinia-git/darwinia-messages-substrate/primitives/message-dispatch" }
+bp-messages            = { path = "/home/workspace/darwinia-git/darwinia-messages-substrate/primitives/messages" }
+bp-pangolin            = { path = "/home/workspace/darwinia-git/darwinia-messages-substrate/primitives/chain-pangolin" }
+bp-pangolin-parachain  = { path = "/home/workspace/darwinia-git/darwinia-messages-substrate/primitives/chain-pangolin-parachain" }
+bp-polkadot-core       = { path = "/home/workspace/darwinia-git/darwinia-messages-substrate/primitives/polkadot-core" }
+bp-runtime             = { path = "/home/workspace/darwinia-git/darwinia-messages-substrate/primitives/runtime" }
+bp-crab                = { path = "/home/workspace/darwinia-git/darwinia-messages-substrate/primitives/chain-crab" }
+bp-crab-parachain      = { path = "/home/workspace/darwinia-git/darwinia-messages-substrate/primitives/chain-crab-parachain" }
+bridge-runtime-common  = { path = "/home/workspace/darwinia-git/darwinia-messages-substrate/bin/runtime-common" }
+pallet-bridge-dispatch = { path = "/home/workspace/darwinia-git/darwinia-messages-substrate/modules/dispatch" }
+pallet-bridge-grandpa  = { path = "/home/workspace/darwinia-git/darwinia-messages-substrate/modules/grandpa" }
+pallet-bridge-messages = { path = "/home/workspace/darwinia-git/darwinia-messages-substrate/modules/messages" }
+pallet-fee-market      = { path = "/home/workspace/darwinia-git/darwinia-messages-substrate/modules/fee-market" }
diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors     = ["Darwinia Network <hello@darwinia.network>"]
-description = "Darwinia Collator Common Runtime"
+description = "Darwinia Parachain Common Runtime"
 edition     = "2021"
 homepage    = "https://darwinia.network/"
 license     = "GPL-3.0"
@@ -25,7 +25,7 @@ bp-runtime             = { default-features = false, git = "https://github.com/d
 bridge-runtime-common  = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.23" }
 pallet-bridge-dispatch = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.23" }
 pallet-fee-market      = { default-features = false, git = "https://github.com/darwinia-network/darwinia-messages-substrate", branch = "polkadot-v0.9.23" }
-# darwinia-collator
+# darwinia-parachain
 dc-primitives = { default-features = false, path = "../../primitives" }
 # substrate
 frame-benchmarking         = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }
@@ -61,7 +61,7 @@ std = [
 	"bridge-runtime-common/std",
 	"pallet-bridge-dispatch/std",
 	"pallet-fee-market/std",
-	# darwinia-collator
+	# darwinia-parachain
 	"dc-primitives/std",
 	# substrate
 	"frame-benchmarking/std",

diff --git a/runtime/crab-parachain/src/weights/cumulus_pallet_xcmp_queue.rs b/runtime/crab-parachain/src/weights/cumulus_pallet_xcmp_queue.rs
@@ -23,7 +23,7 @@
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("crab-parachain-dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/darwinia-collator
+// ./target/release/darwinia-parachain
 // benchmark pallet
 // --header
 // .maintain/lincense-header

diff --git a/runtime/crab-parachain/src/weights/frame_system.rs b/runtime/crab-parachain/src/weights/frame_system.rs
@@ -23,7 +23,7 @@
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("crab-parachain-dev"), DB CACHE: 1024
 
 // Executed Command:
-// target/release/darwinia-collator
+// target/release/darwinia-parachain
 // benchmark pallet
 // --header
 // .maintain/lincense-header

diff --git a/runtime/crab-parachain/src/weights/pallet_balances.rs b/runtime/crab-parachain/src/weights/pallet_balances.rs
@@ -23,7 +23,7 @@
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("crab-parachain-dev"), DB CACHE: 1024
 
 // Executed Command:
-// target/release/darwinia-collator
+// target/release/darwinia-parachain
 // benchmark pallet
 // --header
 // .maintain/lincense-header

diff --git a/runtime/crab-parachain/src/weights/pallet_collator_selection.rs b/runtime/crab-parachain/src/weights/pallet_collator_selection.rs
@@ -23,7 +23,7 @@
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("crab-parachain-dev"), DB CACHE: 1024
 
 // Executed Command:
-// target/release/darwinia-collator
+// target/release/darwinia-parachain
 // benchmark pallet
 // --header
 // .maintain/lincense-header

diff --git a/runtime/crab-parachain/src/weights/pallet_multisig.rs b/runtime/crab-parachain/src/weights/pallet_multisig.rs
@@ -23,7 +23,7 @@
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("crab-parachain-dev"), DB CACHE: 1024
 
 // Executed Command:
-// target/release/darwinia-collator
+// target/release/darwinia-parachain
 // benchmark pallet
 // --header
 // .maintain/lincense-header

diff --git a/runtime/crab-parachain/src/weights/pallet_proxy.rs b/runtime/crab-parachain/src/weights/pallet_proxy.rs
@@ -23,7 +23,7 @@
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("crab-parachain-dev"), DB CACHE: 1024
 
 // Executed Command:
-// target/release/darwinia-collator
+// target/release/darwinia-parachain
 // benchmark pallet
 // --header
 // .maintain/lincense-header

diff --git a/runtime/crab-parachain/src/weights/pallet_timestamp.rs b/runtime/crab-parachain/src/weights/pallet_timestamp.rs
@@ -23,7 +23,7 @@
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("crab-parachain-dev"), DB CACHE: 1024
 
 // Executed Command:
-// target/release/darwinia-collator
+// target/release/darwinia-parachain
 // benchmark pallet
 // --header
 // .maintain/lincense-header

diff --git a/runtime/crab-parachain/src/weights/pallet_utility.rs b/runtime/crab-parachain/src/weights/pallet_utility.rs
@@ -23,7 +23,7 @@
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("crab-parachain-dev"), DB CACHE: 1024
 
 // Executed Command:
-// target/release/darwinia-collator
+// target/release/darwinia-parachain
 // benchmark pallet
 // --header
 // .maintain/lincense-header

diff --git a/runtime/pangolin-parachain/src/weights/cumulus_pallet_xcmp_queue.rs b/runtime/pangolin-parachain/src/weights/cumulus_pallet_xcmp_queue.rs
@@ -23,7 +23,7 @@
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("pangolin-parachain-dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/darwinia-collator
+// ./target/release/darwinia-parachain
 // benchmark pallet
 // --chain
 // pangolin-parachain-dev

diff --git a/runtime/pangolin-parachain/src/weights/frame_system.rs b/runtime/pangolin-parachain/src/weights/frame_system.rs
@@ -23,7 +23,7 @@
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("pangolin-parachain-dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/darwinia-collator
+// ./target/release/darwinia-parachain
 // benchmark pallet
 // --chain
 // pangolin-parachain-dev

diff --git a/runtime/pangolin-parachain/src/weights/pallet_balances.rs b/runtime/pangolin-parachain/src/weights/pallet_balances.rs
@@ -23,7 +23,7 @@
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("pangolin-parachain-dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/darwinia-collator
+// ./target/release/darwinia-parachain
 // benchmark pallet
 // --chain
 // pangolin-parachain-dev

diff --git a/runtime/pangolin-parachain/src/weights/pallet_bridge_grandpa.rs b/runtime/pangolin-parachain/src/weights/pallet_bridge_grandpa.rs
@@ -23,7 +23,7 @@
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("pangolin-parachain-dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/darwinia-collator
+// ./target/release/darwinia-parachain
 // benchmark pallet
 // --chain
 // pangolin-parachain-dev

diff --git a/runtime/pangolin-parachain/src/weights/pallet_bridge_messages.rs b/runtime/pangolin-parachain/src/weights/pallet_bridge_messages.rs
@@ -23,7 +23,7 @@
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("pangolin-parachain-dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/darwinia-collator
+// ./target/release/darwinia-parachain
 // benchmark pallet
 // --chain
 // pangolin-parachain-dev

diff --git a/runtime/pangolin-parachain/src/weights/pallet_collator_selection.rs b/runtime/pangolin-parachain/src/weights/pallet_collator_selection.rs
@@ -23,7 +23,7 @@
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("pangolin-parachain-dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/darwinia-collator
+// ./target/release/darwinia-parachain
 // benchmark pallet
 // --chain
 // pangolin-parachain-dev

diff --git a/runtime/pangolin-parachain/src/weights/pallet_fee_market.rs b/runtime/pangolin-parachain/src/weights/pallet_fee_market.rs
@@ -23,7 +23,7 @@
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("pangolin-parachain-dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/darwinia-collator
+// ./target/release/darwinia-parachain
 // benchmark pallet
 // --chain
 // pangolin-parachain-dev

diff --git a/runtime/pangolin-parachain/src/weights/pallet_multisig.rs b/runtime/pangolin-parachain/src/weights/pallet_multisig.rs
@@ -23,7 +23,7 @@
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("pangolin-parachain-dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/darwinia-collator
+// ./target/release/darwinia-parachain
 // benchmark pallet
 // --chain
 // pangolin-parachain-dev

diff --git a/runtime/pangolin-parachain/src/weights/pallet_proxy.rs b/runtime/pangolin-parachain/src/weights/pallet_proxy.rs
@@ -23,7 +23,7 @@
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("pangolin-parachain-dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/darwinia-collator
+// ./target/release/darwinia-parachain
 // benchmark pallet
 // --chain
 // pangolin-parachain-dev

diff --git a/runtime/pangolin-parachain/src/weights/pallet_timestamp.rs b/runtime/pangolin-parachain/src/weights/pallet_timestamp.rs
@@ -23,7 +23,7 @@
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("pangolin-parachain-dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/darwinia-collator
+// ./target/release/darwinia-parachain
 // benchmark pallet
 // --chain
 // pangolin-parachain-dev

diff --git a/runtime/pangolin-parachain/src/weights/pallet_utility.rs b/runtime/pangolin-parachain/src/weights/pallet_utility.rs
@@ -23,7 +23,7 @@
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("pangolin-parachain-dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/release/darwinia-collator
+// ./target/release/darwinia-parachain
 // benchmark pallet
 // --chain
 // pangolin-parachain-dev

diff --git a/src/command.rs b/src/command.rs
@@ -83,7 +83,7 @@ impl SubstrateCli for Cli {
 
 impl SubstrateCli for RelayChainCli {
 	fn impl_name() -> String {
-		"Darwinia Collator".into()
+		"Darwinia Parachain".into()
 	}
 
 	fn impl_version() -> String {