Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
115 commits
Select commit Hold shift + click to select a range
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
d904495
Bump clap to 4.2.5 (#2505)
May 2, 2023
0004d04
[ci] Run gha fmt in docker (#2511)
alvicsam May 3, 2023
22c06e1
Companion PR for add events to ContractResult (#2510)
juangirini May 3, 2023
72256f6
Bump tokio from 1.27.0 to 1.28.0 (#2508)
dependabot[bot] May 3, 2023
ee82e3f
Bump clap from 4.2.5 to 4.2.7 (#2516)
dependabot[bot] May 3, 2023
9e1afca
Initial version of bridging pallets as git subtree (#2458)
bkontur May 4, 2023
aa1b87c
BridgeHub Rococo/Wococo runtimes (#2111)
bkontur May 4, 2023
053f670
companion for #13384 (#2417)
niklasad1 May 4, 2023
df68186
Companion for #13701 (#2423)
arkpar May 4, 2023
ab7ce3b
Bump parity-scale-codec from 3.4.0 to 3.5.0 (#2523)
dependabot[bot] May 4, 2023
4e82c97
Companion: XCM remote lock config (#2463)
muharem May 5, 2023
1bddaae
Update DNS names of Rococo Contracts bootnodes (#2524)
bakhtin May 5, 2023
0d04b8b
bump zombienet version (#2525)
pepoviola May 5, 2023
4dc50c8
Make zombienet tests required (#2527)
skunert May 6, 2023
c312f0b
Fix Clippy (#2522)
ggwpez May 6, 2023
0aae05b
Bump serde from 1.0.160 to 1.0.162 (#2534)
dependabot[bot] May 6, 2023
8904a44
Update westmint bootnodes (#2521)
May 7, 2023
35a443d
companion for #14088 (#2539)
niklasad1 May 7, 2023
c94d64c
add set_invulnerables to SafeCallFilter (#2537)
joepetrowski May 8, 2023
6cba4b4
Substrate 13843 (Asset Freezing) Companion (#2437)
joepetrowski May 8, 2023
97984e4
Prevent name clash with Substrate Pallet Template (#2536)
ggwpez May 8, 2023
1ab6b2f
Bump quote from 1.0.26 to 1.0.27 (#2548)
dependabot[bot] May 9, 2023
e623cf1
Bump array-bytes from 6.0.0 to 6.1.0 (#2549)
dependabot[bot] May 9, 2023
859604a
Collectives: xcm base weights (#2550)
muharem May 10, 2023
94d56a7
[Backport] weights from 9420 (#2562)
EgorPopelyaev May 11, 2023
8ec0778
Companion for paritytech/substrate#14080 (#2526)
altonen May 11, 2023
cc4038c
Substrate Companion (#2514)
May 11, 2023
0ea1814
companion PR for https://github.com/paritytech/substrate/pull/13373 (…
hirschenberger May 11, 2023
233e3a9
docs: fix build command and some broken links (#2567)
agryaznov May 11, 2023
b3da625
Bump parity-db (#2559)
arkpar May 12, 2023
c24dcd8
[Substrate Companion] Upgrade to libp2p 0.51.3 (#2429)
melekes May 12, 2023
d4caecb
[Backport] version bumps from 9420 (#2561)
EgorPopelyaev May 12, 2023
f7bed4b
Relay-parent digest logs for parachains (#2552)
rphmeier May 13, 2023
89b7b06
Consensus utilities and rearchitecture for more dynamic collators (#2…
rphmeier May 14, 2023
45bae90
remove sp-serializer (#2574)
yjhmelody May 15, 2023
77d8b5b
Bump serde from 1.0.162 to 1.0.163 (#2568)
dependabot[bot] May 15, 2023
a82d5af
Bump tokio from 1.28.0 to 1.28.1 (#2564)
dependabot[bot] May 15, 2023
8a2c762
Bump anyhow from 1.0.69 to 1.0.71 (#2584)
dependabot[bot] May 15, 2023
02b7034
Bump polkadot (#2585)
tdimitrov May 16, 2023
c409dc1
Collectives integration tests xcm v3 (#2221)
muharem May 16, 2023
e23be19
BridgeHubRococo/Wococo nits + updated subtree (#2572)
bkontur May 16, 2023
fcf1b67
Glutton Parachain (#2294)
Szegoo May 17, 2023
48d01c4
Bump polkadot (#2589)
bkontur May 17, 2023
dd48e3a
Added Dwellir bootnodes. (#2557)
Maharacha May 17, 2023
99df7d0
Bump scale-info from 2.6.0 to 2.7.0 (#2587)
dependabot[bot] May 17, 2023
97899fb
Bump proc-macro2 from 1.0.56 to 1.0.58 (#2592)
dependabot[bot] May 17, 2023
974dc46
BridgeHub[Rococo/Wococo] test batched relaying of messages and their …
acatangiu May 18, 2023
6aaf894
Bump toml from 0.7.3 to 0.7.4 (#2598)
dependabot[bot] May 18, 2023
e2a3cf2
Bump bridges (#2602)
bkontur May 19, 2023
95f2c0c
Removed Cargo.lock from subtreee (#2604)
bkontur May 19, 2023
b7082d1
[Feature] XCM-Emulator (#2447)
ruseinov May 19, 2023
8f40400
Update README.md (#2603)
takahser May 19, 2023
d090ac0
Update syn (#2605)
ggwpez May 20, 2023
8cb913d
Switch to `relay_dispatch_queue_remaining_capacity` (#2608)
bkchr May 21, 2023
ba8f89b
update WasmExecutionMethod (#2599)
yjhmelody May 21, 2023
9608ea1
Bump ruby/setup-ruby from 1.148.0 to 1.149.0 (#2581)
dependabot[bot] May 22, 2023
1f75cb9
Bump Swatinem/rust-cache from 2.2.1 to 2.3.0 (#2582)
dependabot[bot] May 22, 2023
04d4333
Chainspecs: Fix bootnode address (#2611)
bkchr May 22, 2023
673e9f6
Update substrate/polkadot + needed changes to compile (#2613)
gilescope May 22, 2023
5cb68fa
Nfts on Statemint (#2595)
jsidorenko May 23, 2023
014ce4b
Try-runtime proper return types (#2615)
Szegoo May 23, 2023
175643f
NFT Fractionalization on Westmint (#2600)
jsidorenko May 23, 2023
0c7ce72
Do not assume `AssetId`s are `Copy` (companion for substrate#14158) (…
koute May 23, 2023
ca5b329
Bump Swatinem/rust-cache from 2.3.0 to 2.4.0 (#2617)
dependabot[bot] May 23, 2023
fab8d1f
use `WasmExecutionMethod::default()` (#2622)
yjhmelody May 23, 2023
80ca5ee
Use default for test relay runtimes (#2616)
gilescope May 23, 2023
e19df87
Companion for substrate#14188 (Add genesis config to Glutton pallet) …
NachoPal May 23, 2023
6cf3618
Bump casey from 0.3.3 to 0.4.0 (#2619)
dependabot[bot] May 23, 2023
415dd81
Add Foreign Assets to Statemint (#2540)
joepetrowski May 23, 2023
ab2fd8b
Change SA for Rococo/Statemine_1000 + removed `CheckedExtrinsic` (#2627)
bkontur May 23, 2023
13a1908
Companion for #14178: Update cargo.lock to point to substrate (#2623)
lexnv May 24, 2023
e20ef8f
Updated README.md for bridges (#2629)
bkontur May 24, 2023
a113748
add statemine emulator tests (#2630)
gilescope May 24, 2023
06025a6
Bump criterion from 0.4.0 to 0.5.0 (#2628)
dependabot[bot] May 24, 2023
888b543
Update & revamp e2e tests (#2614)
NachoPal May 24, 2023
0ab6f90
Bump clap from 4.2.7 to 4.3.0 (#2634)
dependabot[bot] May 24, 2023
7e7209b
Companion for: Substrate#13869 (#2631)
bkchr May 24, 2023
aa147f0
fix typo (#2635)
gilescope May 25, 2023
9baff09
bump zombienet version (#2637)
pepoviola May 25, 2023
e9bfaa9
bump substrate version (#2640)
gilescope May 25, 2023
10afc2f
Companion for polkadot#7234 (XCM: Tools for uniquely referencing mess…
gavofyork May 25, 2023
08aa94d
Companion for Polkadot 7253 (#2621)
mrcnski May 25, 2023
41cc2a7
pallets: implement `Default` for `GenesisConfig` in `no_std` (#2624)
michalkucharczyk May 25, 2023
c608131
polkompanion 6667: past session slashing (#2160)
ordian May 26, 2023
582842a
Bump quote from 1.0.27 to 1.0.28 (#2646)
dependabot[bot] May 27, 2023
006c7b6
Bump proc-macro2 from 1.0.58 to 1.0.59 (#2647)
dependabot[bot] May 28, 2023
85c1c2e
Bump criterion from 0.5.0 to 0.5.1 (#2645)
dependabot[bot] May 28, 2023
8bc5645
Bump peaceiris/actions-gh-pages from 3.9.0 to 3.9.3 (#2412)
dependabot[bot] May 28, 2023
fe42c3b
Bump bumpalo from 3.8.0 to 3.12.0 (#2120)
dependabot[bot] May 28, 2023
02f0bf7
Glutton script chain spec generator (#2638)
NachoPal May 29, 2023
d56b4d8
Companion for #14237: Use latest sp-crates (#2643)
lexnv May 29, 2023
f67d582
Bump ruby/setup-ruby from 1.149.0 to 1.150.0 (#2618)
dependabot[bot] May 29, 2023
abccfae
Add Ability to Add/Remove Invulnerable Collators (#2596)
joepetrowski May 29, 2023
108b86c
Bump syn from 2.0.16 to 2.0.18 (#2650)
dependabot[bot] May 30, 2023
3a16431
Bump log from 0.4.17 to 0.4.18 (#2651)
dependabot[bot] May 31, 2023
98e68bd
Add correct Sign Extensions to Glutton parachain (#2656)
NachoPal May 31, 2023
5dd73ad
Companion for #14265 (#2655)
lexnv May 31, 2023
bbc2b13
cargo check passes now
kianenigma May 31, 2023
a4744f0
tests also 'run', but not all might pass yes
kianenigma Jun 1, 2023
8805bfc
checkpoint for oliver to see
kianenigma Jun 1, 2023
e5e744d
Bump tokio from 1.28.1 to 1.28.2 (#2652)
dependabot[bot] Jun 1, 2023
f8b6240
bump serde to 1.0.163 (#2661)
sam0x17 Jun 1, 2023
d6e4269
Serialize/Deserialize trait implemented in no-std for numerous types …
michalkucharczyk Jun 1, 2023
3d7604e
doc fix (#2676)
michalkucharczyk Jun 1, 2023
c795d6e
docs: Ensure the CI passes for docs (#2666)
lexnv Jun 1, 2023
7e4f186
Adds missing features (#2677)
bkchr Jun 2, 2023
80aaed3
Rename Statemint to Asset Hub (#2633)
joepetrowski Jun 2, 2023
93b7fe3
Support westend integration tests (#2649)
gilescope Jun 2, 2023
e42795b
Bump clap from 4.3.0 to 4.3.1 (#2682)
dependabot[bot] Jun 3, 2023
7b6c3db
Update Substrate & Polkadot (#2687)
bkchr Jun 4, 2023
c833df0
I think I fixed that test
kianenigma Jun 4, 2023
b5f44e9
holy merge master again...
kianenigma Jun 4, 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
Initial version of bridging pallets as git subtree (#2458)
* Initial version of bridges pallet as subtree of https://github.com/paritytech/parity-bridges-common
Added `Bridges subtree files` pr review rule

* Squashed 'bridges/' content from commit d30927c08

git-subtree-dir: bridges
git-subtree-split: d30927c089bd9e73092d1ec1a62895603cb277a3

* Updated REAMDE.md and BRIDGES.md (inspired by original https://github.com/paritytech/polkadot/blob/d22eb62fe40e55e15eb91d375f48cc540d83a47e/BRIDGES.md)

* Squashed 'bridges/' changes from d30927c08..d3970944b

d3970944b Small simplifications (#2050)

git-subtree-dir: bridges
git-subtree-split: d3970944b0cfc4ea5226225e1ca07dab234c3556

* Squashed 'bridges/' changes from d3970944b..2180797fb

2180797fb Removed CODEOWNERS (#2051)

git-subtree-dir: bridges
git-subtree-split: 2180797fbf8a990490c67853dcffd81bc8dd083c

* Squashed 'bridges/' changes from 2180797fbf..4850aac8ce

4850aac8ce Removed relayer_account: &AccountId from MessageDispatch  (#2080)
8c8adafd54 Revert "Fix max-size messages at test chains (#2064)" (#2077)
c01a63efd8 Fixed off-by-one when confirming rewards in messages pallet (#2075)
a298be96aa Update subxt dependencies (#2072)
c0eef51eab Fix max-size messages at test chains (#2064)
3a658e3697 Messages relay fixes (#2073)
0022b5ab22 Slash relayers for invalid transactions (#2025)
198104007f Bump enumflags2 from 0.7.5 to 0.7.7
9229b257e5 [ci] Fix rules for docker build (#2069)
660d791390 [ci] Update buildah command and version (#2058)
e4535c0ca4 fix the way latest_confirmed_nonce_at_source is "calculated" (#2067)
dbc2d37590 select nothing if we have already selected nonces to submit or have submitted something (#2065)
a7eedd21fe [relay-substrate-client] Bump jsonrpsee (#2066)
8875d5aeae Bump clap from 4.2.2 to 4.2.4
25f9cf55e2 Another use of RangeInclusiveExt::checked_len() (#2060)
4942c12a5f submit lane unblock transactions from relay (#2030)
c0325d3c9c Test deployments fixes (#2057)
fc7b9b7ed7 Use the new matrix server (#2056)
63bcb5c10b Fixed delivery alert rule (#2052)

git-subtree-dir: bridges
git-subtree-split: 4850aac8ce6c34e5ca6246b88cd14c873a879cba

* Squashed 'bridges/' changes from 4850aac8ce..66aaf0dd23

66aaf0dd23 Nits (#2083)

git-subtree-dir: bridges
git-subtree-split: 66aaf0dd239dde40b64264061a77c921e2c82568

* Squashed 'bridges/' changes from 66aaf0dd23..557ecbcecc

557ecbcecc Fix sized messages (Follow-up on #2064) (#2103)
54f587a066 Add weight of refund extension post_dispatch to the weights of messages pallet (#2089)
5b1626f8c4 fix pallet param for nightly benchmarks check (#2099)
ae44c6b7a1 Add millau specific messages weights (#2097)
6ad0bd1f1e Add integrity tests to rialto parachain runtiime (#2096)
6919556de5 Bump tokio from 1.27.0 to 1.28.0
58795fcb75 Bump clap from 4.2.4 to 4.2.5
01bf31085b Bump scale-info from 2.5.0 to 2.6.0
8fe383240d Bump anyhow from 1.0.70 to 1.0.71
8d94e82ad5 deployments: add new BEEFY metrics and alarms (#2090)
e9a4749e7e Bump wasmtime from 6.0.1 to 6.0.2
9d9936c0d9 Bump wasmtime from 6.0.1 to 6.0.2 in /tools/runtime-codegen
5d77cd7bee Add more logs to relayer and message pallets (#2082)
75fbb9d3ef Update comment (#2081)
9904d09cf6 Benchmarks for new relayers pallet calls (#2040)

git-subtree-dir: bridges
git-subtree-split: 557ecbcecc585547b744a5ac9fb8d7f3b9de4521

* fmt

* Squashed 'bridges/' changes from 557ecbcecc..04b3dda6aa

04b3dda6aa Remove from subtree (#2111)
f8ff15e7e7 Add `MessagesPalletInstance` for integrity tests (#2107)
92ccef58e6 Use generated runtimes for BHR/BHW (#2106)
b33e0a585b Fix comment (#2105)

git-subtree-dir: bridges
git-subtree-split: 04b3dda6aa38599e612ff637710b6d2cff275ef3

* ".git/.scripts/commands/fmt/fmt.sh"

---------

Co-authored-by: parity-processbot <>
  • Loading branch information
bkontur authored May 4, 2023
commit 9e1afcafb580b77379bebb60bb823f05c9ef8a16
10 changes: 9 additions & 1 deletion .github/pr-custom-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,20 @@ rules:
check_type: changed_files
condition:
include: .*
# excluding files from 'Runtime files' and 'CI files' rules
# excluding files from 'Runtime files' and 'CI files' rules and `Bridges subtree files`
exclude: ^parachains/runtimes/assets/(statemine|statemint)/src/[^/]+\.rs$|^parachains/runtimes/bridge-hubs/(bridge-hub-kusama|bridge-hub-polkadot)/src/[^/]+\.rs$|^parachains/runtimes/collectives/collectives-polkadot/src/[^/]+\.rs$|^parachains/common/src/[^/]+\.rs$|^\.gitlab-ci\.yml|^scripts/ci/.*|^\.github/.*
min_approvals: 2
teams:
- core-devs

# if there are any changes in the bridges subtree (in case of backport changes back to bridges repo)
- name: Bridges subtree files
check_type: changed_files
condition: ^bridges/.*
min_approvals: 1
teams:
- bridges-core

- name: CI files
check_type: changed_files
condition:
Expand Down
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.
Loading