Skip to content

Commit

Permalink
P 262 evm extra (#2274)
Browse files Browse the repository at this point in the history
* feat: sync stop because of frontier block import

* feat: change workflow for docker log

* debug: fmt

* debug: docker name
  • Loading branch information
wangminqi authored Nov 24, 2023
1 parent 99027b8 commit 60168a0
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 16 deletions.
17 changes: 17 additions & 0 deletions .github/workflows/simulate-runtime-upgrade.yml
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
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
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

0 comments on commit 60168a0

Please sign in to comment.