Remove wbmtree and rent_lists

Author: riptl

src/ballet/bmtree/Local.mk

@@ -1,5 +1,5 @@
-$(call add-hdrs,fd_bmtree.h fd_wbmtree.h)
-$(call add-objs,fd_bmtree fd_wbmtree,fd_ballet)
+$(call add-hdrs,fd_bmtree.h)
+$(call add-objs,fd_bmtree,fd_ballet)
 
 $(call make-unit-test,test_bmtree,test_bmtree,fd_ballet fd_util)
 $(call run-unit-test,test_bmtree)

src/ballet/bmtree/fd_wbmtree.c

@@ -36,8 +36,6 @@ $(call add-objs,fd_borrowed_account,fd_flamenco)
 $(call add-hdrs, tests/fd_dump_pb.h)
 $(call add-objs, tests/fd_dump_pb,fd_flamenco)
 
-$(call add-hdrs,fd_rent_lists.h)
-
 $(call add-hdrs,fd_txn_account.h)
 $(call add-objs,fd_txn_account,fd_flamenco)
 $(call make-unit-test,test_txn_account,test_txn_account,fd_flamenco fd_funk fd_ballet fd_util)

src/ballet/bmtree/fd_wbmtree.h

@@ -197,7 +197,6 @@ FD_PROTOTYPES_BEGIN
   X(ulong,                             failed_txn_count,            sizeof(ulong),                             alignof(ulong),                             0,   0,                0    )  /* Failed transaction count */                               \
   X(ulong,                             nonvote_failed_txn_count,    sizeof(ulong),                             alignof(ulong),                             0,   0,                0    )  /* Nonvote failed transaction count */                       \
   X(ulong,                             total_compute_units_used,    sizeof(ulong),                             alignof(ulong),                             0,   0,                0    )  /* Total compute units used */                               \
-  X(ulong,                             part_width,                  sizeof(ulong),                             alignof(ulong),                             0,   0,                0    )  /* Part width */                                             \
   X(ulong,                             slots_per_epoch,             sizeof(ulong),                             alignof(ulong),                             0,   0,                0    )  /* Slots per epoch */                                        \
   X(ulong,                             shred_cnt,                   sizeof(ulong),                             alignof(ulong),                             0,   0,                0    )  /* Shred count */                                            \
   X(int,                               enable_exec_recording,       sizeof(int),                               alignof(int),                               0,   0,                0    )  /* Enable exec recording */                                  \

src/flamenco/runtime/Local.mk

@@ -117,8 +117,6 @@ fd_runtime_update_slots_per_epoch( fd_bank_t * bank,
   }
 
   fd_bank_slots_per_epoch_set( bank, slots_per_epoch );
-
-  fd_bank_part_width_set( bank, fd_rent_partition_width( slots_per_epoch ) );
 }
 
 void

src/flamenco/runtime/fd_bank.h

@@ -9,19 +9,14 @@
 #include "fd_acc_mgr.h"
 #include "fd_hashes.h"
 #include "../features/fd_features.h"
-#include "fd_rent_lists.h"
 #include "context/fd_capture_ctx.h"
 #include "context/fd_exec_txn_ctx.h"
 #include "info/fd_runtime_block_info.h"
 #include "info/fd_instr_info.h"
-#include "../gossip/fd_gossip.h"
-#include "../repair/fd_repair.h"
 #include "../../disco/pack/fd_microblock.h"
 #include "info/fd_microblock_info.h"
-#include "../../ballet/bmtree/fd_wbmtree.h"
 #include "../../ballet/sbpf/fd_sbpf_loader.h"
 #include "fd_runtime_public.h"
-#include "../../disco/stem/fd_stem.h"
 
 /* Various constant values used by the runtime. */
 
@@ -212,11 +207,6 @@ FD_STATIC_ASSERT( FD_BPF_ALIGN_OF_U128==FD_ACCOUNT_REC_DATA_ALIGN, input_data_al
    why 72/40. */
 #define FD_RUNTIME_TRANSACTION_FINALIZATION_FOOTPRINT      (FD_ACC_SZ_MAX*72UL/40UL)
 
-/* The below macros aren't used anywhere, but since the spads are used for PoH tick verification,
-   we ensure that the default spad size is large enough for the wbmtree and leaves */
-
-#define FD_RUNTIME_MERKLE_LEAF_CNT_MAX (FD_TXN_MAX_PER_SLOT * FD_TXN_ACTUAL_SIG_MAX)
-
 
 /* FD_SLICE_ALIGN specifies the alignment needed for a block slice.
    ALIGN is double x86 cache line to mitigate various kinds of false
@@ -257,13 +247,6 @@ FD_STATIC_ASSERT( FD_BPF_ALIGN_OF_U128==FD_ACCOUNT_REC_DATA_ALIGN, input_data_al
 // https://github.com/firedancer-io/solana/blob/v1.17.5/core/src/repair/repair_service.rs#L55
 #define FD_REPAIR_TIMEOUT (200 / FD_MS_PER_TICK)
 
-#define FD_RUNTIME_MERKLE_VERIFICATION_FOOTPRINT FD_RUNTIME_MERKLE_LEAF_CNT_MAX * sizeof(fd_wbmtree32_leaf_t)     /* leaves */   \
-                                                + sizeof(fd_wbmtree32_t) + sizeof(fd_wbmtree32_node_t)*(FD_RUNTIME_MERKLE_LEAF_CNT_MAX + (FD_RUNTIME_MERKLE_LEAF_CNT_MAX/2)) /* tree footprint */ \
-                                                + FD_RUNTIME_MERKLE_LEAF_CNT_MAX * (sizeof(fd_ed25519_sig_t) + 1) /* sig mbuf */ \
-                                                + 1UL + FD_WBMTREE32_ALIGN + alignof(fd_wbmtree32_leaf_t)         /* aligns */
-
-FD_STATIC_ASSERT( FD_RUNTIME_MERKLE_VERIFICATION_FOOTPRINT <= FD_RUNTIME_TRANSACTION_EXECUTION_FOOTPRINT_DEFAULT, merkle verify footprint exceeds txn execution footprint );
-
 /* Helpers for runtime public frame management. */
 
 /* Helpers for runtime spad frame management. */