flamenco: nonce program use previous blockhash entry lamports-per-sig instead of current

Author: ravyu-jump

src/discof/replay/fd_replay_tile.c

@@ -755,7 +755,7 @@ publish_slot_completed( fd_replay_tile_t *  ctx,
   }
 
   fd_hash_t const * bank_hash  = fd_bank_bank_hash_query( bank );
-  fd_hash_t const * block_hash = fd_blockhashes_peek_last( fd_bank_block_hash_queue_query( bank ) );
+  fd_hash_t const * block_hash = fd_blockhashes_peek_last_hash( fd_bank_block_hash_queue_query( bank ) );
   FD_TEST( bank_hash  );
   FD_TEST( block_hash );
 
@@ -1379,7 +1379,7 @@ publish_reset( fd_replay_tile_t *  ctx,
                fd_bank_t *         bank ) {
   if( FD_UNLIKELY( ctx->replay_out->idx==ULONG_MAX ) ) return;
 
-  fd_hash_t const * block_hash = fd_blockhashes_peek_last( fd_bank_block_hash_queue_query( bank ) );
+  fd_hash_t const * block_hash = fd_blockhashes_peek_last_hash( fd_bank_block_hash_queue_query( bank ) );
   FD_TEST( block_hash );
 
   fd_poh_reset_t * reset = fd_chunk_to_laddr( ctx->replay_out->mem, ctx->replay_out->chunk );
@@ -1439,7 +1439,7 @@ boot_genesis( fd_replay_tile_t *  ctx,
   static const fd_txncache_fork_id_t txncache_root = { .val = USHORT_MAX };
   bank->txncache_fork_id = fd_txncache_attach_child( ctx->txncache, txncache_root );
 
-  fd_hash_t const * block_hash = fd_blockhashes_peek_last( fd_bank_block_hash_queue_query( bank ) );
+  fd_hash_t const * block_hash = fd_blockhashes_peek_last_hash( fd_bank_block_hash_queue_query( bank ) );
   fd_txncache_finalize_fork( ctx->txncache, bank->txncache_fork_id, 0UL, block_hash->uc );
 
   publish_stake_weights( ctx, stem, bank, 0 );
@@ -2180,7 +2180,7 @@ process_tower_slot_done( fd_replay_tile_t *           ctx,
     fd_memcpy( reset->completed_block_id, &block_id_ele->block_id, sizeof(fd_hash_t) );
 
     fd_blockhashes_t const * block_hash_queue = fd_bank_block_hash_queue_query( bank );
-    fd_hash_t const * last_hash = fd_blockhashes_peek_last( block_hash_queue );
+    fd_hash_t const * last_hash = fd_blockhashes_peek_last_hash( block_hash_queue );
     FD_TEST( last_hash );
     fd_memcpy( reset->completed_blockhash, last_hash->uc, sizeof(fd_hash_t) );
 

src/discof/restore/utils/fd_ssload.c

@@ -126,7 +126,7 @@ fd_ssload_recover( fd_snapshot_manifest_t *  manifest,
 
   /* PoH */
   fd_blockhashes_t const * bhq = fd_bank_block_hash_queue_query( bank );
-  fd_hash_t const * last_hash = fd_blockhashes_peek_last( bhq );
+  fd_hash_t const * last_hash = fd_blockhashes_peek_last_hash( bhq );
   if( FD_LIKELY( last_hash ) ) fd_bank_poh_set( bank, *last_hash );
 
   fd_bank_capitalization_set( bank, manifest->capitalization );

src/flamenco/runtime/fd_blockhashes.h

@@ -106,11 +106,18 @@ fd_blockhashes_check_age( fd_blockhashes_t const * blockhashes,
                           ulong                    max_age );
 
 FD_FN_PURE static inline fd_hash_t const *
-fd_blockhashes_peek_last( fd_blockhashes_t const * blockhashes ) {
+fd_blockhashes_peek_last_hash( fd_blockhashes_t const * blockhashes ) {
   if( FD_UNLIKELY( fd_blockhash_deq_empty( blockhashes->d.deque ) ) ) return 0;
   return &fd_blockhash_deq_peek_tail_const( blockhashes->d.deque )->hash;
 }
 
+
+FD_FN_PURE static inline fd_blockhash_info_t const *
+fd_blockhashes_peek_last( fd_blockhashes_t const * blockhashes ) {
+  if( FD_UNLIKELY( fd_blockhash_deq_empty( blockhashes->d.deque ) ) ) return 0;
+  return fd_blockhash_deq_peek_tail_const( blockhashes->d.deque );
+}
+
 FD_PROTOTYPES_END
 
 #endif /* HEADER_fd_src_flamenco_runtime_fd_blockhashes_h */

src/flamenco/runtime/fd_runtime.c

@@ -1342,7 +1342,7 @@ fd_runtime_process_new_epoch( fd_banks_t *              banks,
   /* Distribute rewards.  This involves calculating the rewards for
      every vote and stake account. */
 
-  fd_hash_t const * parent_blockhash = fd_blockhashes_peek_last( fd_bank_block_hash_queue_query( bank ) );
+  fd_hash_t const * parent_blockhash = fd_blockhashes_peek_last_hash( fd_bank_block_hash_queue_query( bank ) );
   fd_begin_partitioned_rewards( bank,
                                 accdb,
                                 xid,

src/flamenco/runtime/program/fd_system_program_nonce.c

@@ -59,19 +59,19 @@ require_acct_recent_blockhashes( fd_exec_instr_ctx_t * ctx,
 
 static int
 most_recent_block_hash( fd_exec_instr_ctx_t * ctx,
-                        fd_hash_t *           out ) {
+                        fd_blockhash_info_t * out ) {
   /* The environment config blockhash comes from `bank.last_blockhash_and_lamports_per_signature()`,
      which takes the top element from the blockhash queue.
      https://github.com/anza-xyz/agave/blob/v2.1.6/programs/system/src/system_instruction.rs#L47 */
-  fd_blockhashes_t const * blockhashes = fd_bank_block_hash_queue_query( ctx->txn_ctx->bank );
-  fd_hash_t const *        last_hash   = fd_blockhashes_peek_last( blockhashes );
-  if( FD_UNLIKELY( last_hash==NULL ) ) {
+  fd_blockhashes_t const *    blockhashes     = fd_bank_block_hash_queue_query( ctx->txn_ctx->bank );
+  fd_blockhash_info_t const * last_bhash_info = fd_blockhashes_peek_last( blockhashes );
+  if( FD_UNLIKELY( last_bhash_info==NULL ) ) {
     // Agave panics if this blockhash was never set at the start of the txn batch
     ctx->txn_ctx->err.custom_err = FD_SYSTEM_PROGRAM_ERR_NONCE_NO_RECENT_BLOCKHASHES;
     return FD_EXECUTOR_INSTR_ERR_CUSTOM_ERR;
   }
 
-  *out = *last_hash;
+  *out = *last_bhash_info;
   return FD_EXECUTOR_INSTR_SUCCESS;
 }
 
@@ -181,14 +181,14 @@ fd_system_program_advance_nonce_account( fd_exec_instr_ctx_t *   ctx,
 
     /* https://github.com/solana-labs/solana/blob/v1.17.23/programs/system/src/system_instruction.rs#L45 */
 
-    fd_hash_t blockhash;
+    fd_blockhash_info_t blockhash[1];
     do {
-      int err = most_recent_block_hash( ctx, &blockhash );
+      int err = most_recent_block_hash( ctx, blockhash );
       if( FD_UNLIKELY( err ) ) return err;
     } while(0);
 
     fd_hash_t next_durable_nonce;
-    fd_durable_nonce_from_blockhash( &next_durable_nonce, &blockhash );
+    fd_durable_nonce_from_blockhash( &next_durable_nonce, &blockhash->hash );
 
     /* https://github.com/solana-labs/solana/blob/v1.17.23/programs/system/src/system_instruction.rs#L46-L52 */
 
@@ -208,7 +208,7 @@ fd_system_program_advance_nonce_account( fd_exec_instr_ctx_t *   ctx,
           .authority      = data->authority,
           .durable_nonce  = next_durable_nonce,
           .fee_calculator = {
-            .lamports_per_signature = fd_bank_rbh_lamports_per_sig_get( ctx->txn_ctx->bank )
+            .lamports_per_signature = blockhash->fee_calculator.lamports_per_signature
           }
         } }
       } }
@@ -364,14 +364,14 @@ fd_system_program_withdraw_nonce_account( fd_exec_instr_ctx_t * ctx,
 
       /* https://github.com/solana-labs/solana/blob/v1.17.23/programs/system/src/system_instruction.rs#L109 */
 
-      fd_hash_t blockhash;
+      fd_blockhash_info_t blockhash[1];
       do {
-        int err = most_recent_block_hash( ctx, &blockhash );
+        int err = most_recent_block_hash( ctx, blockhash );
         if( FD_UNLIKELY( err ) ) return err;
       } while(0);
 
       fd_hash_t next_durable_nonce;
-      fd_durable_nonce_from_blockhash( &next_durable_nonce, &blockhash );
+      fd_durable_nonce_from_blockhash( &next_durable_nonce, &blockhash->hash );
 
       /* https://github.com/solana-labs/solana/blob/v1.17.23/programs/system/src/system_instruction.rs#L110-L116 */
 
@@ -554,14 +554,14 @@ fd_system_program_initialize_nonce_account( fd_exec_instr_ctx_t *   ctx,
 
     /* https://github.com/solana-labs/solana/blob/v1.17.23/programs/system/src/system_instruction.rs#L180 */
 
-    fd_hash_t blockhash;
+    fd_blockhash_info_t blockhash[1];
     do {
-      int err = most_recent_block_hash( ctx, &blockhash );
+      int err = most_recent_block_hash( ctx, blockhash );
       if( FD_UNLIKELY( err ) ) return err;
     } while(0);
 
     fd_hash_t durable_nonce;
-    fd_durable_nonce_from_blockhash( &durable_nonce, &blockhash );
+    fd_durable_nonce_from_blockhash( &durable_nonce, &blockhash->hash );
 
     /* https://github.com/anza-xyz/agave/blob/v3.0.3/programs/system/src/system_instruction.rs#L185-L191 */
 
@@ -573,7 +573,7 @@ fd_system_program_initialize_nonce_account( fd_exec_instr_ctx_t *   ctx,
           .authority      = *authorized,
           .durable_nonce  = durable_nonce,
           .fee_calculator = {
-            .lamports_per_signature = fd_bank_rbh_lamports_per_sig_get( ctx->txn_ctx->bank )
+            .lamports_per_signature = blockhash->fee_calculator.lamports_per_signature
           }
         } }
       } }
@@ -877,7 +877,7 @@ fd_system_program_exec_upgrade_nonce_account( fd_exec_instr_ctx_t * ctx ) {
 int
 fd_check_transaction_age( fd_exec_txn_ctx_t * txn_ctx ) {
   fd_blockhashes_t const * block_hash_queue = fd_bank_block_hash_queue_query( txn_ctx->bank );
-  fd_hash_t const *        last_blockhash   = fd_blockhashes_peek_last( block_hash_queue );
+  fd_hash_t const *        last_blockhash   = fd_blockhashes_peek_last_hash( block_hash_queue );
   if( FD_UNLIKELY( !last_blockhash ) ) {
     FD_LOG_CRIT(( "blockhash queue is empty" ));
   }