starknet 11.0.2 → 11.0.3

package/dist/index.mjs

@@ -3020,7 +3020,6 @@ var CairoUint256 = class _CairoUint256 {
    * ```
    */
   low;
-  // TODO should be u128
   /**
    * The top 128 bits of the value.
    * @example
@@ -3030,7 +3029,6 @@ var CairoUint256 = class _CairoUint256 {
    * ```
    */
   high;
-  // TODO should be u128
   /**
    * The abi type this class serializes.
    * @example
@@ -3269,7 +3267,6 @@ var CairoUint512 = class _CairoUint512 {
    * ```
    */
   limb0;
-  // TODO should be u128
   /**
    * Bits 128 to 255 of the value.
    * @example
@@ -3279,7 +3276,6 @@ var CairoUint512 = class _CairoUint512 {
    * ```
    */
   limb1;
-  // TODO should be u128
   /**
    * Bits 256 to 383 of the value.
    * @example
@@ -3289,7 +3285,6 @@ var CairoUint512 = class _CairoUint512 {
    * ```
    */
   limb2;
-  // TODO should be u128
   /**
    * Bits 384 to 511 of the value.
    * @example
@@ -3299,7 +3294,6 @@ var CairoUint512 = class _CairoUint512 {
    * ```
    */
   limb3;
-  // TODO should be u128
   /**
    * The abi type this class serializes.
    * @example
@@ -8554,7 +8548,13 @@ var CairoTypeOption = class _CairoTypeOption {
    * Build an option, from a value a caller passed or from the felts of a response.
    *
    * A {@link CairoOption} says its own branch, so `variant` is not given with one — nor with the
-   * response iterator, which reads the branch off the wire. Anywhere else it is required.
+   * response iterator, which reads the branch off the wire, nor with a `CairoTypeOption`, which
+   * is copied as it is. Anywhere else it is required.
+   *
+   * For the same reason, a `CairoOption` that holds a `CairoTypeOption` is refused: once it is
+   * unwrapped, the variant comes with the `CairoTypeOption`. Accepted, it would lose one level:
+   * `Some(Some(1))` would be sent as `Some(None)`. Write a nested value with `CairoOption`
+   * only, or build one `CairoTypeOption` for the whole type.
    *
    * `subType` is what makes an option of options work. Handed a `CairoOption`, this constructor
    * unwraps it and calls itself with what was inside, which for a nested option is another
@@ -8565,11 +8565,11 @@ var CairoTypeOption = class _CairoTypeOption {
    * @param {string} optionCairoType the abi type, `core::option::Option::<T>`
    * @param {AllowArray<CairoTypeStrategy>} parsingStrategy how to build the value
    * @param {CairoOptionVariant | number} [variant] which branch, when the content does not say.
-   * Must be omitted when `content` is the response iterator.
+   * Must be omitted when `content` is the response iterator or a `CairoTypeOption`.
    * @param {boolean} [subType=false] true when called from the unwrapping of a nested
    * `CairoOption`, which is the only caller that should set it
-   * @throws {Error} when the type is not an option, when the variant is missing, absurd, or
-   * contradicts the content
+   * @throws {Error} when the type is not an option, or when the variant is missing, absurd,
+   * contradicts the content, or is given with a `CairoTypeOption`
    * @example
    * ```typescript
    * const type = 'core::option::Option::<core::integer::u8>';
@@ -8614,6 +8614,10 @@ var CairoTypeOption = class _CairoTypeOption {
       return;
     }
     if (content instanceof _CairoTypeOption) {
+      assert(
+        isUndefined(variant),
+        'when "content" parameter is a CairoTypeOption, do not define "variant" parameter.'
+      );
       this.content = content.content;
       this.isVariantSome = content.isVariantSome;
       this.optionCairoType = content.optionCairoType;
@@ -11075,11 +11079,17 @@ function errorU512(key) {
     `Your object includes the property : ${key}, containing an Uint512 object without the 'limb0' to 'limb3' keys.`
   );
 }
+function getVariantType(abiEnum, variantName) {
+  return abiEnum.variants?.find((abiVariant) => abiVariant.name === variantName)?.type ?? "";
+}
 function orderPropsByAbi(unorderedObject, abiOfObject, structs, enums) {
   const orderInput = (unorderedItem, abiType) => {
     if (CairoFixedArray.isTypeFixedArray(abiType)) {
       return orderFixedArray(unorderedItem, abiType);
     }
+    if (isCairoType(unorderedItem)) {
+      return unorderedItem;
+    }
     if (isTypeArray(abiType)) {
       return orderArray(unorderedItem, abiType);
     }
@@ -11192,14 +11202,8 @@ function orderPropsByAbi(unorderedObject, abiOfObject, structs, enums) {
   const orderEnum = (unorderedObject2, abiObject) => {
     if (isTypeResult(abiObject.name)) {
       const unorderedResult = unorderedObject2;
-      const resultOkType = abiObject.name.substring(
-        abiObject.name.indexOf("<") + 1,
-        abiObject.name.lastIndexOf(",")
-      );
-      const resultErrType = abiObject.name.substring(
-        abiObject.name.indexOf(",") + 1,
-        abiObject.name.lastIndexOf(">")
-      );
+      const resultOkType = getVariantType(abiObject, "Ok");
+      const resultErrType = getVariantType(abiObject, "Err");
       if (unorderedResult.isOk()) {
         return new CairoResult(
           CairoResultVariant.Ok,
@@ -11213,10 +11217,7 @@ function orderPropsByAbi(unorderedObject, abiOfObject, structs, enums) {
     }
     if (isTypeOption(abiObject.name)) {
       const unorderedOption = unorderedObject2;
-      const resultSomeType = abiObject.name.substring(
-        abiObject.name.indexOf("<") + 1,
-        abiObject.name.lastIndexOf(">")
-      );
+      const resultSomeType = getVariantType(abiObject, "Some");
       if (unorderedOption.isSome()) {
         return new CairoOption(
           CairoOptionVariant.Some,
@@ -11231,10 +11232,7 @@ function orderPropsByAbi(unorderedObject, abiOfObject, structs, enums) {
       if (isUndefined(variant[1])) {
         return variant;
       }
-      const variantType = abiObject.type.substring(
-        abiObject.type.lastIndexOf("<") + 1,
-        abiObject.type.lastIndexOf(">")
-      );
+      const variantType = getVariantType(abiObject, variant[0]);
       if (variantType === "()") {
         return variant;
       }