Merge branch 'develop' of https://github.com/stacks-network/stacks-core into chore/cleanup-multiple-miners-tests

jferrant · jferrant · commit d7e9720f9d87 · 2025-02-12T16:19:26.000-08:00
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:alpine as build
+FROM rust:bookworm AS build
 
 ARG STACKS_NODE_VERSION="No Version Info"
 ARG GIT_BRANCH='No Branch Info'
@@ -8,15 +8,13 @@ WORKDIR /src
 
 COPY . .
 
-RUN apk add --no-cache musl-dev
-
 RUN mkdir /out
 
 RUN cargo build --features monitoring_prom,slog_json --release
 
 RUN cp target/release/stacks-node /out
 
-FROM alpine
+FROM debian:bookworm-slim
 
 COPY --from=build /out/ /bin/
 
diff --git a/Dockerfile.debian b/Dockerfile.debian
diff --git a/contrib/tools/Dockerfile.memtest b/contrib/tools/Dockerfile.memtest
@@ -1,6 +1,6 @@
 FROM rust:latest
 
-WORKDIR /src/blockstack-core
+WORKDIR /src/stacks-core
 
 RUN apt-get update
 RUN apt-get install valgrind heaptrack -y
diff --git a/contrib/tools/block-replay.sh b/contrib/tools/block-replay.sh
@@ -375,7 +375,6 @@ usage() {
 	echo "    ${COLBOLD}${0}${COLRESET}"
 	echo "        ${COLYELLOW}--testing${COLRESET}: only check a small number of blocks"
 	echo "        ${COLYELLOW}-t|--terminal${COLRESET}: more terminal friendly output"
-	echo "        ${COLYELLOW}-u|--upload${COLRESET}: upload results to s3"
 	echo "        ${COLYELLOW}-n|--network${COLRESET}: run block replay against specific network (default: mainnet)"
 	echo "        ${COLYELLOW}-b|--branch${COLRESET}: branch of stacks-core to build stacks-inspect from (default: develop)"
 	echo "        ${COLYELLOW}-r|--reserved${COLRESET}: how many cpu cores to reserve for system tasks"
@@ -387,7 +386,7 @@ usage() {
 
 
 ## install missing dependencies
-for cmd in curl tmux git wget tar gzip grep cargo pgrep aws; do
+for cmd in curl tmux git wget tar gzip grep cargo pgrep; do
 	command -v "${cmd}" >/dev/null 2>&1 || {
 		case "${cmd}" in
 			"cargo")
@@ -396,9 +395,6 @@ for cmd in curl tmux git wget tar gzip grep cargo pgrep aws; do
 			"pgrep")
 				package="procps"
 				;;
-			"aws")
-				package="awscli"
-				;;
 			*)
 				package="${cmd}"
 				;;
