Changes to support new `block_header_state` and `block_state` #1975

greg7mdp · 2023-12-11T16:33:23Z

No description provided.

…o gh_1941

wip wip wip

…iants

…` variants

131/150 Test #98: producer_schedule_hs_unit_test_eos-vm-jit ..........***Failed 1.36 sec 132/150 Test #97: producer_schedule_hs_unit_test_eos-vm ..............***Failed 1.57 sec 133/150 Test #96: producer_schedule_hs_unit_test_eos-vm-oc ...........***Failed 2.86 sec 144/150 Test #21: api_unit_test_eos-vm-oc ............................***Failed 79.26 sec 146/150 Test #23: api_unit_test_eos-vm-jit ...........................***Failed 96.61 sec 150/150 Test #22: api_unit_test_eos-vm ...............................***Failed 467.14 sec

…o gh_1941

…o gh_1941 Also removed tabs and aligned struct members

…o gh_1941

ericpassmore · 2023-12-23T22:17:30Z

Note:start
group: IF
category: INTERNALS
summary: Changes to support Instant Finality create a new block_header_state and block_state, and refactoring of code to support both legacy and Instant Finality block structures
Note:end

…o gh_1941

libraries/chain/controller.cpp

…he code.

libraries/chain/controller.cpp

…o gh_1941

libraries/chain/block_header_state.cpp

libraries/chain/block_state.cpp

linh2931 · 2024-01-01T15:48:53Z

libraries/chain/controller.cpp

+                                      return bsp->valid_block_signing_authority;
+                                   },
+                                   [](const block_state_ptr& bsp) -> const block_signing_authority& {
+                                      static block_signing_authority bsa; return bsa; //return bsp->header.producer; [greg todo]


Add a warning here so that the remaining work is easy to be found.

I added the [greg todo] comments instead of warnings, which I think obfuscate the compilation output.

linh2931 · 2024-01-04T13:37:10Z

docs/block_production/lifecycle.md

@@ -0,0 +1,27 @@
+The following diagram describes Leap block production, as implemented in `libraries/chain/controller.cpp`:


This file probably should be located inside /docs/01_nodeos. But you can move it later.

I followed @ericpassmore 's suggestion for the file path, but happy to move it if desirable.

no changes for now.

linh2931 · 2024-01-04T13:37:55Z

docs/block_production/lifecycle.md

+       direction TB
+       start -- "stage = &Oslash;" --> sb
+       sb("start_block()"):::fun -- "stage = building_block" --> et
+       et["execute transactions" ] -- "stage = building_block" --> fb("finalize_block()"):::fun


Does stage still stay in building_block?

I'm not understanding exactly what you are asking.

After executing transactions, is the stage still building_block? ("stage = building_block" in the chart)

yes, it is.

linh2931 · 2024-01-04T16:35:42Z

libraries/chain/controller.cpp

-   // if the _unsigned_block pre-dates block-signing authorities this may be present.
-   std::optional<producer_authority_schedule> _new_producer_authority_cache;
-};
+      // if the _unsigned_block pre-dates block-signing authorities this may be present.


Remove _ in _unsigned_block

linh2931 · 2024-01-04T16:37:38Z

libraries/chain/controller.cpp

+      block_id_type                     id;
+      pending_block_header_state_legacy pending_block_header_state;
+      deque<transaction_metadata_ptr>   trx_metas;
+      signed_block_ptr                  unsigned_block;


I always get confused with unsigned_block having signed_block_ptr as its type. But this is from existing code. No changes needed.

linh2931 · 2024-01-04T17:06:52Z

libraries/chain/controller.cpp


-using block_stage_type = std::variant<building_block, assembled_block, completed_block>;
+   // --------------------------------------------------------------------------------
+   struct assembled_block_if {


I don't know how to handle this. As if is such common reserved word in the code, it can cause confusion when reading a variable containing if. It is ugly to have a capitalized IF. I start to move away from if and spell out if possible.

I can change it to just assembled_block maybe?

linh2931 · 2024-01-04T17:13:52Z

libraries/chain/controller.cpp

-   const pending_block_header_state_legacy& get_pending_block_header_state_legacy()const {
-      if( std::holds_alternative<building_block>(_block_stage) )
-         return std::get<building_block>(_block_stage)._pending_block_header_state_legacy;
+   template <class R, class F>


What does R imply for? (F is for function)

R is the result_type, what F returns.

linh2931 · 2024-01-04T17:34:53Z

libraries/chain/controller.cpp

+
+   };
+
+   std::variant<building_block_dpos, building_block_if> v;


Is v too short? Not obvious when reading functions 100 line away from it.

I don't think so, it is used only locally within the class building_block.

systemzax and others added 8 commits December 6, 2023 22:07

added hotstuff pseudo code

61ff571

simplify protocol_feature_activation

12e3148

Merge branch 'hotstuff_integration' of github.com:AntelopeIO/leap int…

03a226d

…o gh_1941

Revisions to pseudo code

9bb5575

initial changes

c38f1a4

Merge remote-tracking branch 'origin/hotstuff_pseudo_code' into gh_1941

6d862bf

Update contoller to support both IF and legacy block state classes - wip

3fbced5

Block state changes - wip

bc025d1

greg7mdp changed the base branch from main to hotstuff_integration December 11, 2023 16:34

greg7mdp marked this pull request as draft December 11, 2023 16:35

greg7mdp changed the title ~~Changes to suppport new block_header_state and block_state~~ Changes to support new block_header_state and block_state Dec 11, 2023

greg7mdp linked an issue Dec 11, 2023 that may be closed by this pull request

IF: Unification: Create new block_header_state and block_state #1941

Closed

systemzax and others added 5 commits December 11, 2023 19:07

Revisions to pseudo code

bb6e688

wip

5a92916

wip

e94d146

Add document block_construction_data_flow.md from Areg

eb8ad28

Implement alternate versions for all block_stage variants - wip

84f3b85

wip wip wip

greg7mdp force-pushed the gh_1941 branch from 5d9b62c to 84f3b85 Compare December 14, 2023 14:18

greg7mdp and others added 12 commits December 14, 2023 10:43

Progress on implementing alternate versions for all block_stage var…

c55909f

…iants

More progress on implementing alternate versions for all `block_stage…

