diff --git a/Cargo.lock b/Cargo.lock index 8fd7ef660..27c44856a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -687,7 +687,7 @@ dependencies = [ "chainhook-types", "chrono", "clarinet-utils 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "clarity-repl 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "clarity-repl 1.5.0", "crossbeam-channel", "futures", "hex 0.4.3", @@ -814,7 +814,7 @@ dependencies = [ [[package]] name = "clarinet-cli" -version = "1.5.0" +version = "1.5.1" dependencies = [ "aes 0.7.5", "ansi_term", @@ -831,7 +831,7 @@ dependencies = [ "clarinet-files", "clarinet-utils 1.0.0", "clarity-lsp", - "clarity-repl 1.5.0", + "clarity-repl 1.5.1", "crossbeam-channel", "crossterm 0.22.1", "ctrlc", @@ -936,7 +936,7 @@ dependencies = [ "bitcoincore-rpc-json", "clarinet-files", "clarinet-utils 1.0.0", - "clarity-repl 1.5.0", + "clarity-repl 1.5.1", "libsecp256k1 0.7.1", "reqwest", "serde", @@ -955,7 +955,7 @@ dependencies = [ "bitcoin", "chainhook-types", "clarinet-utils 1.0.0", - "clarity-repl 1.5.0", + "clarity-repl 1.5.1", "js-sys", "libsecp256k1 0.7.1", "serde", @@ -997,7 +997,7 @@ dependencies = [ "clap", "clap_generate", "clarinet-files", - "clarity-repl 1.5.0", + "clarity-repl 1.5.1", "serde", "serde_derive", "serde_json", @@ -1009,7 +1009,7 @@ name = "clarity-jupyter-kernel" version = "1.0.0" dependencies = [ "chrono", - "clarity-repl 1.5.0", + "clarity-repl 1.5.1", "colored", "dirs", "failure", @@ -1031,7 +1031,7 @@ version = "1.0.0" dependencies = [ "clarinet-deployments", "clarinet-files", - "clarity-repl 1.5.0", + "clarity-repl 1.5.1", "console_error_panic_hook", "js-sys", "lazy_static", @@ -1048,6 +1048,8 @@ dependencies = [ [[package]] name = "clarity-repl" version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f70d4c9992140d15954e97c640b797f80e05ab58ceebbc3e608bffa205f799a" dependencies = [ "ansi_term", "atty", @@ -1056,7 +1058,7 @@ dependencies = [ "debug_types", "futures", "getrandom 0.2.8", - "hiro-system-kit 0.1.0", + "hiro-system-kit 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "httparse", "integer-sqrt", "lazy_static", @@ -1079,15 +1081,11 @@ dependencies = [ "sha3 0.9.1", "tokio", "tokio-util 0.7.7", - "wasm-bindgen", - "wasm-bindgen-futures", ] [[package]] name = "clarity-repl" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f70d4c9992140d15954e97c640b797f80e05ab58ceebbc3e608bffa205f799a" +version = "1.5.1" dependencies = [ "ansi_term", "atty", @@ -1096,7 +1094,7 @@ dependencies = [ "debug_types", "futures", "getrandom 0.2.8", - "hiro-system-kit 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hiro-system-kit 0.1.0", "httparse", "integer-sqrt", "lazy_static", @@ -1119,6 +1117,8 @@ dependencies = [ "sha3 0.9.1", "tokio", "tokio-util 0.7.7", + "wasm-bindgen", + "wasm-bindgen-futures", ] [[package]] @@ -5890,7 +5890,7 @@ dependencies = [ [[package]] name = "stacks-devnet-js" -version = "1.5.0" +version = "1.5.1" dependencies = [ "clarinet-deployments", "clarinet-files", @@ -5906,7 +5906,7 @@ dependencies = [ [[package]] name = "stacks-network" -version = "1.5.0" +version = "1.5.1" dependencies = [ "base58 0.2.0", "bitcoin", @@ -5918,7 +5918,7 @@ dependencies = [ "clarinet-deployments", "clarinet-files", "clarinet-utils 1.0.0", - "clarity-repl 1.5.0", + "clarity-repl 1.5.1", "crossbeam-channel", "crossterm 0.22.1", "ctrlc", @@ -5942,7 +5942,7 @@ name = "stacks-rpc-client" version = "1.0.0" dependencies = [ "clarinet-utils 1.0.0", - "clarity-repl 1.5.0", + "clarity-repl 1.5.1", "reqwest", "serde", "serde_derive", @@ -5956,7 +5956,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aca7b97b09d835c932c1ee24335adcb4a85225aaf6eb566aa36fe6f9f18958cd" dependencies = [ "clarinet-utils 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "clarity-repl 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "clarity-repl 1.5.0", "reqwest", "serde", "serde_derive", diff --git a/components/clarinet-cli/Cargo.toml b/components/clarinet-cli/Cargo.toml index 7526c98d5..d3fa30441 100644 --- a/components/clarinet-cli/Cargo.toml +++ b/components/clarinet-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clarinet-cli" -version = "1.5.0" +version = "1.5.1" authors = ["Ludo Galabru ", "Brice Dobry "] edition = "2021" description = "Clarinet is a simple, modern and opinionated runtime for testing, integrating and deploying Clarity smart contracts." diff --git a/components/clarity-repl/Cargo.toml b/components/clarity-repl/Cargo.toml index 36bd90a49..b5384fdad 100644 --- a/components/clarity-repl/Cargo.toml +++ b/components/clarity-repl/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clarity-repl" -version = "1.5.0" +version = "1.5.1" description = "Clarity REPL" authors = [ "Ludo Galabru ", diff --git a/components/stacks-devnet-js/Cargo.toml b/components/stacks-devnet-js/Cargo.toml index 583f4ec9c..b6bc5e84e 100644 --- a/components/stacks-devnet-js/Cargo.toml +++ b/components/stacks-devnet-js/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "stacks-devnet-js" -version = "1.5.0" +version = "1.5.1" license = "ISC" edition = "2018" exclude = ["index.node"] diff --git a/components/stacks-devnet-js/package.json b/components/stacks-devnet-js/package.json index bee3e9a4d..f99760bd0 100644 --- a/components/stacks-devnet-js/package.json +++ b/components/stacks-devnet-js/package.json @@ -1,6 +1,6 @@ { "name": "@hirosystems/stacks-devnet-js", - "version": "1.5.0", + "version": "1.5.1", "description": "stacks-devnet-js is a library for writing end to end tests for protocols interacting with the Stacks blockchain and the Bitcoin blockchain.", "author": "Ludo Galabru", "repository": "https://github.com/hirosystems/clarinet/tree/main/components/stacks-devnet-js", diff --git a/components/stacks-network/Cargo.toml b/components/stacks-network/Cargo.toml index e5c6bcdc0..bd6b6a26f 100644 --- a/components/stacks-network/Cargo.toml +++ b/components/stacks-network/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "stacks-network" -version = "1.5.0" +version = "1.5.1" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/components/stacks-network/src/chains_coordinator.rs b/components/stacks-network/src/chains_coordinator.rs index a516adcea..ed2d2fed7 100644 --- a/components/stacks-network/src/chains_coordinator.rs +++ b/components/stacks-network/src/chains_coordinator.rs @@ -368,6 +368,9 @@ pub async fn start_chains_coordinator( }; let _ = devnet_event_tx.send(DevnetEvent::info(message)); + let stacks_rpc = StacksRpc::new(&config.consolidated_stacks_rpc_url()); + let _ = stacks_rpc.get_pox_info(); + let should_submit_pox_orders = known_tip.block.metadata.pox_cycle_position == (known_tip.block.metadata.pox_cycle_length - 2); if should_submit_pox_orders { diff --git a/components/stacks-network/src/orchestrator.rs b/components/stacks-network/src/orchestrator.rs index 1262d132b..7ac115c45 100644 --- a/components/stacks-network/src/orchestrator.rs +++ b/components/stacks-network/src/orchestrator.rs @@ -688,9 +688,12 @@ rpcport={bitcoin_node_rpc_port} bitcoin_node_rpc_port = devnet_config.bitcoin_node_rpc_port, ); let mut bitcoind_conf_path = PathBuf::from(&devnet_config.working_dir); - bitcoind_conf_path.push("conf/bitcoin.conf"); + bitcoind_conf_path.push("conf"); + fs::create_dir_all(&bitcoind_conf_path) + .map_err(|e| format!("unable to create bitcoin conf directory: {}", e.to_string()))?; + bitcoind_conf_path.push("bitcoin.conf"); let mut file = File::create(bitcoind_conf_path) - .map_err(|e| format!("unable to create bitcoin.conf: {:?}", e))?; + .map_err(|e| format!("unable to create bitcoin.conf: {}", e.to_string()))?; file.write_all(bitcoind_conf.as_bytes()) .map_err(|e| format!("unable to write bitcoin.conf: {:?}", e))?;