From 312a675a403ace45c420d07d558eaa09685dd2a1 Mon Sep 17 00:00:00 2001 From: ysq Date: Fri, 10 Oct 2025 18:19:44 +0800 Subject: [PATCH] refactor: restructure event handling from trait objects to enum pattern - Convert UnifiedEvent from trait object (Box) to concrete enum type - Remove match_event! macro in favor of native match expressions - Simplify event metadata access: event.event_type() -> event.metadata().event_type - Unify event callback signatures: Fn(Box) -> Fn(UnifiedEvent) - Update all example code to use the new enum-based event system - Optimize type system to reduce runtime overhead and improve type safety Affected scope: - Core event parser and processor - All protocol event definitions (PumpFun, PumpSwap, Bonk, Raydium series, etc.) - gRPC and Shred streaming modules - All example code --- examples/dynamic_subscription.rs | 16 +- examples/grpc_example.rs | 231 ++----------- .../mint_all_ata_account_listen_example.rs | 33 +- examples/nonce_listen_example.rs | 6 +- examples/parse_tx_events.rs | 2 +- .../pumpswap_pool_account_listen_example.rs | 31 +- examples/shred_example.rs | 210 +----------- examples/token_balance_listen_example.rs | 4 +- examples/token_decimals_listen_example.rs | 31 +- src/streaming/common/config.rs | 76 +---- src/streaming/common/event_processor.rs | 303 +++--------------- src/streaming/common/metrics.rs | 282 +++++++--------- src/streaming/event_parser/common/mod.rs | 77 +---- src/streaming/event_parser/common/types.rs | 184 +++++------ .../event_parser/core/account_event_parser.rs | 34 +- .../event_parser/core/common_event_parser.rs | 6 +- .../event_parser/core/event_parser.rs | 170 +++++----- src/streaming/event_parser/core/traits.rs | 216 ++++++++++--- src/streaming/event_parser/mod.rs | 36 +-- .../protocols/block/block_meta_event.rs | 4 - .../event_parser/protocols/bonk/events.rs | 79 +++-- .../event_parser/protocols/bonk/parser.rs | 47 ++- .../event_parser/protocols/bonk/types.rs | 15 +- .../event_parser/protocols/pumpfun/events.rs | 88 +++-- .../event_parser/protocols/pumpfun/parser.rs | 34 +- .../event_parser/protocols/pumpfun/types.rs | 11 +- .../event_parser/protocols/pumpswap/events.rs | 229 +++++++------ .../event_parser/protocols/pumpswap/parser.rs | 52 ++- .../event_parser/protocols/pumpswap/types.rs | 15 +- .../protocols/raydium_amm_v4/events.rs | 9 +- .../protocols/raydium_amm_v4/parser.rs | 24 +- .../protocols/raydium_amm_v4/types.rs | 7 +- .../protocols/raydium_clmm/events.rs | 13 +- .../protocols/raydium_clmm/parser.rs | 96 +++--- .../protocols/raydium_clmm/types.rs | 36 +-- .../protocols/raydium_cpmm/events.rs | 8 +- .../protocols/raydium_cpmm/parser.rs | 20 +- .../protocols/raydium_cpmm/types.rs | 14 +- src/streaming/grpc/mod.rs | 3 +- src/streaming/shred/connection.rs | 35 +- src/streaming/shred/mod.rs | 3 +- src/streaming/shred_stream.rs | 11 +- src/streaming/yellowstone_grpc.rs | 51 +-- 43 files changed, 1013 insertions(+), 1839 deletions(-) diff --git a/examples/dynamic_subscription.rs b/examples/dynamic_subscription.rs index d6e84f9..bdae3a0 100644 --- a/examples/dynamic_subscription.rs +++ b/examples/dynamic_subscription.rs @@ -31,10 +31,10 @@ async fn main() -> Result<()> { let counter = event_counter.clone(); let callback = - move |event: Box| { + move |event: solana_streamer_sdk::streaming::event_parser::UnifiedEvent| { let count = counter.fetch_add(1, Ordering::Relaxed); - let protocol = match event.event_type() { + let protocol = match event.metadata().event_type { EventType::PumpFunBuy | EventType::PumpFunSell => "PumpFun", EventType::RaydiumCpmmSwapBaseInput | EventType::RaydiumCpmmSwapBaseOutput => { "RaydiumCpmm" @@ -42,7 +42,7 @@ async fn main() -> Result<()> { _ => "Unknown", }; - println!("Event #{}: {:11} - {:.8}...", count + 1, protocol, event.signature()); + println!("Event #{}: {:11} - {:.8}...", count + 1, protocol, event.metadata().signature); }; println!("\n=== Phase 1: PumpFun only ==="); @@ -254,7 +254,7 @@ async fn main() -> Result<()> { let shutdown_event_counter = Arc::new(AtomicU64::new(0)); let shutdown_counter = shutdown_event_counter.clone(); let shutdown_callback = - move |_event: Box| { + move |_event: solana_streamer_sdk::streaming::event_parser::UnifiedEvent| { shutdown_counter.fetch_add(1, Ordering::Relaxed); }; @@ -327,7 +327,7 @@ async fn main() -> Result<()> { println!("\n=== Subscription enforcement ==="); let test_callback = - |_event: Box| {}; + |_event: solana_streamer_sdk::streaming::event_parser::UnifiedEvent| {}; match client .subscribe_events_immediate( @@ -358,7 +358,7 @@ async fn main() -> Result<()> { let client2_counter = Arc::new(AtomicU64::new(0)); let counter2 = client2_counter.clone(); let client2_callback = - move |_event: Box| { + move |_event: solana_streamer_sdk::streaming::event_parser::UnifiedEvent| { counter2.fetch_add(1, Ordering::Relaxed); }; @@ -390,7 +390,7 @@ async fn main() -> Result<()> { println!("\n=== Advanced subscription enforcement ==="); let test_callback_advanced = - |_event: Box| {}; + |_event: solana_streamer_sdk::streaming::event_parser::UnifiedEvent| {}; let client3 = Arc::new(YellowstoneGrpc::new(GRPC_ENDPOINT.to_string(), API_KEY.map(|s| s.to_string()))?); @@ -447,7 +447,7 @@ async fn main() -> Result<()> { let client4_counter = Arc::new(AtomicU64::new(0)); let counter4 = client4_counter.clone(); let client4_callback = - move |_event: Box| { + move |_event: solana_streamer_sdk::streaming::event_parser::UnifiedEvent| { counter4.fetch_add(1, Ordering::Relaxed); }; diff --git a/examples/grpc_example.rs b/examples/grpc_example.rs index b904628..2af1f60 100644 --- a/examples/grpc_example.rs +++ b/examples/grpc_example.rs @@ -1,52 +1,17 @@ -use solana_streamer_sdk::{ - match_event, - streaming::{ - event_parser::{ - common::EventType, - core::account_event_parser::{NonceAccountEvent, TokenAccountEvent, TokenInfoEvent}, - protocols::{ - bonk::{ - parser::BONK_PROGRAM_ID, BonkGlobalConfigAccountEvent, BonkMigrateToAmmEvent, - BonkMigrateToCpswapEvent, BonkPlatformConfigAccountEvent, BonkPoolCreateEvent, - BonkPoolStateAccountEvent, BonkTradeEvent, - }, - pumpfun::{ - parser::PUMPFUN_PROGRAM_ID, PumpFunBondingCurveAccountEvent, - PumpFunCreateTokenEvent, PumpFunGlobalAccountEvent, PumpFunMigrateEvent, - PumpFunTradeEvent, - }, - pumpswap::{ - parser::PUMPSWAP_PROGRAM_ID, PumpSwapBuyEvent, PumpSwapCreatePoolEvent, - PumpSwapDepositEvent, PumpSwapGlobalConfigAccountEvent, - PumpSwapPoolAccountEvent, PumpSwapSellEvent, PumpSwapWithdrawEvent, - }, - raydium_amm_v4::{ - parser::RAYDIUM_AMM_V4_PROGRAM_ID, RaydiumAmmV4AmmInfoAccountEvent, - RaydiumAmmV4DepositEvent, RaydiumAmmV4Initialize2Event, RaydiumAmmV4SwapEvent, - RaydiumAmmV4WithdrawEvent, RaydiumAmmV4WithdrawPnlEvent, - }, - raydium_clmm::{ - parser::RAYDIUM_CLMM_PROGRAM_ID, RaydiumClmmAmmConfigAccountEvent, - RaydiumClmmClosePositionEvent, RaydiumClmmCreatePoolEvent, - RaydiumClmmDecreaseLiquidityV2Event, RaydiumClmmIncreaseLiquidityV2Event, - RaydiumClmmOpenPositionV2Event, RaydiumClmmOpenPositionWithToken22NftEvent, - RaydiumClmmPoolStateAccountEvent, RaydiumClmmSwapEvent, RaydiumClmmSwapV2Event, - RaydiumClmmTickArrayStateAccountEvent, - }, - raydium_cpmm::{ - parser::RAYDIUM_CPMM_PROGRAM_ID, RaydiumCpmmAmmConfigAccountEvent, - RaydiumCpmmDepositEvent, RaydiumCpmmInitializeEvent, - RaydiumCpmmPoolStateAccountEvent, RaydiumCpmmSwapEvent, - RaydiumCpmmWithdrawEvent, - }, - BlockMetaEvent, - }, - Protocol, UnifiedEvent, +use solana_streamer_sdk::streaming::{ + event_parser::{ + protocols::{ + bonk::parser::BONK_PROGRAM_ID, pumpfun::parser::PUMPFUN_PROGRAM_ID, + pumpswap::parser::PUMPSWAP_PROGRAM_ID, + raydium_amm_v4::parser::RAYDIUM_AMM_V4_PROGRAM_ID, + raydium_clmm::parser::RAYDIUM_CLMM_PROGRAM_ID, + raydium_cpmm::parser::RAYDIUM_CPMM_PROGRAM_ID, }, - grpc::ClientConfig, - yellowstone_grpc::{AccountFilter, TransactionFilter}, - YellowstoneGrpc, + Protocol, UnifiedEvent, }, + grpc::ClientConfig, + yellowstone_grpc::{AccountFilter, TransactionFilter}, + YellowstoneGrpc, }; #[tokio::main] @@ -60,7 +25,7 @@ async fn test_grpc() -> Result<(), Box> { println!("Subscribing to Yellowstone gRPC events..."); // Create low-latency configuration - let mut config: ClientConfig = ClientConfig::low_latency(); + let mut config: ClientConfig = ClientConfig::default(); // Enable performance monitoring, has performance overhead, disabled by default config.enable_metrics = true; let grpc = YellowstoneGrpc::new_with_config( @@ -105,7 +70,8 @@ async fn test_grpc() -> Result<(), Box> { }; // Listen to account data belonging to owner programs -> account event monitoring - let account_filter = AccountFilter { account: vec![], owner: account_include.clone(), filters: vec![] }; + let account_filter = + AccountFilter { account: vec![], owner: account_include.clone(), filters: vec![] }; // Event filtering // No event filtering, includes all events @@ -142,162 +108,21 @@ async fn test_grpc() -> Result<(), Box> { Ok(()) } -fn create_event_callback() -> impl Fn(Box) { - |event: Box| { +fn create_event_callback() -> impl Fn(UnifiedEvent) { + |event: UnifiedEvent| { println!( "🎉 Event received! Type: {:?}, transaction_index: {:?}", - event.event_type(), - event.transaction_index() + event.metadata().event_type, + event.metadata().transaction_index ); - match_event!(event, { - // -------------------------- block meta ----------------------- - BlockMetaEvent => |e: BlockMetaEvent| { - println!("BlockMetaEvent: {:?}", e.metadata.handle_us); - }, - // -------------------------- bonk ----------------------- - BonkPoolCreateEvent => |e: BonkPoolCreateEvent| { - // When using grpc, you can get block_time from each event - println!("block_time: {:?}, block_time_ms: {:?}", e.metadata.block_time, e.metadata.block_time_ms); - println!("BonkPoolCreateEvent: {:?}", e.base_mint_param.symbol); - }, - BonkTradeEvent => |e: BonkTradeEvent| { - println!("BonkTradeEvent: {e:?}"); - }, - BonkMigrateToAmmEvent => |e: BonkMigrateToAmmEvent| { - println!("BonkMigrateToAmmEvent: {e:?}"); - }, - BonkMigrateToCpswapEvent => |e: BonkMigrateToCpswapEvent| { - println!("BonkMigrateToCpswapEvent: {e:?}"); - }, - // -------------------------- pumpfun ----------------------- - PumpFunTradeEvent => |e: PumpFunTradeEvent| { - println!("PumpFunTradeEvent: {e:?}"); - }, - PumpFunMigrateEvent => |e: PumpFunMigrateEvent| { - println!("PumpFunMigrateEvent: {e:?}"); - }, - PumpFunCreateTokenEvent => |e: PumpFunCreateTokenEvent| { - println!("PumpFunCreateTokenEvent: {e:?}"); - }, - // -------------------------- pumpswap ----------------------- - PumpSwapBuyEvent => |e: PumpSwapBuyEvent| { - println!("Buy event: {e:?}"); - }, - PumpSwapSellEvent => |e: PumpSwapSellEvent| { - println!("Sell event: {e:?}"); - }, - PumpSwapCreatePoolEvent => |e: PumpSwapCreatePoolEvent| { - println!("CreatePool event: {e:?}"); - }, - PumpSwapDepositEvent => |e: PumpSwapDepositEvent| { - println!("Deposit event: {e:?}"); - }, - PumpSwapWithdrawEvent => |e: PumpSwapWithdrawEvent| { - println!("Withdraw event: {e:?}"); - }, - // -------------------------- raydium_cpmm ----------------------- - RaydiumCpmmSwapEvent => |e: RaydiumCpmmSwapEvent| { - println!("RaydiumCpmmSwapEvent: {e:?}"); - }, - RaydiumCpmmDepositEvent => |e: RaydiumCpmmDepositEvent| { - println!("RaydiumCpmmDepositEvent: {e:?}"); - }, - RaydiumCpmmInitializeEvent => |e: RaydiumCpmmInitializeEvent| { - println!("RaydiumCpmmInitializeEvent: {e:?}"); - }, - RaydiumCpmmWithdrawEvent => |e: RaydiumCpmmWithdrawEvent| { - println!("RaydiumCpmmWithdrawEvent: {e:?}"); - }, - // -------------------------- raydium_clmm ----------------------- - RaydiumClmmSwapEvent => |e: RaydiumClmmSwapEvent| { - println!("RaydiumClmmSwapEvent: {e:?}"); - }, - RaydiumClmmSwapV2Event => |e: RaydiumClmmSwapV2Event| { - println!("RaydiumClmmSwapV2Event: {e:?}"); - }, - RaydiumClmmClosePositionEvent => |e: RaydiumClmmClosePositionEvent| { - println!("RaydiumClmmClosePositionEvent: {e:?}"); - }, - RaydiumClmmDecreaseLiquidityV2Event => |e: RaydiumClmmDecreaseLiquidityV2Event| { - println!("RaydiumClmmDecreaseLiquidityV2Event: {e:?}"); - }, - RaydiumClmmCreatePoolEvent => |e: RaydiumClmmCreatePoolEvent| { - println!("RaydiumClmmCreatePoolEvent: {e:?}"); - }, - RaydiumClmmIncreaseLiquidityV2Event => |e: RaydiumClmmIncreaseLiquidityV2Event| { - println!("RaydiumClmmIncreaseLiquidityV2Event: {e:?}"); - }, - RaydiumClmmOpenPositionWithToken22NftEvent => |e: RaydiumClmmOpenPositionWithToken22NftEvent| { - println!("RaydiumClmmOpenPositionWithToken22NftEvent: {e:?}"); - }, - RaydiumClmmOpenPositionV2Event => |e: RaydiumClmmOpenPositionV2Event| { - println!("RaydiumClmmOpenPositionV2Event: {e:?}"); - }, - // -------------------------- raydium_amm_v4 ----------------------- - RaydiumAmmV4SwapEvent => |e: RaydiumAmmV4SwapEvent| { - println!("RaydiumAmmV4SwapEvent: {e:?}"); - }, - RaydiumAmmV4DepositEvent => |e: RaydiumAmmV4DepositEvent| { - println!("RaydiumAmmV4DepositEvent: {e:?}"); - }, - RaydiumAmmV4Initialize2Event => |e: RaydiumAmmV4Initialize2Event| { - println!("RaydiumAmmV4Initialize2Event: {e:?}"); - }, - RaydiumAmmV4WithdrawEvent => |e: RaydiumAmmV4WithdrawEvent| { - println!("RaydiumAmmV4WithdrawEvent: {e:?}"); - }, - RaydiumAmmV4WithdrawPnlEvent => |e: RaydiumAmmV4WithdrawPnlEvent| { - println!("RaydiumAmmV4WithdrawPnlEvent: {e:?}"); - }, - // -------------------------- account ----------------------- - BonkPoolStateAccountEvent => |e: BonkPoolStateAccountEvent| { - println!("BonkPoolStateAccountEvent: {e:?}"); - }, - BonkGlobalConfigAccountEvent => |e: BonkGlobalConfigAccountEvent| { - println!("BonkGlobalConfigAccountEvent: {e:?}"); - }, - BonkPlatformConfigAccountEvent => |e: BonkPlatformConfigAccountEvent| { - println!("BonkPlatformConfigAccountEvent: {e:?}"); - }, - PumpSwapGlobalConfigAccountEvent => |e: PumpSwapGlobalConfigAccountEvent| { - println!("PumpSwapGlobalConfigAccountEvent: {e:?}"); - }, - PumpSwapPoolAccountEvent => |e: PumpSwapPoolAccountEvent| { - println!("PumpSwapPoolAccountEvent: {e:?}"); - }, - PumpFunBondingCurveAccountEvent => |e: PumpFunBondingCurveAccountEvent| { - println!("PumpFunBondingCurveAccountEvent: {e:?}"); - }, - PumpFunGlobalAccountEvent => |e: PumpFunGlobalAccountEvent| { - println!("PumpFunGlobalAccountEvent: {e:?}"); - }, - RaydiumAmmV4AmmInfoAccountEvent => |e: RaydiumAmmV4AmmInfoAccountEvent| { - println!("RaydiumAmmV4AmmInfoAccountEvent: {e:?}"); - }, - RaydiumClmmAmmConfigAccountEvent => |e: RaydiumClmmAmmConfigAccountEvent| { - println!("RaydiumClmmAmmConfigAccountEvent: {e:?}"); - }, - RaydiumClmmPoolStateAccountEvent => |e: RaydiumClmmPoolStateAccountEvent| { - println!("RaydiumClmmPoolStateAccountEvent: {e:?}"); - }, - RaydiumClmmTickArrayStateAccountEvent => |e: RaydiumClmmTickArrayStateAccountEvent| { - println!("RaydiumClmmTickArrayStateAccountEvent: {e:?}"); - }, - RaydiumCpmmAmmConfigAccountEvent => |e: RaydiumCpmmAmmConfigAccountEvent| { - println!("RaydiumCpmmAmmConfigAccountEvent: {e:?}"); - }, - RaydiumCpmmPoolStateAccountEvent => |e: RaydiumCpmmPoolStateAccountEvent| { - println!("RaydiumCpmmPoolStateAccountEvent: {e:?}"); - }, - TokenAccountEvent => |e: TokenAccountEvent| { - println!("TokenAccountEvent: {e:?}"); - }, - NonceAccountEvent => |e: NonceAccountEvent| { - println!("NonceAccountEvent: {e:?}"); - }, - TokenInfoEvent => |e: TokenInfoEvent| { - println!("TokenInfoEvent: {e:?}"); - }, - }); + match event { + UnifiedEvent::BlockMetaEvent(e) => { + println!("{:?}", e); + } + // .... other events + _ => { + println!("{:?}", event); + } + } } } diff --git a/examples/mint_all_ata_account_listen_example.rs b/examples/mint_all_ata_account_listen_example.rs index b0fc11d..9952a5b 100644 --- a/examples/mint_all_ata_account_listen_example.rs +++ b/examples/mint_all_ata_account_listen_example.rs @@ -1,18 +1,14 @@ use std::str::FromStr; use solana_sdk::pubkey::Pubkey; -use solana_streamer_sdk::{ - match_event, - streaming::{ - event_parser::{ - common::{filter::EventTypeFilter, EventType}, - core::account_event_parser::TokenAccountEvent, - UnifiedEvent, - }, - grpc::ClientConfig, - yellowstone_grpc::{AccountFilter, TransactionFilter}, - YellowstoneGrpc, +use solana_streamer_sdk::streaming::{ + event_parser::{ + common::{filter::EventTypeFilter, EventType}, + UnifiedEvent, }, + grpc::ClientConfig, + yellowstone_grpc::{AccountFilter, TransactionFilter}, + YellowstoneGrpc, }; use yellowstone_grpc_proto::geyser::{ subscribe_request_filter_accounts_filter::Filter, @@ -30,7 +26,7 @@ async fn main() -> Result<(), Box> { async fn test_grpc() -> Result<(), Box> { println!("Subscribing to Yellowstone gRPC events..."); // Create low-latency configuration - let mut config: ClientConfig = ClientConfig::low_latency(); + let mut config: ClientConfig = ClientConfig::default(); // Enable performance monitoring, has performance overhead, disabled by default config.enable_metrics = true; let grpc = YellowstoneGrpc::new_with_config( @@ -106,12 +102,11 @@ async fn test_grpc() -> Result<(), Box> { Ok(()) } -fn create_event_callback() -> impl Fn(Box) { - |event: Box| { - match_event!(event, { - TokenAccountEvent => |e: TokenAccountEvent| { - println!("TokenAccount: {:?} amount: {:?}", e.pubkey, e.amount); - }, - }); +fn create_event_callback() -> impl Fn(UnifiedEvent) { + |event: UnifiedEvent| match event { + UnifiedEvent::TokenAccountEvent(e) => { + println!("TokenAccount: {:?} amount: {:?}", e.pubkey, e.amount); + } + _ => {} } } diff --git a/examples/nonce_listen_example.rs b/examples/nonce_listen_example.rs index fc4c52f..e1fb2b8 100644 --- a/examples/nonce_listen_example.rs +++ b/examples/nonce_listen_example.rs @@ -18,7 +18,7 @@ async fn main() -> Result<(), Box> { async fn test_grpc() -> Result<(), Box> { println!("Subscribing to Yellowstone gRPC events..."); // Create low-latency configuration - let mut config: ClientConfig = ClientConfig::low_latency(); + let mut config: ClientConfig = ClientConfig::default(); // Enable performance monitoring, has performance overhead, disabled by default config.enable_metrics = true; let grpc = YellowstoneGrpc::new_with_config( @@ -75,8 +75,8 @@ async fn test_grpc() -> Result<(), Box> { Ok(()) } -fn create_event_callback() -> impl Fn(Box) { - |event: Box| { +fn create_event_callback() -> impl Fn(UnifiedEvent) { + |event: UnifiedEvent| { println!("🎉 Event received! {:?}", event); } } diff --git a/examples/parse_tx_events.rs b/examples/parse_tx_events.rs index 61c884b..8b0a488 100644 --- a/examples/parse_tx_events.rs +++ b/examples/parse_tx_events.rs @@ -101,7 +101,7 @@ async fn get_single_transaction_details(signature_str: &str) -> Result<()> { .parse_encoded_confirmed_transaction_with_status_meta( signature, transaction, - Arc::new(move |event: &Box| { + Arc::new(move |event: &UnifiedEvent| { println!("{:?}\n", event); }), ) diff --git a/examples/pumpswap_pool_account_listen_example.rs b/examples/pumpswap_pool_account_listen_example.rs index b7fe92e..a25f45c 100644 --- a/examples/pumpswap_pool_account_listen_example.rs +++ b/examples/pumpswap_pool_account_listen_example.rs @@ -1,18 +1,14 @@ use std::str::FromStr; use solana_sdk::pubkey::Pubkey; -use solana_streamer_sdk::{ - match_event, - streaming::{ - event_parser::{ - common::{filter::EventTypeFilter, EventType}, - core::account_event_parser::TokenAccountEvent, - UnifiedEvent, - }, - grpc::ClientConfig, - yellowstone_grpc::{AccountFilter, TransactionFilter}, - YellowstoneGrpc, +use solana_streamer_sdk::streaming::{ + event_parser::{ + common::{filter::EventTypeFilter, EventType}, + UnifiedEvent, }, + grpc::ClientConfig, + yellowstone_grpc::{AccountFilter, TransactionFilter}, + YellowstoneGrpc, }; use yellowstone_grpc_proto::geyser::{ subscribe_request_filter_accounts_filter::Filter, @@ -108,12 +104,11 @@ async fn test_grpc() -> Result<(), Box> { Ok(()) } -fn create_event_callback() -> impl Fn(Box) { - |event: Box| { - match_event!(event, { - TokenAccountEvent => |e: TokenAccountEvent| { - println!("TokenAccount: {:?} amount: {:?}", e.pubkey, e.amount); - }, - }); +fn create_event_callback() -> impl Fn(UnifiedEvent) { + |event: UnifiedEvent| match event { + UnifiedEvent::TokenAccountEvent(e) => { + println!("TokenAccount: {:?} amount: {:?}", e.pubkey, e.amount); + } + _ => {} } } diff --git a/examples/shred_example.rs b/examples/shred_example.rs index bc7bb34..31459c2 100644 --- a/examples/shred_example.rs +++ b/examples/shred_example.rs @@ -1,51 +1,7 @@ -use solana_streamer_sdk::{ - match_event, - streaming::{ - event_parser::{ - common::EventType, - core::account_event_parser::TokenAccountEvent, - protocols::{ - bonk::{ - BonkGlobalConfigAccountEvent, BonkMigrateToAmmEvent, - BonkMigrateToCpswapEvent, BonkPlatformConfigAccountEvent, BonkPoolCreateEvent, - BonkPoolStateAccountEvent, BonkTradeEvent, - }, - pumpfun::{ - PumpFunBondingCurveAccountEvent, - PumpFunCreateTokenEvent, PumpFunGlobalAccountEvent, PumpFunMigrateEvent, - PumpFunTradeEvent, - }, - pumpswap::{ - PumpSwapBuyEvent, PumpSwapCreatePoolEvent, - PumpSwapDepositEvent, PumpSwapGlobalConfigAccountEvent, - PumpSwapPoolAccountEvent, PumpSwapSellEvent, PumpSwapWithdrawEvent, - }, - raydium_amm_v4::{ - RaydiumAmmV4AmmInfoAccountEvent, - RaydiumAmmV4DepositEvent, RaydiumAmmV4Initialize2Event, RaydiumAmmV4SwapEvent, - RaydiumAmmV4WithdrawEvent, RaydiumAmmV4WithdrawPnlEvent, - }, - raydium_clmm::{ - RaydiumClmmAmmConfigAccountEvent, - RaydiumClmmClosePositionEvent, RaydiumClmmCreatePoolEvent, - RaydiumClmmDecreaseLiquidityV2Event, RaydiumClmmIncreaseLiquidityV2Event, - RaydiumClmmOpenPositionV2Event, RaydiumClmmOpenPositionWithToken22NftEvent, - RaydiumClmmPoolStateAccountEvent, RaydiumClmmSwapEvent, RaydiumClmmSwapV2Event, - RaydiumClmmTickArrayStateAccountEvent, - }, - raydium_cpmm::{ - RaydiumCpmmAmmConfigAccountEvent, - RaydiumCpmmDepositEvent, RaydiumCpmmInitializeEvent, - RaydiumCpmmPoolStateAccountEvent, RaydiumCpmmSwapEvent, - RaydiumCpmmWithdrawEvent, - }, - BlockMetaEvent, - }, - Protocol, UnifiedEvent, - }, - shred::StreamClientConfig, - ShredStreamGrpc, - }, +use solana_streamer_sdk::streaming::{ + event_parser::{Protocol, UnifiedEvent}, + shred::StreamClientConfig, + ShredStreamGrpc, }; #[tokio::main] @@ -98,156 +54,18 @@ async fn test_shreds() -> Result<(), Box> { Ok(()) } -fn create_event_callback() -> impl Fn(Box) { - |event: Box| { +fn create_event_callback() -> impl Fn(UnifiedEvent) { + |event: UnifiedEvent| { println!( "🎉 Event received! Type: {:?}, transaction_index: {:?}", - event.event_type(), - event.transaction_index() + event.metadata().event_type, + event.metadata().transaction_index ); - match_event!(event, { - // -------------------------- block meta ----------------------- - BlockMetaEvent => |e: BlockMetaEvent| { + match event { + UnifiedEvent::BlockMetaEvent(e) => { println!("BlockMetaEvent: {:?}", e.metadata.handle_us); - }, - // -------------------------- bonk ----------------------- - BonkPoolCreateEvent => |e: BonkPoolCreateEvent| { - // When using grpc, you can get block_time from each event - println!("block_time: {:?}, block_time_ms: {:?}", e.metadata.block_time, e.metadata.block_time_ms); - println!("BonkPoolCreateEvent: {:?}", e.base_mint_param.symbol); - }, - BonkTradeEvent => |e: BonkTradeEvent| { - println!("BonkTradeEvent: {e:?}"); - }, - BonkMigrateToAmmEvent => |e: BonkMigrateToAmmEvent| { - println!("BonkMigrateToAmmEvent: {e:?}"); - }, - BonkMigrateToCpswapEvent => |e: BonkMigrateToCpswapEvent| { - println!("BonkMigrateToCpswapEvent: {e:?}"); - }, - // -------------------------- pumpfun ----------------------- - PumpFunTradeEvent => |e: PumpFunTradeEvent| { - println!("PumpFunTradeEvent: {e:?}"); - }, - PumpFunMigrateEvent => |e: PumpFunMigrateEvent| { - println!("PumpFunMigrateEvent: {e:?}"); - }, - PumpFunCreateTokenEvent => |e: PumpFunCreateTokenEvent| { - println!("PumpFunCreateTokenEvent: {e:?}"); - }, - // -------------------------- pumpswap ----------------------- - PumpSwapBuyEvent => |e: PumpSwapBuyEvent| { - println!("Buy event: {e:?}"); - }, - PumpSwapSellEvent => |e: PumpSwapSellEvent| { - println!("Sell event: {e:?}"); - }, - PumpSwapCreatePoolEvent => |e: PumpSwapCreatePoolEvent| { - println!("CreatePool event: {e:?}"); - }, - PumpSwapDepositEvent => |e: PumpSwapDepositEvent| { - println!("Deposit event: {e:?}"); - }, - PumpSwapWithdrawEvent => |e: PumpSwapWithdrawEvent| { - println!("Withdraw event: {e:?}"); - }, - // -------------------------- raydium_cpmm ----------------------- - RaydiumCpmmSwapEvent => |e: RaydiumCpmmSwapEvent| { - println!("RaydiumCpmmSwapEvent: {e:?}"); - }, - RaydiumCpmmDepositEvent => |e: RaydiumCpmmDepositEvent| { - println!("RaydiumCpmmDepositEvent: {e:?}"); - }, - RaydiumCpmmInitializeEvent => |e: RaydiumCpmmInitializeEvent| { - println!("RaydiumCpmmInitializeEvent: {e:?}"); - }, - RaydiumCpmmWithdrawEvent => |e: RaydiumCpmmWithdrawEvent| { - println!("RaydiumCpmmWithdrawEvent: {e:?}"); - }, - // -------------------------- raydium_clmm ----------------------- - RaydiumClmmSwapEvent => |e: RaydiumClmmSwapEvent| { - println!("RaydiumClmmSwapEvent: {e:?}"); - }, - RaydiumClmmSwapV2Event => |e: RaydiumClmmSwapV2Event| { - println!("RaydiumClmmSwapV2Event: {e:?}"); - }, - RaydiumClmmClosePositionEvent => |e: RaydiumClmmClosePositionEvent| { - println!("RaydiumClmmClosePositionEvent: {e:?}"); - }, - RaydiumClmmDecreaseLiquidityV2Event => |e: RaydiumClmmDecreaseLiquidityV2Event| { - println!("RaydiumClmmDecreaseLiquidityV2Event: {e:?}"); - }, - RaydiumClmmCreatePoolEvent => |e: RaydiumClmmCreatePoolEvent| { - println!("RaydiumClmmCreatePoolEvent: {e:?}"); - }, - RaydiumClmmIncreaseLiquidityV2Event => |e: RaydiumClmmIncreaseLiquidityV2Event| { - println!("RaydiumClmmIncreaseLiquidityV2Event: {e:?}"); - }, - RaydiumClmmOpenPositionWithToken22NftEvent => |e: RaydiumClmmOpenPositionWithToken22NftEvent| { - println!("RaydiumClmmOpenPositionWithToken22NftEvent: {e:?}"); - }, - RaydiumClmmOpenPositionV2Event => |e: RaydiumClmmOpenPositionV2Event| { - println!("RaydiumClmmOpenPositionV2Event: {e:?}"); - }, - // -------------------------- raydium_amm_v4 ----------------------- - RaydiumAmmV4SwapEvent => |e: RaydiumAmmV4SwapEvent| { - println!("RaydiumAmmV4SwapEvent: {e:?}"); - }, - RaydiumAmmV4DepositEvent => |e: RaydiumAmmV4DepositEvent| { - println!("RaydiumAmmV4DepositEvent: {e:?}"); - }, - RaydiumAmmV4Initialize2Event => |e: RaydiumAmmV4Initialize2Event| { - println!("RaydiumAmmV4Initialize2Event: {e:?}"); - }, - RaydiumAmmV4WithdrawEvent => |e: RaydiumAmmV4WithdrawEvent| { - println!("RaydiumAmmV4WithdrawEvent: {e:?}"); - }, - RaydiumAmmV4WithdrawPnlEvent => |e: RaydiumAmmV4WithdrawPnlEvent| { - println!("RaydiumAmmV4WithdrawPnlEvent: {e:?}"); - }, - // -------------------------- account ----------------------- - BonkPoolStateAccountEvent => |e: BonkPoolStateAccountEvent| { - println!("BonkPoolStateAccountEvent: {e:?}"); - }, - BonkGlobalConfigAccountEvent => |e: BonkGlobalConfigAccountEvent| { - println!("BonkGlobalConfigAccountEvent: {e:?}"); - }, - BonkPlatformConfigAccountEvent => |e: BonkPlatformConfigAccountEvent| { - println!("BonkPlatformConfigAccountEvent: {e:?}"); - }, - PumpSwapGlobalConfigAccountEvent => |e: PumpSwapGlobalConfigAccountEvent| { - println!("PumpSwapGlobalConfigAccountEvent: {e:?}"); - }, - PumpSwapPoolAccountEvent => |e: PumpSwapPoolAccountEvent| { - println!("PumpSwapPoolAccountEvent: {e:?}"); - }, - PumpFunBondingCurveAccountEvent => |e: PumpFunBondingCurveAccountEvent| { - println!("PumpFunBondingCurveAccountEvent: {e:?}"); - }, - PumpFunGlobalAccountEvent => |e: PumpFunGlobalAccountEvent| { - println!("PumpFunGlobalAccountEvent: {e:?}"); - }, - RaydiumAmmV4AmmInfoAccountEvent => |e: RaydiumAmmV4AmmInfoAccountEvent| { - println!("RaydiumAmmV4AmmInfoAccountEvent: {e:?}"); - }, - RaydiumClmmAmmConfigAccountEvent => |e: RaydiumClmmAmmConfigAccountEvent| { - println!("RaydiumClmmAmmConfigAccountEvent: {e:?}"); - }, - RaydiumClmmPoolStateAccountEvent => |e: RaydiumClmmPoolStateAccountEvent| { - println!("RaydiumClmmPoolStateAccountEvent: {e:?}"); - }, - RaydiumClmmTickArrayStateAccountEvent => |e: RaydiumClmmTickArrayStateAccountEvent| { - println!("RaydiumClmmTickArrayStateAccountEvent: {e:?}"); - }, - RaydiumCpmmAmmConfigAccountEvent => |e: RaydiumCpmmAmmConfigAccountEvent| { - println!("RaydiumCpmmAmmConfigAccountEvent: {e:?}"); - }, - RaydiumCpmmPoolStateAccountEvent => |e: RaydiumCpmmPoolStateAccountEvent| { - println!("RaydiumCpmmPoolStateAccountEvent: {e:?}"); - }, - TokenAccountEvent => |e: TokenAccountEvent| { - println!("TokenAccountEvent: {e:?}"); - }, - }); + } + _ => {} + } } -} \ No newline at end of file +} diff --git a/examples/token_balance_listen_example.rs b/examples/token_balance_listen_example.rs index ac1cb54..033ef4f 100644 --- a/examples/token_balance_listen_example.rs +++ b/examples/token_balance_listen_example.rs @@ -76,8 +76,8 @@ async fn test_grpc() -> Result<(), Box> { Ok(()) } -fn create_event_callback() -> impl Fn(Box) { - |event: Box| { +fn create_event_callback() -> impl Fn(UnifiedEvent) { + |event: UnifiedEvent| { println!("🎉 Event received! {:?}", event); } } diff --git a/examples/token_decimals_listen_example.rs b/examples/token_decimals_listen_example.rs index 1abde5d..bc0d5c5 100644 --- a/examples/token_decimals_listen_example.rs +++ b/examples/token_decimals_listen_example.rs @@ -1,15 +1,11 @@ -use solana_streamer_sdk::{ - match_event, - streaming::{ - event_parser::{ - common::{filter::EventTypeFilter, EventType}, - core::account_event_parser::TokenInfoEvent, - UnifiedEvent, - }, - grpc::ClientConfig, - yellowstone_grpc::{AccountFilter, TransactionFilter}, - YellowstoneGrpc, +use solana_streamer_sdk::streaming::{ + event_parser::{ + common::{filter::EventTypeFilter, EventType}, + UnifiedEvent, }, + grpc::ClientConfig, + yellowstone_grpc::{AccountFilter, TransactionFilter}, + YellowstoneGrpc, }; #[tokio::main] @@ -80,12 +76,11 @@ async fn test_grpc() -> Result<(), Box> { Ok(()) } -fn create_event_callback() -> impl Fn(Box) { - |event: Box| { - match_event!(event, { - TokenInfoEvent => |e: TokenInfoEvent| { - println!("TokenInfoEvent: {:?}", e.decimals); - }, - }); +fn create_event_callback() -> impl Fn(UnifiedEvent) { + |event: UnifiedEvent| match event { + UnifiedEvent::TokenInfoEvent(e) => { + println!("TokenInfoEvent: {:?}", e.decimals); + } + _ => {} } } diff --git a/src/streaming/common/config.rs b/src/streaming/common/config.rs index c314813..de63689 100644 --- a/src/streaming/common/config.rs +++ b/src/streaming/common/config.rs @@ -1,35 +1,5 @@ use super::constants::*; -/// Backpressure handling strategy -#[derive(Debug, Clone, Copy)] -pub enum BackpressureStrategy { - /// Block and wait (default) - Block, - /// Drop messages - Drop, -} - -impl Default for BackpressureStrategy { - fn default() -> Self { - Self::Block - } -} - -/// Backpressure configuration -#[derive(Debug, Clone)] -pub struct BackpressureConfig { - /// Channel size (default: 1000) - pub permits: usize, - /// Backpressure handling strategy (default: Block) - pub strategy: BackpressureStrategy, -} - -impl Default for BackpressureConfig { - fn default() -> Self { - Self { permits: 3000, strategy: BackpressureStrategy::default() } - } -} - /// Connection configuration #[derive(Debug, Clone)] pub struct ConnectionConfig { @@ -56,57 +26,21 @@ impl Default for ConnectionConfig { pub struct StreamClientConfig { /// Connection configuration pub connection: ConnectionConfig, - /// Backpressure configuration - pub backpressure: BackpressureConfig, /// Whether performance monitoring is enabled (default: false) pub enable_metrics: bool, } impl Default for StreamClientConfig { fn default() -> Self { - Self { - connection: ConnectionConfig::default(), - backpressure: BackpressureConfig::default(), - enable_metrics: false, - } + Self { connection: ConnectionConfig::default(), enable_metrics: false } } } impl StreamClientConfig { - /// Creates a high-throughput configuration optimized for high-concurrency scenarios. - /// - /// This configuration prioritizes throughput over latency by: - /// - Implementing a drop strategy for backpressure to avoid blocking - /// - Setting a large permit buffer (5,000) to handle burst traffic - /// - /// Ideal for scenarios where you need to process large volumes of data - /// and can tolerate occasional message drops during peak loads. - pub fn high_throughput() -> Self { - Self { - connection: ConnectionConfig::default(), - backpressure: BackpressureConfig { - permits: 20000, - strategy: BackpressureStrategy::Drop, - }, - enable_metrics: false, - } - } - - /// Creates a low-latency configuration optimized for real-time scenarios. - /// - /// This configuration prioritizes latency over throughput by: - /// - Processing events immediately without buffering - /// - Implementing a blocking backpressure strategy to ensure no data loss - /// - Setting optimal permits (4000) for balanced throughput and latency - /// - /// Ideal for scenarios where every millisecond counts and you cannot - /// afford to lose any events, such as trading applications or real-time monitoring. pub fn low_latency() -> Self { - Self { - connection: ConnectionConfig::default(), - backpressure: BackpressureConfig { permits: 4000, strategy: BackpressureStrategy::Block }, - enable_metrics: false, - } + Self::default() + } + pub fn high_throughput() -> Self { + Self::default() } - } diff --git a/src/streaming/common/event_processor.rs b/src/streaming/common/event_processor.rs index 7d4915e..33bdd36 100644 --- a/src/streaming/common/event_processor.rs +++ b/src/streaming/common/event_processor.rs @@ -1,21 +1,16 @@ -use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering}; use std::sync::Arc; -use crossbeam_queue::SegQueue; use solana_sdk::pubkey::Pubkey; use crate::common::AnyResult; -use crate::streaming::common::BackpressureStrategy; -use crate::streaming::common::{ - MetricsEventType, MetricsManager, StreamClientConfig as ClientConfig, -}; +use crate::streaming::common::{MetricsEventType, StreamClientConfig as ClientConfig}; use crate::streaming::event_parser::common::filter::EventTypeFilter; use crate::streaming::event_parser::core::account_event_parser::AccountEventParser; use crate::streaming::event_parser::core::common_event_parser::CommonEventParser; use crate::streaming::event_parser::core::event_parser::EventParser; use crate::streaming::event_parser::{core::traits::UnifiedEvent, Protocol}; -use crate::streaming::grpc::{BackpressureConfig, EventPretty}; +use crate::streaming::grpc::{EventPretty, MetricsManager}; use crate::streaming::shred::TransactionWithSlot; use once_cell::sync::OnceCell; @@ -24,141 +19,54 @@ pub enum EventSource { Shred, } -/// High-performance Event processor using SegQueue for all strategies +/// High-performance Event processor pub struct EventProcessor { - pub(crate) metrics_manager: MetricsManager, pub(crate) config: ClientConfig, pub(crate) parser_cache: OnceCell>, pub(crate) protocols: Vec, pub(crate) event_type_filter: Option, - pub(crate) callback: Option) + Send + Sync>>, - pub(crate) backpressure_config: BackpressureConfig, - pub(crate) grpc_queue: Arc)>>, - pub(crate) shred_queue: Arc)>>, - pub(crate) grpc_pending_count: Arc, - pub(crate) shred_pending_count: Arc, - pub(crate) processing_shutdown: Arc, + pub(crate) callback: Option>, } impl EventProcessor { - pub fn new(metrics_manager: MetricsManager, config: ClientConfig) -> Self { - let backpressure_config = config.backpressure.clone(); - let grpc_queue = Arc::new(SegQueue::new()); - let shred_queue = Arc::new(SegQueue::new()); - let grpc_pending_count = Arc::new(AtomicUsize::new(0)); - let shred_pending_count = Arc::new(AtomicUsize::new(0)); - let processing_shutdown = Arc::new(AtomicBool::new(false)); - + pub fn new(config: ClientConfig) -> Self { Self { - metrics_manager, config, parser_cache: OnceCell::new(), protocols: vec![], event_type_filter: None, - backpressure_config, callback: None, - grpc_queue, - shred_queue, - grpc_pending_count, - shred_pending_count, - processing_shutdown, } } pub fn set_protocols_and_event_type_filter( &mut self, - source: EventSource, + _source: EventSource, protocols: Vec, event_type_filter: Option, - backpressure_config: BackpressureConfig, - callback: Option) + Send + Sync>>, + callback: Option>, ) { self.protocols = protocols; self.event_type_filter = event_type_filter; - - self.backpressure_config = backpressure_config; self.callback = callback; let protocols_ref = &self.protocols; let event_type_filter_ref = self.event_type_filter.as_ref(); self.parser_cache.get_or_init(|| { Arc::new(EventParser::new(protocols_ref.clone(), event_type_filter_ref.cloned())) }); - - if matches!(self.backpressure_config.strategy, BackpressureStrategy::Block) { - self.start_block_processing_thread(source); - } } pub fn get_parser(&self) -> Arc { self.parser_cache.get().unwrap().clone() } - fn create_adapter_callback(&self) -> Arc) + Send + Sync> { - let callback = self.callback.clone().unwrap(); - let metrics_manager = self.metrics_manager.clone(); - - Arc::new(move |event: Box| { - let processing_time_us = event.handle_us() as f64; + fn invoke_callback(&self, event: UnifiedEvent) { + if let Some(callback) = self.callback.as_ref() { callback(event); - metrics_manager.update_metrics(MetricsEventType::Transaction, 1, processing_time_us); - }) - } - - pub async fn process_grpc_event_transaction_with_metrics( - &self, - event_pretty: EventPretty, - bot_wallet: Option, - ) -> AnyResult<()> { - self.apply_backpressure_control(event_pretty, bot_wallet).await - } - - async fn apply_backpressure_control( - &self, - event_pretty: EventPretty, - bot_wallet: Option, - ) -> AnyResult<()> { - match self.backpressure_config.strategy { - BackpressureStrategy::Block => { - loop { - let current_pending = self.grpc_pending_count.load(Ordering::Relaxed); - if current_pending < self.backpressure_config.permits { - self.grpc_queue.push((event_pretty, bot_wallet)); - self.grpc_pending_count.fetch_add(1, Ordering::Relaxed); - break; - } - - tokio::task::yield_now().await; - } - Ok(()) - } - BackpressureStrategy::Drop => { - let current_pending = self.grpc_pending_count.load(Ordering::Relaxed); - if current_pending >= self.backpressure_config.permits { - self.metrics_manager.increment_dropped_events(); - Ok(()) - } else { - self.grpc_pending_count.fetch_add(1, Ordering::Relaxed); - let processor = self.clone(); - tokio::spawn(async move { - match processor - .process_grpc_event_transaction(event_pretty, bot_wallet) - .await - { - Ok(_) => { - processor.grpc_pending_count.fetch_sub(1, Ordering::Relaxed); - } - Err(e) => { - log::error!("Error in async gRPC processing: {}", e); - } - } - }); - Ok(()) - } - } } } - async fn process_grpc_event_transaction( + pub async fn process_grpc_transaction( &self, event_pretty: EventPretty, bot_wallet: Option, @@ -168,20 +76,20 @@ impl EventProcessor { } match event_pretty { EventPretty::Account(account_pretty) => { - self.metrics_manager.add_account_process_count(); + MetricsManager::global().add_account_process_count(); let account_event = AccountEventParser::parse_account_event( &self.protocols, account_pretty, self.event_type_filter.as_ref(), ); - if let Some(event) = account_event { - let processing_time_us = event.handle_us() as f64; + if let Some(mut event) = account_event { + let processing_time_us = event.metadata().handle_us as f64; self.invoke_callback(event); self.update_metrics(MetricsEventType::Account, 1, processing_time_us); } } EventPretty::Transaction(transaction_pretty) => { - self.metrics_manager.add_tx_process_count(); + MetricsManager::global().add_tx_process_count(); let slot = transaction_pretty.slot; let signature = transaction_pretty.signature; let block_time = transaction_pretty.block_time; @@ -190,7 +98,17 @@ impl EventProcessor { let grpc_tx = transaction_pretty.grpc_tx; let parser = self.get_parser(); - let adapter_callback = self.create_adapter_callback(); + let callback = self.callback.clone().unwrap(); + let adapter_callback = Arc::new(move |mut event: UnifiedEvent| { + let processing_time_us = event.metadata().handle_us as f64; + callback(event); + MetricsManager::global().update_metrics( + MetricsEventType::Transaction, + 1, + processing_time_us, + ); + }); + parser .parse_grpc_transaction_owned( grpc_tx, @@ -205,18 +123,18 @@ impl EventProcessor { .await?; } EventPretty::BlockMeta(block_meta_pretty) => { - self.metrics_manager.add_block_meta_process_count(); + MetricsManager::global().add_block_meta_process_count(); let block_time_ms = block_meta_pretty .block_time .map(|ts| ts.seconds * 1000 + ts.nanos as i64 / 1_000_000) .unwrap_or_else(|| chrono::Utc::now().timestamp_millis()); - let block_meta_event = CommonEventParser::generate_block_meta_event( + let mut block_meta_event = CommonEventParser::generate_block_meta_event( block_meta_pretty.slot, block_meta_pretty.block_hash, block_time_ms, block_meta_pretty.recv_us, ); - let processing_time_us = block_meta_event.handle_us() as f64; + let processing_time_us = block_meta_event.metadata().handle_us as f64; self.invoke_callback(block_meta_event); self.update_metrics(MetricsEventType::BlockMeta, 1, processing_time_us); } @@ -225,74 +143,6 @@ impl EventProcessor { Ok(()) } - pub fn invoke_callback(&self, event: Box) { - if let Some(callback) = self.callback.as_ref() { - callback(event); - } - } - - pub async fn process_shred_transaction_immediate( - &self, - transaction_with_slot: TransactionWithSlot, - bot_wallet: Option, - ) -> AnyResult<()> { - self.process_shred_transaction(transaction_with_slot, bot_wallet).await - } - - pub async fn process_shred_transaction_with_metrics( - &self, - transaction_with_slot: TransactionWithSlot, - bot_wallet: Option, - ) -> AnyResult<()> { - self.apply_shred_backpressure_control(transaction_with_slot, bot_wallet).await - } - - async fn apply_shred_backpressure_control( - &self, - transaction_with_slot: TransactionWithSlot, - bot_wallet: Option, - ) -> AnyResult<()> { - match self.backpressure_config.strategy { - BackpressureStrategy::Block => { - loop { - let current_pending = self.shred_pending_count.load(Ordering::Relaxed); - if current_pending < self.backpressure_config.permits { - self.shred_queue.push((transaction_with_slot, bot_wallet)); - self.shred_pending_count.fetch_add(1, Ordering::Relaxed); - break; - } - - tokio::task::yield_now().await; - } - Ok(()) - } - BackpressureStrategy::Drop => { - let current_pending = self.shred_pending_count.load(Ordering::Relaxed); - if current_pending >= self.backpressure_config.permits { - self.metrics_manager.increment_dropped_events(); - Ok(()) - } else { - self.shred_pending_count.fetch_add(1, Ordering::Relaxed); - let processor = self.clone(); - tokio::spawn(async move { - match processor - .process_shred_transaction(transaction_with_slot, bot_wallet) - .await - { - Ok(_) => { - processor.shred_pending_count.fetch_sub(1, Ordering::Relaxed); - } - Err(e) => { - log::error!("Error in async shred processing: {}", e); - } - } - }); - Ok(()) - } - } - } - } - pub async fn process_shred_transaction( &self, transaction_with_slot: TransactionWithSlot, @@ -301,7 +151,7 @@ impl EventProcessor { if self.callback.is_none() { return Ok(()); } - self.metrics_manager.add_tx_process_count(); + MetricsManager::global().add_tx_process_count(); let tx = transaction_with_slot.transaction; let slot = transaction_with_slot.slot; @@ -312,7 +162,17 @@ impl EventProcessor { let recv_us = transaction_with_slot.recv_us; let parser = self.get_parser(); - let adapter_callback = self.create_adapter_callback(); + let callback = self.callback.clone().unwrap(); + let adapter_callback = Arc::new(move |mut event: UnifiedEvent| { + let processing_time_us = event.metadata().handle_us as f64; + callback(event); + MetricsManager::global().update_metrics( + MetricsEventType::Transaction, + 1, + processing_time_us, + ); + }); + parser .parse_versioned_transaction_owned( tx, @@ -331,99 +191,18 @@ impl EventProcessor { } fn update_metrics(&self, ty: MetricsEventType, count: u64, time_us: f64) { - self.metrics_manager.update_metrics(ty, count, time_us); - } - - fn start_block_processing_thread(&self, source: EventSource) { - self.processing_shutdown.store(false, Ordering::Relaxed); - - let grpc_queue = Arc::clone(&self.grpc_queue); - let shred_queue = Arc::clone(&self.shred_queue); - let grpc_pending_count = Arc::clone(&self.grpc_pending_count); - let shred_pending_count = Arc::clone(&self.shred_pending_count); - let shutdown_flag = Arc::clone(&self.processing_shutdown); - let shutdown_flag_clone = Arc::clone(&self.processing_shutdown); - let processor = self.clone(); - let processor_clone = self.clone(); - // Dedicated thread with busy-wait and lock-free processing - match source { - EventSource::Grpc => { - std::thread::spawn(move || { - let worker_threads = - std::thread::available_parallelism().map(|n| n.get()).unwrap_or(4); // 如果获取失败则回退到4个线程 - - let rt = tokio::runtime::Builder::new_multi_thread() - .worker_threads(worker_threads) - .enable_all() - .build() - .unwrap(); - - while !shutdown_flag.load(Ordering::Relaxed) { - if let Some((event_pretty, bot_wallet)) = grpc_queue.pop() { - grpc_pending_count.fetch_sub(1, Ordering::Relaxed); - if let Err(e) = rt.block_on( - processor.process_grpc_event_transaction(event_pretty, bot_wallet), - ) { - println!("Error processing gRPC event: {}", e); - } - } else { - // 待测试替换方案： lock-free queue + spin + batch - std::thread::sleep(std::time::Duration::from_micros(500)); - } - } - }); - } - EventSource::Shred => { - // Shred processing with same low-latency optimization - std::thread::spawn(move || { - let worker_threads = - std::thread::available_parallelism().map(|n| n.get()).unwrap_or(4); // 如果获取失败则回退到4个线程 - - let rt = tokio::runtime::Builder::new_multi_thread() - .worker_threads(worker_threads) - .enable_all() - .build() - .unwrap(); - - while !shutdown_flag_clone.load(Ordering::Relaxed) { - if let Some((transaction_with_slot, bot_wallet)) = shred_queue.pop() { - shred_pending_count.fetch_sub(1, Ordering::Relaxed); - if let Err(e) = rt.block_on( - processor_clone - .process_shred_transaction(transaction_with_slot, bot_wallet), - ) { - log::error!("Error processing shred transaction: {}", e); - } - } else { - // 待测试替换方案： lock-free queue + spin + batch - std::thread::sleep(std::time::Duration::from_micros(500)); - } - } - }); - } - } - } - - pub fn stop_processing(&self) { - self.processing_shutdown.store(true, Ordering::Relaxed); + MetricsManager::global().update_metrics(ty, count, time_us); } } impl Clone for EventProcessor { fn clone(&self) -> Self { Self { - metrics_manager: self.metrics_manager.clone(), config: self.config.clone(), parser_cache: self.parser_cache.clone(), protocols: self.protocols.clone(), event_type_filter: self.event_type_filter.clone(), - backpressure_config: self.backpressure_config.clone(), callback: self.callback.clone(), - grpc_queue: self.grpc_queue.clone(), - shred_queue: self.shred_queue.clone(), - grpc_pending_count: self.grpc_pending_count.clone(), - shred_pending_count: self.shred_pending_count.clone(), - processing_shutdown: self.processing_shutdown.clone(), } } } diff --git a/src/streaming/common/metrics.rs b/src/streaming/common/metrics.rs index f76e866..e3a668a 100644 --- a/src/streaming/common/metrics.rs +++ b/src/streaming/common/metrics.rs @@ -1,5 +1,4 @@ use std::sync::atomic::{AtomicBool, AtomicU64, Ordering}; -use std::sync::Arc; use super::constants::*; @@ -44,13 +43,13 @@ struct AtomicEventMetrics { } impl AtomicEventMetrics { - fn new(now_nanos: u64) -> Self { + const fn new_const() -> Self { Self { process_count: AtomicU64::new(0), events_processed: AtomicU64::new(0), events_in_window: AtomicU64::new(0), - window_start_nanos: AtomicU64::new(now_nanos), - processing_stats: AtomicProcessingTimeStats::new(), + window_start_nanos: AtomicU64::new(0), + processing_stats: AtomicProcessingTimeStats::new_const(), } } @@ -114,43 +113,24 @@ struct AtomicProcessingTimeStats { } impl AtomicProcessingTimeStats { - fn new() -> Self { - let now_nanos = - std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_nanos() - as u64; - + const fn new_const() -> Self { Self { min_time_bits: AtomicU64::new(f64::INFINITY.to_bits()), max_time_bits: AtomicU64::new(0), - min_time_timestamp_nanos: AtomicU64::new(now_nanos), - max_time_timestamp_nanos: AtomicU64::new(now_nanos), + min_time_timestamp_nanos: AtomicU64::new(0), + max_time_timestamp_nanos: AtomicU64::new(0), total_time_us: AtomicU64::new(0), total_events: AtomicU64::new(0), } } - /// Atomically update processing time statistics + /// Atomically update processing time statistics (hot path - no syscalls) #[inline] fn update(&self, time_us: f64, event_count: u64) { let time_bits = time_us.to_bits(); - let now_nanos = - std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_nanos() - as u64; - // Update minimum value, check time difference and reset if over 10 seconds + // Fast path: Update min value without timestamp check (checked in background task) let mut current_min = self.min_time_bits.load(Ordering::Relaxed); - let min_timestamp = self.min_time_timestamp_nanos.load(Ordering::Relaxed); - - // Check if min value timestamp exceeds 10 seconds (10_000_000_000 nanoseconds) - let min_time_diff_nanos = now_nanos.saturating_sub(min_timestamp); - if min_time_diff_nanos > 10_000_000_000 { - // Over 10 seconds, reset min value - self.min_time_bits.store(f64::INFINITY.to_bits(), Ordering::Relaxed); - self.min_time_timestamp_nanos.store(now_nanos, Ordering::Relaxed); - current_min = f64::INFINITY.to_bits(); - } - - // If current time is less than min value, update min value and timestamp while time_bits < current_min { match self.min_time_bits.compare_exchange_weak( current_min, @@ -158,29 +138,13 @@ impl AtomicProcessingTimeStats { Ordering::Relaxed, Ordering::Relaxed, ) { - Ok(_) => { - // Successfully updated min value, also update timestamp - self.min_time_timestamp_nanos.store(now_nanos, Ordering::Relaxed); - break; - } + Ok(_) => break, Err(x) => current_min = x, } } - // Update maximum value, check time difference and reset if over 10 seconds + // Fast path: Update max value without timestamp check (checked in background task) let mut current_max = self.max_time_bits.load(Ordering::Relaxed); - let max_timestamp = self.max_time_timestamp_nanos.load(Ordering::Relaxed); - - // Check if max value timestamp exceeds 10 seconds (10_000_000_000 nanoseconds) - let time_diff_nanos = now_nanos.saturating_sub(max_timestamp); - if time_diff_nanos > 10_000_000_000 { - // Over 10 seconds, reset max value - self.max_time_bits.store(0, Ordering::Relaxed); - self.max_time_timestamp_nanos.store(now_nanos, Ordering::Relaxed); - current_max = 0; - } - - // If current time is greater than max value, update max value and timestamp while time_bits > current_max { match self.max_time_bits.compare_exchange_weak( current_max, @@ -188,11 +152,7 @@ impl AtomicProcessingTimeStats { Ordering::Relaxed, Ordering::Relaxed, ) { - Ok(_) => { - // Successfully updated max value, also update timestamp - self.max_time_timestamp_nanos.store(now_nanos, Ordering::Relaxed); - break; - } + Ok(_) => break, Err(x) => current_max = x, } } @@ -203,6 +163,28 @@ impl AtomicProcessingTimeStats { self.total_events.fetch_add(event_count, Ordering::Relaxed); } + /// Reset min/max if they are older than 10 seconds (called by background task) + #[inline] + fn reset_stale_min_max(&self) { + let now_nanos = + std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_nanos() + as u64; + + // Check and reset min if stale + let min_timestamp = self.min_time_timestamp_nanos.load(Ordering::Relaxed); + if now_nanos.saturating_sub(min_timestamp) > 10_000_000_000 { + self.min_time_bits.store(f64::INFINITY.to_bits(), Ordering::Relaxed); + self.min_time_timestamp_nanos.store(now_nanos, Ordering::Relaxed); + } + + // Check and reset max if stale + let max_timestamp = self.max_time_timestamp_nanos.load(Ordering::Relaxed); + if now_nanos.saturating_sub(max_timestamp) > 10_000_000_000 { + self.max_time_bits.store(0, Ordering::Relaxed); + self.max_time_timestamp_nanos.store(now_nanos, Ordering::Relaxed); + } + } + /// Get statistics (non-blocking) #[inline] fn get_stats(&self) -> ProcessingTimeStats { @@ -275,7 +257,7 @@ impl PerformanceMetrics { /// High-performance metrics system #[derive(Debug)] pub struct HighPerformanceMetrics { - start_nanos: u64, + start_nanos: AtomicU64, event_metrics: [AtomicEventMetrics; 3], processing_stats: AtomicProcessingTimeStats, // 丢弃事件指标 @@ -283,20 +265,16 @@ pub struct HighPerformanceMetrics { } impl HighPerformanceMetrics { - fn new() -> Self { - let now_nanos = - std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_nanos() - as u64; - + /// Const constructor for static initialization (zero-cost) + const fn new_const() -> Self { Self { - start_nanos: now_nanos, + start_nanos: AtomicU64::new(0), // Will be lazily initialized on first access event_metrics: [ - AtomicEventMetrics::new(now_nanos), - AtomicEventMetrics::new(now_nanos), - AtomicEventMetrics::new(now_nanos), + AtomicEventMetrics::new_const(), + AtomicEventMetrics::new_const(), + AtomicEventMetrics::new_const(), ], - processing_stats: AtomicProcessingTimeStats::new(), - // 初始化丢弃事件指标 + processing_stats: AtomicProcessingTimeStats::new_const(), dropped_events_count: AtomicU64::new(0), } } @@ -307,7 +285,23 @@ impl HighPerformanceMetrics { let now_nanos = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_nanos() as u64; - (now_nanos - self.start_nanos) as f64 / 1_000_000_000.0 + + // Lazy initialization of start_nanos (compare-and-swap once) + let mut start = self.start_nanos.load(Ordering::Relaxed); + if start == 0 { + // Try to initialize with current time + match self.start_nanos.compare_exchange( + 0, + now_nanos, + Ordering::Relaxed, + Ordering::Relaxed, + ) { + Ok(_) => start = now_nanos, + Err(existing) => start = existing, + } + } + + (now_nanos - start) as f64 / 1_000_000_000.0 } /// 获取事件指标快照 @@ -348,122 +342,122 @@ impl HighPerformanceMetrics { } } -/// 高性能指标管理器 -pub struct MetricsManager { - metrics: Arc, - enable_metrics: bool, - stream_name: String, - background_task_running: AtomicBool, -} +/// Global singleton instance - zero-cost static allocation +static GLOBAL_METRICS: HighPerformanceMetrics = HighPerformanceMetrics::new_const(); + +/// Background task initialization flag +static BACKGROUND_TASK_STARTED: AtomicBool = AtomicBool::new(false); + +/// Metrics enabled flag +static METRICS_ENABLED: AtomicBool = AtomicBool::new(true); + +/// 高性能指标管理器 (Singleton) +#[derive(Clone, Copy)] +pub struct MetricsManager; impl MetricsManager { - /// 创建新的指标管理器 - pub fn new(enable_metrics: bool, stream_name: String) -> Self { - let manager = Self { - metrics: Arc::new(HighPerformanceMetrics::new()), - enable_metrics, - stream_name, - background_task_running: AtomicBool::new(false), - }; - - // 启动后台任务 - manager.start_background_tasks(); - manager + /// Get global singleton instance (zero-cost) + #[inline] + pub const fn global() -> Self { + Self } - /// 启动后台任务 - fn start_background_tasks(&self) { - if self - .background_task_running - .compare_exchange(false, true, Ordering::Relaxed, Ordering::Relaxed) - .is_ok() + /// Initialize and start background task (call once at startup) + pub fn init(enable_metrics: bool) { + METRICS_ENABLED.store(enable_metrics, Ordering::Relaxed); + + // Start background task only once + if enable_metrics + && BACKGROUND_TASK_STARTED + .compare_exchange(false, true, Ordering::SeqCst, Ordering::SeqCst) + .is_ok() { - if !self.enable_metrics { - return; - } - - let metrics = self.metrics.clone(); - - tokio::spawn(async move { + tokio::spawn(async { let mut interval = tokio::time::interval(std::time::Duration::from_millis(500)); - loop { interval.tick().await; - let window_duration_nanos = DEFAULT_METRICS_WINDOW_SECONDS * 1_000_000_000; - // 更新所有事件类型的窗口指标 - metrics.update_window_metrics(EventType::Transaction, window_duration_nanos); - metrics.update_window_metrics(EventType::Account, window_duration_nanos); - metrics.update_window_metrics(EventType::BlockMeta, window_duration_nanos); + // Update window metrics for all event types + GLOBAL_METRICS + .update_window_metrics(EventType::Transaction, window_duration_nanos); + GLOBAL_METRICS.update_window_metrics(EventType::Account, window_duration_nanos); + GLOBAL_METRICS + .update_window_metrics(EventType::BlockMeta, window_duration_nanos); + + // Reset stale min/max values (10 second expiry) - moved from hot path + GLOBAL_METRICS.processing_stats.reset_stale_min_max(); + for event_metric in &GLOBAL_METRICS.event_metrics { + event_metric.processing_stats.reset_stale_min_max(); + } } }); } } + #[inline] + fn is_enabled(&self) -> bool { + METRICS_ENABLED.load(Ordering::Relaxed) + } + /// 记录处理次数（非阻塞） #[inline] pub fn record_process(&self, event_type: EventType) { - if self.enable_metrics { - self.metrics.event_metrics[event_type.as_index()].add_process_count(); + if self.is_enabled() { + GLOBAL_METRICS.event_metrics[event_type.as_index()].add_process_count(); } } /// 记录事件处理（非阻塞） #[inline] pub fn record_events(&self, event_type: EventType, count: u64, processing_time_us: f64) { - if !self.enable_metrics { + if !self.is_enabled() { return; } let index = event_type.as_index(); // 原子更新事件计数 - self.metrics.event_metrics[index].add_events_processed(count); + GLOBAL_METRICS.event_metrics[index].add_events_processed(count); // 原子更新该事件类型的处理时间统计 - self.metrics.event_metrics[index].update_processing_stats(processing_time_us, count); + GLOBAL_METRICS.event_metrics[index].update_processing_stats(processing_time_us, count); // 保持全局处理时间统计的兼容性 - self.metrics.processing_stats.update(processing_time_us, count); + GLOBAL_METRICS.processing_stats.update(processing_time_us, count); } /// 记录慢处理操作 #[inline] pub fn log_slow_processing(&self, processing_time_us: f64, event_count: usize) { if processing_time_us > SLOW_PROCESSING_THRESHOLD_US { - log::debug!( - "{} slow processing: {:.2}us for {} events", - self.stream_name, - processing_time_us, - event_count, - ); + log::debug!("Slow processing: {:.2}us for {} events", processing_time_us, event_count); } } /// 获取运行时长 pub fn get_uptime(&self) -> std::time::Duration { - std::time::Duration::from_secs_f64(self.metrics.get_uptime_seconds()) + std::time::Duration::from_secs_f64(GLOBAL_METRICS.get_uptime_seconds()) } /// 获取事件指标 pub fn get_event_metrics(&self, event_type: EventType) -> EventMetricsSnapshot { - self.metrics.get_event_metrics(event_type) + GLOBAL_METRICS.get_event_metrics(event_type) } /// 获取处理时间统计 pub fn get_processing_stats(&self) -> ProcessingTimeStats { - self.metrics.get_processing_stats() + GLOBAL_METRICS.get_processing_stats() } /// 获取丢弃事件计数 pub fn get_dropped_events_count(&self) -> u64 { - self.metrics.get_dropped_events_count() + GLOBAL_METRICS.get_dropped_events_count() } /// 打印性能指标（非阻塞） pub fn print_metrics(&self) { - println!("\n📊 {} Performance Metrics", self.stream_name); + println!("\n📊 Performance Metrics"); println!(" Run Time: {:?}", self.get_uptime()); // 打印丢弃事件指标 @@ -496,34 +490,22 @@ impl MetricsManager { /// 启动自动性能监控任务 pub async fn start_auto_monitoring(&self) -> Option> { - if !self.enable_metrics { + if !self.is_enabled() { return None; } - let manager = self.clone(); - let handle = tokio::spawn(async move { + let handle = tokio::spawn(async { let mut interval = tokio::time::interval(std::time::Duration::from_secs( DEFAULT_METRICS_PRINT_INTERVAL_SECONDS, )); loop { interval.tick().await; - manager.print_metrics(); + MetricsManager::global().print_metrics(); } }); Some(handle) } - // === 兼容性方法 === - - /// 兼容性构造函数 - pub fn new_with_metrics( - _metrics: Arc>, - enable_metrics: bool, - stream_name: String, - ) -> Self { - Self::new(enable_metrics, stream_name) - } - /// 获取完整的性能指标（兼容性方法） pub fn get_metrics(&self) -> PerformanceMetrics { PerformanceMetrics { @@ -532,7 +514,7 @@ impl MetricsManager { account_metrics: self.get_event_metrics(EventType::Account), block_meta_metrics: self.get_event_metrics(EventType::BlockMeta), processing_stats: self.get_processing_stats(), - dropped_events_count: self.metrics.get_dropped_events_count(), + dropped_events_count: self.get_dropped_events_count(), } } @@ -569,54 +551,38 @@ impl MetricsManager { /// 增加丢弃事件计数 #[inline] pub fn increment_dropped_events(&self) { - if !self.enable_metrics { + if !self.is_enabled() { return; } // 原子地增加丢弃事件计数 - let new_count = self.metrics.dropped_events_count.fetch_add(1, Ordering::Relaxed) + 1; + let new_count = GLOBAL_METRICS.dropped_events_count.fetch_add(1, Ordering::Relaxed) + 1; // 每丢弃1000个事件记录一次警告日志 if new_count % 1000 == 0 { - log::debug!("{} dropped events count reached: {}", self.stream_name, new_count); + log::debug!("Dropped events count reached: {}", new_count); } } /// 批量增加丢弃事件计数 #[inline] pub fn increment_dropped_events_by(&self, count: u64) { - if !self.enable_metrics || count == 0 { + if !self.is_enabled() || count == 0 { return; } // 原子地增加丢弃事件计数 let new_count = - self.metrics.dropped_events_count.fetch_add(count, Ordering::Relaxed) + count; + GLOBAL_METRICS.dropped_events_count.fetch_add(count, Ordering::Relaxed) + count; // 记录批量丢弃事件的日志 if count > 1 { - log::debug!( - "{} dropped batch of {} events, total dropped: {}", - self.stream_name, - count, - new_count - ); + log::debug!("Dropped batch of {} events, total dropped: {}", count, new_count); } // 每丢弃1000个事件记录一次警告日志 if new_count % 1000 == 0 || (new_count / 1000) != ((new_count - count) / 1000) { - log::debug!("{} dropped events count reached: {}", self.stream_name, new_count); - } - } -} - -impl Clone for MetricsManager { - fn clone(&self) -> Self { - Self { - metrics: self.metrics.clone(), - enable_metrics: self.enable_metrics, - stream_name: self.stream_name.clone(), - background_task_running: AtomicBool::new(false), // 新实例不自动启动后台任务 + log::debug!("Dropped events count reached: {}", new_count); } } } diff --git a/src/streaming/event_parser/common/mod.rs b/src/streaming/event_parser/common/mod.rs index 479d978..3794626 100755 --- a/src/streaming/event_parser/common/mod.rs +++ b/src/streaming/event_parser/common/mod.rs @@ -1,79 +1,6 @@ -pub mod types; -pub mod utils; pub mod filter; pub mod high_performance_clock; - -/// 自动生成UnifiedEvent trait实现的宏 -#[macro_export] -macro_rules! impl_unified_event { - // 带有自定义ID表达式的版本 - ($struct_name:ident, $($field:ident),*) => { - impl $crate::streaming::event_parser::core::traits::UnifiedEvent for $struct_name { - fn event_type(&self) -> $crate::streaming::event_parser::common::types::EventType { - self.metadata.event_type.clone() - } - - fn signature(&self) -> &solana_sdk::signature::Signature { - &self.metadata.signature - } - - fn slot(&self) -> u64 { - self.metadata.slot - } - - fn recv_us(&self) -> i64 { - self.metadata.recv_us - } - - fn handle_us(&self) -> i64 { - self.metadata.handle_us - } - - fn set_handle_us(&mut self, handle_us: i64) { - self.metadata.handle_us = handle_us; - } - - fn as_any(&self) -> &dyn std::any::Any { - self - } - - fn as_any_mut(&mut self) -> &mut dyn std::any::Any { - self - } - - fn clone_boxed(&self) -> Box { - Box::new(self.clone()) - } - - fn merge(&mut self, other: &dyn $crate::streaming::event_parser::core::traits::UnifiedEvent) { - if let Some(_e) = other.as_any().downcast_ref::<$struct_name>() { - $( - self.$field = _e.$field.clone(); - )* - } - } - - fn set_swap_data(&mut self, swap_data: $crate::streaming::event_parser::common::types::SwapData) { - self.metadata.set_swap_data(swap_data); - } - - fn swap_data_is_parsed(&self) -> bool { - self.metadata.swap_data.is_some() - } - - fn outer_index(&self) -> i64 { - self.metadata.outer_index - } - - fn inner_index(&self) -> Option { - self.metadata.inner_index - } - fn transaction_index(&self) -> Option { - self.metadata.transaction_index - } - } - }; -} - +pub mod types; +pub mod utils; pub use types::*; pub use utils::*; diff --git a/src/streaming/event_parser/common/types.rs b/src/streaming/event_parser/common/types.rs index 0aabf08..c28c048 100755 --- a/src/streaming/event_parser/common/types.rs +++ b/src/streaming/event_parser/common/types.rs @@ -4,23 +4,7 @@ use serde::{Deserialize, Serialize}; use solana_sdk::{pubkey::Pubkey, signature::Signature}; use std::{borrow::Cow, fmt, str::FromStr, sync::Arc}; -use crate::{ - match_event, - streaming::{ - common::SimdUtils, - event_parser::{ - protocols::{ - bonk::BonkTradeEvent, - pumpfun::PumpFunTradeEvent, - pumpswap::{PumpSwapBuyEvent, PumpSwapSellEvent}, - raydium_amm_v4::RaydiumAmmV4SwapEvent, - raydium_clmm::{RaydiumClmmSwapEvent, RaydiumClmmSwapV2Event}, - raydium_cpmm::RaydiumCpmmSwapEvent, - }, - UnifiedEvent, - }, - }, -}; +use crate::streaming::{common::SimdUtils, event_parser::UnifiedEvent}; // Object pool size configuration const EVENT_METADATA_POOL_SIZE: usize = 1000; @@ -364,7 +348,7 @@ lazy_static::lazy_static! { /// Parse token transfer data from next instructions pub fn parse_swap_data_from_next_instructions( - event: &dyn UnifiedEvent, + event: &UnifiedEvent, inner_instruction: &solana_transaction_status::InnerInstructions, current_index: i8, accounts: &[Pubkey], @@ -378,7 +362,7 @@ pub fn parse_swap_data_from_next_instructions( }; // 先根据 event 取出关键信息 - let mut user: Option = None; + // let mut user: Option = None; let mut from_mint: Option = None; let mut to_mint: Option = None; let mut user_from_token: Option = None; @@ -386,63 +370,66 @@ pub fn parse_swap_data_from_next_instructions( let mut from_vault: Option = None; let mut to_vault: Option = None; - match_event!(&*event, { - BonkTradeEvent => |e: BonkTradeEvent| { - user = Some(e.payer); + match event { + UnifiedEvent::BonkTradeEvent(e) => { + // user = Some(e.payer); from_mint = Some(e.base_token_mint); to_mint = Some(e.quote_token_mint); user_from_token = Some(e.user_base_token); user_to_token = Some(e.user_quote_token); from_vault = Some(e.base_vault); to_vault = Some(e.quote_vault); - }, - PumpFunTradeEvent => |e: PumpFunTradeEvent| { + } + UnifiedEvent::PumpFunTradeEvent(e) => { swap_data.from_mint = if e.is_buy { *SOL_MINT } else { e.mint }; - swap_data.to_mint = if e.is_buy { e.mint } else { *SOL_MINT }; - }, - PumpSwapBuyEvent => |e: PumpSwapBuyEvent| { + swap_data.to_mint = if e.is_buy { e.mint } else { *SOL_MINT }; + } + UnifiedEvent::PumpSwapBuyEvent(e) => { swap_data.from_mint = e.quote_mint; - swap_data.to_mint = e.base_mint; - }, - PumpSwapSellEvent => |e: PumpSwapSellEvent| { + swap_data.to_mint = e.base_mint; + } + UnifiedEvent::PumpSwapSellEvent(e) => { swap_data.from_mint = e.base_mint; - swap_data.to_mint = e.quote_mint; - }, - RaydiumCpmmSwapEvent => |e: RaydiumCpmmSwapEvent| { - user = Some(e.payer); + swap_data.to_mint = e.quote_mint; + } + UnifiedEvent::RaydiumCpmmSwapEvent(e) => { + // user = Some(e.payer); from_mint = Some(e.input_token_mint); - to_mint = Some(e.output_token_mint); + to_mint = Some(e.output_token_mint); user_from_token = Some(e.input_token_account); - user_to_token = Some(e.output_token_account); + user_to_token = Some(e.output_token_account); from_vault = Some(e.input_vault); - to_vault = Some(e.output_vault); - }, - RaydiumClmmSwapEvent => |e: RaydiumClmmSwapEvent| { - user = Some(e.payer); - swap_data.description = Some("Unable to get from_mint and to_mint from RaydiumClmmSwapEvent".into()); + to_vault = Some(e.output_vault); + } + UnifiedEvent::RaydiumClmmSwapEvent(e) => { + // user = Some(e.payer); + swap_data.description = + Some("Unable to get from_mint and to_mint from RaydiumClmmSwapEvent".into()); user_from_token = Some(e.input_token_account); - user_to_token = Some(e.output_token_account); + user_to_token = Some(e.output_token_account); from_vault = Some(e.input_vault); - to_vault = Some(e.output_vault); - }, - RaydiumClmmSwapV2Event => |e: RaydiumClmmSwapV2Event| { - user = Some(e.payer); + to_vault = Some(e.output_vault); + } + UnifiedEvent::RaydiumClmmSwapV2Event(e) => { + // user = Some(e.payer); from_mint = Some(e.input_vault_mint); - to_mint = Some(e.output_vault_mint); + to_mint = Some(e.output_vault_mint); user_from_token = Some(e.input_token_account); - user_to_token = Some(e.output_token_account); + user_to_token = Some(e.output_token_account); from_vault = Some(e.input_vault); - to_vault = Some(e.output_vault); - }, - RaydiumAmmV4SwapEvent => |e: RaydiumAmmV4SwapEvent| { - user = Some(e.user_source_owner); - swap_data.description = Some("Unable to get from_mint and to_mint from RaydiumAmmV4SwapEvent".into()); + to_vault = Some(e.output_vault); + } + UnifiedEvent::RaydiumAmmV4SwapEvent(e) => { + // user = Some(e.user_source_owner); + swap_data.description = + Some("Unable to get from_mint and to_mint from RaydiumAmmV4SwapEvent".into()); user_from_token = Some(e.user_source_token_account); - user_to_token = Some(e.user_destination_token_account); + user_to_token = Some(e.user_destination_token_account); from_vault = Some(e.pool_pc_token_account); - to_vault = Some(e.pool_coin_token_account); - }, - }); + to_vault = Some(e.pool_coin_token_account); + } + _ => {} + } let user_to_token = user_to_token.unwrap_or_default(); let user_from_token = user_from_token.unwrap_or_default(); @@ -531,7 +518,7 @@ pub fn parse_swap_data_from_next_instructions( /// Parse token transfer data from next instructions /// TODO: - wait refactor pub fn parse_swap_data_from_next_grpc_instructions( - event: &dyn UnifiedEvent, + event: &UnifiedEvent, inner_instruction: &yellowstone_grpc_proto::prelude::InnerInstructions, current_index: i8, accounts: &[Pubkey], @@ -545,7 +532,7 @@ pub fn parse_swap_data_from_next_grpc_instructions( }; // 先根据 event 取出关键信息 - let mut user: Option = None; + // let mut user: Option = None; let mut from_mint: Option = None; let mut to_mint: Option = None; let mut user_from_token: Option = None; @@ -553,63 +540,66 @@ pub fn parse_swap_data_from_next_grpc_instructions( let mut from_vault: Option = None; let mut to_vault: Option = None; - match_event!(&*event, { - BonkTradeEvent => |e: BonkTradeEvent| { - user = Some(e.payer); + match event { + UnifiedEvent::BonkTradeEvent(e) => { + // user = Some(e.payer); from_mint = Some(e.base_token_mint); to_mint = Some(e.quote_token_mint); user_from_token = Some(e.user_base_token); user_to_token = Some(e.user_quote_token); from_vault = Some(e.base_vault); to_vault = Some(e.quote_vault); - }, - PumpFunTradeEvent => |e: PumpFunTradeEvent| { + } + UnifiedEvent::PumpFunTradeEvent(e) => { swap_data.from_mint = if e.is_buy { *SOL_MINT } else { e.mint }; - swap_data.to_mint = if e.is_buy { e.mint } else { *SOL_MINT }; - }, - PumpSwapBuyEvent => |e: PumpSwapBuyEvent| { + swap_data.to_mint = if e.is_buy { e.mint } else { *SOL_MINT }; + } + UnifiedEvent::PumpSwapBuyEvent(e) => { swap_data.from_mint = e.quote_mint; - swap_data.to_mint = e.base_mint; - }, - PumpSwapSellEvent => |e: PumpSwapSellEvent| { + swap_data.to_mint = e.base_mint; + } + UnifiedEvent::PumpSwapSellEvent(e) => { swap_data.from_mint = e.base_mint; - swap_data.to_mint = e.quote_mint; - }, - RaydiumCpmmSwapEvent => |e: RaydiumCpmmSwapEvent| { - user = Some(e.payer); + swap_data.to_mint = e.quote_mint; + } + UnifiedEvent::RaydiumCpmmSwapEvent(e) => { + // user = Some(e.payer); from_mint = Some(e.input_token_mint); - to_mint = Some(e.output_token_mint); + to_mint = Some(e.output_token_mint); user_from_token = Some(e.input_token_account); - user_to_token = Some(e.output_token_account); + user_to_token = Some(e.output_token_account); from_vault = Some(e.input_vault); - to_vault = Some(e.output_vault); - }, - RaydiumClmmSwapEvent => |e: RaydiumClmmSwapEvent| { - user = Some(e.payer); - swap_data.description = Some("Unable to get from_mint and to_mint from RaydiumClmmSwapEvent".into()); + to_vault = Some(e.output_vault); + } + UnifiedEvent::RaydiumClmmSwapEvent(e) => { + // user = Some(e.payer); + swap_data.description = + Some("Unable to get from_mint and to_mint from RaydiumClmmSwapEvent".into()); user_from_token = Some(e.input_token_account); - user_to_token = Some(e.output_token_account); + user_to_token = Some(e.output_token_account); from_vault = Some(e.input_vault); - to_vault = Some(e.output_vault); - }, - RaydiumClmmSwapV2Event => |e: RaydiumClmmSwapV2Event| { - user = Some(e.payer); + to_vault = Some(e.output_vault); + } + UnifiedEvent::RaydiumClmmSwapV2Event(e) => { + // user = Some(e.payer); from_mint = Some(e.input_vault_mint); - to_mint = Some(e.output_vault_mint); + to_mint = Some(e.output_vault_mint); user_from_token = Some(e.input_token_account); - user_to_token = Some(e.output_token_account); + user_to_token = Some(e.output_token_account); from_vault = Some(e.input_vault); - to_vault = Some(e.output_vault); - }, - RaydiumAmmV4SwapEvent => |e: RaydiumAmmV4SwapEvent| { - user = Some(e.user_source_owner); - swap_data.description = Some("Unable to get from_mint and to_mint from RaydiumAmmV4SwapEvent".into()); + to_vault = Some(e.output_vault); + } + UnifiedEvent::RaydiumAmmV4SwapEvent(e) => { + // user = Some(e.user_source_owner); + swap_data.description = + Some("Unable to get from_mint and to_mint from RaydiumAmmV4SwapEvent".into()); user_from_token = Some(e.user_source_token_account); - user_to_token = Some(e.user_destination_token_account); + user_to_token = Some(e.user_destination_token_account); from_vault = Some(e.pool_pc_token_account); - to_vault = Some(e.pool_coin_token_account); - }, - }); + to_vault = Some(e.pool_coin_token_account); + } + _ => {} + } let user_to_token = user_to_token.unwrap_or_default(); let user_from_token = user_from_token.unwrap_or_default(); diff --git a/src/streaming/event_parser/core/account_event_parser.rs b/src/streaming/event_parser/core/account_event_parser.rs index 8a9090e..f605b94 100644 --- a/src/streaming/event_parser/core/account_event_parser.rs +++ b/src/streaming/event_parser/core/account_event_parser.rs @@ -1,4 +1,3 @@ -use crate::impl_unified_event; use crate::streaming::common::SimdUtils; use crate::streaming::event_parser::common::filter::EventTypeFilter; use crate::streaming::event_parser::common::high_performance_clock::elapsed_micros_since; @@ -46,7 +45,6 @@ pub struct TokenAccountEvent { pub amount: Option, pub token_owner: Pubkey, } -impl_unified_event!(TokenAccountEvent,); /// Nonce account event #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] @@ -60,7 +58,6 @@ pub struct NonceAccountEvent { pub nonce: String, pub authority: String, } -impl_unified_event!(NonceAccountEvent,); /// Nonce account event #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] @@ -74,11 +71,10 @@ pub struct TokenInfoEvent { pub supply: u64, pub decimals: u8, } -impl_unified_event!(TokenInfoEvent,); /// 账户事件解析器 pub type AccountEventParserFn = - fn(account: &AccountPretty, metadata: EventMetadata) -> Option>; + fn(account: &AccountPretty, metadata: EventMetadata) -> Option; static PROTOCOL_CONFIGS_CACHE: OnceLock>> = OnceLock::new(); @@ -256,7 +252,7 @@ impl AccountEventParser { protocols: &[Protocol], account: AccountPretty, event_type_filter: Option<&EventTypeFilter>, - ) -> Option> { + ) -> Option { let configs = Self::configs(protocols, event_type_filter); for config in configs { if config.program_id == Pubkey::default() @@ -275,13 +271,11 @@ impl AccountEventParser { event_type: config.event_type, program_id: config.program_id, recv_us: account.recv_us, + handle_us: elapsed_micros_since(account.recv_us), ..Default::default() }, ); - if let Some(mut event) = event { - event.set_handle_us(elapsed_micros_since(account.recv_us)); - return Some(event); - } + return event; } } None @@ -290,7 +284,7 @@ impl AccountEventParser { pub fn parse_token_account_event( account: &AccountPretty, metadata: EventMetadata, - ) -> Option> { + ) -> Option { let pubkey = account.pubkey; let executable = account.executable; let lamports = account.lamports; @@ -310,8 +304,8 @@ impl AccountEventParser { decimals: mint.decimals, }; let recv_delta = elapsed_micros_since(account.recv_us); - event.set_handle_us(recv_delta); - return Some(Box::new(event)); + event.metadata.handle_us = recv_delta; + return Some(UnifiedEvent::TokenInfoEvent(event)); } } // Spl Token2022 Mint @@ -328,8 +322,8 @@ impl AccountEventParser { decimals: mint.base.decimals, }; let recv_delta = elapsed_micros_since(account.recv_us); - event.set_handle_us(recv_delta); - return Some(Box::new(event)); + event.metadata.handle_us = recv_delta; + return Some(UnifiedEvent::TokenInfoEvent(event)); } } let amount = if account.owner.to_bytes() == spl_token_2022::ID.to_bytes() { @@ -351,14 +345,14 @@ impl AccountEventParser { token_owner: account.owner, }; let recv_delta = elapsed_micros_since(account.recv_us); - event.set_handle_us(recv_delta); - Some(Box::new(event)) + event.metadata.handle_us = recv_delta; + Some(UnifiedEvent::TokenAccountEvent(event)) } pub fn parse_nonce_account_event( account: &AccountPretty, metadata: EventMetadata, - ) -> Option> { + ) -> Option { if let Ok(info) = parse_nonce(&account.data) { match info { solana_account_decoder::parse_nonce::UiNonceState::Initialized(details) => { @@ -372,8 +366,8 @@ impl AccountEventParser { nonce: details.blockhash, authority: details.authority, }; - event.set_handle_us(elapsed_micros_since(account.recv_us)); - return Some(Box::new(event)); + event.metadata.handle_us = elapsed_micros_since(account.recv_us); + return Some(UnifiedEvent::NonceAccountEvent(event)); } solana_account_decoder::parse_nonce::UiNonceState::Uninitialized => {} } diff --git a/src/streaming/event_parser/core/common_event_parser.rs b/src/streaming/event_parser/core/common_event_parser.rs index 633a1b8..1775270 100644 --- a/src/streaming/event_parser/core/common_event_parser.rs +++ b/src/streaming/event_parser/core/common_event_parser.rs @@ -10,9 +10,9 @@ impl CommonEventParser { block_hash: String, block_time_ms: i64, recv_us: i64, - ) -> Box { + ) -> UnifiedEvent { let mut block_meta_event = BlockMetaEvent::new(slot, block_hash, block_time_ms, recv_us); - block_meta_event.set_handle_us(elapsed_micros_since(recv_us)); - Box::new(block_meta_event) + block_meta_event.metadata.handle_us = elapsed_micros_since(recv_us); + UnifiedEvent::BlockMetaEvent(block_meta_event) } } diff --git a/src/streaming/event_parser/core/event_parser.rs b/src/streaming/event_parser/core/event_parser.rs index de133f1..11251b2 100644 --- a/src/streaming/event_parser/core/event_parser.rs +++ b/src/streaming/event_parser/core/event_parser.rs @@ -12,9 +12,8 @@ use crate::streaming::{ is_dev_address_in_signature, }, protocols::{ - bonk::{parser::BONK_PROGRAM_ID, BonkPoolCreateEvent, BonkTradeEvent}, - pumpfun::{parser::PUMPFUN_PROGRAM_ID, PumpFunCreateTokenEvent, PumpFunTradeEvent}, - pumpswap::{parser::PUMPSWAP_PROGRAM_ID, PumpSwapBuyEvent, PumpSwapSellEvent}, + bonk::parser::BONK_PROGRAM_ID, pumpfun::parser::PUMPFUN_PROGRAM_ID, + pumpswap::parser::PUMPSWAP_PROGRAM_ID, raydium_amm_v4::parser::RAYDIUM_AMM_V4_PROGRAM_ID, raydium_clmm::parser::RAYDIUM_CLMM_PROGRAM_ID, raydium_cpmm::parser::RAYDIUM_CPMM_PROGRAM_ID, @@ -23,7 +22,10 @@ use crate::streaming::{ }, }; use prost_types::Timestamp; -use solana_sdk::{bs58, message::compiled_instruction::CompiledInstruction, pubkey::Pubkey, signature::Signature, transaction::VersionedTransaction}; +use solana_sdk::{ + bs58, message::compiled_instruction::CompiledInstruction, pubkey::Pubkey, signature::Signature, + transaction::VersionedTransaction, +}; use solana_transaction_status::{ EncodedConfirmedTransactionWithStatusMeta, InnerInstruction, InnerInstructions, UiInstruction, }; @@ -81,11 +83,11 @@ impl Default for AccountPubkeyCache { /// 内联指令事件解析器 pub type InnerInstructionEventParser = - fn(data: &[u8], metadata: EventMetadata) -> Option>; + fn(data: &[u8], metadata: EventMetadata) -> Option; /// 指令事件解析器 pub type InstructionEventParser = - fn(data: &[u8], accounts: &[Pubkey], metadata: EventMetadata) -> Option>; + fn(data: &[u8], accounts: &[Pubkey], metadata: EventMetadata) -> Option; /// 通用事件解析器配置 #[derive(Debug, Clone)] @@ -200,7 +202,7 @@ impl EventParser { inner_instructions: &[yellowstone_grpc_proto::prelude::InnerInstructions], bot_wallet: Option, transaction_index: Option, - callback: Arc Fn(&'a Box) + Send + Sync>, + callback: Arc Fn(&'a UnifiedEvent) + Send + Sync>, ) -> anyhow::Result<()> { // 获取交易的指令和账户 let mut accounts = accounts.to_vec(); @@ -283,7 +285,7 @@ impl EventParser { inner_instructions: &[InnerInstructions], bot_wallet: Option, transaction_index: Option, - callback: Arc Fn(&'a Box) + Send + Sync>, + callback: Arc Fn(&'a UnifiedEvent) + Send + Sync>, ) -> anyhow::Result<()> { // 获取交易的指令和账户 let compiled_instructions = transaction.message.instructions(); @@ -356,11 +358,11 @@ impl EventParser { bot_wallet: Option, transaction_index: Option, inner_instructions: &[InnerInstructions], - callback: Arc) + Send + Sync>, + callback: Arc, ) -> anyhow::Result<()> { // 创建适配器回调，将所有权回调转换为引用回调 - let adapter_callback = Arc::new(move |event: &Box| { - callback(event.clone_boxed()); + let adapter_callback = Arc::new(move |event: &UnifiedEvent| { + callback(event.clone()); }); self.parse_versioned_transaction( &versioned_tx, @@ -387,7 +389,7 @@ impl EventParser { bot_wallet: Option, transaction_index: Option, inner_instructions: &[InnerInstructions], - callback: Arc Fn(&'a Box) + Send + Sync>, + callback: Arc Fn(&'a UnifiedEvent) + Send + Sync>, ) -> anyhow::Result<()> { let accounts: Vec = versioned_tx.message.static_account_keys().to_vec(); self.parse_instruction_events_from_versioned_transaction( @@ -415,11 +417,11 @@ impl EventParser { recv_us: i64, bot_wallet: Option, transaction_index: Option, - callback: Arc) + Send + Sync>, + callback: Arc, ) -> anyhow::Result<()> { // 创建适配器回调，将所有权回调转换为引用回调 - let adapter_callback = Arc::new(move |event: &Box| { - callback(event.clone_boxed()); + let adapter_callback = Arc::new(move |event: &UnifiedEvent| { + callback(event.clone()); }); // 调用原始方法 self.parse_grpc_transaction( @@ -444,7 +446,7 @@ impl EventParser { recv_us: i64, bot_wallet: Option, transaction_index: Option, - callback: Arc Fn(&'a Box) + Send + Sync>, + callback: Arc Fn(&'a UnifiedEvent) + Send + Sync>, ) -> anyhow::Result<()> { if let Some(transition) = grpc_tx.transaction { if let Some(message) = &transition.message { @@ -508,7 +510,7 @@ impl EventParser { &self, signature: Signature, transaction: EncodedConfirmedTransactionWithStatusMeta, - callback: Arc Fn(&'a Box) + Send + Sync>, + callback: Arc Fn(&'a UnifiedEvent) + Send + Sync>, ) -> anyhow::Result<()> { let versioned_tx = match transaction.transaction.transaction.decode() { Some(tx) => tx, @@ -628,7 +630,7 @@ impl EventParser { outer_index: i64, inner_index: Option, transaction_index: Option, - ) -> Option> { + ) -> Option { if let Some(parser) = config.inner_instruction_parser { let timestamp = block_time.unwrap_or(Timestamp { seconds: 0, nanos: 0 }); let block_time_ms = timestamp.seconds * 1000 + (timestamp.nanos as i64) / 1_000_000; @@ -665,7 +667,7 @@ impl EventParser { outer_index: i64, inner_index: Option, transaction_index: Option, - ) -> Option> { + ) -> Option { if let Some(parser) = config.instruction_parser { let timestamp = block_time.unwrap_or(Timestamp { seconds: 0, nanos: 0 }); let block_time_ms = timestamp.seconds * 1000 + (timestamp.nanos as i64) / 1_000_000; @@ -701,7 +703,7 @@ impl EventParser { inner_index: Option, transaction_index: Option, config: &GenericEventParseConfig, - ) -> Vec> { + ) -> Vec { // Use SIMD-optimized data validation with correct discriminator length let discriminator_len = config.inner_instruction_discriminator.len(); if !SimdUtils::validate_instruction_data_simd( @@ -751,7 +753,7 @@ impl EventParser { inner_index: Option, transaction_index: Option, config: &GenericEventParseConfig, - ) -> Vec> { + ) -> Vec { // Use SIMD-optimized data validation with correct discriminator length let discriminator_len = config.inner_instruction_discriminator.len(); if !SimdUtils::validate_instruction_data_simd( @@ -803,7 +805,7 @@ impl EventParser { bot_wallet: Option, transaction_index: Option, inner_instructions: Option<&InnerInstructions>, - callback: Arc Fn(&'a Box) + Send + Sync>, + callback: Arc Fn(&'a UnifiedEvent) + Send + Sync>, ) -> anyhow::Result<()> { let program_id = accounts[instruction.program_id_index as usize]; if !self.should_handle(&program_id) { @@ -860,7 +862,7 @@ impl EventParser { for (_disc, config, mut event) in all_results { // 阻塞处理：原有的同步逻辑 - let mut inner_instruction_event: Option> = None; + let mut inner_instruction_event: Option = None; if inner_instructions.is_some() { let inner_instructions_ref = inner_instructions.unwrap(); @@ -887,9 +889,9 @@ impl EventParser { }); let swap_data_handle = s.spawn(|| { - if !event.swap_data_is_parsed() { + if !event.metadata().swap_data.is_some() { parse_swap_data_from_next_instructions( - &*event, + &event, inner_instructions_ref, inner_index.unwrap_or(-1_i64) as i8, &accounts, @@ -905,7 +907,7 @@ impl EventParser { inner_instruction_event = inner_event_result; if let Some(swap_data) = swap_data_result { - event.set_swap_data(swap_data); + event.metadata_mut().set_swap_data(swap_data); } } @@ -916,10 +918,10 @@ impl EventParser { // 合并事件 if let Some(inner_instruction_event) = inner_instruction_event { - event.merge(&*inner_instruction_event); + // event.merge(&*inner_instruction_event); } // 设置处理时间（使用高性能时钟） - event.set_handle_us(elapsed_micros_since(recv_us)); + event.metadata_mut().handle_us = elapsed_micros_since(recv_us); event = process_event(event, bot_wallet); callback(&event); } @@ -942,7 +944,7 @@ impl EventParser { bot_wallet: Option, transaction_index: Option, inner_instructions: Option<&yellowstone_grpc_proto::prelude::InnerInstructions>, - callback: Arc Fn(&'a Box) + Send + Sync>, + callback: Arc Fn(&'a UnifiedEvent) + Send + Sync>, ) -> anyhow::Result<()> { let program_id = accounts[instruction.program_id_index as usize]; if !self.should_handle(&program_id) { @@ -999,7 +1001,7 @@ impl EventParser { for (_disc, config, mut event) in all_results { // 阻塞处理：原有的同步逻辑 - let mut inner_instruction_event: Option> = None; + let mut inner_instruction_event: Option = None; if inner_instructions.is_some() { let inner_instructions_ref = inner_instructions.unwrap(); @@ -1026,9 +1028,9 @@ impl EventParser { }); let swap_data_handle = s.spawn(|| { - if !event.swap_data_is_parsed() { + if !event.metadata().swap_data.is_some() { parse_swap_data_from_next_grpc_instructions( - &*event, + &event, inner_instructions_ref, inner_index.unwrap_or(-1_i64) as i8, &accounts, @@ -1044,7 +1046,7 @@ impl EventParser { inner_instruction_event = inner_event_result; if let Some(swap_data) = swap_data_result { - event.set_swap_data(swap_data); + event.metadata_mut().set_swap_data(swap_data); } } @@ -1055,10 +1057,10 @@ impl EventParser { // 合并事件 if let Some(inner_instruction_event) = inner_instruction_event { - event.merge(&*inner_instruction_event); + // event.merge(&*inner_instruction_event); } // 设置处理时间（使用高性能时钟） - event.set_handle_us(elapsed_micros_since(recv_us)); + event.metadata_mut().handle_us = elapsed_micros_since(recv_us); event = process_event(event, bot_wallet); callback(&event); } @@ -1074,54 +1076,66 @@ impl EventParser { // } } -fn process_event( - mut event: Box, - bot_wallet: Option, -) -> Box { - let signature = *event.signature(); // Copy the signature to avoid borrowing issues - if let Some(token_info) = event.as_any().downcast_ref::() { - add_dev_address(&signature, token_info.user); - if token_info.creator != Pubkey::default() && token_info.creator != token_info.user { - add_dev_address(&signature, token_info.creator); +fn process_event(mut event: UnifiedEvent, bot_wallet: Option) -> UnifiedEvent { + let signature = event.metadata().signature; // Copy the signature to avoid borrowing issues + match event { + UnifiedEvent::PumpFunCreateTokenEvent(token_info) => { + add_dev_address(&signature, token_info.user); + if token_info.creator != Pubkey::default() && token_info.creator != token_info.user { + add_dev_address(&signature, token_info.creator); + } + UnifiedEvent::PumpFunCreateTokenEvent(token_info) } - } else if let Some(trade_info) = event.as_any_mut().downcast_mut::() { - if is_dev_address_in_signature(&signature, &trade_info.user) - || is_dev_address_in_signature(&signature, &trade_info.creator) - { - trade_info.is_dev_create_token_trade = true; - } else if Some(trade_info.user) == bot_wallet { - trade_info.is_bot = true; - } else { - trade_info.is_dev_create_token_trade = false; + UnifiedEvent::PumpFunTradeEvent(mut trade_info) => { + if is_dev_address_in_signature(&signature, &trade_info.user) + || is_dev_address_in_signature(&signature, &trade_info.creator) + { + trade_info.is_dev_create_token_trade = true; + } else if Some(trade_info.user) == bot_wallet { + trade_info.is_bot = true; + } else { + trade_info.is_dev_create_token_trade = false; + } + if trade_info.metadata.swap_data.is_some() { + trade_info.metadata.swap_data.as_mut().unwrap().from_amount = + if trade_info.is_buy { trade_info.sol_amount } else { trade_info.token_amount }; + trade_info.metadata.swap_data.as_mut().unwrap().to_amount = + if trade_info.is_buy { trade_info.token_amount } else { trade_info.sol_amount }; + } + UnifiedEvent::PumpFunTradeEvent(trade_info) } - if trade_info.metadata.swap_data.is_some() { - trade_info.metadata.swap_data.as_mut().unwrap().from_amount = - if trade_info.is_buy { trade_info.sol_amount } else { trade_info.token_amount }; - trade_info.metadata.swap_data.as_mut().unwrap().to_amount = - if trade_info.is_buy { trade_info.token_amount } else { trade_info.sol_amount }; + UnifiedEvent::PumpSwapBuyEvent(mut trade_info) => { + if trade_info.metadata.swap_data.is_some() { + trade_info.metadata.swap_data.as_mut().unwrap().from_amount = + trade_info.user_quote_amount_in; + trade_info.metadata.swap_data.as_mut().unwrap().to_amount = + trade_info.base_amount_out; + } + UnifiedEvent::PumpSwapBuyEvent(trade_info) } - } else if let Some(trade_info) = event.as_any_mut().downcast_mut::() { - if trade_info.metadata.swap_data.is_some() { - trade_info.metadata.swap_data.as_mut().unwrap().from_amount = - trade_info.user_quote_amount_in; - trade_info.metadata.swap_data.as_mut().unwrap().to_amount = trade_info.base_amount_out; + UnifiedEvent::PumpSwapSellEvent(mut trade_info) => { + if trade_info.metadata.swap_data.is_some() { + trade_info.metadata.swap_data.as_mut().unwrap().from_amount = + trade_info.base_amount_in; + trade_info.metadata.swap_data.as_mut().unwrap().to_amount = + trade_info.user_quote_amount_out; + } + UnifiedEvent::PumpSwapSellEvent(trade_info) } - } else if let Some(trade_info) = event.as_any_mut().downcast_mut::() { - if trade_info.metadata.swap_data.is_some() { - trade_info.metadata.swap_data.as_mut().unwrap().from_amount = trade_info.base_amount_in; - trade_info.metadata.swap_data.as_mut().unwrap().to_amount = - trade_info.user_quote_amount_out; + UnifiedEvent::BonkPoolCreateEvent(pool_info) => { + add_bonk_dev_address(&signature, pool_info.creator); + UnifiedEvent::BonkPoolCreateEvent(pool_info) } - } else if let Some(pool_info) = event.as_any().downcast_ref::() { - add_bonk_dev_address(&signature, pool_info.creator); - } else if let Some(trade_info) = event.as_any_mut().downcast_mut::() { - if is_bonk_dev_address_in_signature(&signature, &trade_info.payer) { - trade_info.is_dev_create_token_trade = true; - } else if Some(trade_info.payer) == bot_wallet { - trade_info.is_bot = true; - } else { - trade_info.is_dev_create_token_trade = false; + UnifiedEvent::BonkTradeEvent(mut trade_info) => { + if is_bonk_dev_address_in_signature(&signature, &trade_info.payer) { + trade_info.is_dev_create_token_trade = true; + } else if Some(trade_info.payer) == bot_wallet { + trade_info.is_bot = true; + } else { + trade_info.is_dev_create_token_trade = false; + } + UnifiedEvent::BonkTradeEvent(trade_info) } + _ => event, } - event } diff --git a/src/streaming/event_parser/core/traits.rs b/src/streaming/event_parser/core/traits.rs index 850e1f3..f5f6475 100755 --- a/src/streaming/event_parser/core/traits.rs +++ b/src/streaming/event_parser/core/traits.rs @@ -1,59 +1,181 @@ -use crate::streaming::event_parser::common::EventType; -use crate::streaming::event_parser::common::SwapData; -use solana_sdk::signature::Signature; +use crate::streaming::event_parser::common::EventMetadata; +use crate::streaming::event_parser::core::account_event_parser::{ + NonceAccountEvent, TokenAccountEvent, TokenInfoEvent, +}; +use crate::streaming::event_parser::protocols::block::block_meta_event::BlockMetaEvent; +use crate::streaming::event_parser::protocols::bonk::events::*; +use crate::streaming::event_parser::protocols::pumpfun::events::*; +use crate::streaming::event_parser::protocols::pumpswap::events::*; +use crate::streaming::event_parser::protocols::raydium_amm_v4::events::*; +use crate::streaming::event_parser::protocols::raydium_clmm::events::*; +use crate::streaming::event_parser::protocols::raydium_cpmm::events::*; +use serde::{Deserialize, Serialize}; use std::fmt::Debug; -/// Unified Event Interface - All protocol events must implement this trait -pub trait UnifiedEvent: Debug + Send + Sync { - /// Get event type - fn event_type(&self) -> EventType; +/// Unified Event Enum - Replaces the trait-based approach with a type-safe enum +#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +pub enum UnifiedEvent { + // Bonk events + BonkTradeEvent(BonkTradeEvent), + BonkPoolCreateEvent(BonkPoolCreateEvent), + BonkMigrateToAmmEvent(BonkMigrateToAmmEvent), + BonkMigrateToCpswapEvent(BonkMigrateToCpswapEvent), + BonkPoolStateAccountEvent(BonkPoolStateAccountEvent), + BonkGlobalConfigAccountEvent(BonkGlobalConfigAccountEvent), + BonkPlatformConfigAccountEvent(BonkPlatformConfigAccountEvent), - /// Get transaction signature - fn signature(&self) -> &Signature; + // PumpFun events + PumpFunCreateTokenEvent(PumpFunCreateTokenEvent), + PumpFunTradeEvent(PumpFunTradeEvent), + PumpFunMigrateEvent(PumpFunMigrateEvent), + PumpFunBondingCurveAccountEvent(PumpFunBondingCurveAccountEvent), + PumpFunGlobalAccountEvent(PumpFunGlobalAccountEvent), - /// Get slot number - fn slot(&self) -> u64; + // PumpSwap events + PumpSwapBuyEvent(PumpSwapBuyEvent), + PumpSwapSellEvent(PumpSwapSellEvent), + PumpSwapCreatePoolEvent(PumpSwapCreatePoolEvent), + PumpSwapDepositEvent(PumpSwapDepositEvent), + PumpSwapWithdrawEvent(PumpSwapWithdrawEvent), + PumpSwapGlobalConfigAccountEvent(PumpSwapGlobalConfigAccountEvent), + PumpSwapPoolAccountEvent(PumpSwapPoolAccountEvent), - /// Get program received timestamp (milliseconds) - fn recv_us(&self) -> i64; + // Raydium AMM V4 events + RaydiumAmmV4SwapEvent(RaydiumAmmV4SwapEvent), + RaydiumAmmV4DepositEvent(RaydiumAmmV4DepositEvent), + RaydiumAmmV4WithdrawEvent(RaydiumAmmV4WithdrawEvent), + RaydiumAmmV4WithdrawPnlEvent(RaydiumAmmV4WithdrawPnlEvent), + RaydiumAmmV4Initialize2Event(RaydiumAmmV4Initialize2Event), + RaydiumAmmV4AmmInfoAccountEvent(RaydiumAmmV4AmmInfoAccountEvent), - /// Processing time consumption (milliseconds) - fn handle_us(&self) -> i64; + // Raydium CLMM events + RaydiumClmmSwapEvent(RaydiumClmmSwapEvent), + RaydiumClmmSwapV2Event(RaydiumClmmSwapV2Event), + RaydiumClmmClosePositionEvent(RaydiumClmmClosePositionEvent), + RaydiumClmmIncreaseLiquidityV2Event(RaydiumClmmIncreaseLiquidityV2Event), + RaydiumClmmDecreaseLiquidityV2Event(RaydiumClmmDecreaseLiquidityV2Event), + RaydiumClmmCreatePoolEvent(RaydiumClmmCreatePoolEvent), + RaydiumClmmOpenPositionWithToken22NftEvent(RaydiumClmmOpenPositionWithToken22NftEvent), + RaydiumClmmOpenPositionV2Event(RaydiumClmmOpenPositionV2Event), + RaydiumClmmAmmConfigAccountEvent(RaydiumClmmAmmConfigAccountEvent), + RaydiumClmmPoolStateAccountEvent(RaydiumClmmPoolStateAccountEvent), + RaydiumClmmTickArrayStateAccountEvent(RaydiumClmmTickArrayStateAccountEvent), - /// Set processing time consumption (milliseconds) - fn set_handle_us(&mut self, handle_us: i64); + // Raydium CPMM events + RaydiumCpmmSwapEvent(RaydiumCpmmSwapEvent), + RaydiumCpmmDepositEvent(RaydiumCpmmDepositEvent), + RaydiumCpmmWithdrawEvent(RaydiumCpmmWithdrawEvent), + RaydiumCpmmInitializeEvent(RaydiumCpmmInitializeEvent), + RaydiumCpmmAmmConfigAccountEvent(RaydiumCpmmAmmConfigAccountEvent), + RaydiumCpmmPoolStateAccountEvent(RaydiumCpmmPoolStateAccountEvent), - /// Convert event to Any for downcasting - fn as_any(&self) -> &dyn std::any::Any; - - /// Convert event to mutable Any for downcasting - fn as_any_mut(&mut self) -> &mut dyn std::any::Any; - - /// Clone the event - fn clone_boxed(&self) -> Box; - - /// Merge events (optional implementation) - fn merge(&mut self, _other: &dyn UnifiedEvent) { - // Default implementation: no merging operation - } - - /// Set swap data - fn set_swap_data(&mut self, swap_data: SwapData); - - /// swap_data is parsed - fn swap_data_is_parsed(&self) -> bool; - - /// Get index - fn outer_index(&self) -> i64; - fn inner_index(&self) -> Option; - - /// Get transaction index in slot - fn transaction_index(&self) -> Option; + // Common events + TokenAccountEvent(TokenAccountEvent), + NonceAccountEvent(NonceAccountEvent), + TokenInfoEvent(TokenInfoEvent), + BlockMetaEvent(BlockMetaEvent), } -// 为Box实现Clone -impl Clone for Box { - fn clone(&self) -> Self { - self.clone_boxed() +impl UnifiedEvent { + pub fn metadata(&self) -> &EventMetadata { + match self { + UnifiedEvent::BonkTradeEvent(e) => &e.metadata, + UnifiedEvent::BonkPoolCreateEvent(e) => &e.metadata, + UnifiedEvent::BonkMigrateToAmmEvent(e) => &e.metadata, + UnifiedEvent::BonkMigrateToCpswapEvent(e) => &e.metadata, + UnifiedEvent::BonkPoolStateAccountEvent(e) => &e.metadata, + UnifiedEvent::BonkGlobalConfigAccountEvent(e) => &e.metadata, + UnifiedEvent::BonkPlatformConfigAccountEvent(e) => &e.metadata, + UnifiedEvent::PumpFunCreateTokenEvent(e) => &e.metadata, + UnifiedEvent::PumpFunTradeEvent(e) => &e.metadata, + UnifiedEvent::PumpFunMigrateEvent(e) => &e.metadata, + UnifiedEvent::PumpFunBondingCurveAccountEvent(e) => &e.metadata, + UnifiedEvent::PumpFunGlobalAccountEvent(e) => &e.metadata, + UnifiedEvent::PumpSwapBuyEvent(e) => &e.metadata, + UnifiedEvent::PumpSwapSellEvent(e) => &e.metadata, + UnifiedEvent::PumpSwapCreatePoolEvent(e) => &e.metadata, + UnifiedEvent::PumpSwapDepositEvent(e) => &e.metadata, + UnifiedEvent::PumpSwapWithdrawEvent(e) => &e.metadata, + UnifiedEvent::PumpSwapGlobalConfigAccountEvent(e) => &e.metadata, + UnifiedEvent::PumpSwapPoolAccountEvent(e) => &e.metadata, + UnifiedEvent::RaydiumAmmV4SwapEvent(e) => &e.metadata, + UnifiedEvent::RaydiumAmmV4DepositEvent(e) => &e.metadata, + UnifiedEvent::RaydiumAmmV4WithdrawEvent(e) => &e.metadata, + UnifiedEvent::RaydiumAmmV4WithdrawPnlEvent(e) => &e.metadata, + UnifiedEvent::RaydiumAmmV4Initialize2Event(e) => &e.metadata, + UnifiedEvent::RaydiumAmmV4AmmInfoAccountEvent(e) => &e.metadata, + UnifiedEvent::RaydiumClmmSwapEvent(e) => &e.metadata, + UnifiedEvent::RaydiumClmmSwapV2Event(e) => &e.metadata, + UnifiedEvent::RaydiumClmmClosePositionEvent(e) => &e.metadata, + UnifiedEvent::RaydiumClmmIncreaseLiquidityV2Event(e) => &e.metadata, + UnifiedEvent::RaydiumClmmDecreaseLiquidityV2Event(e) => &e.metadata, + UnifiedEvent::RaydiumClmmCreatePoolEvent(e) => &e.metadata, + UnifiedEvent::RaydiumClmmOpenPositionWithToken22NftEvent(e) => &e.metadata, + UnifiedEvent::RaydiumClmmOpenPositionV2Event(e) => &e.metadata, + UnifiedEvent::RaydiumClmmAmmConfigAccountEvent(e) => &e.metadata, + UnifiedEvent::RaydiumClmmPoolStateAccountEvent(e) => &e.metadata, + UnifiedEvent::RaydiumClmmTickArrayStateAccountEvent(e) => &e.metadata, + UnifiedEvent::RaydiumCpmmSwapEvent(e) => &e.metadata, + UnifiedEvent::RaydiumCpmmDepositEvent(e) => &e.metadata, + UnifiedEvent::RaydiumCpmmWithdrawEvent(e) => &e.metadata, + UnifiedEvent::RaydiumCpmmInitializeEvent(e) => &e.metadata, + UnifiedEvent::RaydiumCpmmAmmConfigAccountEvent(e) => &e.metadata, + UnifiedEvent::RaydiumCpmmPoolStateAccountEvent(e) => &e.metadata, + UnifiedEvent::TokenAccountEvent(e) => &e.metadata, + UnifiedEvent::NonceAccountEvent(e) => &e.metadata, + UnifiedEvent::TokenInfoEvent(e) => &e.metadata, + UnifiedEvent::BlockMetaEvent(e) => &e.metadata, + } + } + + pub fn metadata_mut(&mut self) -> &mut EventMetadata { + match self { + UnifiedEvent::BonkTradeEvent(e) => &mut e.metadata, + UnifiedEvent::BonkPoolCreateEvent(e) => &mut e.metadata, + UnifiedEvent::BonkMigrateToAmmEvent(e) => &mut e.metadata, + UnifiedEvent::BonkMigrateToCpswapEvent(e) => &mut e.metadata, + UnifiedEvent::BonkPoolStateAccountEvent(e) => &mut e.metadata, + UnifiedEvent::BonkGlobalConfigAccountEvent(e) => &mut e.metadata, + UnifiedEvent::BonkPlatformConfigAccountEvent(e) => &mut e.metadata, + UnifiedEvent::PumpFunCreateTokenEvent(e) => &mut e.metadata, + UnifiedEvent::PumpFunTradeEvent(e) => &mut e.metadata, + UnifiedEvent::PumpFunMigrateEvent(e) => &mut e.metadata, + UnifiedEvent::PumpFunBondingCurveAccountEvent(e) => &mut e.metadata, + UnifiedEvent::PumpFunGlobalAccountEvent(e) => &mut e.metadata, + UnifiedEvent::PumpSwapBuyEvent(e) => &mut e.metadata, + UnifiedEvent::PumpSwapSellEvent(e) => &mut e.metadata, + UnifiedEvent::PumpSwapCreatePoolEvent(e) => &mut e.metadata, + UnifiedEvent::PumpSwapDepositEvent(e) => &mut e.metadata, + UnifiedEvent::PumpSwapWithdrawEvent(e) => &mut e.metadata, + UnifiedEvent::PumpSwapGlobalConfigAccountEvent(e) => &mut e.metadata, + UnifiedEvent::PumpSwapPoolAccountEvent(e) => &mut e.metadata, + UnifiedEvent::RaydiumAmmV4SwapEvent(e) => &mut e.metadata, + UnifiedEvent::RaydiumAmmV4DepositEvent(e) => &mut e.metadata, + UnifiedEvent::RaydiumAmmV4WithdrawEvent(e) => &mut e.metadata, + UnifiedEvent::RaydiumAmmV4WithdrawPnlEvent(e) => &mut e.metadata, + UnifiedEvent::RaydiumAmmV4Initialize2Event(e) => &mut e.metadata, + UnifiedEvent::RaydiumAmmV4AmmInfoAccountEvent(e) => &mut e.metadata, + UnifiedEvent::RaydiumClmmSwapEvent(e) => &mut e.metadata, + UnifiedEvent::RaydiumClmmSwapV2Event(e) => &mut e.metadata, + UnifiedEvent::RaydiumClmmClosePositionEvent(e) => &mut e.metadata, + UnifiedEvent::RaydiumClmmIncreaseLiquidityV2Event(e) => &mut e.metadata, + UnifiedEvent::RaydiumClmmDecreaseLiquidityV2Event(e) => &mut e.metadata, + UnifiedEvent::RaydiumClmmCreatePoolEvent(e) => &mut e.metadata, + UnifiedEvent::RaydiumClmmOpenPositionWithToken22NftEvent(e) => &mut e.metadata, + UnifiedEvent::RaydiumClmmOpenPositionV2Event(e) => &mut e.metadata, + UnifiedEvent::RaydiumClmmAmmConfigAccountEvent(e) => &mut e.metadata, + UnifiedEvent::RaydiumClmmPoolStateAccountEvent(e) => &mut e.metadata, + UnifiedEvent::RaydiumClmmTickArrayStateAccountEvent(e) => &mut e.metadata, + UnifiedEvent::RaydiumCpmmSwapEvent(e) => &mut e.metadata, + UnifiedEvent::RaydiumCpmmDepositEvent(e) => &mut e.metadata, + UnifiedEvent::RaydiumCpmmWithdrawEvent(e) => &mut e.metadata, + UnifiedEvent::RaydiumCpmmInitializeEvent(e) => &mut e.metadata, + UnifiedEvent::RaydiumCpmmAmmConfigAccountEvent(e) => &mut e.metadata, + UnifiedEvent::RaydiumCpmmPoolStateAccountEvent(e) => &mut e.metadata, + UnifiedEvent::TokenAccountEvent(e) => &mut e.metadata, + UnifiedEvent::NonceAccountEvent(e) => &mut e.metadata, + UnifiedEvent::TokenInfoEvent(e) => &mut e.metadata, + UnifiedEvent::BlockMetaEvent(e) => &mut e.metadata, + } } } diff --git a/src/streaming/event_parser/mod.rs b/src/streaming/event_parser/mod.rs index cb5a70f..a53ba60 100755 --- a/src/streaming/event_parser/mod.rs +++ b/src/streaming/event_parser/mod.rs @@ -3,38 +3,4 @@ pub mod core; pub mod protocols; pub use core::traits::UnifiedEvent; -pub use protocols::types::Protocol; - -/// 宏：简化 downcast_ref 模式匹配 -/// -/// # 使用示例 -/// ``` -/// use sol_trade_sdk::event_parser::match_event; -/// -/// match_event!(event, { -/// PumpSwapCreatePoolEvent => |typed_event| { -/// println!("CreatePool event: {:?}", typed_event); -/// }, -/// PumpSwapDepositEvent => |typed_event| { -/// // 处理存款事件 -/// }, -/// }); -/// ``` -#[macro_export] -macro_rules! match_event { - ($event:expr, { - $($event_type:ty => $handler:expr),* $(,)? - }) => { - $( - if let Some(typed_event) = $event.as_any().downcast_ref::<$event_type>() { - $handler(typed_event.clone()); - } else - )* - { - // 默认情况：什么都不做 - } - }; -} - -// 重新导出宏以便于使用 -pub use match_event; +pub use protocols::types::Protocol; \ No newline at end of file diff --git a/src/streaming/event_parser/protocols/block/block_meta_event.rs b/src/streaming/event_parser/protocols/block/block_meta_event.rs index 59390ce..6d606c6 100644 --- a/src/streaming/event_parser/protocols/block/block_meta_event.rs +++ b/src/streaming/event_parser/protocols/block/block_meta_event.rs @@ -1,4 +1,3 @@ -use crate::impl_unified_event; use crate::streaming::event_parser::common::{types::EventType, EventMetadata}; use borsh::BorshDeserialize; use serde::{Deserialize, Serialize}; @@ -36,6 +35,3 @@ impl BlockMetaEvent { Self { metadata, slot, block_hash } } } - -// 使用macro生成UnifiedEvent实现 -impl_unified_event!(BlockMetaEvent,); diff --git a/src/streaming/event_parser/protocols/bonk/events.rs b/src/streaming/event_parser/protocols/bonk/events.rs index ed651d5..42457a7 100755 --- a/src/streaming/event_parser/protocols/bonk/events.rs +++ b/src/streaming/event_parser/protocols/bonk/events.rs @@ -1,4 +1,3 @@ -use crate::impl_unified_event; use crate::streaming::event_parser::common::EventMetadata; use crate::streaming::event_parser::protocols::bonk::types::{ CurveParams, MintParams, PoolStatus, TradeDirection, VestingParams, @@ -82,26 +81,26 @@ pub fn bonk_trade_event_log_decode(data: &[u8]) -> Option { } // Macro to generate UnifiedEvent implementation, specifying the fields to be merged -impl_unified_event!( - BonkTradeEvent, - pool_state, - total_base_sell, - virtual_base, - virtual_quote, - real_base_before, - real_quote_before, - real_base_after, - real_quote_after, - amount_in, - amount_out, - protocol_fee, - platform_fee, - creator_fee, - share_fee, - trade_direction, - pool_status, - exact_in -); +// impl_unified_event!( +// BonkTradeEvent, +// pool_state, +// total_base_sell, +// virtual_base, +// virtual_quote, +// real_base_before, +// real_quote_before, +// real_base_after, +// real_quote_after, +// amount_in, +// amount_out, +// protocol_fee, +// platform_fee, +// creator_fee, +// share_fee, +// trade_direction, +// pool_status, +// exact_in +// ); /// Create pool event #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, BorshDeserialize)] @@ -141,16 +140,16 @@ pub fn bonk_pool_create_event_log_decode(data: &[u8]) -> Option, } -// Macro to generate UnifiedEvent implementation, specifying the fields to be merged -impl_unified_event!(BonkMigrateToCpswapEvent,); - /// 池状态 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] pub struct BonkPoolStateAccountEvent { @@ -284,7 +280,6 @@ pub struct BonkPoolStateAccountEvent { pub rent_epoch: u64, pub pool_state: PoolState, } -impl_unified_event!(BonkPoolStateAccountEvent,); /// 全局配置 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] @@ -297,7 +292,6 @@ pub struct BonkGlobalConfigAccountEvent { pub rent_epoch: u64, pub global_config: GlobalConfig, } -impl_unified_event!(BonkGlobalConfigAccountEvent,); /// 平台配置 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] @@ -310,7 +304,6 @@ pub struct BonkPlatformConfigAccountEvent { pub rent_epoch: u64, pub platform_config: PlatformConfig, } -impl_unified_event!(BonkPlatformConfigAccountEvent,); /// Event discriminator constants pub mod discriminators { diff --git a/src/streaming/event_parser/protocols/bonk/parser.rs b/src/streaming/event_parser/protocols/bonk/parser.rs index f64203c..4ef974d 100755 --- a/src/streaming/event_parser/protocols/bonk/parser.rs +++ b/src/streaming/event_parser/protocols/bonk/parser.rs @@ -113,19 +113,16 @@ pub const CONFIGS: &[GenericEventParseConfig] = &[ fn parse_pool_create_inner_instruction( data: &[u8], metadata: EventMetadata, -) -> Option> { +) -> Option { if let Some(event) = bonk_pool_create_event_log_decode(data) { - Some(Box::new(BonkPoolCreateEvent { metadata, ..event })) + Some(UnifiedEvent::BonkPoolCreateEvent(BonkPoolCreateEvent { metadata, ..event })) } else { None } } /// Parse trade event -fn parse_trade_inner_instruction( - data: &[u8], - metadata: EventMetadata, -) -> Option> { +fn parse_trade_inner_instruction(data: &[u8], metadata: EventMetadata) -> Option { if let Some(event) = bonk_trade_event_log_decode(data) { if metadata.event_type == EventType::BonkBuyExactIn || metadata.event_type == EventType::BonkBuyExactOut @@ -139,7 +136,7 @@ fn parse_trade_inner_instruction( { return None; } - Some(Box::new(BonkTradeEvent { metadata, ..event })) + Some(UnifiedEvent::BonkTradeEvent(BonkTradeEvent { metadata, ..event })) } else { None } @@ -150,7 +147,7 @@ fn parse_buy_exact_in_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 16 || accounts.len() < 18 { return None; } @@ -159,7 +156,7 @@ fn parse_buy_exact_in_instruction( let minimum_amount_out = read_u64_le(data, 8)?; let share_fee_rate = read_u64_le(data, 16)?; - Some(Box::new(BonkTradeEvent { + Some(UnifiedEvent::BonkTradeEvent(BonkTradeEvent { metadata, amount_in, minimum_amount_out, @@ -188,7 +185,7 @@ fn parse_buy_exact_out_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 16 || accounts.len() < 18 { return None; } @@ -197,7 +194,7 @@ fn parse_buy_exact_out_instruction( let maximum_amount_in = read_u64_le(data, 8)?; let share_fee_rate = read_u64_le(data, 16)?; - Some(Box::new(BonkTradeEvent { + Some(UnifiedEvent::BonkTradeEvent(BonkTradeEvent { metadata, amount_out, maximum_amount_in, @@ -226,7 +223,7 @@ fn parse_sell_exact_in_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 16 || accounts.len() < 18 { return None; } @@ -235,7 +232,7 @@ fn parse_sell_exact_in_instruction( let minimum_amount_out = read_u64_le(data, 8)?; let share_fee_rate = read_u64_le(data, 16)?; - Some(Box::new(BonkTradeEvent { + Some(UnifiedEvent::BonkTradeEvent(BonkTradeEvent { metadata, amount_in, minimum_amount_out, @@ -264,7 +261,7 @@ fn parse_sell_exact_out_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 16 || accounts.len() < 18 { return None; } @@ -273,7 +270,7 @@ fn parse_sell_exact_out_instruction( let maximum_amount_in = read_u64_le(data, 8)?; let share_fee_rate = read_u64_le(data, 16)?; - Some(Box::new(BonkTradeEvent { + Some(UnifiedEvent::BonkTradeEvent(BonkTradeEvent { metadata, amount_out, maximum_amount_in, @@ -303,7 +300,7 @@ fn parse_initialize_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 24 { return None; } @@ -313,7 +310,7 @@ fn parse_initialize_instruction( let curve_param = parse_curve_params(data, &mut offset)?; let vesting_param = parse_vesting_params(data, &mut offset)?; - Some(Box::new(BonkPoolCreateEvent { + Some(UnifiedEvent::BonkPoolCreateEvent(BonkPoolCreateEvent { metadata, payer: accounts[0], creator: accounts[1], @@ -336,7 +333,7 @@ fn parse_initialize_v2_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 24 { return None; } @@ -347,7 +344,7 @@ fn parse_initialize_v2_instruction( let vesting_param = parse_vesting_params(data, &mut offset)?; let amm_fee_on = data[offset]; - Some(Box::new(BonkPoolCreateEvent { + Some(UnifiedEvent::BonkPoolCreateEvent(BonkPoolCreateEvent { metadata, payer: accounts[0], creator: accounts[1], @@ -375,7 +372,7 @@ fn parse_initialize_with_token_2022_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 24 { return None; } @@ -386,7 +383,7 @@ fn parse_initialize_with_token_2022_instruction( let vesting_param = parse_vesting_params(data, &mut offset)?; let amm_fee_on = data[offset]; - Some(Box::new(BonkPoolCreateEvent { + Some(UnifiedEvent::BonkPoolCreateEvent(BonkPoolCreateEvent { metadata, payer: accounts[0], creator: accounts[1], @@ -519,7 +516,7 @@ fn parse_migrate_to_amm_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 16 { return None; } @@ -528,7 +525,7 @@ fn parse_migrate_to_amm_instruction( let quote_lot_size = u64::from_le_bytes(data[8..16].try_into().unwrap()); let market_vault_signer_nonce = data[16]; - Some(Box::new(BonkMigrateToAmmEvent { + Some(UnifiedEvent::BonkMigrateToAmmEvent(BonkMigrateToAmmEvent { metadata, base_lot_size, quote_lot_size, @@ -574,8 +571,8 @@ fn parse_migrate_to_cpswap_instruction( _data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { - Some(Box::new(BonkMigrateToCpswapEvent { +) -> Option { + Some(UnifiedEvent::BonkMigrateToCpswapEvent(BonkMigrateToCpswapEvent { metadata, payer: accounts[0], base_mint: accounts[1], diff --git a/src/streaming/event_parser/protocols/bonk/types.rs b/src/streaming/event_parser/protocols/bonk/types.rs index 2e82b12..7374063 100755 --- a/src/streaming/event_parser/protocols/bonk/types.rs +++ b/src/streaming/event_parser/protocols/bonk/types.rs @@ -132,15 +132,12 @@ pub fn pool_state_decode(data: &[u8]) -> Option { borsh::from_slice::(&data[..POOL_STATE_SIZE]).ok() } -pub fn pool_state_parser( - account: &AccountPretty, - metadata: EventMetadata, -) -> Option> { +pub fn pool_state_parser(account: &AccountPretty, metadata: EventMetadata) -> Option { if account.data.len() < POOL_STATE_SIZE + 8 { return None; } if let Some(pool_state) = pool_state_decode(&account.data[8..POOL_STATE_SIZE + 8]) { - Some(Box::new(BonkPoolStateAccountEvent { + Some(UnifiedEvent::BonkPoolStateAccountEvent(BonkPoolStateAccountEvent { metadata, pubkey: account.pubkey, executable: account.executable, @@ -186,12 +183,12 @@ pub fn global_config_decode(data: &[u8]) -> Option { pub fn global_config_parser( account: &AccountPretty, metadata: EventMetadata, -) -> Option> { +) -> Option { if account.data.len() < GLOBAL_CONFIG_SIZE + 8 { return None; } if let Some(global_config) = global_config_decode(&account.data[8..GLOBAL_CONFIG_SIZE + 8]) { - Some(Box::new(BonkGlobalConfigAccountEvent { + Some(UnifiedEvent::BonkGlobalConfigAccountEvent(BonkGlobalConfigAccountEvent { metadata, pubkey: account.pubkey, executable: account.executable, @@ -232,14 +229,14 @@ pub fn platform_config_decode(data: &[u8]) -> Option { pub fn platform_config_parser( account: &AccountPretty, metadata: EventMetadata, -) -> Option> { +) -> Option { if account.data.len() < PLATFORM_CONFIG_SIZE + 8 { return None; } if let Some(platform_config) = platform_config_decode(&account.data[8..PLATFORM_CONFIG_SIZE + 8]) { - Some(Box::new(BonkPlatformConfigAccountEvent { + Some(UnifiedEvent::BonkPlatformConfigAccountEvent(BonkPlatformConfigAccountEvent { metadata, pubkey: account.pubkey, executable: account.executable, diff --git a/src/streaming/event_parser/protocols/pumpfun/events.rs b/src/streaming/event_parser/protocols/pumpfun/events.rs index 32212e2..9125d7c 100755 --- a/src/streaming/event_parser/protocols/pumpfun/events.rs +++ b/src/streaming/event_parser/protocols/pumpfun/events.rs @@ -2,7 +2,6 @@ use borsh::BorshDeserialize; use serde::{Deserialize, Serialize}; use solana_sdk::pubkey::Pubkey; -use crate::impl_unified_event; use crate::streaming::event_parser::common::EventMetadata; use crate::streaming::event_parser::protocols::pumpfun::types::{BondingCurve, Global}; @@ -37,18 +36,18 @@ pub fn pumpfun_create_token_event_log_decode(data: &[u8]) -> Option(&data[..PUMPFUN_CREATE_TOKEN_EVENT_LOG_SIZE]).ok() } -impl_unified_event!( - PumpFunCreateTokenEvent, - mint, - bonding_curve, - user, - creator, - timestamp, - virtual_token_reserves, - virtual_sol_reserves, - real_token_reserves, - token_total_supply -); +// impl_unified_event!( +// PumpFunCreateTokenEvent, +// mint, +// bonding_curve, +// user, +// creator, +// timestamp, +// virtual_token_reserves, +// virtual_sol_reserves, +// real_token_reserves, +// token_total_supply +// ); #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, BorshDeserialize)] pub struct PumpFunTradeEvent { @@ -126,25 +125,25 @@ pub fn pumpfun_trade_event_log_decode(data: &[u8]) -> Option borsh::from_slice::(&data[..PUMPFUN_TRADE_EVENT_LOG_SIZE]).ok() } -impl_unified_event!( - PumpFunTradeEvent, - mint, - sol_amount, - token_amount, - is_buy, - user, - timestamp, - virtual_sol_reserves, - virtual_token_reserves, - real_sol_reserves, - real_token_reserves, - fee_recipient, - fee_basis_points, - fee, - creator, - creator_fee_basis_points, - creator_fee -); +// impl_unified_event!( +// PumpFunTradeEvent, +// mint, +// sol_amount, +// token_amount, +// is_buy, +// user, +// timestamp, +// virtual_sol_reserves, +// virtual_token_reserves, +// real_sol_reserves, +// real_token_reserves, +// fee_recipient, +// fee_basis_points, +// fee, +// creator, +// creator_fee_basis_points, +// creator_fee +// ); #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, BorshDeserialize)] pub struct PumpFunMigrateEvent { @@ -211,17 +210,17 @@ pub fn pumpfun_migrate_event_log_decode(data: &[u8]) -> Option(&data[..PUMPFUN_MIGRATE_EVENT_LOG_SIZE]).ok() } -impl_unified_event!( - PumpFunMigrateEvent, - user, - mint, - mint_amount, - sol_amount, - pool_migration_fee, - bonding_curve, - timestamp, - pool -); +// impl_unified_event!( +// PumpFunMigrateEvent, +// user, +// mint, +// mint_amount, +// sol_amount, +// pool_migration_fee, +// bonding_curve, +// timestamp, +// pool +// ); /// 铸币曲线 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, BorshDeserialize)] @@ -236,8 +235,6 @@ pub struct PumpFunBondingCurveAccountEvent { pub bonding_curve: BondingCurve, } -impl_unified_event!(PumpFunBondingCurveAccountEvent,); - /// 全局配置 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, BorshDeserialize)] pub struct PumpFunGlobalAccountEvent { @@ -250,7 +247,6 @@ pub struct PumpFunGlobalAccountEvent { pub rent_epoch: u64, pub global: Global, } -impl_unified_event!(PumpFunGlobalAccountEvent,); /// 事件鉴别器常量 pub mod discriminators { diff --git a/src/streaming/event_parser/protocols/pumpfun/parser.rs b/src/streaming/event_parser/protocols/pumpfun/parser.rs index 9f81879..a80d44b 100755 --- a/src/streaming/event_parser/protocols/pumpfun/parser.rs +++ b/src/streaming/event_parser/protocols/pumpfun/parser.rs @@ -60,12 +60,9 @@ pub const CONFIGS: &[GenericEventParseConfig] = &[ ]; /// 解析迁移事件 -fn parse_migrate_inner_instruction( - data: &[u8], - metadata: EventMetadata, -) -> Option> { +fn parse_migrate_inner_instruction(data: &[u8], metadata: EventMetadata) -> Option { if let Some(event) = pumpfun_migrate_event_log_decode(data) { - Some(Box::new(PumpFunMigrateEvent { metadata, ..event })) + Some(UnifiedEvent::PumpFunMigrateEvent(PumpFunMigrateEvent { metadata, ..event })) } else { None } @@ -75,21 +72,18 @@ fn parse_migrate_inner_instruction( fn parse_create_token_inner_instruction( data: &[u8], metadata: EventMetadata, -) -> Option> { +) -> Option { if let Some(event) = pumpfun_create_token_event_log_decode(data) { - Some(Box::new(PumpFunCreateTokenEvent { metadata, ..event })) + Some(UnifiedEvent::PumpFunCreateTokenEvent(PumpFunCreateTokenEvent { metadata, ..event })) } else { None } } /// 解析交易事件 -fn parse_trade_inner_instruction( - data: &[u8], - metadata: EventMetadata, -) -> Option> { +fn parse_trade_inner_instruction(data: &[u8], metadata: EventMetadata) -> Option { if let Some(event) = pumpfun_trade_event_log_decode(data) { - Some(Box::new(PumpFunTradeEvent { metadata, ..event })) + Some(UnifiedEvent::PumpFunTradeEvent(PumpFunTradeEvent { metadata, ..event })) } else { None } @@ -100,7 +94,7 @@ fn parse_create_token_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 16 || accounts.len() < 11 { return None; } @@ -141,7 +135,7 @@ fn parse_create_token_instruction( Pubkey::default() }; - Some(Box::new(PumpFunCreateTokenEvent { + Some(UnifiedEvent::PumpFunCreateTokenEvent(PumpFunCreateTokenEvent { metadata, name: name.to_string(), symbol: symbol.to_string(), @@ -161,13 +155,13 @@ fn parse_buy_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 16 || accounts.len() < 13 { return None; } let amount = u64::from_le_bytes(data[0..8].try_into().unwrap()); let max_sol_cost = u64::from_le_bytes(data[8..16].try_into().unwrap()); - Some(Box::new(PumpFunTradeEvent { + Some(UnifiedEvent::PumpFunTradeEvent(PumpFunTradeEvent { metadata, global: accounts[0], fee_recipient: accounts[1], @@ -195,13 +189,13 @@ fn parse_sell_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 16 || accounts.len() < 11 { return None; } let amount = u64::from_le_bytes(data[0..8].try_into().unwrap()); let min_sol_output = u64::from_le_bytes(data[8..16].try_into().unwrap()); - Some(Box::new(PumpFunTradeEvent { + Some(UnifiedEvent::PumpFunTradeEvent(PumpFunTradeEvent { metadata, global: accounts[0], fee_recipient: accounts[1], @@ -229,11 +223,11 @@ fn parse_migrate_instruction( _data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if accounts.len() < 24 { return None; } - Some(Box::new(PumpFunMigrateEvent { + Some(UnifiedEvent::PumpFunMigrateEvent(PumpFunMigrateEvent { metadata, global: accounts[0], withdraw_authority: accounts[1], diff --git a/src/streaming/event_parser/protocols/pumpfun/types.rs b/src/streaming/event_parser/protocols/pumpfun/types.rs index d419996..fbcefaf 100644 --- a/src/streaming/event_parser/protocols/pumpfun/types.rs +++ b/src/streaming/event_parser/protocols/pumpfun/types.rs @@ -34,12 +34,12 @@ pub fn bonding_curve_decode(data: &[u8]) -> Option { pub fn bonding_curve_parser( account: &AccountPretty, metadata: EventMetadata, -) -> Option> { +) -> Option { if account.data.len() < BONDING_CURVE_SIZE + 8 { return None; } if let Some(bonding_curve) = bonding_curve_decode(&account.data[8..BONDING_CURVE_SIZE + 8]) { - Some(Box::new(PumpFunBondingCurveAccountEvent { + Some(UnifiedEvent::PumpFunBondingCurveAccountEvent(PumpFunBondingCurveAccountEvent { metadata, pubkey: account.pubkey, executable: account.executable, @@ -81,15 +81,12 @@ pub fn global_decode(data: &[u8]) -> Option { borsh::from_slice::(&data[..GLOBAL_SIZE]).ok() } -pub fn global_parser( - account: &AccountPretty, - metadata: EventMetadata, -) -> Option> { +pub fn global_parser(account: &AccountPretty, metadata: EventMetadata) -> Option { if account.data.len() < GLOBAL_SIZE + 8 { return None; } if let Some(global) = global_decode(&account.data[8..GLOBAL_SIZE + 8]) { - Some(Box::new(PumpFunGlobalAccountEvent { + Some(UnifiedEvent::PumpFunGlobalAccountEvent(PumpFunGlobalAccountEvent { metadata, pubkey: account.pubkey, executable: account.executable, diff --git a/src/streaming/event_parser/protocols/pumpswap/events.rs b/src/streaming/event_parser/protocols/pumpswap/events.rs index c3d2322..27c4738 100755 --- a/src/streaming/event_parser/protocols/pumpswap/events.rs +++ b/src/streaming/event_parser/protocols/pumpswap/events.rs @@ -2,7 +2,6 @@ use borsh::BorshDeserialize; use serde::{Deserialize, Serialize}; use solana_sdk::pubkey::Pubkey; -use crate::impl_unified_event; use crate::streaming::event_parser::common::EventMetadata; use crate::streaming::event_parser::protocols::pumpswap::types::{GlobalConfig, Pool}; @@ -67,32 +66,32 @@ pub fn pump_swap_buy_event_log_decode(data: &[u8]) -> Option { } // 使用宏生成UnifiedEvent实现，指定需要合并的字段 -impl_unified_event!( - PumpSwapBuyEvent, - timestamp, - base_amount_out, - max_quote_amount_in, - user_base_token_reserves, - user_quote_token_reserves, - pool_base_token_reserves, - pool_quote_token_reserves, - quote_amount_in, - lp_fee_basis_points, - lp_fee, - protocol_fee_basis_points, - protocol_fee, - quote_amount_in_with_lp_fee, - user_quote_amount_in, - pool, - user, - user_base_token_account, - user_quote_token_account, - protocol_fee_recipient, - protocol_fee_recipient_token_account, - coin_creator, - coin_creator_fee_basis_points, - coin_creator_fee -); +// impl_unified_event!( +// PumpSwapBuyEvent, +// timestamp, +// base_amount_out, +// max_quote_amount_in, +// user_base_token_reserves, +// user_quote_token_reserves, +// pool_base_token_reserves, +// pool_quote_token_reserves, +// quote_amount_in, +// lp_fee_basis_points, +// lp_fee, +// protocol_fee_basis_points, +// protocol_fee, +// quote_amount_in_with_lp_fee, +// user_quote_amount_in, +// pool, +// user, +// user_base_token_account, +// user_quote_token_account, +// protocol_fee_recipient, +// protocol_fee_recipient_token_account, +// coin_creator, +// coin_creator_fee_basis_points, +// coin_creator_fee +// ); /// 卖出事件 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, BorshDeserialize)] @@ -150,32 +149,32 @@ pub fn pump_swap_sell_event_log_decode(data: &[u8]) -> Option } // 使用宏生成UnifiedEvent实现，指定需要合并的字段 -impl_unified_event!( - PumpSwapSellEvent, - timestamp, - base_amount_in, - min_quote_amount_out, - user_base_token_reserves, - user_quote_token_reserves, - pool_base_token_reserves, - pool_quote_token_reserves, - quote_amount_out, - lp_fee_basis_points, - lp_fee, - protocol_fee_basis_points, - protocol_fee, - quote_amount_out_without_lp_fee, - user_quote_amount_out, - pool, - user, - user_base_token_account, - user_quote_token_account, - protocol_fee_recipient, - protocol_fee_recipient_token_account, - coin_creator, - coin_creator_fee_basis_points, - coin_creator_fee -); +// impl_unified_event!( +// PumpSwapSellEvent, +// timestamp, +// base_amount_in, +// min_quote_amount_out, +// user_base_token_reserves, +// user_quote_token_reserves, +// pool_base_token_reserves, +// pool_quote_token_reserves, +// quote_amount_out, +// lp_fee_basis_points, +// lp_fee, +// protocol_fee_basis_points, +// protocol_fee, +// quote_amount_out_without_lp_fee, +// user_quote_amount_out, +// pool, +// user, +// user_base_token_account, +// user_quote_token_account, +// protocol_fee_recipient, +// protocol_fee_recipient_token_account, +// coin_creator, +// coin_creator_fee_basis_points, +// coin_creator_fee +// ); /// 创建池子事件 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, BorshDeserialize)] @@ -219,29 +218,29 @@ pub fn pump_swap_create_pool_event_log_decode(data: &[u8]) -> Option(&data[..PUMP_SWAP_CREATE_POOL_EVENT_LOG_SIZE]).ok() } -impl_unified_event!( - PumpSwapCreatePoolEvent, - timestamp, - index, - creator, - base_mint, - quote_mint, - base_mint_decimals, - quote_mint_decimals, - base_amount_in, - quote_amount_in, - pool_base_amount, - pool_quote_amount, - minimum_liquidity, - initial_liquidity, - lp_token_amount_out, - pool_bump, - pool, - lp_mint, - user_base_token_account, - user_quote_token_account, - coin_creator -); +// impl_unified_event!( +// PumpSwapCreatePoolEvent, +// timestamp, +// index, +// creator, +// base_mint, +// quote_mint, +// base_mint_decimals, +// quote_mint_decimals, +// base_amount_in, +// quote_amount_in, +// pool_base_amount, +// pool_quote_amount, +// minimum_liquidity, +// initial_liquidity, +// lp_token_amount_out, +// pool_bump, +// pool, +// lp_mint, +// user_base_token_account, +// user_quote_token_account, +// coin_creator +// ); /// 存款事件 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, BorshDeserialize)] @@ -283,25 +282,25 @@ pub fn pump_swap_deposit_event_log_decode(data: &[u8]) -> Option(&data[..PUMP_SWAP_DEPOSIT_EVENT_LOG_SIZE]).ok() } -impl_unified_event!( - PumpSwapDepositEvent, - timestamp, - lp_token_amount_out, - max_base_amount_in, - max_quote_amount_in, - user_base_token_reserves, - user_quote_token_reserves, - pool_base_token_reserves, - pool_quote_token_reserves, - base_amount_in, - quote_amount_in, - lp_mint_supply, - pool, - user, - user_base_token_account, - user_quote_token_account, - user_pool_token_account -); +// impl_unified_event!( +// PumpSwapDepositEvent, +// timestamp, +// lp_token_amount_out, +// max_base_amount_in, +// max_quote_amount_in, +// user_base_token_reserves, +// user_quote_token_reserves, +// pool_base_token_reserves, +// pool_quote_token_reserves, +// base_amount_in, +// quote_amount_in, +// lp_mint_supply, +// pool, +// user, +// user_base_token_account, +// user_quote_token_account, +// user_pool_token_account +// ); /// 提款事件 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, BorshDeserialize)] @@ -343,25 +342,25 @@ pub fn pump_swap_withdraw_event_log_decode(data: &[u8]) -> Option(&data[..PUMP_SWAP_WITHDRAW_EVENT_LOG_SIZE]).ok() } -impl_unified_event!( - PumpSwapWithdrawEvent, - timestamp, - lp_token_amount_in, - min_base_amount_out, - min_quote_amount_out, - user_base_token_reserves, - user_quote_token_reserves, - pool_base_token_reserves, - pool_quote_token_reserves, - base_amount_out, - quote_amount_out, - lp_mint_supply, - pool, - user, - user_base_token_account, - user_quote_token_account, - user_pool_token_account -); +// impl_unified_event!( +// PumpSwapWithdrawEvent, +// timestamp, +// lp_token_amount_in, +// min_base_amount_out, +// min_quote_amount_out, +// user_base_token_reserves, +// user_quote_token_reserves, +// pool_base_token_reserves, +// pool_quote_token_reserves, +// base_amount_out, +// quote_amount_out, +// lp_mint_supply, +// pool, +// user, +// user_base_token_account, +// user_quote_token_account, +// user_pool_token_account +// ); /// 全局配置 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, BorshDeserialize)] @@ -375,7 +374,6 @@ pub struct PumpSwapGlobalConfigAccountEvent { pub rent_epoch: u64, pub global_config: GlobalConfig, } -impl_unified_event!(PumpSwapGlobalConfigAccountEvent,); /// 池 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, BorshDeserialize)] @@ -389,7 +387,6 @@ pub struct PumpSwapPoolAccountEvent { pub rent_epoch: u64, pub pool: Pool, } -impl_unified_event!(PumpSwapPoolAccountEvent,); /// 事件鉴别器常量 pub mod discriminators { diff --git a/src/streaming/event_parser/protocols/pumpswap/parser.rs b/src/streaming/event_parser/protocols/pumpswap/parser.rs index 9969008..ee29942 100755 --- a/src/streaming/event_parser/protocols/pumpswap/parser.rs +++ b/src/streaming/event_parser/protocols/pumpswap/parser.rs @@ -70,24 +70,18 @@ pub const CONFIGS: &[GenericEventParseConfig] = &[ ]; /// 解析买入日志事件 -fn parse_buy_inner_instruction( - data: &[u8], - metadata: EventMetadata, -) -> Option> { +fn parse_buy_inner_instruction(data: &[u8], metadata: EventMetadata) -> Option { if let Some(event) = pump_swap_buy_event_log_decode(data) { - Some(Box::new(PumpSwapBuyEvent { metadata, ..event })) + Some(UnifiedEvent::PumpSwapBuyEvent(PumpSwapBuyEvent { metadata, ..event })) } else { None } } /// 解析卖出日志事件 -fn parse_sell_inner_instruction( - data: &[u8], - metadata: EventMetadata, -) -> Option> { +fn parse_sell_inner_instruction(data: &[u8], metadata: EventMetadata) -> Option { if let Some(event) = pump_swap_sell_event_log_decode(data) { - Some(Box::new(PumpSwapSellEvent { metadata, ..event })) + Some(UnifiedEvent::PumpSwapSellEvent(PumpSwapSellEvent { metadata, ..event })) } else { None } @@ -97,33 +91,27 @@ fn parse_sell_inner_instruction( fn parse_create_pool_inner_instruction( data: &[u8], metadata: EventMetadata, -) -> Option> { +) -> Option { if let Some(event) = pump_swap_create_pool_event_log_decode(data) { - Some(Box::new(PumpSwapCreatePoolEvent { metadata, ..event })) + Some(UnifiedEvent::PumpSwapCreatePoolEvent(PumpSwapCreatePoolEvent { metadata, ..event })) } else { None } } /// 解析存款日志事件 -fn parse_deposit_inner_instruction( - data: &[u8], - metadata: EventMetadata, -) -> Option> { +fn parse_deposit_inner_instruction(data: &[u8], metadata: EventMetadata) -> Option { if let Some(event) = pump_swap_deposit_event_log_decode(data) { - Some(Box::new(PumpSwapDepositEvent { metadata, ..event })) + Some(UnifiedEvent::PumpSwapDepositEvent(PumpSwapDepositEvent { metadata, ..event })) } else { None } } /// 解析提款日志事件 -fn parse_withdraw_inner_instruction( - data: &[u8], - metadata: EventMetadata, -) -> Option> { +fn parse_withdraw_inner_instruction(data: &[u8], metadata: EventMetadata) -> Option { if let Some(event) = pump_swap_withdraw_event_log_decode(data) { - Some(Box::new(PumpSwapWithdrawEvent { metadata, ..event })) + Some(UnifiedEvent::PumpSwapWithdrawEvent(PumpSwapWithdrawEvent { metadata, ..event })) } else { None } @@ -134,7 +122,7 @@ fn parse_buy_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 16 || accounts.len() < 11 { return None; } @@ -142,7 +130,7 @@ fn parse_buy_instruction( let base_amount_out = read_u64_le(data, 0)?; let max_quote_amount_in = read_u64_le(data, 8)?; - Some(Box::new(PumpSwapBuyEvent { + Some(UnifiedEvent::PumpSwapBuyEvent(PumpSwapBuyEvent { metadata, base_amount_out, max_quote_amount_in, @@ -169,7 +157,7 @@ fn parse_sell_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 16 || accounts.len() < 11 { return None; } @@ -177,7 +165,7 @@ fn parse_sell_instruction( let base_amount_in = read_u64_le(data, 0)?; let min_quote_amount_out = read_u64_le(data, 8)?; - Some(Box::new(PumpSwapSellEvent { + Some(UnifiedEvent::PumpSwapSellEvent(PumpSwapSellEvent { metadata, base_amount_in, min_quote_amount_out, @@ -204,7 +192,7 @@ fn parse_create_pool_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 18 || accounts.len() < 11 { return None; } @@ -218,7 +206,7 @@ fn parse_create_pool_instruction( Pubkey::default() }; - Some(Box::new(PumpSwapCreatePoolEvent { + Some(UnifiedEvent::PumpSwapCreatePoolEvent(PumpSwapCreatePoolEvent { metadata, index, base_amount_in, @@ -243,7 +231,7 @@ fn parse_deposit_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 24 || accounts.len() < 11 { return None; } @@ -252,7 +240,7 @@ fn parse_deposit_instruction( let max_base_amount_in = u64::from_le_bytes(data[8..16].try_into().ok()?); let max_quote_amount_in = u64::from_le_bytes(data[16..24].try_into().ok()?); - Some(Box::new(PumpSwapDepositEvent { + Some(UnifiedEvent::PumpSwapDepositEvent(PumpSwapDepositEvent { metadata, lp_token_amount_out, max_base_amount_in, @@ -275,7 +263,7 @@ fn parse_withdraw_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 24 || accounts.len() < 11 { return None; } @@ -284,7 +272,7 @@ fn parse_withdraw_instruction( let min_base_amount_out = u64::from_le_bytes(data[8..16].try_into().ok()?); let min_quote_amount_out = u64::from_le_bytes(data[16..24].try_into().ok()?); - Some(Box::new(PumpSwapWithdrawEvent { + Some(UnifiedEvent::PumpSwapWithdrawEvent(PumpSwapWithdrawEvent { metadata, lp_token_amount_in, min_base_amount_out, diff --git a/src/streaming/event_parser/protocols/pumpswap/types.rs b/src/streaming/event_parser/protocols/pumpswap/types.rs index 64f6039..c428ec7 100644 --- a/src/streaming/event_parser/protocols/pumpswap/types.rs +++ b/src/streaming/event_parser/protocols/pumpswap/types.rs @@ -5,9 +5,7 @@ use solana_sdk::pubkey::Pubkey; use crate::streaming::{ event_parser::{ common::EventMetadata, - protocols::pumpswap::{ - PumpSwapGlobalConfigAccountEvent, PumpSwapPoolAccountEvent, - }, + protocols::pumpswap::{PumpSwapGlobalConfigAccountEvent, PumpSwapPoolAccountEvent}, UnifiedEvent, }, grpc::AccountPretty, @@ -36,12 +34,12 @@ pub fn global_config_decode(data: &[u8]) -> Option { pub fn global_config_parser( account: &AccountPretty, metadata: EventMetadata, -) -> Option> { +) -> Option { if account.data.len() < GLOBAL_CONFIG_SIZE + 8 { return None; } if let Some(config) = global_config_decode(&account.data[8..GLOBAL_CONFIG_SIZE + 8]) { - Some(Box::new(PumpSwapGlobalConfigAccountEvent { + Some(UnifiedEvent::PumpSwapGlobalConfigAccountEvent(PumpSwapGlobalConfigAccountEvent { metadata, pubkey: account.pubkey, executable: account.executable, @@ -78,15 +76,12 @@ pub fn pool_decode(data: &[u8]) -> Option { borsh::from_slice::(&data[..POOL_SIZE]).ok() } -pub fn pool_parser( - account: &AccountPretty, - metadata: EventMetadata, -) -> Option> { +pub fn pool_parser(account: &AccountPretty, metadata: EventMetadata) -> Option { if account.data.len() < POOL_SIZE + 8 { return None; } if let Some(pool) = pool_decode(&account.data[8..POOL_SIZE + 8]) { - Some(Box::new(PumpSwapPoolAccountEvent { + Some(UnifiedEvent::PumpSwapPoolAccountEvent(PumpSwapPoolAccountEvent { metadata, pubkey: account.pubkey, executable: account.executable, diff --git a/src/streaming/event_parser/protocols/raydium_amm_v4/events.rs b/src/streaming/event_parser/protocols/raydium_amm_v4/events.rs index 9f82f6f..e28e1f1 100755 --- a/src/streaming/event_parser/protocols/raydium_amm_v4/events.rs +++ b/src/streaming/event_parser/protocols/raydium_amm_v4/events.rs @@ -1,6 +1,6 @@ use crate::streaming::event_parser::common::EventMetadata; use crate::{ - impl_unified_event, streaming::event_parser::protocols::raydium_amm_v4::types::AmmInfo, + streaming::event_parser::protocols::raydium_amm_v4::types::AmmInfo, }; use borsh::BorshDeserialize; use serde::{Deserialize, Serialize}; @@ -38,8 +38,6 @@ pub struct RaydiumAmmV4SwapEvent { pub user_source_owner: Pubkey, } -impl_unified_event!(RaydiumAmmV4SwapEvent,); - /// 添加流动性 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, BorshDeserialize)] pub struct RaydiumAmmV4DepositEvent { @@ -64,7 +62,6 @@ pub struct RaydiumAmmV4DepositEvent { pub user_owner: Pubkey, pub serum_event_queue: Pubkey, } -impl_unified_event!(RaydiumAmmV4DepositEvent,); /// 初始化 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, BorshDeserialize)] @@ -98,7 +95,6 @@ pub struct RaydiumAmmV4Initialize2Event { pub user_token_pc: Pubkey, pub user_lp_token_account: Pubkey, } -impl_unified_event!(RaydiumAmmV4Initialize2Event,); /// 移除流动性 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, BorshDeserialize)] @@ -130,7 +126,6 @@ pub struct RaydiumAmmV4WithdrawEvent { pub serum_bids: Pubkey, pub serum_asks: Pubkey, } -impl_unified_event!(RaydiumAmmV4WithdrawEvent,); /// 提现 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, BorshDeserialize)] @@ -156,7 +151,6 @@ pub struct RaydiumAmmV4WithdrawPnlEvent { pub serum_pc_vault_account: Pubkey, pub serum_vault_signer: Pubkey, } -impl_unified_event!(RaydiumAmmV4WithdrawPnlEvent,); /// 池信息 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, BorshDeserialize)] @@ -170,7 +164,6 @@ pub struct RaydiumAmmV4AmmInfoAccountEvent { pub rent_epoch: u64, pub amm_info: AmmInfo, } -impl_unified_event!(RaydiumAmmV4AmmInfoAccountEvent,); /// 事件鉴别器常量 pub mod discriminators { diff --git a/src/streaming/event_parser/protocols/raydium_amm_v4/parser.rs b/src/streaming/event_parser/protocols/raydium_amm_v4/parser.rs index 832e6d8..944b60f 100755 --- a/src/streaming/event_parser/protocols/raydium_amm_v4/parser.rs +++ b/src/streaming/event_parser/protocols/raydium_amm_v4/parser.rs @@ -82,12 +82,12 @@ fn parse_withdraw_pnl_instruction( _data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if accounts.len() < 17 { return None; } - Some(Box::new(RaydiumAmmV4WithdrawPnlEvent { + Some(UnifiedEvent::RaydiumAmmV4WithdrawPnlEvent(RaydiumAmmV4WithdrawPnlEvent { metadata, token_program: accounts[0], amm: accounts[1], @@ -114,13 +114,13 @@ fn parse_withdraw_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 8 || accounts.len() < 22 { return None; } let amount = read_u64_le(data, 0)?; - Some(Box::new(RaydiumAmmV4WithdrawEvent { + Some(UnifiedEvent::RaydiumAmmV4WithdrawEvent(RaydiumAmmV4WithdrawEvent { metadata, amount, @@ -154,7 +154,7 @@ fn parse_initialize2_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 25 || accounts.len() < 21 { return None; } @@ -163,7 +163,7 @@ fn parse_initialize2_instruction( let init_pc_amount = read_u64_le(data, 9)?; let init_coin_amount = read_u64_le(data, 17)?; - Some(Box::new(RaydiumAmmV4Initialize2Event { + Some(UnifiedEvent::RaydiumAmmV4Initialize2Event(RaydiumAmmV4Initialize2Event { metadata, nonce, open_time, @@ -199,7 +199,7 @@ fn parse_deposit_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 24 || accounts.len() < 14 { return None; } @@ -207,7 +207,7 @@ fn parse_deposit_instruction( let max_pc_amount = read_u64_le(data, 8)?; let base_side = read_u64_le(data, 16)?; - Some(Box::new(RaydiumAmmV4DepositEvent { + Some(UnifiedEvent::RaydiumAmmV4DepositEvent(RaydiumAmmV4DepositEvent { metadata, max_coin_amount, max_pc_amount, @@ -235,7 +235,7 @@ fn parse_swap_base_output_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 16 || accounts.len() < 17 { return None; } @@ -249,7 +249,7 @@ fn parse_swap_base_output_instruction( accounts.insert(4, Pubkey::default()); } - Some(Box::new(RaydiumAmmV4SwapEvent { + Some(UnifiedEvent::RaydiumAmmV4SwapEvent(RaydiumAmmV4SwapEvent { metadata, max_amount_in, amount_out, @@ -282,7 +282,7 @@ fn parse_swap_base_input_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 16 || accounts.len() < 17 { return None; } @@ -296,7 +296,7 @@ fn parse_swap_base_input_instruction( accounts.insert(4, Pubkey::default()); } - Some(Box::new(RaydiumAmmV4SwapEvent { + Some(UnifiedEvent::RaydiumAmmV4SwapEvent(RaydiumAmmV4SwapEvent { metadata, amount_in, minimum_amount_out, diff --git a/src/streaming/event_parser/protocols/raydium_amm_v4/types.rs b/src/streaming/event_parser/protocols/raydium_amm_v4/types.rs index e2f3078..7f34804 100644 --- a/src/streaming/event_parser/protocols/raydium_amm_v4/types.rs +++ b/src/streaming/event_parser/protocols/raydium_amm_v4/types.rs @@ -86,15 +86,12 @@ pub fn amm_info_decode(data: &[u8]) -> Option { borsh::from_slice::(&data[..AMM_INFO_SIZE]).ok() } -pub fn amm_info_parser( - account: &AccountPretty, - metadata: EventMetadata, -) -> Option> { +pub fn amm_info_parser(account: &AccountPretty, metadata: EventMetadata) -> Option { if account.data.len() < AMM_INFO_SIZE { return None; } if let Some(amm_info) = amm_info_decode(&account.data[..AMM_INFO_SIZE]) { - Some(Box::new(RaydiumAmmV4AmmInfoAccountEvent { + Some(UnifiedEvent::RaydiumAmmV4AmmInfoAccountEvent(RaydiumAmmV4AmmInfoAccountEvent { metadata, pubkey: account.pubkey, executable: account.executable, diff --git a/src/streaming/event_parser/protocols/raydium_clmm/events.rs b/src/streaming/event_parser/protocols/raydium_clmm/events.rs index dd405cf..492fa57 100755 --- a/src/streaming/event_parser/protocols/raydium_clmm/events.rs +++ b/src/streaming/event_parser/protocols/raydium_clmm/events.rs @@ -1,7 +1,7 @@ use crate::streaming::event_parser::common::EventMetadata; use crate::streaming::event_parser::protocols::raydium_clmm::types::{PoolState, TickArrayState}; use crate::{ - impl_unified_event, streaming::event_parser::protocols::raydium_clmm::types::AmmConfig, + streaming::event_parser::protocols::raydium_clmm::types::AmmConfig, }; use serde::{Deserialize, Serialize}; use solana_sdk::pubkey::Pubkey; @@ -27,7 +27,6 @@ pub struct RaydiumClmmSwapEvent { pub remaining_accounts: Vec, } -impl_unified_event!(RaydiumClmmSwapEvent,); /// 交易v2 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] @@ -52,7 +51,6 @@ pub struct RaydiumClmmSwapV2Event { pub output_vault_mint: Pubkey, pub remaining_accounts: Vec, } -impl_unified_event!(RaydiumClmmSwapV2Event,); /// 关闭仓位 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] @@ -65,7 +63,6 @@ pub struct RaydiumClmmClosePositionEvent { pub system_program: Pubkey, pub token_program: Pubkey, } -impl_unified_event!(RaydiumClmmClosePositionEvent,); /// 减少流动性v2 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] @@ -92,7 +89,6 @@ pub struct RaydiumClmmDecreaseLiquidityV2Event { pub vault1_mint: Pubkey, pub remaining_accounts: Vec, } -impl_unified_event!(RaydiumClmmDecreaseLiquidityV2Event,); /// 创建池 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] @@ -114,7 +110,6 @@ pub struct RaydiumClmmCreatePoolEvent { pub system_program: Pubkey, pub rent: Pubkey, } -impl_unified_event!(RaydiumClmmCreatePoolEvent,); /// 增加流动性v2 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] @@ -140,7 +135,6 @@ pub struct RaydiumClmmIncreaseLiquidityV2Event { pub vault0_mint: Pubkey, pub vault1_mint: Pubkey, } -impl_unified_event!(RaydiumClmmIncreaseLiquidityV2Event,); /// 打开仓位v2 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] @@ -177,7 +171,6 @@ pub struct RaydiumClmmOpenPositionWithToken22NftEvent { pub vault0_mint: Pubkey, pub vault1_mint: Pubkey, } -impl_unified_event!(RaydiumClmmOpenPositionWithToken22NftEvent,); /// 打开仓位V2 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] @@ -217,7 +210,6 @@ pub struct RaydiumClmmOpenPositionV2Event { pub vault1_mint: Pubkey, pub remaining_accounts: Vec, } -impl_unified_event!(RaydiumClmmOpenPositionV2Event,); /// 池配置 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] @@ -230,7 +222,6 @@ pub struct RaydiumClmmAmmConfigAccountEvent { pub rent_epoch: u64, pub amm_config: AmmConfig, } -impl_unified_event!(RaydiumClmmAmmConfigAccountEvent,); /// 池状态 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] @@ -243,7 +234,6 @@ pub struct RaydiumClmmPoolStateAccountEvent { pub rent_epoch: u64, pub pool_state: PoolState, } -impl_unified_event!(RaydiumClmmPoolStateAccountEvent,); /// 池状态 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] @@ -256,7 +246,6 @@ pub struct RaydiumClmmTickArrayStateAccountEvent { pub rent_epoch: u64, pub tick_array_state: TickArrayState, } -impl_unified_event!(RaydiumClmmTickArrayStateAccountEvent,); /// 事件鉴别器常量 pub mod discriminators { diff --git a/src/streaming/event_parser/protocols/raydium_clmm/parser.rs b/src/streaming/event_parser/protocols/raydium_clmm/parser.rs index 7636119..b786b05 100755 --- a/src/streaming/event_parser/protocols/raydium_clmm/parser.rs +++ b/src/streaming/event_parser/protocols/raydium_clmm/parser.rs @@ -107,11 +107,11 @@ fn parse_open_position_v2_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 51 || accounts.len() < 22 { return None; } - Some(Box::new(RaydiumClmmOpenPositionV2Event { + Some(UnifiedEvent::RaydiumClmmOpenPositionV2Event(RaydiumClmmOpenPositionV2Event { metadata, tick_lower_index: read_i32_le(data, 0)?, tick_upper_index: read_i32_le(data, 4)?, @@ -153,42 +153,44 @@ fn parse_open_position_with_token_22_nft_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 51 || accounts.len() < 20 { return None; } - Some(Box::new(RaydiumClmmOpenPositionWithToken22NftEvent { - metadata, - tick_lower_index: read_i32_le(data, 0)?, - tick_upper_index: read_i32_le(data, 4)?, - tick_array_lower_start_index: read_i32_le(data, 8)?, - tick_array_upper_start_index: read_i32_le(data, 12)?, - liquidity: read_u128_le(data, 16)?, - amount0_max: read_u64_le(data, 32)?, - amount1_max: read_u64_le(data, 40)?, - with_metadata: read_u8_le(data, 48)? == 1, - base_flag: read_option_bool(data, &mut 49)?, - payer: accounts[0], - position_nft_owner: accounts[1], - position_nft_mint: accounts[2], - position_nft_account: accounts[3], - pool_state: accounts[4], - protocol_position: accounts[5], - tick_array_lower: accounts[6], - tick_array_upper: accounts[7], - personal_position: accounts[8], - token_account0: accounts[9], - token_account1: accounts[10], - token_vault0: accounts[11], - token_vault1: accounts[12], - rent: accounts[13], - system_program: accounts[14], - token_program: accounts[15], - associated_token_program: accounts[16], - token_program2022: accounts[17], - vault0_mint: accounts[18], - vault1_mint: accounts[19], - })) + Some(UnifiedEvent::RaydiumClmmOpenPositionWithToken22NftEvent( + RaydiumClmmOpenPositionWithToken22NftEvent { + metadata, + tick_lower_index: read_i32_le(data, 0)?, + tick_upper_index: read_i32_le(data, 4)?, + tick_array_lower_start_index: read_i32_le(data, 8)?, + tick_array_upper_start_index: read_i32_le(data, 12)?, + liquidity: read_u128_le(data, 16)?, + amount0_max: read_u64_le(data, 32)?, + amount1_max: read_u64_le(data, 40)?, + with_metadata: read_u8_le(data, 48)? == 1, + base_flag: read_option_bool(data, &mut 49)?, + payer: accounts[0], + position_nft_owner: accounts[1], + position_nft_mint: accounts[2], + position_nft_account: accounts[3], + pool_state: accounts[4], + protocol_position: accounts[5], + tick_array_lower: accounts[6], + tick_array_upper: accounts[7], + personal_position: accounts[8], + token_account0: accounts[9], + token_account1: accounts[10], + token_vault0: accounts[11], + token_vault1: accounts[12], + rent: accounts[13], + system_program: accounts[14], + token_program: accounts[15], + associated_token_program: accounts[16], + token_program2022: accounts[17], + vault0_mint: accounts[18], + vault1_mint: accounts[19], + }, + )) } /// 解析增加流动性v2指令事件 @@ -196,11 +198,11 @@ fn parse_increase_liquidity_v2_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 34 || accounts.len() < 15 { return None; } - Some(Box::new(RaydiumClmmIncreaseLiquidityV2Event { + Some(UnifiedEvent::RaydiumClmmIncreaseLiquidityV2Event(RaydiumClmmIncreaseLiquidityV2Event { metadata, liquidity: read_u128_le(data, 0)?, amount0_max: read_u64_le(data, 16)?, @@ -229,11 +231,11 @@ fn parse_create_pool_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 24 || accounts.len() < 13 { return None; } - Some(Box::new(RaydiumClmmCreatePoolEvent { + Some(UnifiedEvent::RaydiumClmmCreatePoolEvent(RaydiumClmmCreatePoolEvent { metadata, sqrt_price_x64: read_u128_le(data, 0)?, open_time: read_u64_le(data, 16)?, @@ -258,11 +260,11 @@ fn parse_decrease_liquidity_v2_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 32 || accounts.len() < 16 { return None; } - Some(Box::new(RaydiumClmmDecreaseLiquidityV2Event { + Some(UnifiedEvent::RaydiumClmmDecreaseLiquidityV2Event(RaydiumClmmDecreaseLiquidityV2Event { metadata, liquidity: read_u128_le(data, 0)?, amount0_min: read_u64_le(data, 16)?, @@ -292,11 +294,11 @@ fn parse_close_position_instruction( _data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if accounts.len() < 6 { return None; } - Some(Box::new(RaydiumClmmClosePositionEvent { + Some(UnifiedEvent::RaydiumClmmClosePositionEvent(RaydiumClmmClosePositionEvent { metadata, nft_owner: accounts[0], position_nft_mint: accounts[1], @@ -312,7 +314,7 @@ fn parse_swap_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 33 || accounts.len() < 10 { return None; } @@ -322,7 +324,7 @@ fn parse_swap_instruction( let sqrt_price_limit_x64 = read_u128_le(data, 16)?; let is_base_input = read_u8_le(data, 32)?; - Some(Box::new(RaydiumClmmSwapEvent { + Some(UnifiedEvent::RaydiumClmmSwapEvent(RaydiumClmmSwapEvent { metadata, amount, other_amount_threshold, @@ -346,7 +348,7 @@ fn parse_swap_v2_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 33 || accounts.len() < 13 { return None; } @@ -356,7 +358,7 @@ fn parse_swap_v2_instruction( let sqrt_price_limit_x64 = read_u128_le(data, 16)?; let is_base_input = read_u8_le(data, 32)?; - Some(Box::new(RaydiumClmmSwapV2Event { + Some(UnifiedEvent::RaydiumClmmSwapV2Event(RaydiumClmmSwapV2Event { metadata, amount, other_amount_threshold, diff --git a/src/streaming/event_parser/protocols/raydium_clmm/types.rs b/src/streaming/event_parser/protocols/raydium_clmm/types.rs index c8a8803..523f1d0 100644 --- a/src/streaming/event_parser/protocols/raydium_clmm/types.rs +++ b/src/streaming/event_parser/protocols/raydium_clmm/types.rs @@ -37,15 +37,12 @@ pub fn amm_config_decode(data: &[u8]) -> Option { borsh::from_slice::(&data[..AMM_CONFIG_SIZE]).ok() } -pub fn amm_config_parser( - account: &AccountPretty, - metadata: EventMetadata, -) -> Option> { +pub fn amm_config_parser(account: &AccountPretty, metadata: EventMetadata) -> Option { if account.data.len() < AMM_CONFIG_SIZE + 8 { return None; } if let Some(amm_config) = amm_config_decode(&account.data[8..AMM_CONFIG_SIZE + 8]) { - Some(Box::new(RaydiumClmmAmmConfigAccountEvent { + Some(UnifiedEvent::RaydiumClmmAmmConfigAccountEvent(RaydiumClmmAmmConfigAccountEvent { metadata, pubkey: account.pubkey, executable: account.executable, @@ -125,15 +122,12 @@ pub fn pool_state_decode(data: &[u8]) -> Option { borsh::from_slice::(&data[..POOL_STATE_SIZE]).ok() } -pub fn pool_state_parser( - account: &AccountPretty, - metadata: EventMetadata, -) -> Option> { +pub fn pool_state_parser(account: &AccountPretty, metadata: EventMetadata) -> Option { if account.data.len() < POOL_STATE_SIZE + 8 { return None; } if let Some(pool_state) = pool_state_decode(&account.data[8..POOL_STATE_SIZE + 8]) { - Some(Box::new(RaydiumClmmPoolStateAccountEvent { + Some(UnifiedEvent::RaydiumClmmPoolStateAccountEvent(RaydiumClmmPoolStateAccountEvent { metadata, pubkey: account.pubkey, executable: account.executable, @@ -209,22 +203,24 @@ pub fn tick_array_state_decode(data: &[u8]) -> Option { pub fn tick_array_state_parser( account: &AccountPretty, metadata: EventMetadata, -) -> Option> { +) -> Option { if account.data.len() < TICK_ARRAY_STATE_SIZE + 8 { return None; } if let Some(tick_array_state) = tick_array_state_decode(&account.data[8..TICK_ARRAY_STATE_SIZE + 8]) { - Some(Box::new(RaydiumClmmTickArrayStateAccountEvent { - metadata, - pubkey: account.pubkey, - executable: account.executable, - lamports: account.lamports, - owner: account.owner, - rent_epoch: account.rent_epoch, - tick_array_state: tick_array_state, - })) + Some(UnifiedEvent::RaydiumClmmTickArrayStateAccountEvent( + RaydiumClmmTickArrayStateAccountEvent { + metadata, + pubkey: account.pubkey, + executable: account.executable, + lamports: account.lamports, + owner: account.owner, + rent_epoch: account.rent_epoch, + tick_array_state: tick_array_state, + }, + )) } else { None } diff --git a/src/streaming/event_parser/protocols/raydium_cpmm/events.rs b/src/streaming/event_parser/protocols/raydium_cpmm/events.rs index d8c1b7a..c131f23 100755 --- a/src/streaming/event_parser/protocols/raydium_cpmm/events.rs +++ b/src/streaming/event_parser/protocols/raydium_cpmm/events.rs @@ -1,7 +1,7 @@ use crate::streaming::event_parser::common::EventMetadata; use crate::streaming::event_parser::protocols::raydium_cpmm::types::PoolState; use crate::{ - impl_unified_event, streaming::event_parser::protocols::raydium_cpmm::types::AmmConfig, + streaming::event_parser::protocols::raydium_cpmm::types::AmmConfig, }; use borsh::BorshDeserialize; use serde::{Deserialize, Serialize}; @@ -31,7 +31,6 @@ pub struct RaydiumCpmmSwapEvent { pub observation_state: Pubkey, } -impl_unified_event!(RaydiumCpmmSwapEvent,); /// 存款 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, BorshDeserialize)] @@ -56,7 +55,6 @@ pub struct RaydiumCpmmDepositEvent { pub vault1_mint: Pubkey, pub lp_mint: Pubkey, } -impl_unified_event!(RaydiumCpmmDepositEvent,); /// 初始化 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, BorshDeserialize)] @@ -88,7 +86,6 @@ pub struct RaydiumCpmmInitializeEvent { pub system_program: Pubkey, pub rent: Pubkey, } -impl_unified_event!(RaydiumCpmmInitializeEvent,); /// 提款 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, BorshDeserialize)] @@ -114,7 +111,6 @@ pub struct RaydiumCpmmWithdrawEvent { pub lp_mint: Pubkey, pub memo_program: Pubkey, } -impl_unified_event!(RaydiumCpmmWithdrawEvent,); /// 池配置 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, BorshDeserialize)] @@ -128,7 +124,6 @@ pub struct RaydiumCpmmAmmConfigAccountEvent { pub rent_epoch: u64, pub amm_config: AmmConfig, } -impl_unified_event!(RaydiumCpmmAmmConfigAccountEvent,); /// 池状态 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, BorshDeserialize)] @@ -142,7 +137,6 @@ pub struct RaydiumCpmmPoolStateAccountEvent { pub rent_epoch: u64, pub pool_state: PoolState, } -impl_unified_event!(RaydiumCpmmPoolStateAccountEvent,); /// 事件鉴别器常量 pub mod discriminators { diff --git a/src/streaming/event_parser/protocols/raydium_cpmm/parser.rs b/src/streaming/event_parser/protocols/raydium_cpmm/parser.rs index cb852a8..f7d5afa 100755 --- a/src/streaming/event_parser/protocols/raydium_cpmm/parser.rs +++ b/src/streaming/event_parser/protocols/raydium_cpmm/parser.rs @@ -73,11 +73,11 @@ fn parse_withdraw_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 24 || accounts.len() < 14 { return None; } - Some(Box::new(RaydiumCpmmWithdrawEvent { + Some(UnifiedEvent::RaydiumCpmmWithdrawEvent(RaydiumCpmmWithdrawEvent { metadata, lp_token_amount: read_u64_le(data, 0)?, minimum_token0_amount: read_u64_le(data, 8)?, @@ -104,11 +104,11 @@ fn parse_initialize_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 24 || accounts.len() < 20 { return None; } - Some(Box::new(RaydiumCpmmInitializeEvent { + Some(UnifiedEvent::RaydiumCpmmInitializeEvent(RaydiumCpmmInitializeEvent { metadata, init_amount0: read_u64_le(data, 0)?, init_amount1: read_u64_le(data, 8)?, @@ -141,11 +141,11 @@ fn parse_deposit_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 24 || accounts.len() < 13 { return None; } - Some(Box::new(RaydiumCpmmDepositEvent { + Some(UnifiedEvent::RaydiumCpmmDepositEvent(RaydiumCpmmDepositEvent { metadata, lp_token_amount: read_u64_le(data, 0)?, maximum_token0_amount: read_u64_le(data, 8)?, @@ -171,7 +171,7 @@ fn parse_swap_base_input_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 16 || accounts.len() < 13 { return None; } @@ -179,7 +179,7 @@ fn parse_swap_base_input_instruction( let amount_in = read_u64_le(data, 0)?; let minimum_amount_out = read_u64_le(data, 8)?; - Some(Box::new(RaydiumCpmmSwapEvent { + Some(UnifiedEvent::RaydiumCpmmSwapEvent(RaydiumCpmmSwapEvent { metadata, amount_in, minimum_amount_out, @@ -204,7 +204,7 @@ fn parse_swap_base_output_instruction( data: &[u8], accounts: &[Pubkey], metadata: EventMetadata, -) -> Option> { +) -> Option { if data.len() < 16 || accounts.len() < 13 { return None; } @@ -212,7 +212,7 @@ fn parse_swap_base_output_instruction( let max_amount_in = read_u64_le(data, 0)?; let amount_out = read_u64_le(data, 8)?; - Some(Box::new(RaydiumCpmmSwapEvent { + Some(UnifiedEvent::RaydiumCpmmSwapEvent(RaydiumCpmmSwapEvent { metadata, max_amount_in, amount_out, diff --git a/src/streaming/event_parser/protocols/raydium_cpmm/types.rs b/src/streaming/event_parser/protocols/raydium_cpmm/types.rs index 532690f..c428f16 100644 --- a/src/streaming/event_parser/protocols/raydium_cpmm/types.rs +++ b/src/streaming/event_parser/protocols/raydium_cpmm/types.rs @@ -36,15 +36,12 @@ pub fn amm_config_decode(data: &[u8]) -> Option { borsh::from_slice::(&data[..AMM_CONFIG_SIZE]).ok() } -pub fn amm_config_parser( - account: &AccountPretty, - metadata: EventMetadata, -) -> Option> { +pub fn amm_config_parser(account: &AccountPretty, metadata: EventMetadata) -> Option { if account.data.len() < AMM_CONFIG_SIZE + 8 { return None; } if let Some(amm_config) = amm_config_decode(&account.data[8..AMM_CONFIG_SIZE + 8]) { - Some(Box::new(RaydiumCpmmAmmConfigAccountEvent { + Some(UnifiedEvent::RaydiumCpmmAmmConfigAccountEvent(RaydiumCpmmAmmConfigAccountEvent { metadata, pubkey: account.pubkey, executable: account.executable, @@ -94,15 +91,12 @@ pub fn pool_state_decode(data: &[u8]) -> Option { borsh::from_slice::(&data[..POOL_STATE_SIZE]).ok() } -pub fn pool_state_parser( - account: &AccountPretty, - metadata: EventMetadata, -) -> Option> { +pub fn pool_state_parser(account: &AccountPretty, metadata: EventMetadata) -> Option { if account.data.len() < POOL_STATE_SIZE + 8 { return None; } if let Some(pool_state) = pool_state_decode(&account.data[8..POOL_STATE_SIZE + 8]) { - Some(Box::new(RaydiumCpmmPoolStateAccountEvent { + Some(UnifiedEvent::RaydiumCpmmPoolStateAccountEvent(RaydiumCpmmPoolStateAccountEvent { metadata, pubkey: account.pubkey, executable: account.executable, diff --git a/src/streaming/grpc/mod.rs b/src/streaming/grpc/mod.rs index 6618f4e..842e798 100644 --- a/src/streaming/grpc/mod.rs +++ b/src/streaming/grpc/mod.rs @@ -12,6 +12,5 @@ pub use types::*; // 从公用模块重新导出 pub use crate::streaming::common::{ - BackpressureConfig, BackpressureStrategy, ConnectionConfig, MetricsManager, PerformanceMetrics, - StreamClientConfig as ClientConfig, + ConnectionConfig, MetricsManager, PerformanceMetrics, StreamClientConfig as ClientConfig, }; diff --git a/src/streaming/shred/connection.rs b/src/streaming/shred/connection.rs index 951993c..8013930 100644 --- a/src/streaming/shred/connection.rs +++ b/src/streaming/shred/connection.rs @@ -1,5 +1,4 @@ use std::sync::Arc; -use std::sync::RwLock; use tokio::sync::Mutex; use tonic::transport::Channel; @@ -14,8 +13,6 @@ use crate::streaming::common::{ pub struct ShredStreamGrpc { pub shredstream_client: Arc>, pub config: StreamClientConfig, - pub metrics: Arc>, - pub metrics_manager: MetricsManager, pub subscription_handle: Arc>>, } @@ -28,38 +25,14 @@ impl ShredStreamGrpc { /// 创建客户端，使用自定义配置 pub async fn new_with_config(endpoint: String, config: StreamClientConfig) -> AnyResult { let shredstream_client = ShredstreamProxyClient::connect(endpoint.clone()).await?; - let metrics = Arc::new(RwLock::new(PerformanceMetrics::new())); - - let metrics_manager = MetricsManager::new(config.enable_metrics, "ShredStream".to_string()); - + MetricsManager::init(config.enable_metrics); Ok(Self { shredstream_client: Arc::new(shredstream_client), config, - metrics: metrics.clone(), - metrics_manager, subscription_handle: Arc::new(Mutex::new(None)), }) } - /// Creates a new ShredStreamClient with high-throughput configuration. - /// - /// This is a convenience method that creates a client optimized for high-concurrency scenarios - /// where throughput is prioritized over latency. See `StreamClientConfig::high_throughput()` - /// for detailed configuration information. - pub async fn new_high_throughput(endpoint: String) -> AnyResult { - Self::new_with_config(endpoint, StreamClientConfig::high_throughput()).await - } - - /// Creates a new ShredStreamClient with low-latency configuration. - /// - /// This is a convenience method that creates a client optimized for real-time scenarios - /// where latency is prioritized over throughput. See `StreamClientConfig::low_latency()` - /// for detailed configuration information. - pub async fn new_low_latency(endpoint: String) -> AnyResult { - Self::new_with_config(endpoint, StreamClientConfig::low_latency()).await - } - - /// 获取当前配置 pub fn get_config(&self) -> &StreamClientConfig { &self.config @@ -72,7 +45,7 @@ impl ShredStreamGrpc { /// 获取性能指标 pub fn get_metrics(&self) -> PerformanceMetrics { - self.metrics_manager.get_metrics() + MetricsManager::global().get_metrics() } /// 启用或禁用性能监控 @@ -82,12 +55,12 @@ impl ShredStreamGrpc { /// 打印性能指标 pub fn print_metrics(&self) { - self.metrics_manager.print_metrics(); + MetricsManager::global().print_metrics(); } /// 启动自动性能监控任务 pub async fn start_auto_metrics_monitoring(&self) { - self.metrics_manager.start_auto_monitoring().await; + MetricsManager::global().start_auto_monitoring().await; } /// 停止当前订阅 diff --git a/src/streaming/shred/mod.rs b/src/streaming/shred/mod.rs index cd7ce22..622225b 100644 --- a/src/streaming/shred/mod.rs +++ b/src/streaming/shred/mod.rs @@ -10,6 +10,5 @@ pub use types::*; // 从公用模块重新导出 pub use crate::streaming::common::{ - BackpressureConfig, BackpressureStrategy, ConnectionConfig, MetricsEventType, MetricsManager, - PerformanceMetrics, StreamClientConfig, + ConnectionConfig, MetricsEventType, MetricsManager, PerformanceMetrics, StreamClientConfig, }; diff --git a/src/streaming/shred_stream.rs b/src/streaming/shred_stream.rs index 4aa7bd5..c92dace 100755 --- a/src/streaming/shred_stream.rs +++ b/src/streaming/shred_stream.rs @@ -9,6 +9,7 @@ use crate::streaming::common::{EventProcessor, SubscriptionHandle}; use crate::streaming::event_parser::common::filter::EventTypeFilter; use crate::streaming::event_parser::common::high_performance_clock::get_high_perf_clock; use crate::streaming::event_parser::{Protocol, UnifiedEvent}; +use crate::streaming::grpc::MetricsManager; use crate::streaming::shred::pool::factory; use log::error; use solana_entry::entry::Entry; @@ -25,7 +26,7 @@ impl ShredStreamGrpc { callback: F, ) -> AnyResult<()> where - F: Fn(Box) + Send + Sync + 'static, + F: Fn(UnifiedEvent) + Send + Sync + 'static, { // 如果已有活跃订阅，先停止它 self.stop().await; @@ -33,17 +34,15 @@ impl ShredStreamGrpc { let mut metrics_handle = None; // 启动自动性能监控（如果启用） if self.config.enable_metrics { - metrics_handle = self.metrics_manager.start_auto_monitoring().await; + metrics_handle = MetricsManager::global().start_auto_monitoring().await; } // 创建事件处理器 - let mut event_processor = - EventProcessor::new(self.metrics_manager.clone(), self.config.clone()); + let mut event_processor = EventProcessor::new(self.config.clone()); event_processor.set_protocols_and_event_type_filter( super::common::EventSource::Shred, protocols, event_type_filter, - self.config.backpressure.clone(), Some(Arc::new(callback)), ); @@ -67,7 +66,7 @@ impl ShredStreamGrpc { ); // 直接处理，背压控制在 EventProcessor 内部处理 if let Err(e) = event_processor_clone - .process_shred_transaction_with_metrics( + .process_shred_transaction( transaction_with_slot, bot_wallet, ) diff --git a/src/streaming/yellowstone_grpc.rs b/src/streaming/yellowstone_grpc.rs index bc499f3..356baf9 100644 --- a/src/streaming/yellowstone_grpc.rs +++ b/src/streaming/yellowstone_grpc.rs @@ -13,7 +13,7 @@ use futures::{SinkExt, StreamExt}; use log::error; use solana_sdk::pubkey::Pubkey; use std::sync::atomic::{AtomicBool, Ordering}; -use std::sync::{Arc, RwLock}; +use std::sync::Arc; use tokio::sync::Mutex; use yellowstone_grpc_proto::geyser::subscribe_update::UpdateOneof; use yellowstone_grpc_proto::geyser::{ @@ -40,9 +40,7 @@ pub struct YellowstoneGrpc { pub endpoint: String, pub x_token: Option, pub config: StreamClientConfig, - pub metrics: Arc>, pub subscription_manager: SubscriptionManager, - pub metrics_manager: MetricsManager, pub event_processor: EventProcessor, pub subscription_handle: Arc>>, // Dynamic subscription management fields @@ -66,24 +64,16 @@ impl YellowstoneGrpc { config: StreamClientConfig, ) -> AnyResult { let _ = rustls::crypto::ring::default_provider().install_default().ok(); - let metrics = Arc::new(RwLock::new(PerformanceMetrics::new())); - let subscription_manager = SubscriptionManager::new(endpoint.clone(), x_token.clone(), config.clone()); - let metrics_manager = MetricsManager::new_with_metrics( - metrics.clone(), - config.enable_metrics, - "YellowstoneGrpc".to_string(), - ); - let event_processor = EventProcessor::new(metrics_manager.clone(), config.clone()); + MetricsManager::init(config.enable_metrics); + let event_processor = EventProcessor::new(config.clone()); Ok(Self { endpoint, x_token, config, - metrics: metrics.clone(), subscription_manager, - metrics_manager, event_processor, subscription_handle: Arc::new(Mutex::new(None)), active_subscription: Arc::new(AtomicBool::new(false)), @@ -93,24 +83,6 @@ impl YellowstoneGrpc { }) } - /// Creates a new YellowstoneGrpcClient with high-throughput configuration. - /// - /// This is a convenience method that creates a client optimized for high-concurrency scenarios - /// where throughput is prioritized over latency. See `StreamClientConfig::high_throughput()` - /// for detailed configuration information. - pub fn new_high_throughput(endpoint: String, x_token: Option) -> AnyResult { - Self::new_with_config(endpoint, x_token, StreamClientConfig::high_throughput()) - } - - /// Creates a new YellowstoneGrpcClient with low-latency configuration. - /// - /// This is a convenience method that creates a client optimized for real-time scenarios - /// where latency is prioritized over throughput. See `StreamClientConfig::low_latency()` - /// for detailed configuration information. - pub fn new_low_latency(endpoint: String, x_token: Option) -> AnyResult { - Self::new_with_config(endpoint, x_token, StreamClientConfig::low_latency()) - } - /// 获取配置 pub fn get_config(&self) -> &StreamClientConfig { &self.config @@ -123,12 +95,12 @@ impl YellowstoneGrpc { /// 获取性能指标 pub fn get_metrics(&self) -> PerformanceMetrics { - self.metrics_manager.get_metrics() + MetricsManager::global().get_metrics() } /// 打印性能指标 pub fn print_metrics(&self) { - self.metrics_manager.print_metrics(); + MetricsManager::global().print_metrics(); } /// 启用或禁用性能监控 @@ -171,7 +143,7 @@ impl YellowstoneGrpc { callback: F, ) -> AnyResult<()> where - F: Fn(Box) + Send + Sync + 'static, + F: Fn(UnifiedEvent) + Send + Sync + 'static, { *self.event_type_filter.write().await = event_type_filter.clone(); if self @@ -185,7 +157,7 @@ impl YellowstoneGrpc { let mut metrics_handle = None; // 启动自动性能监控（如果启用） if self.config.enable_metrics { - metrics_handle = self.metrics_manager.start_auto_monitoring().await; + metrics_handle = MetricsManager::global().start_auto_monitoring().await; } let transactions = self @@ -213,7 +185,6 @@ impl YellowstoneGrpc { super::common::EventSource::Grpc, protocols, event_type_filter, - self.config.backpressure.clone(), Some(Arc::new(callback)), ); let stream_handle = tokio::spawn(async move { @@ -228,7 +199,7 @@ impl YellowstoneGrpc { let account_pretty = factory::create_account_pretty_pooled(account); log::debug!("Received account: {:?}", account_pretty); if let Err(e) = event_processor - .process_grpc_event_transaction_with_metrics( + .process_grpc_transaction( EventPretty::Account(account_pretty), bot_wallet, ) @@ -241,7 +212,7 @@ impl YellowstoneGrpc { let block_meta_pretty = factory::create_block_meta_pretty_pooled(sut, created_at); log::debug!("Received block meta: {:?}", block_meta_pretty); if let Err(e) = event_processor - .process_grpc_event_transaction_with_metrics( + .process_grpc_transaction( EventPretty::BlockMeta(block_meta_pretty), bot_wallet, ) @@ -258,7 +229,7 @@ impl YellowstoneGrpc { transaction_pretty.slot ); if let Err(e) = event_processor - .process_grpc_event_transaction_with_metrics( + .process_grpc_transaction( EventPretty::Transaction(transaction_pretty), bot_wallet, ) @@ -380,9 +351,7 @@ impl Clone for YellowstoneGrpc { endpoint: self.endpoint.clone(), x_token: self.x_token.clone(), config: self.config.clone(), - metrics: self.metrics.clone(), subscription_manager: self.subscription_manager.clone(), - metrics_manager: self.metrics_manager.clone(), event_processor: self.event_processor.clone(), subscription_handle: self.subscription_handle.clone(), // 共享同一个 Arc> active_subscription: self.active_subscription.clone(),