Try to prove block ranges for GRANDPA (#391)

polytope-labs · Mar 3, 2025 · 3c1a7e1 · 3c1a7e1
1 parent dccc432
commit 3c1a7e1
Show file tree

Hide file tree

Showing 26 changed files with 437 additions and 318 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -221,7 +221,7 @@ pallet-token-gateway-inspector = { path = "modules/pallets/token-gateway-inspect
 
 # merkle trees
 ethereum-triedb = { version = "0.1.1", path = "./modules/trees/ethereum", default-features = false }
-pallet-mmr = { path = "modules/pallets/mmr", default-features = false }
+pallet-mmr-tree = { path = "modules/pallets/mmr", default-features = false }
 pallet-mmr-rpc = { path = "modules/pallets/mmr/rpc", default-features = false }
 mmr-primitives = { path = "modules/pallets/mmr/primitives", default-features = false }
 pallet-mmr-runtime-api = { path = "modules/pallets/mmr/runtime-api", default-features = false }

diff --git a/evm/integration-tests/Cargo.toml b/evm/integration-tests/Cargo.toml
@@ -36,7 +36,7 @@ mmr-primitives = { workspace = true, default-features = true }
 ismp = { workspace = true, default-features = true }
 pallet-ismp = { workspace = true, default-features = true }
 pallet-ismp-host-executive = { workspace = true, default-features = true }
-pallet-mmr = { workspace = true, default-features = true }
+pallet-mmr-tree = { workspace = true, default-features = true }
 beefy-prover = { workspace = true, default-features = true, features = [
     "local",
 ] }

diff --git a/evm/integration-tests/src/lib.rs b/evm/integration-tests/src/lib.rs
@@ -6,7 +6,7 @@
 pub use ethers::{abi::Token, types::U256, utils::keccak256};
 use merkle_mountain_range::{util::MemMMR, Error, Merge};
 use pallet_ismp::offchain::Leaf;
-use pallet_mmr::mmr::Hasher;
+use pallet_mmr_tree::mmr::Hasher;
 use polkadot_sdk::*;
 use primitive_types::H256;
 use sp_runtime::traits;

diff --git a/modules/consensus/grandpa/primitives/src/justification.rs b/modules/consensus/grandpa/primitives/src/justification.rs
@@ -25,7 +25,7 @@ use sp_consensus_grandpa::{
 	AuthorityId, AuthorityList, AuthoritySignature, ConsensusLog, Equivocation, RoundNumber,
 	ScheduledChange, SetId, GRANDPA_ENGINE_ID,
 };
-use sp_runtime::{generic::OpaqueDigestItemId, traits::Header as HeaderT, RuntimeAppPublic};
+use sp_runtime::{generic::OpaqueDigestItemId, traits::Header as HeaderT};
 use sp_std::prelude::*;
 
 /// A GRANDPA justification for block finality, it includes a commit message and

diff --git a/modules/consensus/grandpa/primitives/src/lib.rs b/modules/consensus/grandpa/primitives/src/lib.rs
@@ -45,6 +45,13 @@ pub type Commit<H> = finality_grandpa::Commit<
 	AuthorityId,
 >;
 
+/// The default header type that can be used with the GRANDPA prover.
+///
+/// This type is compatible with our consensus implementation, using
+/// [BlakeTwo256](sp_runtime::traits::BlakeTwo256) for hashing and a 32-bit
+/// block number type.
+pub type DefaultHeader = sp_runtime::generic::Header<u32, sp_runtime::traits::BlakeTwo256>;
+
 /// Finality for block B is proved by providing:
 /// 1) the justification for the descendant block F;
 /// 2) headers sub-chain (B; F] if B != F;

diff --git a/modules/consensus/grandpa/prover/Cargo.toml b/modules/consensus/grandpa/prover/Cargo.toml
@@ -7,17 +7,18 @@ publish = false
 
 [dependencies]
 hex = { workspace = true, default-features = true }
+log = { workspace = true, default-features = true }
 anyhow = { workspace = true, default-features = true }
 serde = { workspace = true, default-features = true }
 subxt = { workspace = true, default-features = true }
 codec = { workspace = true, default-features = true, features = ["derive"] }
 hex-literal = { workspace = true }
 derive_more = { workspace = true, default-features = true }
-downcast-rs = "1.2.0"
 finality-grandpa = "0.16.0"
 grandpa-verifier-primitives = { workspace = true, default-features = true }
 ismp = { workspace = true, default-features = true }
 subxt-utils = { workspace = true, default-features = true }
+indicatif = "0.17.11"
 
 [dependencies.polkadot-sdk]
 workspace = true