Merge pull request #5551 from jbencin/feat/stacks-inspect-try-mine-wi…

…th-config feat: Add `--config` and `--network` flags to several `stacks-inspect` subcommands
stacks-network · Dec 16, 2024 · 3da3394 · 3da3394
2 parents f8886d4 + 51605be
commit 3da3394
Show file tree

Hide file tree

Showing 37 changed files with 466 additions and 414 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -21,7 +21,8 @@ rand = "0.8"
 rand_chacha = "0.3.1"
 tikv-jemallocator = "0.5.4"
 rusqlite = { version = "0.31.0", features = ["blob", "serde_json", "i128_blob", "bundled", "trace"] }
-thiserror = { version = "1.0.65" }
+thiserror = "1.0.65"
+toml = "0.5.6"
 
 # Use a bit more than default optimization for
 #  dev builds to speed up test execution

diff --git a/stacks-signer/Cargo.toml b/stacks-signer/Cargo.toml
@@ -40,7 +40,7 @@ stacks-common = { path = "../stacks-common" }
 stackslib = { path = "../stackslib" }
 thiserror = { workspace = true }
 tiny_http = { version = "0.12", optional = true }
-toml = "0.5.6"
+toml = { workspace = true }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
 rand = { workspace = true }

diff --git a/stackslib/Cargo.toml b/stackslib/Cargo.toml
@@ -58,6 +58,7 @@ libstackerdb = { path = "../libstackerdb" }
 siphasher = "0.3.7"
 hashbrown = { workspace = true }
 rusqlite = { workspace = true }
+toml = { workspace = true }
 
 [target.'cfg(not(any(target_os = "macos",target_os="windows", target_arch = "arm" )))'.dependencies]
 tikv-jemallocator = {workspace = true}

diff --git a/...acks-node/conf/mainnet-follower-conf.toml → stackslib/conf/mainnet-follower-conf.toml b/...acks-node/conf/mainnet-follower-conf.toml → stackslib/conf/mainnet-follower-conf.toml
diff --git a/.../stacks-node/conf/mainnet-miner-conf.toml → stackslib/conf/mainnet-miner-conf.toml b/.../stacks-node/conf/mainnet-miner-conf.toml → stackslib/conf/mainnet-miner-conf.toml
diff --git a/...cks-node/conf/mainnet-mockminer-conf.toml → stackslib/conf/mainnet-mockminer-conf.toml b/...cks-node/conf/mainnet-mockminer-conf.toml → stackslib/conf/mainnet-mockminer-conf.toml
diff --git a/testnet/stacks-node/conf/mainnet-signer.toml → stackslib/conf/mainnet-signer.toml b/testnet/stacks-node/conf/mainnet-signer.toml → stackslib/conf/mainnet-signer.toml
diff --git a/...acks-node/conf/testnet-follower-conf.toml → stackslib/conf/testnet-follower-conf.toml b/...acks-node/conf/testnet-follower-conf.toml → stackslib/conf/testnet-follower-conf.toml
diff --git a/.../stacks-node/conf/testnet-miner-conf.toml → stackslib/conf/testnet-miner-conf.toml b/.../stacks-node/conf/testnet-miner-conf.toml → stackslib/conf/testnet-miner-conf.toml
diff --git a/testnet/stacks-node/conf/testnet-signer.toml → stackslib/conf/testnet-signer.toml b/testnet/stacks-node/conf/testnet-signer.toml → stackslib/conf/testnet-signer.toml