[1.0-beta2 -> main] DeepMind: Add ID to ACCEPT_BLOCK_V2

libraries/chain/controller.cpp

@@ -3284,19 +3284,20 @@ struct controller_impl {
          }
 
          if (auto* dm_logger = get_deep_mind_logger(false)) {
-            auto fd = head_finality_data();
             apply<void>(chain_head,
                         [&](const block_state_legacy_ptr& head) {
                            if (head->block->contains_header_extension(instant_finality_extension::extension_id())) {
+                              auto fd = head_finality_data(); // for transition blocks
                               assert(fd);
-                              dm_logger->on_accepted_block_v2(fork_db_root_block_num(), head->block, *fd);
+                              dm_logger->on_accepted_block_v2(head->id(), fork_db_root_block_num(), head->block, *fd);
                            } else {
                               dm_logger->on_accepted_block(head);
                            }
                         },
                         [&](const block_state_ptr& head) {
+                           auto fd = head_finality_data();
                            assert(fd);
-                           dm_logger->on_accepted_block_v2(fork_db_root_block_num(), head->block, *fd);
+                           dm_logger->on_accepted_block_v2(head->id(), fork_db_root_block_num(), head->block, *fd);
                         });
          }
 

libraries/chain/deep_mind.cpp

@@ -83,12 +83,14 @@ namespace eosio::chain {
       );
    }
 
-   void deep_mind_handler::on_accepted_block_v2(block_num_type lib, const signed_block_ptr& b, const finality_data_t& fd)
+   void deep_mind_handler::on_accepted_block_v2(const block_id_type& id, block_num_type lib, const signed_block_ptr& b,
+                                                const finality_data_t& fd)
    {
       auto packed_blk = fc::raw::pack(*b);
       auto finality_data = fc::raw::pack(fd);
 
-      fc_dlog(_logger, "ACCEPTED_BLOCK_V2 ${num} ${lib} ${blk} ${fd}",
+      fc_dlog(_logger, "ACCEPTED_BLOCK_V2 ${id} ${num} ${lib} ${blk} ${fd}",
+         ("id", id)
          ("num", b->block_num())
          ("lib", lib)
          ("blk", fc::to_hex(packed_blk))

libraries/chain/include/eosio/chain/deep_mind.hpp

@@ -59,7 +59,7 @@ class deep_mind_handler
    void on_startup(chainbase::database& db, uint32_t head_block_num);
    void on_start_block(uint32_t block_num);
    void on_accepted_block(const std::shared_ptr<block_state_legacy>& bsp);
-   void on_accepted_block_v2(block_num_type lib, const signed_block_ptr& b, const finality_data_t& fd);
+   void on_accepted_block_v2(const block_id_type& id, block_num_type lib, const signed_block_ptr& b, const finality_data_t& fd);
    void on_switch_forks(const block_id_type& old_head, const block_id_type& new_head);
    void on_onerror(const signed_transaction& etrx);
    void on_onblock(const signed_transaction& trx);