gavindiaz/sol-trade-sdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Replace global address lookup table cache with direct fetch approach

Browse Source 
Replace the global AddressLookupTableCache with a direct fetch function to simplify address lookup table management. This change improves code maintainability by removing global state and makes the API more explicit.

Key changes:
- Remove AddressLookupTableCache and AddressLookupManager
- Add new fetch_address_lookup_table_account function
- Update TradeBuyParams and TradeSellParams to use AddressLookupTableAccount instead of Pubkey
- Update all examples to use the new direct fetch approach
- Update documentation to reflect the simplified workflow
This commit is contained in:
ysq
2025-10-07 20:56:02 +08:00
parent 2e7b9819d3
commit 2d9976368b
35 changed files with 168 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/address_lookup/src/main.rs
+4 -17
View File
@@ -1,5 +1,4 @@
use sol_trade_sdk::common::address_lookup_cache::AddressLookupTableCache;
use sol_trade_sdk::common::SolanaRpcClient;
use sol_trade_sdk::common::address_lookup::fetch_address_lookup_table_account;
use sol_trade_sdk::common::TradeConfig;
use sol_trade_sdk::{
common::AnyResult,
@@ -97,18 +96,6 @@ fn create_event_callback() -> impl Fn(Box<dyn UnifiedEvent>) {
}
}
/// Setup lookup table cache
async fn setup_lookup_table_cache(
client: Arc<SolanaRpcClient>,
lookup_table_address: Pubkey,
) -> AnyResult<()> {
AddressLookupTableCache::get_instance()
.set_address_lookup_table(client, &lookup_table_address)
.await
.map_err(|e| anyhow::anyhow!("Failed to set address lookup table: {}", e))?;
Ok(())
}
/// Create SolanaTrade client
/// Initializes a new SolanaTrade client with configuration
async fn create_solana_trade_client() -> AnyResult<SolanaTrade> {
@@ -136,8 +123,8 @@ async fn pumpfun_copy_trade_with_grpc(trade_info: PumpFunTradeEvent) -> AnyResul
let recent_blockhash = client.rpc.get_latest_blockhash().await?;
let lookup_table_key = Pubkey::from_str("use_your_lookup_table_key_here").unwrap();
// Setup lookup table cache
setup_lookup_table_cache(client.rpc.clone(), lookup_table_key).await?;
let address_lookup_table_account =
fetch_address_lookup_table_account(&client.rpc, &lookup_table_key).await.ok();
// Buy tokens
println!("Buying tokens from PumpFun...");
@@ -161,7 +148,7 @@ async fn pumpfun_copy_trade_with_grpc(trade_info: PumpFunTradeEvent) -> AnyResul
trade_info.real_sol_reserves,
None,
)),
lookup_table_key: Some(lookup_table_key), // you still need to update the AddressLookupTableCache
address_lookup_table_account: address_lookup_table_account,
wait_transaction_confirmed: true,
create_input_token_ata: false,
close_input_token_ata: false,
examples/bonk_copy_trading/src/main.rs
+2 -2
View File
@@ -156,7 +156,7 @@ async fn bonk_copy_trade_with_grpc(trade_info: BonkTradeEvent) -> AnyResult<()>
trade_info.creator_associated_account,
trade_info.global_config,
)),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
create_input_token_ata: true,
close_input_token_ata: false,
@@ -199,7 +199,7 @@ async fn bonk_copy_trade_with_grpc(trade_info: BonkTradeEvent) -> AnyResult<()>
trade_info.creator_associated_account,
trade_info.global_config,
)),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
open_seed_optimize: false,
with_tip: false,
examples/bonk_sniper_trading/src/main.rs
+2 -2
View File
@@ -126,7 +126,7 @@ async fn bonk_sniper_trade_with_shreds(trade_info: BonkTradeEvent) -> AnyResult<
trade_info.creator_associated_account,
trade_info.global_config,
)),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
create_input_token_ata: true,
close_input_token_ata: true,
@@ -162,7 +162,7 @@ async fn bonk_sniper_trade_with_shreds(trade_info: BonkTradeEvent) -> AnyResult<
trade_info.creator_associated_account,
trade_info.global_config,
)),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
create_output_token_ata: true,
close_output_token_ata: true,
examples/cli_trading/src/main.rs
+10 -10
View File
@@ -622,7 +622,7 @@ async fn handle_buy_pumpfun(
slippage_basis_points: slippage,
recent_blockhash: Some(recent_blockhash),
extension_params: Box::new(param),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
create_input_token_ata: false,
close_input_token_ata: false,
@@ -672,7 +672,7 @@ async fn handle_buy_pumpswap(
slippage_basis_points: slippage,
recent_blockhash: Some(recent_blockhash),
extension_params: Box::new(param),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
create_input_token_ata: true,
close_input_token_ata: false,
@@ -721,7 +721,7 @@ async fn handle_buy_bonk(
slippage_basis_points: slippage,
recent_blockhash: Some(recent_blockhash),
extension_params: Box::new(param),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
create_input_token_ata: true,
close_input_token_ata: false,
@@ -774,7 +774,7 @@ async fn handle_buy_raydium_v4(
slippage_basis_points: slippage,
recent_blockhash: Some(recent_blockhash),
extension_params: Box::new(param),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
create_input_token_ata: true,
close_input_token_ata: false,
@@ -827,7 +827,7 @@ async fn handle_buy_raydium_cpmm(
slippage_basis_points: slippage,
recent_blockhash: Some(recent_blockhash),
extension_params: Box::new(param),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
create_input_token_ata: true,
close_input_token_ata: false,
@@ -991,7 +991,7 @@ async fn handle_sell_pumpfun(
recent_blockhash: Some(recent_blockhash),
with_tip: false,
extension_params: Box::new(param),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
create_output_token_ata: true,
close_output_token_ata: false,
@@ -1044,7 +1044,7 @@ async fn handle_sell_pumpswap(
recent_blockhash: Some(recent_blockhash),
with_tip: false,
extension_params: Box::new(param),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
create_output_token_ata: true,
close_output_token_ata: false,
@@ -1096,7 +1096,7 @@ async fn handle_sell_bonk(
recent_blockhash: Some(recent_blockhash),
with_tip: false,
extension_params: Box::new(param),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
create_output_token_ata: true,
close_output_token_ata: false,
@@ -1151,7 +1151,7 @@ async fn handle_sell_raydium_v4(
recent_blockhash: Some(recent_blockhash),
with_tip: false,
extension_params: Box::new(param),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
create_output_token_ata: true,
close_output_token_ata: false,
@@ -1206,7 +1206,7 @@ async fn handle_sell_raydium_cpmm(
recent_blockhash: Some(recent_blockhash),
with_tip: false,
extension_params: Box::new(param),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
create_output_token_ata: true,
close_output_token_ata: false,
examples/meteora_damm_v2_direct_trading/src/main.rs
+2 -2
View File
@@ -35,7 +35,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
extension_params: Box::new(
MeteoraDammV2Params::from_pool_address_by_rpc(&client.rpc, &pool).await?,
),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
create_input_token_ata: true,
close_input_token_ata: true,
@@ -67,7 +67,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
extension_params: Box::new(
MeteoraDammV2Params::from_pool_address_by_rpc(&client.rpc, &pool).await?,
),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
create_output_token_ata: true,
close_output_token_ata: true,
examples/middleware_system/src/main.rs
+1 -1
View File
@@ -92,7 +92,7 @@ async fn test_middleware() -> AnyResult<()> {
extension_params: Box::new(
PumpSwapParams::from_pool_address_by_rpc(&client.rpc, &pool_address).await?,
),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
create_input_token_ata: true,
close_input_token_ata: true,
examples/nonce_cache/src/main.rs
+1 -1
View File
@@ -148,7 +148,7 @@ async fn pumpfun_copy_trade_with_grpc(trade_info: PumpFunTradeEvent) -> AnyResul
trade_info.real_sol_reserves,
None,
)),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
create_input_token_ata: false,
close_input_token_ata: false,
examples/pumpfun_copy_trading/src/main.rs
+2 -2
View File
@@ -144,7 +144,7 @@ async fn pumpfun_copy_trade_with_grpc(trade_info: PumpFunTradeEvent) -> AnyResul
trade_info.real_sol_reserves,
None,
)),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
create_input_token_ata: false,
close_input_token_ata: false,
@@ -186,7 +186,7 @@ async fn pumpfun_copy_trade_with_grpc(trade_info: PumpFunTradeEvent) -> AnyResul
trade_info.real_sol_reserves,
Some(true),
)),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
create_output_token_ata: false,
close_output_token_ata: false,
examples/pumpfun_sniper_trading/src/main.rs
+2 -2
View File
@@ -110,7 +110,7 @@ async fn pumpfun_sniper_trade_with_shreds(trade_info: PumpFunTradeEvent) -> AnyR
trade_info.creator_vault,
None,
)),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
create_input_token_ata: true,
close_input_token_ata: true,
@@ -141,7 +141,7 @@ async fn pumpfun_sniper_trade_with_shreds(trade_info: PumpFunTradeEvent) -> AnyR
recent_blockhash: Some(recent_blockhash),
with_tip: false,
extension_params: Box::new(PumpFunParams::immediate_sell(trade_info.creator_vault, true)),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
create_output_token_ata: true,
close_output_token_ata: true,
examples/pumpswap_direct_trading/src/main.rs
+2 -2
View File
@@ -35,7 +35,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
extension_params: Box::new(
PumpSwapParams::from_pool_address_by_rpc(&client.rpc, &pool).await?,
),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
create_input_token_ata: true,
close_input_token_ata: true,
@@ -66,7 +66,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
extension_params: Box::new(
PumpSwapParams::from_pool_address_by_rpc(&client.rpc, &pool).await?,
),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
create_output_token_ata: true,
close_output_token_ata: true,
examples/pumpswap_trading/src/main.rs
+2 -2
View File
@@ -194,7 +194,7 @@ async fn pumpswap_trade_with_grpc(mint_pubkey: Pubkey, params: PumpSwapParams) -
slippage_basis_points: slippage_basis_points,
recent_blockhash: Some(recent_blockhash),
extension_params: Box::new(params.clone()),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
create_input_token_ata: true,
close_input_token_ata: true,
@@ -227,7 +227,7 @@ async fn pumpswap_trade_with_grpc(mint_pubkey: Pubkey, params: PumpSwapParams) -
recent_blockhash: Some(recent_blockhash),
with_tip: false,
extension_params: Box::new(params.clone()),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
create_output_token_ata: true,
close_output_token_ata: true,
examples/raydium_amm_v4_trading/src/main.rs
+2 -2
View File
@@ -150,7 +150,7 @@ async fn raydium_amm_v4_copy_trade_with_grpc(trade_info: RaydiumAmmV4SwapEvent)
slippage_basis_points: slippage_basis_points,
recent_blockhash: Some(recent_blockhash),
extension_params: Box::new(params),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
create_input_token_ata: true,
close_input_token_ata: true,
@@ -182,7 +182,7 @@ async fn raydium_amm_v4_copy_trade_with_grpc(trade_info: RaydiumAmmV4SwapEvent)
recent_blockhash: Some(recent_blockhash),
with_tip: false,
extension_params: Box::new(params),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
create_output_token_ata: true,
close_output_token_ata: true,
examples/raydium_cpmm_trading/src/main.rs
+2 -2
View File
@@ -141,7 +141,7 @@ async fn raydium_cpmm_copy_trade_with_grpc(trade_info: RaydiumCpmmSwapEvent) ->
slippage_basis_points: slippage_basis_points,
recent_blockhash: Some(recent_blockhash),
extension_params: Box::new(buy_params),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
create_input_token_ata: true,
close_input_token_ata: true,
@@ -175,7 +175,7 @@ async fn raydium_cpmm_copy_trade_with_grpc(trade_info: RaydiumCpmmSwapEvent) ->
recent_blockhash: Some(recent_blockhash),
with_tip: false,
extension_params: Box::new(sell_params),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
create_output_token_ata: true,
close_output_token_ata: true,
examples/seed_trading/src/main.rs
+2 -2
View File
@@ -34,7 +34,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
extension_params: Box::new(
PumpSwapParams::from_pool_address_by_rpc(&client.rpc, &pool).await?,
),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
create_input_token_ata: true,
close_input_token_ata: true,
@@ -73,7 +73,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
extension_params: Box::new(
PumpSwapParams::from_pool_address_by_rpc(&client.rpc, &pool).await?,
),
lookup_table_key: None,
address_lookup_table_account: None,
wait_transaction_confirmed: true,
create_output_token_ata: true,
close_output_token_ata: true,