types: remove unused solana_account_meta type

This type doesn't require a serializer, move it to solcap

Author: riptl

src/flamenco/capture/fd_solcap_writer.h

@@ -3,7 +3,7 @@
 
 #include "fd_solcap_proto.h"
 #include "fd_solcap.pb.h"
-#include "../types/fd_types.h"
+#include "../types/fd_types_custom.h"
 
 /* fd_solcap_writer_t is an opaque handle to a capture writer object.
    Currently, it implements writing SOLCAP_V1_BANK files.  See below
@@ -14,6 +14,25 @@ typedef struct fd_solcap_writer fd_solcap_writer_t;
 
 FD_PROTOTYPES_BEGIN
 
+struct __attribute__((packed)) fd_solana_account_meta {
+  ulong lamports;
+  uchar owner[32];
+  uchar executable;
+  uchar padding[3];
+};
+typedef struct fd_solana_account_meta fd_solana_account_meta_t;
+
+static inline fd_solana_account_meta_t *
+fd_solana_account_meta_init( fd_solana_account_meta_t * meta,
+                             ulong                      lamports,
+                             void const *               owner,
+                             int                        exec_bit ) {
+  meta->lamports = lamports;
+  fd_memcpy( meta->owner, owner, sizeof(fd_pubkey_t) );
+  meta->executable = !!exec_bit;
+  return meta;
+}
+
 /* fd_solcap_writer_t object lifecycle API ****************************/
 
 /* fd_solcap_writer_{align,footprint} return align and footprint

src/flamenco/runtime/fd_hashes.c

@@ -99,11 +99,17 @@ fd_hashes_update_lthash( fd_txn_account_t const  * account,
   if( capture_ctx && capture_ctx->capture &&
       fd_bank_slot_get( bank )>=capture_ctx->solcap_start_slot &&
       memcmp( prev_account_hash->bytes, new_hash->bytes, sizeof(fd_lthash_value_t))!=0 ) {
-    fd_solana_account_meta_t meta = fd_txn_account_get_solana_meta( account );
+    fd_solana_account_meta_t meta[1];
+    fd_solana_account_meta_init(
+        meta,
+        fd_txn_account_get_lamports ( account ),
+        fd_txn_account_get_owner    ( account ),
+        fd_txn_account_is_executable( account )
+    );
     int err = fd_solcap_write_account(
       capture_ctx->capture,
       account->pubkey,
-      &meta,
+      meta,
       fd_txn_account_get_data( account ),
       fd_txn_account_get_data_len( account ) );
     if( FD_UNLIKELY( err ) ) {

src/flamenco/runtime/fd_runtime.c

@@ -792,7 +792,12 @@ fd_runtime_buffer_solcap_account_update( fd_txn_account_t *        account,
   /* Write the message to the buffer */
   fd_capture_ctx_account_update_msg_t * account_update_msg = (fd_capture_ctx_account_update_msg_t *)(capture_ctx->account_updates_buffer_ptr);
   account_update_msg->pubkey               = *account->pubkey;
-  account_update_msg->info                 = fd_txn_account_get_solana_meta( account );
+  fd_solana_account_meta_init(
+      &account_update_msg->info,
+      fd_txn_account_get_lamports ( account ),
+      fd_txn_account_get_owner    ( account ),
+      fd_txn_account_is_executable( account )
+  );
   account_update_msg->data_sz              = meta->dlen;
   account_update_msg->bank_idx             = bank->idx;
   memcpy( account_update_msg->hash.uc, lthash->bytes, sizeof(fd_hash_t) );

src/flamenco/runtime/fd_txn_account.c

@@ -485,14 +485,3 @@ void
 fd_txn_account_set_mutable( fd_txn_account_t * acct ) {
   acct->is_mutable = 1;
 }
-
-fd_solana_account_meta_t
-fd_txn_account_get_solana_meta( fd_txn_account_t const * acct ) {
-  fd_solana_account_meta_t meta = {
-    .lamports   = acct->meta->lamports,
-    .rent_epoch = ULONG_MAX,
-    .executable = acct->meta->executable,
-  };
-  memcpy( meta.owner, acct->meta->owner, sizeof(fd_pubkey_t) );
-  return meta;
-}

src/flamenco/runtime/fd_txn_account.h

@@ -220,9 +220,6 @@ fd_txn_account_set_readonly( fd_txn_account_t * acct );
 void
 fd_txn_account_set_mutable( fd_txn_account_t * acct );
 
