Skip to content

Commit

Permalink
Update claimant: staker to claimant: stake_account
Browse files Browse the repository at this point in the history
  • Loading branch information
ebatsell committed Feb 4, 2025
1 parent afbefda commit 2df202c
Showing 1 changed file with 22 additions and 9 deletions.
31 changes: 22 additions & 9 deletions meta_merkle_tree/src/generated_merkle_tree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -273,15 +273,28 @@ impl TreeNode {
],
&TIP_DISTRIBUTION_ID,
);
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,
})
// 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,
})
}
})
.collect::<Result<Vec<Self>, MerkleRootGeneratorError>>()?,
);
Expand Down

0 comments on commit 2df202c

Please sign in to comment.