bundle: no floats in config

Author: riptl

src/app/fdctl/config/default.toml

@@ -1159,14 +1159,14 @@ dynamic_port_range = "8900-9000"
         # done using HTTP/2 PING frames.  This option roughly configures
         # the time between keepalives.  The actual timing is randomized
         # to reduce burst loads on the network.  Must be within range
-        # [3,3600].
-        keepalive_interval_seconds = 5.0
+        # [3e3,3600e3]
+        keepalive_interval_millis = 5000
 
         # Consider a connection failed if the bundle server fails to
         # respond to a request in the given time frame.  The validator
         # will reconnect eventually, but with increasing delays if there
-        # are repeated failures.  Must be within range [0.5,60].
-        request_timeout_seconds = 3.0
+        # are repeated failures.  Must be within range [500,60000].
+        request_timeout_millis = 3000
 
     # The pack tile takes incoming transactions that have been verified
     # by the verify tile and then deduplicated, and attempts to order

src/app/fdctl/topology.c

@@ -386,8 +386,8 @@ fd_topo_initialize( config_t * config ) {
       strncpy( tile->bundle.key_log_path, config->development.bundle.ssl_key_log_file, sizeof(tile->bundle.key_log_path) );
       tile->bundle.buf_sz = config->development.bundle.buffer_size_kib<<10;
       tile->bundle.ssl_heap_sz = config->development.bundle.ssl_heap_size_mib<<20;
-      tile->bundle.keepalive_interval_nanos = (ulong)( config->tiles.bundle.keepalive_interval_seconds * 1e9f );
-      tile->bundle.request_timeout_nanos = (ulong)( config->tiles.bundle.request_timeout_seconds * 1e9f );
+      tile->bundle.keepalive_interval_nanos = (ulong)( (float)config->tiles.bundle.keepalive_interval_millis * 1e6f );
+      tile->bundle.request_timeout_nanos = (ulong)( (float)config->tiles.bundle.request_timeout_millis * 1e6f );
     } else if( FD_UNLIKELY( !strcmp( tile->name, "verify" ) ) ) {
       tile->verify.tcache_depth = config->tiles.verify.signature_cache_size;
 

src/app/firedancer/config/default.toml

@@ -864,14 +864,14 @@ user = ""
         # done using HTTP/2 PING frames.  This option roughly configures
         # the time between keepalives.  The actual timing is randomized
         # to reduce burst loads on the network.  Must be within range
-        # [3,3600].
-        keepalive_interval_seconds = 5.0
+        # [3e3,3600e3]
+        keepalive_interval_millis = 5000
 
         # Consider a connection failed if the bundle server fails to
         # respond to a request in the given time frame.  The validator
         # will reconnect eventually, but with increasing delays if there
-        # are repeated failures.  Must be within range [0.5,60].
-        request_timeout_seconds = 3.0
+        # are repeated failures.  Must be within range [500,60000].
+        request_timeout_millis = 3000
 
     # The pack tile takes incoming transactions that have been verified
     # by the verify tile and then deduplicated, and attempts to order

src/app/shared/fd_config.c

@@ -431,19 +431,6 @@ fd_config_fill( fd_config_t * config,
   }                                                    \
 } while(0)
 
