Merge branch 'main' into feat/check-args-length

clar2wasm/src/error_mapping.rs

@@ -56,9 +56,21 @@ pub enum ErrorMap {
 
     /// Indicates an attempt to use a name that is already in use, possibly for a variable or function.
     NameAlreadyUsed = 9,
+
+    /// Represents a short-return error for an expected value that wraps a Response type.
+    /// Usually triggered by `(try!...)`.
+    ShortReturnExpectedValueResponse = 10,
 
-    /// Indicates an attempt to use a function with the wrong amount of arguments
-    ArgumentCountMismatch = 10,
+    /// Represents a short-return error for an expected value that wraps an Optional type.
+    /// Usually triggered by `(try!...)`.
+    ShortReturnExpectedValueOptional = 11,
+
+    /// Represents a short-return error for an expected value.
+    /// usually triggered by `(unwrap!...)` and `(unwrap-err!...)`.
+    ShortReturnExpectedValue = 12,
+
+   /// Indicates an attempt to use a function with the wrong amount of arguments
+    ArgumentCountMismatch = 13,
 
     /// A catch-all for errors that are not mapped to specific error codes.
     /// This might be used for unexpected or unclassified errors.
@@ -79,7 +91,10 @@ impl From<i32> for ErrorMap {
             7 => ErrorMap::ShortReturnAssertionFailure,
             8 => ErrorMap::ArithmeticPowError,
             9 => ErrorMap::NameAlreadyUsed,
-            10 => ErrorMap::ArgumentCountMismatch,
+            10 => ErrorMap::ShortReturnExpectedValueResponse,
+            11 => ErrorMap::ShortReturnExpectedValueOptional,
+            12 => ErrorMap::ShortReturnExpectedValue,
+            13 => ErrorMap::ArgumentCountMismatch,
             _ => ErrorMap::NotMapped,
         }
     }
@@ -229,6 +244,25 @@ fn from_runtime_error_code(
 
             Error::Unchecked(CheckErrors::NameAlreadyUsed(arg_name))
         }
+        ErrorMap::ShortReturnExpectedValueResponse => {
+            let clarity_val = short_return_value(&instance, &mut store, epoch_id, clarity_version);
+            Error::ShortReturn(ShortReturnType::ExpectedValue(Value::Response(
+                ResponseData {
+                    committed: false,
+                    data: Box::new(clarity_val),
+                },
+            )))
+        }
+        ErrorMap::ShortReturnExpectedValueOptional => {
+            Error::ShortReturn(ShortReturnType::ExpectedValue(Value::Optional(
+                clarity::vm::types::OptionalData { data: None },
+            )))
+        }
+        ErrorMap::ShortReturnExpectedValue => {
+            let clarity_val = short_return_value(&instance, &mut store, epoch_id, clarity_version);
+            Error::ShortReturn(ShortReturnType::ExpectedValue(clarity_val))
+
+        }
         ErrorMap::ArgumentCountMismatch => {
             let runtime_error_arg_offset = instance
                 .get_global(&mut store, "runtime-error-arg-offset")

clar2wasm/src/words/conditionals.rs

@@ -1465,5 +1465,26 @@ mod tests {
             .unwrap_err()
             .to_string()
             .contains("expecting 2 arguments, got 3"));
+  }
+    fn try_response_false() {
+        crosscheck(
+            "(try! (if false (ok u1) (err u42)))",
+            Err(Error::ShortReturn(ShortReturnType::ExpectedValue(
+                Value::Response(ResponseData {
+                    committed: false,
+                    data: Box::new(Value::UInt(42)),
+                }),
+            ))),
+        )
+    }
+
+    #[test]
+    fn try_optional_false() {
+        crosscheck(
+            "(try! (if false (some u1) none))",
+            Err(Error::ShortReturn(ShortReturnType::ExpectedValue(
+                Value::Optional(clarity::vm::types::OptionalData { data: None }),
+            ))),
+        )
     }
 }

clar2wasm/src/words/tokens.rs

@@ -579,6 +579,9 @@ impl ComplexWord for GetOwnerOfNonFungibleToken {
 mod tests {
     use crate::tools::{crosscheck, crosscheck_expect_failure, evaluate};
 
+    use clarity::vm::types::{PrincipalData, TupleData};
+    use clarity::vm::Value;
+
     //
     // Module with tests that should only be executed
     // when running Clarity::V1.