chore: build clarity for wasm32-unknown-unknown

Author: hugocaillard

Cargo.lock

@@ -18,8 +18,6 @@ name = "clarity"
 path = "./src/libclarity.rs"
 
 [dependencies]
-rand = { workspace = true }
-rand_chacha = { workspace = true }
 serde = "1"
 serde_derive = "1"
 serde_stacker = "0.1"
@@ -28,22 +26,23 @@ lazy_static = "1.4.0"
 integer-sqrt = "0.1.3"
 slog = { version = "2.5.2", features = [ "max_level_trace" ] }
 stacks_common = { package = "stacks-common", path = "../stacks-common", default-features = false }
-rstest = "0.17.0"
-rstest_reuse = "0.5.0"
+rstest = { version = "0.17.0", optional = true }
+rstest_reuse = { version = "0.5.0", optional = true }
 hashbrown = { workspace = true }
 rusqlite = { workspace = true, optional = true }
 
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+getrandom = { version = "0.2", features = ["js"] }
+
 [dependencies.serde_json]
 version = "1.0"
 features = ["arbitrary_precision", "unbounded_depth"]
 
-[dependencies.time]
-version = "0.2.23"
-features = ["std"]
-
 [dev-dependencies]
 assert-json-diff = "1.0.0"
 mutants = "0.0.3"
+rstest = { version = "0.17.0" }
+rstest_reuse = { version = "0.5.0" }
 # a nightly rustc regression (35dbef235 2021-03-02) prevents criterion from compiling
 #  but it isn't necessary for tests: only benchmarks. therefore, commenting out for now.
 # criterion = "0.3"
@@ -53,7 +52,7 @@ default = ["rusqlite"]
 developer-mode = ["stacks_common/developer-mode"]
 slog_json = ["stacks_common/slog_json"]
 rusqlite = ["stacks_common/rusqlite", "dep:rusqlite"]
-testing = []
+testing = ["rstest", "rstest_reuse"]
 devtools = []
 rollback_value_check = []
 disable-costs = []

clarity/Cargo.toml

@@ -335,7 +335,7 @@ pub fn no_type() -> TypeSignature {
 }
 
 impl<'a, 'b> TypeChecker<'a, 'b> {
-    fn new(
+    pub fn new(
         db: &'a mut AnalysisDatabase<'b>,
         cost_track: LimitedCostTracker,
         build_type_map: bool,

clarity/src/vm/analysis/type_checker/v2_05/mod.rs

@@ -417,6 +417,12 @@ pub enum CostErrors {
     ExecutionTimeExpired,
 }
 
+impl fmt::Display for CostErrors {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{:?}", self)
+    }
+}
+
 impl CostErrors {
     fn rejectable(&self) -> bool {
         matches!(self, CostErrors::InterpreterFailure | CostErrors::Expect(_))

clarity/src/vm/costs/mod.rs

@@ -2632,7 +2632,7 @@ pub fn make_api_reference(function: &NativeFunctions) -> FunctionAPI {
     }
 }
 
-fn make_keyword_reference(variable: &NativeVariables) -> Option<KeywordAPI> {
+pub fn make_keyword_reference(variable: &NativeVariables) -> Option<KeywordAPI> {
     let keyword = match variable {
         NativeVariables::TxSender => TX_SENDER_KEYWORD.clone(),
         NativeVariables::ContractCaller => CONTRACT_CALLER_KEYWORD.clone(),

clarity/src/vm/docs/mod.rs

@@ -56,7 +56,6 @@ pub mod clarity;
 use std::collections::BTreeMap;
 
 use costs::CostErrors;
-use serde_json;
 use stacks_common::types::StacksEpochId;
 
 use self::analysis::ContractAnalysis;
@@ -77,6 +76,7 @@ pub use crate::vm::database::clarity_db::StacksEpoch;
 use crate::vm::errors::{
     CheckErrors, Error, InterpreterError, InterpreterResult as Result, RuntimeErrorType,
 };
+use crate::vm::events::StacksTransactionEvent;
 use crate::vm::functions::define::DefineResult;
 pub use crate::vm::functions::stx_transfer_consolidated;
 pub use crate::vm::representations::{
@@ -118,12 +118,12 @@ pub enum EvaluationResult {
 #[derive(Debug, Clone)]
 pub struct ExecutionResult {
     pub result: EvaluationResult,
-    pub events: Vec<serde_json::Value>,
+    pub events: Vec<StacksTransactionEvent>,
     pub cost: Option<CostSynthesis>,
     pub diagnostics: Vec<Diagnostic>,
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Serialize)]
 pub struct CostSynthesis {
     pub total: ExecutionCost,
     pub limit: ExecutionCost,

clarity/src/vm/mod.rs

@@ -19,8 +19,8 @@ name = "pox_locking"
 path = "src/lib.rs"
 
 [dependencies]
-clarity = { package = "clarity", path = "../clarity" }
-stacks_common = { package = "stacks-common", path = "../stacks-common" }
+clarity = { package = "clarity", path = "../clarity", default-features = false}
+stacks_common = { package = "stacks-common", path = "../stacks-common", default-features = false}
 slog = { version = "2.5.2", features = [ "max_level_trace" ] }
 
 [dev-dependencies]

pox-locking/Cargo.toml

@@ -68,10 +68,6 @@ workspace = true
 version = "4.1.3"
 features = ["serde"]
 
-[dependencies.time]
-version = "0.2.23"
-features = ["std"]
-
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
 secp256k1 = { version = "0.24.3", features = ["serde", "recovery"] }
 
@@ -83,7 +79,7 @@ rand_core = { workspace = true }
 proptest = "1.6.0"
 
 [features]
-default = ["developer-mode"]
+default = ["rusqlite", "developer-mode"]
 developer-mode = []
 slog_json = ["slog-json"]
 rusqlite = ["dep:rusqlite"]

stacks-common/Cargo.toml

@@ -20,10 +20,9 @@ pub mod hash;
 
 use std::{error, fmt};
 
-use secp256k1;
-
 use crate::deps_common::bitcoin::network;
 use crate::deps_common::bitcoin::network::serialize;
+use crate::util::secp256k1::Error as Secp256k1Error;
 
 /// A trait which allows numbers to act as fixed-size bit arrays
 pub trait BitArray {
@@ -51,7 +50,7 @@ pub trait BitArray {
 #[derive(Debug)]
 pub enum Error {
     /// secp-related error
-    Secp256k1(secp256k1::Error),
+    Secp256k1(Secp256k1Error),
     /// Serialization error
     Serialize(serialize::Error),
     /// Network error
@@ -86,8 +85,8 @@ impl error::Error for Error {
 }
 
 #[doc(hidden)]
-impl From<secp256k1::Error> for Error {
-    fn from(e: secp256k1::Error) -> Error {
+impl From<Secp256k1Error> for Error {
+    fn from(e: Secp256k1Error) -> Error {
         Error::Secp256k1(e)
     }
 }

stacks-common/src/deps_common/bitcoin/util/mod.rs

@@ -16,6 +16,7 @@
 
 pub mod bech32;
 pub mod bitcoin;
+#[cfg(not(target_arch = "wasm32"))]
 pub mod ctrlc;
 pub mod httparse;