47660e1

…` variants

Merge branch 'hotstuff_integration' of github.com:AntelopeIO/leap int…

cb30d5b

…o gh_1941

missing in previous merge commit

27439fa

My previous merge missed these changes.

c60ded4

Add comment

cadcb05

Merge branch 'hotstuff_pseudo_code' of github.com:AntelopeIO/leap int…

640b3ec

…o gh_1941 Also removed tabs and aligned struct members

GH-1941 Fixes for GCC

ec1f198

GH-1941 actually invoke the function

f324575

Fix gcc warnings

b23ab79

Merge branch 'gh_1941' of github.com:AntelopeIO/leap into gh_1941

e85b0bf

greg7mdp added 2 commits December 22, 2023 22:24

Remove outdated comment and fix indentation.

d508795

Merge branch 'hotstuff_integration' of github.com:AntelopeIO/leap int…

882bb5f

…o gh_1941

greg7mdp added 2 commits December 27, 2023 16:07

Add mermaid diagram

08730c6

Merge branch 'hotstuff_integration' of github.com:AntelopeIO/leap int…

c830bea

…o gh_1941

ericpassmore reviewed Dec 28, 2023

View reviewed changes

libraries/chain/controller.cpp Outdated Show resolved Hide resolved

greg7mdp added 9 commits January 2, 2024 08:33

Move mermaid diagram of block production to docs directory.

1ac7744

Try adding some quotes to mermaid diagram so that it dosplays in github.

49fcbae

Embedded markdown does not seem to work correctly in github mermaid.

4a648dc

Add comment in fork_database.cpp.

e535015

Cleanup new apply functions.

6eda25a

Rename variable block_num -> prev_block_num.

6207985

Add a few accessor member functions in controller_impl to cleanup t…

23c9862

…he code.

Add comment and cleanup whitespace.

5e6be9d

Add controller_impl::head_block() member function.

6473bc8

heifner approved these changes Jan 3, 2024

View reviewed changes

heifner reviewed Jan 3, 2024

View reviewed changes

libraries/chain/controller.cpp Outdated Show resolved Hide resolved

greg7mdp and others added 8 commits January 3, 2024 16:56

Temporarily disable reference-contracts tests.

ea199c5

remove unplanned todo.

346435b

GH-1941 Update test to use mock signed_block instead of block_state

8d19355

GH-1941 Update test to use mock signed_block instead of block_state

96c029d

GH-1941 Update test to use mock signed_block instead of block_state

32b1d2e

Merge branch 'hotstuff_integration' of github.com:AntelopeIO/leap int…

e1295ae

…o gh_1941

Merge branch 'hotstuff_integration' of github.com:AntelopeIO/leap int…

2af37fc

…o gh_1941

Merge branch 'gh_1941' of github.com:AntelopeIO/leap into gh_1941

029d5d7

linh2931 reviewed Jan 4, 2024

View reviewed changes

Minor changes from PR review

c17ecf9

linh2931 approved these changes Jan 4, 2024

View reviewed changes

greg7mdp merged commit 14963e2 into hotstuff_integration Jan 4, 2024
26 checks passed

greg7mdp deleted the gh_1941 branch January 4, 2024 20:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Changes to support new `block_header_state` and `block_state` #1975

Changes to support new `block_header_state` and `block_state` #1975

greg7mdp commented Dec 11, 2023

ericpassmore commented Dec 23, 2023

linh2931 Jan 1, 2024

greg7mdp Jan 4, 2024

linh2931 Jan 4, 2024

greg7mdp Jan 4, 2024

linh2931 Jan 4, 2024

linh2931 Jan 4, 2024

greg7mdp Jan 4, 2024

linh2931 Jan 4, 2024 •

edited by greg7mdp

Loading

linh2931 Jan 4, 2024

linh2931 Jan 4, 2024

linh2931 Jan 4, 2024

greg7mdp Jan 4, 2024

linh2931 Jan 4, 2024

greg7mdp Jan 4, 2024

linh2931 Jan 4, 2024

greg7mdp Jan 4, 2024 •

edited

Loading

		@@ -0,0 +1,27 @@
		The following diagram describes Leap block production, as implemented in `libraries/chain/controller.cpp`:

Changes to support new block_header_state and block_state #1975

Changes to support new block_header_state and block_state #1975

Conversation

greg7mdp commented Dec 11, 2023

ericpassmore commented Dec 23, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

linh2931 Jan 4, 2024 • edited by greg7mdp Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

greg7mdp Jan 4, 2024 • edited Loading

Choose a reason for hiding this comment

Changes to support new `block_header_state` and `block_state` #1975

Changes to support new `block_header_state` and `block_state` #1975

linh2931 Jan 4, 2024 •

edited by greg7mdp

Loading

greg7mdp Jan 4, 2024 •

edited

Loading