From 37bdf1a48d8ec51dd97433353fc6ff73b2f256bf Mon Sep 17 00:00:00 2001 From: Federico De Felici Date: Fri, 4 Jul 2025 10:55:08 +0200 Subject: [PATCH 1/4] refactor: move 'stacks-node' to root and update workspace, #6252 --- Cargo.toml | 2 +- .../stacks-node => stacks-node}/Cargo.toml | 18 +++++++++--------- .../stacks-node => stacks-node}/Stacks.toml | 0 .../burnchains/bitcoin_regtest_controller.rs | 0 .../src/burnchains/mocknet_controller.rs | 0 .../src/burnchains/mod.rs | 0 .../src/event_dispatcher.rs | 0 .../src/genesis_data.rs | 0 .../stacks-node => stacks-node}/src/globals.rs | 0 .../src/keychain.rs | 0 .../stacks-node => stacks-node}/src/main.rs | 0 .../src/monitoring/mod.rs | 0 .../src/monitoring/prometheus.rs | 0 .../src/nakamoto_node.rs | 0 .../src/nakamoto_node/miner.rs | 0 .../src/nakamoto_node/miner_db.rs | 0 .../src/nakamoto_node/peer.rs | 0 .../src/nakamoto_node/relayer.rs | 0 .../src/nakamoto_node/signer_coordinator.rs | 0 .../src/nakamoto_node/stackerdb_listener.rs | 0 .../src/nakamoto_node/tests.rs | 0 .../src/neon_node.rs | 0 .../stacks-node => stacks-node}/src/node.rs | 0 .../src/operations.rs | 0 .../src/run_loop/boot_nakamoto.rs | 0 .../src/run_loop/helium.rs | 0 .../src/run_loop/mod.rs | 0 .../src/run_loop/nakamoto.rs | 0 .../src/run_loop/neon.rs | 0 .../src/stacks_events.rs | 0 .../stacks-node => stacks-node}/src/syncctl.rs | 0 .../stacks-node => stacks-node}/src/tenure.rs | 0 .../src/tests/atlas.rs | 0 .../src/tests/bitcoin_regtest.rs | 0 .../src/tests/epoch_205.rs | 0 .../src/tests/epoch_21.rs | 0 .../src/tests/epoch_22.rs | 0 .../src/tests/epoch_23.rs | 0 .../src/tests/epoch_24.rs | 0 .../src/tests/integrations.rs | 0 .../src/tests/mempool.rs | 0 .../src/tests/mod.rs | 0 .../src/tests/nakamoto_integrations.rs | 0 .../src/tests/neon_integrations.rs | 0 .../tests/signer/commands/bitcoin_mining.rs | 0 .../src/tests/signer/commands/block_commit.rs | 0 .../src/tests/signer/commands/block_verify.rs | 0 .../src/tests/signer/commands/block_wait.rs | 0 .../src/tests/signer/commands/boot.rs | 0 .../src/tests/signer/commands/commit_ops.rs | 0 .../src/tests/signer/commands/context.rs | 0 .../src/tests/signer/commands/mod.rs | 0 .../src/tests/signer/commands/shutdown.rs | 0 .../src/tests/signer/commands/sortition.rs | 0 .../src/tests/signer/commands/stacks_mining.rs | 0 .../src/tests/signer/commands/transfer.rs | 0 .../src/tests/signer/mod.rs | 0 .../src/tests/signer/multiversion.rs | 0 .../src/tests/signer/v0.rs | 0 .../src/tests/stackerdb.rs | 0 60 files changed, 10 insertions(+), 10 deletions(-) rename {testnet/stacks-node => stacks-node}/Cargo.toml (85%) rename {testnet/stacks-node => stacks-node}/Stacks.toml (100%) rename {testnet/stacks-node => stacks-node}/src/burnchains/bitcoin_regtest_controller.rs (100%) rename {testnet/stacks-node => stacks-node}/src/burnchains/mocknet_controller.rs (100%) rename {testnet/stacks-node => stacks-node}/src/burnchains/mod.rs (100%) rename {testnet/stacks-node => stacks-node}/src/event_dispatcher.rs (100%) rename {testnet/stacks-node => stacks-node}/src/genesis_data.rs (100%) rename {testnet/stacks-node => stacks-node}/src/globals.rs (100%) rename {testnet/stacks-node => stacks-node}/src/keychain.rs (100%) rename {testnet/stacks-node => stacks-node}/src/main.rs (100%) rename {testnet/stacks-node => stacks-node}/src/monitoring/mod.rs (100%) rename {testnet/stacks-node => stacks-node}/src/monitoring/prometheus.rs (100%) rename {testnet/stacks-node => stacks-node}/src/nakamoto_node.rs (100%) rename {testnet/stacks-node => stacks-node}/src/nakamoto_node/miner.rs (100%) rename {testnet/stacks-node => stacks-node}/src/nakamoto_node/miner_db.rs (100%) rename {testnet/stacks-node => stacks-node}/src/nakamoto_node/peer.rs (100%) rename {testnet/stacks-node => stacks-node}/src/nakamoto_node/relayer.rs (100%) rename {testnet/stacks-node => stacks-node}/src/nakamoto_node/signer_coordinator.rs (100%) rename {testnet/stacks-node => stacks-node}/src/nakamoto_node/stackerdb_listener.rs (100%) rename {testnet/stacks-node => stacks-node}/src/nakamoto_node/tests.rs (100%) rename {testnet/stacks-node => stacks-node}/src/neon_node.rs (100%) rename {testnet/stacks-node => stacks-node}/src/node.rs (100%) rename {testnet/stacks-node => stacks-node}/src/operations.rs (100%) rename {testnet/stacks-node => stacks-node}/src/run_loop/boot_nakamoto.rs (100%) rename {testnet/stacks-node => stacks-node}/src/run_loop/helium.rs (100%) rename {testnet/stacks-node => stacks-node}/src/run_loop/mod.rs (100%) rename {testnet/stacks-node => stacks-node}/src/run_loop/nakamoto.rs (100%) rename {testnet/stacks-node => stacks-node}/src/run_loop/neon.rs (100%) rename {testnet/stacks-node => stacks-node}/src/stacks_events.rs (100%) rename {testnet/stacks-node => stacks-node}/src/syncctl.rs (100%) rename {testnet/stacks-node => stacks-node}/src/tenure.rs (100%) rename {testnet/stacks-node => stacks-node}/src/tests/atlas.rs (100%) rename {testnet/stacks-node => stacks-node}/src/tests/bitcoin_regtest.rs (100%) rename {testnet/stacks-node => stacks-node}/src/tests/epoch_205.rs (100%) rename {testnet/stacks-node => stacks-node}/src/tests/epoch_21.rs (100%) rename {testnet/stacks-node => stacks-node}/src/tests/epoch_22.rs (100%) rename {testnet/stacks-node => stacks-node}/src/tests/epoch_23.rs (100%) rename {testnet/stacks-node => stacks-node}/src/tests/epoch_24.rs (100%) rename {testnet/stacks-node => stacks-node}/src/tests/integrations.rs (100%) rename {testnet/stacks-node => stacks-node}/src/tests/mempool.rs (100%) rename {testnet/stacks-node => stacks-node}/src/tests/mod.rs (100%) rename {testnet/stacks-node => stacks-node}/src/tests/nakamoto_integrations.rs (100%) rename {testnet/stacks-node => stacks-node}/src/tests/neon_integrations.rs (100%) rename {testnet/stacks-node => stacks-node}/src/tests/signer/commands/bitcoin_mining.rs (100%) rename {testnet/stacks-node => stacks-node}/src/tests/signer/commands/block_commit.rs (100%) rename {testnet/stacks-node => stacks-node}/src/tests/signer/commands/block_verify.rs (100%) rename {testnet/stacks-node => stacks-node}/src/tests/signer/commands/block_wait.rs (100%) rename {testnet/stacks-node => stacks-node}/src/tests/signer/commands/boot.rs (100%) rename {testnet/stacks-node => stacks-node}/src/tests/signer/commands/commit_ops.rs (100%) rename {testnet/stacks-node => stacks-node}/src/tests/signer/commands/context.rs (100%) rename {testnet/stacks-node => stacks-node}/src/tests/signer/commands/mod.rs (100%) rename {testnet/stacks-node => stacks-node}/src/tests/signer/commands/shutdown.rs (100%) rename {testnet/stacks-node => stacks-node}/src/tests/signer/commands/sortition.rs (100%) rename {testnet/stacks-node => stacks-node}/src/tests/signer/commands/stacks_mining.rs (100%) rename {testnet/stacks-node => stacks-node}/src/tests/signer/commands/transfer.rs (100%) rename {testnet/stacks-node => stacks-node}/src/tests/signer/mod.rs (100%) rename {testnet/stacks-node => stacks-node}/src/tests/signer/multiversion.rs (100%) rename {testnet/stacks-node => stacks-node}/src/tests/signer/v0.rs (100%) rename {testnet/stacks-node => stacks-node}/src/tests/stackerdb.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index d604038f94..74f59ccb84 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ members = [ "libstackerdb", "libsigner", "stacks-signer", - "testnet/stacks-node", + "stacks-node", "contrib/tools/config-docs-generator"] # Dependencies we want to keep the same between workspace members diff --git a/testnet/stacks-node/Cargo.toml b/stacks-node/Cargo.toml similarity index 85% rename from testnet/stacks-node/Cargo.toml rename to stacks-node/Cargo.toml index 3b4c65e2b8..61766e5053 100644 --- a/testnet/stacks-node/Cargo.toml +++ b/stacks-node/Cargo.toml @@ -12,17 +12,17 @@ pico-args = "0.5.0" serde = "1" serde_derive = "1" serde_json = { version = "1.0", features = ["arbitrary_precision", "raw_value"] } -stacks = { package = "stackslib", path = "../../stackslib" } -stx-genesis = { path = "../../stx-genesis"} +stacks = { package = "stackslib", path = "../stackslib" } +stx-genesis = { path = "../stx-genesis"} base64 = "0.12.0" backtrace = "0.3.50" libc = "0.2.151" slog = { version = "2.5.2", features = [ "max_level_trace" ] } -clarity = { path = "../../clarity" } -stacks-common = { path = "../../stacks-common" } +clarity = { path = "../clarity" } +stacks-common = { path = "../stacks-common" } chrono = "0.4.19" regex = "1" -libsigner = { path = "../../libsigner" } +libsigner = { path = "../libsigner" } url = "2.1.0" rand = { workspace = true } hashbrown = { workspace = true } @@ -44,10 +44,10 @@ tikv-jemallocator = {workspace = true} warp = "0.3.5" tokio = "1.15" reqwest = { version = "0.11", default-features = false, features = ["blocking", "json", "rustls", "rustls-tls"] } -clarity = { path = "../../clarity", features = ["default", "testing"]} -stacks-common = { path = "../../stacks-common", features = ["default", "testing"] } -stacks = { package = "stackslib", path = "../../stackslib", features = ["default", "testing"] } -stacks-signer = { path = "../../stacks-signer", features = ["testing"] } +clarity = { path = "../clarity", features = ["default", "testing"]} +stacks-common = { path = "../stacks-common", features = ["default", "testing"] } +stacks = { package = "stackslib", path = "../stackslib", features = ["default", "testing"] } +stacks-signer = { path = "../stacks-signer", features = ["testing"] } tracing = "0.1.37" tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } mutants = "0.0.3" diff --git a/testnet/stacks-node/Stacks.toml b/stacks-node/Stacks.toml similarity index 100% rename from testnet/stacks-node/Stacks.toml rename to stacks-node/Stacks.toml diff --git a/testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs b/stacks-node/src/burnchains/bitcoin_regtest_controller.rs similarity index 100% rename from testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs rename to stacks-node/src/burnchains/bitcoin_regtest_controller.rs diff --git a/testnet/stacks-node/src/burnchains/mocknet_controller.rs b/stacks-node/src/burnchains/mocknet_controller.rs similarity index 100% rename from testnet/stacks-node/src/burnchains/mocknet_controller.rs rename to stacks-node/src/burnchains/mocknet_controller.rs diff --git a/testnet/stacks-node/src/burnchains/mod.rs b/stacks-node/src/burnchains/mod.rs similarity index 100% rename from testnet/stacks-node/src/burnchains/mod.rs rename to stacks-node/src/burnchains/mod.rs diff --git a/testnet/stacks-node/src/event_dispatcher.rs b/stacks-node/src/event_dispatcher.rs similarity index 100% rename from testnet/stacks-node/src/event_dispatcher.rs rename to stacks-node/src/event_dispatcher.rs diff --git a/testnet/stacks-node/src/genesis_data.rs b/stacks-node/src/genesis_data.rs similarity index 100% rename from testnet/stacks-node/src/genesis_data.rs rename to stacks-node/src/genesis_data.rs diff --git a/testnet/stacks-node/src/globals.rs b/stacks-node/src/globals.rs similarity index 100% rename from testnet/stacks-node/src/globals.rs rename to stacks-node/src/globals.rs diff --git a/testnet/stacks-node/src/keychain.rs b/stacks-node/src/keychain.rs similarity index 100% rename from testnet/stacks-node/src/keychain.rs rename to stacks-node/src/keychain.rs diff --git a/testnet/stacks-node/src/main.rs b/stacks-node/src/main.rs similarity index 100% rename from testnet/stacks-node/src/main.rs rename to stacks-node/src/main.rs diff --git a/testnet/stacks-node/src/monitoring/mod.rs b/stacks-node/src/monitoring/mod.rs similarity index 100% rename from testnet/stacks-node/src/monitoring/mod.rs rename to stacks-node/src/monitoring/mod.rs diff --git a/testnet/stacks-node/src/monitoring/prometheus.rs b/stacks-node/src/monitoring/prometheus.rs similarity index 100% rename from testnet/stacks-node/src/monitoring/prometheus.rs rename to stacks-node/src/monitoring/prometheus.rs diff --git a/testnet/stacks-node/src/nakamoto_node.rs b/stacks-node/src/nakamoto_node.rs similarity index 100% rename from testnet/stacks-node/src/nakamoto_node.rs rename to stacks-node/src/nakamoto_node.rs diff --git a/testnet/stacks-node/src/nakamoto_node/miner.rs b/stacks-node/src/nakamoto_node/miner.rs similarity index 100% rename from testnet/stacks-node/src/nakamoto_node/miner.rs rename to stacks-node/src/nakamoto_node/miner.rs diff --git a/testnet/stacks-node/src/nakamoto_node/miner_db.rs b/stacks-node/src/nakamoto_node/miner_db.rs similarity index 100% rename from testnet/stacks-node/src/nakamoto_node/miner_db.rs rename to stacks-node/src/nakamoto_node/miner_db.rs diff --git a/testnet/stacks-node/src/nakamoto_node/peer.rs b/stacks-node/src/nakamoto_node/peer.rs similarity index 100% rename from testnet/stacks-node/src/nakamoto_node/peer.rs rename to stacks-node/src/nakamoto_node/peer.rs diff --git a/testnet/stacks-node/src/nakamoto_node/relayer.rs b/stacks-node/src/nakamoto_node/relayer.rs similarity index 100% rename from testnet/stacks-node/src/nakamoto_node/relayer.rs rename to stacks-node/src/nakamoto_node/relayer.rs diff --git a/testnet/stacks-node/src/nakamoto_node/signer_coordinator.rs b/stacks-node/src/nakamoto_node/signer_coordinator.rs similarity index 100% rename from testnet/stacks-node/src/nakamoto_node/signer_coordinator.rs rename to stacks-node/src/nakamoto_node/signer_coordinator.rs diff --git a/testnet/stacks-node/src/nakamoto_node/stackerdb_listener.rs b/stacks-node/src/nakamoto_node/stackerdb_listener.rs similarity index 100% rename from testnet/stacks-node/src/nakamoto_node/stackerdb_listener.rs rename to stacks-node/src/nakamoto_node/stackerdb_listener.rs diff --git a/testnet/stacks-node/src/nakamoto_node/tests.rs b/stacks-node/src/nakamoto_node/tests.rs similarity index 100% rename from testnet/stacks-node/src/nakamoto_node/tests.rs rename to stacks-node/src/nakamoto_node/tests.rs diff --git a/testnet/stacks-node/src/neon_node.rs b/stacks-node/src/neon_node.rs similarity index 100% rename from testnet/stacks-node/src/neon_node.rs rename to stacks-node/src/neon_node.rs diff --git a/testnet/stacks-node/src/node.rs b/stacks-node/src/node.rs similarity index 100% rename from testnet/stacks-node/src/node.rs rename to stacks-node/src/node.rs diff --git a/testnet/stacks-node/src/operations.rs b/stacks-node/src/operations.rs similarity index 100% rename from testnet/stacks-node/src/operations.rs rename to stacks-node/src/operations.rs diff --git a/testnet/stacks-node/src/run_loop/boot_nakamoto.rs b/stacks-node/src/run_loop/boot_nakamoto.rs similarity index 100% rename from testnet/stacks-node/src/run_loop/boot_nakamoto.rs rename to stacks-node/src/run_loop/boot_nakamoto.rs diff --git a/testnet/stacks-node/src/run_loop/helium.rs b/stacks-node/src/run_loop/helium.rs similarity index 100% rename from testnet/stacks-node/src/run_loop/helium.rs rename to stacks-node/src/run_loop/helium.rs diff --git a/testnet/stacks-node/src/run_loop/mod.rs b/stacks-node/src/run_loop/mod.rs similarity index 100% rename from testnet/stacks-node/src/run_loop/mod.rs rename to stacks-node/src/run_loop/mod.rs diff --git a/testnet/stacks-node/src/run_loop/nakamoto.rs b/stacks-node/src/run_loop/nakamoto.rs similarity index 100% rename from testnet/stacks-node/src/run_loop/nakamoto.rs rename to stacks-node/src/run_loop/nakamoto.rs diff --git a/testnet/stacks-node/src/run_loop/neon.rs b/stacks-node/src/run_loop/neon.rs similarity index 100% rename from testnet/stacks-node/src/run_loop/neon.rs rename to stacks-node/src/run_loop/neon.rs diff --git a/testnet/stacks-node/src/stacks_events.rs b/stacks-node/src/stacks_events.rs similarity index 100% rename from testnet/stacks-node/src/stacks_events.rs rename to stacks-node/src/stacks_events.rs diff --git a/testnet/stacks-node/src/syncctl.rs b/stacks-node/src/syncctl.rs similarity index 100% rename from testnet/stacks-node/src/syncctl.rs rename to stacks-node/src/syncctl.rs diff --git a/testnet/stacks-node/src/tenure.rs b/stacks-node/src/tenure.rs similarity index 100% rename from testnet/stacks-node/src/tenure.rs rename to stacks-node/src/tenure.rs diff --git a/testnet/stacks-node/src/tests/atlas.rs b/stacks-node/src/tests/atlas.rs similarity index 100% rename from testnet/stacks-node/src/tests/atlas.rs rename to stacks-node/src/tests/atlas.rs diff --git a/testnet/stacks-node/src/tests/bitcoin_regtest.rs b/stacks-node/src/tests/bitcoin_regtest.rs similarity index 100% rename from testnet/stacks-node/src/tests/bitcoin_regtest.rs rename to stacks-node/src/tests/bitcoin_regtest.rs diff --git a/testnet/stacks-node/src/tests/epoch_205.rs b/stacks-node/src/tests/epoch_205.rs similarity index 100% rename from testnet/stacks-node/src/tests/epoch_205.rs rename to stacks-node/src/tests/epoch_205.rs diff --git a/testnet/stacks-node/src/tests/epoch_21.rs b/stacks-node/src/tests/epoch_21.rs similarity index 100% rename from testnet/stacks-node/src/tests/epoch_21.rs rename to stacks-node/src/tests/epoch_21.rs diff --git a/testnet/stacks-node/src/tests/epoch_22.rs b/stacks-node/src/tests/epoch_22.rs similarity index 100% rename from testnet/stacks-node/src/tests/epoch_22.rs rename to stacks-node/src/tests/epoch_22.rs diff --git a/testnet/stacks-node/src/tests/epoch_23.rs b/stacks-node/src/tests/epoch_23.rs similarity index 100% rename from testnet/stacks-node/src/tests/epoch_23.rs rename to stacks-node/src/tests/epoch_23.rs diff --git a/testnet/stacks-node/src/tests/epoch_24.rs b/stacks-node/src/tests/epoch_24.rs similarity index 100% rename from testnet/stacks-node/src/tests/epoch_24.rs rename to stacks-node/src/tests/epoch_24.rs diff --git a/testnet/stacks-node/src/tests/integrations.rs b/stacks-node/src/tests/integrations.rs similarity index 100% rename from testnet/stacks-node/src/tests/integrations.rs rename to stacks-node/src/tests/integrations.rs diff --git a/testnet/stacks-node/src/tests/mempool.rs b/stacks-node/src/tests/mempool.rs similarity index 100% rename from testnet/stacks-node/src/tests/mempool.rs rename to stacks-node/src/tests/mempool.rs diff --git a/testnet/stacks-node/src/tests/mod.rs b/stacks-node/src/tests/mod.rs similarity index 100% rename from testnet/stacks-node/src/tests/mod.rs rename to stacks-node/src/tests/mod.rs diff --git a/testnet/stacks-node/src/tests/nakamoto_integrations.rs b/stacks-node/src/tests/nakamoto_integrations.rs similarity index 100% rename from testnet/stacks-node/src/tests/nakamoto_integrations.rs rename to stacks-node/src/tests/nakamoto_integrations.rs diff --git a/testnet/stacks-node/src/tests/neon_integrations.rs b/stacks-node/src/tests/neon_integrations.rs similarity index 100% rename from testnet/stacks-node/src/tests/neon_integrations.rs rename to stacks-node/src/tests/neon_integrations.rs diff --git a/testnet/stacks-node/src/tests/signer/commands/bitcoin_mining.rs b/stacks-node/src/tests/signer/commands/bitcoin_mining.rs similarity index 100% rename from testnet/stacks-node/src/tests/signer/commands/bitcoin_mining.rs rename to stacks-node/src/tests/signer/commands/bitcoin_mining.rs diff --git a/testnet/stacks-node/src/tests/signer/commands/block_commit.rs b/stacks-node/src/tests/signer/commands/block_commit.rs similarity index 100% rename from testnet/stacks-node/src/tests/signer/commands/block_commit.rs rename to stacks-node/src/tests/signer/commands/block_commit.rs diff --git a/testnet/stacks-node/src/tests/signer/commands/block_verify.rs b/stacks-node/src/tests/signer/commands/block_verify.rs similarity index 100% rename from testnet/stacks-node/src/tests/signer/commands/block_verify.rs rename to stacks-node/src/tests/signer/commands/block_verify.rs diff --git a/testnet/stacks-node/src/tests/signer/commands/block_wait.rs b/stacks-node/src/tests/signer/commands/block_wait.rs similarity index 100% rename from testnet/stacks-node/src/tests/signer/commands/block_wait.rs rename to stacks-node/src/tests/signer/commands/block_wait.rs diff --git a/testnet/stacks-node/src/tests/signer/commands/boot.rs b/stacks-node/src/tests/signer/commands/boot.rs similarity index 100% rename from testnet/stacks-node/src/tests/signer/commands/boot.rs rename to stacks-node/src/tests/signer/commands/boot.rs diff --git a/testnet/stacks-node/src/tests/signer/commands/commit_ops.rs b/stacks-node/src/tests/signer/commands/commit_ops.rs similarity index 100% rename from testnet/stacks-node/src/tests/signer/commands/commit_ops.rs rename to stacks-node/src/tests/signer/commands/commit_ops.rs diff --git a/testnet/stacks-node/src/tests/signer/commands/context.rs b/stacks-node/src/tests/signer/commands/context.rs similarity index 100% rename from testnet/stacks-node/src/tests/signer/commands/context.rs rename to stacks-node/src/tests/signer/commands/context.rs diff --git a/testnet/stacks-node/src/tests/signer/commands/mod.rs b/stacks-node/src/tests/signer/commands/mod.rs similarity index 100% rename from testnet/stacks-node/src/tests/signer/commands/mod.rs rename to stacks-node/src/tests/signer/commands/mod.rs diff --git a/testnet/stacks-node/src/tests/signer/commands/shutdown.rs b/stacks-node/src/tests/signer/commands/shutdown.rs similarity index 100% rename from testnet/stacks-node/src/tests/signer/commands/shutdown.rs rename to stacks-node/src/tests/signer/commands/shutdown.rs diff --git a/testnet/stacks-node/src/tests/signer/commands/sortition.rs b/stacks-node/src/tests/signer/commands/sortition.rs similarity index 100% rename from testnet/stacks-node/src/tests/signer/commands/sortition.rs rename to stacks-node/src/tests/signer/commands/sortition.rs diff --git a/testnet/stacks-node/src/tests/signer/commands/stacks_mining.rs b/stacks-node/src/tests/signer/commands/stacks_mining.rs similarity index 100% rename from testnet/stacks-node/src/tests/signer/commands/stacks_mining.rs rename to stacks-node/src/tests/signer/commands/stacks_mining.rs diff --git a/testnet/stacks-node/src/tests/signer/commands/transfer.rs b/stacks-node/src/tests/signer/commands/transfer.rs similarity index 100% rename from testnet/stacks-node/src/tests/signer/commands/transfer.rs rename to stacks-node/src/tests/signer/commands/transfer.rs diff --git a/testnet/stacks-node/src/tests/signer/mod.rs b/stacks-node/src/tests/signer/mod.rs similarity index 100% rename from testnet/stacks-node/src/tests/signer/mod.rs rename to stacks-node/src/tests/signer/mod.rs diff --git a/testnet/stacks-node/src/tests/signer/multiversion.rs b/stacks-node/src/tests/signer/multiversion.rs similarity index 100% rename from testnet/stacks-node/src/tests/signer/multiversion.rs rename to stacks-node/src/tests/signer/multiversion.rs diff --git a/testnet/stacks-node/src/tests/signer/v0.rs b/stacks-node/src/tests/signer/v0.rs similarity index 100% rename from testnet/stacks-node/src/tests/signer/v0.rs rename to stacks-node/src/tests/signer/v0.rs diff --git a/testnet/stacks-node/src/tests/stackerdb.rs b/stacks-node/src/tests/stackerdb.rs similarity index 100% rename from testnet/stacks-node/src/tests/stackerdb.rs rename to stacks-node/src/tests/stackerdb.rs From bc8e8efff002b1168eab81431a907bc9b977ad14 Mon Sep 17 00:00:00 2001 From: Federico De Felici Date: Fri, 4 Jul 2025 11:14:19 +0200 Subject: [PATCH 2/4] chore: remove testnet/ prefix, #6252 --- .../bitcoin-int-tests/Dockerfile.atlas-test | 2 +- .../Dockerfile.generic.bitcoin-tests | 2 +- .../Dockerfile.large-genesis | 2 +- contrib/nix/flake.nix | 2 +- docs/mining.md | 4 ++-- docs/profiling.md | 20 +++++++++---------- stackslib/src/net/api/gethealth.rs | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/actions/bitcoin-int-tests/Dockerfile.atlas-test b/.github/actions/bitcoin-int-tests/Dockerfile.atlas-test index e46b5500ea..8bd003d803 100644 --- a/.github/actions/bitcoin-int-tests/Dockerfile.atlas-test +++ b/.github/actions/bitcoin-int-tests/Dockerfile.atlas-test @@ -14,6 +14,6 @@ RUN cd / && tar -xvzf bitcoin-25.0-x86_64-linux-gnu.tar.gz RUN ln -s /bitcoin-25.0/bin/bitcoind /bin/ ENV BITCOIND_TEST 1 -WORKDIR /src/testnet/stacks-node +WORKDIR /src/stacks-node RUN cargo test -- --test-threads 1 --ignored tests::neon_integrations::atlas_integration_test RUN cargo test -- --test-threads 1 --ignored tests::neon_integrations::atlas_stress_integration_test diff --git a/.github/actions/bitcoin-int-tests/Dockerfile.generic.bitcoin-tests b/.github/actions/bitcoin-int-tests/Dockerfile.generic.bitcoin-tests index 25422bb37c..ec8a13bb29 100644 --- a/.github/actions/bitcoin-int-tests/Dockerfile.generic.bitcoin-tests +++ b/.github/actions/bitcoin-int-tests/Dockerfile.generic.bitcoin-tests @@ -4,7 +4,7 @@ WORKDIR /src/ COPY . . -WORKDIR /src/testnet/stacks-node +WORKDIR /src/stacks-node RUN rustup component add llvm-tools-preview && \ cargo install grcov diff --git a/.github/actions/bitcoin-int-tests/Dockerfile.large-genesis b/.github/actions/bitcoin-int-tests/Dockerfile.large-genesis index c6c4f3a821..6bf7c0ee15 100644 --- a/.github/actions/bitcoin-int-tests/Dockerfile.large-genesis +++ b/.github/actions/bitcoin-int-tests/Dockerfile.large-genesis @@ -22,7 +22,7 @@ RUN cargo test --no-run --workspace && \ cargo build --workspace ENV BITCOIND_TEST 1 -RUN cd testnet/stacks-node && cargo test --release --features prod-genesis-chainstate -- --test-threads 1 --ignored neon_integrations::bitcoind_integration_test +RUN cd stacks-node && cargo test --release --features prod-genesis-chainstate -- --test-threads 1 --ignored neon_integrations::bitcoind_integration_test RUN grcov . --binary-path ./target/debug/ -s . -t lcov --branch --ignore-not-existing --ignore "/*" -o lcov.info diff --git a/contrib/nix/flake.nix b/contrib/nix/flake.nix index a52bfe35fa..cad95d58e0 100644 --- a/contrib/nix/flake.nix +++ b/contrib/nix/flake.nix @@ -110,7 +110,7 @@ (craneLib.fileset.commonCargoSources ../../stacks-common) (craneLib.fileset.commonCargoSources ../../stackslib) (craneLib.fileset.commonCargoSources ../../stx-genesis) - (craneLib.fileset.commonCargoSources ../../testnet/stacks-node) + (craneLib.fileset.commonCargoSources ../../stacks-node) ]; }; diff --git a/docs/mining.md b/docs/mining.md index dfdfdd7909..320ab41cb0 100644 --- a/docs/mining.md +++ b/docs/mining.md @@ -44,8 +44,8 @@ to verify that it was able to find its Bitcoin UTXOs: ```bash $ head -n 100 /path/to/your/node/logs | grep -i utxo -INFO [1630127492.031042] [testnet/stacks-node/src/run_loop/neon.rs:146] [main] Miner node: checking UTXOs at address: -INFO [1630127492.062652] [testnet/stacks-node/src/run_loop/neon.rs:164] [main] UTXOs found - will run as a Miner node +INFO [1630127492.031042] [stacks-node/src/run_loop/neon.rs:146] [main] Miner node: checking UTXOs at address: +INFO [1630127492.062652] [stacks-node/src/run_loop/neon.rs:164] [main] UTXOs found - will run as a Miner node ``` ## Configuring Cost and Fee Estimation diff --git a/docs/profiling.md b/docs/profiling.md index f830d5af65..d8a12b5a1a 100644 --- a/docs/profiling.md +++ b/docs/profiling.md @@ -17,28 +17,28 @@ Validating the config file using `stacks-node check-config`: ``` $ cargo run -r -p stacks-node --bin stacks-node check-config --config ./sample/conf/mainnet-follower-conf.toml -INFO [1661276562.220137] [testnet/stacks-node/src/main.rs:82] [main] stacks-node 0.1.0 (:, release build, linux [x86_64]) -INFO [1661276562.220363] [testnet/stacks-node/src/main.rs:115] [main] Loading config at path ./sample/conf/mainnet-follower-conf.toml -INFO [1661276562.233071] [testnet/stacks-node/src/main.rs:128] [main] Valid config! +INFO [1661276562.220137] [stacks-node/src/main.rs:82] [main] stacks-node 0.1.0 (:, release build, linux [x86_64]) +INFO [1661276562.220363] [stacks-node/src/main.rs:115] [main] Loading config at path ./sample/conf/mainnet-follower-conf.toml +INFO [1661276562.233071] [stacks-node/src/main.rs:128] [main] Loaded config! ``` Enabling debug logging using environment variable `STACKS_LOG_DEBUG=1`: ``` $ STACKS_LOG_DEBUG=1 cargo run -r -p stacks-node --bin stacks-node check-config --config ./sample/conf/mainnet-follower-conf.toml -INFO [1661276562.220137] [testnet/stacks-node/src/main.rs:82] [main] stacks-node 0.1.0 (tip-mine:c90476aa8a+, release build, macos [aarch64]) -INFO [1661276562.220363] [testnet/stacks-node/src/main.rs:115] [main] Loading config at path ./sample/conf/mainnet-follower-conf.toml -DEBG [1661276562.222450] [testnet/stacks-node/src/main.rs:118] [main] Loaded config file: ConfigFile { burnchain: Some(BurnchainConfigFile { chain: Some("bitcoin"), burn_fee_cap: Some(1), mode: Some("mainnet"), commit_anchor_block_within: None, peer_host: Some("localhost"), peer_port: Some(8333), rpc_port: Some(8332), rpc_ssl: None, username: Some("btcuser"), password: Some("btcpass"), timeout: None, magic_bytes: None, local_mining_public_key: None, process_exit_at_block_height: None, poll_time_secs: None, satoshis_per_byte: None, leader_key_tx_estimated_size: None, block_commit_tx_estimated_size: None, rbf_fee_increment: None, max_rbf: None, epochs: None }), node: Some(NodeConfigFile { name: None, seed: None, deny_nodes: None, working_dir: Some("/Users/igor/w/stacks-work/working_dir"), rpc_bind: Some("0.0.0.0:20443"), p2p_bind: Some("0.0.0.0:20444"), p2p_address: None, data_url: None, bootstrap_node: Some("02196f005965cebe6ddc3901b7b1cc1aa7a88f305bb8c5893456b8f9a605923893@seed.mainnet.hiro.so:20444"), local_peer_seed: None, miner: Some(true), mock_mining: Some(true), mine_microblocks: None, microblock_frequency: None, max_microblocks: None, wait_time_for_microblocks: None, prometheus_bind: None, marf_cache_strategy: None, marf_defer_hashing: None, pox_sync_sample_secs: None, use_test_genesis_chainstate: None }), ustx_balance: None, events_observer: Some([EventObserverConfigFile { endpoint: "localhost:3700", events_keys: ["*"] }]), connection_options: None, fee_estimation: None, miner: None } -INFO [1661276562.233071] [testnet/stacks-node/src/main.rs:128] [main] Valid config! +INFO [1661276562.220137] [stacks-node/src/main.rs:82] [main] stacks-node 0.1.0 (tip-mine:c90476aa8a+, release build, macos [aarch64]) +INFO [1661276562.220363] [stacks-node/src/main.rs:115] [main] Loading config at path ./sample/conf/mainnet-follower-conf.toml +DEBG [1661276562.222450] [stacks-node/src/main.rs:118] [main] Loaded config file: ConfigFile { burnchain: Some(BurnchainConfigFile { chain: Some("bitcoin"), burn_fee_cap: Some(1), mode: Some("mainnet"), commit_anchor_block_within: None, peer_host: Some("localhost"), peer_port: Some(8333), rpc_port: Some(8332), rpc_ssl: None, username: Some("btcuser"), password: Some("btcpass"), timeout: None, magic_bytes: None, local_mining_public_key: None, process_exit_at_block_height: None, poll_time_secs: None, satoshis_per_byte: None, leader_key_tx_estimated_size: None, block_commit_tx_estimated_size: None, rbf_fee_increment: None, max_rbf: None, epochs: None }), node: Some(NodeConfigFile { name: None, seed: None, deny_nodes: None, working_dir: Some("/Users/igor/w/stacks-work/working_dir"), rpc_bind: Some("0.0.0.0:20443"), p2p_bind: Some("0.0.0.0:20444"), p2p_address: None, data_url: None, bootstrap_node: Some("02196f005965cebe6ddc3901b7b1cc1aa7a88f305bb8c5893456b8f9a605923893@seed.mainnet.hiro.so:20444"), local_peer_seed: None, miner: Some(true), mock_mining: Some(true), mine_microblocks: None, microblock_frequency: None, max_microblocks: None, wait_time_for_microblocks: None, prometheus_bind: None, marf_cache_strategy: None, marf_defer_hashing: None, pox_sync_sample_secs: None, use_test_genesis_chainstate: None }), ustx_balance: None, events_observer: Some([EventObserverConfigFile { endpoint: "localhost:3700", events_keys: ["*"] }]), connection_options: None, fee_estimation: None, miner: None } +INFO [1661276562.233071] [stacks-node/src/main.rs:128] [main] Loaded config! ``` Enabling json logging using environment variable `STACKS_LOG_JSON=1` and feature flag `slog_json`: ``` $ STACKS_LOG_JSON=1 cargo run -F slog_json -r -p stacks-node --bin stacks-node check-config --config ./sample/conf/mainnet-follower-conf.toml -{"msg":"stacks-node 0.1.0 (tip-mine:c90476aa8a+, release build, macos [aarch64])","level":"INFO","ts":"2022-08-23T12:44:28.072462-05:00","thread":"main","line":82,"file":"testnet/stacks-node/src/main.rs"} -{"msg":"Loading config at path ./sample/conf/mainnet-follower-conf.toml","level":"INFO","ts":"2022-08-23T12:44:28.074238-05:00","thread":"main","line":115,"file":"testnet/stacks-node/src/main.rs"} -{"msg":"Valid config!","level":"INFO","ts":"2022-08-23T12:44:28.089960-05:00","thread":"main","line":128,"file":"testnet/stacks-node/src/main.rs"} +{"msg":"stacks-node 0.1.0 (tip-mine:c90476aa8a+, release build, macos [aarch64])","level":"INFO","ts":"2022-08-23T12:44:28.072462-05:00","thread":"main","line":82,"file":"stacks-node/src/main.rs"} +{"msg":"Loading config at path ./sample/conf/mainnet-follower-conf.toml","level":"INFO","ts":"2022-08-23T12:44:28.074238-05:00","thread":"main","line":115,"file":"stacks-node/src/main.rs"} +{"msg":"Valid config!","level":"INFO","ts":"2022-08-23T12:44:28.089960-05:00","thread":"main","line":128,"file":"stacks-node/src/main.rs"} ``` ## Setting up the working directory diff --git a/stackslib/src/net/api/gethealth.rs b/stackslib/src/net/api/gethealth.rs index 1958b5d34c..d17fe14229 100644 --- a/stackslib/src/net/api/gethealth.rs +++ b/stackslib/src/net/api/gethealth.rs @@ -189,7 +189,7 @@ impl RPCRequestHandler for RPCGetHealthRequestHandler { let peer_max_stacks_height_opt = { if current_epoch.epoch_id < StacksEpochId::Epoch30 { // When the node enters Epoch 3.0, ibd is not accurate. In nakamoto it's always set to false. - // See the implementation of `RunLoop::start` in `testnet/stacks-node/src/run_loop/nakamoto.rs`, + // See the implementation of `RunLoop::start` in `stacks-node/src/run_loop/nakamoto.rs`, // specifically the section and comment where `let ibd = false`, for details. let ibd = infer_initial_burnchain_block_download( &network.burnchain, From 7a775f4e5177b12a8860ba31b8fe77bb42961ae1 Mon Sep 17 00:00:00 2001 From: Federico De Felici Date: Fri, 4 Jul 2025 11:26:57 +0200 Subject: [PATCH 3/4] chore: .gitignore clean up, #6252 --- .gitignore | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index bb95069e7f..4bf9499ba1 100644 --- a/.gitignore +++ b/.gitignore @@ -41,27 +41,14 @@ secrets* # vim *.swp -#Docker -Docker/blockstore.ini - -#Docs -api/templates/index.html -api/data - -# testnets -testnet-logs/ -testnet.log -testnet/index.html - # virtualenvs .venv # will have compiled files and executables -/target/ -/testnet/helium/target/ -/contrib/tools/puppet-chain/target/ -/contrib/core-contract-tests/.cache/ -/contrib/tools/config-docs-generator/target/ +target/ +contrib/tools/puppet-chain/target/ +contrib/core-contract-tests/.cache/ +contrib/tools/config-docs-generator/target/ # These are backup files generated by rustfmt **/*.rs.bk @@ -71,7 +58,6 @@ tarpaulin-report.html osxcross osxcross*.tar.xz .DS_Store -testnet/stacks-node/target net-test/etc/*.toml net-test/etc/*.conf From d85ae0f2ed6b8e9d3c1545abcc7b8744ed249612 Mon Sep 17 00:00:00 2001 From: Federico De Felici Date: Thu, 10 Jul 2025 10:23:57 +0200 Subject: [PATCH 4/4] chore: remove two contrib/ ignore no more used, #6252 --- .gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4bf9499ba1..3c67c5f30a 100644 --- a/.gitignore +++ b/.gitignore @@ -46,8 +46,6 @@ secrets* # will have compiled files and executables target/ -contrib/tools/puppet-chain/target/ -contrib/core-contract-tests/.cache/ contrib/tools/config-docs-generator/target/ # These are backup files generated by rustfmt