Add timestamp and parent_timestamp to finality leaf nodes.

libraries/chain/block_state.cpp

@@ -103,9 +103,11 @@ block_state_ptr block_state::create_if_genesis_block(const block_state_legacy& b
 
    // build leaf_node and validation_tree
    valid_t::finality_leaf_node_t leaf_node {
-      .block_num       = bsp.block_num(),
-      .finality_digest = result.strong_digest,
-      .action_mroot    = *bsp.action_mroot_savanna
+      .block_num        = bsp.block_num(),
+      .timestamp        = bsp.timestamp(),
+      .parent_timestamp = block_timestamp_type(), // for the genesis block, the parent_timestamp is the the earliest representable timestamp.
+      .finality_digest  = result.strong_digest,
+      .action_mroot     = *bsp.action_mroot_savanna
    };
    // construct valid structure
    incremental_merkle_tree validation_tree;
@@ -322,9 +324,11 @@ valid_t block_state::new_valid(const block_header_state& next_bhs, const digest_
 
    // construct block's finality leaf node.
    valid_t::finality_leaf_node_t leaf_node{
-      .block_num       = next_bhs.block_num(),
-      .finality_digest = strong_digest,
-      .action_mroot    = action_mroot
+      .block_num        = next_bhs.block_num(),
+      .timestamp        = next_bhs.timestamp(),
+      .parent_timestamp = timestamp(),
+      .finality_digest  = strong_digest,
+      .action_mroot     = action_mroot
    };
    auto leaf_node_digest = fc::sha256::hash(leaf_node);
 

libraries/chain/include/eosio/chain/block_state.hpp

@@ -43,11 +43,13 @@ struct block_state_accessor;
  * */
 struct valid_t {
    struct finality_leaf_node_t {
-      uint32_t       major_version{light_header_protocol_version_major};
-      uint32_t       minor_version{light_header_protocol_version_minor};
-      block_num_type block_num{0};   // the block number
-      digest_type    finality_digest; // finality digest for the block
-      digest_type    action_mroot;    // digest of the root of the action Merkle tree of the block
+      uint32_t             major_version{light_header_protocol_version_major};
+      uint32_t             minor_version{light_header_protocol_version_minor};
+      block_num_type       block_num{0};     // the block number
+      block_timestamp_type timestamp;
+      block_timestamp_type parent_timestamp;
+      digest_type          finality_digest;  // finality digest for the block
+      digest_type          action_mroot;     // digest of the root of the action Merkle tree of the block
    };
 
    // The Finality Merkle Tree, containing leaf nodes from IF genesis block to current block
@@ -198,7 +200,7 @@ using block_state_pair      = std::pair<std::shared_ptr<block_state_legacy>, blo
 } // namespace eosio::chain
 
 // not exporting pending_qc or valid_qc
-FC_REFLECT( eosio::chain::valid_t::finality_leaf_node_t, (major_version)(minor_version)(block_num)(finality_digest)(action_mroot) )
+FC_REFLECT( eosio::chain::valid_t::finality_leaf_node_t, (major_version)(minor_version)(block_num)(timestamp)(parent_timestamp)(finality_digest)(action_mroot) )
 FC_REFLECT( eosio::chain::valid_t, (validation_tree)(validation_mroots))
 FC_REFLECT( eosio::chain::finality_data_t, (major_version)(minor_version)(active_finalizer_policy_generation)(final_on_strong_qc_block_num)(action_mroot)(reversible_blocks_mroot)(base_digest)(pending_finalizer_policy) )
 FC_REFLECT_DERIVED( eosio::chain::block_state, (eosio::chain::block_header_state), (block)(strong_digest)(weak_digest)(pending_qc)(valid)(validated) )