merge

Author: ibhatt-jumptrading

book/api/metrics-generated.md

@@ -557,14 +557,18 @@
 ## Sock Tile
 | Metric | Type | Description |
 |--------|------|-------------|
-| sock_​syscalls_​sendmmsg | `counter` | Number of sendmmsg syscalls dispatched |
+| sock_​syscalls_​sendmmsg_​no_​error | `counter` | Number of sendmmsg syscalls dispatched (No error) |
+| sock_​syscalls_​sendmmsg_​slow | `counter` | Number of sendmmsg syscalls dispatched (ENOBUFS, EAGAIN error) |
+| sock_​syscalls_​sendmmsg_​perm | `counter` | Number of sendmmsg syscalls dispatched (EPERM error (blocked by netfilter)) |
+| sock_​syscalls_​sendmmsg_​unreach | `counter` | Number of sendmmsg syscalls dispatched (ENETUNREACH, EHOSTUNREACH error) |
+| sock_​syscalls_​sendmmsg_​down | `counter` | Number of sendmmsg syscalls dispatched (ENONET, ENETDOWN, EHOSTDOWN error) |
+| sock_​syscalls_​sendmmsg_​other | `counter` | Number of sendmmsg syscalls dispatched (Unrecognized error code) |
 | sock_​syscalls_​recvmmsg | `counter` | Number of recvmsg syscalls dispatched |
 | sock_​rx_​pkt_​cnt | `counter` | Number of packets received |
 | sock_​tx_​pkt_​cnt | `counter` | Number of packets sent |
 | sock_​tx_​drop_​cnt | `counter` | Number of packets failed to send |
 | sock_​tx_​bytes_​total | `counter` | Total number of bytes transmitted (including Ethernet header). |
 | sock_​rx_​bytes_​total | `counter` | Total number of bytes received (including Ethernet header). |
-| sock_​tx_​permission_​error_​cnt | `counter` | Number of send attempts that failed with EPERM (e.g. due to nftables) |
 
 ## Repair Tile
 | Metric | Type | Description |

src/app/firedancer-dev/config/default.toml

@@ -6,7 +6,7 @@
       "entrypoint.testnet.solana.com:8001",
       "entrypoint2.testnet.solana.com:8001",
       "entrypoint3.testnet.solana.com:8001",
-      "${VALIDATOR_IP}:8001",
+      "{validator_ip}:8001",
     ]
 [blockstore]
     shred_max = 16777216

src/app/rpcserver/main.c

