Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support protocol hotfixing #613

Merged
merged 119 commits into from
Nov 1, 2019
Merged

Support protocol hotfixing #613

merged 119 commits into from
Nov 1, 2019

Conversation

bricewang
Copy link
Contributor

@bricewang bricewang commented Aug 17, 2019

Description

Implements 3 phase hotfixes (whitelist, prepare, execute):

  • a byzantine quorum of validators must "whitelist" a hotfix for it to be "preparable"
  • an approver must "whitelist" a hotfix for it to be "preparable"
  • anyone can "prepare" a hotfix provided the whitelist criteria are met which makes it "executable" for the current epoch
  • anyone with the raw transaction that derives a hotfix hash can "execute" it in an epoch where it has been marked "prepared"

Tested

Added Governance tests for whitelistHotfix, prepareHotfix, executeHotfix' and isHotfixPassingAdded e2e-tests for validator byzantine quorum Added Validator tests forgetEpochNumber`

Related issues

Backwards compatibility

All new

m-chrzan and others added 30 commits July 23, 2019 13:51
* Add pilotstaging mnemonic to gitignore

* Make a safer gitignore for hiding mnemonics

* Add pilotstaging enc mnemonic

* Change the pilotstaging blockscout prefix

* Deploy pilotstaging

* Revert back to 10 minElectableValidators

* Add pilot mnemonic and encrypt

* Changes required for deploying pilot services

* Keep old .enc files

* Use old .enc files

* Use old .enc files for google-services

* Update pilot mnemonics

* Redeploy pilot and pilotstaging
@asaj asaj removed their assignment Oct 25, 2019
packages/protocol/contracts/governance/Governance.sol Outdated Show resolved Hide resolved
packages/protocol/contracts/governance/Governance.sol Outdated Show resolved Hide resolved
packages/protocol/contracts/governance/Governance.sol Outdated Show resolved Hide resolved
packages/protocol/test/governance/governance.ts Outdated Show resolved Hide resolved
packages/protocol/contracts/governance/Governance.sol Outdated Show resolved Hide resolved
packages/protocol/contracts/governance/Governance.sol Outdated Show resolved Hide resolved
packages/protocol/contracts/governance/Governance.sol Outdated Show resolved Hide resolved
packages/protocol/contracts/governance/Governance.sol Outdated Show resolved Hide resolved
@asaj asaj removed their assignment Oct 29, 2019
@yorhodes yorhodes added the automerge Have PR merge automatically when checks pass label Oct 31, 2019
@celo-ci-bot-user celo-ci-bot-user merged commit 0f38aab into master Nov 1, 2019
@celo-ci-bot-user celo-ci-bot-user deleted the bricewang/hotfixing branch November 1, 2019 20:02
aaronmgdr added a commit that referenced this pull request Nov 2, 2019
* master: (62 commits)
  Fix e2e on CI (#1537)
  Allow a specified address to disable/enable the Exchange  (#1467)
  Avoid re-encrypting key files with yarn keys:encrypt command (#1560)
  Support protocol hotfixing (#613)
  Point e2e tests back (#1562)
  Refactor to Accounts.sol (#1392)
  Add selectIssuers Transaction (#1327)
  [Wallet] Get React Native Hot Reloading Working (#1551)
  Unify to prefix messages for signing (#1473)
  [Wallet] Improve error handling around account creation and keystore ops (#1497)
  Add CI test for checking licenses and misc package.json cleanup (#1550)
  [Wallet] Implement SMS invite on iOS (#1541)
  CI: brings back to master (#1554)
  Validators: uses Ethereum address for proof of possession (#1494)
  Validate Attestation Requests (#1468)
  Rename hosted node references to forno (#1511)
  Bump rubyzip from 1.2.3 to 1.3.0 in /packages/mobile (#1508)
  Added txpool family to geth apis. Sorted geth cmd options (#1462)
  [Wallet] Fix yarn dev command for running android (#1534)
  [Wallet] iOS info plist changes and version bump (#1539)
  ...

# Conflicts:
#	yarn.lock
aaronmgdr added a commit that referenced this pull request Dec 5, 2019
* master: (73 commits)
  Fix Ethstats Image reference (#1577)
  EU Cookies Behavior Change (#1447)
  [verifier] Upgrade to RN 61 (#1572)
  [Wallet] Update link styles and Implement VerificationEducationScreen (#1565)
  [wallet] Added native phone picker (#1310)
  [Wallet] Set up new verification screen skeletons (#1563)
  Bump e2e test migrate numbers where needed (#1567)
  [Wallet] Create new carousel component (#1555)
  [Wallet] Protect Backup Key and Safeguards with PIN (#1556)
  Increase ganache gas limit (#1569)
  Re-work locked gold requirements for validators and groups (#1474)
  Fix e2e on CI (#1537)
  Allow a specified address to disable/enable the Exchange  (#1467)
  Avoid re-encrypting key files with yarn keys:encrypt command (#1560)
  Support protocol hotfixing (#613)
  Point e2e tests back (#1562)
  Refactor to Accounts.sol (#1392)
  Add selectIssuers Transaction (#1327)
  [Wallet] Get React Native Hot Reloading Working (#1551)
  Unify to prefix messages for signing (#1473)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Have PR merge automatically when checks pass protocol All issues relating to protocol packages
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Protocol SBAT receive zero-day reports and hotfix vulnerabilities
10 participants