Add basic BABE consensus type by Demi-Marie · Pull Request #2165 · paritytech/substrate

Demi-Marie · 2019-04-01T21:09:58Z

This is only the very beginning of what will likely be another 5-10 KLOC.

parity-cla-bot · 2019-04-01T21:10:00Z

It looks like @demimarie-parity hasn't signed our Contributor License Agreement, yet.

The purpose of a CLA is to ensure that the guardian of a project's outputs has the necessary ownership or grants of rights over all contributions to allow them to distribute under the chosen licence.
Wikipedia

You can read and sign our full Contributor License Agreement at the following URL: https://cla.parity.io

Once you've signed, please reply to this thread with [clabot:check] to prove it.

Many thanks,

Parity Technologies CLA Bot

parity-cla-bot · 2019-04-01T21:10:01Z

It looks like @demimarie-parity hasn't signed our Contributor License Agreement, yet.

The purpose of a CLA is to ensure that the guardian of a project's outputs has the necessary ownership or grants of rights over all contributions to allow them to distribute under the chosen licence.
Wikipedia

You can read and sign our full Contributor License Agreement at the following URL: https://cla.parity.io

Once you've signed, please reply to this thread with [clabot:check] to prove it.

Many thanks,

Parity Technologies CLA Bot

core/consensus/babe/slots/Cargo.toml

core/consensus/babe/src/lib.rs

core/consensus/babe/primitives/src/lib.rs

Co-Authored-By: DemiMarie-parity <48690212+DemiMarie-parity@users.noreply.github.com>

…-babe

core/consensus/babe/primitives/src/lib.rs

core/consensus/babe/src/lib.rs

rphmeier

A couple comments and minor grumbles

core/consensus/babe/primitives/src/lib.rs

This reverts commit af53d76.

This was highly non-trivial, due to cyclic dependencies.

Some of the code duplication was removed using a macro.

rphmeier · 2019-04-08T10:21:29Z

Generally looks good to me. Before merging we should

fix the check-runtime CI (probably some runtime versions need to be bumped)
make sure that this successfully synchronizes Alexander and Emberic Elm
make sure a local testnet authors new blocks successfully

core/consensus/slots/src/lib.rs

core/consensus/babe/src/lib.rs

core/consensus/babe/primitives/src/lib.rs

scripts/node-template-release/Cargo.lock

Co-Authored-By: DemiMarie-parity <48690212+DemiMarie-parity@users.noreply.github.com>

…-babe

Demi-Marie · 2019-04-08T12:34:34Z

@rphmeier

Generally looks good to me. Before merging we should

fix the check-runtime CI (probably some runtime versions need to be bumped)

make sure that this successfully synchronizes Alexander and Emberic Elm

make sure a local testnet authors new blocks successfully

check-runtime CI is fixed. How can I test the remainder?

gnunicorn

Just minor Qs

core/consensus/aura/src/lib.rs

core/consensus/babe/Cargo.toml

Demi-Marie · 2019-04-11T16:20:15Z

@rphmeier can I merge?

bkchr · 2019-04-12T11:28:34Z

@demimarie-parity just update your pr and then it can be merged.

Demi-Marie · 2019-04-12T14:15:49Z

@demimarie-parity just update your pr and then it can be merged.

It seems to already be updated. Is there something I am missing?

bkchr · 2019-04-12T14:16:23Z

The branch has conflicts with master.

…-babe

Add basic BABE consensus type

5161e16

Demi-Marie requested review from gnunicorn and rphmeier April 1, 2019 22:07

gnunicorn reviewed Apr 1, 2019

View reviewed changes

core/consensus/babe/slots/Cargo.toml Outdated Show resolved Hide resolved

core/consensus/babe/src/lib.rs Outdated Show resolved Hide resolved

rphmeier added the A0-please_review Pull request needs code review. label Apr 1, 2019

Merge branch 'master' into demi-babe

f2a7c7e

rphmeier reviewed Apr 2, 2019

View reviewed changes

core/consensus/babe/primitives/src/lib.rs Outdated Show resolved Hide resolved

gnunicorn and others added 3 commits April 2, 2019 10:05

Update core/consensus/babe/slots/Cargo.toml

99d8e29

Co-Authored-By: DemiMarie-parity <48690212+DemiMarie-parity@users.noreply.github.com>

Fix parameterization and run rustfmt

bd0aed2

Merge branch 'demi-babe' of github.com:paritytech/substrate into demi…

e7c8fe1

…-babe

Demi-Marie requested review from gnunicorn and rphmeier April 2, 2019 14:23

