refactor: handle at-block

hirosystems · Jan 17, 2025 · 042750b · 042750b
1 parent b0f46ec
commit 042750b
Show file tree

Hide file tree

Showing 13 changed files with 300 additions and 343 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,7 +1,10 @@
 {
   "rust-analyzer.check.command": "clippy",
-  "rust-analyzer.check.workspace": true,
+  // rust-analyzer hack:
+  // manually set --workspace in extraArgs so that it's always set only one time
+  "rust-analyzer.check.workspace": false,
   "rust-analyzer.check.extraArgs": [
+    "--workspace",
     "--exclude=clarinet-sdk-wasm",
     "--exclude=clarity-jupyter-kernel"
   ]

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

diff --git a/components/clarinet-sdk-wasm/src/core.rs b/components/clarinet-sdk-wasm/src/core.rs
@@ -371,6 +371,7 @@ impl SDK {
             .interpreter
             .clarity_datastore
             .set_http_client(self.http_client.clone());
+
         self.session = Some(session);
         Ok(())
     }
@@ -383,7 +384,7 @@ impl SDK {
             .ok_or("Failed to parse manifest location")?;
 
         let ProjectCache {
-            session,
+            mut session,
             contracts_interfaces,
             contracts_locations,
             accounts,
@@ -392,6 +393,11 @@ impl SDK {
             None => self.setup_session(&manifest_location).await?,
         };
 
+        session
+            .interpreter
+            .clarity_datastore
+            .set_http_client(self.http_client.clone());
+
         self.deployer = session.interpreter.get_tx_sender().to_string();
 
         self.contracts_interfaces = contracts_interfaces;

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.12.0",
+  "version": "2.13.0-beta1",
   "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.12.0",
+    "@hirosystems/clarinet-sdk-wasm-browser": "2.13.0-beta1",
     "@stacks/transactions": "^6.13.0",
     "sync-request": "^6.1.0"
   }

diff --git a/components/clarinet-sdk/common/src/httpClient.ts b/components/clarinet-sdk/common/src/httpClient.ts
@@ -3,9 +3,13 @@ import request, { HttpVerb, Options as HttpOptions } from "sync-request";
 const encoder = new TextEncoder();
 
 export function httpClient(method: HttpVerb, path: string, options?: HttpOptions): Uint8Array {
+  console.log("-".repeat(20));
+  console.log("httpClient", method, path, options);
   const response = request(method, path, options);
   if (typeof response.body === "string") {
     return encoder.encode(response.body);
   }
+  console.log("httpClient response", response.statusCode);
+  console.log("-".repeat(20));
   return response.body;
 }
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.12.0",
+  "version": "2.13.0-beta1",
   "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.12.0",
+    "@hirosystems/clarinet-sdk-wasm": "2.13.0-beta1",
     "@stacks/transactions": "^6.13.0",
     "kolorist": "^1.8.0",
     "prompts": "^2.4.2",

diff --git a/components/clarinet-sdk/node/tests/remote-data.test.ts b/components/clarinet-sdk/node/tests/remote-data.test.ts
@@ -30,7 +30,7 @@ beforeEach(async () => {
   await simnet.initEmptySession({
     enabled: true,
     api_url: "http://localhost:3999",
-    initial_height: 186,
+    initial_height: 56,
   });
 });