From 6fcd2a4f05edb5f0efbfc9b4a5bed6734092dfd2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Aug 2023 15:39:34 +0000 Subject: [PATCH 1/5] chore(deps): bump chevdor/srtool-actions from 0.7.0 to 0.8.0 Bumps [chevdor/srtool-actions](https://github.com/chevdor/srtool-actions) from 0.7.0 to 0.8.0. - [Release notes](https://github.com/chevdor/srtool-actions/releases) - [Commits](https://github.com/chevdor/srtool-actions/compare/v0.7.0...v0.8.0) --- updated-dependencies: - dependency-name: chevdor/srtool-actions dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/draft-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index dd851ba8eb..b19b02b660 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -18,7 +18,7 @@ jobs: - name: Build ${{ matrix.runtime }} runtime id: srtool_build - uses: chevdor/srtool-actions@v0.7.0 + uses: chevdor/srtool-actions@v0.8.0 with: image: docker.io/interlayhq/srtool tag: nightly-2022-12-15 From d906dad1f7481f76bdda8cfcd7e09b68b563c86e Mon Sep 17 00:00:00 2001 From: Gregory Hill Date: Thu, 31 Aug 2023 15:45:13 +0100 Subject: [PATCH 2/5] fix: launch period should be seconds Signed-off-by: Gregory Hill --- parachain/runtime/interlay/src/lib.rs | 2 +- parachain/runtime/kintsugi/src/lib.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/parachain/runtime/interlay/src/lib.rs b/parachain/runtime/interlay/src/lib.rs index ef53390eca..fa56788ad2 100644 --- a/parachain/runtime/interlay/src/lib.rs +++ b/parachain/runtime/interlay/src/lib.rs @@ -496,7 +496,7 @@ type EnsureRootOrAllTechnicalCommittee = EitherOfDiverse< >; parameter_types! { - pub const LaunchPeriod: u64 = 1000 * 60 * 60 * 24 * 7; // one week + pub const LaunchPeriod: u64 = 60 * 60 * 24 * 7; // one week (seconds) pub const VotingPeriod: BlockNumber = 7 * DAYS; pub const FastTrackVotingPeriod: BlockNumber = 3 * HOURS; // Require 250 vINTR to make a proposal. Given the crowdloan airdrop, this qualifies about 7500 diff --git a/parachain/runtime/kintsugi/src/lib.rs b/parachain/runtime/kintsugi/src/lib.rs index e283de4d0c..e333f77425 100644 --- a/parachain/runtime/kintsugi/src/lib.rs +++ b/parachain/runtime/kintsugi/src/lib.rs @@ -496,7 +496,7 @@ type EnsureRootOrAllTechnicalCommittee = EitherOfDiverse< >; parameter_types! { - pub const LaunchPeriod: u64 = 1000 * 60 * 60 * 24 * 7; // one week + pub const LaunchPeriod: u64 = 60 * 60 * 24 * 7; // one week (seconds) pub const VotingPeriod: BlockNumber = 2 * DAYS; pub const FastTrackVotingPeriod: BlockNumber = 3 * HOURS; // Require 5 vKINT to make a proposal. Given the crowdloan airdrop, this qualifies about 3500 From a261c3fc4e5a52f06209514ddc2162144e9d07f5 Mon Sep 17 00:00:00 2001 From: Gregory Hill Date: Thu, 31 Aug 2023 16:02:45 +0100 Subject: [PATCH 3/5] chore: bump spec_version to 1.25.2 Signed-off-by: Gregory Hill --- parachain/runtime/interlay/src/lib.rs | 2 +- parachain/runtime/kintsugi/src/lib.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/parachain/runtime/interlay/src/lib.rs b/parachain/runtime/interlay/src/lib.rs index fa56788ad2..ab935702a2 100644 --- a/parachain/runtime/interlay/src/lib.rs +++ b/parachain/runtime/interlay/src/lib.rs @@ -112,7 +112,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("interlay-parachain"), impl_name: create_runtime_str!("interlay-parachain"), authoring_version: 1, - spec_version: 1025001, + spec_version: 1025002, impl_version: 1, transaction_version: 4, apis: RUNTIME_API_VERSIONS, diff --git a/parachain/runtime/kintsugi/src/lib.rs b/parachain/runtime/kintsugi/src/lib.rs index e333f77425..44761fc66c 100644 --- a/parachain/runtime/kintsugi/src/lib.rs +++ b/parachain/runtime/kintsugi/src/lib.rs @@ -113,7 +113,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("kintsugi-parachain"), impl_name: create_runtime_str!("kintsugi-parachain"), authoring_version: 1, - spec_version: 1025001, + spec_version: 1025002, impl_version: 1, transaction_version: 4, apis: RUNTIME_API_VERSIONS, From 575c3959b08dabcebe8f474bada1e62a91d6f10d Mon Sep 17 00:00:00 2001 From: Sander Bosma Date: Fri, 1 Sep 2023 15:46:22 +0200 Subject: [PATCH 4/5] fix: only construct one block import --- parachain/src/service.rs | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/parachain/src/service.rs b/parachain/src/service.rs index 1b02e504f9..b9ada299ea 100644 --- a/parachain/src/service.rs +++ b/parachain/src/service.rs @@ -235,6 +235,7 @@ pub fn new_partial( sc_consensus::DefaultImportQueue>, sc_transaction_pool::FullPool>, ( + ParachainBlockImport, Option, Option, FrontierBackend, @@ -310,6 +311,8 @@ where let overrides = interbtc_rpc::overrides_handle(client.clone()); let frontier_backend = open_frontier_backend(client.clone(), config, eth_config, overrides.clone())?; + let parachain_block_import = ParachainBlockImport::new(client.clone(), backend.clone()); + let import_queue = if instant_seal { // instant sealing sc_consensus_manual_seal::import_queue( @@ -322,7 +325,7 @@ where cumulus_client_consensus_aura::import_queue::( cumulus_client_consensus_aura::ImportQueueParams { - block_import: ParachainBlockImport::new(client.clone(), backend.clone()), + block_import: parachain_block_import.clone(), client: client.clone(), create_inherent_data_providers: move |_parent: sp_core::H256, _| async move { let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); @@ -349,7 +352,13 @@ where task_manager, transaction_pool, select_chain, - other: (telemetry, telemetry_worker_handle, frontier_backend, overrides), + other: ( + parachain_block_import, + telemetry, + telemetry_worker_handle, + frontier_backend, + overrides, + ), }; Ok(params) @@ -409,7 +418,7 @@ where let mut parachain_config = prepare_node_config(parachain_config); let params = new_partial(¶chain_config, ð_config, false)?; - let (mut telemetry, telemetry_worker_handle, frontier_backend, overrides) = params.other; + let (parachain_block_import, mut telemetry, telemetry_worker_handle, frontier_backend, overrides) = params.other; let client = params.client.clone(); let backend = params.backend.clone(); @@ -541,7 +550,7 @@ where if validator { let parachain_consensus = build_consensus( client.clone(), - ParachainBlockImport::new(client.clone(), backend.clone()), + parachain_block_import, prometheus_registry.as_ref(), telemetry.as_ref().map(|t| t.handle()), &task_manager, @@ -705,7 +714,7 @@ where keystore_container, select_chain: maybe_select_chain, transaction_pool, - other: (mut telemetry, _telemetry_worker_handle, frontier_backend, overrides), + other: (_, mut telemetry, _telemetry_worker_handle, frontier_backend, overrides), } = new_partial::(&config, ð_config, true)?; let (network, system_rpc_tx, tx_handler_controller, network_starter, sync_service) = From e137ad4c8030fa9b93058e0d26d665c799c5126c Mon Sep 17 00:00:00 2001 From: ns212 Date: Fri, 1 Sep 2023 14:29:32 +0000 Subject: [PATCH 5/5] chore: fix srtool github action --- .github/workflows/draft-release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index b19b02b660..4006d38552 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -25,6 +25,7 @@ jobs: package: ${{ matrix.runtime }}-runtime-parachain runtime_dir: ./parachain/runtime/${{ matrix.runtime }} chain: ${{ matrix.runtime }} + workdir: ${{ github.workspace }} - name: Store srtool digest to disk run: | echo '${{ steps.srtool_build.outputs.json }}' | jq > ${{ matrix.runtime }}_srtool_output.json