Skip to content

fix incorrect eth parent hashes on moonbase #2524

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
nbaztec merged 3 commits into from
Oct 17, 2023
Merged

fix incorrect eth parent hashes on moonbase #2524

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec4b248
fix incorrect parent hashes
nbaztec Oct 16, 2023
3d543de
apply to moonbase
nbaztec Oct 16, 2023
26ac4c4
use correct block hash
nbaztec Oct 16, 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
23 changes: 22 additions & 1 deletion node/service/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ use sp_api::{ConstructRuntimeApi, ProvideRuntimeApi};
use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
use sp_core::{ByteArray, H256};
use sp_keystore::{Keystore, KeystorePtr};
use std::str::FromStr;
use std::sync::Arc;
use std::{collections::BTreeMap, path::Path, sync::Mutex, time::Duration};
use substrate_prometheus_endpoint::Registry;
Expand Down Expand Up @@ -800,6 +801,26 @@ where

let keystore = params.keystore_container.keystore();
move |deny_unsafe, subscription_task_executor| {
#[cfg(feature = "moonbase-native")]
let forced_parent_hashes = {
let mut forced_parent_hashes = BTreeMap::new();
// Fixes for https://github.com/paritytech/frontier/pull/570
// #1648995
forced_parent_hashes.insert(
H256::from_str(
"0xa352fee3eef9c554a31ec0612af887796a920613358abf3353727760ea14207b",
)
.expect("must be valid hash"),
H256::from_str(
"0x0d0fd88778aec08b3a83ce36387dbf130f6f304fc91e9a44c9605eaf8a80ce5d",
)
.expect("must be valid hash"),
);
Some(forced_parent_hashes)
};
#[cfg(not(feature = "moonbase-native"))]
let forced_parent_hashes = None;

let deps = rpc::FullDeps {
backend: backend.clone(),
client: client.clone(),
Expand All @@ -822,7 +843,7 @@ where
xcm_senders: None,
block_data_cache: block_data_cache.clone(),
overrides: overrides.clone(),
forced_parent_hashes: None,
forced_parent_hashes,
};
let pending_consensus_data_provider = Box::new(PendingConsensusDataProvider::new(
client.clone(),
Expand Down