|
6 | 6 | },
|
7 | 7 | pinocchio::{
|
8 | 8 | account_info::AccountInfo,
|
9 |
| - entrypoint::deserialize, |
| 9 | + entrypoint::{deserialize, NON_DUP_MARKER}, |
| 10 | + hint::likely, |
10 | 11 | log::sol_log,
|
11 | 12 | no_allocator, nostd_panic_handler,
|
12 | 13 | program_error::{ProgramError, ToStr},
|
|
15 | 16 | pinocchio_token_interface::{
|
16 | 17 | error::TokenError,
|
17 | 18 | instruction::TokenInstruction,
|
18 |
| - likely, |
19 | 19 | state::{account::Account, mint::Mint, Transmutable},
|
20 | 20 | },
|
21 | 21 | };
|
@@ -115,11 +115,11 @@ pub unsafe extern "C" fn entrypoint(input: *mut u8) -> u64 {
|
115 | 115 | // and discriminator equal to 12.
|
116 | 116 | if *input == 4
|
117 | 117 | && (*input.add(ACCOUNT1_DATA_LEN).cast::<u64>() == Account::LEN as u64)
|
118 |
| - && (*input.add(ACCOUNT2_HEADER_OFFSET) == 255) |
| 118 | + && (*input.add(ACCOUNT2_HEADER_OFFSET) == NON_DUP_MARKER) |
119 | 119 | && (*input.add(ACCOUNT2_DATA_LEN).cast::<u64>() == Mint::LEN as u64)
|
120 |
| - && (*input.add(IX12_ACCOUNT3_HEADER_OFFSET) == 255) |
| 120 | + && (*input.add(IX12_ACCOUNT3_HEADER_OFFSET) == NON_DUP_MARKER) |
121 | 121 | && (*input.add(IX12_ACCOUNT3_DATA_LEN).cast::<u64>() == Account::LEN as u64)
|
122 |
| - && (*input.add(IX12_ACCOUNT4_HEADER_OFFSET) == 255) |
| 122 | + && (*input.add(IX12_ACCOUNT4_HEADER_OFFSET) == NON_DUP_MARKER) |
123 | 123 | {
|
124 | 124 | // The `authority` account can have variable data length.
|
125 | 125 | let account_4_data_len_aligned =
|
@@ -170,9 +170,9 @@ pub unsafe extern "C" fn entrypoint(input: *mut u8) -> u64 {
|
170 | 170 | // and discriminator equal to 3.
|
171 | 171 | else if *input == 3
|
172 | 172 | && (*input.add(ACCOUNT1_DATA_LEN).cast::<u64>() == Account::LEN as u64)
|
173 |
| - && (*input.add(ACCOUNT2_HEADER_OFFSET) == 255) |
| 173 | + && (*input.add(ACCOUNT2_HEADER_OFFSET) == NON_DUP_MARKER) |
174 | 174 | && (*input.add(ACCOUNT2_DATA_LEN).cast::<u64>() == Account::LEN as u64)
|
175 |
| - && (*input.add(IX3_ACCOUNT3_HEADER_OFFSET) == 255) |
| 175 | + && (*input.add(IX3_ACCOUNT3_HEADER_OFFSET) == NON_DUP_MARKER) |
176 | 176 | {
|
177 | 177 | // The `authority` account can have variable data length.
|
178 | 178 | let account_3_data_len_aligned =
|
|
0 commit comments