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

chore: integrate into neon_node. requires Box<dyn ..>

Browse Source
This commit is contained in:
Aaron Blankstein
2021-09-23 13:29:48 -05:00
parent c1042ccefb
commit d5d94cfb2d
4 changed files with 73 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -448,7 +448,7 @@ impl<'a> StacksMicroblockBuilder<'a> {
return self.make_next_microblock(txs_included, miner_key);
}
pub fn mine_next_microblock<CE: CostEstimator, CM: CostMetric>(
pub fn mine_next_microblock<CE: CostEstimator + ?Sized, CM: CostMetric + ?Sized>(
&mut self,
mem_pool: &mut MemPoolDB,
miner_key: &Secp256k1PrivateKey,
@@ -1444,7 +1444,7 @@ impl StacksBlockBuilder {
/// Given access to the mempool, mine an anchored block with no more than the given execution cost.
/// returns the assembled block, and the consumed execution budget.
pub fn build_anchored_block<CE: CostEstimator, CM: CostMetric>(
pub fn build_anchored_block<CE: CostEstimator + ?Sized, CM: CostMetric + ?Sized>(
chainstate_handle: &StacksChainState, // not directly used; used as a handle to open other chainstates
burn_dbconn: &SortitionDBConn,
mempool: &mut MemPoolDB,

2
src/core/mempool.rs
View File

@@ -550,7 +550,7 @@ impl MemPoolDB {
/// at most `max_updates` entries in the database before returning.
///
/// Returns `Ok(number_updated)` on success
pub fn estimate_tx_rates<CE: CostEstimator, CM: CostMetric>(
pub fn estimate_tx_rates<CE: CostEstimator + ?Sized, CM: CostMetric + ?Sized>(
&mut self,
estimator: &CE,
metric: &CM,

76
testnet/stacks-node/src/neon_node.rs
View File

@@ -27,6 +27,7 @@ use stacks::chainstate::stacks::db::{
};
use stacks::chainstate::stacks::Error as ChainstateError;
use stacks::chainstate::stacks::StacksPublicKey;
use stacks::chainstate::stacks::MAX_BLOCK_LEN;
use stacks::chainstate::stacks::{
miner::BlockBuilderSettings, miner::StacksMicroblockBuilder, StacksBlockBuilder,
};
@@ -37,6 +38,11 @@ use stacks::chainstate::stacks::{
use stacks::codec::StacksMessageCodec;
use stacks::core::mempool::MemPoolDB;
use stacks::core::FIRST_BURNCHAIN_CONSENSUS_HASH;
use stacks::cost_estimates::metrics::CostMetric;
use stacks::cost_estimates::metrics::ProportionalDotProduct;
use stacks::cost_estimates::metrics::UnitMetric;
use stacks::cost_estimates::CostEstimator;
use stacks::cost_estimates::UnitEstimator;
use stacks::monitoring::{increment_stx_blocks_mined_counter, update_active_miners_count_gauge};
use stacks::net::{
atlas::{AtlasConfig, AtlasDB, AttachmentInstance},
@@ -60,6 +66,8 @@ use stacks::vm::costs::ExecutionCost;
use stacks::{burnchains::BurnchainSigner, chainstate::stacks::db::StacksHeaderInfo};
use crate::burnchains::bitcoin_regtest_controller::BitcoinRegtestController;
use crate::config::CostEstimatorName;
use crate::config::CostMetricName;
use crate::run_loop::RegisteredKey;
use crate::syncctl::PoxSyncWatchdogComms;
use crate::ChainTip;
@@ -324,11 +332,13 @@ fn inner_generate_block_commit_op(
}
/// Mine and broadcast a single microblock, unconditionally.
fn mine_one_microblock(
fn mine_one_microblock<CM: CostMetric + ?Sized, CE: CostEstimator + ?Sized>(
microblock_state: &mut MicroblockMinerState,
sortdb: &SortitionDB,
chainstate: &mut StacksChainState,
mempool: &MemPoolDB,
mempool: &mut MemPoolDB,
estimator: &mut CE,
metric: &CM,
) -> Result<StacksMicroblock, ChainstateError> {
debug!(
"Try to mine one microblock off of {}/{} (total: {})",
@@ -363,7 +373,13 @@ fn mine_one_microblock(
};
let t1 = get_epoch_time_ms();
let mblock = microblock_miner.mine_next_microblock(mempool, &microblock_state.miner_key)?;
let mblock = microblock_miner.mine_next_microblock(
mempool,
&microblock_state.miner_key,
estimator,
metric,
)?;
let new_cost_so_far = microblock_miner.get_cost_so_far().expect("BUG: cannot read cost so far from miner -- indicates that the underlying Clarity Tx is somehow in use still.");
let t2 = get_epoch_time_ms();
@@ -399,13 +415,15 @@ fn mine_one_microblock(
return Ok(mined_microblock);
}
fn try_mine_microblock(
fn try_mine_microblock<CM: CostMetric + ?Sized, CE: CostEstimator + ?Sized>(
config: &Config,
microblock_miner_state: &mut Option<MicroblockMinerState>,
chainstate: &mut StacksChainState,
sortdb: &SortitionDB,
mem_pool: &MemPoolDB,
mem_pool: &mut MemPoolDB,
winning_tip: (ConsensusHash, BlockHeaderHash, Secp256k1PrivateKey),
estimator: &mut CE,
metric: &CM,
) -> Result<Option<StacksMicroblock>, NetError> {
let ch = winning_tip.0;
let bhh = winning_tip.1;
@@ -466,8 +484,14 @@ fn try_mine_microblock(
get_epoch_time_secs() - 600,
)?;
if num_attachable == 0 {
match mine_one_microblock(&mut microblock_miner, sortdb, chainstate, &mem_pool)
{
match mine_one_microblock(
&mut microblock_miner,
sortdb,
chainstate,
mem_pool,
estimator,
metric,
) {
Ok(microblock) => {
// will need to relay this
next_microblock = Some(microblock);
@@ -493,16 +517,18 @@ fn try_mine_microblock(
Ok(next_microblock)
}
fn run_microblock_tenure(
fn run_microblock_tenure<CM: CostMetric + ?Sized, CE: CostEstimator + ?Sized>(
config: &Config,
microblock_miner_state: &mut Option<MicroblockMinerState>,
chainstate: &mut StacksChainState,
sortdb: &mut SortitionDB,
mem_pool: &MemPoolDB,
mem_pool: &mut MemPoolDB,
relayer: &mut Relayer,
miner_tip: (ConsensusHash, BlockHeaderHash, Secp256k1PrivateKey),
microblocks_processed: BlocksProcessedCounter,
event_dispatcher: &EventDispatcher,
estimator: &mut CE,
metric: &CM,
) {
// TODO: this is sensitive to poll latency -- can we call this on a fixed
// schedule, regardless of network activity?
@@ -522,6 +548,8 @@ fn run_microblock_tenure(
sortdb,
mem_pool,
miner_tip.clone(),
estimator,
metric,
) {
Ok(x) => x,
Err(e) => {
@@ -839,6 +867,20 @@ fn spawn_miner_relayer(
let mut last_tenure_issue_time = 0;
let relayer_handle = thread::Builder::new().name("relayer".to_string()).spawn(move || {
let mut cost_estimator: Box<dyn CostEstimator> = match config.estimation.cost_estimator {
Some(CostEstimatorName::NaivePessimistic) =>
Box::new(
config.estimation
.make_pessimistic_cost_estimator(config.get_chainstate_path())),
None => Box::new(UnitEstimator),
};
let metric: Box<dyn CostMetric> = match config.estimation.cost_metric {
Some(CostMetricName::ProportionDotProduct) =>
Box::new(ProportionalDotProduct::new(MAX_BLOCK_LEN as u64, config.block_limit.clone())),
None => Box::new(UnitMetric),
};
while let Ok(mut directive) = relay_channel.recv() {
match directive {
RelayerDirective::HandleNetResult(ref mut net_result) => {
@@ -1048,6 +1090,8 @@ fn spawn_miner_relayer(
&mut bitcoin_controller,
&last_mined_blocks_vec.iter().map(|(blk, _)| blk).collect(),
&event_dispatcher,
cost_estimator.as_mut(),
metric.as_ref(),
);
if let Some((last_mined_block, microblock_privkey)) = last_mined_block_opt {
if last_mined_blocks_vec.len() == 0 {
@@ -1096,11 +1140,13 @@ fn spawn_miner_relayer(
&mut microblock_miner_state,
&mut chainstate,
&mut sortdb,
&mem_pool,
&mut mem_pool,
&mut relayer,
(ch, bh, mblock_pkey),
microblocks_processed.clone(),
&event_dispatcher
&event_dispatcher,
cost_estimator.as_mut(),
metric.as_ref(),
);
// synchronize unconfirmed tx index to p2p thread
@@ -1531,7 +1577,7 @@ impl InitializedNeonNode {
/// Return the assembled anchor block info and microblock private key on success.
/// Return None if we couldn't build a block for whatever reason
fn relayer_run_tenure(
fn relayer_run_tenure<CM: CostMetric + ?Sized, CE: CostEstimator + ?Sized>(
config: &Config,
registered_key: RegisteredKey,
chain_state: &mut StacksChainState,
@@ -1544,6 +1590,8 @@ impl InitializedNeonNode {
bitcoin_controller: &mut BitcoinRegtestController,
last_mined_blocks: &Vec<&AssembledAnchorBlock>,
event_observer: &EventDispatcher,
estimator: &mut CE,
metric: &CM,
) -> Option<(AssembledAnchorBlock, Secp256k1PrivateKey)> {
let MiningTenureInformation {
mut stacks_parent_header,
@@ -1830,6 +1878,8 @@ impl InitializedNeonNode {
&coinbase_tx,
config.make_block_builder_settings((last_mined_blocks.len() + 1) as u64),
Some(event_observer),
estimator,
metric,
) {
Ok(block) => block,
Err(ChainstateError::InvalidStacksMicroblock(msg, mblock_header_hash)) => {
@@ -1870,6 +1920,8 @@ impl InitializedNeonNode {
&coinbase_tx,
config.make_block_builder_settings((last_mined_blocks.len() + 1) as u64),
Some(event_observer),
estimator,
metric,
) {
Ok(block) => block,
Err(e) => {

6
testnet/stacks-node/src/tenure.rs
View File

@@ -11,6 +11,8 @@ use stacks::chainstate::stacks::{
StacksPrivateKey, StacksPublicKey, StacksTransaction,
};
use stacks::core::mempool::MemPoolDB;
use stacks::cost_estimates::metrics::UnitMetric;
use stacks::cost_estimates::UnitEstimator;
use stacks::types::chainstate::VRFSeed;
use stacks::util::hash::Hash160;
use stacks::util::vrf::VRFProof;
@@ -84,6 +86,8 @@ impl<'a> Tenure {
)
.unwrap();
let mut estimator = UnitEstimator;
let metric = UnitMetric;
let (anchored_block, _, _) = StacksBlockBuilder::build_anchored_block(
&mut chain_state,
burn_dbconn,
@@ -95,6 +99,8 @@ impl<'a> Tenure {
&self.coinbase_tx,
BlockBuilderSettings::limited(self.config.block_limit.clone()),
None,
&mut estimator,
&metric,
)
.unwrap();