Skip to content

fix(core): default to token_program_id from token account type if not found #345

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.

Sign up for GitHub

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

Merged
MicaiahReid merged 1 commit into from
Sep 29, 2025
Merged

fix(core): default to token_program_id from token account type if not found #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions crates/core/src/surfnet/locker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,11 +954,11 @@ impl SurfnetSvmLocker {

let token_programs = token_accounts_before
.iter()
.map(|(i, _)| {
.map(|(i, ta)| {
svm_reader
.get_account(&transaction_accounts[*i])
.unwrap()
.owner
.map(|a| a.owner)
.unwrap_or(ta.token_program_id())
})
.collect::<Vec<_>>()
.clone();
Expand Down
7 changes: 7 additions & 0 deletions crates/core/src/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,6 +564,13 @@ pub enum TokenAccount {
}

impl TokenAccount {
pub fn token_program_id(&self) -> Pubkey {
match self {
Self::SplToken2022(_) => spl_token_2022::id(),
Self::SplToken(_) => spl_token::id(),
}
}

pub fn unpack(bytes: &[u8]) -> SurfpoolResult<Self> {
if let Ok(account) = spl_token_2022::state::Account::unpack(bytes) {
Ok(Self::SplToken2022(account))
Expand Down