change mmr proof generation back to leaf numbers

Lederstrumpf · Dec 7, 2022 · 72cdcad · 72cdcad
1 parent b0e994c
commit 72cdcad
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/frame/merkle-mountain-range/rpc/src/lib.rs b/frame/merkle-mountain-range/rpc/src/lib.rs
@@ -108,7 +108,7 @@ pub trait MmrApi<BlockHash, BlockNumber> {
 	#[method(name = "mmr_generateProof")]
 	fn generate_proof(
 		&self,
-		block_number: BlockNumber,
+		leaf_index: sp_mmr_primitives::LeafIndex,
 		at: Option<BlockHash>,
 	) -> RpcResult<LeafProof<BlockHash>>;
 
@@ -179,7 +179,7 @@ where
 {
 	fn generate_proof(
 		&self,
-		block_number: NumberFor<Block>,
+		leaf_index: sp_mmr_primitives::LeafIndex,
 		at: Option<<Block as BlockT>::Hash>,
 	) -> RpcResult<LeafProof<Block::Hash>> {
 		let api = self.client.runtime_api();
@@ -189,7 +189,7 @@ where
 			.generate_proof_with_context(
 				&BlockId::hash(block_hash),
 				sp_core::ExecutionContext::OffchainCall(None),
-				block_number,
+				leaf_index,
 			)
 			.map_err(runtime_error_into_rpc_error)?
 			.map_err(mmr_error_into_rpc_error)?;

diff --git a/primitives/merkle-mountain-range/src/lib.rs b/primitives/merkle-mountain-range/src/lib.rs
@@ -438,7 +438,7 @@ sp_api::decl_runtime_apis! {
 	/// API to interact with MMR pallet.
 	pub trait MmrApi<Hash: codec::Codec, BlockNumber: codec::Codec> {
 		/// Generate MMR proof for a block with a specified `block_number`.
-		fn generate_proof(block_number: BlockNumber) -> Result<(EncodableOpaqueLeaf, Proof<Hash>), Error>;
+		fn generate_proof(leaf_index: LeafIndex) -> Result<(EncodableOpaqueLeaf, Proof<Hash>), Error>;
 
 		/// Verify MMR proof against on-chain MMR.
 		///