diff --git a/Cargo.toml b/Cargo.toml index 93478f8..8c5ee44 100755 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,6 +25,7 @@ serde-big-array = "0.5.1" futures = "0.3.32" bincode = "1.3" anyhow = "1.0.102" +bs58 = "0.5.1" yellowstone-grpc-client = { version = "10.2.0" } yellowstone-grpc-proto = { version = "10.1.1" } tokio = { version = "1.49.0", features = ["full", "rt-multi-thread"]} diff --git a/src/streaming/event_parser/common/types.rs b/src/streaming/event_parser/common/types.rs index 088bcf4..b5fedaa 100755 --- a/src/streaming/event_parser/common/types.rs +++ b/src/streaming/event_parser/common/types.rs @@ -312,9 +312,9 @@ pub struct EventMetadata { pub swap_data: Option, pub outer_index: i64, pub inner_index: Option, - /// Transaction message recent blockhash (32 bytes), when available. + /// Transaction message recent blockhash as base58 string (same encoding as signature), when available. #[serde(default)] - pub recent_blockhash: Option>, + pub recent_blockhash: Option, } impl EventMetadata { @@ -331,7 +331,7 @@ impl EventMetadata { inner_index: Option, recv_us: i64, tx_index: Option, - recent_blockhash: Option>, + recent_blockhash: Option, ) -> Self { Self { signature, diff --git a/src/streaming/event_parser/core/event_parser.rs b/src/streaming/event_parser/core/event_parser.rs index a4f576f..d7703a0 100644 --- a/src/streaming/event_parser/core/event_parser.rs +++ b/src/streaming/event_parser/core/event_parser.rs @@ -85,7 +85,7 @@ impl EventParser { let recent_blockhash = if message.recent_blockhash.is_empty() { None } else { - Some(message.recent_blockhash.clone()) + Some(bs58::encode(&message.recent_blockhash).into_string()) }; Self::parse_instruction_events_from_grpc_transaction( protocols, @@ -134,7 +134,7 @@ impl EventParser { }); // 获取交易的指令和账户 let compiled_instructions = transaction.message.instructions(); - let recent_blockhash = Some(transaction.message.recent_blockhash().to_bytes().to_vec()); + let recent_blockhash = Some(transaction.message.recent_blockhash().to_string()); let mut accounts: Vec = accounts.to_vec(); // 检查交易中是否包含程序 let has_program = accounts @@ -223,7 +223,7 @@ impl EventParser { inner_instructions: &[yellowstone_grpc_proto::prelude::InnerInstructions], bot_wallet: Option, tx_index: Option, - recent_blockhash: Option>, + recent_blockhash: Option, callback: Arc Fn(&'a DexEvent) + Send + Sync>, ) -> anyhow::Result<()> { // 获取交易的指令和账户 @@ -320,7 +320,7 @@ impl EventParser { inner_index: Option, bot_wallet: Option, tx_index: Option, - recent_blockhash: Option<&[u8]>, + recent_blockhash: Option<&str>, inner_instructions: Option<&yellowstone_grpc_proto::prelude::InnerInstructions>, callback: Arc Fn(&'a DexEvent) + Send + Sync>, ) -> anyhow::Result<()> { @@ -360,7 +360,7 @@ impl EventParser { inner_index, recv_us, tx_index, - recent_blockhash.map(|s| s.to_vec()), + recent_blockhash.map(|s| s.to_string()), ); if is_cu_program { @@ -479,7 +479,7 @@ impl EventParser { inner_index: Option, bot_wallet: Option, tx_index: Option, - recent_blockhash: Option<&[u8]>, + recent_blockhash: Option<&str>, inner_instructions: Option<&InnerInstructions>, callback: Arc Fn(&'a DexEvent) + Send + Sync>, ) -> anyhow::Result<()> { @@ -520,7 +520,7 @@ impl EventParser { inner_index, recv_us, tx_index, - recent_blockhash.map(|s| s.to_vec()), + recent_blockhash.map(|s| s.to_string()), ); if is_cu_program {