diff --git a/Cargo.toml b/Cargo.toml index a6edce3eabf87..0bd3a2898febe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,23 +37,23 @@ members = [ "primitives/test-utils", "primitives/xcm-bridge-hub", "primitives/xcm-bridge-hub-router", - "relays/bin-substrate", - "relays/client-bridge-hub-kusama", - "relays/client-bridge-hub-polkadot", - "relays/client-bridge-hub-rococo", - "relays/client-bridge-hub-westend", - "relays/client-kusama", - "relays/client-polkadot", - "relays/client-polkadot-bulletin", - "relays/client-rococo", + "relay-clients/client-bridge-hub-kusama", + "relay-clients/client-bridge-hub-polkadot", + "relay-clients/client-bridge-hub-rococo", + "relay-clients/client-bridge-hub-westend", + "relay-clients/client-kusama", + "relay-clients/client-polkadot", + "relay-clients/client-polkadot-bulletin", + "relay-clients/client-rococo", + "relay-clients/client-westend", "relays/client-substrate", - "relays/client-westend", "relays/equivocation", "relays/finality", "relays/lib-substrate-relay", "relays/messages", "relays/parachains", - "relays/utils" + "relays/utils", + "substrate-relay", ] # Setup clippy lints as `polkadot-sdk`, diff --git a/relays/client-bridge-hub-kusama/Cargo.toml b/relay-clients/client-bridge-hub-kusama/Cargo.toml similarity index 94% rename from relays/client-bridge-hub-kusama/Cargo.toml rename to relay-clients/client-bridge-hub-kusama/Cargo.toml index a02dc26a0a8d3..6ce688e9fed17 100644 --- a/relays/client-bridge-hub-kusama/Cargo.toml +++ b/relay-clients/client-bridge-hub-kusama/Cargo.toml @@ -23,7 +23,7 @@ bp-parachains = { path = "../../primitives/parachains" } bp-polkadot = { path = "../../chains/chain-polkadot" } bp-polkadot-core = { path = "../../primitives/polkadot-core" } bridge-runtime-common = { path = "../../bin/runtime-common" } -relay-substrate-client = { path = "../client-substrate" } +relay-substrate-client = { path = "../../relays/client-substrate" } # Substrate Dependencies diff --git a/relays/client-bridge-hub-kusama/src/codegen_runtime.rs b/relay-clients/client-bridge-hub-kusama/src/codegen_runtime.rs similarity index 100% rename from relays/client-bridge-hub-kusama/src/codegen_runtime.rs rename to relay-clients/client-bridge-hub-kusama/src/codegen_runtime.rs diff --git a/relays/client-bridge-hub-kusama/src/lib.rs b/relay-clients/client-bridge-hub-kusama/src/lib.rs similarity index 100% rename from relays/client-bridge-hub-kusama/src/lib.rs rename to relay-clients/client-bridge-hub-kusama/src/lib.rs diff --git a/relays/client-bridge-hub-kusama/src/runtime_wrapper.rs b/relay-clients/client-bridge-hub-kusama/src/runtime_wrapper.rs similarity index 100% rename from relays/client-bridge-hub-kusama/src/runtime_wrapper.rs rename to relay-clients/client-bridge-hub-kusama/src/runtime_wrapper.rs diff --git a/relays/client-bridge-hub-polkadot/Cargo.toml b/relay-clients/client-bridge-hub-polkadot/Cargo.toml similarity index 95% rename from relays/client-bridge-hub-polkadot/Cargo.toml rename to relay-clients/client-bridge-hub-polkadot/Cargo.toml index abfd5bae4f025..1c49636ad2747 100644 --- a/relays/client-bridge-hub-polkadot/Cargo.toml +++ b/relay-clients/client-bridge-hub-polkadot/Cargo.toml @@ -24,7 +24,7 @@ bp-polkadot-core = { path = "../../primitives/polkadot-core" } bp-kusama = { path = "../../chains/chain-kusama" } bp-runtime = { path = "../../primitives/runtime" } bridge-runtime-common = { path = "../../bin/runtime-common" } -relay-substrate-client = { path = "../client-substrate" } +relay-substrate-client = { path = "../../relays/client-substrate" } # Substrate Dependencies diff --git a/relays/client-bridge-hub-polkadot/src/codegen_runtime.rs b/relay-clients/client-bridge-hub-polkadot/src/codegen_runtime.rs similarity index 100% rename from relays/client-bridge-hub-polkadot/src/codegen_runtime.rs rename to relay-clients/client-bridge-hub-polkadot/src/codegen_runtime.rs diff --git a/relays/client-bridge-hub-polkadot/src/lib.rs b/relay-clients/client-bridge-hub-polkadot/src/lib.rs similarity index 100% rename from relays/client-bridge-hub-polkadot/src/lib.rs rename to relay-clients/client-bridge-hub-polkadot/src/lib.rs diff --git a/relays/client-bridge-hub-polkadot/src/runtime_wrapper.rs b/relay-clients/client-bridge-hub-polkadot/src/runtime_wrapper.rs similarity index 100% rename from relays/client-bridge-hub-polkadot/src/runtime_wrapper.rs rename to relay-clients/client-bridge-hub-polkadot/src/runtime_wrapper.rs diff --git a/relays/client-bridge-hub-rococo/Cargo.toml b/relay-clients/client-bridge-hub-rococo/Cargo.toml similarity index 94% rename from relays/client-bridge-hub-rococo/Cargo.toml rename to relay-clients/client-bridge-hub-rococo/Cargo.toml index 70d65ac19453c..246c7ed1d6ef6 100644 --- a/relays/client-bridge-hub-rococo/Cargo.toml +++ b/relay-clients/client-bridge-hub-rococo/Cargo.toml @@ -23,7 +23,7 @@ bp-polkadot-core = { path = "../../primitives/polkadot-core" } bp-runtime = { path = "../../primitives/runtime" } bridge-runtime-common = { path = "../../bin/runtime-common" } -relay-substrate-client = { path = "../client-substrate" } +relay-substrate-client = { path = "../../relays/client-substrate" } # Substrate Dependencies diff --git a/relays/client-bridge-hub-rococo/src/codegen_runtime.rs b/relay-clients/client-bridge-hub-rococo/src/codegen_runtime.rs similarity index 100% rename from relays/client-bridge-hub-rococo/src/codegen_runtime.rs rename to relay-clients/client-bridge-hub-rococo/src/codegen_runtime.rs diff --git a/relays/client-bridge-hub-rococo/src/lib.rs b/relay-clients/client-bridge-hub-rococo/src/lib.rs similarity index 100% rename from relays/client-bridge-hub-rococo/src/lib.rs rename to relay-clients/client-bridge-hub-rococo/src/lib.rs diff --git a/relays/client-bridge-hub-westend/Cargo.toml b/relay-clients/client-bridge-hub-westend/Cargo.toml similarity index 95% rename from relays/client-bridge-hub-westend/Cargo.toml rename to relay-clients/client-bridge-hub-westend/Cargo.toml index c65c7ec0014b8..7f5f01910cc16 100644 --- a/relays/client-bridge-hub-westend/Cargo.toml +++ b/relay-clients/client-bridge-hub-westend/Cargo.toml @@ -23,7 +23,7 @@ bp-polkadot-core = { path = "../../primitives/polkadot-core" } bp-rococo = { path = "../../chains/chain-rococo" } bridge-runtime-common = { path = "../../bin/runtime-common" } -relay-substrate-client = { path = "../client-substrate" } +relay-substrate-client = { path = "../../relays/client-substrate" } # Substrate Dependencies diff --git a/relays/client-bridge-hub-westend/src/codegen_runtime.rs b/relay-clients/client-bridge-hub-westend/src/codegen_runtime.rs similarity index 100% rename from relays/client-bridge-hub-westend/src/codegen_runtime.rs rename to relay-clients/client-bridge-hub-westend/src/codegen_runtime.rs diff --git a/relays/client-bridge-hub-westend/src/lib.rs b/relay-clients/client-bridge-hub-westend/src/lib.rs similarity index 100% rename from relays/client-bridge-hub-westend/src/lib.rs rename to relay-clients/client-bridge-hub-westend/src/lib.rs diff --git a/relays/client-kusama/Cargo.toml b/relay-clients/client-kusama/Cargo.toml similarity index 90% rename from relays/client-kusama/Cargo.toml rename to relay-clients/client-kusama/Cargo.toml index c459f347af1ed..95b3318f5d674 100644 --- a/relays/client-kusama/Cargo.toml +++ b/relay-clients/client-kusama/Cargo.toml @@ -19,8 +19,8 @@ bp-kusama = { path = "../../chains/chain-kusama" } bp-polkadot-core = { path = "../../primitives/polkadot-core" } bp-runtime = { path = "../../primitives/runtime" } -relay-substrate-client = { path = "../client-substrate" } -relay-utils = { path = "../utils" } +relay-substrate-client = { path = "../../relays/client-substrate" } +relay-utils = { path = "../../relays/utils" } # Substrate Dependencies diff --git a/relays/client-kusama/src/codegen_runtime.rs b/relay-clients/client-kusama/src/codegen_runtime.rs similarity index 100% rename from relays/client-kusama/src/codegen_runtime.rs rename to relay-clients/client-kusama/src/codegen_runtime.rs diff --git a/relays/client-kusama/src/lib.rs b/relay-clients/client-kusama/src/lib.rs similarity index 100% rename from relays/client-kusama/src/lib.rs rename to relay-clients/client-kusama/src/lib.rs diff --git a/relays/client-polkadot-bulletin/Cargo.toml b/relay-clients/client-polkadot-bulletin/Cargo.toml similarity index 92% rename from relays/client-polkadot-bulletin/Cargo.toml rename to relay-clients/client-polkadot-bulletin/Cargo.toml index 842b53c48ef25..c563c145a366d 100644 --- a/relays/client-polkadot-bulletin/Cargo.toml +++ b/relay-clients/client-polkadot-bulletin/Cargo.toml @@ -21,8 +21,8 @@ bp-polkadot-core = { path = "../../primitives/polkadot-core" } bp-polkadot-bulletin = { path = "../../chains/chain-polkadot-bulletin" } bp-runtime = { path = "../../primitives/runtime" } bridge-runtime-common = { path = "../../bin/runtime-common" } -relay-substrate-client = { path = "../client-substrate" } -relay-utils = { path = "../utils" } +relay-substrate-client = { path = "../../relays/client-substrate" } +relay-utils = { path = "../../relays/utils" } # Substrate Dependencies diff --git a/relays/client-polkadot-bulletin/src/codegen_runtime.rs b/relay-clients/client-polkadot-bulletin/src/codegen_runtime.rs similarity index 100% rename from relays/client-polkadot-bulletin/src/codegen_runtime.rs rename to relay-clients/client-polkadot-bulletin/src/codegen_runtime.rs diff --git a/relays/client-polkadot-bulletin/src/lib.rs b/relay-clients/client-polkadot-bulletin/src/lib.rs similarity index 100% rename from relays/client-polkadot-bulletin/src/lib.rs rename to relay-clients/client-polkadot-bulletin/src/lib.rs diff --git a/relays/client-polkadot/Cargo.toml b/relay-clients/client-polkadot/Cargo.toml similarity index 90% rename from relays/client-polkadot/Cargo.toml rename to relay-clients/client-polkadot/Cargo.toml index 19cf9f9335bc5..b66df4c84049a 100644 --- a/relays/client-polkadot/Cargo.toml +++ b/relay-clients/client-polkadot/Cargo.toml @@ -19,8 +19,8 @@ bp-polkadot = { path = "../../chains/chain-polkadot" } bp-polkadot-core = { path = "../../primitives/polkadot-core" } bp-runtime = { path = "../../primitives/runtime" } -relay-substrate-client = { path = "../client-substrate" } -relay-utils = { path = "../utils" } +relay-substrate-client = { path = "../../relays/client-substrate" } +relay-utils = { path = "../../relays/utils" } # Substrate Dependencies diff --git a/relays/client-polkadot/src/codegen_runtime.rs b/relay-clients/client-polkadot/src/codegen_runtime.rs similarity index 100% rename from relays/client-polkadot/src/codegen_runtime.rs rename to relay-clients/client-polkadot/src/codegen_runtime.rs diff --git a/relays/client-polkadot/src/lib.rs b/relay-clients/client-polkadot/src/lib.rs similarity index 100% rename from relays/client-polkadot/src/lib.rs rename to relay-clients/client-polkadot/src/lib.rs diff --git a/relays/client-rococo/Cargo.toml b/relay-clients/client-rococo/Cargo.toml similarity index 90% rename from relays/client-rococo/Cargo.toml rename to relay-clients/client-rococo/Cargo.toml index 5e847600f4660..7e6cbe35826c6 100644 --- a/relays/client-rococo/Cargo.toml +++ b/relay-clients/client-rococo/Cargo.toml @@ -18,8 +18,8 @@ subxt = { version = "0.32.1", default-features = false, features = ["native"] } bp-polkadot-core = { path = "../../primitives/polkadot-core" } bp-rococo = { path = "../../chains/chain-rococo" } -relay-substrate-client = { path = "../client-substrate" } -relay-utils = { path = "../utils" } +relay-substrate-client = { path = "../../relays/client-substrate" } +relay-utils = { path = "../../relays/utils" } # Substrate Dependencies diff --git a/relays/client-rococo/src/codegen_runtime.rs b/relay-clients/client-rococo/src/codegen_runtime.rs similarity index 100% rename from relays/client-rococo/src/codegen_runtime.rs rename to relay-clients/client-rococo/src/codegen_runtime.rs diff --git a/relays/client-rococo/src/lib.rs b/relay-clients/client-rococo/src/lib.rs similarity index 100% rename from relays/client-rococo/src/lib.rs rename to relay-clients/client-rococo/src/lib.rs diff --git a/relays/client-westend/Cargo.toml b/relay-clients/client-westend/Cargo.toml similarity index 90% rename from relays/client-westend/Cargo.toml rename to relay-clients/client-westend/Cargo.toml index 8b56e51d084d2..1f148a1c414b3 100644 --- a/relays/client-westend/Cargo.toml +++ b/relay-clients/client-westend/Cargo.toml @@ -19,8 +19,8 @@ bp-polkadot-core = { path = "../../primitives/polkadot-core" } bp-runtime = { path = "../../primitives/runtime" } bp-westend = { path = "../../chains/chain-westend" } -relay-substrate-client = { path = "../client-substrate" } -relay-utils = { path = "../utils" } +relay-substrate-client = { path = "../../relays/client-substrate" } +relay-utils = { path = "../../relays/utils" } # Substrate Dependencies diff --git a/relays/client-westend/src/codegen_runtime.rs b/relay-clients/client-westend/src/codegen_runtime.rs similarity index 100% rename from relays/client-westend/src/codegen_runtime.rs rename to relay-clients/client-westend/src/codegen_runtime.rs diff --git a/relays/client-westend/src/lib.rs b/relay-clients/client-westend/src/lib.rs similarity index 100% rename from relays/client-westend/src/lib.rs rename to relay-clients/client-westend/src/lib.rs diff --git a/relays/bin-substrate/Cargo.toml b/relays/bin-substrate/Cargo.toml deleted file mode 100644 index 6c0ac1da6fc58..0000000000000 --- a/relays/bin-substrate/Cargo.toml +++ /dev/null @@ -1,66 +0,0 @@ -[package] -name = "substrate-relay" -version = "1.2.0" -authors = ["Parity Technologies "] -edition = "2021" -license = "GPL-3.0-or-later WITH Classpath-exception-2.0" - -[lints] -workspace = true - -[dependencies] -anyhow = "1.0" -async-std = "1.9.0" -async-trait = "0.1.79" -codec = { package = "parity-scale-codec", version = "3.1.5" } -env_logger = "0.11" -futures = "0.3.30" -hex = "0.4" -log = { workspace = true } -num-format = "0.4" -num-traits = "0.2" -rbtag = "0.3" -structopt = "0.3" -signal-hook = "0.3.15" -signal-hook-async-std = "0.2.2" -strum = { version = "0.26.2", features = ["derive"] } - -# Bridge dependencies -bp-bridge-hub-polkadot = { path = "../../chains/chain-bridge-hub-polkadot" } -bp-bridge-hub-rococo = { path = "../../chains/chain-bridge-hub-rococo" } -bp-header-chain = { path = "../../primitives/header-chain" } -bp-messages = { path = "../../primitives/messages" } -bp-parachains = { path = "../../primitives/parachains" } -bp-polkadot-bulletin = { path = "../../chains/chain-polkadot-bulletin" } -bp-polkadot = { path = "../../chains/chain-polkadot" } -bp-polkadot-core = { path = "../../primitives/polkadot-core" } -bp-rococo = { path = "../../chains/chain-rococo" } -bp-runtime = { path = "../../primitives/runtime" } -bridge-runtime-common = { path = "../../bin/runtime-common" } -pallet-bridge-parachains = { path = "../../modules/parachains" } -parachains-relay = { path = "../parachains" } -relay-bridge-hub-kusama-client = { path = "../client-bridge-hub-kusama" } -relay-bridge-hub-polkadot-client = { path = "../client-bridge-hub-polkadot" } -relay-bridge-hub-rococo-client = { path = "../client-bridge-hub-rococo" } -relay-bridge-hub-westend-client = { path = "../client-bridge-hub-westend" } -relay-kusama-client = { path = "../client-kusama" } -relay-polkadot-client = { path = "../client-polkadot" } -relay-polkadot-bulletin-client = { path = "../client-polkadot-bulletin" } -relay-rococo-client = { path = "../client-rococo" } -relay-substrate-client = { path = "../client-substrate" } -relay-utils = { path = "../utils" } -relay-westend-client = { path = "../client-westend" } -substrate-relay-helper = { path = "../lib-substrate-relay" } - -# Substrate Dependencies - -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" } - -[dev-dependencies] -bp-test-utils = { path = "../../primitives/test-utils" } -hex-literal = "0.4" -sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" } -tempfile = "3.10" -finality-grandpa = { version = "0.16.2" } diff --git a/relays/lib-substrate-relay/Cargo.toml b/relays/lib-substrate-relay/Cargo.toml index db4c3a7f8875c..5bd14bb832008 100644 --- a/relays/lib-substrate-relay/Cargo.toml +++ b/relays/lib-substrate-relay/Cargo.toml @@ -58,6 +58,6 @@ sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "mas [dev-dependencies] bp-rococo = { path = "../../chains/chain-rococo" } pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" } -relay-bridge-hub-rococo-client = { path = "../client-bridge-hub-rococo" } -relay-bridge-hub-westend-client = { path = "../client-bridge-hub-westend" } -relay-rococo-client = { path = "../client-rococo" } +relay-bridge-hub-rococo-client = { path = "../../relay-clients/client-bridge-hub-rococo" } +relay-bridge-hub-westend-client = { path = "../../relay-clients/client-bridge-hub-westend" } +relay-rococo-client = { path = "../../relay-clients/client-rococo" } diff --git a/substrate-relay/Cargo.toml b/substrate-relay/Cargo.toml new file mode 100644 index 0000000000000..8a87186ec633b --- /dev/null +++ b/substrate-relay/Cargo.toml @@ -0,0 +1,66 @@ +[package] +name = "substrate-relay" +version = "1.2.0" +authors = ["Parity Technologies "] +edition = "2021" +license = "GPL-3.0-or-later WITH Classpath-exception-2.0" + +[lints] +workspace = true + +[dependencies] +anyhow = "1.0" +async-std = "1.9.0" +async-trait = "0.1.79" +codec = { package = "parity-scale-codec", version = "3.1.5" } +env_logger = "0.11" +futures = "0.3.30" +hex = "0.4" +log = { workspace = true } +num-format = "0.4" +num-traits = "0.2" +rbtag = "0.3" +structopt = "0.3" +signal-hook = "0.3.15" +signal-hook-async-std = "0.2.2" +strum = { version = "0.26.2", features = ["derive"] } + +# Bridge dependencies +bp-bridge-hub-polkadot = { path = "../chains/chain-bridge-hub-polkadot" } +bp-bridge-hub-rococo = { path = "../chains/chain-bridge-hub-rococo" } +bp-header-chain = { path = "../primitives/header-chain" } +bp-messages = { path = "../primitives/messages" } +bp-parachains = { path = "../primitives/parachains" } +bp-polkadot-bulletin = { path = "../chains/chain-polkadot-bulletin" } +bp-polkadot = { path = "../chains/chain-polkadot" } +bp-polkadot-core = { path = "../primitives/polkadot-core" } +bp-rococo = { path = "../chains/chain-rococo" } +bp-runtime = { path = "../primitives/runtime" } +bridge-runtime-common = { path = "../bin/runtime-common" } +pallet-bridge-parachains = { path = "../modules/parachains" } +parachains-relay = { path = "../relays/parachains" } +relay-bridge-hub-kusama-client = { path = "../relay-clients/client-bridge-hub-kusama" } +relay-bridge-hub-polkadot-client = { path = "../relay-clients/client-bridge-hub-polkadot" } +relay-bridge-hub-rococo-client = { path = "../relay-clients/client-bridge-hub-rococo" } +relay-bridge-hub-westend-client = { path = "../relay-clients/client-bridge-hub-westend" } +relay-kusama-client = { path = "../relay-clients/client-kusama" } +relay-polkadot-client = { path = "../relay-clients/client-polkadot" } +relay-polkadot-bulletin-client = { path = "../relay-clients/client-polkadot-bulletin" } +relay-rococo-client = { path = "../relay-clients/client-rococo" } +relay-substrate-client = { path = "../relays/client-substrate" } +relay-utils = { path = "../relays/utils" } +relay-westend-client = { path = "../relay-clients/client-westend" } +substrate-relay-helper = { path = "../relays/lib-substrate-relay" } + +# Substrate Dependencies + +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" } + +[dev-dependencies] +bp-test-utils = { path = "../primitives/test-utils" } +hex-literal = "0.4" +sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" } +tempfile = "3.10" +finality-grandpa = { version = "0.16.2" } diff --git a/relays/bin-substrate/src/bridges/kusama_polkadot/bridge_hub_kusama_messages_to_bridge_hub_polkadot.rs b/substrate-relay/src/bridges/kusama_polkadot/bridge_hub_kusama_messages_to_bridge_hub_polkadot.rs similarity index 100% rename from relays/bin-substrate/src/bridges/kusama_polkadot/bridge_hub_kusama_messages_to_bridge_hub_polkadot.rs rename to substrate-relay/src/bridges/kusama_polkadot/bridge_hub_kusama_messages_to_bridge_hub_polkadot.rs diff --git a/relays/bin-substrate/src/bridges/kusama_polkadot/bridge_hub_polkadot_messages_to_bridge_hub_kusama.rs b/substrate-relay/src/bridges/kusama_polkadot/bridge_hub_polkadot_messages_to_bridge_hub_kusama.rs similarity index 100% rename from relays/bin-substrate/src/bridges/kusama_polkadot/bridge_hub_polkadot_messages_to_bridge_hub_kusama.rs rename to substrate-relay/src/bridges/kusama_polkadot/bridge_hub_polkadot_messages_to_bridge_hub_kusama.rs diff --git a/relays/bin-substrate/src/bridges/kusama_polkadot/kusama_headers_to_bridge_hub_polkadot.rs b/substrate-relay/src/bridges/kusama_polkadot/kusama_headers_to_bridge_hub_polkadot.rs similarity index 100% rename from relays/bin-substrate/src/bridges/kusama_polkadot/kusama_headers_to_bridge_hub_polkadot.rs rename to substrate-relay/src/bridges/kusama_polkadot/kusama_headers_to_bridge_hub_polkadot.rs diff --git a/relays/bin-substrate/src/bridges/kusama_polkadot/kusama_parachains_to_bridge_hub_polkadot.rs b/substrate-relay/src/bridges/kusama_polkadot/kusama_parachains_to_bridge_hub_polkadot.rs similarity index 100% rename from relays/bin-substrate/src/bridges/kusama_polkadot/kusama_parachains_to_bridge_hub_polkadot.rs rename to substrate-relay/src/bridges/kusama_polkadot/kusama_parachains_to_bridge_hub_polkadot.rs diff --git a/relays/bin-substrate/src/bridges/kusama_polkadot/mod.rs b/substrate-relay/src/bridges/kusama_polkadot/mod.rs similarity index 100% rename from relays/bin-substrate/src/bridges/kusama_polkadot/mod.rs rename to substrate-relay/src/bridges/kusama_polkadot/mod.rs diff --git a/relays/bin-substrate/src/bridges/kusama_polkadot/polkadot_headers_to_bridge_hub_kusama.rs b/substrate-relay/src/bridges/kusama_polkadot/polkadot_headers_to_bridge_hub_kusama.rs similarity index 100% rename from relays/bin-substrate/src/bridges/kusama_polkadot/polkadot_headers_to_bridge_hub_kusama.rs rename to substrate-relay/src/bridges/kusama_polkadot/polkadot_headers_to_bridge_hub_kusama.rs diff --git a/relays/bin-substrate/src/bridges/kusama_polkadot/polkadot_parachains_to_bridge_hub_kusama.rs b/substrate-relay/src/bridges/kusama_polkadot/polkadot_parachains_to_bridge_hub_kusama.rs similarity index 100% rename from relays/bin-substrate/src/bridges/kusama_polkadot/polkadot_parachains_to_bridge_hub_kusama.rs rename to substrate-relay/src/bridges/kusama_polkadot/polkadot_parachains_to_bridge_hub_kusama.rs diff --git a/relays/bin-substrate/src/bridges/mod.rs b/substrate-relay/src/bridges/mod.rs similarity index 100% rename from relays/bin-substrate/src/bridges/mod.rs rename to substrate-relay/src/bridges/mod.rs diff --git a/relays/bin-substrate/src/bridges/polkadot_bulletin/bridge_hub_polkadot_messages_to_polkadot_bulletin.rs b/substrate-relay/src/bridges/polkadot_bulletin/bridge_hub_polkadot_messages_to_polkadot_bulletin.rs similarity index 100% rename from relays/bin-substrate/src/bridges/polkadot_bulletin/bridge_hub_polkadot_messages_to_polkadot_bulletin.rs rename to substrate-relay/src/bridges/polkadot_bulletin/bridge_hub_polkadot_messages_to_polkadot_bulletin.rs diff --git a/relays/bin-substrate/src/bridges/polkadot_bulletin/mod.rs b/substrate-relay/src/bridges/polkadot_bulletin/mod.rs similarity index 100% rename from relays/bin-substrate/src/bridges/polkadot_bulletin/mod.rs rename to substrate-relay/src/bridges/polkadot_bulletin/mod.rs diff --git a/relays/bin-substrate/src/bridges/polkadot_bulletin/polkadot_bulletin_headers_to_bridge_hub_polkadot.rs b/substrate-relay/src/bridges/polkadot_bulletin/polkadot_bulletin_headers_to_bridge_hub_polkadot.rs similarity index 100% rename from relays/bin-substrate/src/bridges/polkadot_bulletin/polkadot_bulletin_headers_to_bridge_hub_polkadot.rs rename to substrate-relay/src/bridges/polkadot_bulletin/polkadot_bulletin_headers_to_bridge_hub_polkadot.rs diff --git a/relays/bin-substrate/src/bridges/polkadot_bulletin/polkadot_bulletin_messages_to_bridge_hub_polkadot.rs b/substrate-relay/src/bridges/polkadot_bulletin/polkadot_bulletin_messages_to_bridge_hub_polkadot.rs similarity index 100% rename from relays/bin-substrate/src/bridges/polkadot_bulletin/polkadot_bulletin_messages_to_bridge_hub_polkadot.rs rename to substrate-relay/src/bridges/polkadot_bulletin/polkadot_bulletin_messages_to_bridge_hub_polkadot.rs diff --git a/relays/bin-substrate/src/bridges/polkadot_bulletin/polkadot_headers_to_polkadot_bulletin.rs b/substrate-relay/src/bridges/polkadot_bulletin/polkadot_headers_to_polkadot_bulletin.rs similarity index 100% rename from relays/bin-substrate/src/bridges/polkadot_bulletin/polkadot_headers_to_polkadot_bulletin.rs rename to substrate-relay/src/bridges/polkadot_bulletin/polkadot_headers_to_polkadot_bulletin.rs diff --git a/relays/bin-substrate/src/bridges/polkadot_bulletin/polkadot_parachains_to_polkadot_bulletin.rs b/substrate-relay/src/bridges/polkadot_bulletin/polkadot_parachains_to_polkadot_bulletin.rs similarity index 100% rename from relays/bin-substrate/src/bridges/polkadot_bulletin/polkadot_parachains_to_polkadot_bulletin.rs rename to substrate-relay/src/bridges/polkadot_bulletin/polkadot_parachains_to_polkadot_bulletin.rs diff --git a/relays/bin-substrate/src/bridges/rococo_bulletin/bridge_hub_rococo_messages_to_rococo_bulletin.rs b/substrate-relay/src/bridges/rococo_bulletin/bridge_hub_rococo_messages_to_rococo_bulletin.rs similarity index 100% rename from relays/bin-substrate/src/bridges/rococo_bulletin/bridge_hub_rococo_messages_to_rococo_bulletin.rs rename to substrate-relay/src/bridges/rococo_bulletin/bridge_hub_rococo_messages_to_rococo_bulletin.rs diff --git a/relays/bin-substrate/src/bridges/rococo_bulletin/mod.rs b/substrate-relay/src/bridges/rococo_bulletin/mod.rs similarity index 100% rename from relays/bin-substrate/src/bridges/rococo_bulletin/mod.rs rename to substrate-relay/src/bridges/rococo_bulletin/mod.rs diff --git a/relays/bin-substrate/src/bridges/rococo_bulletin/rococo_bulletin_headers_to_bridge_hub_rococo.rs b/substrate-relay/src/bridges/rococo_bulletin/rococo_bulletin_headers_to_bridge_hub_rococo.rs similarity index 100% rename from relays/bin-substrate/src/bridges/rococo_bulletin/rococo_bulletin_headers_to_bridge_hub_rococo.rs rename to substrate-relay/src/bridges/rococo_bulletin/rococo_bulletin_headers_to_bridge_hub_rococo.rs diff --git a/relays/bin-substrate/src/bridges/rococo_bulletin/rococo_bulletin_messages_to_bridge_hub_rococo.rs b/substrate-relay/src/bridges/rococo_bulletin/rococo_bulletin_messages_to_bridge_hub_rococo.rs similarity index 100% rename from relays/bin-substrate/src/bridges/rococo_bulletin/rococo_bulletin_messages_to_bridge_hub_rococo.rs rename to substrate-relay/src/bridges/rococo_bulletin/rococo_bulletin_messages_to_bridge_hub_rococo.rs diff --git a/relays/bin-substrate/src/bridges/rococo_bulletin/rococo_headers_to_rococo_bulletin.rs b/substrate-relay/src/bridges/rococo_bulletin/rococo_headers_to_rococo_bulletin.rs similarity index 100% rename from relays/bin-substrate/src/bridges/rococo_bulletin/rococo_headers_to_rococo_bulletin.rs rename to substrate-relay/src/bridges/rococo_bulletin/rococo_headers_to_rococo_bulletin.rs diff --git a/relays/bin-substrate/src/bridges/rococo_bulletin/rococo_parachains_to_rococo_bulletin.rs b/substrate-relay/src/bridges/rococo_bulletin/rococo_parachains_to_rococo_bulletin.rs similarity index 100% rename from relays/bin-substrate/src/bridges/rococo_bulletin/rococo_parachains_to_rococo_bulletin.rs rename to substrate-relay/src/bridges/rococo_bulletin/rococo_parachains_to_rococo_bulletin.rs diff --git a/relays/bin-substrate/src/bridges/rococo_westend/bridge_hub_rococo_messages_to_bridge_hub_westend.rs b/substrate-relay/src/bridges/rococo_westend/bridge_hub_rococo_messages_to_bridge_hub_westend.rs similarity index 100% rename from relays/bin-substrate/src/bridges/rococo_westend/bridge_hub_rococo_messages_to_bridge_hub_westend.rs rename to substrate-relay/src/bridges/rococo_westend/bridge_hub_rococo_messages_to_bridge_hub_westend.rs diff --git a/relays/bin-substrate/src/bridges/rococo_westend/bridge_hub_westend_messages_to_bridge_hub_rococo.rs b/substrate-relay/src/bridges/rococo_westend/bridge_hub_westend_messages_to_bridge_hub_rococo.rs similarity index 100% rename from relays/bin-substrate/src/bridges/rococo_westend/bridge_hub_westend_messages_to_bridge_hub_rococo.rs rename to substrate-relay/src/bridges/rococo_westend/bridge_hub_westend_messages_to_bridge_hub_rococo.rs diff --git a/relays/bin-substrate/src/bridges/rococo_westend/mod.rs b/substrate-relay/src/bridges/rococo_westend/mod.rs similarity index 100% rename from relays/bin-substrate/src/bridges/rococo_westend/mod.rs rename to substrate-relay/src/bridges/rococo_westend/mod.rs diff --git a/relays/bin-substrate/src/bridges/rococo_westend/rococo_headers_to_bridge_hub_westend.rs b/substrate-relay/src/bridges/rococo_westend/rococo_headers_to_bridge_hub_westend.rs similarity index 100% rename from relays/bin-substrate/src/bridges/rococo_westend/rococo_headers_to_bridge_hub_westend.rs rename to substrate-relay/src/bridges/rococo_westend/rococo_headers_to_bridge_hub_westend.rs diff --git a/relays/bin-substrate/src/bridges/rococo_westend/rococo_parachains_to_bridge_hub_westend.rs b/substrate-relay/src/bridges/rococo_westend/rococo_parachains_to_bridge_hub_westend.rs similarity index 100% rename from relays/bin-substrate/src/bridges/rococo_westend/rococo_parachains_to_bridge_hub_westend.rs rename to substrate-relay/src/bridges/rococo_westend/rococo_parachains_to_bridge_hub_westend.rs diff --git a/relays/bin-substrate/src/bridges/rococo_westend/westend_headers_to_bridge_hub_rococo.rs b/substrate-relay/src/bridges/rococo_westend/westend_headers_to_bridge_hub_rococo.rs similarity index 100% rename from relays/bin-substrate/src/bridges/rococo_westend/westend_headers_to_bridge_hub_rococo.rs rename to substrate-relay/src/bridges/rococo_westend/westend_headers_to_bridge_hub_rococo.rs diff --git a/relays/bin-substrate/src/bridges/rococo_westend/westend_parachains_to_bridge_hub_rococo.rs b/substrate-relay/src/bridges/rococo_westend/westend_parachains_to_bridge_hub_rococo.rs similarity index 100% rename from relays/bin-substrate/src/bridges/rococo_westend/westend_parachains_to_bridge_hub_rococo.rs rename to substrate-relay/src/bridges/rococo_westend/westend_parachains_to_bridge_hub_rococo.rs diff --git a/relays/bin-substrate/src/cli/chain_schema.rs b/substrate-relay/src/cli/chain_schema.rs similarity index 100% rename from relays/bin-substrate/src/cli/chain_schema.rs rename to substrate-relay/src/cli/chain_schema.rs diff --git a/relays/bin-substrate/src/cli/detect_equivocations.rs b/substrate-relay/src/cli/detect_equivocations.rs similarity index 100% rename from relays/bin-substrate/src/cli/detect_equivocations.rs rename to substrate-relay/src/cli/detect_equivocations.rs diff --git a/relays/bin-substrate/src/cli/init_bridge.rs b/substrate-relay/src/cli/init_bridge.rs similarity index 100% rename from relays/bin-substrate/src/cli/init_bridge.rs rename to substrate-relay/src/cli/init_bridge.rs diff --git a/relays/bin-substrate/src/cli/mod.rs b/substrate-relay/src/cli/mod.rs similarity index 100% rename from relays/bin-substrate/src/cli/mod.rs rename to substrate-relay/src/cli/mod.rs diff --git a/relays/bin-substrate/src/cli/relay_headers.rs b/substrate-relay/src/cli/relay_headers.rs similarity index 100% rename from relays/bin-substrate/src/cli/relay_headers.rs rename to substrate-relay/src/cli/relay_headers.rs diff --git a/relays/bin-substrate/src/cli/relay_headers_and_messages.rs b/substrate-relay/src/cli/relay_headers_and_messages.rs similarity index 100% rename from relays/bin-substrate/src/cli/relay_headers_and_messages.rs rename to substrate-relay/src/cli/relay_headers_and_messages.rs diff --git a/relays/bin-substrate/src/cli/relay_messages.rs b/substrate-relay/src/cli/relay_messages.rs similarity index 100% rename from relays/bin-substrate/src/cli/relay_messages.rs rename to substrate-relay/src/cli/relay_messages.rs diff --git a/relays/bin-substrate/src/cli/relay_parachains.rs b/substrate-relay/src/cli/relay_parachains.rs similarity index 100% rename from relays/bin-substrate/src/cli/relay_parachains.rs rename to substrate-relay/src/cli/relay_parachains.rs diff --git a/relays/bin-substrate/src/main.rs b/substrate-relay/src/main.rs similarity index 100% rename from relays/bin-substrate/src/main.rs rename to substrate-relay/src/main.rs