Skip to content

Commit

Permalink
Revert "second batch of firedancer/gui integration fixes"
Browse files Browse the repository at this point in the history 
This reverts commit 478ba77.
  • Loading branch information
@kbhargava-jump
kbhargava-jump committed Dec 18, 2024
1 parent f4f8129 commit 23b0a6f
Show file tree
Hide file tree
Showing 10 changed files with 105 additions and 204 deletions.
3 changes: 0 additions & 3 deletions contrib/test/test_firedancer_leader.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ SHRED_VERS=`grep shred_version: validator.log | sed -e 's@.*shred_version: \([0-

sudo rm -f /tmp/localnet.funk
sudo rm -f /tmp/localnet.blockstore
sudo rm -f fddev.log

echo "
name = \"fd1\"
Expand Down Expand Up @@ -68,8 +67,6 @@ name = \"fd1\"
use_consumed_cus = false
[tiles.gui]
enabled = false
gui_listen_address = \"64.130.51.169\"
gui_listen_port = 8080
[consensus]
expected_shred_version = $SHRED_VERS
vote = true
Expand Down
49 changes: 18 additions & 31 deletions src/app/fdctl/run/tiles/fd_gossip.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -550,56 +550,43 @@ after_frag( fd_gossip_tile_ctx_t * ctx,
static void
publish_peers_to_plugin( fd_gossip_tile_ctx_t * ctx,
fd_stem_context_t * stem ) {
static const ulong FIREDANCER_CLUSTER_NODE_CNT = 200*201 - 1;
uchar * dst = (uchar *)fd_chunk_to_laddr( ctx->gossip_plugin_out_mem, ctx->gossip_plugin_out_chunk );

ulong i = 0;
for( fd_contact_info_table_iter_t iter = fd_contact_info_table_iter_init( ctx->contact_info_table );
!fd_contact_info_table_iter_done( ctx->contact_info_table, iter ) && i < FD_CLUSTER_NODE_CNT;
!fd_contact_info_table_iter_done( ctx->contact_info_table, iter ) && i < FIREDANCER_CLUSTER_NODE_CNT;
iter = fd_contact_info_table_iter_next( ctx->contact_info_table, iter ), ++i ) {
fd_contact_info_elem_t const * ele = fd_contact_info_table_iter_ele_const( ctx->contact_info_table, iter );
fd_gossip_update_msg_t * msg = (fd_gossip_update_msg_t *)(dst + sizeof(ulong) + i*FD_GOSSIP_LINK_MSG_SIZE);
memset( msg, 0, FD_GOSSIP_LINK_MSG_SIZE );
fd_gossip_update_msg_t * msg = (fd_gossip_update_msg_t *)(dst + sizeof(ulong) + i*sizeof(fd_gossip_update_msg_t));
memcpy( msg->pubkey, ele->contact_info.id.key, sizeof(fd_pubkey_t) );
msg->wallclock = ele->contact_info.wallclock;
msg->shred_version = ele->contact_info.shred_version;
#define COPY_ADDR( _idx_, _srcname_ ) \
#define COPY_ADDR( _idx_, _srcname_ ) \
if( ele->contact_info._srcname_.discriminant == fd_gossip_socket_addr_enum_ip4 ) { \
msg->addrs[ _idx_ ].ip = ele->contact_info._srcname_.inner.ip4.addr; \
msg->addrs[ _idx_ ].port = ele->contact_info._srcname_.inner.ip4.port; \
}
/*
0: gossip_socket,
1: rpc_socket,
2: rpc_pubsub_socket,
3: serve_repair_socket_udp,
4: serve_repair_socket_quic,
5: tpu_socket_udp,
6: tpu_socket_quic,
7: tvu_socket_udp,
8: tvu_socket_quic,
9: tpu_forwards_socket_udp,
10: tpu_forwards_socket_quic,
11: tpu_vote_socket,
*/
COPY_ADDR(0, gossip);
COPY_ADDR(1, rpc);
COPY_ADDR(2, rpc_pubsub);
COPY_ADDR(3, serve_repair);
COPY_ADDR(4, serve_repair);
COPY_ADDR(5, tpu);
COPY_ADDR(6, tpu);
COPY_ADDR(7, tvu);
COPY_ADDR(8, tvu);
COPY_ADDR(9, tpu_fwd);
COPY_ADDR(10, tpu_fwd);
COPY_ADDR(0, gossip);
COPY_ADDR(1, rpc);
COPY_ADDR(2, rpc_pubsub);
COPY_ADDR(3, repair);
// COPY_ADDR(4, serve_repair_socket_quic); FIX THESE CASES
// COPY_ADDR(5, tpu_socket_udp);
// COPY_ADDR(6, tpu_socket_quic);
// COPY_ADDR(7, tvu_socket_udp);
// COPY_ADDR(8, tvu_socket_quic);
// COPY_ADDR(9, tpu_forwards_socket_udp);
// COPY_ADDR(10, tpu_forwards_socket_quic);
COPY_ADDR(11, tpu_vote);
}

*(ulong *)dst = i;
ulong data_sz = i*sizeof(fd_gossip_update_msg_t);

ulong tspub = (ulong)fd_frag_meta_ts_comp( fd_tickcount() );
fd_stem_publish( stem, PLUGIN_OUT_IDX, FD_PLUGIN_MSG_GOSSIP_UPDATE, ctx->gossip_plugin_out_chunk, 0, 0UL, 0UL, tspub );
ctx->gossip_plugin_out_chunk = fd_dcache_compact_next( ctx->gossip_plugin_out_chunk, 8UL + 40200UL*(58UL+12UL*34UL), ctx->gossip_plugin_out_chunk0, ctx->gossip_plugin_out_wmark );
fd_stem_publish( stem, PLUGIN_OUT_IDX, FD_PLUGIN_MSG_GOSSIP_UPDATE, ctx->gossip_plugin_out_chunk, data_sz, 0UL, 0UL, tspub );
ctx->gossip_plugin_out_chunk = fd_dcache_compact_next( ctx->gossip_plugin_out_chunk, data_sz, ctx->gossip_plugin_out_chunk0, ctx->gossip_plugin_out_wmark );
}

static void
Expand Down
16 changes: 6 additions & 10 deletions src/app/fdctl/run/tiles/fd_gui.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,18 +139,14 @@ during_frag( fd_gui_ctx_t * ctx,
uchar * src = (uchar *)fd_chunk_to_laddr( ctx->in_mem, chunk );

/* ... todo... sigh, sz is not correct since it's too big */
if( FD_LIKELY( sig==FD_PLUGIN_MSG_GOSSIP_UPDATE || sig==FD_PLUGIN_MSG_VALIDATOR_INFO ) ) {
if( sig==FD_PLUGIN_MSG_GOSSIP_UPDATE || sig==FD_PLUGIN_MSG_VOTE_ACCOUNT_UPDATE || sig==FD_PLUGIN_MSG_VALIDATOR_INFO ) {
ulong peer_cnt = ((ulong *)src)[ 0 ];
FD_TEST( peer_cnt<=40200 );
sz = 8UL + peer_cnt*FD_GOSSIP_LINK_MSG_SIZE;
} else if( FD_LIKELY( sig==FD_PLUGIN_MSG_VOTE_ACCOUNT_UPDATE ) ) {
ulong peer_cnt = ((ulong *)src)[ 0 ];
FD_TEST( peer_cnt<=40200 );
sz = 8UL + peer_cnt*112UL;
} else if( FD_UNLIKELY( sig==FD_PLUGIN_MSG_LEADER_SCHEDULE ) ) {
ulong staked_cnt = ((ulong *)src)[ 1 ];
FD_TEST( staked_cnt<=50000UL );
sz = 40UL + staked_cnt*40UL;
sz = 8UL + peer_cnt*(58UL+12UL*34UL);
} else if( sig==FD_PLUGIN_MSG_LEADER_SCHEDULE ) {
ulong leader_cnt = ((ulong *)src)[ 1 ];
FD_TEST( leader_cnt<=40200 );
sz = 40UL + leader_cnt*40UL;
}

if( FD_UNLIKELY( chunk<ctx->in_chunk0 || chunk>ctx->in_wmark || sz>sizeof( ctx->buf ) ) )
Expand Down
20 changes: 9 additions & 11 deletions src/app/fdctl/run/tiles/fd_plugin.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,12 @@ during_frag( fd_plugin_ctx_t * ctx,
ulong * dst = (ulong *)fd_chunk_to_laddr( ctx->out_mem, ctx->out_chunk );

/* ... todo... sigh, sz is not correct since it's too big */
if( FD_UNLIKELY( in_idx==1UL ) && FD_LIKELY( sig==FD_PLUGIN_MSG_GOSSIP_UPDATE || sig==FD_PLUGIN_MSG_VALIDATOR_INFO ) ) {
ulong peer_cnt = ((ulong *)src)[ 0 ];
FD_TEST( peer_cnt<=40200 );
sz = 8UL + peer_cnt*FD_GOSSIP_LINK_MSG_SIZE;
} else if( FD_UNLIKELY( in_idx==1UL || in_idx==3UL ) && FD_LIKELY( sig==FD_PLUGIN_MSG_VOTE_ACCOUNT_UPDATE ) ) {
ulong peer_cnt = ((ulong *)src)[ 0 ];
FD_TEST( peer_cnt<=40200 );
sz = 8UL + peer_cnt*112UL;
if( FD_UNLIKELY( in_idx==1UL ) ) {
if( FD_LIKELY( sig==FD_PLUGIN_MSG_GOSSIP_UPDATE || sig==FD_PLUGIN_MSG_VOTE_ACCOUNT_UPDATE || sig==FD_PLUGIN_MSG_VALIDATOR_INFO ) ) {
ulong peer_cnt = ((ulong *)src)[ 0 ];
FD_TEST( peer_cnt<=40200 );
sz = 8UL + peer_cnt*(58UL+12UL*34UL);
}
} else if( FD_UNLIKELY( in_idx==2UL ) ) {
ulong staked_cnt = ((ulong *)src)[ 1 ];
FD_TEST( staked_cnt<=50000UL );
Expand Down Expand Up @@ -98,9 +96,9 @@ after_frag( fd_plugin_ctx_t * ctx,
sig = FD_PLUGIN_MSG_LEADER_SCHEDULE;
break;
}
/* poh_plugin or votes_plugin */
/* poh_plugin */
case 3UL: {
FD_TEST( sig==FD_PLUGIN_MSG_SLOT_START || sig==FD_PLUGIN_MSG_SLOT_END || sig==FD_PLUGIN_MSG_VOTE_ACCOUNT_UPDATE );
FD_TEST( sig==FD_PLUGIN_MSG_SLOT_START || sig==FD_PLUGIN_MSG_SLOT_END );
break;
}
/* startp_plugi */
Expand All @@ -117,7 +115,7 @@ after_frag( fd_plugin_ctx_t * ctx,
}

ulong true_size = sz;
if( FD_UNLIKELY( in_idx==1UL || ( in_idx==3UL && sig == FD_PLUGIN_MSG_VOTE_ACCOUNT_UPDATE ) ) ) true_size = 8UL + 40200UL*(58UL+12UL*34UL);
if( FD_UNLIKELY( in_idx==1UL ) ) true_size = 8UL + 40200UL*(58UL+12UL*34UL);
else if( FD_UNLIKELY( in_idx==2UL ) ) true_size = 40UL + 40200UL*40UL; /* ... todo... sigh, sz is not correct since it's too big */

fd_stem_publish( stem, 0UL, sig, ctx->out_chunk, sz, 0UL, 0UL, 0UL ); /* Not true_sz which might not fit */
Expand Down
78 changes: 10 additions & 68 deletions src/app/fdctl/run/tiles/fd_replay.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
transactions, they must be split into multiple sets. */
#define MAX_TXNS_PER_REPLAY ( ( FD_SHRED_MAX_PER_SLOT * FD_SHRED_MAX_SZ) / FD_TXN_MIN_SERIALIZED_SZ )

#define PLUGIN_PUBLISH_TIME_NS ((long)60e9)

#define STORE_IN_IDX (0UL)
#define PACK_IN_IDX (1UL)
Expand All @@ -63,7 +62,6 @@
#define STORE_OUT_IDX (4UL)
#define POH_OUT_IDX (5UL)
#define REPLAY_PLUG_OUT_IDX (6UL)
#define VOTES_PLUG_OUT_IDX (7UL)

/* Scratch space estimates.
TODO: Update constants and add explanation
Expand Down Expand Up @@ -173,12 +171,6 @@ struct fd_replay_tile_ctx {
ulong replay_plugin_out_wmark;
ulong replay_plugin_out_chunk;

fd_wksp_t * votes_plugin_out_mem;
ulong votes_plugin_out_chunk0;
ulong votes_plugin_out_wmark;
ulong votes_plugin_out_chunk;
long last_plugin_push_time;

char const * blockstore_checkpt;
int tx_metadata_storage;
char const * funk_checkpt;
Expand Down Expand Up @@ -723,11 +715,11 @@ publish_slot_notifications( fd_replay_tile_ctx_t * ctx,
if( ctx->replay_plugin_out_mem ) {
fd_replay_complete_msg_t msg2 = {
.slot = curr_slot,
.total_txn_count = fork->slot_ctx.txn_count,
.nonvote_txn_count = fork->slot_ctx.nonvote_txn_count,
.failed_txn_count = fork->slot_ctx.failed_txn_count,
.nonvote_failed_txn_count = fork->slot_ctx.nonvote_failed_txn_count,
.compute_units = fork->slot_ctx.total_compute_units_used,
.total_txn_count = fork->slot_ctx.slot_bank.transaction_count - fork->slot_ctx.parent_transaction_count,
.nonvote_txn_count = 0,
.failed_txn_count = 0,
.nonvote_failed_txn_count = 0,
.compute_units = 0,
.transaction_fee = fork->slot_ctx.slot_bank.collected_execution_fees,
.priority_fee = fork->slot_ctx.slot_bank.collected_priority_fees,
.parent_slot = ctx->parent_slot,
Expand Down Expand Up @@ -1049,11 +1041,10 @@ after_frag( fd_replay_tile_ctx_t * ctx,
}

if( flags & REPLAY_FLAG_FINISHED_BLOCK ) {
fork->slot_ctx.txn_count = fork->slot_ctx.slot_bank.transaction_count-fork->slot_ctx.parent_transaction_count;
FD_LOG_INFO(( "finished block - slot: %lu, parent_slot: %lu, txn_cnt: %lu, blockhash: %s",
curr_slot,
ctx->parent_slot,
fork->slot_ctx.txn_count,
fork->slot_ctx.slot_bank.transaction_count-fork->slot_ctx.parent_transaction_count,
FD_BASE58_ENC_32_ALLOCA( ctx->blockhash.uc ) ));
// Copy over latest blockhash to slot_bank poh for updating the sysvars
fd_memcpy( fork->slot_ctx.slot_bank.poh.uc, ctx->blockhash.uc, sizeof(fd_hash_t) );
Expand Down Expand Up @@ -1524,39 +1515,6 @@ init_snapshot( fd_replay_tile_ctx_t * ctx,
FD_TEST( ctx->slot_ctx );
}

static void
publish_votes_to_plugin( fd_replay_tile_ctx_t * ctx,
fd_stem_context_t * stem ) {
uchar * dst = (uchar *)fd_chunk_to_laddr( ctx->votes_plugin_out_mem, ctx->votes_plugin_out_chunk );

fd_fork_t * fork = fd_fork_frontier_ele_query( ctx->forks->frontier, &ctx->curr_slot, NULL, ctx->forks->pool );
if( FD_UNLIKELY ( !fork ) ) return;
fd_vote_accounts_t * accts = &fork->slot_ctx.slot_bank.epoch_stakes;
fd_vote_accounts_pair_t_mapnode_t * root = accts->vote_accounts_root;
fd_vote_accounts_pair_t_mapnode_t * pool = accts->vote_accounts_pool;

ulong i = 0;
for( fd_vote_accounts_pair_t_mapnode_t const * n = fd_vote_accounts_pair_t_map_minimum_const( pool, root );
n && i < FD_CLUSTER_NODE_CNT;
n = fd_vote_accounts_pair_t_map_successor_const( pool, n ) ) {
if( n->elem.stake == 0 ) continue;
fd_vote_update_msg_t * msg = (fd_vote_update_msg_t *)(dst + sizeof(ulong) + i*112U);
memset( msg, 0, 112U );
memcpy( msg->vote_pubkey, n->elem.key.uc, sizeof(fd_pubkey_t) );
memcpy( msg->node_pubkey, n->elem.value.node_pubkey.uc, sizeof(fd_pubkey_t) );
msg->activated_stake = n->elem.stake;
msg->last_vote = n->elem.value.last_timestamp_slot;
msg->is_delinquent = (uchar)(msg->last_vote == 0);
++i;
}

*(ulong *)dst = i;

ulong tspub = (ulong)fd_frag_meta_ts_comp( fd_tickcount() );
fd_stem_publish( stem, VOTES_PLUG_OUT_IDX, FD_PLUGIN_MSG_VOTE_ACCOUNT_UPDATE, ctx->votes_plugin_out_chunk, 0, 0UL, 0UL, tspub );
ctx->votes_plugin_out_chunk = fd_dcache_compact_next( ctx->votes_plugin_out_chunk, 8UL + 40200UL*(58UL+12UL*34UL), ctx->votes_plugin_out_chunk0, ctx->votes_plugin_out_wmark );
}

/* after_credit runs on every iteration of the replay tile loop except
when backpressured.
Expand Down Expand Up @@ -1634,13 +1592,6 @@ after_credit( fd_replay_tile_ctx_t * ctx,
ctx->gossip_out_chunk = fd_dcache_compact_next( ctx->gossip_out_chunk, buf_len, ctx->gossip_out_chunk0, ctx->gossip_out_wmark );
}
}

long now = fd_log_wallclock();
if( ctx->votes_plugin_out_mem && FD_UNLIKELY( ( now - ctx->last_plugin_push_time )>PLUGIN_PUBLISH_TIME_NS ) ) {
ctx->last_plugin_push_time = now;
publish_votes_to_plugin( ctx, stem );
}

}

static void
Expand Down Expand Up @@ -2101,19 +2052,10 @@ unprivileged_init( fd_topo_t * topo,
if( strcmp( replay_plugin_out->name, "replay_plugi" ) ) {
FD_LOG_ERR(("output link confusion for output %lu", REPLAY_PLUG_OUT_IDX));
}
ctx->replay_plugin_out_mem = topo->workspaces[ topo->objs[ replay_plugin_out->dcache_obj_id ].wksp_id ].wksp;
ctx->replay_plugin_out_chunk0 = fd_dcache_compact_chunk0( ctx->replay_plugin_out_mem, replay_plugin_out->dcache );
ctx->replay_plugin_out_wmark = fd_dcache_compact_wmark ( ctx->replay_plugin_out_mem, replay_plugin_out->dcache, replay_plugin_out->mtu );
ctx->replay_plugin_out_chunk = ctx->replay_plugin_out_chunk0;

fd_topo_link_t const * votes_plugin_out = &topo->links[ tile->out_link_id[ VOTES_PLUG_OUT_IDX] ];
if( strcmp( votes_plugin_out->name, "votes_plugin" ) ) {
FD_LOG_ERR(("output link confusion for output %lu", VOTES_PLUG_OUT_IDX));
}
ctx->votes_plugin_out_mem = topo->workspaces[ topo->objs[ votes_plugin_out->dcache_obj_id ].wksp_id ].wksp;
ctx->votes_plugin_out_chunk0 = fd_dcache_compact_chunk0( ctx->votes_plugin_out_mem, votes_plugin_out->dcache );
ctx->votes_plugin_out_wmark = fd_dcache_compact_wmark ( ctx->votes_plugin_out_mem, votes_plugin_out->dcache, votes_plugin_out->mtu );
ctx->votes_plugin_out_chunk = ctx->votes_plugin_out_chunk0;
ctx->replay_plugin_out_mem = topo->workspaces[ topo->objs[ replay_plugin_out->dcache_obj_id ].wksp_id ].wksp;
ctx->replay_plugin_out_chunk0 = fd_dcache_compact_chunk0( ctx->replay_plugin_out_mem, replay_plugin_out->dcache );
ctx->replay_plugin_out_wmark = fd_dcache_compact_wmark ( ctx->replay_plugin_out_mem, replay_plugin_out->dcache, replay_plugin_out->mtu );
ctx->replay_plugin_out_chunk = ctx->replay_plugin_out_chunk0;
}

if( strnlen( tile->replay.slots_replayed, sizeof(tile->replay.slots_replayed) )>0UL ) {
Expand Down
5 changes: 1 addition & 4 deletions src/app/fdctl/run/topos/fd_firedancer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -459,19 +459,16 @@ fd_topo_initialize( config_t * config ) {
/**/ fd_topob_link( topo, "plugin_out", "plugin_out", 128UL, 8UL+40200UL*(58UL+12UL*34UL), 1UL );
/**/ fd_topob_link( topo, "replay_plugi", "plugin_in", 128UL, 4098*8UL, 1UL );
/**/ fd_topob_link( topo, "gossip_plugi", "plugin_in", 128UL, 8UL+40200UL*(58UL+12UL*34UL), 1UL );
/**/ fd_topob_link( topo, "votes_plugin", "plugin_in", 128UL, 8UL+40200UL*(58UL+12UL*34UL), 1UL );

/**/ fd_topob_tile( topo, "plugin", "plugin", "metric_in", tile_to_cpu[ topo->tile_cnt ], 0 );

/**/ fd_topob_tile_out( topo, "replay", 0UL, "replay_plugi", 0UL );
/**/ fd_topob_tile_out( topo, "replay", 0UL, "votes_plugin", 0UL );
/**/ fd_topob_tile_out( topo, "gossip", 0UL, "gossip_plugi", 0UL );
/**/ fd_topob_tile_out( topo, "plugin", 0UL, "plugin_out", 0UL );

/**/ fd_topob_tile_in( topo, "plugin", 0UL, "metric_in", "replay_plugi", 0UL, FD_TOPOB_RELIABLE, FD_TOPOB_POLLED );
/**/ fd_topob_tile_in( topo, "plugin", 0UL, "metric_in", "gossip_plugi", 0UL, FD_TOPOB_RELIABLE, FD_TOPOB_POLLED );
/**/ fd_topob_tile_in( topo, "plugin", 0UL, "metric_in", "stake_out", 0UL, FD_TOPOB_RELIABLE, FD_TOPOB_POLLED );
/**/ fd_topob_tile_in( topo, "plugin", 0UL, "metric_in", "votes_plugin", 0UL, FD_TOPOB_RELIABLE, FD_TOPOB_POLLED );
}

if( FD_LIKELY( config->tiles.gui.enabled ) ) {
Expand Down Expand Up @@ -661,7 +658,7 @@ fd_topo_initialize( config_t * config ) {
} else if( FD_UNLIKELY( !strcmp( tile->name, "eqvoc" ) ) ) {
strncpy( tile->eqvoc.identity_key_path, config->consensus.identity_path, sizeof(tile->eqvoc.identity_key_path) );
} else if( FD_UNLIKELY( !strcmp( tile->name, "rpcsrv" ) ) ) {
strncpy( tile->replay.blockstore_file, config->blockstore.file, sizeof(tile->replay.blockstore_file) );
strncpy( tile->replay.blockstore_file, config->blockstore.file, sizeof(tile->replay.blockstore_file) );
tile->replay.funk_rec_max = config->tiles.replay.funk_rec_max;
tile->replay.funk_sz_gb = config->tiles.replay.funk_sz_gb;
tile->replay.funk_txn_max = config->tiles.replay.funk_txn_max;
Expand Down
21 changes: 1 addition & 20 deletions src/disco/plugin/fd_plugin.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,7 @@ struct __attribute__((packed, aligned(8))) fd_replay_complete_msg {
};
typedef struct fd_replay_complete_msg fd_replay_complete_msg_t;

#define FD_CLUSTER_NODE_CNT (200U*201U - 1U)
#define FD_GOSSIP_LINK_MSG_SIZE (58U + 12U * 6U)

struct __attribute__((packed)) fd_gossip_update_msg {
struct __attribute__((packed, aligned(8))) fd_gossip_update_msg {
uchar pubkey[32]; // 0..31
ulong wallclock; // 32..39
ushort shred_version; // 40..41
Expand Down Expand Up @@ -73,20 +70,4 @@ struct __attribute__((packed)) fd_gossip_update_msg {
};
typedef struct fd_gossip_update_msg fd_gossip_update_msg_t;

FD_STATIC_ASSERT( sizeof(fd_gossip_update_msg_t) == FD_GOSSIP_LINK_MSG_SIZE, fd_gossip_update_msg );

struct __attribute__((packed)) fd_vote_update_msg {
uchar vote_pubkey[32]; // 0..31
uchar node_pubkey[32]; // 32..63
ulong activated_stake; // 64..71
ulong last_vote; // 72..79
ulong root_slot; // 80..87
ulong epoch_credits; // 88..95
uchar commission; // 96
uchar is_delinquent; // 97
};
typedef struct fd_vote_update_msg fd_vote_update_msg_t;

FD_STATIC_ASSERT( sizeof(fd_vote_update_msg_t) <= FD_GOSSIP_LINK_MSG_SIZE, fd_vote_update_msg );

#endif /* HEADER_fd_src_disco_plugin_fd_plugin_h */
5 changes: 0 additions & 5 deletions src/flamenco/runtime/context/fd_exec_slot_ctx.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,6 @@ struct __attribute__((aligned(8UL))) fd_exec_slot_ctx {
ulong prev_lamports_per_signature;
ulong parent_signature_cnt;
ulong parent_transaction_count;
ulong txn_count;
ulong nonvote_txn_count;
ulong failed_txn_count;
ulong nonvote_failed_txn_count;
ulong total_compute_units_used;

fd_sysvar_cache_t * sysvar_cache;
fd_account_compute_elem_t * account_compute_table;
Expand Down
Loading

0 comments on commit 23b0a6f

Please sign in to comment.