Patch publish ci (#1267)

* Revert "client refactor (#1263)" This reverts commit 5477e6f. * revert upload-artifacts to v3
AstarNetwork · Jun 18, 2024 · 004040b · 004040b
1 parent 5477e6f
commit 004040b
Show file tree

Hide file tree

Showing 9 changed files with 1,406 additions and 407 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -98,7 +98,7 @@ jobs:
       id: artifact-name
       run: echo "::set-output name=name::astar-ubuntu-latest-${TARGET%%-*}"
 
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v3
       with:
         name: ${{ steps.artifact-name.outputs.name }}
         path: target/${{ matrix.target }}/release/astar-collator
@@ -131,7 +131,7 @@ jobs:
     - name: Build optimized binary with evm tracing
       run: CARGO_PROFILE_RELEASE_LTO=true RUSTFLAGS="-C codegen-units=1" cargo build --release --target x86_64-unknown-linux-gnu --features evm-tracing --verbose --locked
 
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v3
       with:
         name: astar-evm-tracing-ubuntu-latest-x86_64-unknown-linux-gnu
         path: target/x86_64-unknown-linux-gnu/release/astar-collator
@@ -142,17 +142,17 @@ jobs:
         mv target/x86_64-unknown-linux-gnu/release/wbuild/shiden-runtime/shiden_runtime.compact.compressed.wasm target/x86_64-unknown-linux-gnu/release/wbuild/shiden-runtime/shiden_evm_tracing_runtime.compact.compressed.wasm
         mv target/x86_64-unknown-linux-gnu/release/wbuild/shibuya-runtime/shibuya_runtime.compact.compressed.wasm target/x86_64-unknown-linux-gnu/release/wbuild/shibuya-runtime/shibuya_evm_tracing_runtime.compact.compressed.wasm
 
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v3
       with:
         name: astar-evm-tracing-runtime
         path: target/x86_64-unknown-linux-gnu/release/wbuild/astar-runtime/astar_evm_tracing_runtime.compact.compressed.wasm
 
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v3
       with:
         name: shiden-evm-tracing-runtime
         path: target/x86_64-unknown-linux-gnu/release/wbuild/shiden-runtime/shiden_evm_tracing_runtime.compact.compressed.wasm
 
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v3
       with:
         name: shibuya-evm-tracing-runtime
         path: target/x86_64-unknown-linux-gnu/release/wbuild/shibuya-runtime/shibuya_evm_tracing_runtime.compact.compressed.wasm
@@ -196,7 +196,7 @@ jobs:
     - name: Show sccache stats
       run: sccache --show-stats
 
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v3
       with:
         name: astar-macOS-latest-x86_64
         path: target/release/astar-collator
@@ -228,7 +228,7 @@ jobs:
         tag-sha: true # add git short SHA as Docker tag
 
     - name: Download pre-built linux collator binary
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v3
       with:
         name: astar-ubuntu-latest-x86_64
 
@@ -273,7 +273,7 @@ jobs:
 
     # it takes a while to build the runtime, so let's save the artifact as soon as we have it
     - name: Archive Artifacts for ${{ matrix.chain }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: ${{ matrix.chain }}-runtime
         path: |
@@ -311,7 +311,7 @@ jobs:
           tee ${{ matrix.chain }}-diff.txt
 
     - name: Archive Subwasm results
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: ${{ matrix.chain }}-runtime
         path: |
@@ -332,19 +332,19 @@ jobs:
         fetch-depth: 0
 
     - name: Download astar runtime
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v3
       with:
         name: astar-runtime
         path: runtime-artifacts
 
     - name: Download shiden runtime
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v3
       with:
         name: shiden-runtime
         path: runtime-artifacts
 
     - name: Download shibuya runtime
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v3
       with:
         name: shibuya-runtime
         path: runtime-artifacts
@@ -398,7 +398,7 @@ jobs:
         mkdir -p ubuntu-tracing-bin
 
     - name: Download pre-built collator binary
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v3
       with:
         name: astar-${{ matrix.os }}-latest-${{ matrix.arch }}
         path: ${{ matrix.os }}-${{ matrix.arch }}-bin
@@ -427,7 +427,7 @@ jobs:
         chain: ["astar", "shiden", "shibuya"]
     steps:
     - name: Download runtime
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v3
       with:
         name: ${{ matrix.chain }}-runtime
 
@@ -491,25 +491,25 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Download pre-built collator binary for evm tracing
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v3
       with:
         name: astar-evm-tracing-ubuntu-latest-x86_64-unknown-linux-gnu
         path: evm-tracing-artifacts
 
     - name: Download evm tracing runtime
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v3
       with:
         name: astar-evm-tracing-runtime
         path: evm-tracing-artifacts
 
     - name: Download evm tracing runtime
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v3
       with:
         name: shiden-evm-tracing-runtime
         path: evm-tracing-artifacts
-    
+
     - name: Download evm tracing runtime
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v3
       with:
         name: shibuya-evm-tracing-runtime
         path: evm-tracing-artifacts
@@ -548,7 +548,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Download pre-built collator binary
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: astar-ubuntu-latest-x86_64
           path: target/release

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -238,8 +238,6 @@ cumulus-client-consensus-common = { git = "https://github.com/paritytech/polkado
 cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.3.0" }
 cumulus-client-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.3.0" }
 cumulus-client-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.3.0" }
-cumulus-client-collator = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.3.0" }
-cumulus-client-consensus-proposer = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.3.0" }
 cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.3.0" }
 cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.3.0" }
 cumulus-relay-chain-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.3.0" }

diff --git a/bin/collator/Cargo.toml b/bin/collator/Cargo.toml
@@ -108,10 +108,8 @@ sc-cli = { workspace = true, optional = true }
 
 # cumulus dependencies
 cumulus-client-cli = { workspace = true }
-cumulus-client-collator = { workspace = true }
 cumulus-client-consensus-aura = { workspace = true }
 cumulus-client-consensus-common = { workspace = true }
-cumulus-client-consensus-proposer = { workspace = true }
 cumulus-client-consensus-relay-chain = { workspace = true }
 cumulus-client-network = { workspace = true }
 cumulus-client-service = { workspace = true }

diff --git a/bin/collator/src/command.rs b/bin/collator/src/command.rs
@@ -220,7 +220,7 @@ pub fn run() -> Result<()> {
                         ..
                     } = parachain::new_partial::<shiden::RuntimeApi, shiden::Executor, _>(
                         &config,
-                        parachain::build_import_queue_fallback,
+                        parachain::build_import_queue,
                     )?;
                     Ok((cmd.run(client, import_queue), task_manager))
                 })
@@ -261,7 +261,7 @@ pub fn run() -> Result<()> {
                         ..
                     } = parachain::new_partial::<shiden::RuntimeApi, shiden::Executor, _>(
                         &config,
-                        parachain::build_import_queue_fallback,
+                        parachain::build_import_queue,
                     )?;
                     Ok((cmd.run(client, config.database), task_manager))
                 })
