From e9b8ba533a8f14e8830a8b56bc08b2e10b6d0e5b Mon Sep 17 00:00:00 2001 From: bestmike007 Date: Fri, 27 Jan 2023 14:41:54 +0000 Subject: [PATCH 1/3] feat: support stacks 2.1 in mocknet controller Signed-off-by: bestmike007 --- .../src/burnchains/mocknet_controller.rs | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/testnet/stacks-node/src/burnchains/mocknet_controller.rs b/testnet/stacks-node/src/burnchains/mocknet_controller.rs index af8f4b8c1..330a0d917 100644 --- a/testnet/stacks-node/src/burnchains/mocknet_controller.rs +++ b/testnet/stacks-node/src/burnchains/mocknet_controller.rs @@ -12,7 +12,9 @@ use stacks::chainstate::burn::operations::{ LeaderKeyRegisterOp, PreStxOp, StackStxOp, TransferStxOp, UserBurnSupportOp, }; use stacks::chainstate::burn::BlockSnapshot; -use stacks::core::{StacksEpoch, StacksEpochId, PEER_VERSION_EPOCH_2_0, STACKS_EPOCH_MAX}; +use stacks::core::{ + StacksEpoch, StacksEpochId, PEER_VERSION_EPOCH_2_0, PEER_VERSION_EPOCH_2_1, STACKS_EPOCH_MAX, +}; use stacks::types::chainstate::{BurnchainHeaderHash, PoxId}; use stacks::util::get_epoch_time_secs; use stacks::util::hash::Sha256Sum; @@ -99,13 +101,22 @@ impl BurnchainController for MocknetController { fn get_stacks_epochs(&self) -> Vec { match &self.config.burnchain.epochs { Some(epochs) => epochs.clone(), - None => vec![StacksEpoch { - epoch_id: StacksEpochId::Epoch20, - start_height: 0, - end_height: STACKS_EPOCH_MAX, - block_limit: ExecutionCost::max_value(), - network_epoch: PEER_VERSION_EPOCH_2_0, - }], + None => vec![ + StacksEpoch { + epoch_id: StacksEpochId::Epoch20, + start_height: 0, + end_height: 1, + block_limit: ExecutionCost::max_value(), + network_epoch: PEER_VERSION_EPOCH_2_0, + }, + StacksEpoch { + epoch_id: StacksEpochId::Epoch21, + start_height: 1, + end_height: STACKS_EPOCH_MAX, + block_limit: ExecutionCost::max_value(), + network_epoch: PEER_VERSION_EPOCH_2_1, + }, + ], } } From 64f1567daac38261e5505605324a0d3140e84025 Mon Sep 17 00:00:00 2001 From: bestmike007 Date: Fri, 27 Jan 2023 14:51:54 +0000 Subject: [PATCH 2/3] chore: update mocknet config to disable public ip address discovery Signed-off-by: bestmike007 --- testnet/stacks-node/conf/mocknet-miner-conf.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testnet/stacks-node/conf/mocknet-miner-conf.toml b/testnet/stacks-node/conf/mocknet-miner-conf.toml index 31d8ea830..71add782b 100644 --- a/testnet/stacks-node/conf/mocknet-miner-conf.toml +++ b/testnet/stacks-node/conf/mocknet-miner-conf.toml @@ -8,6 +8,9 @@ miner = true wait_time_for_microblocks = 10000 use_test_genesis_chainstate = true +[connection_options] +public_ip_address = "127.0.0.1:20444" + [burnchain] chain = "bitcoin" mode = "mocknet" From 0174151f6cfdd16e572ec42c691fcc846640e145 Mon Sep 17 00:00:00 2001 From: bestmike007 Date: Wed, 8 Feb 2023 02:48:28 +0000 Subject: [PATCH 3/3] chore: transition to epoch 2.05 before 2.1 Signed-off-by: bestmike007 --- .../stacks-node/src/burnchains/mocknet_controller.rs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/testnet/stacks-node/src/burnchains/mocknet_controller.rs b/testnet/stacks-node/src/burnchains/mocknet_controller.rs index 330a0d917..003770b6f 100644 --- a/testnet/stacks-node/src/burnchains/mocknet_controller.rs +++ b/testnet/stacks-node/src/burnchains/mocknet_controller.rs @@ -13,7 +13,8 @@ use stacks::chainstate::burn::operations::{ }; use stacks::chainstate::burn::BlockSnapshot; use stacks::core::{ - StacksEpoch, StacksEpochId, PEER_VERSION_EPOCH_2_0, PEER_VERSION_EPOCH_2_1, STACKS_EPOCH_MAX, + StacksEpoch, StacksEpochId, PEER_VERSION_EPOCH_2_0, PEER_VERSION_EPOCH_2_05, + PEER_VERSION_EPOCH_2_1, STACKS_EPOCH_MAX, }; use stacks::types::chainstate::{BurnchainHeaderHash, PoxId}; use stacks::util::get_epoch_time_secs; @@ -110,8 +111,15 @@ impl BurnchainController for MocknetController { network_epoch: PEER_VERSION_EPOCH_2_0, }, StacksEpoch { - epoch_id: StacksEpochId::Epoch21, + epoch_id: StacksEpochId::Epoch2_05, start_height: 1, + end_height: 2, + block_limit: ExecutionCost::max_value(), + network_epoch: PEER_VERSION_EPOCH_2_05, + }, + StacksEpoch { + epoch_id: StacksEpochId::Epoch21, + start_height: 2, end_height: STACKS_EPOCH_MAX, block_limit: ExecutionCost::max_value(), network_epoch: PEER_VERSION_EPOCH_2_1,