Move merkle impl to core

yrong · Oct 14, 2024 · 0905c41 · 0905c41
1 parent d5cadfa
commit 0905c41
Show file tree

Hide file tree

Showing 13 changed files with 6 additions and 71 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -54,7 +54,6 @@ members = [
 	"bridges/snowbridge/pallets/inbound-queue/fixtures",
 	"bridges/snowbridge/pallets/outbound-queue",
 	"bridges/snowbridge/pallets/outbound-queue-v2",
-	"bridges/snowbridge/pallets/outbound-queue-v2/merkle-tree",
 	"bridges/snowbridge/pallets/outbound-queue-v2/runtime-api",
 	"bridges/snowbridge/pallets/outbound-queue/merkle-tree",
 	"bridges/snowbridge/pallets/outbound-queue/runtime-api",
@@ -1208,7 +1207,6 @@ snowbridge-beacon-primitives = { path = "bridges/snowbridge/primitives/beacon",
 snowbridge-core = { path = "bridges/snowbridge/primitives/core", default-features = false }
 snowbridge-ethereum = { path = "bridges/snowbridge/primitives/ethereum", default-features = false }
 snowbridge-outbound-queue-merkle-tree = { path = "bridges/snowbridge/pallets/outbound-queue/merkle-tree", default-features = false }
-snowbridge-outbound-queue-merkle-tree-v2 = { path = "bridges/snowbridge/pallets/outbound-queue-v2/merkle-tree", default-features = false }
 snowbridge-outbound-queue-runtime-api = { path = "bridges/snowbridge/pallets/outbound-queue/runtime-api", default-features = false }
 snowbridge-outbound-queue-runtime-api-v2 = { path = "bridges/snowbridge/pallets/outbound-queue-v2/runtime-api", default-features = false }
 snowbridge-pallet-ethereum-client = { path = "bridges/snowbridge/pallets/ethereum-client", default-features = false }

diff --git a/bridges/snowbridge/pallets/outbound-queue-v2/Cargo.toml b/bridges/snowbridge/pallets/outbound-queue-v2/Cargo.toml
@@ -33,7 +33,6 @@ sp-arithmetic = { workspace = true }
 bridge-hub-common = { workspace = true }
 
 snowbridge-core = { features = ["serde"], workspace = true }
-snowbridge-outbound-queue-merkle-tree-v2 = { workspace = true }
 ethabi = { workspace = true }
 hex-literal = { workspace = true, default-features = true }
 
@@ -56,7 +55,6 @@ std = [
 	"scale-info/std",
 	"serde/std",
 	"snowbridge-core/std",
-	"snowbridge-outbound-queue-merkle-tree-v2/std",
 	"sp-arithmetic/std",
 	"sp-core/std",
 	"sp-io/std",

diff --git a/bridges/snowbridge/pallets/outbound-queue-v2/merkle-tree/Cargo.toml b/bridges/snowbridge/pallets/outbound-queue-v2/merkle-tree/Cargo.toml
diff --git a/bridges/snowbridge/pallets/outbound-queue-v2/merkle-tree/README.md b/bridges/snowbridge/pallets/outbound-queue-v2/merkle-tree/README.md
diff --git a/bridges/snowbridge/pallets/outbound-queue-v2/runtime-api/Cargo.toml b/bridges/snowbridge/pallets/outbound-queue-v2/runtime-api/Cargo.toml
@@ -19,7 +19,6 @@ codec = { features = ["derive"], workspace = true }
 sp-std = { workspace = true }
 sp-api = { workspace = true }
 frame-support = { workspace = true }
-snowbridge-outbound-queue-merkle-tree-v2 = { workspace = true }
 snowbridge-core = { workspace = true }
 
 [features]
@@ -28,7 +27,6 @@ std = [
 	"codec/std",
 	"frame-support/std",
 	"snowbridge-core/std",
-	"snowbridge-outbound-queue-merkle-tree-v2/std",
 	"sp-api/std",
 	"sp-std/std",
 ]
diff --git a/bridges/snowbridge/pallets/outbound-queue-v2/runtime-api/src/lib.rs b/bridges/snowbridge/pallets/outbound-queue-v2/runtime-api/src/lib.rs
@@ -3,7 +3,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use frame_support::traits::tokens::Balance as BalanceT;
-use snowbridge_outbound_queue_merkle_tree_v2::MerkleProof;
+use snowbridge_core::merkle::MerkleProof;
 
 sp_api::decl_runtime_apis! {
 	pub trait OutboundQueueApiV2<Balance> where Balance: BalanceT

diff --git a/bridges/snowbridge/pallets/outbound-queue-v2/src/api.rs b/bridges/snowbridge/pallets/outbound-queue-v2/src/api.rs
@@ -4,7 +4,7 @@
 
 use crate::{Config, MessageLeaves};
 use frame_support::storage::StorageStreamIter;
-use snowbridge_outbound_queue_merkle_tree_v2::{merkle_proof, MerkleProof};
+use snowbridge_core::merkle::{merkle_proof, MerkleProof};
 
 pub fn prove_message<T>(leaf_index: u64) -> Option<MerkleProof>
 where

diff --git a/bridges/snowbridge/pallets/outbound-queue-v2/src/lib.rs b/bridges/snowbridge/pallets/outbound-queue-v2/src/lib.rs
@@ -114,11 +114,10 @@ use frame_support::{
 };
 use snowbridge_core::{
 	inbound::Message as DeliveryMessage,
+	merkle::merkle_root,
 	outbound_v2::{CommandWrapper, Fee, GasMeter, Message},
 	BasicOperatingMode,
 };
-use snowbridge_outbound_queue_merkle_tree_v2::merkle_root;
-pub use snowbridge_outbound_queue_merkle_tree_v2::MerkleProof;
 use sp_core::H256;
 use sp_runtime::{traits::Hash, ArithmeticError, DigestItem};
 use sp_std::prelude::*;

diff --git a/bridges/snowbridge/pallets/outbound-queue-v2/src/types.rs b/bridges/snowbridge/pallets/outbound-queue-v2/src/types.rs
@@ -10,8 +10,8 @@ use sp_std::prelude::*;
 
 use super::Pallet;
 
+pub use snowbridge_core::merkle::MerkleProof;
 use snowbridge_core::outbound_v2::CommandWrapper;
-pub use snowbridge_outbound_queue_merkle_tree_v2::MerkleProof;
 
 pub type ProcessMessageOriginOf<T> = <Pallet<T> as ProcessMessage>::Origin;
 

diff --git a/bridges/snowbridge/primitives/core/src/lib.rs b/bridges/snowbridge/primitives/core/src/lib.rs
@@ -10,6 +10,7 @@ mod tests;
 
 pub mod inbound;
 pub mod location;
+pub mod merkle;
 pub mod operating_mode;
 pub mod outbound;
 pub mod outbound_v2;

diff --git a/.../outbound-queue-v2/merkle-tree/src/lib.rs → .../snowbridge/primitives/core/src/merkle.rs b/.../outbound-queue-v2/merkle-tree/src/lib.rs → .../snowbridge/primitives/core/src/merkle.rs
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs
@@ -896,7 +896,7 @@ impl_runtime_apis! {
 	}
 
 	impl snowbridge_outbound_queue_runtime_api_v2::OutboundQueueApiV2<Block, Balance> for Runtime {
-		fn prove_message(leaf_index: u64) -> Option<snowbridge_pallet_outbound_queue_v2::MerkleProof> {
+		fn prove_message(leaf_index: u64) -> Option<snowbridge_core::merkle::MerkleProof> {
 			snowbridge_pallet_outbound_queue_v2::api::prove_message::<Runtime>(leaf_index)
 		}
 	}