accdb: move slot field to DB layer

Removes the slot field from account_meta (runtime layer).  The
database layer is aware of the slot numbers in which accounts
change anyways.  This saves 8 bytes per account and removes a
cache miss during snapshot loading (checking if a duplicate account
is newer or obsolete).

This is a low-risk change because the slot field is not consensus-
relevant outside of snapshot loading.

Author: riptl

src/discof/genesis/fd_genesi_tile.c

@@ -138,7 +138,7 @@ initialize_accdb( fd_genesi_tile_t * ctx ) {
     void * data = (void *)( meta+1 );
     fd_memcpy( meta->owner, account->account.owner.uc, sizeof(fd_pubkey_t) );
     meta->lamports = account->account.lamports;
-    meta->slot = 0UL;
+    rec->slot = 0UL;
     meta->executable = !!account->account.executable;
     meta->dlen = (uint)account->account.data_len;
     fd_memcpy( data, fd_solana_account_data_join( &account->account ), account->account.data_len );

src/discof/restore/fd_snapin_tile_funk.c

@@ -48,7 +48,7 @@ fd_snapin_process_account_header_funk( fd_snapin_tile_t *            ctx,
   if( FD_UNLIKELY( existing_rec ) ) {
     fd_account_meta_t * meta = fd_funk_val( existing_rec, funk->wksp );
     if( FD_UNLIKELY( meta ) ) {
-      if( FD_LIKELY( meta->slot>result->account_header.slot ) ) {
+      if( FD_LIKELY( rec->slot>result->account_header.slot ) ) {
         ctx->acc_data = NULL;
         fd_snapin_send_duplicate_account( ctx, result->account_header.lamports, NULL, result->account_header.data_len, (uchar)result->account_header.executable, result->account_header.owner, result->account_header.pubkey, 0, &early_exit );
         return early_exit;
@@ -78,7 +78,7 @@ fd_snapin_process_account_header_funk( fd_snapin_tile_t *            ctx,
   rec->val_sz    = (uint)( alloc_sz  & FD_FUNK_REC_VAL_MAX );
 
   meta->dlen       = (uint)result->account_header.data_len;
-  meta->slot       = result->account_header.slot;
+  rec->slot        = result->account_header.slot;
   memcpy( meta->owner, result->account_header.owner, sizeof(fd_pubkey_t) );
   meta->lamports   = result->account_header.lamports;
   meta->executable = (uchar)result->account_header.executable;
@@ -129,10 +129,10 @@ streamlined_insert( fd_snapin_tile_t * ctx,
   rec->val_gaddr = fd_wksp_gaddr_fast( funk->wksp, meta );
   rec->val_max   = (uint)( fd_ulong_min( alloc_max, FD_FUNK_REC_VAL_MAX ) & FD_FUNK_REC_VAL_MAX );
   rec->val_sz    = (uint)( alloc_sz  & FD_FUNK_REC_VAL_MAX );
+  rec->slot      = slot;
 
   /* Write metadata */
   meta->dlen = (uint)data_len;
-  meta->slot = slot;
   memcpy( meta->owner, owner, sizeof(fd_pubkey_t) );
   meta->lamports   = lamports;
   meta->executable = (uchar)executable;
@@ -237,11 +237,11 @@ fd_snapin_process_account_batch_funk( fd_snapin_tile_t *            ctx,
       fd_account_meta_t const * existing = fd_funk_val( r, funk->wksp );
       if( FD_UNLIKELY( !existing ) ) FD_LOG_HEXDUMP_NOTICE(( "r", r, sizeof(fd_funk_rec_t) ));
       FD_TEST( existing );
-      if( existing->slot > slot ) {
+      if( r->slot > slot ) {
         rec[ i ] = NULL;  /* skip record if existing value is newer */
         /* send the skipped account to the subtracting hash tile */
         fd_snapin_send_duplicate_account( ctx, lamports, data, data_len, executable, owner, pubkey, 1, &early_exit );
-      } else if( slot > existing->slot) {
+      } else if( slot > r->slot) {
         /* send the to-be-replaced account to the subtracting hash tile */
         fd_snapin_send_duplicate_account( ctx, existing->lamports, (uchar const *)existing + sizeof(fd_account_meta_t), existing->dlen, existing->executable, existing->owner, pubkey, 1, &early_exit );
       } else { /* slot==existing->slot */
@@ -310,7 +310,6 @@ fd_snapin_read_account_funk( fd_snapin_tile_t *  ctx,
 
   memcpy( meta->owner, fd_accdb_ref_owner( peek->acc ), sizeof(fd_pubkey_t) );
   meta->lamports   = fd_accdb_ref_lamports( peek->acc );
-  meta->slot       = fd_accdb_ref_slot( peek->acc );
   meta->dlen       = (uint)data_sz;
   meta->executable = !!fd_accdb_ref_exec_bit( peek->acc );
   fd_memcpy( data, fd_accdb_ref_data_const( peek->acc ), data_sz );

src/discof/restore/fd_snapin_tile_vinyl.c

@@ -482,7 +482,6 @@ fd_snapin_process_account_header_vinyl( fd_snapin_tile_t *            ctx,
   memset( meta, 0, sizeof(fd_account_meta_t) ); /* bulk zero */
   memcpy( meta->owner, result->account_header.owner, sizeof(fd_pubkey_t) );
   meta->lamports   = result->account_header.lamports;
-  meta->slot       = result->account_header.slot;
   meta->dlen       = (uint)result->account_header.data_len;
   meta->executable = (uchar)result->account_header.executable;
 
@@ -651,7 +650,6 @@ fd_snapin_process_account_batch_vinyl( fd_snapin_tile_t *            ctx,
     memset( meta, 0, sizeof(fd_account_meta_t) ); /* bulk zero */
     memcpy( meta->owner, owner, sizeof(fd_pubkey_t) );
     meta->lamports   = lamports;
-    meta->slot       = result->account_batch.slot;
     meta->dlen       = (uint)data_len;
     meta->executable = !!executable;
 

src/flamenco/accdb/fd_accdb_impl_v1.c

@@ -269,9 +269,9 @@ fd_accdb_prep_create( fd_accdb_rw_t *           rw,
   rec->tag      = 0;
   rec->prev_idx = FD_FUNK_REC_IDX_NULL;
   rec->next_idx = FD_FUNK_REC_IDX_NULL;
+  rec->slot     = xid->ul[0];
 
   fd_account_meta_t * meta = val;
-  meta->slot = xid->ul[0];
 
   accdb->base.rw_active++;
   *rw = (fd_accdb_rw_t) {

src/flamenco/accdb/fd_accdb_ref.h

@@ -68,7 +68,7 @@ fd_accdb_ref_exec_bit( fd_accdb_ro_t const * ro ) {
 
 static inline ulong
 fd_accdb_ref_slot( fd_accdb_ro_t const * ro ) {
-  return ro->meta->slot;
+  return ro->rec->slot;
 }
 
 // void
@@ -165,7 +165,7 @@ fd_accdb_ref_exec_bit_set( fd_accdb_rw_t * rw,
 static inline void
 fd_accdb_ref_slot_set( fd_accdb_rw_t * rw,
                        ulong           slot ) {
-  rw->meta->slot = slot;
+  rw->rec->slot = slot;
 }
 
 FD_PROTOTYPES_END

src/flamenco/fd_flamenco_base.h

@@ -109,7 +109,6 @@ typedef struct fd_log_collector fd_log_collector_t;
 struct fd_account_meta {
   uchar owner[32];
   ulong lamports;
-  ulong slot;
   uint  dlen;
   uchar executable;
   uchar padding[3];

src/flamenco/rewards/fd_rewards.c

@@ -813,7 +813,7 @@ calculate_rewards_and_distribute_vote_rewards( fd_bank_t *                    ba
       fd_txn_account_get_data( vote_rec ),
       prev_hash );
 
-    fd_txn_account_set_slot( vote_rec, fd_bank_slot_get( bank ) );
+    prepare.rec->slot = fd_bank_slot_get( bank );
 
     if( FD_UNLIKELY( fd_txn_account_checked_add_lamports( vote_rec, rewards ) ) ) {
       FD_LOG_ERR(( "Adding lamports to vote account would cause overflow" ));
@@ -879,7 +879,7 @@ distribute_epoch_reward_to_stake_acc( fd_bank_t *               bank,
     fd_txn_account_get_data( stake_acc_rec ),
     prev_hash );
 
-  fd_txn_account_set_slot( stake_acc_rec, fd_bank_slot_get( bank ) );
+  prepare.rec->slot = fd_bank_slot_get( bank );
 
   fd_stake_state_v2_t stake_state[1] = {0};
   if( fd_stake_get_state( stake_acc_rec, stake_state ) != 0 ) {

src/flamenco/runtime/fd_executor.c

@@ -1390,9 +1390,7 @@ fd_execute_instr( fd_runtime_t *      runtime,
 }
 
 void
-fd_executor_reclaim_account( fd_txn_account_t *  account,
-                             ulong               slot ) {
-  fd_txn_account_set_slot( account, slot );
+fd_executor_reclaim_account( fd_txn_account_t * account ) {
   if( FD_UNLIKELY( fd_txn_account_get_lamports( account )==0UL ) ) {
     fd_txn_account_set_data_len( account, 0UL );
     fd_txn_account_clear_owner( account );

src/flamenco/runtime/fd_executor.h

@@ -109,8 +109,7 @@ fd_executor_txn_check( fd_bank_t *    bank,
                        fd_txn_out_t * txn_out );
 
 void
-fd_executor_reclaim_account( fd_txn_account_t * account,
-                             ulong              slot );
+fd_executor_reclaim_account( fd_txn_account_t * account );
 
 /* fd_io_strerror converts an FD_EXECUTOR_INSTR_ERR_{...} code into a
    human readable cstr.  The lifetime of the returned pointer is

src/flamenco/runtime/fd_runtime.c

@@ -318,7 +318,7 @@ fd_runtime_freeze( fd_bank_t *         bank,
 
       /* TODO: is it ok to not check the overflow error here? */
       fd_txn_account_checked_add_lamports( rec, fees );
-      fd_txn_account_set_slot( rec, fd_bank_slot_get( bank ) );
+      prepare.rec->slot = fd_bank_slot_get( bank );
 
       fd_hashes_update_lthash( rec, prev_hash, bank, capture_ctx );
       fd_txn_account_mutable_fini( rec, accdb, &prepare );
@@ -1018,6 +1018,7 @@ fd_runtime_finalize_account( fd_funk_t *               funk,
     FD_LOG_CRIT(( "fd_runtime_finalize_account: account is not mutable" ));
   }
 
+  ulong               slot        = xid->ul[0];
   fd_pubkey_t const * key         = acc->pubkey;
   uchar       const * record_data = (uchar *)fd_txn_account_get_meta( acc );
   ulong               record_sz   = fd_account_meta_get_record_sz( acc->meta );
@@ -1033,6 +1034,7 @@ fd_runtime_finalize_account( fd_funk_t *               funk,
       FD_LOG_ERR(( "fd_runtime_finalize_account: failed to prepare record (%i-%s)", err, fd_funk_strerror( err ) ));
     }
 
+    rec->slot = slot;
     if( FD_UNLIKELY( !fd_funk_val_truncate(
         rec,
         fd_funk_alloc( funk ),
@@ -1049,6 +1051,7 @@ fd_runtime_finalize_account( fd_funk_t *               funk,
 
   } else {
 
+    prev_rec->slot = slot;
     if( FD_UNLIKELY( !fd_funk_val_truncate(
         prev_rec,
         fd_funk_alloc( funk ),
@@ -1133,7 +1136,8 @@ fd_runtime_buffer_solcap_account_update( fd_txn_account_t *        account,
    - Queries funk for the previous account version
    - Computes the hash of the previous version (or uses zero for new)
    - Calls fd_hashes_update_lthash with the computed previous hash
-   - Saves the new version of the account to Funk
+   - Saves the new version of the account to Funk (also updates the
+     record's slot field)
    - Notifies the replay tile that an account update has occurred, so it
      can write the account to the solcap file.
 
@@ -1251,7 +1255,7 @@ fd_runtime_commit_txn( fd_runtime_t *      runtime,
 
       /* Reclaim any accounts that have 0-lamports, now that any related
          cache updates have been applied. */
-      fd_executor_reclaim_account( &txn_out->accounts.accounts[i], fd_bank_slot_get( bank ) );
+      fd_executor_reclaim_account( &txn_out->accounts.accounts[i] );
 
       fd_runtime_save_account( runtime->funk, &xid, &txn_out->accounts.accounts[i], bank, runtime->log.capture_ctx );
     }