Skip to content
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

Jump to bottom

Move relay clients to separate folder #2893

Merged
merged 1 commit into from
Mar 25, 2024
Merged

Move relay clients to separate folder #2893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 11 additions & 11 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`,
Expand Down
2 changes: 1 addition & 1 deletion relays/client-bridge-hub-kusama/Cargo.toml → ...ients/client-bridge-hub-kusama/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
0 ...-bridge-hub-kusama/src/codegen_runtime.rs → ...-bridge-hub-kusama/src/codegen_runtime.rs
View file
Open in desktop
File renamed without changes.
0 relays/client-bridge-hub-kusama/src/lib.rs → ...ients/client-bridge-hub-kusama/src/lib.rs
View file
Open in desktop
File renamed without changes.
0 ...-bridge-hub-kusama/src/runtime_wrapper.rs → ...-bridge-hub-kusama/src/runtime_wrapper.rs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion relays/client-bridge-hub-polkadot/Cargo.toml → ...nts/client-bridge-hub-polkadot/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
0 ...ridge-hub-polkadot/src/codegen_runtime.rs → ...ridge-hub-polkadot/src/codegen_runtime.rs
View file
Open in desktop
File renamed without changes.
0 relays/client-bridge-hub-polkadot/src/lib.rs → ...nts/client-bridge-hub-polkadot/src/lib.rs
View file
Open in desktop
File renamed without changes.
0 ...ridge-hub-polkadot/src/runtime_wrapper.rs → ...ridge-hub-polkadot/src/runtime_wrapper.rs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion relays/client-bridge-hub-rococo/Cargo.toml → ...ients/client-bridge-hub-rococo/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
0 ...-bridge-hub-rococo/src/codegen_runtime.rs → ...-bridge-hub-rococo/src/codegen_runtime.rs
View file
Open in desktop
File renamed without changes.
0 relays/client-bridge-hub-rococo/src/lib.rs → ...ients/client-bridge-hub-rococo/src/lib.rs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion relays/client-bridge-hub-westend/Cargo.toml → ...ents/client-bridge-hub-westend/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
0 ...bridge-hub-westend/src/codegen_runtime.rs → ...bridge-hub-westend/src/codegen_runtime.rs
View file
Open in desktop
File renamed without changes.
0 relays/client-bridge-hub-westend/src/lib.rs → ...ents/client-bridge-hub-westend/src/lib.rs
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions relays/client-kusama/Cargo.toml → relay-clients/client-kusama/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
0 relays/client-kusama/src/codegen_runtime.rs → ...ents/client-kusama/src/codegen_runtime.rs
View file
Open in desktop
File renamed without changes.
0 relays/client-kusama/src/lib.rs → relay-clients/client-kusama/src/lib.rs
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions relays/client-polkadot-bulletin/Cargo.toml → ...ients/client-polkadot-bulletin/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
0 ...-polkadot-bulletin/src/codegen_runtime.rs → ...-polkadot-bulletin/src/codegen_runtime.rs
View file
Open in desktop
File renamed without changes.
0 relays/client-polkadot-bulletin/src/lib.rs → ...ients/client-polkadot-bulletin/src/lib.rs
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions relays/client-polkadot/Cargo.toml → relay-clients/client-polkadot/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
0 ...ys/client-polkadot/src/codegen_runtime.rs → ...ts/client-polkadot/src/codegen_runtime.rs
View file
Open in desktop
File renamed without changes.
0 relays/client-polkadot/src/lib.rs → relay-clients/client-polkadot/src/lib.rs
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions relays/client-rococo/Cargo.toml → relay-clients/client-rococo/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
0 relays/client-rococo/src/codegen_runtime.rs → ...ents/client-rococo/src/codegen_runtime.rs
View file
Open in desktop
File renamed without changes.
0 relays/client-rococo/src/lib.rs → relay-clients/client-rococo/src/lib.rs
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions relays/client-westend/Cargo.toml → relay-clients/client-westend/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
0 relays/client-westend/src/codegen_runtime.rs → ...nts/client-westend/src/codegen_runtime.rs
View file
Open in desktop
File renamed without changes.
0 relays/client-westend/src/lib.rs → relay-clients/client-westend/src/lib.rs
View file
Open in desktop
File renamed without changes.
66 changes: 0 additions & 66 deletions relays/bin-substrate/Cargo.toml
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions relays/lib-substrate-relay/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
66 changes: 66 additions & 0 deletions substrate-relay/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
[package]
name = "substrate-relay"
version = "1.2.0"
authors = ["Parity Technologies <admin@parity.io>"]
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" }
0 ...kusama_messages_to_bridge_hub_polkadot.rs → ...kusama_messages_to_bridge_hub_polkadot.rs
View file
Open in desktop
File renamed without changes.
0 ...polkadot_messages_to_bridge_hub_kusama.rs → ...polkadot_messages_to_bridge_hub_kusama.rs
View file
Open in desktop
File renamed without changes.
0 .../kusama_headers_to_bridge_hub_polkadot.rs → .../kusama_headers_to_bridge_hub_polkadot.rs
View file
Open in desktop
File renamed without changes.
0 ...sama_parachains_to_bridge_hub_polkadot.rs → ...sama_parachains_to_bridge_hub_polkadot.rs
View file
Open in desktop
File renamed without changes.
0 ...strate/src/bridges/kusama_polkadot/mod.rs → ...-relay/src/bridges/kusama_polkadot/mod.rs
View file
Open in desktop
File renamed without changes.
0 .../polkadot_headers_to_bridge_hub_kusama.rs → .../polkadot_headers_to_bridge_hub_kusama.rs
View file
Open in desktop
File renamed without changes.
0 ...lkadot_parachains_to_bridge_hub_kusama.rs → ...lkadot_parachains_to_bridge_hub_kusama.rs
View file
Open in desktop
File renamed without changes.
0 relays/bin-substrate/src/bridges/mod.rs → substrate-relay/src/bridges/mod.rs
View file
Open in desktop
File renamed without changes.
0 ...polkadot_messages_to_polkadot_bulletin.rs → ...polkadot_messages_to_polkadot_bulletin.rs
View file
Open in desktop
File renamed without changes.
0 ...rate/src/bridges/polkadot_bulletin/mod.rs → ...elay/src/bridges/polkadot_bulletin/mod.rs
View file
Open in desktop
File renamed without changes.
0 ...ulletin_headers_to_bridge_hub_polkadot.rs → ...ulletin_headers_to_bridge_hub_polkadot.rs
View file
Open in desktop
File renamed without changes.
0 ...lletin_messages_to_bridge_hub_polkadot.rs → ...lletin_messages_to_bridge_hub_polkadot.rs
View file
Open in desktop
File renamed without changes.
0 .../polkadot_headers_to_polkadot_bulletin.rs → .../polkadot_headers_to_polkadot_bulletin.rs
View file
Open in desktop
File renamed without changes.
0 ...lkadot_parachains_to_polkadot_bulletin.rs → ...lkadot_parachains_to_polkadot_bulletin.rs
View file
Open in desktop
File renamed without changes.
0 ...hub_rococo_messages_to_rococo_bulletin.rs → ...hub_rococo_messages_to_rococo_bulletin.rs
View file
Open in desktop
File renamed without changes.
0 ...strate/src/bridges/rococo_bulletin/mod.rs → ...-relay/src/bridges/rococo_bulletin/mod.rs
View file
Open in desktop
File renamed without changes.
0 ..._bulletin_headers_to_bridge_hub_rococo.rs → ..._bulletin_headers_to_bridge_hub_rococo.rs
View file
Open in desktop
File renamed without changes.
0 ...bulletin_messages_to_bridge_hub_rococo.rs → ...bulletin_messages_to_bridge_hub_rococo.rs
View file
Open in desktop
File renamed without changes.
0 ...etin/rococo_headers_to_rococo_bulletin.rs → ...etin/rococo_headers_to_rococo_bulletin.rs
View file
Open in desktop
File renamed without changes.
0 ...n/rococo_parachains_to_rococo_bulletin.rs → ...n/rococo_parachains_to_rococo_bulletin.rs
View file
Open in desktop
File renamed without changes.
0 ..._rococo_messages_to_bridge_hub_westend.rs → ..._rococo_messages_to_bridge_hub_westend.rs
View file
Open in desktop
File renamed without changes.
0 ..._westend_messages_to_bridge_hub_rococo.rs → ..._westend_messages_to_bridge_hub_rococo.rs
View file
Open in desktop
File renamed without changes.
0 ...bstrate/src/bridges/rococo_westend/mod.rs → ...e-relay/src/bridges/rococo_westend/mod.rs
View file
Open in desktop
File renamed without changes.
0 ...d/rococo_headers_to_bridge_hub_westend.rs → ...d/rococo_headers_to_bridge_hub_westend.rs
View file
Open in desktop
File renamed without changes.
0 ...ococo_parachains_to_bridge_hub_westend.rs → ...ococo_parachains_to_bridge_hub_westend.rs
View file
Open in desktop
File renamed without changes.
0 ...d/westend_headers_to_bridge_hub_rococo.rs → ...d/westend_headers_to_bridge_hub_rococo.rs
View file
Open in desktop
File renamed without changes.
0 ...estend_parachains_to_bridge_hub_rococo.rs → ...estend_parachains_to_bridge_hub_rococo.rs
View file
Open in desktop
File renamed without changes.
0 relays/bin-substrate/src/cli/chain_schema.rs → substrate-relay/src/cli/chain_schema.rs
View file
Open in desktop
File renamed without changes.
0 ...substrate/src/cli/detect_equivocations.rs → ...ate-relay/src/cli/detect_equivocations.rs
View file
Open in desktop
File renamed without changes.
0 relays/bin-substrate/src/cli/init_bridge.rs → substrate-relay/src/cli/init_bridge.rs
View file
Open in desktop
File renamed without changes.
0 relays/bin-substrate/src/cli/mod.rs → substrate-relay/src/cli/mod.rs
View file
Open in desktop
File renamed without changes.
0 ...ys/bin-substrate/src/cli/relay_headers.rs → substrate-relay/src/cli/relay_headers.rs
View file
Open in desktop
File renamed without changes.
0 ...ate/src/cli/relay_headers_and_messages.rs → ...lay/src/cli/relay_headers_and_messages.rs
View file
Open in desktop
File renamed without changes.
0 ...s/bin-substrate/src/cli/relay_messages.rs → substrate-relay/src/cli/relay_messages.rs
View file
Open in desktop
File renamed without changes.
0 ...bin-substrate/src/cli/relay_parachains.rs → substrate-relay/src/cli/relay_parachains.rs
View file
Open in desktop
File renamed without changes.
0 relays/bin-substrate/src/main.rs → substrate-relay/src/main.rs
View file
Open in desktop
File renamed without changes.