feat(choreo): rewrite for dup handling and gossip integration

Author: lidatong

src/app/firedancer/topology.c

@@ -1,24 +1,25 @@
 #include "topology.h"
 
-#include "../../discof/reasm/fd_reasm.h"
-#include "../../discof/poh/fd_poh.h"
-#include "../../discof/replay/fd_exec.h"
-#include "../../discof/gossip/fd_gossip_tile.h"
-#include "../../discof/tower/fd_tower_tile.h"
-#include "../../discof/resolv/fd_resolv_tile.h"
-#include "../../discof/repair/fd_repair.h"
-#include "../../discof/replay/fd_replay_tile.h"
+#include "../../choreo/fd_choreo_base.h"
 #include "../../disco/net/fd_net_tile.h"
 #include "../../disco/quic/fd_tpu.h"
 #include "../../disco/pack/fd_pack_cost.h"
 #include "../../disco/tiles.h"
 #include "../../disco/topo/fd_topob.h"
 #include "../../disco/topo/fd_cpu_topo.h"
-#include "../../util/pod/fd_pod_format.h"
-#include "../../util/tile/fd_tile_private.h"
+#include "../../discof/gossip/fd_gossip_tile.h"
+#include "../../discof/poh/fd_poh.h"
+#include "../../discof/reasm/fd_reasm.h"
+#include "../../discof/repair/fd_repair.h"
+#include "../../discof/replay/fd_exec.h"
+#include "../../discof/replay/fd_replay_tile.h"
+#include "../../discof/resolv/fd_resolv_tile.h"
 #include "../../discof/restore/utils/fd_ssmsg.h"
+#include "../../discof/tower/fd_tower_tile.h"
 #include "../../flamenco/gossip/fd_gossip.h"
 #include "../../flamenco/runtime/context/fd_capture_ctx.h"
+#include "../../util/pod/fd_pod_format.h"
+#include "../../util/tile/fd_tile_private.h"
 
 #include <sys/random.h>
 #include <sys/types.h>
@@ -370,7 +371,7 @@ fd_topo_initialize( config_t * config ) {
 
   FOR(shred_tile_cnt)  fd_topob_link( topo, "shred_out",    "shred_out",    pending_fec_shreds_depth,                 FD_SHRED_OUT_MTU,              3UL ); /* TODO: Pretty sure burst of 3 is incorrect here */
   FOR(shred_tile_cnt)  fd_topob_link( topo, "repair_shred", "shred_out",    pending_fec_shreds_depth,                 sizeof(fd_ed25519_sig_t),      1UL ); /* TODO: Also pending_fec_shreds_depth? Seems wrong */
-  /**/                 fd_topob_link( topo, "tower_out",    "tower_out",    1024UL,                                   sizeof(fd_tower_slot_done_t),  1UL );
+  /**/                 fd_topob_link( topo, "tower_out",    "tower_out",    FD_BLOCK_MAX,                             sizeof(fd_tower_msg_t),        1UL );
   /**/                 fd_topob_link( topo, "send_txns",    "send_txns",    128UL,                                    FD_TPU_RAW_MTU,                1UL ); /* TODO: Horribly named. Rename to indicate tile and where its going */
 
                        fd_topob_link( topo, "replay_exec",  "replay_exec",  16384UL,                                  2240UL,                        1UL );
@@ -523,7 +524,8 @@ fd_topo_initialize( config_t * config ) {
      single out link, over which all the writer tiles round-robin. */
   FOR(writer_tile_cnt) for( ulong j=0UL; j<exec_tile_cnt; j++ )
                        fd_topob_tile_in(    topo, "writer",  i,            "metric_in", "exec_writer",  j,            FD_TOPOB_RELIABLE,   FD_TOPOB_POLLED );
-  /**/                 fd_topob_tile_in (   topo, "tower",  0UL,           "metric_in", "genesi_out",   0UL,          FD_TOPOB_RELIABLE,   FD_TOPOB_POLLED );
+  /**/                 fd_topob_tile_in (   topo, "tower",   0UL,          "metric_in", "genesi_out",   0UL,          FD_TOPOB_RELIABLE,   FD_TOPOB_POLLED );
+  /**/                 fd_topob_tile_in (   topo, "tower",   0UL,          "metric_in", "gossip_out",   0UL,          FD_TOPOB_RELIABLE,   FD_TOPOB_POLLED );
   /**/                 fd_topob_tile_in (   topo, "tower",   0UL,          "metric_in", "replay_out",   0UL,          FD_TOPOB_RELIABLE,   FD_TOPOB_POLLED );
   if( snapshots_enabled ) {
                        fd_topob_tile_in (   topo, "tower",   0UL,          "metric_in", "snap_out",     0UL,          FD_TOPOB_RELIABLE,   FD_TOPOB_POLLED );
@@ -967,8 +969,8 @@ fd_topo_configure_tile( fd_topo_tile_t * tile,
 
   } else if( FD_UNLIKELY( !strcmp( tile->name, "tower" ) ) ) {
 
-    strncpy( tile->tower.identity_key_path, config->paths.identity_key, sizeof(tile->tower.identity_key_path) );
-    strncpy( tile->tower.vote_acc_path, config->paths.vote_account, sizeof(tile->tower.vote_acc_path) );
+    strncpy( tile->tower.identity_key, config->paths.identity_key, sizeof(tile->tower.identity_key) );
+    strncpy( tile->tower.vote_account, config->paths.vote_account, sizeof(tile->tower.vote_account) );
     strncpy( tile->tower.ledger_path, config->paths.ledger, sizeof(tile->tower.ledger_path) );
 
   } else if( FD_UNLIKELY( !strcmp( tile->name, "send" ) ) ) {

src/choreo/fd_choreo_base.h

@@ -32,17 +32,10 @@
 #define FD_SLOT_PUBKEY_HASH(key,seed) FD_SLOT_HASH_HASH(key,seed)
 /* clang-format on */
 
-/* The block_id is the merkle root of the last FEC set for a slot.  This
-   is guaranteed to be unique (practically speaking, the probability of
-   collision before sun burns out is negligibly miniscule).
-
-   This is used as the identifier for a block (hence "block_id") because
-   unlike the slot number, if a leader equivocates (ie. produces
-   multiple blocks for the same slot), the block_id will remain unique
-   unlike the slot. */
-
 typedef uchar fd_block_id_t[ 32UL ];
 
 typedef fd_slot_hash_t fd_slot_pubkey_t;
 
+static const fd_pubkey_t pubkey_null = {{ 0 }};
+
 #endif /* HEADER_fd_src_choreo_fd_choreo_base_h */