refactor: enhance account event parser with more precise event classification

- Rename CommonAccountEvent to TokenAccountEvent for better semantic clarity
- Rename AccountNonce to NonceAccount for consistent naming convention
- Add MintInfoEvent type to support SPL Token Mint account parsing
- Enhance parse_token_account_event to automatically detect and parse Mint accounts
- Update all example code to use new event types and structures
- Improve event type semantics for better developer experience
This commit is contained in:
ysq
2025-09-09 23:42:35 +08:00
parent 528003a688
commit 0c07c4d9ee
10 changed files with 152 additions and 26 deletions
+6 -6
View File
@@ -141,8 +141,8 @@ pub enum EventType {
AccountRaydiumCpmmAmmConfig,
AccountRaydiumCpmmPoolState,
AccountNonce,
AccountCommon,
NonceAccount,
TokenAccount,
// Common events
BlockMeta,
@@ -164,8 +164,8 @@ pub const ACCOUNT_EVENT_TYPES: &[EventType] = &[
EventType::AccountRaydiumClmmTickArrayState,
EventType::AccountRaydiumCpmmAmmConfig,
EventType::AccountRaydiumCpmmPoolState,
EventType::AccountCommon,
EventType::AccountNonce,
EventType::TokenAccount,
EventType::NonceAccount,
];
pub const BLOCK_EVENT_TYPES: &[EventType] = &[EventType::BlockMeta];
@@ -230,8 +230,8 @@ impl fmt::Display for EventType {
}
EventType::AccountRaydiumCpmmAmmConfig => write!(f, "AccountRaydiumCpmmAmmConfig"),
EventType::AccountRaydiumCpmmPoolState => write!(f, "AccountRaydiumCpmmPoolState"),
EventType::AccountCommon => write!(f, "AccountCommon"),
EventType::AccountNonce => write!(f, "AccountNonce"),
EventType::TokenAccount => write!(f, "TokenAccount"),
EventType::NonceAccount => write!(f, "NonceAccount"),
EventType::BlockMeta => write!(f, "BlockMeta"),
EventType::Unknown => write!(f, "Unknown"),
}
@@ -33,7 +33,7 @@ pub struct AccountEventParseConfig {
/// 通用账户事件
#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
pub struct CommonAccountEvent {
pub struct TokenAccountEvent {
pub metadata: EventMetadata,
pub pubkey: Pubkey,
pub executable: bool,
@@ -42,7 +42,7 @@ pub struct CommonAccountEvent {
pub rent_epoch: u64,
pub amount: Option<u64>,
}
impl_unified_event!(CommonAccountEvent,);
impl_unified_event!(TokenAccountEvent,);
/// Nonce account event
#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
@@ -57,6 +57,20 @@ pub struct NonceAccountEvent {
}
impl_unified_event!(NonceAccountEvent,);
/// Nonce account event
#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
pub struct TokenInfoEvent {
pub metadata: EventMetadata,
pub pubkey: Pubkey,
pub executable: bool,
pub lamports: u64,
pub owner: Pubkey,
pub rent_epoch: u64,
pub supply: u64,
pub decimals: u8,
}
impl_unified_event!(TokenInfoEvent,);
/// 账户事件解析器
pub type AccountEventParserFn =
fn(account: &AccountPretty, metadata: EventMetadata) -> Option<Box<dyn UnifiedEvent>>;
@@ -209,12 +223,12 @@ impl AccountEventParser {
}
if event_type_filter.is_none()
|| event_type_filter.unwrap().include.contains(&EventType::AccountNonce)
|| event_type_filter.unwrap().include.contains(&EventType::NonceAccount)
{
let nonce_config = NONCE_CONFIG.get_or_init(|| AccountEventParseConfig {
program_id: Pubkey::default(),
protocol_type: ProtocolType::Common,
event_type: EventType::AccountNonce,
event_type: EventType::NonceAccount,
account_discriminator: &[1, 0, 0, 0, 1, 0, 0, 0],
account_parser: Self::parse_nonce_account_event,
});
@@ -224,7 +238,7 @@ impl AccountEventParser {
let common_config = COMMON_CONFIG.get_or_init(|| AccountEventParseConfig {
program_id: Pubkey::default(),
protocol_type: ProtocolType::Common,
event_type: EventType::AccountCommon,
event_type: EventType::TokenAccount,
account_discriminator: &[],
account_parser: Self::parse_token_account_event,
});
@@ -272,8 +286,24 @@ impl AccountEventParser {
account: &AccountPretty,
metadata: EventMetadata,
) -> Option<Box<dyn UnifiedEvent>> {
use solana_program::program_pack::Pack;
use spl_token::state::Mint;
if let Ok(mint) = Mint::unpack_from_slice(&account.data) {
let mut event = TokenInfoEvent {
metadata,
pubkey: account.pubkey,
executable: account.executable,
lamports: account.lamports,
owner: account.owner,
rent_epoch: account.rent_epoch,
supply: mint.supply,
decimals: mint.decimals,
};
event.set_handle_us(elapsed_micros_since(account.recv_us));
return Some(Box::new(event));
}
let info = Account::unpack(&account.data);
let mut event = CommonAccountEvent {
let mut event = TokenAccountEvent {
metadata,
pubkey: account.pubkey,
executable: account.executable,