diff --git a/docs/release-process.md b/docs/release-process.md
@@ -16,10 +16,10 @@
 Normal releases in this repository that add new features are released on a monthly schedule.
 The currently staged changes for such releases are in the [develop branch](https://github.com/stacks-network/stacks-core/tree/develop).
 It is generally safe to run a `stacks-node` from that branch, though it has received less rigorous testing than release tags or the [master branch](https://github.com/stacks-network/stacks-core/tree/master).
-If bugs are found in the `develop` branch, please do [report them as issues](https://github.com/stacks-network/stacks-core/issues) on this repository.
+If bugs are found in the `develop` branch, please do [report them as issues](https://github.com/stacks-network/stacks-core/issues) in this repository.
 
 For fixes that impact the correct functioning or liveness of the network, _hotfixes_ may be issued.
-These are patches to the main branch which are backported to the develop branch after merging.
+These are patches to the default branch which are backported to the develop branch after merging.
 These hotfixes are categorized by priority according to the following rubric:
 
 - **High Priority**. Any fix for an issue that could deny service to the network as a whole, e.g., an issue where a particular kind of invalid transaction would cause nodes to stop processing requests or shut down unintentionally. Any fix for an issue that could cause honest miners to produce invalid blocks.
@@ -58,27 +58,33 @@ The timing of the next Stacking cycle can be found [here](https://stx.eco/dao/to
 
    - A label should be applied to each such issue/PR as `X.Y.Z.A.n-blocker`.
 
-3. Since development is continuing in the `develop` branch, it may be necessary to cherry-pick some commits into the release branch.
+3. Perform a [block-replay](../contrib/tools/block-replay.sh) using an existing chainstate, or sync from genesis
+
+4. Since development is continuing in the `develop` branch, it may be necessary to cherry-pick some commits into the release branch or open a PR against the release branch.
 
    - Create a feature branch from `release/X.Y.Z.A.n`, ex: `feat/X.Y.Z.A.n-pr_number`.
    - Add cherry-picked commits to the `feat/X.Y.Z.A.n-pr_number` branch
    - Merge `feat/X.Y.Z.A.n-pr_number` into `release/X.Y.Z.A.n`.
 
-4. Open a PR to update the [CHANGELOG](../CHANGELOG.md) in the `release/X.Y.Z.A.n` branch.
+5. If necessary, open a PR to update the [CHANGELOG](../CHANGELOG.md) in the `release/X.Y.Z.A.n` branch.
 
    - Create a chore branch from `release/X.Y.Z.A.n`, ex: `chore/X.Y.Z.A.n-changelog`.
+   - Update [versions.toml](../versions.toml) to match this release:
+     - Update the `stacks_node_version` string to match this release version.
+     - Update the `stacks_signer_version` string to match `stacks_node_version`, with an appending `0` for this release version.
    - Add summaries of all Pull Requests to the `Added`, `Changed` and `Fixed` sections.
-   - Update the `stacks_node_version` string in [versions.toml](../versions.toml) to match this release.
 
      - Pull requests merged into `develop` can be found [here](https://github.com/stacks-network/stacks-core/pulls?q=is%3Apr+is%3Aclosed+base%3Adevelop+sort%3Aupdated-desc).
 
        **Note**: GitHub does not allow sorting by _merge time_, so, when sorting by some proxy criterion, some care should be used to understand which PR's were _merged_ after the last release.
 
-5. Once `chore/X.Y.Z.A.n-changelog` has merged, a build may be started by manually triggering the [`CI` workflow](../.github/workflows/ci.yml) against the `release/X.Y.Z.A.n` branch.
+   - This PR must be merged before continuing to the next steps
+
+6. A build may be started by manually triggering the [`CI` workflow](../.github/workflows/ci.yml) against the `release/X.Y.Z.A.n` branch.
 
-6. Once the release candidate has been built and binaries are available, ecosystem participants shall be notified to test the tagged release on various staging infrastructure.
+   - **Note**: A `stacks-signer` release will also be produced when this workflow is run
 
-7. The release candidate will test that it successfully syncs with the current chain from genesis both in testnet and mainnet.
+7. Once the release candidate has been built and binaries are available, ecosystem participants shall be notified to test the tagged release on various staging infrastructure.
 
 8. If bugs or issues emerge from the rollout on staging infrastructure, the release will be delayed until those regressions are resolved.
 
@@ -90,7 +96,7 @@ The timing of the next Stacking cycle can be found [here](https://stx.eco/dao/to
 
 10. Finally, the following merges will happen to complete the release process:
     - Release branch `release/X.Y.Z.A.n` will be merged into the `master` branch.
-    - Then, `master` will be merged into `develop`.
+    - Then, `release/X.Y.Z.A.n` will be merged into `develop`.
 
 ## Consensus Breaking Release Process
 
diff --git a/sample/conf/mainnet-miner-conf.toml b/sample/conf/mainnet-miner-conf.toml
@@ -4,7 +4,6 @@ rpc_bind = "127.0.0.1:20443"
 p2p_bind = "127.0.0.1:20444"
 prometheus_bind = "127.0.0.1:9153"
 seed = "<YOUR_SEED>"
-local_peer_seed = "<YOUR_SEED>"
 miner = true
 mine_microblocks = false # Disable microblocks (ref: https://github.com/stacks-network/stacks-core/pull/4561 )
 
diff --git a/sample/conf/mocknet.toml b/sample/conf/mocknet.toml
@@ -0,0 +1,14 @@
+[node]
+# working_dir = "/dir/to/save/chainstate" # defaults to: /tmp/stacks-node-[0-9]*
+rpc_bind = "0.0.0.0:20443"
+p2p_bind = "0.0.0.0:20444"
+prometheus_bind = "0.0.0.0:9153" 
+
+[burnchain]
+mode = "mocknet"
+
+# Used for sending events to a local stacks-blockchain-api service
+# [[events_observer]]
+# endpoint = "localhost:3700"
+# events_keys = ["*"]
+
diff --git a/stacks-signer/CHANGELOG.md b/stacks-signer/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 ## Added
 
 - Introduced the `reorg_attempts_activity_timeout_ms` configuration option for signers which is used to determine the length of time after the last block of a tenure is confirmed that an incoming miner's attempts to reorg it are considered valid miner activity.
+- Add signer configuration option `tenure_idle_timeout_buffer_secs` to specify the number of seconds of buffer the signer will add to its tenure extend time that it sends to miners. The idea is to allow for some clock skew between the miner and signers, preventing the case where the miner attempts to tenure extend too early.
 
 ### Changed
 
diff --git a/stacks-signer/release-process.md b/stacks-signer/release-process.md
@@ -63,7 +63,7 @@ The timing of the next Stacking cycle can be found [here](https://stx.eco/dao/to
    - Add cherry-picked commits to the `feat/signer-X.Y.Z.A.n.x-pr_number` branch
    - Merge `feat/signer-X.Y.Z.A.n.x-pr_number` into `release/signer-X.Y.Z.A.n.x`.
 
-4. Open a PR to update the [CHANGELOG](./CHANGELOG.md) in the `release/signer-X.Y.Z.A.n.x` branch.
+4. If necessary, open a PR to update the [CHANGELOG](./CHANGELOG.md) in the `release/signer-X.Y.Z.A.n.x` branch.
 
    - Create a chore branch from `release/signer-X.Y.Z.A.n.x`, ex: `chore/signer-X.Y.Z.A.n.x-changelog`.
    - Add summaries of all Pull Requests to the `Added`, `Changed` and `Fixed` sections.
@@ -86,5 +86,5 @@ The timing of the next Stacking cycle can be found [here](https://stx.eco/dao/to
    Announcements will then be shared in the `#stacks-core-devs` channel in the Stacks Discord, as well as the [mailing list](https://groups.google.com/a/stacks.org/g/announce).
 
 9. Finally, the following merges will happen to complete the release process:
-   - Release branch `release/signer-X.Y.Z.A.n.x` will be merged into the `master` branch.
-   - Then, `master` will be merged into `develop`.
+   - Release branch `release/X.Y.Z.A.n` will be merged into the `master` branch.
+   - Then, `release/X.Y.Z.A.n` will be merged into `develop`.
diff --git a/stacks-signer/src/chainstate.rs b/stacks-signer/src/chainstate.rs
@@ -124,6 +124,8 @@ pub struct ProposalEvalConfig {
     pub tenure_last_block_proposal_timeout: Duration,
     /// How much idle time must pass before allowing a tenure extend
     pub tenure_idle_timeout: Duration,
+    /// How much buffer to add to the tenure idle timeout sent to miners to account for clock skew
+    pub tenure_idle_timeout_buffer: Duration,
     /// Time following the last block of the previous tenure's global acceptance that a signer will consider an attempt by
     /// the new miner to reorg it as valid towards miner activity
     pub reorg_attempts_activity_timeout: Duration,
@@ -137,6 +139,7 @@ impl From<&SignerConfig> for ProposalEvalConfig {
             tenure_last_block_proposal_timeout: value.tenure_last_block_proposal_timeout,
             tenure_idle_timeout: value.tenure_idle_timeout,
             reorg_attempts_activity_timeout: value.reorg_attempts_activity_timeout,
+            tenure_idle_timeout_buffer: value.tenure_idle_timeout_buffer,
         }
     }
 }
diff --git a/stacks-signer/src/client/mod.rs b/stacks-signer/src/client/mod.rs
@@ -416,6 +416,7 @@ pub(crate) mod tests {
             tenure_last_block_proposal_timeout: config.tenure_last_block_proposal_timeout,
             block_proposal_validation_timeout: config.block_proposal_validation_timeout,
             tenure_idle_timeout: config.tenure_idle_timeout,
+            tenure_idle_timeout_buffer: config.tenure_idle_timeout_buffer,
             block_proposal_max_age_secs: config.block_proposal_max_age_secs,
             reorg_attempts_activity_timeout: config.reorg_attempts_activity_timeout,
         }
diff --git a/stacks-signer/src/config.rs b/stacks-signer/src/config.rs
@@ -42,6 +42,9 @@ const DEFAULT_TENURE_LAST_BLOCK_PROPOSAL_TIMEOUT_SECS: u64 = 30;
 const DEFAULT_DRY_RUN: bool = false;
 const TENURE_IDLE_TIMEOUT_SECS: u64 = 120;
 const DEFAULT_REORG_ATTEMPTS_ACTIVITY_TIMEOUT_MS: u64 = 200_000;
+/// Default number of seconds to add to the tenure extend time, after computing the idle timeout,
+/// to allow for clock skew between the signer and the miner
+const DEFAULT_TENURE_IDLE_TIMEOUT_BUFFER_SECS: u64 = 2;
 
 #[derive(thiserror::Error, Debug)]
 /// An error occurred parsing the provided configuration
@@ -162,6 +165,9 @@ pub struct SignerConfig {
     pub block_proposal_validation_timeout: Duration,
     /// How much idle time must pass before allowing a tenure extend
     pub tenure_idle_timeout: Duration,
+    /// Amount of buffer time to add to the tenure extend time sent to miners to allow for
+    /// clock skew
+    pub tenure_idle_timeout_buffer: Duration,
     /// The maximum age of a block proposal in seconds that will be processed by the signer
     pub block_proposal_max_age_secs: u64,
     /// Time following the last block of the previous tenure's global acceptance that a signer will consider an attempt by
@@ -207,6 +213,9 @@ pub struct GlobalConfig {
     pub block_proposal_validation_timeout: Duration,
     /// How much idle time must pass before allowing a tenure extend
     pub tenure_idle_timeout: Duration,
+    /// Amount of buffer time to add to the tenure extend time sent to miners to allow for
+    /// clock skew
+    pub tenure_idle_timeout_buffer: Duration,
     /// The maximum age of a block proposal that will be processed by the signer
     pub block_proposal_max_age_secs: u64,
     /// Time following the last block of the previous tenure's global acceptance that a signer will consider an attempt by
@@ -251,6 +260,9 @@ struct RawConfigFile {
     pub block_proposal_validation_timeout_ms: Option<u64>,
     /// How much idle time (in seconds) must pass before a tenure extend is allowed
     pub tenure_idle_timeout_secs: Option<u64>,
+    /// Number of seconds of buffer to add to the tenure extend time sent to miners to allow for
+    /// clock skew
+    pub tenure_idle_timeout_buffer_secs: Option<u64>,
     /// The maximum age of a block proposal (in secs) that will be processed by the signer.
     pub block_proposal_max_age_secs: Option<u64>,
     /// Time (in millisecs) following a block's global acceptance that a signer will consider an attempt by a miner
@@ -367,6 +379,12 @@ impl TryFrom<RawConfigFile> for GlobalConfig {
 
         let dry_run = raw_data.dry_run.unwrap_or(DEFAULT_DRY_RUN);
 
+        let tenure_idle_timeout_buffer = Duration::from_secs(
+            raw_data
+                .tenure_idle_timeout_buffer_secs
+                .unwrap_or(DEFAULT_TENURE_IDLE_TIMEOUT_BUFFER_SECS),
+        );
+
         Ok(Self {
             node_host: raw_data.node_host,
             endpoint,
@@ -386,6 +404,7 @@ impl TryFrom<RawConfigFile> for GlobalConfig {
             block_proposal_max_age_secs,
             reorg_attempts_activity_timeout,
             dry_run,
+            tenure_idle_timeout_buffer,
         })
     }
 }
diff --git a/stacks-signer/src/runloop.rs b/stacks-signer/src/runloop.rs
@@ -314,6 +314,7 @@ impl<Signer: SignerTrait<T>, T: StacksMessageCodec + Clone + Send + Debug> RunLo
             tenure_last_block_proposal_timeout: self.config.tenure_last_block_proposal_timeout,
             block_proposal_validation_timeout: self.config.block_proposal_validation_timeout,
             tenure_idle_timeout: self.config.tenure_idle_timeout,
+            tenure_idle_timeout_buffer: self.config.tenure_idle_timeout_buffer,
             block_proposal_max_age_secs: self.config.block_proposal_max_age_secs,
             reorg_attempts_activity_timeout: self.config.reorg_attempts_activity_timeout,
         }))
diff --git a/stacks-signer/src/tests/chainstate.rs b/stacks-signer/src/tests/chainstate.rs
@@ -91,6 +91,7 @@ fn setup_test_environment(
             block_proposal_timeout: Duration::from_secs(5),
             tenure_last_block_proposal_timeout: Duration::from_secs(30),
             tenure_idle_timeout: Duration::from_secs(300),
+            tenure_idle_timeout_buffer: Duration::from_secs(2),
             reorg_attempts_activity_timeout: Duration::from_secs(3),
         },
     };
diff --git a/stacks-signer/src/v0/signer.rs b/stacks-signer/src/v0/signer.rs
@@ -357,7 +357,9 @@ impl Signer {
             block.header.signer_signature_hash(),
             signature,
             self.signer_db.calculate_tenure_extend_timestamp(
-                self.proposal_config.tenure_idle_timeout,
+                self.proposal_config
+                    .tenure_idle_timeout
+                    .saturating_add(self.proposal_config.tenure_idle_timeout_buffer),
                 block,
                 true,
             ),
@@ -375,7 +377,9 @@ impl Signer {
             &self.private_key,
             self.mainnet,
             self.signer_db.calculate_tenure_extend_timestamp(
-                self.proposal_config.tenure_idle_timeout,
+                self.proposal_config
+                    .tenure_idle_timeout
+                    .saturating_add(self.proposal_config.tenure_idle_timeout_buffer),
                 block,
                 false,
             ),
@@ -813,7 +817,9 @@ impl Signer {
             &self.private_key,
             self.mainnet,
             self.signer_db.calculate_tenure_extend_timestamp(
-                self.proposal_config.tenure_idle_timeout,
+                self.proposal_config
+                    .tenure_idle_timeout
+                    .saturating_add(self.proposal_config.tenure_idle_timeout_buffer),
                 &block_info.block,
                 false,
             ),
diff --git a/testnet/stacks-node/src/tests/nakamoto_integrations.rs b/testnet/stacks-node/src/tests/nakamoto_integrations.rs
@@ -6578,6 +6578,7 @@ fn signer_chainstate() {
             block_proposal_timeout: Duration::from_secs(100),
             tenure_last_block_proposal_timeout: Duration::from_secs(30),
             tenure_idle_timeout: Duration::from_secs(300),
+            tenure_idle_timeout_buffer: Duration::from_secs(2),
             reorg_attempts_activity_timeout: Duration::from_secs(30),
         };
         let mut sortitions_view =
@@ -6710,6 +6711,7 @@ fn signer_chainstate() {
             block_proposal_timeout: Duration::from_secs(100),
             tenure_last_block_proposal_timeout: Duration::from_secs(30),
             tenure_idle_timeout: Duration::from_secs(300),
+            tenure_idle_timeout_buffer: Duration::from_secs(2),
             reorg_attempts_activity_timeout: Duration::from_secs(30),
         };
         let burn_block_height = SortitionDB::get_canonical_burn_chain_tip(sortdb.conn())
@@ -6790,6 +6792,7 @@ fn signer_chainstate() {
         block_proposal_timeout: Duration::from_secs(100),
         tenure_last_block_proposal_timeout: Duration::from_secs(30),
         tenure_idle_timeout: Duration::from_secs(300),
+        tenure_idle_timeout_buffer: Duration::from_secs(2),
         reorg_attempts_activity_timeout: Duration::from_secs(30),
     };
     let mut sortitions_view = SortitionsView::fetch_view(proposal_conf, &signer_client).unwrap();
diff --git a/testnet/stacks-node/src/tests/signer/v0.rs b/testnet/stacks-node/src/tests/signer/v0.rs
diff --git a/versions.toml b/versions.toml

Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,8 @@ pub struct ProposalEvalConfig {`
`124`	`124`	`pub tenure_last_block_proposal_timeout: Duration,`
`125`	`125`	`/// How much idle time must pass before allowing a tenure extend`
`126`	`126`	`pub tenure_idle_timeout: Duration,`
	`127`	`+ /// How much buffer to add to the tenure idle timeout sent to miners to account for clock skew`
	`128`	`+ pub tenure_idle_timeout_buffer: Duration,`
`127`	`129`	`/// Time following the last block of the previous tenure's global acceptance that a signer will consider an attempt by`
`128`	`130`	`/// the new miner to reorg it as valid towards miner activity`
`129`	`131`	`pub reorg_attempts_activity_timeout: Duration,`
`@@ -137,6 +139,7 @@ impl From<&SignerConfig> for ProposalEvalConfig {`
`137`	`139`	`tenure_last_block_proposal_timeout: value.tenure_last_block_proposal_timeout,`
`138`	`140`	`tenure_idle_timeout: value.tenure_idle_timeout,`
`139`	`141`	`reorg_attempts_activity_timeout: value.reorg_attempts_activity_timeout,`
	`142`	`+ tenure_idle_timeout_buffer: value.tenure_idle_timeout_buffer,`
`140`	`143`	`}`
`141`	`144`	`}`
`142`	`145`	`}`