Fix new deserialization

Author: ebatsell

tip-router-operator-cli/src/claim.rs

@@ -1,4 +1,3 @@
-use borsh::de::BorshDeserialize;
 use itertools::Itertools;
 use jito_priority_fee_distribution_sdk::PriorityFeeDistributionAccount;
 use jito_tip_distribution_sdk::{
@@ -605,7 +604,7 @@ pub async fn get_unprocessed_claims_for_validators(
 
     let deserialized_claim_statuses = claim_statuses
         .values()
-        .map(|a| (ClaimStatus::try_from_slice(&a.data).unwrap(), a));
+        .map(|a| (ClaimStatus::deserialize(&a.data).unwrap(), a));
 
     let unprocessed_claim_statuses = deserialized_claim_statuses
         .filter(|(c, _)| !c.is_claimed)

tip-router-operator-cli/src/reclaim.rs

@@ -1,7 +1,6 @@
 use std::{sync::Arc, time::Instant};
 
 use anyhow::Result;
-use borsh::de::BorshDeserialize;
 use jito_priority_fee_distribution_sdk::{
     instruction::{
         close_claim_status_ix as close_pf_claim_status_ix,
@@ -300,7 +299,7 @@ async fn close_tip_distribution_account_transactions(
         .value
         .ok_or_else(|| anyhow::anyhow!("Config account not found"))?;
 
-    let tip_distribution_config = TipDistributionConfig::try_from_slice(&config_account.data)?;
+    let tip_distribution_config = TipDistributionConfig::deserialize(&config_account.data)?;
 
     let instructions: Vec<_> = accounts
         .iter()
@@ -342,7 +341,7 @@ async fn close_priority_fee_distribution_account_transactions(
         .ok_or_else(|| anyhow::anyhow!("Config account not found"))?;
 
     let priority_fee_distribution_config =
-        PriorityFeeDistributionConfig::try_from_slice(&config_account.data)?;
+        PriorityFeeDistributionConfig::deserialize(&config_account.data)?;
 
     let instructions: Vec<_> = accounts
         .iter()
@@ -446,7 +445,7 @@ pub async fn fetch_expired_distribution_accounts(
         .iter()
         .flat_map(|(pubkey, account)| {
             let tip_distribution_account =
-                TipDistributionAccount::try_from_slice(account.data.as_slice());
+                TipDistributionAccount::deserialize(account.data.as_slice());
             tip_distribution_account.map_or_else(
                 |_| vec![],
                 |tip_distribution_account| vec![(*pubkey, tip_distribution_account)],
@@ -457,7 +456,7 @@ pub async fn fetch_expired_distribution_accounts(
         .iter()
         .flat_map(|(pubkey, account)| {
             let priority_fee_distribution_account =
-                PriorityFeeDistributionAccount::try_from_slice(&account.data);
+                PriorityFeeDistributionAccount::deserialize(&account.data);
             priority_fee_distribution_account.map_or_else(
                 |_| vec![],
                 |priority_fee_distribution_account| {
@@ -538,7 +537,7 @@ async fn fetch_expired_claim_statuses(
         .iter()
         .flat_map(|(pubkey, account)| {
             let tip_distribution_claim_status =
-                TipDistributionClaimStatus::try_from_slice(account.data.as_slice());
+                TipDistributionClaimStatus::deserialize(account.data.as_slice());
             tip_distribution_claim_status.map_or_else(
                 |_| vec![],
                 |tip_distribution_claim_status| vec![(*pubkey, tip_distribution_claim_status)],
@@ -550,7 +549,7 @@ async fn fetch_expired_claim_statuses(
         .iter()
         .flat_map(|(pubkey, account)| {
             let priority_fee_distribution_claim_status =
-                PriorityFeeDistributionClaimStatus::try_from_slice(&account.data);
+                PriorityFeeDistributionClaimStatus::deserialize(&account.data);
             priority_fee_distribution_claim_status.map_or_else(
                 |_| vec![],
                 |priority_fee_distribution_claim_status| {

tip-router-operator-cli/src/submit.rs

@@ -1,4 +1,3 @@
-use borsh::de::BorshDeserialize;
 use jito_bytemuck::AccountDeserialize as JitoAccountDeserialize;
 use jito_priority_fee_distribution_sdk::PriorityFeeDistributionAccount;
 use jito_tip_distribution_sdk::TipDistributionAccount;
@@ -398,7 +397,7 @@ async fn get_priority_fee_distribution_accounts_to_upload(
         .into_iter()
         .filter_map(|(pubkey, account)| {
             let tip_distribution_account =
-                PriorityFeeDistributionAccount::try_from_slice(&account.data);
+                PriorityFeeDistributionAccount::deserialize(&account.data);
             tip_distribution_account.map_or(None, |tip_distribution_account| {
                 if tip_distribution_account.epoch_created_at == epoch
                     && tip_distribution_account.merkle_root_upload_authority

tip-router-operator-cli/src/tip_distribution_stats.rs

@@ -1,5 +1,4 @@
 use anyhow::Result;
-use borsh::de::BorshDeserialize;
 use jito_priority_fee_distribution_sdk::PriorityFeeDistributionAccount;
 use jito_tip_distribution_sdk::TipDistributionAccount;
 use log::info;
@@ -94,8 +93,7 @@ async fn get_tip_distribution_accounts_for_epoch(
 
     let mut result = Vec::new();
     for (pubkey, account) in accounts {
-        if let Ok(tip_distribution_account) = TipDistributionAccount::try_from_slice(&account.data)
-        {
+        if let Ok(tip_distribution_account) = TipDistributionAccount::deserialize(&account.data) {
             if tip_distribution_account.epoch_created_at == epoch {
                 result.push((pubkey, tip_distribution_account));
             }
@@ -127,7 +125,7 @@ async fn get_priority_fee_distribution_accounts_for_epoch(
     let mut result = Vec::new();
     for (pubkey, account) in accounts {
         if let Ok(priority_fee_distribution_account) =
-            PriorityFeeDistributionAccount::try_from_slice(&account.data)
+            PriorityFeeDistributionAccount::deserialize(&account.data)
         {
             if priority_fee_distribution_account.epoch_created_at == epoch {
                 result.push((pubkey, priority_fee_distribution_account));