Skip to content

Commit

Permalink
some tests added
Browse files Browse the repository at this point in the history
  • Loading branch information
@coachchucksol
coachchucksol committed Dec 3, 2024
1 parent eb4ef87 commit da3591e
Show file tree
Hide file tree
Showing 5 changed files with 316 additions and 97 deletions.
52 changes: 28 additions & 24 deletions clients/js/jito_tip_router/errors/jitoTipRouter.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,54 +62,56 @@ export const JITO_TIP_ROUTER_ERROR__VAULT_INDEX_ALREADY_IN_USE = 0x220d; // 8717
export const JITO_TIP_ROUTER_ERROR__MINT_ENTRY_NOT_FOUND = 0x220e; // 8718
/** FeeCapExceeded: Fee cap exceeded */
export const JITO_TIP_ROUTER_ERROR__FEE_CAP_EXCEEDED = 0x220f; // 8719
/** DefaultDaoWallet: DAO wallet cannot be default */
export const JITO_TIP_ROUTER_ERROR__DEFAULT_DAO_WALLET = 0x2210; // 8720
/** IncorrectNcnAdmin: Incorrect NCN Admin */
export const JITO_TIP_ROUTER_ERROR__INCORRECT_NCN_ADMIN = 0x2210; // 8720
export const JITO_TIP_ROUTER_ERROR__INCORRECT_NCN_ADMIN = 0x2211; // 8721
/** IncorrectNcn: Incorrect NCN */
export const JITO_TIP_ROUTER_ERROR__INCORRECT_NCN = 0x2211; // 8721
export const JITO_TIP_ROUTER_ERROR__INCORRECT_NCN = 0x2212; // 8722
/** IncorrectFeeAdmin: Incorrect fee admin */
export const JITO_TIP_ROUTER_ERROR__INCORRECT_FEE_ADMIN = 0x2212; // 8722
export const JITO_TIP_ROUTER_ERROR__INCORRECT_FEE_ADMIN = 0x2213; // 8723
/** WeightTableNotFinalized: Weight table not finalized */
export const JITO_TIP_ROUTER_ERROR__WEIGHT_TABLE_NOT_FINALIZED = 0x2213; // 8723
export const JITO_TIP_ROUTER_ERROR__WEIGHT_TABLE_NOT_FINALIZED = 0x2214; // 8724
/** WeightNotFound: Weight not found */
export const JITO_TIP_ROUTER_ERROR__WEIGHT_NOT_FOUND = 0x2214; // 8724
export const JITO_TIP_ROUTER_ERROR__WEIGHT_NOT_FOUND = 0x2215; // 8725
/** NoOperators: No operators in ncn */
export const JITO_TIP_ROUTER_ERROR__NO_OPERATORS = 0x2215; // 8725
export const JITO_TIP_ROUTER_ERROR__NO_OPERATORS = 0x2216; // 8726
/** VaultOperatorDelegationFinalized: Vault operator delegation is already finalized - should not happen */
export const JITO_TIP_ROUTER_ERROR__VAULT_OPERATOR_DELEGATION_FINALIZED = 0x2216; // 8726
export const JITO_TIP_ROUTER_ERROR__VAULT_OPERATOR_DELEGATION_FINALIZED = 0x2217; // 8727
/** OperatorFinalized: Operator is already finalized - should not happen */
export const JITO_TIP_ROUTER_ERROR__OPERATOR_FINALIZED = 0x2217; // 8727
export const JITO_TIP_ROUTER_ERROR__OPERATOR_FINALIZED = 0x2218; // 8728
/** TooManyVaultOperatorDelegations: Too many vault operator delegations */
export const JITO_TIP_ROUTER_ERROR__TOO_MANY_VAULT_OPERATOR_DELEGATIONS = 0x2218; // 8728
export const JITO_TIP_ROUTER_ERROR__TOO_MANY_VAULT_OPERATOR_DELEGATIONS = 0x2219; // 8729
/** DuplicateVaultOperatorDelegation: Duplicate vault operator delegation */
export const JITO_TIP_ROUTER_ERROR__DUPLICATE_VAULT_OPERATOR_DELEGATION = 0x2219; // 8729
export const JITO_TIP_ROUTER_ERROR__DUPLICATE_VAULT_OPERATOR_DELEGATION = 0x221a; // 8730
/** DuplicateVoteCast: Duplicate Vote Cast */
export const JITO_TIP_ROUTER_ERROR__DUPLICATE_VOTE_CAST = 0x221a; // 8730
export const JITO_TIP_ROUTER_ERROR__DUPLICATE_VOTE_CAST = 0x221b; // 8731
/** OperatorVotesFull: Operator votes full */
export const JITO_TIP_ROUTER_ERROR__OPERATOR_VOTES_FULL = 0x221b; // 8731
export const JITO_TIP_ROUTER_ERROR__OPERATOR_VOTES_FULL = 0x221c; // 8732
/** BallotTallyFull: Merkle root tally full */
export const JITO_TIP_ROUTER_ERROR__BALLOT_TALLY_FULL = 0x221c; // 8732
export const JITO_TIP_ROUTER_ERROR__BALLOT_TALLY_FULL = 0x221d; // 8733
/** ConsensusAlreadyReached: Consensus already reached */
export const JITO_TIP_ROUTER_ERROR__CONSENSUS_ALREADY_REACHED = 0x221d; // 8733
export const JITO_TIP_ROUTER_ERROR__CONSENSUS_ALREADY_REACHED = 0x221e; // 8734
/** ConsensusNotReached: Consensus not reached */
export const JITO_TIP_ROUTER_ERROR__CONSENSUS_NOT_REACHED = 0x221e; // 8734
export const JITO_TIP_ROUTER_ERROR__CONSENSUS_NOT_REACHED = 0x221f; // 8735
/** InvalidNcnFeeGroup: Not a valid NCN fee group */
export const JITO_TIP_ROUTER_ERROR__INVALID_NCN_FEE_GROUP = 0x221f; // 8735
export const JITO_TIP_ROUTER_ERROR__INVALID_NCN_FEE_GROUP = 0x2220; // 8736
/** InvalidBaseFeeGroup: Not a valid base fee group */
export const JITO_TIP_ROUTER_ERROR__INVALID_BASE_FEE_GROUP = 0x2220; // 8736
export const JITO_TIP_ROUTER_ERROR__INVALID_BASE_FEE_GROUP = 0x2221; // 8737
/** OperatorRewardListFull: Operator reward list full */
export const JITO_TIP_ROUTER_ERROR__OPERATOR_REWARD_LIST_FULL = 0x2221; // 8737
export const JITO_TIP_ROUTER_ERROR__OPERATOR_REWARD_LIST_FULL = 0x2222; // 8738
/** OperatorRewardNotFound: Operator Reward not found */
export const JITO_TIP_ROUTER_ERROR__OPERATOR_REWARD_NOT_FOUND = 0x2222; // 8738
export const JITO_TIP_ROUTER_ERROR__OPERATOR_REWARD_NOT_FOUND = 0x2223; // 8739
/** VaultRewardNotFound: Vault Reward not found */
export const JITO_TIP_ROUTER_ERROR__VAULT_REWARD_NOT_FOUND = 0x2223; // 8739
export const JITO_TIP_ROUTER_ERROR__VAULT_REWARD_NOT_FOUND = 0x2224; // 8740
/** DestinationMismatch: Destination mismatch */
export const JITO_TIP_ROUTER_ERROR__DESTINATION_MISMATCH = 0x2224; // 8740
export const JITO_TIP_ROUTER_ERROR__DESTINATION_MISMATCH = 0x2225; // 8741
/** NcnRewardRouteNotFound: Ncn reward route not found */
export const JITO_TIP_ROUTER_ERROR__NCN_REWARD_ROUTE_NOT_FOUND = 0x2225; // 8741
export const JITO_TIP_ROUTER_ERROR__NCN_REWARD_ROUTE_NOT_FOUND = 0x2226; // 8742
/** FeeNotActive: Fee not active */
export const JITO_TIP_ROUTER_ERROR__FEE_NOT_ACTIVE = 0x2226; // 8742
export const JITO_TIP_ROUTER_ERROR__FEE_NOT_ACTIVE = 0x2227; // 8743
/** NoRewards: No rewards to distribute */
export const JITO_TIP_ROUTER_ERROR__NO_REWARDS = 0x2227; // 8743
export const JITO_TIP_ROUTER_ERROR__NO_REWARDS = 0x2228; // 8744

