7646 chain id in blog #7841

brianjohnson5972 · 2019-09-03T19:24:55Z

Change Description

#7646

Changed Block log format to only include the genesis state if the block log starts at block 1, and updated the block log version number
Changed global_property_object to store chain_id and removed genesis state from Snapshot
Added validation to ensure snapshot, block log, and genesis-json command line parameter match.
Refactored controller to only pass snapshot or genesis_state when required for startup and not store the genesis_state in the controller::config

Consensus Changes

Consensus Changes

API Changes

API Changes

global_property_v1 type in the state history plugin has been modified to include the new chain_id field.

Documentation Additions

Documentation Additions

…ore validation.

…work.

…assed in.

…a snapshot and only chain_id is required for snapshots.

plugins/chain_plugin/chain_plugin.cpp

libraries/chain/include/eosio/chain/chain_snapshot.hpp

libraries/chain/controller.cpp

plugins/chain_plugin/chain_plugin.cpp

… of corner case where snapshot is provided, but the head is not set.

libraries/chain/controller.cpp

plugins/chain_plugin/chain_plugin.cpp

libraries/testing/include/eosio/testing/tester.hpp

unittests/api_tests.cpp

unittests/whitelist_blacklist_tests.cpp

technically clang does not support -fdiagnostics-color (it's not in its docs) but it does indeed support it for gcc compat. Let's a lways use -fdiagnostics-color so we fix a problem where when both GCC & Clang are used in a single build there isn't a failure due to -fcolor-diagnostics (which GCC balks at)

…s initial_timestamp instead of genesis.

brianjohnson5972 · 2019-09-17T16:37:10Z

This change did not cover fixing the header for a eosio-blocklog using the feature to trim the front of the blocklog, if the version is the current version. This will be handled by #7939 7939

arhag

Still need to review snapshot_tests.cpp.

plugins/chain_plugin/chain_plugin.cpp

tests/Node.py

libraries/chain/block_log.cpp

…ate expectations.

plugins/chain_plugin/chain_plugin.cpp

unittests/snapshot_tests.cpp

libraries/chain/include/eosio/chain/global_property_object.hpp

plugins/state_history_plugin/state_history_plugin_abi.cpp

… introduced in #7841 in which plugins like net_plugin were incorrectly using the default chain ID

johnsonb@objectcomputing.com added 8 commits September 3, 2019 13:18

Chain id block log addition for version 3.

92ce3b3

Added chain id to snapshot and support for version upgrade.

caae219

Added chain id as parameter, made genesis state optional, and added m…

8aa0743

…ore validation.

Test support for chain id addition.

6bb2496

Added ability to remove command line flags for relaunch in test frame…

95d07cc

…work.

Missed adding chain_id to reflection for global_property_object.

e86f561

Changed snapshot to only use chain id from genesis, if chain_id not p…

b278bdd

…assed in.

Added tests to verify genesis state is required for starting without …

ab28e4a

…a snapshot and only chain_id is required for snapshots.

brianjohnson5972 requested a review from arhag September 3, 2019 19:25

brianjohnson5972 commented Sep 4, 2019

View reviewed changes

plugins/chain_plugin/chain_plugin.cpp Outdated Show resolved Hide resolved

Fix setting chain_id before genesis-timestamp is set.

e2431f7

arhag suggested changes Sep 5, 2019

View reviewed changes

johnsonb@objectcomputing.com and others added 7 commits September 5, 2019 09:09

Added setting chain_config->genesis when available, to allow handling…

86d3dfb

… of corner case where snapshot is provided, but the head is not set.

Improved comment.

d6548c6

Reverted all changes to chain_plugin.

b6aeaf1

Changes from PR to remove storage of optional genesis in controller.

0681d32

Test framework refactoring for 3 startup methods.

6431507

Specific test changes based off of tester changes.

d68f163

Merging in CICD changes to allow PR to pass in current environment.

f42bcd7

brianjohnson5972 requested a review from arhag September 13, 2019 20:30

arhag suggested changes Sep 14, 2019

View reviewed changes

brianjohnson5972 and others added 8 commits September 16, 2019 08:15

Merging in CICD changes so PR build can work.

aaab5cb

Merging in CICD even more changes so PR build can work.

d884147

More fixes for CICD pipeline.

4a3244a

Fixed PR changes to print integrity hash at correct time and just pas…

aa80bca

…s initial_timestamp instead of genesis.

PR changes to remove caching of chain_id and other cleanup.

f9dc122

PR removing of extra code and cleanup.

9ed9c10

Merging in latest changes to handle conflict.

8df8d6b

brianjohnson5972 requested a review from arhag September 17, 2019 16:30

arhag suggested changes Sep 18, 2019

View reviewed changes

johnsonb@objectcomputing.com added 3 commits September 19, 2019 09:20

Reverted name change.

f912a99

Removed unneeded block log method paremeter and added assert to valid…

ad50fd3

…ate expectations.

Further cleanup of chain initalization.

37ede05

brianjohnson5972 requested a review from arhag September 19, 2019 14:59

arhag suggested changes Sep 19, 2019

View reviewed changes

plugins/chain_plugin/chain_plugin.cpp Outdated Show resolved Hide resolved

unittests/snapshot_tests.cpp Show resolved Hide resolved

unittests/snapshot_tests.cpp Outdated Show resolved Hide resolved

unittests/snapshot_tests.cpp Outdated Show resolved Hide resolved

arhag suggested changes Sep 19, 2019

View reviewed changes

libraries/chain/include/eosio/chain/global_property_object.hpp Show resolved Hide resolved

johnsonb@objectcomputing.com added 3 commits September 20, 2019 09:16

Made check actually verify a file type exists.

3e1e5a1

Removed erroneous test and unneeded variable.

19604e2

Changes for state history plugin support for global_property_object.

b5c34d2

brianjohnson5972 requested a review from arhag September 20, 2019 14:45

arhag suggested changes Sep 20, 2019

View reviewed changes

plugins/state_history_plugin/state_history_plugin_abi.cpp Outdated Show resolved Hide resolved

Fixed type definition for state history abi.

f0c279e

brianjohnson5972 requested a review from arhag September 20, 2019 14:50

arhag approved these changes Sep 20, 2019

View reviewed changes

arhag merged commit 1a928e3 into EOSIO:develop Sep 20, 2019

arhag added a commit that referenced this pull request Sep 21, 2019

set immutable chain_id during construction of controller; fixes a bug…

8ed4b58

… introduced in #7841 in which plugins like net_plugin were incorrectly using the default chain ID

This was referenced Sep 21, 2019

set immutable chain_id during construction of controller #7962

Merged

more bug fixes with chain_id in state changes #7985

Merged

chain_id needs to be in state #7646

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

7646 chain id in blog #7841

7646 chain id in blog #7841

brianjohnson5972 commented Sep 3, 2019 •

edited by arhag

Loading

brianjohnson5972 commented Sep 17, 2019

arhag left a comment

7646 chain id in blog #7841

7646 chain id in blog #7841

Conversation

brianjohnson5972 commented Sep 3, 2019 • edited by arhag Loading

Change Description

Consensus Changes

API Changes

Documentation Additions

brianjohnson5972 commented Sep 17, 2019

arhag left a comment

Choose a reason for hiding this comment

brianjohnson5972 commented Sep 3, 2019 •

edited by arhag

Loading