@@ -301,7 +301,7 @@ pub fn run() -> Result<()> {
                         ..
                     } = parachain::new_partial::<shiden::RuntimeApi, shiden::Executor, _>(
                         &config,
-                        parachain::build_import_queue_fallback,
+                        parachain::build_import_queue,
                     )?;
                     Ok((cmd.run(client, config.chain_spec), task_manager))
                 })
@@ -343,7 +343,7 @@ pub fn run() -> Result<()> {
                         ..
                     } = parachain::new_partial::<shiden::RuntimeApi, shiden::Executor, _>(
                         &config,
-                        parachain::build_import_queue_fallback,
+                        parachain::build_import_queue,
                     )?;
                     Ok((cmd.run(client, import_queue), task_manager))
                 })
@@ -409,7 +409,7 @@ pub fn run() -> Result<()> {
                         ..
                     } = parachain::new_partial::<shiden::RuntimeApi, shiden::Executor, _>(
                         &config,
-                        parachain::build_import_queue_fallback,
+                        parachain::build_import_queue,
                     )?;
                     let aux_revert = Box::new(|client, _, blocks| {
                         sc_consensus_grandpa::revert(client, blocks)?;
@@ -452,7 +452,7 @@ pub fn run() -> Result<()> {
                     let PartialComponents { client, .. } =
                         parachain::new_partial::<shiden::RuntimeApi, shiden::Executor, _>(
                             &config,
-                            parachain::build_import_queue_fallback,
+                            parachain::build_import_queue,
                         )?;
                     cmd.run(config.chain_spec.as_ref(), client.as_ref())
                 })
@@ -522,7 +522,7 @@ pub fn run() -> Result<()> {
                             let params =
                                 parachain::new_partial::<shiden::RuntimeApi, shiden::Executor, _>(
                                     &config,
-                                    parachain::build_import_queue_fallback,
+                                    parachain::build_import_queue,
                                 )?;
                             cmd.run(params.client)
                         })
@@ -562,7 +562,7 @@ pub fn run() -> Result<()> {
                             let params =
                                 parachain::new_partial::<shiden::RuntimeApi, shiden::Executor, _>(
                                     &config,
-                                    parachain::build_import_queue_fallback,
+                                    parachain::build_import_queue,
                                 )?;
                             let db = params.backend.expose_db();
                             let storage = params.backend.expose_storage();
@@ -618,7 +618,7 @@ pub fn run() -> Result<()> {
                             let params =
                                 parachain::new_partial::<shiden::RuntimeApi, shiden::Executor, _>(
                                     &config,
-                                    parachain::build_import_queue_fallback,
+                                    parachain::build_import_queue,
                                 )?;
 
                             let ext_builder = RemarkBuilder::new(params.client.clone());
@@ -700,7 +700,7 @@ pub fn run() -> Result<()> {
                             let params =
                                 parachain::new_partial::<shiden::RuntimeApi, shiden::Executor, _>(
                                     &config,
-                                    parachain::build_import_queue_fallback,
+                                    parachain::build_import_queue,
                                 )?;
                             let remark_builder = RemarkBuilder::new(params.client.clone());
                             let tka_builder = TransferKeepAliveBuilder::new(
@@ -788,8 +788,14 @@ pub fn run() -> Result<()> {
             };
 
             runner.run_node_until_exit(|config| async move {
+                #[cfg(feature = "evm-tracing")]
+                if config.chain_spec.is_dev() {
+                    return local::start_node(config, evm_tracing_config).map_err(Into::into);
+                }
+
+                #[cfg(not(feature = "evm-tracing"))]
                 if config.chain_spec.is_dev() {
-                    return local::start_node(config, #[cfg(feature = "evm-tracing")] evm_tracing_config).map_err(Into::into);
+                    return local::start_node(config).map_err(Into::into);
                 }
 
                 let polkadot_cli = RelayChainCli::new(