Skip to content

fix(hfork): removal bug with multiple bank hashes (hard forks) #7466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 29, 2025
Merged

fix(hfork): removal bug with multiple bank hashes (hard forks) #7466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 22 additions & 5 deletions src/choreo/hfork/fd_hfork.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,25 @@ fd_hfork_delete( void * hfork ) {
return hfork;
}

void
remove( blk_t * blk, fd_hash_t * bank_hash, bank_hash_t * pool ) {
bank_hash_t * prev = NULL;
bank_hash_t * curr = blk->bank_hashes;
while( FD_LIKELY( curr ) ) {
if( FD_LIKELY( 0==memcmp( &curr->bank_hash, bank_hash, 32UL ) ) ) break;
prev = curr;
curr = bank_hash_pool_ele( pool, curr->next );
}
FD_TEST( curr ); /* assumes bank_hash in blk->bank_hashes */

/* In most cases, there is only one bank_hash per blk, so it will be
the first element in blk->bank_hashes and prev will be NULL. */

if( FD_LIKELY( !prev ) ) blk->bank_hashes = bank_hash_pool_ele( pool, curr->next );
else prev->next = curr->next;
bank_hash_pool_ele_release( pool, curr );
}

void
fd_hfork_count_vote( fd_hfork_t * hfork,
fd_hash_t const * vote_acc,
Expand Down Expand Up @@ -205,11 +224,9 @@ fd_hfork_count_vote( fd_hfork_t * hfork,
candidate->cnt--;
if( FD_UNLIKELY( candidate->cnt==0 ) ) {
candidate_map_remove( hfork->candidate_map, candidate );
blk_t * blk = blk_map_query( hfork->blk_map, vote.block_id, NULL );
bank_hash_t * remove = blk->bank_hashes;
blk->bank_hashes = bank_hash_pool_ele( hfork->bank_hash_pool, remove->next );
bank_hash_pool_ele_release( hfork->bank_hash_pool, remove );

blk_t * blk = blk_map_query( hfork->blk_map, vote.block_id, NULL );
FD_TEST( blk ); /* asumes if this is in candidate_map, it must also be in blk_map */
remove( blk, &vote.bank_hash, hfork->bank_hash_pool );
if( FD_UNLIKELY( !blk->bank_hashes ) ) {
blk_map_remove( hfork->blk_map, blk );
if( FD_UNLIKELY( blk->forked ) ) {
Expand Down
114 changes: 96 additions & 18 deletions src/choreo/hfork/test_hfork.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
#include "fd_hfork.h"
#include "fd_hfork_private.h"

ulong
cnt( fd_hfork_t * hfork, fd_hash_t * block_id ) {
ulong cnt = 0;
blk_t * blk = blk_map_query( hfork->blk_map, *block_id, NULL );
bank_hash_t * curr = blk->bank_hashes;
while( FD_LIKELY( curr ) ) {
curr = bank_hash_pool_ele( hfork->bank_hash_pool, curr->next );
cnt++;
}
return cnt;
}

void
test_hfork_simple( fd_wksp_t * wksp ) {
ulong max_live_slots = 2;
Expand All @@ -10,22 +22,30 @@ test_hfork_simple( fd_wksp_t * wksp ) {
fd_hfork_t * hfork = fd_hfork_join( fd_hfork_new( mem, max_live_slots, max_vote_accounts, 42, 0 ) );
FD_TEST( hfork );

ulong slot = 368778153;
ulong slot = 368778150;
fd_hash_t block_id = { .ul = { slot } };
fd_hash_t bank_hash = { .ul = { slot } };

ulong slot1 = 368778154;
ulong slot1 = 368778151;
fd_hash_t block_id1 = { .ul = { slot1 } };
fd_hash_t bank_hash1 = { .ul = { slot1 } };

ulong slot2 = 368778155;
ulong slot2 = 368778152;
fd_hash_t block_id2 = { .ul = { slot2 } };
fd_hash_t bank_hash2 = { .ul = { slot2 } };

ulong slot3 = 368778156;
// fd_hash_t block_id3 = { .ul = { slot3 } };
ulong slot3 = 368778153;
fd_hash_t block_id3 = { .ul = { slot3 } };
fd_hash_t bank_hash3 = { .ul = { slot3 } };

ulong slot4 = 368778154;
fd_hash_t block_id4 = { .ul = { slot4 } };
fd_hash_t bank_hash4 = { .ul = { slot4 } };

ulong slot5 = 368778155;
fd_hash_t block_id5 = { .ul = { slot5 } };
fd_hash_t bank_hash5 = { .ul = { slot5 } };

fd_hash_t voters[4] = {
(fd_hash_t){ .ul = { 1 } },
(fd_hash_t){ .ul = { 2 } },
Expand Down Expand Up @@ -66,19 +86,77 @@ test_hfork_simple( fd_wksp_t * wksp ) {

/* max bank hashes for a given block_id */

fd_hfork_count_vote( hfork, &voters[0], &block_id, &bank_hash, slot3, 1, 100, &metrics );
fd_hfork_count_vote( hfork, &voters[1], &block_id, &bank_hash1, slot3, 51, 100, &metrics );
fd_hfork_count_vote( hfork, &voters[2], &block_id, &bank_hash2, slot3, 2, 100, &metrics );
fd_hfork_count_vote( hfork, &voters[3], &block_id, &bank_hash3, slot3, 3, 100, &metrics );

blk_t * blk = blk_map_query( hfork->blk_map, block_id, NULL );
bank_hash_t * curr = blk->bank_hashes;
ulong cnt = 0;
while( FD_LIKELY( curr ) ) {
curr = bank_hash_pool_ele( hfork->bank_hash_pool, curr->next );
cnt++;
}
FD_TEST( cnt==4 );
fd_hfork_count_vote( hfork, &voters[0], &block_id3, &bank_hash, slot3, 1, 100, &metrics );
fd_hfork_count_vote( hfork, &voters[1], &block_id3, &bank_hash1, slot3, 51, 100, &metrics );
fd_hfork_count_vote( hfork, &voters[2], &block_id3, &bank_hash2, slot3, 2, 100, &metrics );
fd_hfork_count_vote( hfork, &voters[3], &block_id3, &bank_hash3, slot3, 3, 100, &metrics );

FD_TEST( cnt( hfork, &block_id3 )==4 );
blk_t * blk3 = blk_map_query( hfork->blk_map, block_id3, NULL );
bank_hash_t * curr = blk3->bank_hashes;
FD_TEST( curr->bank_hash.ul[0] == bank_hash.ul[0] );
curr = bank_hash_pool_ele( hfork->bank_hash_pool, curr->next );
FD_TEST( curr->bank_hash.ul[0] == bank_hash1.ul[0] );
curr = bank_hash_pool_ele( hfork->bank_hash_pool, curr->next );
FD_TEST( curr->bank_hash.ul[0] == bank_hash2.ul[0] );
curr = bank_hash_pool_ele( hfork->bank_hash_pool, curr->next );
FD_TEST( curr->bank_hash.ul[0] == bank_hash3.ul[0] );

/* evict front (bank_hash) from block_id */

fd_hfork_count_vote( hfork, &voters[0], &block_id4, &bank_hash4, slot4, 1, 100, &metrics );
fd_hfork_count_vote( hfork, &voters[0], &block_id5, &bank_hash5, slot5, 1, 100, &metrics );

FD_TEST( !candidate_map_query( hfork->candidate_map, (candidate_key_t){ .block_id = block_id3, .bank_hash = bank_hash }, NULL ) );
FD_TEST( cnt( hfork, &block_id3 )==3 );
blk3 = blk_map_query( hfork->blk_map, block_id3, NULL );

curr = blk3->bank_hashes;
FD_TEST( curr->bank_hash.ul[0] == bank_hash1.ul[0] );
curr = bank_hash_pool_ele( hfork->bank_hash_pool, curr->next );
FD_TEST( curr->bank_hash.ul[0] == bank_hash2.ul[0] );
curr = bank_hash_pool_ele( hfork->bank_hash_pool, curr->next );
FD_TEST( curr->bank_hash.ul[0] == bank_hash3.ul[0] );
curr = bank_hash_pool_ele( hfork->bank_hash_pool, curr->next );
FD_TEST( !curr );

/* evict middle (bank_hash2) from block_id */

fd_hfork_count_vote( hfork, &voters[2], &block_id4, &bank_hash4, slot4, 1, 100, &metrics );
fd_hfork_count_vote( hfork, &voters[2], &block_id5, &bank_hash5, slot5, 1, 100, &metrics );

FD_TEST( !candidate_map_query( hfork->candidate_map, (candidate_key_t){ .block_id = block_id3, .bank_hash = bank_hash2 }, NULL ) );
FD_TEST( cnt( hfork, &block_id3 )==2 );
blk3 = blk_map_query( hfork->blk_map, block_id3, NULL );

curr = blk3->bank_hashes;
FD_TEST( curr->bank_hash.ul[0] == bank_hash1.ul[0] );
curr = bank_hash_pool_ele( hfork->bank_hash_pool, curr->next );
FD_TEST( curr->bank_hash.ul[0] == bank_hash3.ul[0] );
curr = bank_hash_pool_ele( hfork->bank_hash_pool, curr->next );
FD_TEST( !curr );

/* evict back (bank_hash3) from block_id */

fd_hfork_count_vote( hfork, &voters[3], &block_id4, &bank_hash4, slot4, 1, 100, &metrics );
fd_hfork_count_vote( hfork, &voters[3], &block_id5, &bank_hash5, slot5, 1, 100, &metrics );

FD_TEST( !candidate_map_query( hfork->candidate_map, (candidate_key_t){ .block_id = block_id3, .bank_hash = bank_hash3 }, NULL ) );
FD_TEST( cnt( hfork, &block_id3 )==1 );
blk3 = blk_map_query( hfork->blk_map, block_id3, NULL );

curr = blk3->bank_hashes;
FD_TEST( curr->bank_hash.ul[0] == bank_hash1.ul[0] );
curr = bank_hash_pool_ele( hfork->bank_hash_pool, curr->next );
FD_TEST( !curr );

/* evict singleton (bank_hash1) from block_id */

fd_hfork_count_vote( hfork, &voters[1], &block_id4, &bank_hash4, slot4, 1, 100, &metrics );
fd_hfork_count_vote( hfork, &voters[1], &block_id5, &bank_hash5, slot5, 1, 100, &metrics );

FD_TEST( !candidate_map_query( hfork->candidate_map, (candidate_key_t){ .block_id = block_id3, .bank_hash = bank_hash1 }, NULL ) );
FD_TEST( !blk_map_query( hfork->blk_map, block_id3, NULL ) );

fd_wksp_free_laddr( fd_hfork_delete( fd_hfork_leave( hfork ) ) );
}
Expand Down
Loading