kylefang/stacks-puppet-node
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-puppet-node.git synced 2026-06-12 07:45:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

address feedback

Browse Source
This commit is contained in:
Jude Nelson
2021-03-01 14:03:06 -05:00
parent 437a898075
commit 08db53bd2c
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/chainstate/stacks/miner.rs
View File

@@ -257,7 +257,7 @@ impl<'a> StacksMicroblockBuilder<'a> {
};
info!(
"\n\nMiner: Created microblock block {} (seq={}) off of {}/{}: {} transaction(s)\n",
"Miner: Created microblock block {} (seq={}) off of {}/{}: {} transaction(s)",
microblock.block_hash(),
microblock.header.sequence,
self.anchor_block_consensus_hash,

2
src/net/p2p.rs
View File

@@ -4037,7 +4037,7 @@ impl PeerNetwork {
// set up sockets that have finished connecting
self.process_connecting_sockets(&mut poll_state);
// find out who is inbound and unauthenticed
// find out who is inbound and unauthenticated
let unauthenticated_inbounds = self.find_unauthenticated_inbound_convos();
// run existing conversations, clear out broken ones, and get back messages forwarded to us

7
testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs
View File

@@ -16,6 +16,9 @@ use super::super::operations::BurnchainOpSigner;
use super::super::Config;
use super::{BurnchainController, BurnchainTip, Error as BurnchainControllerError};
use stacks::burnchains::bitcoin::indexer::{
BitcoinIndexer, BitcoinIndexerConfig, BitcoinIndexerRuntime,
};
use stacks::burnchains::bitcoin::spv::SpvClient;
use stacks::burnchains::bitcoin::BitcoinNetworkType;
use stacks::burnchains::db::BurnchainDB;
@@ -46,10 +49,6 @@ use stacks::net::StacksMessageCodec;
use stacks::util::hash::{hex_bytes, Hash160};
use stacks::util::secp256k1::Secp256k1PublicKey;
use stacks::util::sleep_ms;
use stacks::{
burnchains::bitcoin::indexer::{BitcoinIndexer, BitcoinIndexerConfig, BitcoinIndexerRuntime},
chainstate::burn::db::sortdb::SortitionId,
};
use stacks::monitoring::{increment_btc_blocks_received_counter, increment_btc_ops_sent_counter};

12
testnet/stacks-node/src/syncctl.rs
View File

@@ -12,6 +12,12 @@ use std::sync::{
Arc,
};
// amount of time to wait for an inv or download sync to complete.
// These _really should_ complete before the PoX sync watchdog permits processing the next reward
// cycle, so this number is intentionally high (like, there's something really wrong with your
// network if your node is actualy waiting a day in-between reward cycles).
const SYNC_WAIT_SECS: u64 = 24 * 3600;
#[derive(Clone)]
pub struct PoxSyncWatchdogComms {
/// how many passes in the p2p state machine have taken place since startup?
@@ -441,7 +447,7 @@ impl PoxSyncWatchdog {
< burnchain.first_block_height + (burnchain.pox_constants.reward_cycle_length as u64)
{
debug!("PoX watchdog in first reward cycle -- sync immediately");
sleep_ms(10_000);
sleep_ms(self.steady_state_burnchain_sync_interval);
return ibbd;
}
@@ -456,7 +462,7 @@ impl PoxSyncWatchdog {
// so make sure the downloader knows about blocks it doesn't have yet so we can go and
// fetch its blocks before proceeding.
debug!("PoX watchdog: Wait for at least one inventory state-machine pass...");
self.relayer_comms.wait_for_inv_sync_pass(3600); // wait an hour at most
self.relayer_comms.wait_for_inv_sync_pass(SYNC_WAIT_SECS);
waited = true;
} else {
debug!("PoX watchdog: not in initial burn block download, so not waiting for an inventory state-machine pass");
@@ -621,7 +627,7 @@ impl PoxSyncWatchdog {
if ibbd || !steady_state {
debug!("PoX watchdog: Wait for at least one downloader state-machine pass before resetting...");
self.relayer_comms.wait_for_download_pass(3600); // wait at most an hour, but should be far, far less
self.relayer_comms.wait_for_download_pass(SYNC_WAIT_SECS);
} else {
debug!("PoX watchdog: in steady-state, so not waiting for download pass");
}