Skip to content

Remove deprecated code #3539

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
RomarQ merged 3 commits into from
Nov 4, 2025
Merged

Remove deprecated code #3539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d0ec48
remove deprecated code
RomarQ Nov 3, 2025
8f9dc87
fix lazy-loading
RomarQ Nov 3, 2025
38ee34a
remove unused dependency
RomarQ Nov 3, 2025
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
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion core-primitives/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ version = "0.1.1"

[dependencies]
account = { workspace = true }
hex-literal = { workspace = true }
sp-core = { workspace = true }
sp-runtime = { workspace = true }

Expand Down
9 changes: 0 additions & 9 deletions core-primitives/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,3 @@ pub type Address = AccountId;
pub type AccountIndex = u32;
/// Digest item type.
pub type DigestItem = generic::DigestItem;

pub mod well_known_relay_keys {
use hex_literal::hex;

#[deprecated]
/// Can be removed after runtime 4000
pub const TIMESTAMP_NOW: &[u8] =
&hex!["f0c365c3cf59d671eb72da0e7a4113c49f1f0515f462cdcf84e0f1d6045dfcbb"];
}
1 change: 1 addition & 0 deletions node/service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ moonbeam-runtime = { workspace = true, optional = true }
moonriver-runtime = { workspace = true, optional = true }
frame-system = { workspace = true, features = ["std"] }
pallet-balances = { workspace = true, features = ["std"] }
pallet-timestamp = { workspace = true }
pallet-transaction-payment-rpc = { workspace = true }
pallet-transaction-payment-rpc-runtime-api = { workspace = true, features = [
"std",
Expand Down
6 changes: 3 additions & 3 deletions node/service/src/lazy_loading/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,10 +604,10 @@ where
));

let additional_key_values = vec![
// TODO: TIMESTAMP_NOW can be removed after runtime 4000
(
#[allow(deprecated)]
moonbeam_core_primitives::well_known_relay_keys::TIMESTAMP_NOW
// TIMESTAMP_NOW was deprecated in runtime 4000, but should
// be kept for backwards compatibility with old runtimes
pallet_timestamp::Now::<moonbeam_runtime::Runtime>::hashed_key()
.to_vec(),
timestamp.encode(),
),
Expand Down
7 changes: 1 addition & 6 deletions node/service/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1059,12 +1059,7 @@ where
nimbus_consensus::collators::lookahead::run::<Block, _, _, _, FullBackend, _, _, _, _, _, _>(
nimbus_consensus::collators::lookahead::Params {
additional_digests_provider: maybe_provide_vrf_digest,
additional_relay_keys: vec![
// TODO: Can be removed after runtime 4000
#[allow(deprecated)]
moonbeam_core_primitives::well_known_relay_keys::TIMESTAMP_NOW.to_vec(),
relay_chain::well_known_keys::EPOCH_INDEX.to_vec(),
],
additional_relay_keys: vec![relay_chain::well_known_keys::EPOCH_INDEX.to_vec()],
authoring_duration: block_authoring_duration,
block_import,
code_hash_provider,
Expand Down
Loading