[CBR-482] Implement OBFT block creation/generation #4077

intricate · 2019-02-13T20:49:28Z

Description

Implementation of block generation/creation for the OBFT era.

Linked issues

https://iohk.myjetbrains.com/youtrack/issue/CBR-482

Type of change

[~] 🐞 Bug fix (non-breaking change which fixes an issue)
[~] 🛠 New feature (non-breaking change which adds functionality)
⚠️ Breaking change (fix or feature that would cause existing functionality to change)
[~] 🏭 Refactoring that does not change existing functionality but does improve things like code readability, structure etc
[~] 🔨 New or improved tests for existing code
[~] ⛑ git-flow chore (backport, hotfix, etc)

Developer checklist

I have read the style guide document, and my code follows the code style of this project.
If my code deals with exceptions, it follows the guidelines.
I have updated any documentation accordingly, if needed. Documentation changes can be reflected in opening a PR on cardanodocs.com, amending the inline Haddock comments, any relevant README file or one of the document listed in the docs directory.
CHANGELOG entry has been added and is linked to the correct PR on GitHub.

Testing checklist

I have added tests to cover my changes.
All new and existing tests passed.

chain/src/Pos/Chain/Block/Slog/Types.hs

chain/test/Test/Pos/Chain/Block/Arbitrary.hs

tatyanavych

Please, add CHANGELOG.md entry in OBFT Features subsection.

Added CHANGELOG entries

mhuesch

LGTM. Addition of my proposed comment would be nice.

mhuesch · 2019-02-22T16:31:57Z

db/src/Pos/DB/Update/Logic/Global.hs

+                    processGenesisBlock genesisConfig ei)
+                getAdoptedBV
+
+            Original -> pure initialBV


👍 I like the refactor here to drop the BlockVersion arg and instead check getAdoptedBV inside of verifyBlock, so that we can catch updates as we go along.

lib/src/Pos/Worker/Block.hs

mhuesch · 2019-02-22T16:40:27Z

lib/src/Pos/Worker/Block.hs

+                Just leaders ->
+                    maybe onNoLeader
+                          (onKnownLeader leaders)
+                          (leaders ^? ix (fromIntegral $ getSlotIndex siSlot))


Context for other reviewers: this part is just the red deletions above, indented over. We hide the whenJust in this branch of the case, so that creation of the EBB won't be reported (since we will roll it back shortly).

mhuesch · 2019-02-22T16:41:12Z

script-runner/stack-test

+# Kill all existing cardano-node-simple processes. If there are processes
+# still running from previous runs of this script, the test will fail if
+# we don't kill them first.
+kill_cardano_nodes


There should be no EBB (epoch boundary block) between the last original epoch and the first OBFT block and the first block of the first OBFT epoch should have its previous block hash point to the last block of the last original epoch.

4077: [CBR-482] Implement OBFT block creation/generation r=mhuesch a=intricate ## Description Implementation of block generation/creation for the `OBFT` era. ## Linked issues https://iohk.myjetbrains.com/youtrack/issue/CBR-482 Co-authored-by: Luke Nadur <luke.nadur@iohk.io> Co-authored-by: Michael Hueschen <michael.hueschen@iohk.io> Co-authored-by: Erik de Castro Lopo <erikd@mega-nerd.com> Co-authored-by: Luke Nadur <19835357+intricate@users.noreply.github.com>

iohk-bors · 2019-02-22T16:54:24Z

Canceled

mhuesch · 2019-02-22T17:00:10Z

bors r+

4077: [CBR-482] Implement OBFT block creation/generation r=mhuesch a=intricate ## Description Implementation of block generation/creation for the `OBFT` era. ## Linked issues https://iohk.myjetbrains.com/youtrack/issue/CBR-482 Co-authored-by: Luke Nadur <luke.nadur@iohk.io> Co-authored-by: Michael Hueschen <michael.hueschen@iohk.io> Co-authored-by: Erik de Castro Lopo <erikd@mega-nerd.com> Co-authored-by: Luke Nadur <19835357+intricate@users.noreply.github.com>

iohk-bors · 2019-02-22T19:00:36Z

Timed out

iohk-bors · 2019-02-22T19:15:37Z

try

Timed out

intricate · 2019-02-22T19:57:29Z

bors r+

4077: [CBR-482] Implement OBFT block creation/generation r=intricate a=intricate ## Description Implementation of block generation/creation for the `OBFT` era. ## Linked issues https://iohk.myjetbrains.com/youtrack/issue/CBR-482 Co-authored-by: Luke Nadur <luke.nadur@iohk.io> Co-authored-by: Michael Hueschen <michael.hueschen@iohk.io> Co-authored-by: Erik de Castro Lopo <erikd@mega-nerd.com> Co-authored-by: Luke Nadur <19835357+intricate@users.noreply.github.com>

