Skip to content

Fix block import error for EVM node client #2274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 24, 2023
Merged

Fix block import error for EVM node client #2274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c3fbbdc
feat: sync stop because of frontier block import
wangminqi Nov 22, 2023
b580647
feat: change workflow for docker log
wangminqi Nov 23, 2023
79e4a1f
debug: fmt
wangminqi Nov 23, 2023
9b47abb
debug: docker name
wangminqi Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .github/workflows/simulate-runtime-upgrade.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,20 @@ jobs:
timeout-minutes: 10
run: |
./scripts/runtime-upgrade.sh ${{ matrix.chain }}-parachain-runtime.compact.compressed.wasm ${{ env.RELEASE_TAG }}

- name: Collect docker logs if test fails
continue-on-error: true
uses: jwalton/gh-docker-logs@v2
if: failure()
with:
tail: all
dest: docker-logs

- name: Upload docker logs if test fails
uses: actions/upload-artifact@v3
if: failure()
with:
name: ${{ matrix.chain }}-docker-logs
path: docker-logs
if-no-files-found: ignore
retention-days: 3
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
.cargo/config

**/node_modules/
**/ts-tests/.yarn

docker/generated-*/
tee-worker/docker/litentry/
Expand Down
18 changes: 2 additions & 16 deletions node/src/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ use cumulus_primitives_parachain_inherent::{
use cumulus_relay_chain_inprocess_interface::build_inprocess_relay_chain;
use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface, RelayChainResult};
use cumulus_relay_chain_minimal_node::build_minimal_relay_chain_node;
use fc_consensus::FrontierBlockImport;
use fc_rpc::{EthBlockDataCacheTask, OverrideHandle};
use fc_rpc_core::types::{FeeHistoryCache, FilterPool};
use futures::StreamExt;
Expand Down Expand Up @@ -162,15 +161,8 @@ pub mod __ {
TParachainBlockImport<Block, Arc<ParachainClient<RuntimeApi>>, ParachainBackend>;

#[evm]
type ParachainBlockImport<RuntimeApi, Executor> = TParachainBlockImport<
Block,
FrontierBlockImport<
Block,
Arc<ParachainClient<RuntimeApi, Executor>>,
ParachainClient<RuntimeApi, Executor>,
>,
ParachainBackend,
>;
type ParachainBlockImport<RuntimeApi, Executor> =
TParachainBlockImport<Block, Arc<ParachainClient<RuntimeApi, Executor>>, ParachainBackend>;

#[no_evm]
/// Starts a `ServiceBuilder` for a full service.
Expand Down Expand Up @@ -329,13 +321,7 @@ pub mod __ {

#[evm]
let frontier_backend = rpc_evm::open_frontier_backend(client.clone(), config)?;
#[evm]
let frontier_block_import = FrontierBlockImport::new(client.clone(), client.clone());

#[evm]
let block_import = ParachainBlockImport::new(frontier_block_import, backend.clone());

#[no_evm]
let block_import = ParachainBlockImport::new(client.clone(), backend.clone());

let import_queue = build_import_queue(
Expand Down