Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
139 commits
Select commit Hold shift + click to select a range
7d4319d
Bump futures from 0.3.26 to 0.3.27 (#2359)
dependabot[bot] Mar 27, 2023
ea6598c
Bump clap from 4.1.11 to 4.1.13 (#2388)
dependabot[bot] Mar 27, 2023
35d79f3
Remove HeaderBackend from RelayChainRPCClient (#2385)
skunert Mar 28, 2023
0ef1444
Bump scale-info from 2.3.1 to 2.4.0 (#2386)
dependabot[bot] Mar 28, 2023
066db6b
Bump serde_json from 1.0.94 to 1.0.95 (#2387)
dependabot[bot] Mar 28, 2023
1d8208b
Companion: wasm-builder support stable Rust (#2393)
bkchr Mar 29, 2023
559f3ca
Bump thiserror from 1.0.38 to 1.0.40 (#2396)
dependabot[bot] Mar 29, 2023
69dd6ae
Bump syn from 1.0.109 to 2.0.9 (#2397)
dependabot[bot] Mar 29, 2023
247e843
Bump serde from 1.0.156 to 1.0.159 (#2395)
dependabot[bot] Mar 29, 2023
2ce882f
Companion for https://github.com/paritytech/substrate/pull/13725 (#2401)
altonen Mar 30, 2023
3ce4e83
Bump syn from 2.0.9 to 2.0.11 (#2405)
dependabot[bot] Mar 30, 2023
693e973
Bump scale-info from 2.4.0 to 2.5.0 (#2404)
dependabot[bot] Mar 30, 2023
f5340e7
Bump tempfile from 3.4.0 to 3.5.0 (#2406)
dependabot[bot] Mar 30, 2023
337bd17
bump zombienet version (#2411)
pepoviola Mar 30, 2023
826e1aa
Bump tokio from 1.26.0 to 1.27.0 (#2413)
dependabot[bot] Mar 31, 2023
a4188ea
Merge remote-tracking branch 'origin/master' into bridge-hub-rococo-w…
Mar 31, 2023
93d9b6a
Bump syn from 2.0.11 to 2.0.12 (#2414)
dependabot[bot] Mar 31, 2023
b1cd3d5
Bump proc-macro2 from 1.0.52 to 1.0.54 (#2415)
dependabot[bot] Mar 31, 2023
9106fa8
Companion PR for contract deletion updates (#2409)
pgherveou Mar 31, 2023
e5035c8
Allow arbitrary key-values in RelayStateSproofBuilder (#2407)
tmpolaczyk Mar 31, 2023
e5d994b
help text examples + clean up (#2418)
skunert Apr 1, 2023
e67094e
Bump futures from 0.3.27 to 0.3.28 (#2420)
dependabot[bot] Apr 1, 2023
6bdcf1f
Bump clap from 4.1.13 to 4.1.14 (#2421)
dependabot[bot] Apr 1, 2023
66bfb2c
Update Substrate & Polkadot (#2422)
bkchr Apr 3, 2023
d12c6d0
Bump syn from 2.0.12 to 2.0.13 (#2428)
dependabot[bot] Apr 3, 2023
697f0cd
Bump hex-literal from 0.3.4 to 0.4.0 (#2426)
dependabot[bot] Apr 3, 2023
2b4467c
Updated scripts for transfer assets
bkontur Mar 27, 2023
53c6b8d
Companion for #6986 (#2416)
bkontur Apr 4, 2023
5ed3677
[backport] weights 9400 (#2425)
EgorPopelyaev Apr 4, 2023
88ead41
Cleanup: Remove polkadot-service dependency from minimal node (#2430)
skunert Apr 4, 2023
2cbaa39
Co #13699: Remove old calls (#2431)
ggwpez Apr 4, 2023
b49628f
[Backport] version bumps 9400 (#2424)
EgorPopelyaev Apr 5, 2023
d8d5781
Merge branch 'master' into bridge-hub-rococo-wococo
bkontur Apr 5, 2023
25b7b44
Cargo.lock
bkontur Apr 5, 2023
98f6ca7
Bump hex-literal from 0.4.0 to 0.4.1 (#2434)
dependabot[bot] Apr 5, 2023
a5a79db
Updated bridge-hub-polkadot.json (#2435)
bkontur Apr 6, 2023
b0715f9
The Polkadot Fellowship import (#2236)
muharem Apr 9, 2023
dcedafb
Script updates for `ping-via-bridge-from-statemine-rococo`
bkontur Apr 11, 2023
03763dd
Companion for #13302 (#2357)
lexnv Apr 11, 2023
b4a50e2
use stable rust toolchain in ci
Apr 11, 2023
4733416
Bump syn from 2.0.13 to 2.0.14 (#2446)
dependabot[bot] Apr 12, 2023
5a0ebad
Bump serde from 1.0.159 to 1.0.160 (#2445)
dependabot[bot] Apr 12, 2023
a9a6c30
Added `transfer-asset-from-statemine-rococo`
bkontur Apr 12, 2023
030db02
Invoke cargo build commands with `--locked` (#2444)
Apr 12, 2023
8252d87
Finished scripts
bkontur Apr 12, 2023
c70f503
README.md
bkontur Apr 12, 2023
df9ed24
Bump actions/checkout from 3.1.0 to 3.5.1 (#2448)
dependabot[bot] Apr 12, 2023
977587b
Merge remote-tracking branch 'origin/master' into bridge-hub-rococo-w…
Apr 13, 2023
574f425
Bump serde_json from 1.0.95 to 1.0.96 (#2453)
dependabot[bot] Apr 13, 2023
b42855d
Bump actions/checkout from 3.5.1 to 3.5.2 (#2452)
dependabot[bot] Apr 14, 2023
f776496
Merge remote-tracking branch 'origin/master' into bridge-hub-rococo-w…
bkontur Apr 14, 2023
6a12724
Compile fix + log xcm trace all
bkontur Apr 14, 2023
a26ebb2
Bump syn from 2.0.14 to 2.0.15 (#2454)
dependabot[bot] Apr 14, 2023
863e94d
Bump assert_cmd from 2.0.10 to 2.0.11 (#2457)
dependabot[bot] Apr 15, 2023
795fe4e
Initial version of bridges pallet as subtree of https://github.com/pa…
bkontur Apr 14, 2023
f891b32
Merge remote-tracking branch 'origin/master' into bridge-hub-rococo-w…
bkontur Apr 17, 2023
3a8b6ea
Squashed 'bridges/' changes from ecddd4a31..d30927c08
bkontur Apr 17, 2023
4156016
Merge commit '3a8b6ea5290368cb0dbf39e76555d15d380fc194' into bridge-h…
bkontur Apr 17, 2023
20f7a55
Fixes
bkontur Apr 17, 2023
a9e2773
Squashed 'bridges/' content from commit d30927c08
bkontur Apr 17, 2023
71a1d47
Merge commit 'a9e27730296e3269b82cd315aed9d635610f076c' as 'bridges'
bkontur Apr 17, 2023
8f67dc5
Merge branch 'bridge-hub-subtree' into bridge-hub-rococo-wococo
bkontur Apr 17, 2023
1e489dd
Updated REAMDE.md and BRIDGES.md (inspired by original https://github…
bkontur Apr 17, 2023
0670d9f
Squashed 'bridges/' changes from d30927c08..d3970944b
bkontur Apr 17, 2023
71aad1e
Merge commit '0670d9fa5ae67f6f01028440318a723d1b330720' into bridge-h…
bkontur Apr 17, 2023
5b20c4e
Merge branch 'bridge-hub-subtree' into bridge-hub-rococo-wococo
bkontur Apr 17, 2023
72349fc
Changed `query_account_balances` return type (#2455)
bkontur Apr 17, 2023
f2277b6
Squashed 'bridges/' changes from d3970944b..2180797fb
bkontur Apr 18, 2023
873f5cc
Merge commit 'f2277b6f81208bd38a15cb74ebd535c4cd851b32' into bridge-h…
bkontur Apr 18, 2023
8f2b30d
Merge remote-tracking branch 'origin/master' into bridge-hub-subtree
bkontur Apr 18, 2023
6ffe4f3
Merge remote-tracking branch 'origin/bridge-hub-subtree' into bridge-…
bkontur Apr 18, 2023
926799c
Companion for substrate#13883 (#2460)
andresilva Apr 18, 2023
3de5354
Optimize level monitor reconstruction (#2461)
davxy Apr 19, 2023
4449044
Bump clap from 4.1.14 to 4.2.3 (#2465)
dependabot[bot] Apr 19, 2023
ea44f8c
Bump Swatinem/rust-cache from 2.2.0 to 2.2.1 (#2456)
dependabot[bot] Apr 19, 2023
d403b49
Companion for substrate#13771 (#2410)
muharem Apr 19, 2023
eced0cb
Parachain node should not recover blocks while syncing (#2462)
skunert Apr 19, 2023
8615ac8
[Polkadot Companion] for 7101 (#2470)
mrcnski Apr 21, 2023
2c1dd4f
Align BridgeHub runtimes with other SP runtimes + reused test for tel…
bkontur Apr 24, 2023
77c0b76
[ci] Update buildah command and version (#2479)
alvicsam Apr 24, 2023
321e81e
Bump enumflags2 from 0.7.5 to 0.7.7 (#2481)
dependabot[bot] Apr 24, 2023
1ad8cc8
Bump ruby/setup-ruby from 1.133.2 to 1.146.0 (#2466)
dependabot[bot] Apr 25, 2023
383f399
Bump ruby/setup-ruby from 1.146.0 to 1.147.0 (#2484)
dependabot[bot] Apr 26, 2023
e63a06d
Bump actions/download-artifact from 3.0.0 to 3.0.1 (#1798)
dependabot[bot] Apr 26, 2023
b54ccba
Bump actions/upload-artifact from 3.1.0 to 3.1.1 (#1799)
dependabot[bot] Apr 26, 2023
263ebdf
Bump actions/cache from 3.0.11 to 3.2.3 (#2082)
dependabot[bot] Apr 26, 2023
db74a62
Companion for substrate#13565 (#2306)
agryaznov Apr 26, 2023
7e59781
Bump actions/download-artifact from 3.0.1 to 3.0.2 (#2485)
dependabot[bot] Apr 26, 2023
2014997
Bump chevdor/srtool-actions from 0.6.0 to 0.7.0 (#2486)
dependabot[bot] Apr 26, 2023
1e83f6e
Bump actions/upload-artifact from 3.1.1 to 3.1.2 (#2487)
dependabot[bot] Apr 26, 2023
44dfcae
Bump actions/cache from 3.2.3 to 3.3.1 (#2488)
dependabot[bot] Apr 26, 2023
6524f14
Bump h2 from 0.3.9 to 0.3.17 (#2451)
dependabot[bot] Apr 26, 2023
ad6bfdf
Merge remote-tracking branch 'origin/master' into bridge-hub-subtree
bkontur Apr 27, 2023
20647a6
Reused `teleports_for_native_asset_works` test to all bridge-hub runtime
bkontur Apr 13, 2023
c7e5556
Added test case `initialize_bridge_by_governance_works`
bkontur Apr 20, 2023
1dba38d
Added test case `handle_export_message_from_system_parachain_to_outbo…
bkontur Apr 24, 2023
e6fedb9
Added test-case `message_dispatch_routing_works`
bkontur Apr 27, 2023
9c5701c
Squashed 'bridges/' changes from 2180797fbf..4850aac8ce
bkontur Apr 27, 2023
a6bf890
Merge commit '9c5701c8ccafd307cae9abff43e8a3f86e855f47' into bridge-h…
bkontur Apr 27, 2023
1f3d70e
Merge remote-tracking branch 'origin/bridge-hub-subtree' into bridge-…
bkontur Apr 27, 2023
a7b7f39
Fmt
bkontur Apr 27, 2023
6c29018
Merge commit 'fd69d9414cdc2586be3e26d7599dc50b587c7428' into bridge-h…
bkontur Apr 27, 2023
fd69d94
Squashed 'bridges/' changes from 4850aac8ce..66aaf0dd23
bkontur Apr 27, 2023
3d2a818
Merge remote-tracking branch 'origin/bridge-hub-subtree' into bridge-…
bkontur Apr 27, 2023
56aa147
Add JSON chainspecs for Wococo and Rococo Bridge-hub (#2473)
PierreBesson Apr 27, 2023
4f7c913
Merge remote-tracking branch 'origin/master' into bridge-hub-subtree
Apr 27, 2023
4e100ec
Merge remote-tracking branch 'origin/bridge-hub-subtree' into bridge-…
bkontur Apr 27, 2023
cf4a6ef
Companion for paritytech/polkadot#7098 (#2469)
KiChjang Apr 27, 2023
6c5bec5
Cleaning
bkontur Apr 27, 2023
9240ded
level-monitor: Use prroper log target (#2493)
bkchr Apr 28, 2023
ad86283
Bump ruby/setup-ruby from 1.147.0 to 1.148.0 (#2496)
dependabot[bot] Apr 30, 2023
5892628
Skip av-store, make consensus task blocking (#2497)
skunert May 1, 2023
cd91e6b
Bump scale-info from 2.5.0 to 2.6.0 (#2500)
dependabot[bot] May 2, 2023
70b426b
bridge-hub-rococo: minor fixes
acatangiu May 2, 2023
d904495
Bump clap to 4.2.5 (#2505)
May 2, 2023
17fc1c1
Merge remote-tracking branch 'origin/master' into bridge-hub-subtree
bkontur May 3, 2023
8b62a00
Squashed 'bridges/' changes from 66aaf0dd23..557ecbcecc
bkontur May 3, 2023
00e45c5
Merge commit '8b62a005717fbe976832504b1f0c39eee19ac0a6' into bridge-h…
bkontur May 3, 2023
b93712d
fmt
bkontur May 3, 2023
ca6e8ac
Merge remote-tracking branch 'origin/bridge-hub-subtree' into bridge-…
bkontur May 3, 2023
8afd1fb
Fix compile
bkontur May 3, 2023
6612cae
Fix benchmark
bkontur May 3, 2023
0004d04
[ci] Run gha fmt in docker (#2511)
alvicsam May 3, 2023
e6497d4
Merge remote-tracking branch 'origin/master' into bridge-hub-subtree
bkontur May 3, 2023
65ee2dc
Squashed 'bridges/' changes from 557ecbcecc..04b3dda6aa
bkontur May 3, 2023
6dd9e36
Merge commit '65ee2dc77f5c0832f48b5331371483ff5c3c2574' into bridge-h…
bkontur May 3, 2023
6f7e193
Merge remote-tracking branch 'origin/bridge-hub-subtree' into bridge-…
bkontur May 3, 2023
a93f995
Fix
bkontur May 3, 2023
1a986c5
".git/.scripts/commands/fmt/fmt.sh"
May 3, 2023
499d9a2
Merge remote-tracking branch 'origin/bridge-hub-subtree' into bridge-…
May 3, 2023
e6b02ea
".git/.scripts/commands/bench/bench.sh" pallet bridge-hub-rococo brid…
May 3, 2023
22d1f8e
".git/.scripts/commands/bench/bench.sh" pallet bridge-hub-rococo brid…
May 3, 2023
68cd27a
".git/.scripts/commands/bench/bench.sh" pallet bridge-hub-rococo brid…
May 3, 2023
dbb1a7e
".git/.scripts/commands/bench/bench.sh" pallet bridge-hub-rococo brid…
May 3, 2023
1182cfc
Companion PR for add events to ContractResult (#2510)
juangirini May 3, 2023
8ca3fc4
Bump tokio from 1.27.0 to 1.28.0 (#2508)
dependabot[bot] May 3, 2023
f632ad7
Bump clap from 4.2.5 to 4.2.7 (#2516)
dependabot[bot] May 3, 2023
c78addf
Merge branch 'bridge-hub-rococo-wococo' into alistair/merged-rococo-w…
alistair-singh May 5, 2023
08f0981
updated dependencies
alistair-singh May 5, 2023
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
Prev Previous commit
Next Next commit
Updated REAMDE.md and BRIDGES.md (inspired by original https://github…
  • Loading branch information
bkontur committed Apr 17, 2023
commit 1e489dddce1f36824bfe00157f9972f7e7ad22ee
88 changes: 88 additions & 0 deletions BRIDGES.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
# Using Parity Bridges Common dependency (`git subtree`).

In `./bridges` sub-directory you can find a `git subtree` imported version of:
[parity-bridges-common](https://github.com/paritytech/parity-bridges-common/) repository.

(For regular Cumulus contributor 1. is relevant) \
(For Cumulus maintainer 1. and 2. are relevant) \
(For Bridges team 1. and 2. and 3. are relevant)

# 1. How to fix broken Bridges code?

To fix Bridges code simply create a commit in current (`Cumulus`) repo. Best if
the commit is isolated to changes in `./bridges` sub-directory, because it makes
it easier to import that change back to upstream repo.

(Any changes to `bridges` subtree require Bridges team approve and they should manage backport to Bridges repo)


# 2. How to pull latest Bridges code to the `bridges` subtree
(in practice)
```
cd <cumulus-git-repo-dir>

# this will update new git branches from bridges repo
# there could be unresolved conflicts, but dont worry,
# lots of them are caused because of removed unneeded files with patch step,
./scripts/bridges_update_subtree.sh fetch

# so, after fetch and before solving conflicts just run patch,
# this will remove unneeded files and checks if subtree modules compiles
./scripts/bridges_update_subtree.sh patch

# if there are conflicts, this could help,
# this removes locally deleted files at least (move changes to git stash for commit)
./scripts/bridges_update_subtree.sh merge

# (optional) when conflicts resolved, you can check build again - should pass
# also important: this updates global Cargo.lock
./scripts/bridges_update_subtree.sh patch

# add changes to the commit, first command `fetch` starts merge,
# so after all conflicts are solved and patch passes and compiles,
# then we need to finish merge with:
git merge --continue
````

# 3. How to pull latest Bridges code or contribute back?
(in theory)

Note that it's totally fine to ping the **Bridges Team** to do that for you. The point
of adding the code as `git subtree` is to **reduce maintenance cost** for Cumulus/Polkadot
developers.

If you still would like to either update the code to match latest code from the repo
or create an upstream PR read below. The following commands should be run in the
current (`polkadot`) repo.

1. Add Bridges repo as a local remote:
```
$ git remote add -f bridges git@github.com:paritytech/parity-bridges-common.git
```

If you plan to contribute back, consider forking the repository on Github and adding
your personal fork as a remote as well.
```
$ git remote add -f my-bridges git@github.com:tomusdrw/parity-bridges-common.git
```

2. To update Bridges:
```
$ git fetch bridges master
$ git subtree pull --prefix=bridges bridges master --squash
````

We use `--squash` to avoid adding individual commits and rather squashing them
all into one.

3. Clean unneeded files here:
```
./bridges/scripts/verify-pallets-build.sh --ignore-git-state --no-revert
```

4. Contributing back to Bridges (creating upstream PR)
```
$ git subtree push --prefix=bridges my-bridges master
```
This command will push changes to your personal fork of Bridges repo, from where
you can simply create a PR to the main repo.
38 changes: 0 additions & 38 deletions parachains/runtimes/bridge-hubs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,41 +35,3 @@ or
# BridgeHubPolkadot
zombienet-linux --provider native spawn ./zombienet/examples/bridge_hub_polkadot_local_network.toml
```

----
## Git subtree `./bridges`

Add Bridges repo as a local remote and synchronize it with latest `master` from bridges repo:

### How to update `bridges` subtree
```
cd <cumulus-git-repo-dir>
# this will update new git branches from bridges repo
# there could be unresolved conflicts, but dont worry,
# lots of them are caused because of removed unneeded files with patch step :)
# so before solving conflicts just run patch
./scripts/bridges_update_subtree.sh fetch
# this will remove unneeded files and checks if subtree modules compiles
./scripts/bridges_update_subtree.sh patch
# if there are conflicts, this could help, removes locally deleted files at least
# (but you can also do this manually)
./scripts/bridges_update_subtree.sh merge
# when conflicts resolved, you can check build again - should pass
# also important: this updates global Cargo.lock
./scripts/bridges_update_subtree.sh patch
````
We use `--squash` to avoid adding individual commits and rather squashing them
all into one.
Now we use `master` branch, but in future, it could change to some release branch/tag.

### How was first time initialized (does not need anymore)
```
cd <cumulus-git-repo-dir>
git remote add -f bridges git@github.com:paritytech/parity-bridges-common.git
# (ran just only first time, when subtree was initialized)
git subtree add --prefix=bridges bridges master --squash
# remove unnecessery files
./scripts/bridges_update_subtree.sh patch
./scripts/bridges_update_subtree.sh merge
git commit --amend
```