Merge branch 'main' into feat/default-settings-flag

hirosystems · Aug 2, 2024 · 319fc03 · 319fc03
2 parents c813aca + 79ce8a4
commit 319fc03
Show file tree

Hide file tree

Showing 19 changed files with 862 additions and 565 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,26 @@
+# [2.8.0](https://github.com/hirosystems/clarinet/compare/v2.7.0...v2.8.0) (2024-08-01)
+
+##### New Features
+
+*  Add `stacks_node_next_initiative_delay` in devnet config (#1523) (56f7c469)
+*  Advance burn and stacks chain tips independently (#1506) (efeadc5c)
+*  Clarinet sdk browser (#1448) (19824418)
+
+##### Chores
+
+*  Update time version (#1525) (428afdc6)
+*  Clippy warning v1.80 (#1518) (445ea332)
+*  Update reqwest and tokio version and other dependencies (#1510) (bce1a301)
+
+##### Documentation Changes
+
+*  Fix cbtc example (#1492) (978ee627)
+
+##### Bug Fixes
+
+*  Improve vitest matcher sources resolver (#1514) (0cd1b950)
+*  Testnet.toml path in project creation template (#1504) (b37d9f82)
+
 # [2.7.0](https://github.com/hirosystems/clarinet/compare/v2.6.0...v2.7.0) (2024-06-28)
 
 ##### New Features

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,7 +18,7 @@ members = [
 default-members = ["components/clarinet-cli"]
 
 [workspace.package]
-version = "2.7.0"
+version = "2.8.0"
 
 [workspace.dependencies]
 clarity = { git = "https://github.com/stacks-network/stacks-core.git", branch="feat/clarity-wasm-develop", package = "clarity", default-features = false }

diff --git a/components/clarinet-cli/src/generate/project.rs b/components/clarinet-cli/src/generate/project.rs
@@ -341,37 +341,41 @@ disable_stacks_api = false
 # subnet_api_image_url = "{default_subnet_api_image}"
 # subnet_api_postgres_database = "subnet_api"
 
-# For testing in epoch 2.1 / using Clarity2
 # epoch_2_0 = {DEFAULT_EPOCH_2_0}
 # epoch_2_05 = {DEFAULT_EPOCH_2_05}
 # epoch_2_1 = {DEFAULT_EPOCH_2_1}
 # epoch_2_2 = {DEFAULT_EPOCH_2_2}
 # epoch_2_3 = {DEFAULT_EPOCH_2_3}
 # epoch_2_4 = {DEFAULT_EPOCH_2_4}
 # epoch_2_5 = {DEFAULT_EPOCH_2_5}
+# epoch_3_0 = 144
 
 
 # Send some stacking orders
 [[devnet.pox_stacking_orders]]
 start_at_cycle = 1
-duration = 12
+duration = 10
+auto_extend = true
 wallet = "wallet_1"
 slots = 2
 btc_address = "mr1iPkD9N3RJZZxXRk7xF9d36gffa6exNC"
 
 [[devnet.pox_stacking_orders]]
 start_at_cycle = 1
-duration = 12
+duration = 10
+auto_extend = true
 wallet = "wallet_2"
-slots = 1
+slots = 2
 btc_address = "muYdXKmX9bByAueDe6KFfHd5Ff1gdN9ErG"
 
 [[devnet.pox_stacking_orders]]
 start_at_cycle = 1
-duration = 12
+duration = 10
+auto_extend = true
 wallet = "wallet_3"
-slots = 1
+slots = 2
 btc_address = "mvZtbibDAAA3WLpY7zXXFqRa3T4XSknBX7"
+
 "#,
             default_derivation_path = DEFAULT_DERIVATION_PATH,
             default_bitcoin_node_image = DEFAULT_BITCOIN_NODE_IMAGE,

diff --git a/components/clarinet-files/src/network_manifest.rs b/components/clarinet-files/src/network_manifest.rs
@@ -86,6 +86,7 @@ pub struct DevnetConfigFile {
     pub stacks_node_first_attempt_time_ms: Option<u32>,
     pub stacks_node_subsequent_attempt_time_ms: Option<u32>,
     pub stacks_node_env_vars: Option<Vec<String>>,
+    pub stacks_node_next_initiative_delay: Option<u16>,
     pub stacks_api_env_vars: Option<Vec<String>>,
     pub stacks_explorer_env_vars: Option<Vec<String>>,
     pub subnet_node_env_vars: Option<Vec<String>>,
@@ -259,6 +260,7 @@ pub struct DevnetConfig {
     pub stacks_node_subsequent_attempt_time_ms: u32,
     pub stacks_node_events_observers: Vec<String>,
     pub stacks_node_env_vars: Vec<String>,
+    pub stacks_node_next_initiative_delay: u16,
     pub stacks_api_port: u16,
     pub stacks_api_events_port: u16,
     pub stacks_api_env_vars: Vec<String>,
@@ -399,6 +401,7 @@ impl Default for DevnetConfig {
             disable_stacks_api: false,
             bind_containers_volumes: true,
             enable_subnet_node: true,
+            stacks_node_next_initiative_delay: 4000,
             subnet_node_image_url: DEFAULT_SUBNET_NODE_IMAGE.to_string(),
             subnet_leader_stx_address: subnet_stx_address,
             subnet_leader_secret_key_hex: subnet_secret_key_hex,
@@ -628,6 +631,10 @@ impl NetworkManifest {
                     devnet_config.stacks_node_events_observers = Some(val.clone());
                 }
 
+                if let Some(val) = devnet_override.stacks_node_next_initiative_delay {
+                    devnet_config.stacks_node_next_initiative_delay = Some(val);
+                }
+
                 if let Some(val) = devnet_override.stacks_api_port {
                     devnet_config.stacks_api_port = Some(val);
                 }
@@ -953,6 +960,9 @@ impl NetworkManifest {
                 stacks_node_subsequent_attempt_time_ms: devnet_config
                     .stacks_node_subsequent_attempt_time_ms
                     .unwrap_or(1_000),
+                stacks_node_next_initiative_delay: devnet_config
+                    .stacks_node_next_initiative_delay
+                    .unwrap_or(4000),
                 stacks_api_port: devnet_config.stacks_api_port.unwrap_or(3999),
                 stacks_api_events_port: devnet_config.stacks_api_events_port.unwrap_or(3700),
                 stacks_explorer_port: devnet_config.stacks_explorer_port.unwrap_or(8000),

diff --git a/components/clarinet-sdk-wasm/Cargo.toml b/components/clarinet-sdk-wasm/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "clarinet-sdk-wasm"
-# version.workspace = true
-version = "2.8.0-beta6"
+version.workspace = true
 edition = "2021"
 license = "GPL-3.0"
 repository = "https://github.com/hirosystems/clarinet"

diff --git a/components/clarinet-sdk/browser/package.json b/components/clarinet-sdk/browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hirosystems/clarinet-sdk-browser",
-  "version": "2.8.0-beta6",
+  "version": "2.8.0",
   "description": "A SDK to interact with Clarity Smart Contracts in the browser",
   "homepage": "https://www.hiro.so/clarinet",
   "repository": {
@@ -28,7 +28,7 @@
   "license": "GPL-3.0",
   "readme": "./README.md",
   "dependencies": {
-    "@hirosystems/clarinet-sdk-wasm-browser": "^2.8.0-beta6",
+    "@hirosystems/clarinet-sdk-wasm-browser": "^2.8.0",
     "@stacks/transactions": "^6.13.0"
   }
 }
diff --git a/components/clarinet-sdk/node/package.json b/components/clarinet-sdk/node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hirosystems/clarinet-sdk",
-  "version": "2.8.0-beta6",
+  "version": "2.8.0",
   "description": "A SDK to interact with Clarity Smart Contracts in node.js",
   "homepage": "https://www.hiro.so/clarinet",
   "repository": {
@@ -61,7 +61,7 @@
   "license": "GPL-3.0",
   "readme": "./README.md",
   "dependencies": {
-    "@hirosystems/clarinet-sdk-wasm": "^2.8.0-beta6",
+    "@hirosystems/clarinet-sdk-wasm": "^2.8.0",
     "@stacks/transactions": "^6.13.0",
     "kolorist": "^1.8.0",
     "prompts": "^2.4.2",

diff --git a/components/clarity-repl/src/repl/interpreter.rs b/components/clarity-repl/src/repl/interpreter.rs
@@ -1126,14 +1126,14 @@ impl ClarityInterpreter {
     }
 
     pub fn set_tenure_height(&mut self) {
-        let block_height = self.get_block_height();
+        let burn_block_height = self.get_burn_block_height();
         let mut conn = ClarityDatabase::new(
             &mut self.datastore,
             &self.burn_datastore,
             &self.burn_datastore,
         );
         conn.begin();
-        conn.put_data("_stx-data::tenure_height", &block_height)
+        conn.put_data("_stx-data::tenure_height", &burn_block_height)
             .expect("failed set tenure height");
         conn.commit().expect("failed to commit");
     }

diff --git a/components/clarity-vscode/client/package.json b/components/clarity-vscode/client/package.json
@@ -16,7 +16,7 @@
     "@types/vscode": "^1.68.0"
   },
   "dependencies": {
-    "@vscode/test-web": "^0.0.55",
+    "@vscode/test-web": "0.0.56",
     "vscode-languageclient": "^9.0.1"
   }
 }