Skip to content

Commit b7b62a9

Browse files
ebatsellebatsell
committed
Checkpoint
1 parent 260b404 commit b7b62a9

File tree

7 files changed

+1062
-110
lines changed

7 files changed

+1062
-110
lines changed

‎idl/jito_tip_router.json‎

Lines changed: 226 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2860,6 +2860,223 @@
28602860
"type": {
28612861
"kind": "enum",
28622862
"variants": [
2863+
{
2864+
"name": "Initialize"
2865+
},
2866+
{
2867+
"name": "AddValidatorToPool",
2868+
"fields": [
2869+
"u32"
2870+
]
2871+
},
2872+
{
2873+
"name": "RemoveValidatorFromPool"
2874+
},
2875+
{
2876+
"name": "DecreaseValidatorStake",
2877+
"fields": [
2878+
{
2879+
"name": "lamports",
2880+
"type": "u64"
2881+
},
2882+
{
2883+
"name": "transient_stake_seed",
2884+
"type": "u64"
2885+
}
2886+
]
2887+
},
2888+
{
2889+
"name": "IncreaseValidatorStake",
2890+
"fields": [
2891+
{
2892+
"name": "lamports",
2893+
"type": "u64"
2894+
},
2895+
{
2896+
"name": "transient_stake_seed",
2897+
"type": "u64"
2898+
}
2899+
]
2900+
},
2901+
{
2902+
"name": "SetPreferredValidator"
2903+
},
2904+
{
2905+
"name": "UpdateValidatorListBalance",
2906+
"fields": [
2907+
{
2908+
"name": "start_index",
2909+
"type": "u32"
2910+
},
2911+
{
2912+
"name": "no_merge",
2913+
"type": "bool"
2914+
}
2915+
]
2916+
},
2917+
{
2918+
"name": "UpdateStakePoolBalance"
2919+
},
2920+
{
2921+
"name": "CleanupRemovedValidatorEntries"
2922+
},
2923+
{
2924+
"name": "DepositStake"
2925+
},
2926+
{
2927+
"name": "WithdrawStake",
2928+
"fields": [
2929+
"u64"
2930+
]
2931+
},
2932+
{
2933+
"name": "SetManager"
2934+
},
2935+
{
2936+
"name": "SetFee"
2937+
},
2938+
{
2939+
"name": "SetStaker"
2940+
},
2941+
{
2942+
"name": "DepositSol",
2943+
"fields": [
2944+
"u64"
2945+
]
2946+
},
2947+
{
2948+
"name": "SetFundingAuthority"
2949+
},
2950+
{
2951+
"name": "WithdrawSol",
2952+
"fields": [
2953+
"u64"
2954+
]
2955+
},
2956+
{
2957+
"name": "CreateTokenMetadata",
2958+
"fields": [
2959+
{
2960+
"name": "name",
2961+
"type": "string"
2962+
},
2963+
{
2964+
"name": "symbol",
2965+
"type": "string"
2966+
},
2967+
{
2968+
"name": "uri",
2969+
"type": "string"
2970+
}
2971+
]
2972+
},
2973+
{
2974+
"name": "UpdateTokenMetadata",
2975+
"fields": [
2976+
{
2977+
"name": "name",
2978+
"type": "string"
2979+
},
2980+
{
2981+
"name": "symbol",
2982+
"type": "string"
2983+
},
2984+
{
2985+
"name": "uri",
2986+
"type": "string"
2987+
}
2988+
]
2989+
},
2990+
{
2991+
"name": "IncreaseAdditionalValidatorStake",
2992+
"fields": [
2993+
{
2994+
"name": "lamports",
2995+
"type": "u64"
2996+
},
2997+
{
2998+
"name": "transient_stake_seed",
2999+
"type": "u64"
3000+
},
3001+
{
3002+
"name": "ephemeral_stake_seed",
3003+
"type": "u64"
3004+
}
3005+
]
3006+
},
3007+
{
3008+
"name": "DecreaseAdditionalValidatorStake",
3009+
"fields": [
3010+
{
3011+
"name": "lamports",
3012+
"type": "u64"
3013+
},
3014+
{
3015+
"name": "transient_stake_seed",
3016+
"type": "u64"
3017+
},
3018+
{
3019+
"name": "ephemeral_stake_seed",
3020+
"type": "u64"
3021+
}
3022+
]
3023+
},
3024+
{
3025+
"name": "DecreaseValidatorStakeWithReserve",
3026+
"fields": [
3027+
{
3028+
"name": "lamports",
3029+
"type": "u64"
3030+
},
3031+
{
3032+
"name": "transient_stake_seed",
3033+
"type": "u64"
3034+
}
3035+
]
3036+
},
3037+
{
3038+
"name": "Redelegate",
3039+
"fields": [
3040+
{
3041+
"name": "lamports",
3042+
"type": "u64"
3043+
},
3044+
{
3045+
"name": "source_transient_stake_seed",
3046+
"type": "u64"
3047+
},
3048+
{
3049+
"name": "ephemeral_stake_seed",
3050+
"type": "u64"
3051+
},
3052+
{
3053+
"name": "destination_transient_stake_seed",
3054+
"type": "u64"
3055+
}
3056+
]
3057+
},
3058+
{
3059+
"name": "DepositStakeWithSlippage",
3060+
"fields": [
3061+
{
3062+
"name": "minimum_pool_tokens_out",
3063+
"type": "u64"
3064+
}
3065+
]
3066+
},
3067+
{
3068+
"name": "WithdrawStakeWithSlippage",
3069+
"fields": [
3070+
{
3071+
"name": "pool_tokens_in",
3072+
"type": "u64"
3073+
},
3074+
{
3075+
"name": "minimum_lamports_out",
3076+
"type": "u64"
3077+
}
3078+
]
3079+
},
28633080
{
28643081
"name": "DepositSolWithSlippage",
28653082
"fields": [
@@ -2874,9 +3091,16 @@
28743091
]
28753092
},
28763093
{
2877-
"name": "DepositSol",
3094+
"name": "WithdrawSolWithSlippage",
28783095
"fields": [
2879-
"u64"
3096+
{
3097+
"name": "pool_tokens_in",
3098+
"type": "u64"
3099+
},
3100+
{
3101+
"name": "minimum_lamports_out",
3102+
"type": "u64"
3103+
}
28803104
]
28813105
}
28823106
]

‎integration_tests/tests/fixtures/spl_stake_pool.rs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,13 @@ pub enum StakePoolInstruction {
5656
/// Maximum expected number of validators
5757
max_validators: u32,
5858
},
59+
AddValidatorToPool,
60+
RemoveValidatorFromPool,
61+
DecreaseValidatorStake,
62+
IncreaseValidatorStake,
63+
SetPreferredValidator,
64+
UpdateValidatorListBalance,
65+
5966
/// Updates total pool balance based on balances in the reserve and
6067
/// validator list
6168
///

‎integration_tests/tests/fixtures/stake_pool_client.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use solana_commitment_config::CommitmentLevel;
88
use solana_program::{borsh1::get_instance_packed_len, pubkey::Pubkey};
99
use solana_program_test::BanksClient;
1010
use solana_sdk::{
11+
borsh1::get_packed_len,
1112
signature::{Keypair, Signer},
1213
transaction::Transaction,
1314
};
@@ -154,7 +155,8 @@ impl StakePoolClient {
154155
&jito_tip_router_program::spl_stake_pool_id(),
155156
);
156157

157-
let packed_len = std::mem::size_of::<StakePool>();
158+
// TODO replace with get_packed_len with borsh upgrade. StakePool struct can be assumed static.
159+
let packed_len = 611;
158160
let create_pool_ix = system_instruction::create_account(
159161
&self.payer.pubkey(),
160162
&stake_pool.pubkey(),

0 commit comments

Comments
 (0)