Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Stored ClaimStatus address #96

Merged
merged 8 commits into from
Mar 5, 2025
Merged

Fix Stored ClaimStatus address #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f280afb
Fix Claim Status Address
ebatsell Mar 3, 2025
4a54565
Updated claim status derive
ebatsell Mar 3, 2025
0698257
Compile
ebatsell Mar 3, 2025
d605329
Optimize
ebatsell Mar 3, 2025
9fe7b16
cleanu
ebatsell Mar 4, 2025
fc8043c
new claim stats
ebatsell Mar 5, 2025
b3737ac
lints
ebatsell Mar 5, 2025
accf843
Fix test
ebatsell Mar 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 11 additions & 23 deletions meta_merkle_tree/src/generated_merkle_tree.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,33 +277,21 @@ impl TreeNode {
let (claim_status_pubkey, claim_status_bump) = Pubkey::find_program_address(
&[
CLAIM_STATUS_SEED,
&delegation.staker_pubkey.to_bytes(),
&delegation.stake_account_pubkey.to_bytes(),
&tip_distribution_meta.tip_distribution_pubkey.to_bytes(),
],
&TIP_DISTRIBUTION_ID,
);
// Time-gated fix so slow rollout won't affect consensus
if tip_router_target_epoch > 737 {
Ok(Self {
claimant: delegation.stake_account_pubkey,
claim_status_pubkey,
claim_status_bump,
staker_pubkey: delegation.staker_pubkey,
withdrawer_pubkey: delegation.withdrawer_pubkey,
amount: reward_amount,
proof: None,
})
} else {
Ok(Self {
claimant: delegation.staker_pubkey,
claim_status_pubkey,
claim_status_bump,
staker_pubkey: delegation.staker_pubkey,
withdrawer_pubkey: delegation.withdrawer_pubkey,
amount: reward_amount,
proof: None,
})
}

Ok(Self {
claimant: delegation.stake_account_pubkey,
claim_status_pubkey,
claim_status_bump,
staker_pubkey: delegation.staker_pubkey,
withdrawer_pubkey: delegation.withdrawer_pubkey,
amount: reward_amount,
proof: None,
})
})
.collect::<Result<Vec<Self>, MerkleRootGeneratorError>>()?,
);
Expand Down
69 changes: 46 additions & 23 deletions tip-router-operator-cli/src/claim.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ use std::{
use anchor_lang::AccountDeserialize;
use itertools::Itertools;
use jito_tip_distribution_sdk::{
jito_tip_distribution::accounts::ClaimStatus, TipDistributionAccount, CLAIM_STATUS_SEED,
CLAIM_STATUS_SIZE, CONFIG_SEED,
derive_claim_status_account_address, jito_tip_distribution::accounts::ClaimStatus,
TipDistributionAccount, CLAIM_STATUS_SIZE, CONFIG_SEED,
};
use jito_tip_router_client::instructions::ClaimWithPayerBuilder;
use jito_tip_router_core::{account_payer::AccountPayer, config::Config};
Expand Down Expand Up @@ -81,8 +81,28 @@ pub async fn claim_mev_tips_with_emit(
let rpc_url = cli.rpc_url.clone();
let merkle_tree_coll_path =
meta_merkle_tree_dir.join(format!("generated_merkle_tree_{}.json", epoch));
let merkle_tree_coll = GeneratedMerkleTreeCollection::new_from_file(&merkle_tree_coll_path)
let mut merkle_tree_coll = GeneratedMerkleTreeCollection::new_from_file(&merkle_tree_coll_path)
.map_err(|e| anyhow::anyhow!(e))?;

let tip_router_config_address =
Config::find_program_address(&tip_router_program_id, &ncn_address).0;

// Fix wrong claim status pubkeys for 1 epoch -- noop if already correct
for tree in merkle_tree_coll.generated_merkle_trees.iter_mut() {
if tree.merkle_root_upload_authority != tip_router_config_address {
continue;
}
for node in tree.tree_nodes.iter_mut() {
let (claim_status_pubkey, claim_status_bump) = derive_claim_status_account_address(
&tip_distribution_program_id,
&node.claimant,
&tree.tip_distribution_account,
);
node.claim_status_pubkey = claim_status_pubkey;
node.claim_status_bump = claim_status_bump;
}
}

let start = Instant::now();

match claim_mev_tips(
Expand Down Expand Up @@ -265,13 +285,15 @@ pub async fn get_claim_transactions_for_valid_unclaimed(
) -> Result<Vec<Transaction>, ClaimMevError> {
let tip_router_config_address =
Config::find_program_address(&tip_router_program_id, &ncn_address).0;

let tree_nodes = merkle_trees
.generated_merkle_trees
.iter()
.filter_map(|tree| {
if tree.merkle_root_upload_authority != tip_router_config_address {
return None;
}

Some(&tree.tree_nodes)
})
.flatten()
Expand All @@ -290,6 +312,7 @@ pub async fn get_claim_transactions_for_valid_unclaimed(
.iter()
.map(|tree| tree.tip_distribution_account)
.collect_vec();

let tdas: HashMap<Pubkey, Account> = get_batched_accounts(rpc_client, &tda_pubkeys)
.await?
.into_iter()
Expand All @@ -310,6 +333,7 @@ pub async fn get_claim_transactions_for_valid_unclaimed(
.iter()
.map(|tree_node| tree_node.claim_status_pubkey)
.collect_vec();

let claim_statuses: HashMap<Pubkey, Account> =
get_batched_accounts(rpc_client, &claim_status_pubkeys)
.await?
Expand Down Expand Up @@ -392,19 +416,11 @@ fn build_mev_claim_transactions(
})
.collect();

datapoint_info!(
"tip_router_cli.build_mev_claim_transactions",
(
"tip_distribution_accounts",
tip_distribution_accounts.len(),
i64
),
("claim_statuses", claim_statuses.len(), i64),
);

let tip_distribution_config =
Pubkey::find_program_address(&[CONFIG_SEED], &tip_distribution_program_id).0;

let mut zero_amount_claimants = 0;

let mut instructions = Vec::with_capacity(claimants.len());
for tree in &merkle_trees.generated_merkle_trees {
if tree.max_total_claim == 0 {
Expand Down Expand Up @@ -432,16 +448,11 @@ fn build_mev_claim_transactions(
|| claim_statuses.contains_key(&node.claim_status_pubkey)
|| node.amount == 0
{
if node.amount == 0 {
zero_amount_claimants += 1;
}
continue;
}
let (claim_status_pubkey, claim_status_bump) = Pubkey::find_program_address(
&[
CLAIM_STATUS_SEED,
&node.claimant.to_bytes(),
&tree.tip_distribution_account.to_bytes(),
],
&tip_distribution_program_id,
);

let claim_with_payer_ix = ClaimWithPayerBuilder::new()
.account_payer(tip_router_account_payer)
Expand All @@ -450,12 +461,12 @@ fn build_mev_claim_transactions(
.tip_distribution_program(tip_distribution_program_id)
.tip_distribution_config(tip_distribution_config)
.tip_distribution_account(tree.tip_distribution_account)
.claim_status(claim_status_pubkey)
.claim_status(node.claim_status_pubkey)
.claimant(node.claimant)
.system_program(system_program::id())
.proof(node.proof.clone().unwrap())
.amount(node.amount)
.bump(claim_status_bump)
.bump(node.claim_status_bump)
.instruction();

instructions.push(claim_with_payer_ix);
Expand All @@ -476,6 +487,18 @@ fn build_mev_claim_transactions(
})
.collect();

info!("zero amount claimants: {}", zero_amount_claimants);
datapoint_info!(
"tip_router_cli.build_mev_claim_transactions",
(
"tip_distribution_accounts",
tip_distribution_accounts.len(),
i64
),
("claim_statuses", claim_statuses.len(), i64),
("claim_transactions", transactions.len(), i64),
);

transactions
}

Expand Down
2 changes: 1 addition & 1 deletion tip-router-operator-cli/tests/integration_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ async fn test_merkle_tree_generation() -> Result<(), Box<dyn std::error::Error>>

assert_eq!(
generated_tree.merkle_root.to_string(),
"4X4wPZvbbKQkkJEmdot5J2nQjs2amJUbF1Be6Pb5BV3u"
"Cb1Es45bg4AcYhztFrkVijKZM1aE864rAEsXH9oajrXX"
);

let nodes = &generated_tree.tree_nodes;
Expand Down
Loading