iohk-bors · 2019-02-22T20:22:52Z

Build succeeded

intricate added the wip label Feb 13, 2019

intricate self-assigned this Feb 13, 2019

intricate requested review from mhuesch and erikd February 13, 2019 20:49

intricate force-pushed the intricate+mhuesch/CBR-482 branch 2 times, most recently from 67c86a9 to 68d841d Compare February 14, 2019 16:07

erikd reviewed Feb 17, 2019

View reviewed changes

chain/src/Pos/Chain/Block/Slog/Types.hs Show resolved Hide resolved

erikd reviewed Feb 17, 2019

View reviewed changes

chain/test/Test/Pos/Chain/Block/Arbitrary.hs Outdated Show resolved Hide resolved

tatyanavych previously requested changes Feb 18, 2019

View reviewed changes

intricate force-pushed the intricate+mhuesch/CBR-482 branch 3 times, most recently from a066fb5 to c9f825a Compare February 19, 2019 01:56

intricate requested a review from erikd February 19, 2019 04:37

intricate force-pushed the intricate+mhuesch/CBR-482 branch 9 times, most recently from c546d98 to 49737f7 Compare February 22, 2019 13:39

intricate changed the title ~~[WIP] [CBR-482] Implement OBFT block generation~~ [CBR-482] Implement OBFT block generation Feb 22, 2019

intricate removed the wip label Feb 22, 2019

intricate force-pushed the intricate+mhuesch/CBR-482 branch from 122eab2 to bdc061b Compare February 22, 2019 13:50

intricate changed the title ~~[CBR-482] Implement OBFT block generation~~ [CBR-482] Implement OBFT block creation/generation Feb 22, 2019

intricate added 3 commits February 22, 2019 08:13

CBR-482: Generate blocks for OBFT

a820f24

CBR-482: Fix update adoption during OBFT

f572e8d

CBR-482: Document the ConsensusEraLeaders data type

51c80cb

intricate force-pushed the intricate+mhuesch/CBR-482 branch from bdc061b to 053fa87 Compare February 22, 2019 14:14

mhuesch approved these changes Feb 22, 2019

View reviewed changes

mhuesch self-assigned this Feb 22, 2019

Michael Hueschen and others added 3 commits February 22, 2019 11:49

CBR-482: Fix/improve script-runner

d940239

Add CHANGELOG entries for CBR-504 and CBR-482

ccacf63

mhuesch force-pushed the intricate+mhuesch/CBR-482 branch from 2476f28 to ccacf63 Compare February 22, 2019 16:50

iohk-bors bot added a commit that referenced this pull request Feb 22, 2019

Try #4077:

f78bdf0

iohk-bors bot merged commit ccacf63 into develop Feb 22, 2019

iohk-bors bot deleted the intricate+mhuesch/CBR-482 branch February 22, 2019 20:22

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CBR-482] Implement OBFT block creation/generation #4077

[CBR-482] Implement OBFT block creation/generation #4077

intricate commented Feb 13, 2019

tatyanavych left a comment

mhuesch left a comment

mhuesch Feb 22, 2019

mhuesch Feb 22, 2019

mhuesch Feb 22, 2019

iohk-bors bot commented Feb 22, 2019

mhuesch commented Feb 22, 2019

iohk-bors bot commented Feb 22, 2019

iohk-bors bot commented Feb 22, 2019

intricate commented Feb 22, 2019

iohk-bors bot commented Feb 22, 2019

[CBR-482] Implement OBFT block creation/generation #4077

[CBR-482] Implement OBFT block creation/generation #4077

Conversation

intricate commented Feb 13, 2019

Description

Linked issues

Type of change

Developer checklist

Testing checklist

tatyanavych left a comment

Choose a reason for hiding this comment

mhuesch left a comment

Choose a reason for hiding this comment

mhuesch Feb 22, 2019

Choose a reason for hiding this comment

mhuesch Feb 22, 2019

Choose a reason for hiding this comment

mhuesch Feb 22, 2019

Choose a reason for hiding this comment

iohk-bors bot commented Feb 22, 2019

Canceled

mhuesch commented Feb 22, 2019

iohk-bors bot commented Feb 22, 2019

Timed out

iohk-bors bot commented Feb 22, 2019

try

Timed out

intricate commented Feb 22, 2019

iohk-bors bot commented Feb 22, 2019

Build succeeded