Skip to content

Commit 4dc33a7

Browse files
committed
test: fix transfer counting assertion
assertion should not include phantom txs. timing changes around the signer status checks made this more likely.
1 parent bc079b3 commit 4dc33a7

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

testnet/stacks-node/src/nakamoto_node/signer_coordinator.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,10 @@ impl SignerCoordinator {
298298
);
299299

300300
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+
}
302305
_ => return res,
303306
}
304307
}

testnet/stacks-node/src/tests/signer/v0.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ use stacks::chainstate::burn::db::sortdb::SortitionDB;
3535
use stacks::chainstate::burn::operations::LeaderBlockCommitOp;
3636
use stacks::chainstate::coordinator::comm::CoordinatorChannels;
3737
use stacks::chainstate::nakamoto::{NakamotoBlock, NakamotoBlockHeader, NakamotoChainState};
38-
use stacks::chainstate::stacks::address::PoxAddress;
38+
use stacks::chainstate::stacks::address::{PoxAddress, StacksAddressExtensions};
3939
use stacks::chainstate::stacks::boot::MINERS_NAME;
4040
use stacks::chainstate::stacks::db::{StacksBlockHeaderTypes, StacksChainState, StacksHeaderInfo};
4141
use stacks::chainstate::stacks::miner::{TransactionEvent, TransactionSuccessEvent};
@@ -12105,7 +12105,10 @@ fn transfers_in_block(block: &serde_json::Value) -> usize {
1210512105
let tx_bytes = hex_bytes(&raw_tx[2..]).unwrap();
1210612106
let parsed = StacksTransaction::consensus_deserialize(&mut &tx_bytes[..]).unwrap();
1210712107
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+
}
1210912112
}
1211012113
}
1211112114
count

0 commit comments

Comments
 (0)