replace solana-inline-spl with spl-generic-token #5805
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1219,7 +1219,7 @@ impl<T: IndexValue, U: DiskIndexValue + From<T> + Into<T>> AccountsIndex<T, U> { | |
| .unwrap_or(0) | ||
| } | ||
|
|
||
| fn update_spl_token_secondary_indexes<G: spl_generic_token::token::GenericTokenAccount>( | ||
|
Member
Author
There was a problem hiding this comment. @brooksprumo we talked about this in dms and agreed its fine from a consensus perspective since it only affects rpc but if you could sign off on this specifically, the new token account parser is more strict and requires token accounts to have been initialized (ie initialized or frozen states). the changed tests show the effect this has. this is a straightforward bugfix, so this is correct to do, and correct to do with no feature gate if the secondary indexes are not used for runtime account loading There was a problem hiding this comment. Looks good to me, thanks for the fix! |
||
| &self, | ||
| token_id: &Pubkey, | ||
| pubkey: &Pubkey, | ||
|
|
@@ -1310,15 +1310,15 @@ impl<T: IndexValue, U: DiskIndexValue + From<T> + Into<T>> AccountsIndex<T, U> { | |
| // (as persisted tombstone for snapshots). This will then ultimately be | ||
| // filtered out by post-scan filters, like in `get_filtered_spl_token_accounts_by_owner()`. | ||
|
|
||
| self.update_spl_token_secondary_indexes::<spl_generic_token::token::Account>( | ||
| &spl_generic_token::token::id(), | ||
| pubkey, | ||
| account_owner, | ||
| account_data, | ||
| account_indexes, | ||
| ); | ||
| self.update_spl_token_secondary_indexes::<spl_generic_token::token_2022::Account>( | ||
| &spl_generic_token::token_2022::id(), | ||
| pubkey, | ||
| account_owner, | ||
| account_data, | ||
|
|
@@ -1752,19 +1752,14 @@ pub mod tests { | |
| crate::bucket_map_holder::{AtomicAge, BucketMapHolder}, | ||
| account_map_entry::AccountMapEntryMeta, | ||
| solana_account::{AccountSharedData, WritableAccount}, | ||
| solana_pubkey::PUBKEY_BYTES, | ||
| spl_generic_token::{spl_token_ids, token::SPL_TOKEN_ACCOUNT_OWNER_OFFSET}, | ||
| std::ops::{ | ||
| Bound::{Excluded, Included, Unbounded}, | ||
| RangeInclusive, | ||
| }, | ||
| }; | ||
|
|
||
| pub enum SecondaryIndexTypes<'a> { | ||
| RwLock(&'a SecondaryIndex<RwLockSecondaryIndexEntry>), | ||
| DashMap(&'a SecondaryIndex<DashMapSecondaryIndexEntry>), | ||
|
|
@@ -3055,7 +3050,10 @@ pub mod tests { | |
| } | ||
|
|
||
| fn make_empty_token_account_data() -> Vec<u8> { | ||
| const SPL_TOKEN_INITIALIZED_OFFSET: usize = 108; | ||
| let mut data = vec![0; spl_generic_token::token::Account::get_packed_len()]; | ||
| data[SPL_TOKEN_INITIALIZED_OFFSET] = 1; | ||
| data | ||
| } | ||
|
|
||
| fn run_test_purge_exact_secondary_index< | ||
|
|
@@ -3085,7 +3083,7 @@ pub mod tests { | |
| &AccountSharedData::create( | ||
| 0, | ||
| account_data.to_vec(), | ||
| spl_generic_token::token::id(), | ||
| false, | ||
| 0, | ||
| ), | ||
|
|
@@ -3347,7 +3345,7 @@ pub mod tests { | |
| fn test_spl_token_mint_secondary_index() { | ||
| let (key_start, key_end, secondary_indexes) = create_spl_token_mint_secondary_index_state(); | ||
| let index = AccountsIndex::<bool, bool>::default_for_tests(); | ||
| for token_id in &spl_token_ids() { | ||
| run_test_spl_token_secondary_indexes( | ||
| token_id, | ||
| &index, | ||
|
|
@@ -3364,7 +3362,7 @@ pub mod tests { | |
| let (key_start, key_end, secondary_indexes) = | ||
| create_spl_token_owner_secondary_index_state(); | ||
| let index = AccountsIndex::<bool, bool>::default_for_tests(); | ||
| for token_id in &spl_token_ids() { | ||
| run_test_spl_token_secondary_indexes( | ||
| token_id, | ||
| &index, | ||
|
|
@@ -3469,7 +3467,7 @@ pub mod tests { | |
| fn test_spl_token_mint_secondary_index_same_slot_and_forks() { | ||
| let (key_start, key_end, account_index) = create_spl_token_mint_secondary_index_state(); | ||
| let index = AccountsIndex::<bool, bool>::default_for_tests(); | ||
| for token_id in &spl_token_ids() { | ||
| run_test_secondary_indexes_same_slot_and_forks( | ||
| token_id, | ||
| &index, | ||
|
|
@@ -3485,7 +3483,7 @@ pub mod tests { | |
| fn test_rwlock_secondary_index_same_slot_and_forks() { | ||
| let (key_start, key_end, account_index) = create_spl_token_owner_secondary_index_state(); | ||
| let index = AccountsIndex::<bool, bool>::default_for_tests(); | ||
| for token_id in &spl_token_ids() { | ||
| run_test_secondary_indexes_same_slot_and_forks( | ||
| token_id, | ||
| &index, | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
we
pub usethese to avoid a breaking change becausesolana-account-decoderis a crate that (unlikesolana-inline-spl) is very reasonable for downstream projects to include