rphmeier reviewed Apr 2, 2019

View reviewed changes

core/consensus/babe/primitives/src/lib.rs Outdated Show resolved Hide resolved

rphmeier reviewed Apr 2, 2019

View reviewed changes

core/consensus/babe/src/lib.rs Outdated Show resolved Hide resolved

rphmeier reviewed Apr 2, 2019

View reviewed changes

core/consensus/babe/src/lib.rs Outdated Show resolved Hide resolved

rphmeier reviewed Apr 2, 2019

View reviewed changes

core/consensus/babe/src/lib.rs Outdated Show resolved Hide resolved

rphmeier suggested changes Apr 2, 2019

View reviewed changes

rphmeier added A5-grumble and removed A0-please_review Pull request needs code review. labels Apr 2, 2019

Demi-Marie added 2 commits April 2, 2019 18:31

Respond to review comments

52308bb

Update various Cargo.lock files

af53d76

rphmeier reviewed Apr 3, 2019

View reviewed changes

core/consensus/babe/primitives/src/lib.rs Outdated Show resolved Hide resolved

Demi-Marie added 6 commits April 3, 2019 08:40

Revert "Update various Cargo.lock files"

1458387

This reverts commit af53d76.

Merge branch 'master' into demi-babe

8d27f02

BabeSealSignature → BabeSeal

f353f3b

Move slot code to its own crate

6702946

This was highly non-trivial, due to cyclic dependencies.

Remove redundancy between AuRa and BABE

7e56f95

Some of the code duplication was removed using a macro.

Fix build error

6ffc5be

rphmeier reviewed Apr 8, 2019

View reviewed changes

core/consensus/slots/src/lib.rs Show resolved Hide resolved

bkchr reviewed Apr 8, 2019

View reviewed changes

core/consensus/babe/src/lib.rs Outdated Show resolved Hide resolved

core/consensus/babe/primitives/src/lib.rs Outdated Show resolved Hide resolved

scripts/node-template-release/Cargo.lock Outdated Show resolved Hide resolved

bkchr and others added 6 commits April 8, 2019 08:10

Update core/consensus/babe/src/lib.rs

38491e9

Co-Authored-By: DemiMarie-parity <48690212+DemiMarie-parity@users.noreply.github.com>

Merge branch 'master' of github.com:paritytech/substrate into demi-babe

83eee6f

Remove wrongly added file

1970c19

Fix copyright notice

791b86c

Co-Authored-By: DemiMarie-parity <48690212+DemiMarie-parity@users.noreply.github.com>

Bump impl_version and spec_version

0c4d5c9

Merge branch 'demi-babe' of github.com:paritytech/substrate into demi…

d149ca3

…-babe

devops-parity added the B2-breaksapi label Apr 8, 2019

Demi-Marie added A0-please_review Pull request needs code review. and removed A4-gotissues labels Apr 8, 2019

gnunicorn approved these changes Apr 9, 2019

View reviewed changes

core/consensus/aura/src/lib.rs Outdated Show resolved Hide resolved

core/consensus/babe/Cargo.toml Outdated Show resolved Hide resolved

gnunicorn mentioned this pull request Apr 9, 2019

Allow for customisation of chain selection systems #2240

Merged

2 tasks

Demi-Marie and others added 3 commits April 10, 2019 09:45

Merge branch 'master' into demi-babe

e878b57

Fix deprecation version; remove spurious carets

29d1786

Merge branch 'master' into demi-babe

423b928

Demi-Marie added 5 commits April 12, 2019 10:50

Merge branch 'master' into demi-babe

fcf40ac

Merge branch 'demi-babe' of github.com:paritytech/substrate into demi…

08d9f7b

…-babe

Merge branch 'master' into demi-babe

42c4139

Update Cargo.lock

d1e383a

Update dependencies

ef170cf

bkchr merged commit dd2225d into master Apr 15, 2019

bkchr deleted the demi-babe branch April 15, 2019 05:41

Conversation

Demi-Marie commented Apr 1, 2019

Uh oh!

parity-cla-bot commented Apr 1, 2019

Uh oh!

parity-cla-bot commented Apr 1, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rphmeier left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

rphmeier commented Apr 8, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Demi-Marie commented Apr 8, 2019

Uh oh!

gnunicorn left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Demi-Marie commented Apr 11, 2019

Uh oh!

bkchr commented Apr 12, 2019

Uh oh!

Demi-Marie commented Apr 12, 2019

Uh oh!

bkchr commented Apr 12, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants