starknet 4.16.0 → 4.17.0

package/index.js

@@ -62,8 +62,7 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 
 // src/contract/default.ts
-var import_bn3 = __toESM(require("bn.js"));
-var import_minimalistic_assert4 = __toESM(require("minimalistic-assert"));
+var import_minimalistic_assert5 = __toESM(require("minimalistic-assert"));
 
 // src/utils/fetchPonyfill.ts
 var import_isomorphic_fetch = __toESM(require("isomorphic-fetch"));
@@ -3524,6 +3523,187 @@ var ProviderInterface = class {
 // src/provider/index.ts
 var defaultProvider = new Provider();
 
+// src/utils/calldata.ts
+var import_bn3 = __toESM(require("bn.js"));
+var import_minimalistic_assert4 = __toESM(require("minimalistic-assert"));
+var CheckCallData = class {
+  constructor(abi) {
+    this.abi = abi;
+    this.structs = abi.filter((abiEntry) => abiEntry.type === "struct").reduce(
+      (acc, abiEntry) => ({
+        ...acc,
+        [abiEntry.name]: abiEntry
+      }),
+      {}
+    );
+  }
+  compileCalldata(args, inputs) {
+    const argsIterator = args[Symbol.iterator]();
+    return inputs.reduce((acc, input) => {
+      if (/_len$/.test(input.name)) {
+        return acc;
+      }
+      const parsedData = this.parseCalldataField(argsIterator, input);
+      if (Array.isArray(parsedData)) {
+        acc.push(...parsedData);
+      } else {
+        acc.push(parsedData);
+      }
+      return acc;
+    }, []);
+  }
+  validateMethodAndArgs(type, method, args = []) {
+    if (type !== "DEPLOY") {
+      const invocableFunctionNames = this.abi.filter((abi) => {
+        if (abi.type !== "function")
+          return false;
+        const isView = abi.stateMutability === "view";
+        return type === "INVOKE" ? !isView : isView;
+      }).map((abi) => abi.name);
+      (0, import_minimalistic_assert4.default)(
+        invocableFunctionNames.includes(method),
+        `${type === "INVOKE" ? "invocable" : "viewable"} method not found in abi`
+      );
+    }
+    const methodAbi = this.abi.find(
+      (abi) => type === "DEPLOY" ? abi.name === method && abi.type === method : abi.name === method && abi.type === "function"
+    );
+    let argPosition = 0;
+    methodAbi.inputs.forEach((input) => {
+      if (/_len$/.test(input.name)) {
+        return;
+      }
+      if (input.type === "felt") {
+        (0, import_minimalistic_assert4.default)(
+          typeof args[argPosition] === "string" || typeof args[argPosition] === "number" || args[argPosition] instanceof import_bn3.default,
+          `arg ${input.name} should be a felt (string, number, BigNumber)`
+        );
+        argPosition += 1;
+      } else if (input.type in this.structs && typeof args[argPosition] === "object") {
+        if (Array.isArray(args[argPosition])) {
+          const structMembersLength = this.calculateStructMembers(input.type);
+          (0, import_minimalistic_assert4.default)(
+            args[argPosition].length === structMembersLength,
+            `arg should be of length ${structMembersLength}`
+          );
+        } else {
+          this.structs[input.type].members.forEach(({ name }) => {
+            (0, import_minimalistic_assert4.default)(
+              Object.keys(args[argPosition]).includes(name),
+              `arg should have a property ${name}`
+            );
+          });
+        }
+        argPosition += 1;
+      } else {
+        (0, import_minimalistic_assert4.default)(Array.isArray(args[argPosition]), `arg ${input.name} should be an Array`);
+        if (input.type === "felt*") {
+          args[argPosition].forEach((felt) => {
+            (0, import_minimalistic_assert4.default)(
+              typeof felt === "string" || typeof felt === "number" || felt instanceof import_bn3.default,
+              `arg ${input.name} should be an array of string, number or BigNumber`
+            );
+          });
+          argPosition += 1;
+        } else if (/\(felt/.test(input.type)) {
+          const tupleLength = input.type.split(",").length;
+          (0, import_minimalistic_assert4.default)(
+            args[argPosition].length === tupleLength,
+            `arg ${input.name} should have ${tupleLength} elements in tuple`
+          );
+          args[argPosition].forEach((felt) => {
+            (0, import_minimalistic_assert4.default)(
+              typeof felt === "string" || typeof felt === "number" || felt instanceof import_bn3.default,
+              `arg ${input.name} should be an array of string, number or BigNumber`
+            );
+          });
+          argPosition += 1;
+        } else {
+          const arrayType = input.type.replace("*", "");
+          args[argPosition].forEach((struct) => {
+            this.structs[arrayType].members.forEach(({ name }) => {
+              if (Array.isArray(struct)) {
+                const structMembersLength = this.calculateStructMembers(arrayType);
+                (0, import_minimalistic_assert4.default)(
+                  struct.length === structMembersLength,
+                  `arg should be of length ${structMembersLength}`
+                );
+              } else {
+                (0, import_minimalistic_assert4.default)(
+                  Object.keys(struct).includes(name),
+                  `arg ${input.name} should be an array of ${arrayType}`
+                );
+              }
+            });
+          });
+          argPosition += 1;
+        }
+      }
+    });
+  }
+  parseCalldataField(argsIterator, input) {
+    const { name, type } = input;
+    const { value } = argsIterator.next();
+    const parsedCalldata = [];
+    switch (true) {
+      case /\*/.test(type):
+        if (Array.isArray(value)) {
+          parsedCalldata.push(toFelt(value.length));
+          return value.reduce((acc, el) => {
+            if (/felt/.test(type)) {
+              acc.push(toFelt(el));
+            } else {
+              acc.push(...this.parseCalldataValue(el, type.replace("*", "")));
+            }
+            return acc;
+          }, parsedCalldata);
+        }
+        throw Error(`Expected ${name} to be array`);
+      case type in this.structs:
+        return this.parseCalldataValue(value, type);
+      case /\(felt/.test(type):
+        if (Array.isArray(value)) {
+          return value.map((el) => toFelt(el));
+        }
+        throw Error(`Expected ${name} to be array`);
+      default:
+        return toFelt(value);
+    }
+  }
+  parseCalldataValue(element, type) {
+    if (element === void 0) {
+      throw Error("Missing element in calldata");
+    }
+    if (Array.isArray(element)) {
+      const structMemberNum = this.calculateStructMembers(type);
+      if (element.length !== structMemberNum) {
+        throw Error("Missing element in calldata");
+      }
+      return element.map((el) => toFelt(el));
+    }
+    if (this.structs[type] && this.structs[type].members.length) {
+      return this.structs[type].members.reduce((acc, member) => {
+        const parsedData = this.parseCalldataValue(element[member.name], member.type);
+        if (typeof parsedData === "string") {
+          acc.push(parsedData);
+        } else {
+          acc.push(...parsedData);
+        }
+        return acc;
+      }, []);
+    }
+    return toFelt(element);
+  }
+  calculateStructMembers(struct) {
+    return this.structs[struct].members.reduce((acc, member) => {
+      if (member.type === "felt") {
+        return acc + 1;
+      }
+      return acc + this.calculateStructMembers(member.type);
+    }, 0);
+  }
+};
+
 // src/contract/default.ts
 function parseFelt(candidate) {
   try {
@@ -3587,6 +3767,7 @@ var Contract = class {
       }),
       {}
     );
+    this.checkCalldata = new CheckCallData(abi);
     Object.defineProperty(this, "functions", {
       enumerable: true,
       value: {},
@@ -3664,10 +3845,10 @@ var Contract = class {
   }
   async call(method, args = [], options = {}) {
     const blockIdentifier = (options == null ? void 0 : options.blockIdentifier) || void 0;
-    (0, import_minimalistic_assert4.default)(this.address !== null, "contract is not connected to an address");
-    this.validateMethodAndArgs("CALL", method, args);
+    (0, import_minimalistic_assert5.default)(this.address !== null, "contract is not connected to an address");
+    this.checkCalldata.validateMethodAndArgs("CALL", method, args);
     const { inputs } = this.abi.find((abi) => abi.name === method);
-    const calldata = this.compileCalldata(args, inputs);
+    const calldata = this.checkCalldata.compileCalldata(args, inputs);
     return this.providerOrAccount.callContract(
       {
         contractAddress: this.address,
@@ -3678,8 +3859,8 @@ var Contract = class {
     ).then((x) => this.parseResponse(method, x.result));
   }
   invoke(method, args = [], options = {}) {
-    (0, import_minimalistic_assert4.default)(this.address !== null, "contract is not connected to an address");
-    this.validateMethodAndArgs("INVOKE", method, args);
+    (0, import_minimalistic_assert5.default)(this.address !== null, "contract is not connected to an address");
+    this.checkCalldata.validateMethodAndArgs("INVOKE", method, args);
     const { inputs } = this.abi.find((abi) => abi.name === method);
     const inputsLength = inputs.reduce((acc, input) => {
       if (!/_len$/.test(input.name)) {
@@ -3692,7 +3873,7 @@ var Contract = class {
         `Invalid number of arguments, expected ${inputsLength} arguments, but got ${args.length}`
       );
     }
-    const calldata = this.compileCalldata(args, inputs);
+    const calldata = this.checkCalldata.compileCalldata(args, inputs);
     const invocation = {
       contractAddress: this.address,
       calldata,
@@ -3719,8 +3900,8 @@ var Contract = class {
     );
   }
   async estimate(method, args = []) {
-    (0, import_minimalistic_assert4.default)(this.address !== null, "contract is not connected to an address");
-    this.validateMethodAndArgs("INVOKE", method, args);
+    (0, import_minimalistic_assert5.default)(this.address !== null, "contract is not connected to an address");
+    this.checkCalldata.validateMethodAndArgs("INVOKE", method, args);
     const invocation = this.populateTransaction[method](...args);
     if ("estimateInvokeFee" in this.providerOrAccount) {
       return this.providerOrAccount.estimateInvokeFee(invocation);
@@ -3732,128 +3913,9 @@ var Contract = class {
     return {
       contractAddress: this.address,
       entrypoint: method,
-      calldata: this.compileCalldata(args, inputs)
+      calldata: this.checkCalldata.compileCalldata(args, inputs)
     };
   }
-  calculateStructMembers(struct) {
-    return this.structs[struct].members.reduce((acc, member) => {
-      if (member.type === "felt") {
-        return acc + 1;
-      }
-      return acc + this.calculateStructMembers(member.type);
-    }, 0);
-  }
-  validateMethodAndArgs(type, method, args = []) {
-    const invocableFunctionNames = this.abi.filter((abi) => {
-      if (abi.type !== "function")
-        return false;
-      const isView = abi.stateMutability === "view";
-      return type === "INVOKE" ? !isView : isView;
-    }).map((abi) => abi.name);
-    (0, import_minimalistic_assert4.default)(
-      invocableFunctionNames.includes(method),
-      `${type === "INVOKE" ? "invocable" : "viewable"} method not found in abi`
-    );
-    const methodAbi = this.abi.find(
-      (abi) => abi.name === method && abi.type === "function"
-    );
-    let argPosition = 0;
-    methodAbi.inputs.forEach((input) => {
-      if (/_len$/.test(input.name)) {
-        return;
-      }
-      if (input.type === "felt") {
-        (0, import_minimalistic_assert4.default)(
-          typeof args[argPosition] === "string" || typeof args[argPosition] === "number" || args[argPosition] instanceof import_bn3.default,
-          `arg ${input.name} should be a felt (string, number, BigNumber)`
-        );
-        argPosition += 1;
-      } else if (input.type in this.structs && typeof args[argPosition] === "object") {
-        if (Array.isArray(args[argPosition])) {
-          const structMembersLength = this.calculateStructMembers(input.type);
-          (0, import_minimalistic_assert4.default)(
-            args[argPosition].length === structMembersLength,
-            `arg should be of length ${structMembersLength}`
-          );
-        } else {
-          this.structs[input.type].members.forEach(({ name }) => {
-            (0, import_minimalistic_assert4.default)(
-              Object.keys(args[argPosition]).includes(name),
-              `arg should have a property ${name}`
-            );
-          });
-        }
-        argPosition += 1;
-      } else {
-        (0, import_minimalistic_assert4.default)(Array.isArray(args[argPosition]), `arg ${input.name} should be an Array`);
-        if (input.type === "felt*") {
-          args[argPosition].forEach((felt) => {
-            (0, import_minimalistic_assert4.default)(
-              typeof felt === "string" || typeof felt === "number" || felt instanceof import_bn3.default,
-              `arg ${input.name} should be an array of string, number or BigNumber`
-            );
-          });
-          argPosition += 1;
-        } else if (/\(felt/.test(input.type)) {
-          const tupleLength = input.type.split(",").length;
-          (0, import_minimalistic_assert4.default)(
-            args[argPosition].length === tupleLength,
-            `arg ${input.name} should have ${tupleLength} elements in tuple`
-          );
-          args[argPosition].forEach((felt) => {
-            (0, import_minimalistic_assert4.default)(
-              typeof felt === "string" || typeof felt === "number" || felt instanceof import_bn3.default,
-              `arg ${input.name} should be an array of string, number or BigNumber`
-            );
-          });
-          argPosition += 1;
-        } else {
-          const arrayType = input.type.replace("*", "");
-          args[argPosition].forEach((struct) => {
-            this.structs[arrayType].members.forEach(({ name }) => {
-              if (Array.isArray(struct)) {
-                const structMembersLength = this.calculateStructMembers(arrayType);
-                (0, import_minimalistic_assert4.default)(
-                  struct.length === structMembersLength,
-                  `arg should be of length ${structMembersLength}`
-                );
-              } else {
-                (0, import_minimalistic_assert4.default)(
-                  Object.keys(struct).includes(name),
-                  `arg ${input.name} should be an array of ${arrayType}`
-                );
-              }
-            });
-          });
-          argPosition += 1;
-        }
-      }
-    });
-  }
-  parseCalldataValue(element, type) {
-    if (element === void 0) {
-      throw Error("Missing element in calldata");
-    }
-    if (Array.isArray(element)) {
-      const structMemberNum = this.calculateStructMembers(type);
-      if (element.length !== structMemberNum) {
-        throw Error("Missing element in calldata");
-      }
-      return element.map((el) => toFelt(el));
-    }
-    if (this.structs[type] && this.structs[type].members.length) {
-      return this.structs[type].members.reduce((acc, member) => {
-        const parsedData = this.parseCalldataValue(element[member.name], member.type);
-        if (typeof parsedData === "string") {
-          acc.push(parsedData);
-        } else {
-          acc.push(...parsedData);
-        }
-        return acc;
-      }, []);
-    }
-    return toFelt(element);
-  }
   parseResponseStruct(responseIterator, type) {
     if (type in this.structs && this.structs[type]) {
       return this.structs[type].members.reduce((acc, el) => {
@@ -3863,50 +3925,6 @@ var Contract = class {
     }
     return parseFelt(responseIterator.next().value);
   }
-  parseCalldataField(argsIterator, input) {
-    const { name, type } = input;
-    const { value } = argsIterator.next();
-    const parsedCalldata = [];
-    switch (true) {
-      case /\*/.test(type):
-        if (Array.isArray(value)) {
-          parsedCalldata.push(toFelt(value.length));
-          return value.reduce((acc, el) => {
-            if (/felt/.test(type)) {
-              acc.push(toFelt(el));
-            } else {
-              acc.push(...this.parseCalldataValue(el, type.replace("*", "")));
-            }
-            return acc;
-          }, parsedCalldata);
-        }
-        throw Error(`Expected ${name} to be array`);
-      case type in this.structs:
-        return this.parseCalldataValue(value, type);
-      case /\(felt/.test(type):
-        if (Array.isArray(value)) {
-          return value.map((el) => toFelt(el));
-        }
-        throw Error(`Expected ${name} to be array`);
-      default:
-        return toFelt(value);
-    }
-  }
-  compileCalldata(args, inputs) {
-    const argsIterator = args[Symbol.iterator]();
-    return inputs.reduce((acc, input) => {
-      if (/_len$/.test(input.name)) {
-        return acc;
-      }
-      const parsedData = this.parseCalldataField(argsIterator, input);
-      if (Array.isArray(parsedData)) {
-        acc.push(...parsedData);
-      } else {
-        acc.push(parsedData);
-      }
-      return acc;
-    }, []);
-  }
   parseResponseField(responseIterator, output, parsedResult) {
     const { name, type } = output;
     const parsedDataArr = [];
@@ -3957,15 +3975,19 @@ var ContractInterface = class {
 };
 
 // src/contract/contractFactory.ts
-var import_minimalistic_assert5 = __toESM(require("minimalistic-assert"));
+var import_minimalistic_assert6 = __toESM(require("minimalistic-assert"));
 var ContractFactory = class {
   constructor(compiledContract, classHash, account, abi = compiledContract.abi) {
     this.abi = abi;
     this.compiledContract = compiledContract;
     this.account = account;
     this.classHash = classHash;
+    this.checkCalldata = new CheckCallData(abi);
   }
-  async deploy(constructorCalldata, addressSalt) {
+  async deploy(args = [], addressSalt) {
+    this.checkCalldata.validateMethodAndArgs("DEPLOY", "constructor", args);
+    const { inputs } = this.abi.find((abi) => abi.type === "constructor");
+    const constructorCalldata = this.checkCalldata.compileCalldata(args, inputs);
     const {
       deploy: { contract_address, transaction_hash }
     } = await this.account.declareDeploy({
@@ -3974,7 +3996,7 @@ var ContractFactory = class {
       constructorCalldata,
       salt: addressSalt
     });
-    (0, import_minimalistic_assert5.default)(Boolean(contract_address), "Deployment of the contract failed");
+    (0, import_minimalistic_assert6.default)(Boolean(contract_address), "Deployment of the contract failed");
     const contractInstance = new Contract(
       this.compiledContract.abi,
       contract_address,