Merge pull request #934 from hirosystems/release/next

Release/next
hirosystems · Mar 15, 2023 · f484c59 · f484c59
2 parents d8af8f6 + 46315f8
commit f484c59
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 27 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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 <[email protected]>", "Brice Dobry <[email protected]>"]
 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
@@ -1,6 +1,6 @@
 [package]
 name = "clarity-repl"
-version = "1.5.0"
+version = "1.5.1"
 description = "Clarity REPL"
 authors = [
     "Ludo Galabru <[email protected]>",

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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))?;