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

Update BEEFY+MMR integration.#3480

Merged
adoerr merged 5 commits intomasterfrom
td-merkle
Jul 16, 2021
Merged

Update BEEFY+MMR integration.#3480
adoerr merged 5 commits intomasterfrom
td-merkle

Conversation

@tomusdrw
Copy link
Copy Markdown
Contributor

@tomusdrw tomusdrw commented Jul 15, 2021

This PR changes the way we construct merkle trees for parachains and BEEFY validator set.

Note that the pallet code that previously was part of common/src/mmr.rs is now part of BEEFY repository (paritytech/grandpa-bridge-gadget#236)

@tomusdrw tomusdrw requested a review from adoerr July 15, 2021 15:11
@ordian
Copy link
Copy Markdown

ordian commented Jul 15, 2021

@drahnr could please help fixing spellcheck https://gitlab.parity.io/parity/polkadot/-/jobs/1016684?

@drahnr
Copy link
Copy Markdown
Contributor

drahnr commented Jul 15, 2021 •
edited
Loading

@drahnr could please help fixing spellcheck https://gitlab.parity.io/parity/polkadot/-/jobs/1016684?

Working on a spellcheck fixing manifest, WIP.

For the particular CI failures:

error: spellcheck(Hunspell)
    --> /builds/parity/polkadot/runtime/rococo/src/lib.rs:858
     |
[2021-07-15T15:11:30Z WARN  cargo_spellcheck::suggestion] Unable to get terminal size. Using default: 80
 858 |  See [MmrLeafVersion] type documentation for more details.
     |       ^^^^^^^^^^^^^^
     |   Possible spelling mistake found.
error: spellcheck(Hunspell)
    --> /builds/parity/polkadot/runtime/rococo/src/lib.rs:858
     |
[2021-07-15T15:11:30Z INFO  cargo_spellcheck::action] ❌ /builds/parity/polkadot/runtime/rococo/src/lib.rs : 2
 858 |  See [MmrLeafVersion] type documentation for more details.
     |       ^^^^^^^^^^^^^^
     |   Possible spelling mistake found.

should become

[`MmrLeafVersion`]

@ordian which is why the pass currently is {"build_allow_failure":true} to avoid an hold-ups until the spellcheck-fixup manifest is complete

@tomusdrw tomusdrw added 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. D2-notlive 💤 PR contains changes in a runtime directory that is not deployed to a chain that requires an audit. labels Jul 15, 2021
@tomusdrw
Copy link
Copy Markdown
Contributor Author

tomusdrw commented Jul 15, 2021

CC @musnit @philipstanislaus

philipstanislaus
philipstanislaus approved these changes Jul 16, 2021
View reviewed changes
Copy link
Copy Markdown

@philipstanislaus philipstanislaus left a comment

Choose a reason for hiding this comment

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

Nice, thanks 🙏

adoerr
adoerr approved these changes Jul 16, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@adoerr adoerr left a comment

Choose a reason for hiding this comment

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

LGTM. I did a smoke test with rococo-local.

@adoerr adoerr merged commit 0c670d8 into master Jul 16, 2021
@adoerr adoerr deleted the td-merkle branch July 16, 2021 13:13
ordian added a commit that referenced this pull request Jul 20, 2021
@ordian
Merge branch 'master' into ao-enable-disputes
74f0319 
* master:
  Update secp256k1 and remove unrequired usage (#3502)
  Bump libc from 0.2.91 to 0.2.98 (#3496)
  Bump slotmap from 1.0.2 to 1.0.5 (#3495)
  Gossip rebroadcast rate limiter (#3494)
  dependabot: ignore another git dep (#3493)
  add rustfmt toml (#3491)
  Disputes runtime (#2947)
  Bump async-process from 1.0.1 to 1.1.0 (#3122)
  remove the kubernetes helm chart (#3483)
  added pallet-proxy in rococo feature dependencies (#3486)
  Update BEEFY+MMR integration. (#3480)
  more verbose asserts (#3476)
  ci: use srtool-actions to build runtimes (#3423)
  overseer gen minor chore fixes (#3479)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

3 more reviewers

@svyatonik svyatonik svyatonik approved these changes

@philipstanislaus philipstanislaus philipstanislaus approved these changes

@adoerr adoerr adoerr approved these changes

Reviewers whose approvals may not affect merge requirements

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. D2-notlive 💤 PR contains changes in a runtime directory that is not deployed to a chain that requires an audit.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@tomusdrw @ordian @drahnr @svyatonik @philipstanislaus @adoerr