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

Companion for better way to resolve Phase::Emergency via governance #10663 #4757

Merged
merged 4 commits into from
Jan 27, 2022
Merged

Companion for better way to resolve Phase::Emergency via governance #10663 #4757

merged 4 commits into from
Jan 27, 2022

Conversation

georgesdib
Copy link
Contributor

Companion to paritytech/substrate#10663

Adding GovernanceFallback after changes in substrate in the accompanying PR.

@georgesdib georgesdib mentioned this pull request Jan 20, 2022
Merged
@kianenigma kianenigma requested review from bkchr and emostov January 26, 2022 17:08
bkchr
bkchr approved these changes Jan 26, 2022
View reviewed changes
Copy link
Member

@bkchr bkchr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving it for @kianenigma

But I still find it weird that we set the GovernanceFallback to what it should be set for test nets :D

@paritytech-processbot
Copy link

Merge cancelled due to error. Error: Command 'Command { std: "git" "push" "georgesdib" "election-onchain-backup", kill_on_drop: false }' failed with status Some(1); output: To https://github.com/georgesdib/polkadot.git
! [remote rejected] election-onchain-backup -> election-onchain-backup (refusing to allow a GitHub App to create or update workflow .github/workflows/publish-draft-release.yml without workflows permission)
error: failed to push some refs to 'https://x-access-token:${SECRET}@github.com/georgesdib/polkadot.git'

@kianenigma
Copy link
Contributor

yeah, sorry, I should've known that this companion model would fail :(

@kianenigma
Copy link
Contributor

@georgesdib can you give me and Basti access to your fork so either of us can update and merge this?

@georgesdib
Copy link
Contributor Author

georgesdib commented Jan 27, 2022 •
edited
Loading

@georgesdib can you give me and Basti access to your fork so either of us can update and merge this?

Done, sorry about this, what is the error though? Is it because I don't have access to the substrate repo and you didn't have access to my polkadot repo?

@bkchr bkchr added B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. D3-trivial 🧸 PR contains trivial changes in a runtime directory that do not require an audit. A0-please_review Pull request needs code review. labels Jan 27, 2022
@bkchr
Copy link
Member

bkchr commented Jan 27, 2022

bot merge

@bkchr bkchr merged commit f8afb49 into paritytech:master Jan 27, 2022
@bkchr bkchr deleted the election-onchain-backup branch January 27, 2022 14:43
ordian added a commit that referenced this pull request Jan 27, 2022
@ordian
Merge branch 'master' into refactor_check_validation_outputs
675dde3 
* master:
  Fix incomplete sorting. (#4795)
  Companion for better way to resolve `Phase::Emergency` via governance #10663 (#4757)
  Refactor and fix usage of `get_session_index()` and `get_session_info_by_index()` (#4735)
  `relay chain selection` and `dispute-coordinator` fixes and improvements (#4752)
  Fix tests (#4787)
  log concluded disputes (#4785)
  availability-distribution: look for leaf ancestors within the same session (#4596)
  Companion for Use proper bounded vector type for nominations #10601 (#4709)
  Fix release profile (#4778)
  [ci] remove publish-s3-release (#4779)
  Companion for substrate#10632 (#4689)
  [ci] pipeline chores (#4775)
  New changelog scripts (#4491)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@kianenigma kianenigma kianenigma approved these changes

@bkchr bkchr bkchr approved these changes

@emostov emostov Awaiting requested review from emostov

Assignees
No one assigned
Labels
A0-please_review Pull request needs code review. B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. D3-trivial 🧸 PR contains trivial changes in a runtime directory that do not require an audit.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@georgesdib @kianenigma @bkchr