blockworks-foundation
/
autobahn
mirror of https://github.com/blockworks-foundation/autobahn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix invariant token 2022

This commit is contained in:
none00y 2024-11-06 19:19:56 +01:00
parent 44c791a274
commit 4e699e6546
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/dex-invariant/src/invariant_dex.rs
View File

@ -4,10 +4,7 @@ use std::{
};
use anchor_lang::{AnchorDeserialize, Id};
use anchor_spl::{
token::spl_token::{self, state::AccountState},
token_2022::Token2022,
};
use anchor_spl::{token::spl_token::{self, state::AccountState}, token_2022::Token2022};
use anyhow::{Context, Ok};
use async_trait::async_trait;
use invariant_types::{
@ -246,8 +243,7 @@ impl DexInterface for InvariantDex {
let banned_reserves = vaults
.iter()
.filter(|(_, reserve)| {
reserve.owner == Token2022::id()
|| spl_token::state::Account::unpack(reserve.data())
spl_token::state::Account::unpack(reserve.data())
.unwrap()
.state
== AccountState::Frozen

12
lib/dex-invariant/src/invariant_ix_builder.rs
View File

@ -1,12 +1,13 @@
use crate::internal::accounts::{InvariantSwapAccounts, InvariantSwapParams};
use crate::invariant_edge::{InvariantEdge, InvariantEdgeIdentifier, InvariantSimulationParams};
use anchor_spl::associated_token::get_associated_token_address;
use anchor_spl::associated_token::get_associated_token_address_with_program_id;
use anyhow::Context;
use invariant_types::math::{get_max_sqrt_price, get_min_sqrt_price};
use router_lib::dex::{AccountProviderView, DexEdgeIdentifier, SwapInstruction};
use sha2::{Digest, Sha256};
use solana_program::instruction::Instruction;
use solana_program::pubkey::Pubkey;
use solana_sdk::account::ReadableAccount;
pub fn build_swap_ix(
id: &InvariantEdgeIdentifier,
@ -21,9 +22,14 @@ pub fn build_swap_ix(
let (source_mint, destination_mint) = (id.input_mint(), id.output_mint());
let source_acc = chain_data.account(&source_mint)?.account;
let dest_acc = chain_data.account(&destination_mint)?.account;
let source_owner = source_acc.owner();
let destination_owner = dest_acc.owner();
let (source_account, destination_account) = (
get_associated_token_address(wallet_pk, &source_mint),
get_associated_token_address(wallet_pk, &destination_mint),
get_associated_token_address_with_program_id(wallet_pk, &source_mint, &source_owner),
get_associated_token_address_with_program_id(wallet_pk, &destination_mint, &destination_owner)
);
let sqrt_price_limit = if id.x_to_y {