File tree Expand file tree Collapse file tree 2 files changed +9
-3
lines changed Expand file tree Collapse file tree 2 files changed +9
-3
lines changed Original file line number Diff line number Diff line change @@ -298,7 +298,10 @@ impl SignerCoordinator {
298
298
) ;
299
299
300
300
match res {
301
- Err ( NakamotoNodeError :: SignatureTimeout ) => continue ,
301
+ Err ( NakamotoNodeError :: SignatureTimeout ) => {
302
+ info ! ( "Block proposal signing process timed out, resending the same proposal" ) ;
303
+ continue ;
304
+ }
302
305
_ => return res,
303
306
}
304
307
}
Original file line number Diff line number Diff line change @@ -35,7 +35,7 @@ use stacks::chainstate::burn::db::sortdb::SortitionDB;
35
35
use stacks:: chainstate:: burn:: operations:: LeaderBlockCommitOp ;
36
36
use stacks:: chainstate:: coordinator:: comm:: CoordinatorChannels ;
37
37
use stacks:: chainstate:: nakamoto:: { NakamotoBlock , NakamotoBlockHeader , NakamotoChainState } ;
38
- use stacks:: chainstate:: stacks:: address:: PoxAddress ;
38
+ use stacks:: chainstate:: stacks:: address:: { PoxAddress , StacksAddressExtensions } ;
39
39
use stacks:: chainstate:: stacks:: boot:: MINERS_NAME ;
40
40
use stacks:: chainstate:: stacks:: db:: { StacksBlockHeaderTypes , StacksChainState , StacksHeaderInfo } ;
41
41
use stacks:: chainstate:: stacks:: miner:: { TransactionEvent , TransactionSuccessEvent } ;
@@ -12105,7 +12105,10 @@ fn transfers_in_block(block: &serde_json::Value) -> usize {
12105
12105
let tx_bytes = hex_bytes ( & raw_tx[ 2 ..] ) . unwrap ( ) ;
12106
12106
let parsed = StacksTransaction :: consensus_deserialize ( & mut & tx_bytes[ ..] ) . unwrap ( ) ;
12107
12107
if let TransactionPayload :: TokenTransfer ( ..) = & parsed. payload {
12108
- count += 1 ;
12108
+ // don't count phantom unlock transactions (identified as transfers from the boot addr)
12109
+ if !parsed. get_origin ( ) . address_testnet ( ) . is_boot_code_addr ( ) {
12110
+ count += 1 ;
12111
+ }
12109
12112
}
12110
12113
}
12111
12114
count
You can’t perform that action at this time.
0 commit comments