make sending of accounts on blocksubscription optional, false by default

block-builder/src/block_builder.rs

@@ -18,9 +18,15 @@ pub fn start_block_building_thread(
     channel_messages: Receiver<ChannelMessage>,
     output: Sender<ChannelMessage>,
     compression_type: CompressionType,
+    build_blocks_with_accounts: bool,
 ) {
     std::thread::spawn(move || {
-        build_blocks(channel_messages, output, compression_type);
+        build_blocks(
+            channel_messages,
+            output,
+            compression_type,
+            build_blocks_with_accounts,
+        );
     });
 }
 
@@ -35,32 +41,35 @@ pub fn build_blocks(
     channel_messages: Receiver<ChannelMessage>,
     output: Sender<ChannelMessage>,
     compression_type: CompressionType,
+    build_blocks_with_accounts: bool,
 ) {
     let mut partially_build_blocks = BTreeMap::<u64, PartialBlock>::new();
     while let Ok(channel_message) = channel_messages.recv() {
         match channel_message {
             ChannelMessage::Account(account_data, slot) => {
-                if let Some(lowest) = partially_build_blocks.first_entry() {
+                if build_blocks_with_accounts {
-                    if *lowest.key() > slot {
+                    if let Some(lowest) = partially_build_blocks.first_entry() {
-                        log::error!("Account update is too late the slot data has already been dispactched lowest slot: {}, account slot: {}", lowest.key(), slot);
+                        if *lowest.key() > slot {
+                            log::error!("Account update is too late the slot data has already been dispactched lowest slot: {}, account slot: {}", lowest.key(), slot);
+                        }
                     }
-                }
+                    // save account updates
-                // save account updates
+                    let partial_block = match partially_build_blocks.get_mut(&slot) {
-                let partial_block = match partially_build_blocks.get_mut(&slot) {
+                        Some(pb) => pb,
-                    Some(pb) => pb,
+                        None => {
-                    None => {
+                            partially_build_blocks.insert(slot, PartialBlock::default());
-                        partially_build_blocks.insert(slot, PartialBlock::default());
+                            partially_build_blocks.get_mut(&slot).unwrap()
-                        partially_build_blocks.get_mut(&slot).unwrap()
+                        }
+                    };
+                    let update = match partial_block.account_updates.get(&account_data.pubkey) {
+                        Some(prev_update) => prev_update.write_version < account_data.write_version,
+                        None => true,
+                    };
+                    if update {
+                        partial_block
+                            .account_updates
+                            .insert(account_data.pubkey, account_data);
                     }
-                };
-                let update = match partial_block.account_updates.get(&account_data.pubkey) {
-                    Some(prev_update) => prev_update.write_version < account_data.write_version,
-                    None => true,
-                };
-                if update {
-                    partial_block
-                        .account_updates
-                        .insert(account_data.pubkey, account_data);
                 }
             }
             ChannelMessage::Slot(slot, _parent_slot, commitment) => {

block-builder/src/tests.rs

@@ -1,4 +1,3 @@
-
 use std::{
     collections::HashMap,
     sync::mpsc::{channel, TryRecvError},
@@ -38,6 +37,7 @@ fn test_block_creation_transactions_after_blockmeta() {
         cm_rx,
         ms_sx,
         quic_geyser_common::compression::CompressionType::None,
+        true,
     );
 
     let acc1_pk = Pubkey::new_unique();
@@ -261,6 +261,7 @@ fn test_block_creation_blockmeta_after_transactions() {
         cm_rx,
         ms_sx,
         quic_geyser_common::compression::CompressionType::None,
+        true,
     );
 
     let acc1_pk = Pubkey::new_unique();
@@ -485,6 +486,7 @@ fn test_block_creation_incomplete_block_after_slot_notification() {
         cm_rx,
         ms_sx,
         quic_geyser_common::compression::CompressionType::None,
+        true,
     );
 
     let acc1_pk = Pubkey::new_unique();
@@ -708,6 +710,7 @@ fn test_block_creation_incomplete_slot() {
         cm_rx,
         ms_sx,
         quic_geyser_common::compression::CompressionType::None,
+        true,
     );
 
     let acc1_pk = Pubkey::new_unique();

blocking_client/src/client.rs

@@ -127,6 +127,7 @@ mod tests {
                     allow_accounts: true,
                     allow_accounts_at_startup: false,
                     enable_block_builder: false,
+                    build_blocks_with_accounts: false,
                 };
                 let quic_server = QuicServer::new(config).unwrap();
                 // wait for client to connect and subscribe

client/src/non_blocking/client.rs

@@ -256,6 +256,7 @@ mod tests {
                     allow_accounts: true,
                     allow_accounts_at_startup: false,
                     enable_block_builder: false,
+                    build_blocks_with_accounts: false,
                 };
                 let quic_server = QuicServer::new(config).unwrap();
                 // wait for client to connect and subscribe

common/src/config.rs

@@ -32,6 +32,8 @@ pub struct ConfigQuicPlugin {
     pub allow_accounts_at_startup: bool,
     #[serde(default = "ConfigQuicPlugin::default_enable_block_builder")]
     pub enable_block_builder: bool,
+    #[serde(default)]
+    pub build_blocks_with_accounts: bool,
 }
 
 impl ConfigQuicPlugin {

examples/tester-server/src/main.rs

@@ -35,6 +35,7 @@ pub fn main() {
         allow_accounts: true,
         allow_accounts_at_startup: false,
         enable_block_builder: true,
+        build_blocks_with_accounts: true,
     };
     let quic_server = QuicServer::new(config).unwrap();
 

plugin/src/quic_plugin.rs

@@ -36,6 +36,7 @@ impl GeyserPlugin for QuicGeyserPlugin {
         let config = Config::load_from_file(config_file)?;
         let compression_type = config.quic_plugin.compression_parameters.compression_type;
         let enable_block_builder = config.quic_plugin.enable_block_builder;
+        let build_blocks_with_accounts = config.quic_plugin.build_blocks_with_accounts;
         log::info!("Quic plugin config correctly loaded");
         solana_logger::setup_with_default(&config.quic_plugin.log_level);
         let quic_server = QuicServer::new(config.quic_plugin).map_err(|_| {
@@ -47,6 +48,7 @@ impl GeyserPlugin for QuicGeyserPlugin {
                 rx,
                 quic_server.data_channel_sender.clone(),
                 compression_type,
+                build_blocks_with_accounts,
             );
             self.block_builder_channel = Some(sx);
         }

proxy/src/main.rs

@@ -34,6 +34,7 @@ pub fn main() -> anyhow::Result<()> {
         Filter::TransactionsAll,
         Filter::Slot,
         Filter::BlockMeta,
+        Filter::BlockAll,
     ])?;
 
     let quic_config = ConfigQuicPlugin {
@@ -57,6 +58,7 @@ pub fn main() -> anyhow::Result<()> {
         allow_accounts: true,
         allow_accounts_at_startup: false,
         enable_block_builder: false,
+        build_blocks_with_accounts: false,
     };
 
     let (server_sender, server_reciever) = std::sync::mpsc::channel::<ChannelMessage>();