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

Allow to build_upon skipped entries, but don't walk back #635

Merged
merged 2 commits into from
Aug 31, 2018

Conversation

gnunicorn
Copy link
Contributor

No description provided.

@gnunicorn gnunicorn requested a review from rphmeier August 30, 2018 16:21
match handle.status() {
_ if *header.parent_hash() == *live_hash => true, // can always follow with next block.
status::BAD => hash == *live_hash, // bad block can be re-agreed on.
_ if *header != *live_header && *live_header.parent_hash() != header.hash() => true, // can always follow with next block.
Copy link
Contributor

Choose a reason for hiding this comment

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

header.hash() is already computed here and bound to hash

@rphmeier rphmeier merged commit c14b23a into master Aug 31, 2018
@rphmeier rphmeier deleted the ben-skip-a-beat branch August 31, 2018 10:51
gavofyork pushed a commit that referenced this pull request Aug 31, 2018
* Allow to build_upon skipped entries, but don't walk back

* Use existing calculated version
gguoss pushed a commit to chainx-org/substrate that referenced this pull request Sep 3, 2018
)

* Allow to build_upon skipped entries, but don't walk back

* Use existing calculated version
dvdplm added a commit that referenced this pull request Sep 3, 2018
…rs-generic-over-hasher-and-rlpcodec

* origin/master: (26 commits)
  Contract runtime polishing (#601)
  WIP on chain heap (#639)
  Events to track extrinsic success (#640)
  Install llvm-tools-preview component (#643)
  fix wasm executor compile error (#631)
  random fixes (#638)
  Empty becomes (), reflecting convention (#637)
  Allow to build_upon skipped entries, but don't walk back (#635)
  Separate out staking module into balances and payment (#629)
  Update .gitlab-ci.yml (#633)
  Do not attempt to rustup if in CI. This is taken care of by the base (#621)
  Avoid need for ident strings in storage (#624)
  rename to panic_handler as panic_implementation is deprecated in nightly (#626)
  5 random fixes (#2) (#623)
  fix one typo in README (#627)
  Misspelled words (#625)
  Contracts: Per block gas limit (#506)
  Make sure to ban invalid transactions. (#615) (#620)
  Forward-port BFT fixes from v0.2 and restructure agreement cancelling (#619)
  Allow specifying listening multiaddresses (#577)
  ...
dvdplm added a commit that referenced this pull request Sep 4, 2018
* master: (22 commits)
  Introduce treasury and document (#646)
  Off-the-table staking preference (#656)
  Implement function `json_metadata` in `decl_module!` (#654)
  Fix warnings in networking (#652)
  Add a reputation system (#645)
  Check for pruned block state (#648)
  Contract runtime polishing (#601)
  WIP on chain heap (#639)
  Events to track extrinsic success (#640)
  Install llvm-tools-preview component (#643)
  fix wasm executor compile error (#631)
  random fixes (#638)
  Empty becomes (), reflecting convention (#637)
  Allow to build_upon skipped entries, but don't walk back (#635)
  Separate out staking module into balances and payment (#629)
  Update .gitlab-ci.yml (#633)
  Do not attempt to rustup if in CI. This is taken care of by the base (#621)
  Avoid need for ident strings in storage (#624)
  rename to panic_handler as panic_implementation is deprecated in nightly (#626)
  5 random fixes (#2) (#623)
  ...
liuchengxu added a commit to chainx-org/substrate that referenced this pull request Aug 23, 2021
* Init SessionKeyFilterMap in GenesisConfig

* Remove FIXME

* Build wasm

* Add xgrandpa info
helin6 pushed a commit to boolnetwork/substrate that referenced this pull request Jul 25, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants