starknet 5.15.1 → 5.16.0

package/dist/index.js

@@ -2595,6 +2595,9 @@ var getArrayType = (type) => {
 function isCairo1Abi(abi) {
   const firstFunction = abi.find((entry) => entry.type === "function");
   if (!firstFunction) {
+    if (abi.find((it) => it.type === "interface")) {
+      return true;
+    }
     throw new Error(`Error in ABI. No function in ABI.`);
   }
   if (firstFunction.inputs.length) {
@@ -2696,6 +2699,92 @@ function formatter(data, type, sameType) {
   }, {});
 }
 
+// src/utils/calldata/parser/parser-0-1.1.0.ts
+var AbiParser1 = class {
+  constructor(abi) {
+    this.abi = abi;
+  }
+  /**
+   * abi method inputs length without '_len' inputs
+   * cairo 0 reducer
+   * @param abiMethod FunctionAbi
+   * @returns number
+   */
+  methodInputsLength(abiMethod) {
+    return abiMethod.inputs.reduce((acc, input) => !isLen(input.name) ? acc + 1 : acc, 0);
+  }
+  /**
+   * get method definition from abi
+   * @param name string
+   * @returns FunctionAbi | undefined
+   */
+  getMethod(name) {
+    return this.abi.find((it) => it.name === name);
+  }
+  /**
+   * Get Abi in legacy format
+   * @returns Abi
+   */
+  getLegacyFormat() {
+    return this.abi;
+  }
+};
+
+// src/utils/calldata/parser/parser-2.0.0.ts
+var AbiParser2 = class {
+  constructor(abi) {
+    this.abi = abi;
+  }
+  /**
+   * abi method inputs length
+   * @param abiMethod FunctionAbi
+   * @returns number
+   */
+  methodInputsLength(abiMethod) {
+    return abiMethod.inputs.length;
+  }
+  /**
+   * get method definition from abi
+   * @param name string
+   * @returns FunctionAbi | undefined
+   */
+  getMethod(name) {
+    const intf = this.abi.find((it) => it.type === "interface");
+    return intf.items.find((it) => it.name === name);
+  }
+  /**
+   * Get Abi in legacy format
+   * @returns Abi
+   */
+  getLegacyFormat() {
+    return this.abi.flatMap((e) => {
+      if (e.type === "interface") {
+        return e.items;
+      }
+      return e;
+    });
+  }
+};
+
+// src/utils/calldata/parser/index.ts
+function createAbiParser(abi) {
+  const version = getAbiVersion(abi);
+  if (version === 0 || version === 1) {
+    return new AbiParser1(abi);
+  }
+  if (version === 2) {
+    return new AbiParser2(abi);
+  }
+  throw Error(`Unsupported ABI version ${version}`);
+}
+function getAbiVersion(abi) {
+  if (abi.find((it) => it.type === "interface"))
+    return 2;
+  if (isCairo1Abi(abi))
+    return 1;
+  return 0;
+}
+
 // src/utils/calldata/tuple.ts
 function parseNamedTuple(namedTuple) {
   const name = namedTuple.substring(0, namedTuple.indexOf(":"));
@@ -2924,6 +3013,14 @@ function parseTuple(element, typeStr) {
     };
   });
 }
+function parseUint256(element) {
+  if (typeof element === "object") {
+    const { low, high } = element;
+    return [felt(low), felt(high)];
+  }
+  const el_uint256 = uint256(element);
+  return [felt(el_uint256.low), felt(el_uint256.high)];
+}
 function parseCalldataValue(element, type, structs) {
   if (element === void 0) {
     throw Error(`Missing parameter for type ${type}`);
@@ -2937,6 +3034,9 @@ function parseCalldataValue(element, type, structs) {
     }, result);
   }
   if (structs[type] && structs[type].members.length) {
+    if (isTypeUint256(type)) {
+      return parseUint256(element);
+    }
     const { members } = structs[type];
     const subElement = element;
     return members.reduce((acc, it) => {
@@ -2951,12 +3051,7 @@ function parseCalldataValue(element, type, structs) {
     }, []);
   }
   if (isTypeUint256(type)) {
-    if (typeof element === "object") {
-      const { low, high } = element;
-      return [felt(low), felt(high)];
-    }
-    const el_uint256 = uint256(element);
-    return [felt(el_uint256.low), felt(el_uint256.high)];
+    return parseUint256(element);
   }
   if (typeof element === "object") {
     throw Error(`Parameter ${element} do not align with abi parameter ${type}`);
@@ -2999,6 +3094,11 @@ function parseBaseTypes2(type, it) {
   }
 }
 function parseResponseValue(responseIterator, element, structs) {
+  if (isTypeUint256(element.type)) {
+    const low = responseIterator.next().value;
+    const high = responseIterator.next().value;
+    return uint256ToBN({ low, high });
+  }
   if (element.type in structs && structs[element.type]) {
     return structs[element.type].members.reduce((acc, el) => {
       acc[el.name] = parseResponseValue(responseIterator, el, structs);
@@ -3125,6 +3225,10 @@ var validateBool = (parameter, input) => {
   );
 };
 var validateStruct = (parameter, input, structs) => {
+  if (input.type === "core::integer::u256" /* u256 */) {
+    validateUint(parameter, input);
+    return;
+  }
   assert(
     typeof parameter === "object" && !Array.isArray(parameter),
     `Validate: arg ${input.name} is cairo type struct (${input.type}), and should be defined as js object (not array)`
@@ -3214,8 +3318,9 @@ function validateFields(abiMethod, args, structs) {
 // src/utils/calldata/index.ts
 var CallData = class {
   constructor(abi) {
-    this.abi = abi;
     this.structs = CallData.getAbiStruct(abi);
+    this.parser = createAbiParser(abi);
+    this.abi = this.parser.getLegacyFormat();
   }
   /**
    * Validate arguments passed to the method as corresponding to the ones in the abi
@@ -3237,9 +3342,9 @@ var CallData = class {
       );
     }
     const abiMethod = this.abi.find(
-      (abi) => type === "DEPLOY" /* DEPLOY */ ? abi.name === method && abi.type === method : abi.name === method && abi.type === "function"
+      (abi) => type === "DEPLOY" /* DEPLOY */ ? abi.name === method && abi.type === "constructor" : abi.name === method && abi.type === "function"
     );
-    const inputsLength = CallData.abiInputsLength(abiMethod.inputs);
+    const inputsLength = this.parser.methodInputsLength(abiMethod);
     if (args.length !== inputsLength) {
       throw Error(
         `Invalid number of arguments, expected ${inputsLength} arguments, but got ${args.length}`
@@ -3346,14 +3451,6 @@ var CallData = class {
     const parsed = this.parse(method, response);
     return formatter(parsed, format);
   }
-  /**
-   * Helper to calculate inputs from abi
-   * @param inputs AbiEntry
-   * @returns number
-   */
-  static abiInputsLength(inputs) {
-    return inputs.reduce((acc, input) => !isLen(input.name) ? acc + 1 : acc, 0);
-  }
   /**
    * Helper to extract structs from abi
    * @param abi Abi
@@ -3471,12 +3568,12 @@ function calculateTransactionHashCommon(txHashPrefix, version, contractAddress,
   ];
   return computeHashOnElements(dataToHash);
 }
-function calculateDeployTransactionHash(contractAddress, constructorCalldata, version, chainId) {
+function calculateDeployTransactionHash(contractAddress, constructorCalldata, version, chainId, constructorName = "constructor") {
   return calculateTransactionHashCommon(
     "0x6465706c6f79" /* DEPLOY */,
     version,
     contractAddress,
-    getSelectorFromName("constructor"),
+    getSelectorFromName(constructorName),
     constructorCalldata,
     0,
     chainId
@@ -6182,7 +6279,8 @@ var Contract = class {
     this.providerOrAccount = providerOrAccount;
     this.callData = new CallData(abi);
     this.structs = CallData.getAbiStruct(abi);
-    this.abi = abi;
+    const parser = createAbiParser(abi);
+    this.abi = parser.getLegacyFormat();
     const options = { enumerable: true, value: {}, writable: false };
     Object.defineProperties(this, {
       functions: { enumerable: true, value: {}, writable: false },