WIP

Author: ureeves

clar2wasm/src/wasm_generator.rs

@@ -495,8 +495,9 @@ impl WasmGenerator {
                     simpleword.visit(self, builder, &arg_types, &return_type)?;
                 } else if let Some(variadic) = words::lookup_variadic_simple(function_name) {
                     let (arg_types, return_type) = get_types()?;
+                    let args_len = args.len();
 
-                    variadic.charge(self, builder, arg_types.len() as u32)?;
+                    variadic.charge(self, builder, args_len as u32)?;
 
                     let mut args_enumerated = args.iter().enumerate();
 

clar2wasm/src/words/bindings.rs

@@ -27,9 +27,10 @@ impl ComplexWord for Let {
 
         check_args!(generator, builder, 2, args_len, ArgumentCountCheck::AtLeast);
 
-        self.charge(generator, builder, args_len as u32)?;
-
         let bindings = args.get_list(0)?;
+        let bindings_len = bindings.len();
+
+        self.charge(generator, builder, bindings_len as u32)?;
 
         // Save the current named locals
         let saved_locals = generator.bindings.clone();
@@ -89,9 +90,12 @@ impl ComplexWord for Let {
 
 #[cfg(test)]
 mod tests {
-    use clarity::vm::Value;
+    use clarity::{types::StacksEpochId, vm::Value};
 
-    use crate::tools::{crosscheck, crosscheck_compare_only, crosscheck_expect_failure, evaluate};
+    use crate::tools::{
+        crosscheck, crosscheck_compare_only, crosscheck_expect_failure, crosscheck_with_epoch,
+        evaluate,
+    };
 
     #[cfg(feature = "test-clarity-v1")]
     mod clarity_v1 {
@@ -132,6 +136,28 @@ mod tests {
         crosscheck_expect_failure(&format!("{ERR} (test)"));
     }
 
+    #[test]
+    fn clar_let_cost() {
+        const SNIPPET_LET: &str = r#"
+(let ((a u1) (b u2))
+  (+ a b)
+)
+"#;
+        const SNIPPET_NO_LET: &str = r#"
+  (+ u1 u2)
+"#;
+        // crosscheck_with_epoch(
+        //     SNIPPET_LET,
+        //     Ok(Some(Value::UInt(3))),
+        //     StacksEpochId::Epoch20,
+        // );
+        crosscheck_with_epoch(
+            SNIPPET_NO_LET,
+            Ok(Some(Value::UInt(3))),
+            StacksEpochId::Epoch31,
+        );
+    }
+
     #[test]
     fn clar_let_disallow_user_defined_names() {
         // It's not allowed to use names of user-defined functions as bindings

clar2wasm/tests/contracts/add_cost.clar

@@ -0,0 +1,7 @@
+(define-public (simple)
+  (begin
+    (let a u4)
+    (let b u1)
+    (ok (+ a b))
+  )
+)