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

[Bridges v2] Compact proofs compatible relayer #3012

Draft
wants to merge 11 commits into
base: master
Choose a base branch
from
Draft

[Bridges v2] Compact proofs compatible relayer #3012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bba6973
Dienerize to polkadot-sdk's `bko-bridges-v2-compact-proofs`
bkontur Jun 20, 2024
0387c2f
Fix imports for `FromBridgedChainMessagesProof` / `FromBridgedChainMe…
bkontur Jun 20, 2024
56b3528
Introduce `client-legacy` for handling version discrepancies between …
bkontur Jun 20, 2024
f805714
Fix non-compact-proofs codegens
bkontur Jun 20, 2024
d0b2bee
Align with actual `polkadot-sdk`
bkontur Jun 20, 2024
c1f06b6
New codegen for client-bridge-hub-rococo with compact proofs
bkontur Jun 27, 2024
43d2afe
client-legacy: non-comapact proofs macros: generate_receive_message_d…
bkontur Jun 27, 2024
2df5acf
Adjust with polkadot-sdk and macro fix
bkontur Jun 27, 2024
e33ca75
Codegen allowing type_substitute_overrides - for better control of co…
bkontur Jun 28, 2024
51ba09e
Fix codegen for BHK
bkontur Jun 30, 2024
4076fde
Align with actual `polkadot-sdk`
bkontur Jul 1, 2024
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
1,811 changes: 1,099 additions & 712 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ members = [
"relay-clients/client-bridge-hub-rococo",
"relay-clients/client-bridge-hub-westend",
"relay-clients/client-kusama",
"relay-clients/client-legacy",
"relay-clients/client-polkadot",
"relay-clients/client-polkadot-bulletin",
"relay-clients/client-rococo",
Expand Down
27 changes: 14 additions & 13 deletions relay-clients/client-bridge-hub-kusama/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,20 @@ codec = { package = "parity-scale-codec", version = "3.6.1", features = ["derive
scale-info = { version = "2.11.3", default-features = false, features = ["derive"] }
subxt = { version = "0.37.0", default-features = false, features = ["native"] }

# Bridge dependencies
# Local dependencies
relay-legacy-client = { path = "../client-legacy" }

bp-bridge-hub-kusama = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
bp-header-chain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
bp-messages = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
bp-parachains = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
bp-polkadot-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
bp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
bridge-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
relay-substrate-client = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
# Bridge dependencies
bp-bridge-hub-kusama = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }
bp-header-chain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }
bp-messages = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }
bp-parachains = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }
bp-polkadot-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }
bp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }
bridge-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }
relay-substrate-client = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }

# Substrate Dependencies

sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
sp-weights = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }
sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }
sp-weights = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }
45 changes: 26 additions & 19 deletions relay-clients/client-bridge-hub-kusama/src/codegen_runtime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
//! Autogenerated runtime API
//! THIS FILE WAS AUTOGENERATED USING parity-bridges-common::runtime-codegen
//! EXECUTED COMMAND: target/debug/runtime-codegen --from-wasm-file
//! bridge-hub-kusama_runtime-v1002005.compact.compressed.wasm
//! bridge-hub-kusama_runtime-v1002005.compact.compressed.wasm -t
//! bp_polkadot_core::parachains::ParaHeadsProof=::relay_legacy_client::non_compact_proofs::bp_polkadot_core::parachains::ParaHeadsProof

#[allow(dead_code, unused_imports, non_camel_case_types)]
#[allow(clippy::all)]
Expand Down Expand Up @@ -1356,15 +1357,15 @@ pub mod api {
#[codec(index = 2)]
receive_messages_proof {
relayer_id_at_bridged_chain: ::sp_core::crypto::AccountId32,
proof: ::bridge_runtime_common::messages::target::FromBridgedChainMessagesProof<
proof: ::relay_legacy_client::non_compact_proofs::bridge_runtime_common::messages::target::FromBridgedChainMessagesProof<
::subxt::ext::subxt_core::utils::H256,
>,
messages_count: ::core::primitive::u32,
dispatch_weight: ::sp_weights::Weight,
},
#[codec(index = 3)]
receive_messages_delivery_proof {
proof: ::bridge_runtime_common::messages::source::FromBridgedChainMessagesDeliveryProof<
proof: ::relay_legacy_client::non_compact_proofs::bridge_runtime_common::messages::source::FromBridgedChainMessagesDeliveryProof<
::subxt::ext::subxt_core::utils::H256,
>,
relayers_state: ::bp_messages::UnrewardedRelayersState,
Expand Down Expand Up @@ -1437,22 +1438,28 @@ pub mod api {
#[derive(::codec::Decode, ::codec::Encode, Clone, Debug, PartialEq)]
pub enum Call {
#[codec(index = 0)]
submit_parachain_heads {
at_relay_block:
(::core::primitive::u32, ::subxt::ext::subxt_core::utils::H256),
parachains: ::subxt::ext::subxt_core::alloc::vec::Vec<(
::bp_polkadot_core::parachains::ParaId,
::subxt::ext::subxt_core::utils::H256,
)>,
parachain_heads_proof: ::bp_polkadot_core::parachains::ParaHeadsProof,
},
#[codec(index = 1)]
set_owner { new_owner: ::core::option::Option<::sp_core::crypto::AccountId32> },
#[codec(index = 2)]
set_operating_mode {
operating_mode: runtime_types::bp_runtime::BasicOperatingMode,
},
}
submit_parachain_heads {
at_relay_block: (
::core::primitive::u32,
::subxt::ext::subxt_core::utils::H256,
),
parachains: ::subxt::ext::subxt_core::alloc::vec::Vec<
(
::bp_polkadot_core::parachains::ParaId,
::subxt::ext::subxt_core::utils::H256,
),
>,
parachain_heads_proof: ::relay_legacy_client::non_compact_proofs::bp_polkadot_core::parachains::ParaHeadsProof,
},
#[codec(index = 1)]
set_owner {
new_owner: ::core::option::Option<::sp_core::crypto::AccountId32>,
},
#[codec(index = 2)]
set_operating_mode {
operating_mode: runtime_types::bp_runtime::BasicOperatingMode,
},
}
#[derive(::codec::Decode, ::codec::Encode, Clone, Debug, PartialEq)]
pub enum Error {
#[codec(index = 0)]
Expand Down
31 changes: 16 additions & 15 deletions relay-clients/client-bridge-hub-polkadot/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,22 @@ codec = { package = "parity-scale-codec", version = "3.6.1", features = ["derive
scale-info = { version = "2.11.3", default-features = false, features = ["derive"] }
subxt = { version = "0.37.0", default-features = false, features = ["native"] }

# Bridge dependencies
# Local dependencies
relay-legacy-client = { path = "../client-legacy" }

bp-bridge-hub-polkadot = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
bp-header-chain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
bp-messages = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
bp-parachains = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
bp-polkadot = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
bp-polkadot-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
bp-kusama = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
bp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
bridge-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
relay-substrate-client = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
# Bridge dependencies
bp-bridge-hub-polkadot = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }
bp-header-chain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }
bp-messages = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }
bp-parachains = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }
bp-polkadot = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }
bp-polkadot-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }
bp-kusama = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }
bp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }
bridge-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }
relay-substrate-client = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }

# Substrate Dependencies

sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
sp-weights = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }
sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }
sp-weights = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }
45 changes: 26 additions & 19 deletions relay-clients/client-bridge-hub-polkadot/src/codegen_runtime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
//! Autogenerated runtime API
//! THIS FILE WAS AUTOGENERATED USING parity-bridges-common::runtime-codegen
//! EXECUTED COMMAND: target/debug/runtime-codegen --from-wasm-file
//! bridge-hub-polkadot_runtime-v1002005.compact.compressed.wasm
//! bridge-hub-polkadot_runtime-v1002005.compact.compressed.wasm -t
//! bp_polkadot_core::parachains::ParaHeadsProof=::relay_legacy_client::non_compact_proofs::bp_polkadot_core::parachains::ParaHeadsProof

#[allow(dead_code, unused_imports, non_camel_case_types)]
#[allow(clippy::all)]
Expand Down Expand Up @@ -1356,15 +1357,15 @@ pub mod api {
#[codec(index = 2)]
receive_messages_proof {
relayer_id_at_bridged_chain: ::sp_core::crypto::AccountId32,
proof: ::bridge_runtime_common::messages::target::FromBridgedChainMessagesProof<
proof: ::relay_legacy_client::non_compact_proofs::bridge_runtime_common::messages::target::FromBridgedChainMessagesProof<
::subxt::ext::subxt_core::utils::H256,
>,
messages_count: ::core::primitive::u32,
dispatch_weight: ::sp_weights::Weight,
},
#[codec(index = 3)]
receive_messages_delivery_proof {
proof: ::bridge_runtime_common::messages::source::FromBridgedChainMessagesDeliveryProof<
proof: ::relay_legacy_client::non_compact_proofs::bridge_runtime_common::messages::source::FromBridgedChainMessagesDeliveryProof<
::subxt::ext::subxt_core::utils::H256,
>,
relayers_state: ::bp_messages::UnrewardedRelayersState,
Expand Down Expand Up @@ -1437,22 +1438,28 @@ pub mod api {
#[derive(::codec::Decode, ::codec::Encode, Clone, Debug, PartialEq)]
pub enum Call {
#[codec(index = 0)]
submit_parachain_heads {
at_relay_block:
(::core::primitive::u32, ::subxt::ext::subxt_core::utils::H256),
parachains: ::subxt::ext::subxt_core::alloc::vec::Vec<(
::bp_polkadot_core::parachains::ParaId,
::subxt::ext::subxt_core::utils::H256,
)>,
parachain_heads_proof: ::bp_polkadot_core::parachains::ParaHeadsProof,
},
#[codec(index = 1)]
set_owner { new_owner: ::core::option::Option<::sp_core::crypto::AccountId32> },
#[codec(index = 2)]
set_operating_mode {
operating_mode: runtime_types::bp_runtime::BasicOperatingMode,
},
}
submit_parachain_heads {
at_relay_block: (
::core::primitive::u32,
::subxt::ext::subxt_core::utils::H256,
),
parachains: ::subxt::ext::subxt_core::alloc::vec::Vec<
(
::bp_polkadot_core::parachains::ParaId,
::subxt::ext::subxt_core::utils::H256,
),
>,
parachain_heads_proof: ::relay_legacy_client::non_compact_proofs::bp_polkadot_core::parachains::ParaHeadsProof,
},
#[codec(index = 1)]
set_owner {
new_owner: ::core::option::Option<::sp_core::crypto::AccountId32>,
},
#[codec(index = 2)]
set_operating_mode {
operating_mode: runtime_types::bp_runtime::BasicOperatingMode,
},
}
#[derive(::codec::Decode, ::codec::Encode, Clone, Debug, PartialEq)]
pub enum Error {
#[codec(index = 0)]
Expand Down
27 changes: 14 additions & 13 deletions relay-clients/client-bridge-hub-rococo/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,21 @@ codec = { package = "parity-scale-codec", version = "3.6.1", features = ["derive
scale-info = { version = "2.11.3", default-features = false, features = ["derive"] }
subxt = { version = "0.37.0", default-features = false, features = ["native"] }

# Bridge dependencies
# Local dependencies
relay-legacy-client = { path = "../client-legacy" }

bp-bridge-hub-rococo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
bp-header-chain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
bp-messages = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
bp-parachains = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
bp-polkadot-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
bp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
# Bridge dependencies
bp-bridge-hub-rococo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }
bp-header-chain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }
bp-messages = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }
bp-parachains = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }
bp-polkadot-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }
bp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }

bridge-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
relay-substrate-client = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
bridge-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }
relay-substrate-client = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }

# Substrate Dependencies

sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
sp-weights = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }
sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }
sp-weights = { git = "https://github.com/paritytech/polkadot-sdk", branch = "bko-bridges-v2-compact-proofs" }
Loading