@@ -27,8 +27,6 @@ static void
 init_args( int * argc, char *** argv, fd_rpcserver_args_t * args ) {
   memset( args, 0, sizeof(fd_rpcserver_args_t) );
 
-  args->valloc = fd_libc_alloc_virtual();
-
   char const * funk_file = fd_env_strip_cmdline_cstr( argc, argv, "--funk-file", NULL, NULL );
   if( FD_UNLIKELY( !funk_file ))
     FD_LOG_ERR(( "--funk-file argument is required" ));
@@ -101,8 +99,6 @@ init_args_offline( int * argc, char *** argv, fd_rpcserver_args_t * args ) {
   memset( args, 0, sizeof(fd_rpcserver_args_t) );
   args->offline = 1;
 
-  args->valloc = fd_libc_alloc_virtual();
-
   char const * funk_file = fd_env_strip_cmdline_cstr( argc, argv, "--funk-file", NULL, NULL );
   if( FD_UNLIKELY( !funk_file ))
     FD_LOG_ERR(( "--funk-file argument is required" ));
@@ -208,7 +204,6 @@ int main( int argc, char ** argv ) {
     while( !stopflag ) {
       fd_rpc_ws_poll( ctx );
     }
-    fd_rpc_stop_service( ctx );
     fd_halt();
     return 0;
   }
@@ -224,8 +219,6 @@ int main( int argc, char ** argv ) {
     fd_rpc_ws_poll( ctx );
   }
 
-  fd_rpc_stop_service( ctx );
-
   fd_halt();
   return 0;
 }

src/app/rpcserver/test_rpc_server.py

@@ -17,23 +17,26 @@
 fixtures = []
 
 def good_method(arg):
-    print(arg)
+    print('GOOD: ' + json.dumps(arg))
     data = json.dumps(arg).encode('utf-8')
     if fuzz:
         fixtures.append(data)
     x = requests.post(url,headers={'Content-Type':'application/json'},data=data)
+    with open('response','wb') as fd:
+        fd.write(x.content)
     res = json.loads(x.content)
     print(res)
     assert arg['id'] == res['id']
     return res
 
 def bad_method(arg):
-    print(arg)
+    print("BAD: " + json.dumps(arg))
     data = json.dumps(arg).encode('utf-8')
     if fuzz:
         fixtures.append(data)
     x = requests.post(url,headers={'Content-Type':'application/json'},data=data)
-    print(x.content)
+    with open('response','bw') as fd:
+        fd.write(x.content)
     res = json.loads(x.content)
     print(res)
     assert res['error'] is not None

src/disco/metrics/generated/fd_metrics_enums.h

@@ -19,6 +19,21 @@
 #define FD_METRICS_ENUM_TILE_REGIME_V_PROCESSING_POSTFRAG_IDX  7
 #define FD_METRICS_ENUM_TILE_REGIME_V_PROCESSING_POSTFRAG_NAME "processing_postfrag"
 
+#define FD_METRICS_ENUM_SOCK_ERR_NAME "sock_err"
+#define FD_METRICS_ENUM_SOCK_ERR_CNT (6UL)
+#define FD_METRICS_ENUM_SOCK_ERR_V_NO_ERROR_IDX  0
+#define FD_METRICS_ENUM_SOCK_ERR_V_NO_ERROR_NAME "no_error"
+#define FD_METRICS_ENUM_SOCK_ERR_V_SLOW_IDX  1
+#define FD_METRICS_ENUM_SOCK_ERR_V_SLOW_NAME "slow"
+#define FD_METRICS_ENUM_SOCK_ERR_V_PERM_IDX  2
+#define FD_METRICS_ENUM_SOCK_ERR_V_PERM_NAME "perm"
+#define FD_METRICS_ENUM_SOCK_ERR_V_UNREACH_IDX  3
+#define FD_METRICS_ENUM_SOCK_ERR_V_UNREACH_NAME "unreach"
+#define FD_METRICS_ENUM_SOCK_ERR_V_DOWN_IDX  4
+#define FD_METRICS_ENUM_SOCK_ERR_V_DOWN_NAME "down"
+#define FD_METRICS_ENUM_SOCK_ERR_V_OTHER_IDX  5
+#define FD_METRICS_ENUM_SOCK_ERR_V_OTHER_NAME "other"
+
 #define FD_METRICS_ENUM_TPU_RECV_TYPE_NAME "tpu_recv_type"
 #define FD_METRICS_ENUM_TPU_RECV_TYPE_CNT (3UL)
 #define FD_METRICS_ENUM_TPU_RECV_TYPE_V_UDP_IDX  0

src/disco/metrics/generated/fd_metrics_sock.c

@@ -2,12 +2,16 @@
 #include "fd_metrics_sock.h"
 
 const fd_metrics_meta_t FD_METRICS_SOCK[FD_METRICS_SOCK_TOTAL] = {
-    DECLARE_METRIC( SOCK_SYSCALLS_SENDMMSG, COUNTER ),
+    DECLARE_METRIC_ENUM( SOCK_SYSCALLS_SENDMMSG, COUNTER, SOCK_ERR, NO_ERROR ),
+    DECLARE_METRIC_ENUM( SOCK_SYSCALLS_SENDMMSG, COUNTER, SOCK_ERR, SLOW ),
+    DECLARE_METRIC_ENUM( SOCK_SYSCALLS_SENDMMSG, COUNTER, SOCK_ERR, PERM ),
+    DECLARE_METRIC_ENUM( SOCK_SYSCALLS_SENDMMSG, COUNTER, SOCK_ERR, UNREACH ),
+    DECLARE_METRIC_ENUM( SOCK_SYSCALLS_SENDMMSG, COUNTER, SOCK_ERR, DOWN ),
+    DECLARE_METRIC_ENUM( SOCK_SYSCALLS_SENDMMSG, COUNTER, SOCK_ERR, OTHER ),
     DECLARE_METRIC( SOCK_SYSCALLS_RECVMMSG, COUNTER ),
     DECLARE_METRIC( SOCK_RX_PKT_CNT, COUNTER ),
     DECLARE_METRIC( SOCK_TX_PKT_CNT, COUNTER ),
     DECLARE_METRIC( SOCK_TX_DROP_CNT, COUNTER ),
     DECLARE_METRIC( SOCK_TX_BYTES_TOTAL, COUNTER ),
     DECLARE_METRIC( SOCK_RX_BYTES_TOTAL, COUNTER ),
-    DECLARE_METRIC( SOCK_TX_PERMISSION_ERROR_CNT, COUNTER ),
 };

src/disco/metrics/generated/fd_metrics_sock.h

@@ -8,48 +8,50 @@
 #define FD_METRICS_COUNTER_SOCK_SYSCALLS_SENDMMSG_TYPE (FD_METRICS_TYPE_COUNTER)
 #define FD_METRICS_COUNTER_SOCK_SYSCALLS_SENDMMSG_DESC "Number of sendmmsg syscalls dispatched"
 #define FD_METRICS_COUNTER_SOCK_SYSCALLS_SENDMMSG_CVT  (FD_METRICS_CONVERTER_NONE)
+#define FD_METRICS_COUNTER_SOCK_SYSCALLS_SENDMMSG_CNT  (6UL)
 
-#define FD_METRICS_COUNTER_SOCK_SYSCALLS_RECVMMSG_OFF  (17UL)
+#define FD_METRICS_COUNTER_SOCK_SYSCALLS_SENDMMSG_NO_ERROR_OFF (16UL)
+#define FD_METRICS_COUNTER_SOCK_SYSCALLS_SENDMMSG_SLOW_OFF (17UL)
+#define FD_METRICS_COUNTER_SOCK_SYSCALLS_SENDMMSG_PERM_OFF (18UL)
+#define FD_METRICS_COUNTER_SOCK_SYSCALLS_SENDMMSG_UNREACH_OFF (19UL)
+#define FD_METRICS_COUNTER_SOCK_SYSCALLS_SENDMMSG_DOWN_OFF (20UL)
+#define FD_METRICS_COUNTER_SOCK_SYSCALLS_SENDMMSG_OTHER_OFF (21UL)
+
+#define FD_METRICS_COUNTER_SOCK_SYSCALLS_RECVMMSG_OFF  (22UL)
 #define FD_METRICS_COUNTER_SOCK_SYSCALLS_RECVMMSG_NAME "sock_syscalls_recvmmsg"
 #define FD_METRICS_COUNTER_SOCK_SYSCALLS_RECVMMSG_TYPE (FD_METRICS_TYPE_COUNTER)
 #define FD_METRICS_COUNTER_SOCK_SYSCALLS_RECVMMSG_DESC "Number of recvmsg syscalls dispatched"
 #define FD_METRICS_COUNTER_SOCK_SYSCALLS_RECVMMSG_CVT  (FD_METRICS_CONVERTER_NONE)
 
-#define FD_METRICS_COUNTER_SOCK_RX_PKT_CNT_OFF  (18UL)
+#define FD_METRICS_COUNTER_SOCK_RX_PKT_CNT_OFF  (23UL)
 #define FD_METRICS_COUNTER_SOCK_RX_PKT_CNT_NAME "sock_rx_pkt_cnt"
 #define FD_METRICS_COUNTER_SOCK_RX_PKT_CNT_TYPE (FD_METRICS_TYPE_COUNTER)
 #define FD_METRICS_COUNTER_SOCK_RX_PKT_CNT_DESC "Number of packets received"
 #define FD_METRICS_COUNTER_SOCK_RX_PKT_CNT_CVT  (FD_METRICS_CONVERTER_NONE)
 
-#define FD_METRICS_COUNTER_SOCK_TX_PKT_CNT_OFF  (19UL)
+#define FD_METRICS_COUNTER_SOCK_TX_PKT_CNT_OFF  (24UL)
 #define FD_METRICS_COUNTER_SOCK_TX_PKT_CNT_NAME "sock_tx_pkt_cnt"
 #define FD_METRICS_COUNTER_SOCK_TX_PKT_CNT_TYPE (FD_METRICS_TYPE_COUNTER)
 #define FD_METRICS_COUNTER_SOCK_TX_PKT_CNT_DESC "Number of packets sent"
 #define FD_METRICS_COUNTER_SOCK_TX_PKT_CNT_CVT  (FD_METRICS_CONVERTER_NONE)
 
-#define FD_METRICS_COUNTER_SOCK_TX_DROP_CNT_OFF  (20UL)
+#define FD_METRICS_COUNTER_SOCK_TX_DROP_CNT_OFF  (25UL)
 #define FD_METRICS_COUNTER_SOCK_TX_DROP_CNT_NAME "sock_tx_drop_cnt"
 #define FD_METRICS_COUNTER_SOCK_TX_DROP_CNT_TYPE (FD_METRICS_TYPE_COUNTER)
 #define FD_METRICS_COUNTER_SOCK_TX_DROP_CNT_DESC "Number of packets failed to send"
 #define FD_METRICS_COUNTER_SOCK_TX_DROP_CNT_CVT  (FD_METRICS_CONVERTER_NONE)
 
-#define FD_METRICS_COUNTER_SOCK_TX_BYTES_TOTAL_OFF  (21UL)
+#define FD_METRICS_COUNTER_SOCK_TX_BYTES_TOTAL_OFF  (26UL)
 #define FD_METRICS_COUNTER_SOCK_TX_BYTES_TOTAL_NAME "sock_tx_bytes_total"
 #define FD_METRICS_COUNTER_SOCK_TX_BYTES_TOTAL_TYPE (FD_METRICS_TYPE_COUNTER)
 #define FD_METRICS_COUNTER_SOCK_TX_BYTES_TOTAL_DESC "Total number of bytes transmitted (including Ethernet header)."
 #define FD_METRICS_COUNTER_SOCK_TX_BYTES_TOTAL_CVT  (FD_METRICS_CONVERTER_NONE)
 
-#define FD_METRICS_COUNTER_SOCK_RX_BYTES_TOTAL_OFF  (22UL)
+#define FD_METRICS_COUNTER_SOCK_RX_BYTES_TOTAL_OFF  (27UL)
 #define FD_METRICS_COUNTER_SOCK_RX_BYTES_TOTAL_NAME "sock_rx_bytes_total"
 #define FD_METRICS_COUNTER_SOCK_RX_BYTES_TOTAL_TYPE (FD_METRICS_TYPE_COUNTER)
 #define FD_METRICS_COUNTER_SOCK_RX_BYTES_TOTAL_DESC "Total number of bytes received (including Ethernet header)."
 #define FD_METRICS_COUNTER_SOCK_RX_BYTES_TOTAL_CVT  (FD_METRICS_CONVERTER_NONE)
 
-#define FD_METRICS_COUNTER_SOCK_TX_PERMISSION_ERROR_CNT_OFF  (23UL)
-#define FD_METRICS_COUNTER_SOCK_TX_PERMISSION_ERROR_CNT_NAME "sock_tx_permission_error_cnt"
-#define FD_METRICS_COUNTER_SOCK_TX_PERMISSION_ERROR_CNT_TYPE (FD_METRICS_TYPE_COUNTER)
-#define FD_METRICS_COUNTER_SOCK_TX_PERMISSION_ERROR_CNT_DESC "Number of send attempts that failed with EPERM (e.g. due to nftables)"
-#define FD_METRICS_COUNTER_SOCK_TX_PERMISSION_ERROR_CNT_CVT  (FD_METRICS_CONVERTER_NONE)
-
-#define FD_METRICS_SOCK_TOTAL (8UL)
+#define FD_METRICS_SOCK_TOTAL (12UL)
 extern const fd_metrics_meta_t FD_METRICS_SOCK[FD_METRICS_SOCK_TOTAL];

src/disco/metrics/metrics.xml

@@ -81,15 +81,23 @@ metric introduced.
     <counter name="XdpTxRingEmptyDescs" summary="xdp_statistics_v1.tx_ring_empty_descs: Failed to retrieve item from tx ring" />
 </tile>
 
+<enum name="SockErr">
+    <int value="0" name="NoError" label="No error" />
+    <int value="1" name="Slow" label="ENOBUFS, EAGAIN error" />
+    <int value="2" name="Perm" label="EPERM error (blocked by netfilter)" />
+    <int value="3" name="Unreach" label="ENETUNREACH, EHOSTUNREACH error" />
+    <int value="4" name="Down" label="ENONET, ENETDOWN, EHOSTDOWN error" />
+    <int value="3" name="Other" label="Unrecognized error code" />
+</enum>
+
 <tile name="sock">
-    <counter name="SyscallsSendmmsg" summary="Number of sendmmsg syscalls dispatched" />
+    <counter name="SyscallsSendmmsg" enum="SockErr" summary="Number of sendmmsg syscalls dispatched" />
     <counter name="SyscallsRecvmmsg" summary="Number of recvmsg syscalls dispatched" />
     <counter name="RxPktCnt" summary="Number of packets received" />
     <counter name="TxPktCnt" summary="Number of packets sent" />
     <counter name="TxDropCnt" summary="Number of packets failed to send" />
     <counter name="TxBytesTotal" summary="Total number of bytes transmitted (including Ethernet header)." />
     <counter name="RxBytesTotal" summary="Total number of bytes received (including Ethernet header)." />
-    <counter name="TxPermissionErrorCnt" summary="Number of send attempts that failed with EPERM (e.g. due to nftables)" />
 </tile>
 
 <enum name="TpuRecvType">

src/disco/net/sock/fd_sock_tile.c

@@ -436,33 +436,40 @@ static void
 flush_tx_batch( fd_sock_tile_t * ctx ) {
   ulong batch_cnt = ctx->batch_cnt;
   for( int j = 0; j < (int)batch_cnt; /* incremented in loop */ ) {
-    ctx->metrics.sys_sendmmsg_cnt++;
-
     int remain   = (int)batch_cnt - j;
     int send_cnt = sendmmsg( ctx->tx_sock, ctx->batch_msg + j, (uint)remain, MSG_DONTWAIT );
+    if( send_cnt>=0 ) {
+      ctx->metrics.sys_sendmmsg_cnt[ FD_METRICS_ENUM_SOCK_ERR_V_NO_ERROR_IDX ]++;
+    }
     if( FD_UNLIKELY( send_cnt < remain ) ) {
+      ctx->metrics.tx_drop_cnt++;
       if( FD_UNLIKELY( send_cnt < 0 ) ) {
         switch( errno ) {
-          case EAGAIN:
-          case ENOBUFS:
-            ctx->metrics.tx_drop_cnt++;
-            break;
-
-          case EPERM:
-            ctx->metrics.tx_permission_error_cnt++;
-            break;
-
-          default:
-            FD_LOG_ERR(( "sendmmsg failed (%i-%s)", errno, fd_io_strerror( errno ) ));
+        case EAGAIN:
+        case ENOBUFS:
+          ctx->metrics.sys_sendmmsg_cnt[ FD_METRICS_ENUM_SOCK_ERR_V_SLOW_IDX ]++;
+          break;
+        case EPERM:
+          ctx->metrics.sys_sendmmsg_cnt[ FD_METRICS_ENUM_SOCK_ERR_V_PERM_IDX ]++;
+          break;
+        case ENETUNREACH:
+        case EHOSTUNREACH:
+          ctx->metrics.sys_sendmmsg_cnt[ FD_METRICS_ENUM_SOCK_ERR_V_UNREACH_IDX ]++;
+          break;
+        case ENONET:
+        case ENETDOWN:
+        case EHOSTDOWN:
+          ctx->metrics.sys_sendmmsg_cnt[ FD_METRICS_ENUM_SOCK_ERR_V_DOWN_IDX ]++;
+          break;
+        default:
+          ctx->metrics.sys_sendmmsg_cnt[ FD_METRICS_ENUM_SOCK_ERR_V_OTHER_IDX ]++;
+          /* log with NOTICE, since flushing has a significant negative performance impact */
+          FD_LOG_NOTICE(( "sendmmsg failed (%i-%s)", errno, fd_io_strerror( errno ) ));
         }
 
         /* first message failed, so skip failing message and continue */
         j++;
       } else {
-        /* sent at least one, and error on ctx->batch_msg[send_cnt] is lost
-           so assume recoverable and continue */
-        ctx->metrics.tx_drop_cnt++;
-
         /* send_cnt succeeded, so skip those and also the failing message */
         j += send_cnt + 1;
 
@@ -624,13 +631,12 @@ after_credit( fd_sock_tile_t *    ctx,
 static void
 metrics_write( fd_sock_tile_t * ctx ) {
   FD_MCNT_SET( SOCK, SYSCALLS_RECVMMSG,       ctx->metrics.sys_recvmmsg_cnt     );
-  FD_MCNT_SET( SOCK, SYSCALLS_SENDMMSG,       ctx->metrics.sys_sendmmsg_cnt     );
+  FD_MCNT_ENUM_COPY( SOCK, SYSCALLS_SENDMMSG, ctx->metrics.sys_sendmmsg_cnt     );
   FD_MCNT_SET( SOCK, RX_PKT_CNT,              ctx->metrics.rx_pkt_cnt           );
   FD_MCNT_SET( SOCK, TX_PKT_CNT,              ctx->metrics.tx_pkt_cnt           );
   FD_MCNT_SET( SOCK, TX_DROP_CNT,             ctx->metrics.tx_drop_cnt          );
   FD_MCNT_SET( SOCK, TX_BYTES_TOTAL,          ctx->metrics.tx_bytes_total       );
   FD_MCNT_SET( SOCK, RX_BYTES_TOTAL,          ctx->metrics.rx_bytes_total       );
-  FD_MCNT_SET( SOCK, TX_PERMISSION_ERROR_CNT, ctx->metrics.tx_permission_error_cnt );
 }
 
 static ulong

src/disco/net/sock/fd_sock_tile_private.h

@@ -4,6 +4,7 @@
 #if FD_HAS_HOSTED
 
 #include "../../../util/fd_util_base.h"
+#include "../../metrics/generated/fd_metrics_enums.h"
 #include <poll.h>
 #include <sys/socket.h>
 
@@ -26,13 +27,12 @@
 
 struct fd_sock_tile_metrics {
   ulong sys_recvmmsg_cnt;
-  ulong sys_sendmmsg_cnt;
+  ulong sys_sendmmsg_cnt[ FD_METRICS_ENUM_SOCK_ERR_CNT ];
   ulong rx_pkt_cnt;
   ulong tx_pkt_cnt;
   ulong tx_drop_cnt;
   ulong rx_bytes_total;
   ulong tx_bytes_total;
-  ulong tx_permission_error_cnt;
 };
 
 typedef struct fd_sock_tile_metrics fd_sock_tile_metrics_t;

src/discof/batch/fd_batch_tile.c

@@ -66,7 +66,7 @@ FD_FN_PURE static inline ulong
 scratch_footprint( fd_topo_tile_t const * tile FD_PARAM_UNUSED ) {
   ulong l = FD_LAYOUT_INIT;
   l = FD_LAYOUT_APPEND( l, alignof(fd_snapshot_tile_ctx_t), sizeof(fd_snapshot_tile_ctx_t) );
-  l = FD_LAYOUT_APPEND( l, fd_spad_align(), fd_ulong_align_up( MEM_FOOTPRINT, fd_spad_align() ) );
+  l = FD_LAYOUT_APPEND( l, fd_spad_align(), fd_spad_footprint( MEM_FOOTPRINT ) );
   return FD_LAYOUT_FINI( l, scratch_align() );
 }
 
@@ -144,7 +144,7 @@ unprivileged_init( fd_topo_t      * topo,
   FD_SCRATCH_ALLOC_INIT( l, scratch );
   fd_snapshot_tile_ctx_t * ctx = FD_SCRATCH_ALLOC_APPEND( l, alignof(fd_snapshot_tile_ctx_t), sizeof(fd_snapshot_tile_ctx_t) );
   memset( ctx, 0, sizeof(fd_snapshot_tile_ctx_t) );
-  void * spad_mem            = FD_SCRATCH_ALLOC_APPEND( l, fd_spad_align(), fd_ulong_align_up( MEM_FOOTPRINT, fd_spad_align() ) );
+  void * spad_mem            = FD_SCRATCH_ALLOC_APPEND( l, fd_spad_align(), fd_spad_footprint( MEM_FOOTPRINT ) );
   ulong  scratch_alloc_mem   = FD_SCRATCH_ALLOC_FINI  ( l, scratch_align() );
 
   if( FD_UNLIKELY( scratch_alloc_mem > (ulong)scratch + scratch_footprint(tile) ) ) {

src/discof/geyser/Local.mk

@@ -6,28 +6,10 @@
 
 /* Data structure which is passed through replay_notif link */
 
-#define FD_REPLAY_NOTIF_MTU 2048U
-#define FD_REPLAY_NOTIF_ACCT_MAX ((FD_REPLAY_NOTIF_MTU - 128U)/sizeof(struct fd_replay_notif_acct))
-#define FD_REPLAY_NOTIF_DEPTH (1U<<15U)
-
-#define FD_REPLAY_ACCTS_TYPE 0x29FE5135U
 #define FD_REPLAY_SLOT_TYPE  0xD1239ACAU
 
-struct __attribute__((aligned(1))) fd_replay_notif_acct {
-  uchar id [ 32U ]; /* Account id */
-  uchar flags;      /* 0=nothing 1=account written */
-};
-#define FD_REPLAY_NOTIF_ACCT_WRITTEN  ((uchar)1)
-#define FD_REPLAY_NOTIF_ACCT_NO_FLAGS ((uchar)0)
-
 struct __attribute__((aligned(64UL))) fd_replay_notif_msg {
   union {
-    struct {
-      fd_funk_txn_xid_t           funk_xid;
-      uchar                       sig[64U];           /* Transaction signature */
-      struct fd_replay_notif_acct accts[FD_REPLAY_NOTIF_ACCT_MAX];
-      uint                        accts_cnt;
-    } accts;
     struct {
       ulong parent;
       ulong root;
@@ -37,13 +19,15 @@ struct __attribute__((aligned(64UL))) fd_replay_notif_msg {
       fd_hash_t block_hash;
       fd_pubkey_t identity;
       ulong transaction_count;
+      ulong shred_cnt;
+      ulong ts;
     } slot_exec;
   };
   uint type;
 };
 typedef struct fd_replay_notif_msg fd_replay_notif_msg_t;
 
-/* MTU on replay_notif link is 128 */
-FD_STATIC_ASSERT( sizeof(fd_replay_notif_msg_t) <= FD_REPLAY_NOTIF_MTU, notify message too big);
+#define FD_REPLAY_NOTIF_MTU sizeof(fd_replay_notif_msg_t)
+#define FD_REPLAY_NOTIF_DEPTH 1024
 
 #endif /* HEADER_fd_src_discof_geyser_fd_replay_notif_h */