-FD_FN_CONST static int
-fd_float_in_range( float value,
-                   float low,
-                   float high ) {
-  return value>=low && value<=high;
-}
-
-#define CFG_FLOAT_RANGE_CHECK( value, low, high ) do { \
-  if( FD_UNLIKELY( !fd_float_in_range( (config->value), (low), (high) ) ) ) { \
-    FD_LOG_ERR(( "`%s` must be in range [%f,%f]", #value, (double)(low), (double)(high) )); \
-  } \
-} while(0)
-
 static void
 fd_config_validatef( fd_configf_t const * config ) {
   (void)config;
@@ -536,8 +523,14 @@ fd_config_validate( fd_config_t const * config ) {
 
   CFG_HAS_NON_ZERO( tiles.gui.gui_listen_port );
 
-  CFG_FLOAT_RANGE_CHECK( tiles.bundle.keepalive_interval_seconds, 3.0f, 3600.f );
-  CFG_FLOAT_RANGE_CHECK( tiles.bundle.request_timeout_seconds,    0.5f,   60.f );
+  if( FD_UNLIKELY( config->tiles.bundle.keepalive_interval_millis <    3000 &&
+                   config->tiles.bundle.keepalive_interval_millis > 3600000 ) ) {
+    FD_LOG_ERR(( "`tiles.bundle.keepalive_interval_millis` must be in range [3000, 3,600,000]" ));
+  }
+  if( FD_UNLIKELY( config->tiles.bundle.request_timeout_millis <   500 &&
+                   config->tiles.bundle.request_timeout_millis > 60000 ) ) {
+    FD_LOG_ERR(( "`tiles.bundle.request_timeout_millis` must be in range [500, 60,000]" ));
+  }
 
   CFG_HAS_NON_EMPTY( development.netns.interface0 );
   CFG_HAS_NON_EMPTY( development.netns.interface0_mac );

src/app/shared/fd_config.h

@@ -335,8 +335,8 @@ struct fd_config {
       char tip_payment_program_addr[ FD_BASE58_ENCODED_32_SZ ];
       char tip_distribution_authority[ FD_BASE58_ENCODED_32_SZ ];
       uint commission_bps;
-      float keepalive_interval_seconds;
-      float request_timeout_seconds;
+      ulong keepalive_interval_millis;
+      ulong request_timeout_millis;
     } bundle;
 
     struct {

src/app/shared/fd_config_parse.c

@@ -188,8 +188,8 @@ fd_config_extract_pod( uchar *       pod,
   CFG_POP      ( cstr,   tiles.bundle.tip_payment_program_addr            );
   CFG_POP      ( cstr,   tiles.bundle.tip_distribution_authority          );
   CFG_POP      ( uint,   tiles.bundle.commission_bps                      );
-  CFG_POP      ( float,  tiles.bundle.keepalive_interval_seconds          );
-  CFG_POP      ( float,  tiles.bundle.request_timeout_seconds             );
+  CFG_POP      ( ulong,  tiles.bundle.keepalive_interval_millis           );
+  CFG_POP      ( ulong,  tiles.bundle.request_timeout_millis              );
 
   CFG_POP      ( uint,   tiles.pack.max_pending_transactions              );
   CFG_POP      ( bool,   tiles.pack.use_consumed_cus                      );

src/app/shared_dev/commands/bundle_client.c

@@ -52,8 +52,8 @@ bundle_client_topo( config_t *   config ) {
   strncpy( bundle_tile->bundle.key_log_path, config->development.bundle.ssl_key_log_file, sizeof(bundle_tile->bundle.key_log_path) );
   bundle_tile->bundle.buf_sz = config->development.bundle.buffer_size_kib<<10;
   bundle_tile->bundle.ssl_heap_sz = config->development.bundle.ssl_heap_size_mib<<20;
-  bundle_tile->bundle.keepalive_interval_nanos = (ulong)( config->tiles.bundle.keepalive_interval_seconds * 1e9f );
-  bundle_tile->bundle.request_timeout_nanos = (ulong)( config->tiles.bundle.request_timeout_seconds * 1e9f );
+  bundle_tile->bundle.keepalive_interval_nanos = (ulong)( (float)config->tiles.bundle.keepalive_interval_millis * 1e6f );
+  bundle_tile->bundle.request_timeout_nanos = (ulong)( (float)config->tiles.bundle.request_timeout_millis * 1e6f );
 
   strncpy( sign_tile->sign.identity_key_path, config->paths.identity_key, sizeof(sign_tile->sign.identity_key_path) );