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

Adding more info to block logs

This commit is contained in:
Godmode Galactus 2023-06-29 13:49:19 +02:00
parent 6b946ea4e9
commit e7f7d415ad
No known key found for this signature in database
GPG Key ID: A04142C71ABB0DEA
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/confirmation_strategies.rs
View File

@ -32,6 +32,7 @@ pub async fn process_blocks(
tx_block_data: Sender<BlockData>, tx_block_data: Sender<BlockData>,
transaction_map: Arc<DashMap<Signature, (TransactionSendRecord, Instant)>>, transaction_map: Arc<DashMap<Signature, (TransactionSendRecord, Instant)>>,
slot: u64, slot: u64,
commitment: CommitmentLevel,
) { ) {
let mut mm_transaction_count: u64 = 0; let mut mm_transaction_count: u64 = 0;
let rewards = block.rewards.as_ref().unwrap(); let rewards = block.rewards.as_ref().unwrap();
@ -123,9 +124,11 @@ pub async fn process_blocks(
} else { } else {
0 0
}, },
number_of_mm_transactions: mm_transaction_count, number_of_mango_simulation_txs: mm_transaction_count,
total_transactions: nb_transactions as u64, total_transactions: nb_transactions as u64,
cu_consumed: cu_consumed, cu_consumed: 0,
cu_consumed_by_mango_simulations: cu_consumed,
commitment,
}); });
} }
} }
@ -194,9 +197,11 @@ pub fn confirmation_by_lite_rpc_notification_stream(
block_leader: block_notification.block_leader, block_leader: block_notification.block_leader,
block_slot: block_notification.slot, block_slot: block_notification.slot,
block_time: block_notification.block_time, block_time: block_notification.block_time,
number_of_mm_transactions: block_notification.transaction_found, number_of_mango_simulation_txs: block_notification.transaction_found,
total_transactions: block_notification.total_transactions, total_transactions: block_notification.total_transactions,
cu_consumed: block_notification.total_cu_consumed, cu_consumed: block_notification.total_cu_consumed,
cu_consumed_by_mango_simulations: block_notification.cu_consumed_by_txs,
commitment: block_notification.commitment,
}); });
} }
NotificationMsg::UpdateTransactionMsg(tx_update_notifications) => { NotificationMsg::UpdateTransactionMsg(tx_update_notifications) => {
@ -306,6 +311,7 @@ pub fn confirmation_by_lite_rpc_notification_stream(
vec![confirming_task, cleaner_jh] vec![confirming_task, cleaner_jh]
} }
#[deprecated]
pub fn confirmations_by_blocks( pub fn confirmations_by_blocks(
client: Arc<RpcClient>, client: Arc<RpcClient>,
mut tx_record_rx: UnboundedReceiver<TransactionSendRecord>, mut tx_record_rx: UnboundedReceiver<TransactionSendRecord>,
@ -462,6 +468,7 @@ pub fn confirmations_by_blocks(
tx_block_data, tx_block_data,
transaction_map, transaction_map,
block_slot.1, block_slot.1,
commitment_confirmation.commitment,
) )
.await; .await;
} }

6
src/states.rs
View File

@ -3,7 +3,7 @@ use fixed::types::I80F48;
use mango::state::PerpMarket; use mango::state::PerpMarket;
use serde::Serialize; use serde::Serialize;
use solana_program::{pubkey::Pubkey, slot_history::Slot}; use solana_program::{pubkey::Pubkey, slot_history::Slot};
use solana_sdk::signature::Signature; use solana_sdk::{signature::Signature, commitment_config::CommitmentLevel};
use std::fmt; use std::fmt;
#[derive(Clone, Debug, Serialize)] #[derive(Clone, Debug, Serialize)]
@ -99,7 +99,9 @@ pub struct BlockData {
pub block_slot: Slot, pub block_slot: Slot,
pub block_leader: String, pub block_leader: String,
pub total_transactions: u64, pub total_transactions: u64,
pub number_of_mm_transactions: u64, pub number_of_mango_simulation_txs: u64,
pub block_time: u64, pub block_time: u64,
pub cu_consumed: u64, pub cu_consumed: u64,
pub cu_consumed_by_mango_simulations: u64,
pub commitment: CommitmentLevel,
} }