-fd_solana_account_meta_t
-fd_txn_account_get_solana_meta( fd_txn_account_t const * acct );
-
 FD_PROTOTYPES_END
 
 #endif /* HEADER_fd_src_flamenco_runtime_fd_txn_account_h */

src/flamenco/types/fd_fuzz_types.h

@@ -198,29 +198,6 @@ void *fd_solana_account_stored_meta_generate( void *mem, void **alloc_mem, fd_rn
   return mem;
 }
 
-void *fd_solana_account_meta_generate( void *mem, void **alloc_mem, fd_rng_t * rng ) {
-  fd_solana_account_meta_t *self = (fd_solana_account_meta_t *) mem;
-  *alloc_mem = (uchar *) *alloc_mem + sizeof(fd_solana_account_meta_t);
-  fd_solana_account_meta_new(mem);
-  self->lamports = fd_rng_ulong( rng );
-  self->rent_epoch = fd_rng_ulong( rng );
-  LLVMFuzzerMutate( &self->owner[0], sizeof(self->owner), sizeof(self->owner) );
-  self->executable = fd_rng_uchar( rng );
-  LLVMFuzzerMutate( self->padding, 3, 3 );
-  return mem;
-}
-
-void *fd_solana_account_hdr_generate( void *mem, void **alloc_mem, fd_rng_t * rng ) {
-  fd_solana_account_hdr_t *self = (fd_solana_account_hdr_t *) mem;
-  *alloc_mem = (uchar *) *alloc_mem + sizeof(fd_solana_account_hdr_t);
-  fd_solana_account_hdr_new(mem);
-  fd_solana_account_stored_meta_generate( &self->meta, alloc_mem, rng );
-  fd_solana_account_meta_generate( &self->info, alloc_mem, rng );
-  LLVMFuzzerMutate( self->padding, 4, 4 );
-  fd_hash_generate( &self->hash, alloc_mem, rng );
-  return mem;
-}
-
 void *fd_delegation_generate( void *mem, void **alloc_mem, fd_rng_t * rng ) {
   fd_delegation_t *self = (fd_delegation_t *) mem;
   *alloc_mem = (uchar *) *alloc_mem + sizeof(fd_delegation_t);

src/flamenco/types/fd_types.c

@@ -918,135 +918,6 @@ void fd_solana_account_stored_meta_walk( void * w, fd_solana_account_stored_meta
   fun( w, self->pubkey, "pubkey", FD_FLAMENCO_TYPE_HASH256, "uchar[32]", level, 0  );
   fun( w, self, name, FD_FLAMENCO_TYPE_MAP_END, "fd_solana_account_stored_meta", level--, 0 );
 }
-int fd_solana_account_meta_encode( fd_solana_account_meta_t const * self, fd_bincode_encode_ctx_t * ctx ) {
-  int err;
-  err = fd_bincode_uint64_encode( self->lamports, ctx );
-  if( FD_UNLIKELY( err ) ) return err;
-  err = fd_bincode_uint64_encode( self->rent_epoch, ctx );
-  if( FD_UNLIKELY( err ) ) return err;
-  err = fd_bincode_bytes_encode( self->owner, sizeof(self->owner), ctx );
-  if( FD_UNLIKELY( err ) ) return err;
-  err = fd_bincode_bool_encode( (uchar)(self->executable), ctx );
-  if( FD_UNLIKELY( err ) ) return err;
-  err = fd_bincode_bytes_encode( self->padding, 3, ctx );
-  if( FD_UNLIKELY( err ) ) return err;
-  return FD_BINCODE_SUCCESS;
-}
-static int fd_solana_account_meta_decode_footprint_inner( fd_bincode_decode_ctx_t * ctx, ulong * total_sz ) {
-  if( ctx->data>=ctx->dataend ) { return FD_BINCODE_ERR_OVERFLOW; };
-  int err = 0;
-  err = fd_bincode_uint64_decode_footprint( ctx );
-  if( FD_UNLIKELY( err!=FD_BINCODE_SUCCESS ) ) return err;
-  err = fd_bincode_uint64_decode_footprint( ctx );
-  if( FD_UNLIKELY( err!=FD_BINCODE_SUCCESS ) ) return err;
-  err = fd_bincode_bytes_decode_footprint( 32, ctx );
-  if( FD_UNLIKELY( err ) ) return err;
-  err = fd_bincode_bool_decode_footprint( ctx );
-  if( FD_UNLIKELY( err ) ) return err;
-  err = fd_bincode_bytes_decode_footprint( 3, ctx );
-  if( FD_UNLIKELY( err!=FD_BINCODE_SUCCESS ) ) return err;
-  return 0;
-}
-int fd_solana_account_meta_decode_footprint( fd_bincode_decode_ctx_t * ctx, ulong * total_sz ) {
-  *total_sz += sizeof(fd_solana_account_meta_t);
-  void const * start_data = ctx->data;
-  int err = fd_solana_account_meta_decode_footprint_inner( ctx, total_sz );
-  if( ctx->data>ctx->dataend ) { return FD_BINCODE_ERR_OVERFLOW; };
-  ctx->data = start_data;
-  return err;
-}
-static void fd_solana_account_meta_decode_inner( void * struct_mem, void * * alloc_mem, fd_bincode_decode_ctx_t * ctx ) {
-  fd_solana_account_meta_t * self = (fd_solana_account_meta_t *)struct_mem;
-  fd_bincode_uint64_decode_unsafe( &self->lamports, ctx );
-  fd_bincode_uint64_decode_unsafe( &self->rent_epoch, ctx );
-  fd_bincode_bytes_decode_unsafe( &self->owner[0], sizeof(self->owner), ctx );
-  fd_bincode_bool_decode_unsafe( &self->executable, ctx );
-  fd_bincode_bytes_decode_unsafe( self->padding, 3, ctx );
-}
-void * fd_solana_account_meta_decode( void * mem, fd_bincode_decode_ctx_t * ctx ) {
-  fd_solana_account_meta_t * self = (fd_solana_account_meta_t *)mem;
-  fd_solana_account_meta_new( self );
-  void * alloc_region = (uchar *)mem + sizeof(fd_solana_account_meta_t);
-  void * * alloc_mem = &alloc_region;
-  fd_solana_account_meta_decode_inner( mem, alloc_mem, ctx );
-  return self;
-}
-void fd_solana_account_meta_new(fd_solana_account_meta_t * self) {
-  fd_memset( self, 0, sizeof(fd_solana_account_meta_t) );
-}
-void fd_solana_account_meta_walk( void * w, fd_solana_account_meta_t const * self, fd_types_walk_fn_t fun, const char *name, uint level, uint varint ) {
-  (void) varint;
-  fun( w, self, name, FD_FLAMENCO_TYPE_MAP, "fd_solana_account_meta", level++, 0 );
-  fun( w, &self->lamports, "lamports", FD_FLAMENCO_TYPE_ULONG, "ulong", level, 0  );
-  fun( w, &self->rent_epoch, "rent_epoch", FD_FLAMENCO_TYPE_ULONG, "ulong", level, 0  );
-  fun( w, self->owner, "owner", FD_FLAMENCO_TYPE_HASH256, "uchar[32]", level, 0  );
-  fun( w, &self->executable, "executable", FD_FLAMENCO_TYPE_BOOL, "bool", level, 0  );
-  fun(w, self->padding, "padding", FD_FLAMENCO_TYPE_UCHAR, "uchar", level, 0 );
-  fun( w, self, name, FD_FLAMENCO_TYPE_MAP_END, "fd_solana_account_meta", level--, 0 );
-}
-int fd_solana_account_hdr_encode( fd_solana_account_hdr_t const * self, fd_bincode_encode_ctx_t * ctx ) {
-  int err;
-  err = fd_solana_account_stored_meta_encode( &self->meta, ctx );
-  if( FD_UNLIKELY( err ) ) return err;
-  err = fd_solana_account_meta_encode( &self->info, ctx );
-  if( FD_UNLIKELY( err ) ) return err;
-  err = fd_bincode_bytes_encode( self->padding, 4, ctx );
-  if( FD_UNLIKELY( err ) ) return err;
-  err = fd_hash_encode( &self->hash, ctx );
-  if( FD_UNLIKELY( err ) ) return err;
-  return FD_BINCODE_SUCCESS;
-}
-static int fd_solana_account_hdr_decode_footprint_inner( fd_bincode_decode_ctx_t * ctx, ulong * total_sz ) {
-  if( ctx->data>=ctx->dataend ) { return FD_BINCODE_ERR_OVERFLOW; };
-  int err = 0;
-  err = fd_solana_account_stored_meta_decode_footprint_inner( ctx, total_sz );
-  if( FD_UNLIKELY( err ) ) return err;
-  err = fd_solana_account_meta_decode_footprint_inner( ctx, total_sz );
-  if( FD_UNLIKELY( err ) ) return err;
-  err = fd_bincode_bytes_decode_footprint( 4, ctx );
-  if( FD_UNLIKELY( err!=FD_BINCODE_SUCCESS ) ) return err;
-  err = fd_hash_decode_footprint_inner( ctx, total_sz );
-  if( FD_UNLIKELY( err ) ) return err;
-  return 0;
-}
-int fd_solana_account_hdr_decode_footprint( fd_bincode_decode_ctx_t * ctx, ulong * total_sz ) {
-  *total_sz += sizeof(fd_solana_account_hdr_t);
-  void const * start_data = ctx->data;
-  int err = fd_solana_account_hdr_decode_footprint_inner( ctx, total_sz );
-  if( ctx->data>ctx->dataend ) { return FD_BINCODE_ERR_OVERFLOW; };
-  ctx->data = start_data;
-  return err;
-}
-static void fd_solana_account_hdr_decode_inner( void * struct_mem, void * * alloc_mem, fd_bincode_decode_ctx_t * ctx ) {
-  fd_solana_account_hdr_t * self = (fd_solana_account_hdr_t *)struct_mem;
-  fd_solana_account_stored_meta_decode_inner( &self->meta, alloc_mem, ctx );
-  fd_solana_account_meta_decode_inner( &self->info, alloc_mem, ctx );
-  fd_bincode_bytes_decode_unsafe( self->padding, 4, ctx );
-  fd_hash_decode_inner( &self->hash, alloc_mem, ctx );
-}
-void * fd_solana_account_hdr_decode( void * mem, fd_bincode_decode_ctx_t * ctx ) {
-  fd_solana_account_hdr_t * self = (fd_solana_account_hdr_t *)mem;
-  fd_solana_account_hdr_new( self );
-  void * alloc_region = (uchar *)mem + sizeof(fd_solana_account_hdr_t);
-  void * * alloc_mem = &alloc_region;
-  fd_solana_account_hdr_decode_inner( mem, alloc_mem, ctx );
-  return self;
-}
-void fd_solana_account_hdr_new(fd_solana_account_hdr_t * self) {
-  fd_memset( self, 0, sizeof(fd_solana_account_hdr_t) );
-  fd_solana_account_stored_meta_new( &self->meta );
-  fd_solana_account_meta_new( &self->info );
-  fd_hash_new( &self->hash );
-}
-void fd_solana_account_hdr_walk( void * w, fd_solana_account_hdr_t const * self, fd_types_walk_fn_t fun, const char *name, uint level, uint varint ) {
-  (void) varint;
-  fun( w, self, name, FD_FLAMENCO_TYPE_MAP, "fd_solana_account_hdr", level++, 0 );
-  fd_solana_account_stored_meta_walk( w, &self->meta, fun, "meta", level, 0 );
-  fd_solana_account_meta_walk( w, &self->info, fun, "info", level, 0 );
-  fun(w, self->padding, "padding", FD_FLAMENCO_TYPE_UCHAR, "uchar", level, 0 );
-  fd_hash_walk( w, &self->hash, fun, "hash", level, 0 );
-  fun( w, self, name, FD_FLAMENCO_TYPE_MAP_END, "fd_solana_account_hdr", level--, 0 );
-}
 int fd_delegation_encode( fd_delegation_t const * self, fd_bincode_encode_ctx_t * ctx ) {
   int err;
   err = fd_pubkey_encode( &self->voter_pubkey, ctx );

src/flamenco/types/fd_types.h

@@ -176,27 +176,6 @@ struct __attribute__((packed)) fd_solana_account_stored_meta {
 typedef struct fd_solana_account_stored_meta fd_solana_account_stored_meta_t;
 #define FD_SOLANA_ACCOUNT_STORED_META_ALIGN (8UL)
 
-/* Encoded Size: Fixed (52 bytes) */
-struct __attribute__((packed)) fd_solana_account_meta {
-  ulong lamports;
-  ulong rent_epoch;
-  uchar owner[32];
-  uchar executable;
-  uchar padding[3];
-};
-typedef struct fd_solana_account_meta fd_solana_account_meta_t;
-#define FD_SOLANA_ACCOUNT_META_ALIGN (8UL)
-
-/* Encoded Size: Fixed (136 bytes) */
-struct __attribute__((packed)) fd_solana_account_hdr {
-  fd_solana_account_stored_meta_t meta;
-  fd_solana_account_meta_t info;
-  uchar padding[4];
-  fd_hash_t hash;
-};
-typedef struct fd_solana_account_hdr fd_solana_account_hdr_t;
-#define FD_SOLANA_ACCOUNT_HDR_ALIGN (8UL)
-
 /* https://github.com/solana-labs/solana/blob/8f2c8b8388a495d2728909e30460aa40dcc5d733/sdk/program/src/stake/state.rs#L303 */
 /* Encoded Size: Fixed (64 bytes) */
 struct fd_delegation {
@@ -2066,22 +2045,6 @@ static inline int fd_solana_account_stored_meta_decode_footprint( fd_bincode_dec
 }
 void * fd_solana_account_stored_meta_decode( void * mem, fd_bincode_decode_ctx_t * ctx );
 
-void fd_solana_account_meta_new( fd_solana_account_meta_t * self );
-int fd_solana_account_meta_encode( fd_solana_account_meta_t const * self, fd_bincode_encode_ctx_t * ctx );
-void fd_solana_account_meta_walk( void * w, fd_solana_account_meta_t const * self, fd_types_walk_fn_t fun, const char *name, uint level, uint varint );
-static inline ulong fd_solana_account_meta_size( fd_solana_account_meta_t const * self ) { (void)self; return 52UL; }
-static inline ulong fd_solana_account_meta_align( void ) { return FD_SOLANA_ACCOUNT_META_ALIGN; }
-int fd_solana_account_meta_decode_footprint( fd_bincode_decode_ctx_t * ctx, ulong * total_sz );
-void * fd_solana_account_meta_decode( void * mem, fd_bincode_decode_ctx_t * ctx );
-
-void fd_solana_account_hdr_new( fd_solana_account_hdr_t * self );
-int fd_solana_account_hdr_encode( fd_solana_account_hdr_t const * self, fd_bincode_encode_ctx_t * ctx );
-void fd_solana_account_hdr_walk( void * w, fd_solana_account_hdr_t const * self, fd_types_walk_fn_t fun, const char *name, uint level, uint varint );
-static inline ulong fd_solana_account_hdr_size( fd_solana_account_hdr_t const * self ) { (void)self; return 136UL; }
-static inline ulong fd_solana_account_hdr_align( void ) { return FD_SOLANA_ACCOUNT_HDR_ALIGN; }
-int fd_solana_account_hdr_decode_footprint( fd_bincode_decode_ctx_t * ctx, ulong * total_sz );
-void * fd_solana_account_hdr_decode( void * mem, fd_bincode_decode_ctx_t * ctx );
-
 static inline void fd_delegation_new( fd_delegation_t * self ) { fd_memset( self, 0, sizeof(fd_delegation_t) ); }
 int fd_delegation_encode( fd_delegation_t const * self, fd_bincode_encode_ctx_t * ctx );
 void fd_delegation_walk( void * w, fd_delegation_t const * self, fd_types_walk_fn_t fun, const char *name, uint level, uint varint );

src/flamenco/types/fd_types.json

@@ -167,29 +167,6 @@
         { "name": "pubkey", "type": "uchar[32]" }
       ]
     },
-    {
-      "name": "solana_account_meta",
-      "packed": true,
-      "type": "struct",
-      "fields": [
-        { "name": "lamports", "type": "ulong" },
-        { "name": "rent_epoch", "type": "ulong" },
-        { "name": "owner", "type": "uchar[32]" },
-        { "name": "executable", "type": "bool" },
-        { "name": "padding", "type": "array", "element": "uchar", "length": 3 }
-      ]
-    },
-    {
-      "name": "solana_account_hdr",
-      "packed": true,
-      "type": "struct",
-      "fields": [
-        { "name": "meta", "type": "solana_account_stored_meta" },
-        { "name": "info", "type": "solana_account_meta" },
-        { "name": "padding", "type": "array", "element": "uchar", "length": 4 },
-        { "name": "hash", "type": "hash" }
-      ]
-    },
     {
       "name": "delegation",
       "type": "struct",