Merge branch 'master' into feat/drop-first-burn-hash

hirosystems · Jun 21, 2022 · ccff7ca · ccff7ca
2 parents 33b717c + 4b7c5eb
commit ccff7ca
Show file tree

Hide file tree

Showing 3 changed files with 301 additions and 9 deletions.
diff --git a/src/chainstate/stacks/miner.rs b/src/chainstate/stacks/miner.rs
@@ -236,6 +236,7 @@ impl TransactionResult {
             "event_name" => %"transaction_result",
             "tx_id" => %tx.txid(),
             "event_type" => %"success",
+            "payload" => %tx.payload.name(),
         );
     }
 
@@ -247,6 +248,7 @@ impl TransactionResult {
             "reason" => %err,
             "tx_id" => %tx.txid(),
             "event_type" => "error",
+            "payload" => %tx.payload.name(),
         );
     }
 
@@ -258,6 +260,7 @@ impl TransactionResult {
             "event_name" => "transaction_result",
             "tx_id" => %tx.txid(),
             "event_type" => "skip",
+            "payload" => %tx.payload.name(),
             "reason" => %err,
         );
     }

diff --git a/src/core/mempool.rs b/src/core/mempool.rs
@@ -182,6 +182,7 @@ pub enum MemPoolDropReason {
     TOO_EXPENSIVE,
 }
 
+#[derive(Debug)]
 pub struct ConsiderTransaction {
     /// Transaction to consider in block assembly
     pub tx: MemPoolTxInfo,
@@ -190,6 +191,7 @@ pub struct ConsiderTransaction {
     pub update_estimate: bool,
 }
 
+#[derive(Debug)]
 enum ConsiderTransactionResult {
     NoTransactions,
     UpdateNonces(Vec<StacksAddress>),