Skip to content

Commit 547cb31

Browse files
antkvebkontur
andauthored
People bridging (#36)
* Moved from rococo BH to polkadot PH * Added people hub bridging primitives * Added missed cargo line * Added PB spec command * Fixed build issues * Moved to workspace dependencies * Fixed compile warnings * Cargo.lock * More workspace de[s * Enabled polkadot CI jobs * More workspace cleanup * zepter taplo * Stable? * Hmm breaks CI? * Fix benchmarking for CI * Changed pallet indices for polkadot testing * people-hub-polkadot to people-polkadot * Split `construct_runtime` to keep the same indicies * More cleaning * Nits * Let's make separate bulletin-polkadot-runtime for Fellows/production * Remove rococo/polkadot feature gate * Update zombienet/config.toml * Removed not used crate * Apply suggestions from code review * Removed file * Fix chain spec for dev/local * Nit * Remove versions --------- Co-authored-by: Branislav Kontur <[email protected]>
1 parent c7d07cf commit 547cb31

File tree

29 files changed

+3987
-358
lines changed

29 files changed

+3987
-358
lines changed

.github/workflows/check.yml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,9 @@ jobs:
7070
cache-on-failure: true
7171
cache-all-crates: true
7272

73-
- name: Cargo check (Rococo) (benchmarking)
73+
- name: Cargo check benchmarking
7474
run: |
75-
cargo check --workspace --features=rococo,runtime-benchmarks
76-
77-
#- name: Cargo check (Polkadot) (benchmarking)
78-
# run: |
79-
# cargo check --workspace --features=polkadot,runtime-benchmarks
75+
cargo check --workspace --features=runtime-benchmarks
8076
8177
test:
8278
name: Test
@@ -103,10 +99,10 @@ jobs:
10399
104100
- name: Run (Rococo) runtime tests
105101
run: |
106-
cargo test -p polkadot-bulletin-chain-runtime --features=rococo
107-
cargo test -p polkadot-bulletin-chain-runtime --features=rococo,runtime-benchmarks
102+
cargo test -p polkadot-bulletin-chain-runtime
103+
cargo test -p polkadot-bulletin-chain-runtime --features=runtime-benchmarks
108104
109-
#- name: Run (Polkadot) runtime tests
110-
# run: |
111-
# cargo test -p polkadot-bulletin-chain-runtime --features=polkadot
112-
# cargo test -p polkadot-bulletin-chain-runtime --features=polkadot,runtime-benchmarks
105+
- name: Run (Polkadot) runtime tests
106+
run: |
107+
cargo test -p bulletin-polkadot-runtime
108+
cargo test -p bulletin-polkadot-runtime --features=runtime-benchmarks

Cargo.lock

Lines changed: 74 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ repository = "https://github.com/zdave-parity/polkadot-bulletin-chain.git"
55

66
[workspace.dependencies]
77
array-bytes = { version = "6.1" }
8+
bp-test-utils = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602" }
89
cfg-if = { version = "1.0" }
910
clap = { version = "4.2.5" }
1011
codec = { package = "parity-scale-codec", version = "3.7.5", default-features = false }
@@ -19,6 +20,103 @@ static_assertions = { version = "1.1" }
1920
tracing = { version = "0.1.41", default-features = false }
2021
try-runtime-cli = { version = "0.42" }
2122

23+
# Local workspace members
24+
bulletin-polkadot-runtime = { path = "runtimes/bulletin-polkadot" }
25+
pallet-relayer-set = { path = "pallets/relayer-set", default-features = false }
26+
pallet-transaction-storage = { path = "pallets/transaction-storage", default-features = false }
27+
pallet-validator-set = { path = "pallets/validator-set", default-features = false }
28+
pallets-common = { path = "pallets/common", default-features = false }
29+
polkadot-bulletin-chain-runtime = { path = "runtime" }
30+
31+
# Polkadot SDK crates (shared git revision)
32+
frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
33+
frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
34+
frame-executive = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
35+
frame-support = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
36+
frame-system = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
37+
frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
38+
frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
39+
frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
40+
polkadot-sdk-frame = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
41+
42+
sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602" }
43+
sc-cli = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602" }
44+
sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602" }
45+
sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602" }
46+
sc-consensus-babe = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602" }
47+
sc-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602" }
48+
sc-consensus-grandpa-rpc = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602" }
49+
sc-executor = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602" }
50+
sc-network = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602" }
51+
sc-offchain = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602" }
52+
sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602" }
53+
sc-service = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602" }
54+
sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602" }
55+
sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602" }
56+
sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602" }
57+
58+
sp-api = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
59+
sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
60+
sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
61+
sp-consensus-babe = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
62+
sp-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
63+
sp-core = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
64+
sp-genesis-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
65+
sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
66+
sp-io = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
67+
sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
68+
sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
69+
sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
70+
sp-session = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
71+
sp-std = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
72+
sp-storage = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
73+
sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
74+
sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
75+
sp-transaction-storage-proof = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
76+
sp-trie = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
77+
sp-version = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
78+
79+
pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
80+
pallet-babe = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
81+
pallet-grandpa = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
82+
pallet-offences = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
83+
pallet-session = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
84+
pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
85+
pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
86+
pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
87+
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
88+
89+
bp-bridge-hub-cumulus = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
90+
bp-bridge-hub-rococo = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
91+
bp-header-chain = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
92+
bp-messages = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
93+
bp-parachains = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
94+
# TODO: remove this and replace with local runtime/src/bridge-primitives
95+
bp-polkadot-bulletin = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
96+
bp-polkadot-core = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
97+
bp-rococo = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
98+
bp-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
99+
bridge-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
100+
101+
pallet-bridge-grandpa = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
102+
pallet-bridge-messages = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
103+
pallet-bridge-parachains = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
104+
pallet-bridge-relayers = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
105+
pallet-xcm-bridge-hub = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
106+
107+
pallet-staking = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
108+
pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
109+
parachains-common = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
110+
sp-staking = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }
111+
xcm = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", package = "staging-xcm", default-features = false }
112+
xcm-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", package = "staging-xcm-builder", default-features = false }
113+
xcm-executor = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", package = "staging-xcm-executor", default-features = false }
114+
115+
# Substrate tooling
116+
substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602" }
117+
substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602" }
118+
substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602" }
119+
22120
[workspace]
23121
resolver = "2"
24122
members = [
@@ -28,6 +126,7 @@ members = [
28126
"pallets/transaction-storage",
29127
"pallets/validator-set",
30128
"runtime",
129+
"runtimes/bulletin-polkadot",
31130
]
32131
[profile.release]
33132
# Polkadot runtime requires unwinding.

0 commit comments

Comments
 (0)