Merge branch 'develop' into fix/tenure-downloader

Author: kantai

.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

.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

.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
 

.gitignore

@@ -41,27 +41,12 @@ 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/config-docs-generator/target/
 
 # These are backup files generated by rustfmt
 **/*.rs.bk
@@ -71,7 +56,6 @@ tarpaulin-report.html
 osxcross
 osxcross*.tar.xz
 .DS_Store
-testnet/stacks-node/target
 
 net-test/etc/*.toml
 net-test/etc/*.conf

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

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)
             ];
           };
 

docs/mining.md

@@ -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"