Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Update Substrate #623

Merged
merged 15 commits into from
Nov 28, 2019
Merged

Update Substrate #623

merged 15 commits into from
Nov 28, 2019

Conversation

gavofyork
Copy link
Member

@gavofyork gavofyork commented Nov 27, 2019

Backports

bkchr and others added 2 commits November 27, 2019 22:10
* Update to latest Substrate master

* Remove unneeded patch + warning

* Update `Cargo.lock`

* Fix tests

* Update again
* Update lock

* Fix
@gavofyork gavofyork added A0-please_review Pull request needs code review. A2-insubstantial Pull request requires no code review (e.g., a sub-repository hash update). labels Nov 27, 2019
@svyatonik
Copy link
Contributor

@gavofyork I was trying to fix polkadot compilation after paritytech/substrate#3833 has been merged && found that there are some other compilation issues + this PR opened. I've fixed compilation, but in a separate branch (just wanted to avoid conflicts if someone else working on this). The branch is based on gav-upsub and it is here: fix_polkadot_for_light_tx_pool3 branch.

So, if help with this PR is required, you could just do:

git cherry-pick 5173d220b3d954d5751a4b2e8fb172d5fd77d948
git cherry-pick 20143b727c538a9afa33fd0f94f7f66fff19ae37

to make it compile.

gavofyork and others added 8 commits November 28, 2019 11:03
- Liberal slash-refunding
- Instant unbonding
* *: Enable authority discovery module

* *: List authority discovery id after parachain validator id

Make sure existing key types don't change their order by appending the
authority discovery id instead of injecting it between im online id and
parachain validator id.

* *: Gate authority discovery module behind feature flag

* cli/src/lib.rs: Fix warnings

* cli/src/lib.rs: Shorten line length
@gavofyork
Copy link
Member Author

gavofyork commented Nov 28, 2019

CI gummed up again and cargo tested locally and all good.

@gavofyork gavofyork merged commit e3a3906 into master Nov 28, 2019
@gavofyork gavofyork deleted the gav-upsub branch November 28, 2019 12:08
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A0-please_review Pull request needs code review. A2-insubstantial Pull request requires no code review (e.g., a sub-repository hash update).
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants