Updating features map and enable_loader_v4

jvarela-jump · jvarela-jump · commit fe48d1b12c53 · 2025-03-29T14:04:42.000Z
diff --git a/src/app/shared_dev/commands/configure/genesis.c b/src/app/shared_dev/commands/configure/genesis.c
@@ -47,7 +47,7 @@ default_enable_features( fd_features_t * features ) {
   features->update_hashes_per_tick3 = 0UL;
   features->update_hashes_per_tick4 = 0UL;
   features->enable_bpf_loader_extend_program_ix = 0UL;
-  features->enable_program_runtime_v2_and_loader_v4 = 0UL;
+  features->enable_loader_v4 = 0UL;
   features->increase_tx_account_lock_limit = 0UL;
   features->stake_raise_minimum_delegation_to_1_sol = 0UL;
   features->enable_alt_bn128_syscall = 0UL;
diff --git a/src/flamenco/features/fd_features_generated.c b/src/flamenco/features/fd_features_generated.c
@@ -1150,10 +1150,10 @@ fd_feature_id_t const ids[] = {
     .name                      = "remaining_compute_units_syscall_enabled",
     .cleaned_up                = {UINT_MAX, UINT_MAX, UINT_MAX} },
 
-  { .index                     = offsetof(fd_features_t, enable_program_runtime_v2_and_loader_v4)>>3,
-    .id                        = {"\x73\xd6\xec\x04\xbe\x12\xf9\x97\x7c\x5b\x14\x23\xca\x21\x5f\x5c\xac\x7c\x41\xfa\xd1\xf8\xc7\x7f\x0d\x23\x00\xe1\xb4\xa6\xf1\xd8"},
-                                 /* 8oBxsYqnCvUTGzgEpxPcnVf7MLbWWPYddE33PftFeBBd */
-    .name                      = "enable_program_runtime_v2_and_loader_v4",
+  { .index                     = offsetof(fd_features_t, enable_loader_v4)>>3,
+    .id                        = {"\x6a\xf9\xc2\xb7\xef\x03\x1f\xcd\x0f\x1a\x09\x23\x4e\x8a\x87\x4e\xa1\xf5\x78\x76\x05\xb9\x50\xa3\x0d\x93\x1f\xf6\x6a\x54\x99\xd6"},
+                                 /* 8Cb77yHjPWe9wuWUfXeh6iszFGCDGNCoFk3tprViYHNm */
+    .name                      = "enable_loader_v4",
     .cleaned_up                = {UINT_MAX, UINT_MAX, UINT_MAX} },
 
   { .index                     = offsetof(fd_features_t, require_rent_exempt_split_destination)>>3,
@@ -1560,6 +1560,36 @@ fd_feature_id_t const ids[] = {
     .name                      = "disable_partitioned_rent_collection",
     .cleaned_up                = {UINT_MAX, UINT_MAX, UINT_MAX} },
 
+  { .index                     = offsetof(fd_features_t, vote_only_full_fec_sets)>>3,
+    .id                        = {"\x09\xe7\xc5\x4a\x98\x6c\xb6\x68\x7d\xea\x99\x67\x65\x85\xc4\x3a\x6b\xac\x6d\x4c\x86\x10\x38\x21\xa6\x5c\x47\x63\x60\x46\x6a\x13"},
+                                 /* ffecLRhhakKSGhMuc6Fz2Lnfq4uT9q3iu9ZsNaPLxPc */
+    .name                      = "vote_only_full_fec_sets",
+    .cleaned_up                = {UINT_MAX, UINT_MAX, UINT_MAX} },
+
+  { .index                     = offsetof(fd_features_t, drop_unchained_merkle_shreds)>>3,
+    .id                        = {"\x20\x0f\x3a\xb8\x5d\x6c\x0b\x80\xe0\x5b\xbd\x7c\x65\x02\x11\xc5\x4c\xa1\x37\x3a\x74\xc9\x1a\xf1\xe7\x34\x0b\xf5\x27\x82\x0f\x8d"},
+                                 /* 3A9WtMU4aHuryD3VN7SFKdfXto8HStLb1Jj6HjkgfnGL */
+    .name                      = "drop_unchained_merkle_shreds",
+    .cleaned_up                = {UINT_MAX, UINT_MAX, UINT_MAX} },
+
+  { .index                     = offsetof(fd_features_t, verify_retransmitter_signature)>>3,
+    .id                        = {"\x9c\xcc\xbd\x50\xa2\xed\x41\xa8\x85\x34\x23\x68\x9b\xcd\xb3\x28\xd1\x52\xd5\xe6\xfa\xcd\x2d\x3d\x8e\xbc\x54\x90\xee\x43\x96\xa6"},
+                                 /* BZ5g4hRbu5hLQQBdPyo2z9icGyJ8Khiyj3QS6dhWijTb */
+    .name                      = "verify_retransmitter_signature",
+    .cleaned_up                = {UINT_MAX, UINT_MAX, UINT_MAX} },
+
+  { .index                     = offsetof(fd_features_t, enable_turbine_extended_fanout_experiments)>>3,
+    .id                        = {"\x9c\xfa\x56\x83\x27\xa3\x72\x02\xcc\xb2\x43\x58\x96\x7a\xd0\xb1\x15\x49\x12\xb3\x1e\xb1\x38\xb9\x5c\x09\x00\x03\xc2\x36\xd8\xbe"},
+                                 /* BZn14Liea52wtBwrXUxTv6vojuTTmfc7XGEDTXrvMD7b */
+    .name                      = "enable_turbine_extended_fanout_experiments",
+    .cleaned_up                = {UINT_MAX, UINT_MAX, UINT_MAX} },
+
+  { .index                     = offsetof(fd_features_t, vote_only_retransmitter_signed_fec_sets)>>3,
+    .id                        = {"\x06\x51\x2b\xe1\x3a\x96\x4f\x49\x50\xb7\xac\x06\xb0\x90\x4d\x04\xbb\xbf\x29\xc7\x0c\x01\xf6\x52\x11\x2b\x02\xfa\x13\x90\x98\x76"},
+                                 /* RfEcA95xnhuwooVAhUUksEJLZBF7xKCLuqrJoqk4Zph */
+    .name                      = "vote_only_retransmitter_signed_fec_sets",
+    .cleaned_up                = {UINT_MAX, UINT_MAX, UINT_MAX} },
+
   { .index = ULONG_MAX }
 };
 /* TODO replace this with fd_map_perfect */
@@ -1732,7 +1762,7 @@ fd_feature_id_query( ulong prefix ) {
   case 0x3cbf822ccb2eebd4: return &ids[ 163 ];
   case 0xe9d32123513c4d0d: return &ids[ 164 ];
   case 0x64205286d7935342: return &ids[ 165 ];
-  case 0x97f912be04ecd673: return &ids[ 166 ];
+  case 0xcd1f03efb7c2f96a: return &ids[ 166 ];
   case 0x4b241cb4c6f3b3b2: return &ids[ 167 ];
   case 0x21746beaa849f9d9: return &ids[ 168 ];
   case 0x9bb55b5df1c396c5: return &ids[ 169 ];
@@ -1794,6 +1824,11 @@ fd_feature_id_query( ulong prefix ) {
   case 0x8ef4f4fdbc3d6c85: return &ids[ 225 ];
   case 0xd571e3dc9532c905: return &ids[ 226 ];
   case 0x4d86ca23d81d6d11: return &ids[ 227 ];
+  case 0x68b66c984ac5e709: return &ids[ 228 ];
+  case 0x800b6c5db83a0f20: return &ids[ 229 ];
+  case 0xa841eda250bdcc9c: return &ids[ 230 ];
+  case 0x0272a3278356fa9c: return &ids[ 231 ];
+  case 0x494f963ae12b5106: return &ids[ 232 ];
   default: break;
   }
   return NULL;
@@ -1965,7 +2000,7 @@ FD_STATIC_ASSERT( offsetof( fd_features_t, revise_turbine_epoch_stakes
 FD_STATIC_ASSERT( offsetof( fd_features_t, enable_poseidon_syscall                                 )>>3==163UL, layout );
 FD_STATIC_ASSERT( offsetof( fd_features_t, timely_vote_credits                                     )>>3==164UL, layout );
 FD_STATIC_ASSERT( offsetof( fd_features_t, remaining_compute_units_syscall_enabled                 )>>3==165UL, layout );
-FD_STATIC_ASSERT( offsetof( fd_features_t, enable_program_runtime_v2_and_loader_v4                 )>>3==166UL, layout );
+FD_STATIC_ASSERT( offsetof( fd_features_t, enable_loader_v4                                        )>>3==166UL, layout );
 FD_STATIC_ASSERT( offsetof( fd_features_t, require_rent_exempt_split_destination                   )>>3==167UL, layout );
 FD_STATIC_ASSERT( offsetof( fd_features_t, better_error_codes_for_tx_lamport_check                 )>>3==168UL, layout );
 FD_STATIC_ASSERT( offsetof( fd_features_t, enable_alt_bn128_compression_syscall                    )>>3==169UL, layout );
@@ -2027,4 +2062,9 @@ FD_STATIC_ASSERT( offsetof( fd_features_t, raise_block_limits_to_50m
 FD_STATIC_ASSERT( offsetof( fd_features_t, move_precompile_verification_to_svm                     )>>3==225UL, layout );
 FD_STATIC_ASSERT( offsetof( fd_features_t, enable_transaction_loading_failure_fees                 )>>3==226UL, layout );
 FD_STATIC_ASSERT( offsetof( fd_features_t, disable_partitioned_rent_collection                     )>>3==227UL, layout );
+FD_STATIC_ASSERT( offsetof( fd_features_t, vote_only_full_fec_sets                                 )>>3==228UL, layout );
+FD_STATIC_ASSERT( offsetof( fd_features_t, drop_unchained_merkle_shreds                            )>>3==229UL, layout );
+FD_STATIC_ASSERT( offsetof( fd_features_t, verify_retransmitter_signature                          )>>3==230UL, layout );
+FD_STATIC_ASSERT( offsetof( fd_features_t, enable_turbine_extended_fanout_experiments              )>>3==231UL, layout );
+FD_STATIC_ASSERT( offsetof( fd_features_t, vote_only_retransmitter_signed_fec_sets                 )>>3==232UL, layout );
 FD_STATIC_ASSERT( sizeof( fd_features_t )>>3==FD_FEATURE_ID_CNT, layout );
diff --git a/src/flamenco/features/fd_features_generated.h b/src/flamenco/features/fd_features_generated.h
@@ -3,7 +3,7 @@
 #error "Include fd_features.h instead of this file."
 #endif
 /* FEATURE_ID_CNT is the number of features in ids */
-#define FD_FEATURE_ID_CNT (228UL)
+#define FD_FEATURE_ID_CNT (233UL)
 union fd_features {
   ulong f[ FD_FEATURE_ID_CNT ];
   struct {
@@ -173,7 +173,7 @@ union fd_features {
     /* 0x3cbf822ccb2eebd4 */ ulong enable_poseidon_syscall;
     /* 0xe9d32123513c4d0d */ ulong timely_vote_credits;
     /* 0x64205286d7935342 */ ulong remaining_compute_units_syscall_enabled;
-    /* 0x97f912be04ecd673 */ ulong enable_program_runtime_v2_and_loader_v4;
+    /* 0xcd1f03efb7c2f96a */ ulong enable_loader_v4;
     /* 0x4b241cb4c6f3b3b2 */ ulong require_rent_exempt_split_destination;
     /* 0x21746beaa849f9d9 */ ulong better_error_codes_for_tx_lamport_check;
     /* 0x9bb55b5df1c396c5 */ ulong enable_alt_bn128_compression_syscall;
@@ -235,5 +235,10 @@ union fd_features {
     /* 0x8ef4f4fdbc3d6c85 */ ulong move_precompile_verification_to_svm;
     /* 0xd571e3dc9532c905 */ ulong enable_transaction_loading_failure_fees;
     /* 0x4d86ca23d81d6d11 */ ulong disable_partitioned_rent_collection;
+    /* 0x68b66c984ac5e709 */ ulong vote_only_full_fec_sets;
+    /* 0x800b6c5db83a0f20 */ ulong drop_unchained_merkle_shreds;
+    /* 0xa841eda250bdcc9c */ ulong verify_retransmitter_signature;
+    /* 0x0272a3278356fa9c */ ulong enable_turbine_extended_fanout_experiments;
+    /* 0x494f963ae12b5106 */ ulong vote_only_retransmitter_signed_fec_sets;
   };
 };
diff --git a/src/flamenco/features/feature_map.json b/src/flamenco/features/feature_map.json
@@ -165,7 +165,7 @@
   {"name":"enable_poseidon_syscall","pubkey": "FL9RsQA6TVUoh5xJQ9d936RHSebA1NLQqe3Zv9sXZRpr","activated_on_all_clusters":1},
   {"name":"timely_vote_credits","old": "2oXpeh141pPZCTCFHBsvCwG2BtaHZZAtrVhwaxSy6brS","pubkey":"tvcF6b1TRz353zKuhBjinZkKzjmihXmBAHJdjNYw1sQ","activated_on_all_clusters":1},
   {"name":"remaining_compute_units_syscall_enabled","pubkey": "5TuppMutoyzhUSfuYdhgzD47F92GL1g89KpCZQKqedxP"},
-  {"name":"enable_program_runtime_v2_and_loader_v4","pubkey": "8oBxsYqnCvUTGzgEpxPcnVf7MLbWWPYddE33PftFeBBd"},
+  {"name":"enable_loader_v4","pubkey": "8Cb77yHjPWe9wuWUfXeh6iszFGCDGNCoFk3tprViYHNm"},
   {"name":"require_rent_exempt_split_destination","pubkey": "D2aip4BBr8NPWtU9vLrwrBvbuaQ8w1zV38zFLxx4pfBV","cleaned_up":[2,0,0],"activated_on_all_clusters":1},
   {"name":"better_error_codes_for_tx_lamport_check","pubkey": "Ffswd3egL3tccB6Rv3XY6oqfdzn913vUcjCSnpvCKpfx","cleaned_up":[2,0,0],"activated_on_all_clusters":1},
   {"name":"enable_alt_bn128_compression_syscall","pubkey": "EJJewYSddEEtSZHiqugnvhQHiWyZKjkFDQASd7oKSagn","activated_on_all_clusters":1},
@@ -227,5 +227,9 @@
   {"name":"move_precompile_verification_to_svm","pubkey":"9ypxGLzkMxi89eDerRKXWDXe44UY2z4hBig4mDhNq5Dp"},
   {"name":"enable_transaction_loading_failure_fees","pubkey":"PaymEPK2oqwT9TXAVfadjztH2H6KfLEB9Hhd5Q5frvP","activated_on_all_clusters":1},
   {"name":"disable_partitioned_rent_collection","pubkey":"2B2SBNbUcr438LtGXNcJNBP2GBSxjx81F945SdSkUSfC"},
-  {"name":"vote_only_full_fec_sets","pubkey":"ffecLRhhakKSGhMuc6Fz2Lnfq4uT9q3iu9ZsNaPLxPc"}
+  {"name":"vote_only_full_fec_sets","pubkey":"ffecLRhhakKSGhMuc6Fz2Lnfq4uT9q3iu9ZsNaPLxPc"},
+  {"name":"drop_unchained_merkle_shreds","pubkey":"3A9WtMU4aHuryD3VN7SFKdfXto8HStLb1Jj6HjkgfnGL"},
+  {"name":"verify_retransmitter_signature","pubkey":"BZ5g4hRbu5hLQQBdPyo2z9icGyJ8Khiyj3QS6dhWijTb"},
+  {"name":"enable_turbine_extended_fanout_experiments","pubkey":"BZn14Liea52wtBwrXUxTv6vojuTTmfc7XGEDTXrvMD7b"},
+  {"name":"vote_only_retransmitter_signed_fec_sets","pubkey":"RfEcA95xnhuwooVAhUUksEJLZBF7xKCLuqrJoqk4Zph"}
 ]
diff --git a/src/flamenco/runtime/program/fd_builtin_programs.c b/src/flamenco/runtime/program/fd_builtin_programs.c
@@ -46,7 +46,7 @@ DEFINE_CORE_BPF_MIGRATION_CONFIG(STATELESS_TO_CORE_BPF_FEATURE_GATE_PROGRAM_CONF
 #define VOTE_PROGRAM_BUILTIN                  BUILTIN_PROGRAM(&fd_solana_vote_program_id,                   "vote_program",                          NO_ENABLE_FEATURE_ID,                                             NO_CORE_BPF_MIGRATION_CONFIG)
 #define STAKE_PROGRAM_BUILTIN                 BUILTIN_PROGRAM(&fd_solana_stake_program_id,                  "stake_program",                         NO_ENABLE_FEATURE_ID,                                             MIGRATE_BUILTIN_TO_CORE_BPF_STAKE_PROGRAM_CONFIG)
 #define CONFIG_PROGRAM_BUILTIN                BUILTIN_PROGRAM(&fd_solana_config_program_id,                 "config_program",                        NO_ENABLE_FEATURE_ID,                                             MIGRATE_BUILTIN_TO_CORE_BPF_CONFIG_PROGRAM_CONFIG)
-#define LOADER_V4_BUILTIN                     BUILTIN_PROGRAM(&fd_solana_bpf_loader_v4_program_id,          "loader_v4",                             offsetof(fd_features_t, enable_program_runtime_v2_and_loader_v4), NO_CORE_BPF_MIGRATION_CONFIG)
+#define LOADER_V4_BUILTIN                     BUILTIN_PROGRAM(&fd_solana_bpf_loader_v4_program_id,          "loader_v4",                             offsetof(fd_features_t, enable_loader_v4),                        NO_CORE_BPF_MIGRATION_CONFIG)
 #define ADDRESS_LOOKUP_TABLE_PROGRAM_BUILTIN  BUILTIN_PROGRAM(&fd_solana_address_lookup_table_program_id,   "address_lookup_table_program",          NO_ENABLE_FEATURE_ID,                                             MIGRATE_BUILTIN_TO_CORE_BPF_ADDRESS_LOOKUP_TABLE_PROGRAM_CONFIG)
 #define BPF_LOADER_DEPRECATED_BUILTIN         BUILTIN_PROGRAM(&fd_solana_bpf_loader_deprecated_program_id,  "solana_bpf_loader_deprecated_program",  NO_ENABLE_FEATURE_ID,                                             NO_CORE_BPF_MIGRATION_CONFIG)
 #define BPF_LOADER_BUILTIN                    BUILTIN_PROGRAM(&fd_solana_bpf_loader_program_id,             "solana_bpf_loader_program",             NO_ENABLE_FEATURE_ID,                                             NO_CORE_BPF_MIGRATION_CONFIG)
diff --git a/src/flamenco/runtime/program/fd_loader_v4_program.c b/src/flamenco/runtime/program/fd_loader_v4_program.c
@@ -691,7 +691,7 @@ fd_loader_v4_program_instruction_finalize( fd_exec_instr_ctx_t * instr_ctx ) {
    https://github.com/anza-xyz/agave/blob/v2.1.4/programs/loader-v4/src/lib.rs#L463-L526 */
 int
 fd_loader_v4_program_execute( fd_exec_instr_ctx_t * instr_ctx ) {
-  if( FD_UNLIKELY( !FD_FEATURE_ACTIVE( instr_ctx->txn_ctx->slot, instr_ctx->txn_ctx->features, enable_program_runtime_v2_and_loader_v4 ) ) ) {
+  if( FD_UNLIKELY( !FD_FEATURE_ACTIVE( instr_ctx->txn_ctx->slot, instr_ctx->txn_ctx->features, enable_loader_v4 ) ) ) {
     return FD_EXECUTOR_INSTR_ERR_UNSUPPORTED_PROGRAM_ID;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -691,7 +691,7 @@ fd_loader_v4_program_instruction_finalize( fd_exec_instr_ctx_t * instr_ctx ) {`
`691`	`691`	`https://github.com/anza-xyz/agave/blob/v2.1.4/programs/loader-v4/src/lib.rs#L463-L526 */`
`692`	`692`	`int`
`693`	`693`	`fd_loader_v4_program_execute( fd_exec_instr_ctx_t * instr_ctx ) {`
`694`		`- if( FD_UNLIKELY( !FD_FEATURE_ACTIVE( instr_ctx->txn_ctx->slot, instr_ctx->txn_ctx->features, enable_program_runtime_v2_and_loader_v4 ) ) ) {`
	`694`	`+ if( FD_UNLIKELY( !FD_FEATURE_ACTIVE( instr_ctx->txn_ctx->slot, instr_ctx->txn_ctx->features, enable_loader_v4 ) ) ) {`
`695`	`695`	`return FD_EXECUTOR_INSTR_ERR_UNSUPPORTED_PROGRAM_ID;`
`696`	`696`	`}`
`697`	`697`