ready

.gitignore

@@ -8,3 +8,4 @@ program_errors.json
 test_errors.output
 tests.output
 integration_tests/tests/fixtures/jito_tip_router_program.so
+integration_tests/tests/fixtures/jito_tip_router_program-keypair.json

core/src/lib.rs

@@ -1,6 +1,7 @@
 pub mod ballot_box;
 pub mod base_fee_group;
 pub mod base_reward_router;
+pub mod claim_status_payer;
 pub mod constants;
 pub mod discriminators;
 pub mod epoch_snapshot;
@@ -16,4 +17,3 @@ pub mod tracked_mints;
 pub mod utils;
 pub mod weight_entry;
 pub mod weight_table;
-pub mod claim_status_payer;

integration_tests/tests/tip_router/bpf/set_merkle_root.rs

@@ -24,7 +24,6 @@ mod set_merkle_root {
             TestResult,
         },
         helpers::ballot_box::serialized_ballot_box_account,
-        tip_router,
     };
 
     struct GeneratedMerkleTreeCollectionFixture {

program/src/lib.rs

@@ -1,5 +1,6 @@
 mod admin_update_weight_table;
 mod cast_vote;
+mod claim_with_payer;
 mod distribute_base_ncn_reward_route;
 mod distribute_base_rewards;
 mod distribute_ncn_operator_rewards;
@@ -25,7 +26,6 @@ mod set_new_admin;
 mod set_tie_breaker;
 mod set_tracked_mint_ncn_fee_group;
 mod snapshot_vault_operator_delegation;
-mod claim_with_payer;
 
 use borsh::BorshDeserialize;
 use const_str_to_pubkey::str_to_pubkey;
@@ -40,6 +40,7 @@ use solana_security_txt::security_txt;
 
 use crate::{
     admin_update_weight_table::process_admin_update_weight_table, cast_vote::process_cast_vote,
+    claim_with_payer::process_claim_with_payer,
     distribute_base_ncn_reward_route::process_distribute_base_ncn_reward_route,
     distribute_base_rewards::process_distribute_base_rewards,
     distribute_ncn_operator_rewards::process_distribute_ncn_operator_rewards,
@@ -61,7 +62,6 @@ use crate::{
     set_tie_breaker::process_set_tie_breaker,
     set_tracked_mint_ncn_fee_group::process_set_tracked_mint_ncn_fee_group,
     snapshot_vault_operator_delegation::process_snapshot_vault_operator_delegation,
-    claim_with_payer::process_claim_with_payer,
 };
 
 declare_id!(str_to_pubkey(env!("TIP_ROUTER_PROGRAM_ID")));

program/src/route_ncn_rewards.rs

@@ -5,8 +5,8 @@ use jito_tip_router_core::{
     ncn_reward_router::NcnRewardRouter,
 };
 use solana_program::{
-    account_info::AccountInfo, entrypoint::ProgramResult, log::sol_log_compute_units, msg,
-    program_error::ProgramError, pubkey::Pubkey, rent::Rent, sysvar::Sysvar,
+    account_info::AccountInfo, entrypoint::ProgramResult, msg, program_error::ProgramError,
+    pubkey::Pubkey, rent::Rent, sysvar::Sysvar,
 };
 
 /// Can be backfilled for previous epochs