-
Notifications
You must be signed in to change notification settings - Fork 2k
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.
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
ci: Bump repo to Solana 1.17 #5575
Conversation
This is ready to go! Most of the commits are pretty simple in the end, but all required to avoid deprecated functions / fix new clippy lints. |
single-pool/program/src/error.rs
Outdated
#[error("WrongStakeStateV2")] | ||
WrongStakeStateV2, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#[error("WrongStakeStateV2")] | |
WrongStakeStateV2, | |
#[error("WrongStakeState")] | |
WrongStakeState, |
overzealous search/replace?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh, big time, thanks for noticing this and fixing it 🙏
single-pool/program/src/error.rs
Outdated
SinglePoolError::WrongStakeState => msg!("Error: Stake account is not in the state expected by the program."), | ||
SinglePoolError::WrongStakeStateV2 => msg!("Error: Stake account is not in the state expected by the program."), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
also here (github suggestions doesnt let me fix this...)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
actually ill just push my own commit, need to handle merge conflicts anyway
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for fixing this!
stake-pool/py/stake/state.py
Outdated
class StakeStateType(IntEnum): | ||
class StakeStateV2Type(IntEnum): | ||
"""Stake State Types.""" | ||
UNINITIALIZED = 0 | ||
INITIALIZED = 1 | ||
STAKE = 2 | ||
REWARDS_POOL = 3 | ||
|
||
|
||
class StakeState(NamedTuple): | ||
state_type: StakeStateType | ||
class StakeStateV2(NamedTuple): | ||
state_type: StakeStateV2Type |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
assuming this is also accidental because nothing about the definitions has changed at all...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok yes im sure about this because flags are not added to STAKE_STATE_LAYOUT
/STAKE_AND_META_LAYOUT
nor were they renamed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You're right, this is also incorrect
i rebased on master, the diff on token/cli/src/main.rs is spurious (because it shows the full commit that was in master), the only change to fix merge was this went one way and had to go back the other way (or something):
to wit:
|
Problem
The 1.17 crates are out, but SPL is still on 1.16.
Solution
Bump everything and fix things up as they arise!