From 7e891a0156eea4e52c74d27fb6f9570f969cac83 Mon Sep 17 00:00:00 2001 From: Rodrigo Quelhas Date: Wed, 11 Jun 2025 13:27:33 +0100 Subject: [PATCH 1/6] Revert "temporarily disable lazy-loading tests (#3219)" This reverts commit af375e850f2d9a99dd0cfabe4f239b45bc35ba03. --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d74d8b67ae..42fff83d48 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -690,7 +690,6 @@ jobs: labels: bare-metal permissions: contents: read - if: false # Temporarily disabled needs: ["set-tags", "build"] strategy: fail-fast: false From c04e8386895d54ff6a06c582552181e922f94f1f Mon Sep 17 00:00:00 2001 From: Rodrigo Quelhas Date: Wed, 11 Jun 2025 15:09:27 +0100 Subject: [PATCH 2/6] fix(lazy-loading): fix condition in storage key iterator --- node/service/src/lazy_loading/backend.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node/service/src/lazy_loading/backend.rs b/node/service/src/lazy_loading/backend.rs index b08479a2c6..48d5c788d1 100644 --- a/node/service/src/lazy_loading/backend.rs +++ b/node/service/src/lazy_loading/backend.rs @@ -1100,7 +1100,7 @@ impl sp_state_machine::Backend Some(key), + Ok(Some(next_key)) if key != next_key => Some(next_key), _ if !self.removed_keys.read().contains_key(key) => { remote_fetch(Some(self.fork_block)) } From 8d3ee7427020b3df7c44dfdab349995d39765aa5 Mon Sep 17 00:00:00 2001 From: Rodrigo Quelhas Date: Wed, 11 Jun 2025 15:14:46 +0100 Subject: [PATCH 3/6] fix --- node/service/src/lazy_loading/backend.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/node/service/src/lazy_loading/backend.rs b/node/service/src/lazy_loading/backend.rs index 48d5c788d1..a99e8893b9 100644 --- a/node/service/src/lazy_loading/backend.rs +++ b/node/service/src/lazy_loading/backend.rs @@ -1100,7 +1100,13 @@ impl sp_state_machine::Backend Some(next_key), + Ok(Some(next_key)) => { + if key != next_key { + Some(next_key) + } else { + None + } + } _ if !self.removed_keys.read().contains_key(key) => { remote_fetch(Some(self.fork_block)) } From f5141619b2392f449ea4e9e956dd52aca9c7ec02 Mon Sep 17 00:00:00 2001 From: Rodrigo Quelhas Date: Wed, 11 Jun 2025 15:46:23 +0100 Subject: [PATCH 4/6] improve code --- node/service/src/lazy_loading/backend.rs | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/node/service/src/lazy_loading/backend.rs b/node/service/src/lazy_loading/backend.rs index a99e8893b9..d4b2727ca0 100644 --- a/node/service/src/lazy_loading/backend.rs +++ b/node/service/src/lazy_loading/backend.rs @@ -1096,23 +1096,22 @@ impl sp_state_machine::Backend { - if key != next_key { - Some(next_key) - } else { - None - } - } + Ok(Some(next_key)) => Some(next_key), + // If not found locally and key is not marked as removed, fetch remotely _ if !self.removed_keys.read().contains_key(key) => { remote_fetch(Some(self.fork_block)) } + // Otherwise, there's no next key _ => None, } - }; + } + .filter(|next_key| next_key != key); log::trace!( target: super::LAZY_LOADING_LOG_TARGET, From bd9e9a1af8b4ba4e287bf776d5e79ede893ae058 Mon Sep 17 00:00:00 2001 From: Rodrigo Quelhas Date: Wed, 11 Jun 2025 16:57:55 +0100 Subject: [PATCH 5/6] remove upgrade restriction signal --- node/service/src/lazy_loading/mod.rs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/node/service/src/lazy_loading/mod.rs b/node/service/src/lazy_loading/mod.rs index 907fe3ca18..57fd1029ed 100644 --- a/node/service/src/lazy_loading/mod.rs +++ b/node/service/src/lazy_loading/mod.rs @@ -33,7 +33,6 @@ use nimbus_primitives::NimbusId; use parity_scale_codec::Encode; use polkadot_primitives::{ AbridgedHostConfiguration, AsyncBackingParams, PersistedValidationData, Slot, UpgradeGoAhead, - UpgradeRestriction, }; use sc_chain_spec::{get_extension, BuildGenesisBlock, GenesisBlockBuilder}; use sc_client_api::{Backend, BadBlocks, ExecutorProvider, ForkBlocks}; @@ -643,12 +642,6 @@ where relay_chain::well_known_keys::CURRENT_SLOT.to_vec(), Slot::from(u64::from(current_para_block)).encode(), ), - ( - relay_chain::well_known_keys::upgrade_restriction_signal( - ParaId::new(parachain_id), - ), - None::.encode(), - ), ]; let current_para_head = client_for_xcm From 43d946eb3ef2754e8c0633981dbbec1c8a092460 Mon Sep 17 00:00:00 2001 From: Rodrigo Quelhas Date: Wed, 11 Jun 2025 17:02:02 +0100 Subject: [PATCH 6/6] set enable_import_proof_recording to true --- node/service/src/lazy_loading/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node/service/src/lazy_loading/mod.rs b/node/service/src/lazy_loading/mod.rs index 57fd1029ed..f7af4fa609 100644 --- a/node/service/src/lazy_loading/mod.rs +++ b/node/service/src/lazy_loading/mod.rs @@ -207,7 +207,7 @@ where SyncMode::LightState { .. } | SyncMode::Warp { .. } ), wasm_runtime_substitutes, - enable_import_proof_recording: false, + enable_import_proof_recording: true, }, )?;