working switchboard cli code

Author: gzalz

Cargo.lock

@@ -95,7 +95,7 @@ solana-instruction = { package = "solana-instruction", git = "https://github.com
 solana-ledger = { package = "solana-ledger", git = "https://github.com/jito-foundation/jito-solana.git", rev = "93c4da92ba1f2db5963a3ba678d6c34b123cca5a" }
 solana-measure = { git = "https://github.com/jito-foundation/jito-solana.git", rev = "93c4da92ba1f2db5963a3ba678d6c34b123cca5a" }
 solana-metrics = { package = "solana-metrics", git = "https://github.com/jito-foundation/jito-solana.git", rev = "93c4da92ba1f2db5963a3ba678d6c34b123cca5a" }
-solana-program = { version = "3.0.0", default-features = false }
+solana-program = { version = "3.0.0", default-features = false, features = [] }
 solana-program-entrypoint = "3.0.0"
 solana-program-error = "=3.0.0"
 solana-program-test = { package = "solana-program-test", git = "https://github.com/jito-foundation/jito-solana.git", rev = "93c4da92ba1f2db5963a3ba678d6c34b123cca5a" }

Cargo.toml

@@ -42,8 +42,8 @@ jito-vault-sdk = { workspace = true }
 log = { workspace = true }
 num-derive = { workspace = true }
 num-traits = { workspace = true }
-solana-account-info = "3.0.0"
 solana-account-decoder = { workspace = true }
+solana-account-info = "3.0.0"
 solana-address-lookup-table-interface = { workspace = true }
 solana-cli-config = { workspace = true }
 solana-client = { workspace = true }
@@ -59,7 +59,7 @@ solana-system-interface = { workspace = true }
 solana-transaction-status = { workspace = true }
 spl-associated-token-account-interface = { workspace = true }
 spl-token-interface = { workspace = true }
-switchboard-on-demand-client = { package="switchboard-on-demand", version = "0.10.0", default-features = false, features = ["solana-v3", "client-v3"] }
+switchboard-on-demand-client = { package = "switchboard-on-demand", version = "0.10.1", default-features = false, features = ["solana-v3", "client-v3"] }
 thiserror = { workspace = true }
 tokio = { workspace = true }
 

cli/Cargo.toml

@@ -60,7 +60,7 @@ pub struct CliHandler {
     ncn: Option<Pubkey>,
     pub epoch: u64,
     rpc_client: RpcClient,
-    switchboard_context: Arc<SbContext>,
+    pub switchboard_context: Arc<SbContext>,
     pub retries: u64,
     pub priority_fee_micro_lamports: u64,
     pub(crate) print_tx: bool,
@@ -174,9 +174,9 @@ impl CliHandler {
         Ok(config)
     }
 
-    /*pub const fn switchboard_context(&self) -> &Arc<SbContext> {
+    pub const fn switchboard_context(&self) -> &Arc<SbContext> {
         &self.switchboard_context
-    }*/
+    }
 
     pub const fn keypair(&self) -> &Keypair {
         &self.keypair
@@ -361,12 +361,12 @@ impl CliHandler {
             ProgramCommand::CrankSwitchboard { switchboard_feed } => {
                 let switchboard_feed =
                     Pubkey::from_str(&switchboard_feed).expect("error parsing switchboard feed");
-                crank_switchboard(self, &switchboard_feed).await;
+                let _ = crank_switchboard(self, &switchboard_feed).await;
                 Ok(())
             }
             ProgramCommand::SetWeight { vault } => {
                 let vault = Pubkey::from_str(&vault).expect("error parsing vault");
-                set_weight(self, &vault, self.epoch).await;
+                let _ = set_weight(self, &vault, self.epoch).await;
                 Ok(())
             }
 

cli/src/handler.rs

@@ -109,7 +109,6 @@ use switchboard_on_demand_client::{
     },
     QueueAccountData,
 };
-use switchboard_on_demand_client::QueueAccountData;
 use tokio::time::sleep;
 
 use jito_priority_fee_distribution_sdk;
@@ -876,6 +875,8 @@ pub async fn crank_switchboard(handler: &CliHandler, switchboard_feed: &Pubkey)
         Ok(())
     }
 
+    let switchboard_context = handler.switchboard_context();
+
     let client = handler.rpc_client();
     let payer = handler.keypair();
 
@@ -892,7 +893,6 @@ pub async fn crank_switchboard(handler: &CliHandler, switchboard_feed: &Pubkey)
         .get_account_with_commitment(&queue_key, handler.commitment)
         .await?
         .value
-        .map(|a| a)
         .expect("Queue account not found");
     let queue_account_info = AccountInfo {
         key: &queue_key,
@@ -902,14 +902,15 @@ pub async fn crank_switchboard(handler: &CliHandler, switchboard_feed: &Pubkey)
         lamports: Rc::new(RefCell::new(&mut queue_account.lamports)),
         data: Rc::new(RefCell::new(&mut queue_account.data)),
         executable: false,
+        #[allow(deprecated)]
         _unused: 0,
     };
 
     let queue = *QueueAccountData::new(&queue_account_info)?;
 
-    //let gateways = &queue.fetch_gateways(client).await?;
+    let gateways = &queue.fetch_gateways(client).await?;
 
-    /*if gateways.is_empty() {
+    if gateways.is_empty() {
         return Err(anyhow!("No gateways found"));
     }
 
@@ -938,7 +939,7 @@ pub async fn crank_switchboard(handler: &CliHandler, switchboard_feed: &Pubkey)
         "Crank Switchboard",
         &[format!("FEED: {:?}", switchboard_feed)],
     )
-    .await?;*/
+    .await?;
 
     Ok(())
 }

cli/src/instructions.rs

@@ -43,6 +43,7 @@ pub struct KeeperState {
     pub is_epoch_completed: bool,
 }
 
+#[allow(clippy::unnecessary_unwrap)]
 impl KeeperState {
     pub async fn fetch(&mut self, handler: &CliHandler, epoch: u64) -> Result<()> {
         // Fetch all vaults and operators

cli/src/keeper/keeper_state.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::future_not_send)]
+#![allow(clippy::cognitive_complexity)]
 #![allow(clippy::arithmetic_side_effects)]
 pub mod args;
 pub mod getters;

cli/src/lib.rs

@@ -32,7 +32,7 @@ fn format_log_message(buf: &mut Formatter, record: &Record) -> std::io::Result<(
     )
 }
 
-fn colored_level(style: &mut Style, level: log::Level) -> StyledValue<&'static str> {
+fn colored_level(style: &mut Style, level: log::Level) -> StyledValue<'_, &'static str> {
     match level {
         log::Level::Trace => style.set_color(Color::Magenta).value("TRACE"),
         log::Level::Debug => style.set_color(Color::Blue).value("DEBUG"),

cli/src/log.rs

@@ -166,7 +166,7 @@ impl MerkleTree {
         self.nodes.iter().last()
     }
 
-    pub fn find_path(&self, index: usize) -> Option<Proof> {
+    pub fn find_path(&self, index: usize) -> Option<Proof<'_>> {
         if index >= self.leaf_count {
             return None;
         }

meta_merkle_tree/src/merkle_tree.rs

@@ -286,6 +286,7 @@ pub async fn get_claimer_balance(
     Ok(balance)
 }
 
+#[allow(clippy::cognitive_complexity)]
 #[allow(clippy::too_many_arguments)]
 pub async fn claim_mev_tips(
     merkle_trees: &GeneratedMerkleTreeCollection,