Update advance_nonce_account.rs #271
Conversation
sonicfromnewyoke
left a comment
sonicfromnewyoke
left a comment
There was a problem hiding this comment.
good catch, system program uses u32 le as discriminator
also, would you mind updating upgrade_nonce_account.rs and making the same change?
| program_id: &crate::ID, | ||
| accounts: &account_metas, | ||
| data: &[4], | ||
| data: &DATA, |
There was a problem hiding this comment.
maybe this way will be simpler?
| data: &DATA, | |
| data: &[4, 0, 0, 0], |
There was a problem hiding this comment.
true haha, just made a new commit with the change and also updated upgrade_nonce_account.rs
|
|
||
| // instruction | ||
| // instruction data uses 4-byte LE discriminator expected by the system program | ||
| const DATA: [u8; 4] = [4, 0, 0, 0]; |
There was a problem hiding this comment.
use this array directly
| const DATA: [u8; 4] = [4, 0, 0, 0]; |
| ]; | ||
|
|
||
| // instruction | ||
| // instruction data uses 4-byte LE discriminator expected by the system program |
There was a problem hiding this comment.
nit: Could we keep the existing comment? I think it is a bit redundant to have it on every instruction and other don't have it.
| let account_metas: [AccountMeta; 1] = [AccountMeta::writable(self.account.key())]; | ||
|
|
||
| // instruction | ||
| // instruction data uses 4-byte LE discriminator expected by the system program |
There was a problem hiding this comment.
nit: Same here, could we keep the existing comment?
There was a problem hiding this comment.
Yup, just pushed the new commit to keep the existing comment
febo
left a comment
febo
left a comment
There was a problem hiding this comment.
This is great, thank you! I will fix the CI issue so we can get this merged.
|
@dedeleono If you rebase the PR, CI should be able to run. |
- Using array slices directly
dedeleono
force-pushed
the
advance_nonce_account_fix
branch
from
6991914 to
e892ebe
Compare
Nice, just did! @febo |
3 participants
This update builds the instruction with a const [4, 0, 0, 0] payload, ensuring the System Program receives the 4-byte little-endian discriminator it expects. This prevents the invalid instruction data errors previously occurring.
Ref: Issue #270