export type JitoTipRouterError =
| typeof JITO_TIP_ROUTER_ERROR__ARITHMETIC_FLOOR_ERROR
Expand All @@ -123,6 +125,7 @@ export type JitoTipRouterError =
| typeof JITO_TIP_ROUTER_ERROR__CONFIG_MINTS_NOT_UPDATED
| typeof JITO_TIP_ROUTER_ERROR__CONSENSUS_ALREADY_REACHED
| typeof JITO_TIP_ROUTER_ERROR__CONSENSUS_NOT_REACHED
| typeof JITO_TIP_ROUTER_ERROR__DEFAULT_DAO_WALLET
| typeof JITO_TIP_ROUTER_ERROR__DENOMINATOR_IS_ZERO
| typeof JITO_TIP_ROUTER_ERROR__DESTINATION_MISMATCH
| typeof JITO_TIP_ROUTER_ERROR__DUPLICATE_MINTS_IN_TABLE
Expand Down Expand Up @@ -175,6 +178,7 @@ if (process.env.NODE_ENV !== 'production') {
[JITO_TIP_ROUTER_ERROR__CONFIG_MINTS_NOT_UPDATED]: `Config supported mints do not match NCN Vault Count`,
[JITO_TIP_ROUTER_ERROR__CONSENSUS_ALREADY_REACHED]: `Consensus already reached`,
[JITO_TIP_ROUTER_ERROR__CONSENSUS_NOT_REACHED]: `Consensus not reached`,
[JITO_TIP_ROUTER_ERROR__DEFAULT_DAO_WALLET]: `DAO wallet cannot be default`,
[JITO_TIP_ROUTER_ERROR__DENOMINATOR_IS_ZERO]: `Zero in the denominator`,
[JITO_TIP_ROUTER_ERROR__DESTINATION_MISMATCH]: `Destination mismatch`,
[JITO_TIP_ROUTER_ERROR__DUPLICATE_MINTS_IN_TABLE]: `Duplicate mints in table`,
Expand Down
99 changes: 51 additions & 48 deletions clients/rust/jito_tip_router/src/generated/errors/jito_tip_router.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,78 +81,81 @@ pub enum JitoTipRouterError {
/// 8719 - Fee cap exceeded
#[error("Fee cap exceeded")]
FeeCapExceeded = 0x220F,
/// 8720 - Incorrect NCN Admin
/// 8720 - DAO wallet cannot be default
#[error("DAO wallet cannot be default")]
DefaultDaoWallet = 0x2210,
/// 8721 - Incorrect NCN Admin
#[error("Incorrect NCN Admin")]
IncorrectNcnAdmin = 0x2210,
/// 8721 - Incorrect NCN
IncorrectNcnAdmin = 0x2211,
/// 8722 - Incorrect NCN
#[error("Incorrect NCN")]
IncorrectNcn = 0x2211,
/// 8722 - Incorrect fee admin
IncorrectNcn = 0x2212,
/// 8723 - Incorrect fee admin
#[error("Incorrect fee admin")]
IncorrectFeeAdmin = 0x2212,
/// 8723 - Weight table not finalized
IncorrectFeeAdmin = 0x2213,
/// 8724 - Weight table not finalized
#[error("Weight table not finalized")]
WeightTableNotFinalized = 0x2213,
/// 8724 - Weight not found
WeightTableNotFinalized = 0x2214,
/// 8725 - Weight not found
#[error("Weight not found")]
WeightNotFound = 0x2214,
/// 8725 - No operators in ncn
WeightNotFound = 0x2215,
/// 8726 - No operators in ncn
#[error("No operators in ncn")]
NoOperators = 0x2215,
/// 8726 - Vault operator delegation is already finalized - should not happen
NoOperators = 0x2216,
/// 8727 - Vault operator delegation is already finalized - should not happen
#[error("Vault operator delegation is already finalized - should not happen")]
VaultOperatorDelegationFinalized = 0x2216,
/// 8727 - Operator is already finalized - should not happen
VaultOperatorDelegationFinalized = 0x2217,
/// 8728 - Operator is already finalized - should not happen
#[error("Operator is already finalized - should not happen")]
OperatorFinalized = 0x2217,
/// 8728 - Too many vault operator delegations
OperatorFinalized = 0x2218,
/// 8729 - Too many vault operator delegations
#[error("Too many vault operator delegations")]
TooManyVaultOperatorDelegations = 0x2218,
/// 8729 - Duplicate vault operator delegation
TooManyVaultOperatorDelegations = 0x2219,
/// 8730 - Duplicate vault operator delegation
#[error("Duplicate vault operator delegation")]
DuplicateVaultOperatorDelegation = 0x2219,
/// 8730 - Duplicate Vote Cast
DuplicateVaultOperatorDelegation = 0x221A,
/// 8731 - Duplicate Vote Cast
#[error("Duplicate Vote Cast")]
DuplicateVoteCast = 0x221A,
/// 8731 - Operator votes full
DuplicateVoteCast = 0x221B,
/// 8732 - Operator votes full
#[error("Operator votes full")]
OperatorVotesFull = 0x221B,
/// 8732 - Merkle root tally full
OperatorVotesFull = 0x221C,
/// 8733 - Merkle root tally full
#[error("Merkle root tally full")]
BallotTallyFull = 0x221C,
/// 8733 - Consensus already reached
BallotTallyFull = 0x221D,
/// 8734 - Consensus already reached
#[error("Consensus already reached")]
ConsensusAlreadyReached = 0x221D,
/// 8734 - Consensus not reached
ConsensusAlreadyReached = 0x221E,
/// 8735 - Consensus not reached
#[error("Consensus not reached")]
ConsensusNotReached = 0x221E,
/// 8735 - Not a valid NCN fee group
ConsensusNotReached = 0x221F,
/// 8736 - Not a valid NCN fee group
#[error("Not a valid NCN fee group")]
InvalidNcnFeeGroup = 0x221F,
/// 8736 - Not a valid base fee group
InvalidNcnFeeGroup = 0x2220,
/// 8737 - Not a valid base fee group
#[error("Not a valid base fee group")]
InvalidBaseFeeGroup = 0x2220,
/// 8737 - Operator reward list full
InvalidBaseFeeGroup = 0x2221,
/// 8738 - Operator reward list full
#[error("Operator reward list full")]
OperatorRewardListFull = 0x2221,
/// 8738 - Operator Reward not found
OperatorRewardListFull = 0x2222,
/// 8739 - Operator Reward not found
#[error("Operator Reward not found")]
OperatorRewardNotFound = 0x2222,
/// 8739 - Vault Reward not found
OperatorRewardNotFound = 0x2223,
/// 8740 - Vault Reward not found
#[error("Vault Reward not found")]
VaultRewardNotFound = 0x2223,
/// 8740 - Destination mismatch
VaultRewardNotFound = 0x2224,
/// 8741 - Destination mismatch
#[error("Destination mismatch")]
DestinationMismatch = 0x2224,
/// 8741 - Ncn reward route not found
DestinationMismatch = 0x2225,
/// 8742 - Ncn reward route not found
#[error("Ncn reward route not found")]
NcnRewardRouteNotFound = 0x2225,
/// 8742 - Fee not active
NcnRewardRouteNotFound = 0x2226,
/// 8743 - Fee not active
#[error("Fee not active")]
FeeNotActive = 0x2226,
/// 8743 - No rewards to distribute
FeeNotActive = 0x2227,
/// 8744 - No rewards to distribute
#[error("No rewards to distribute")]
NoRewards = 0x2227,
NoRewards = 0x2228,
}

impl solana_program::program_error::PrintProgramError for JitoTipRouterError {
Expand Down
2 changes: 2 additions & 0 deletions core/src/error.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ pub enum TipRouterError {
MintEntryNotFound,
#[error("Fee cap exceeded")]
FeeCapExceeded,
#[error("DAO wallet cannot be default")]
DefaultDaoWallet,
#[error("Incorrect NCN Admin")]
IncorrectNcnAdmin,
#[error("Incorrect NCN")]
Expand Down
Loading

0 comments on commit da3591e

Please sign in to comment.