Skip to content

fix: Forward fix for swap instruction breaking change #21

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
denys-cb merged 4 commits into from
Sep 10, 2026
Merged

fix: Forward fix for swap instruction breaking change #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0d0b4c7
readd whitelist
OliverCai0 Sep 10, 2026
020de94
adjust lib
OliverCai0 Sep 10, 2026
933339e
Change to UncheckedAccount
OliverCai0 Sep 10, 2026
2d91c1d
delete test file
OliverCai0 Sep 10, 2026
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
3 changes: 3 additions & 0 deletions solana/programs/stable-swapper/src/constants.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,6 @@ pub const TOKEN_VAULT_SEED: &[u8] = b"token_vault";

/// Seed for vault token account PDA
pub const VAULT_TOKEN_ACCOUNT_SEED: &[u8] = b"vault_token_account";

/// Seed for address whitelist PDA
pub const ADDRESS_WHITELIST_SEED: &[u8] = b"address_whitelist";
20 changes: 16 additions & 4 deletions solana/programs/stable-swapper/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ use utils::*;

declare_id!("pqgqKahpG1y2wsgxFhzaAnkV1cL9vk8MSg9qm4q646F");

// NOTE: The previously deployed whitelist PDA (seeded b"address_whitelist") is orphaned
// on devnet/mainnet after whitelist removal. Its rent is intentionally forfeited; adding a
// close_whitelist instruction is not worth the complexity for the small amount involved.

#[program]
pub mod stable_swapper {
use super::*;
Expand Down Expand Up @@ -173,6 +169,11 @@ pub mod stable_swapper {
require!(amount_in > 0, LiquidityError::InvalidAmount);
require!(min_amount_out > 0, LiquidityError::InvalidAmount);

// Whitelist enforcement is permanently deprecated. `whitelist` stays in this
// instruction's account list (see the field below) purely so already-encoded
// callers/indexers built against the pre-deprecation `swap` signature keep working;
// nothing reads or writes it anymore.

// Check that neither token is disabled
require!(
!ctx.accounts.in_vault.disabled,
Expand Down Expand Up @@ -907,6 +908,17 @@ pub struct Swap<'info> {
#[account(mut)]
pub user: Signer<'info>,

/// Deprecated whitelist PDA. Kept only so the account list matches the
/// pre-deprecation `swap` signature that existing callers/indexers already encode;
/// its data is never read. On mainnet this resolves to the orphaned whitelist account
/// left behind by the original removal; on fresh deployments it need not exist at all.
/// CHECK: seeds-verified PDA address only; deliberately not deserialized.
#[account(
seeds = [ADDRESS_WHITELIST_SEED],
bump
)]
pub whitelist: UncheckedAccount<'info>,

pub token_program: Program<'info, Token>,
pub associated_token_program: Program<'info, AssociatedToken>,
pub system_program: Program<'info, System>,
Expand Down
Loading