starknet 5.3.0 → 5.4.1

package/dist/index.mjs

@@ -2444,24 +2444,22 @@ import * as weierstrass from "@noble/curves/abstract/weierstrass";
 // src/utils/json.ts
 var json_exports = {};
 __export(json_exports, {
-  default: () => json_default,
-  parse: () => parse,
+  parse: () => parse2,
   parseAlwaysAsBig: () => parseAlwaysAsBig,
-  stringify: () => stringify,
+  stringify: () => stringify2,
   stringifyAlwaysAsBig: () => stringifyAlwaysAsBig
 });
-import Json from "json-bigint";
-var json = (alwaysParseAsBig) => {
-  return Json({
-    alwaysParseAsBig,
-    useNativeBigInt: true,
-    protoAction: "preserve",
-    constructorAction: "preserve"
-  });
+import * as json from "lossless-json";
+var parseIntAsNumberOrBigInt = (x) => {
+  if (!json.isInteger(x))
+    return parseFloat(x);
+  const v = parseInt(x, 10);
+  return Number.isSafeInteger(v) ? v : BigInt(x);
 };
-var { parse, stringify } = json(false);
-var { parse: parseAlwaysAsBig, stringify: stringifyAlwaysAsBig } = json(true);
-var json_default = { parse, stringify };
+var parse2 = (x) => json.parse(String(x), null, parseIntAsNumberOrBigInt);
+var parseAlwaysAsBig = (x) => json.parse(String(x), null, json.parseNumberAndBigInt);
+var stringify2 = (...p) => json.stringify(...p);
+var stringifyAlwaysAsBig = stringify2;
 
 // src/utils/hash.ts
 import * as poseidon from "@noble/curves/abstract/poseidon";
@@ -2595,11 +2593,11 @@ function formatSpaces(json2) {
 function computeHintedClassHash(compiledContract) {
   const { abi, program } = compiledContract;
   const contractClass = { abi, program };
-  const serializedJson = formatSpaces(stringify(contractClass, nullSkipReplacer));
+  const serializedJson = formatSpaces(stringify2(contractClass, nullSkipReplacer));
   return addHexPrefix(starkCurve.keccak(utf8ToArray(serializedJson)).toString(16));
 }
 function computeLegacyContractClassHash(contract) {
-  const compiledContract = typeof contract === "string" ? parse(contract) : contract;
+  const compiledContract = typeof contract === "string" ? parse2(contract) : contract;
   const apiVersion = toHex(API_VERSION);
   const externalEntryPointsHash = computeHashOnElements(
     compiledContract.entry_points_by_type.EXTERNAL.flatMap((e) => [e.selector, e.offset])
@@ -2662,7 +2660,7 @@ function hashEntryPointSierra(data) {
   return poseidonHashMany(base);
 }
 function hashAbi(sierra) {
-  const indentString = formatSpaces(stringify(sierra.abi, null));
+  const indentString = formatSpaces(stringify2(sierra.abi, null));
   return BigInt(addHexPrefix(starkCurve.keccak(utf8ToArray(indentString)).toString(16)));
 }
 function computeSierraContractClassHash(sierra) {
@@ -2685,7 +2683,7 @@ function computeSierraContractClassHash(sierra) {
   );
 }
 function computeContractClassHash(contract) {
-  const compiledContract = typeof contract === "string" ? parse(contract) : contract;
+  const compiledContract = typeof contract === "string" ? parse2(contract) : contract;
   if ("sierra_program" in compiledContract) {
     return computeSierraContractClassHash(compiledContract);
   }
@@ -2693,7 +2691,6 @@ function computeContractClassHash(contract) {
 }
 
 // src/utils/contract.ts
-import { parse as parse2 } from "json-bigint";
 function isSierra(contract) {
   const compiledContract = typeof contract === "string" ? parse2(contract) : contract;
   return "sierra_program" in compiledContract;
@@ -2723,15 +2720,14 @@ __export(stark_exports, {
   estimatedFeeToMaxFee: () => estimatedFeeToMaxFee,
   formatSignature: () => formatSignature,
   makeAddress: () => makeAddress,
-  parseSignature: () => parseSignature,
   randomAddress: () => randomAddress,
   signatureToDecimalArray: () => signatureToDecimalArray,
   signatureToHexArray: () => signatureToHexArray
 });
-import { Signature, getStarkKey, utils } from "micro-starknet";
+import { getStarkKey, utils } from "micro-starknet";
 import { gzip } from "pako";
 function compressProgram(jsonProgram) {
-  const stringified = typeof jsonProgram === "string" ? jsonProgram : stringify(jsonProgram);
+  const stringified = typeof jsonProgram === "string" ? jsonProgram : stringify2(jsonProgram);
   const compressedProgram = gzip(stringified);
   return btoaUniversal(compressedProgram);
 }
@@ -2744,12 +2740,15 @@ function makeAddress(input) {
 }
 function formatSignature(sig) {
   if (!sig)
-    return [];
+    throw Error("formatSignature: provided signature is undefined");
+  if (Array.isArray(sig)) {
+    return sig.map((it) => toHex(it));
+  }
   try {
     const { r, s } = sig;
     return [toHex(r), toHex(s)];
   } catch (e) {
-    return [];
+    throw new Error("Signature need to be weierstrass.SignatureType or an array for custom");
   }
 }
 function signatureToDecimalArray(sig) {
@@ -2758,12 +2757,6 @@ function signatureToDecimalArray(sig) {
 function signatureToHexArray(sig) {
   return bigNumberishArrayToHexadecimalStringArray(formatSignature(sig));
 }
-function parseSignature(sig) {
-  if (!sig)
-    return void 0;
-  const [r, s] = sig;
-  return new Signature(toBigInt(r), toBigInt(s));
-}
 function compileCalldata(args) {
   const compiledData = Object.values(args).flatMap((value) => {
     if (Array.isArray(value))
@@ -2801,13 +2794,13 @@ function parseCalldata(calldata = []) {
 function createSierraContractClass(contract) {
   const result = { ...contract };
   delete result.sierra_program_debug_info;
-  result.abi = formatSpaces(stringify(contract.abi));
-  result.sierra_program = formatSpaces(stringify(contract.sierra_program));
+  result.abi = formatSpaces(stringify2(contract.abi));
+  result.sierra_program = formatSpaces(stringify2(contract.sierra_program));
   result.sierra_program = compressProgram(result.sierra_program);
   return result;
 }
 function parseContract(contract) {
-  const parsedContract = typeof contract === "string" ? parse(contract) : contract;
+  const parsedContract = typeof contract === "string" ? parse2(contract) : contract;
   if (!isSierra(contract)) {
     return {
       ...parsedContract,
@@ -2857,7 +2850,7 @@ var RPCResponseParser = class {
 };
 
 // src/provider/errors.ts
-import { CustomError } from "ts-custom-error";
+import { CustomError } from "ts-custom-error/dist/custom-error";
 var LibraryError = class extends CustomError {
 };
 var GatewayError = class extends LibraryError {
@@ -3079,7 +3072,7 @@ var RpcProvider = class {
   fetch(method, params) {
     return fetchPonyfill_default(this.nodeUrl, {
       method: "POST",
-      body: stringify({ method, jsonrpc: "2.0", params, id: 0 }),
+      body: stringify2({ method, jsonrpc: "2.0", params, id: 0 }),
       headers: this.headers
     });
   }
@@ -3398,7 +3391,7 @@ var SequencerAPIResponseParser = class extends ResponseParser {
       max_fee: "max_fee" in res.transaction ? res.transaction.max_fee : void 0,
       nonce: res.transaction.nonce,
       sender_address: "sender_address" in res.transaction ? res.transaction.sender_address : void 0,
-      signature: "signature" in res.transaction ? parseSignature(res.transaction.signature) : void 0,
+      signature: "signature" in res.transaction ? res.transaction.signature : void 0,
       transaction_hash: "transaction_hash" in res.transaction ? res.transaction.transaction_hash : void 0,
       version: "version" in res.transaction ? res.transaction.version : void 0
     };
@@ -3666,20 +3659,20 @@ var SequencerProvider = class {
     try {
       const response = await fetchPonyfill_default(url, {
         method,
-        body: stringify(options == null ? void 0 : options.body),
+        body: stringify2(options == null ? void 0 : options.body),
         headers
       });
       const textResponse = await response.text();
       if (!response.ok) {
         let responseBody;
         try {
-          responseBody = parse(textResponse);
+          responseBody = parse2(textResponse);
         } catch {
           throw new HttpError(response.statusText, response.status);
         }
         throw new GatewayError(responseBody.message, responseBody.code);
       }
-      const parseChoice = (options == null ? void 0 : options.parseAlwaysAsBigInt) ? parseAlwaysAsBig : parse;
+      const parseChoice = (options == null ? void 0 : options.parseAlwaysAsBigInt) ? parseAlwaysAsBig : parse2;
       return parseChoice(textResponse);
     } catch (error) {
       if (error instanceof Error && !(error instanceof LibraryError))
@@ -4748,7 +4741,10 @@ var transaction_exports = {};
 __export(transaction_exports, {
   fromCallsToExecuteCalldata: () => fromCallsToExecuteCalldata,
   fromCallsToExecuteCalldataWithNonce: () => fromCallsToExecuteCalldataWithNonce,
-  transformCallsToMulticallArrays: () => transformCallsToMulticallArrays
+  fromCallsToExecuteCalldata_cairo1: () => fromCallsToExecuteCalldata_cairo1,
+  getExecuteCalldata: () => getExecuteCalldata,
+  transformCallsToMulticallArrays: () => transformCallsToMulticallArrays,
+  transformCallsToMulticallArrays_cairo1: () => transformCallsToMulticallArrays_cairo1
 });
 var transformCallsToMulticallArrays = (calls) => {
   const callArray = [];
@@ -4782,6 +4778,27 @@ var fromCallsToExecuteCalldata = (calls) => {
 var fromCallsToExecuteCalldataWithNonce = (calls, nonce) => {
   return [...fromCallsToExecuteCalldata(calls), toBigInt(nonce).toString()];
 };
+var transformCallsToMulticallArrays_cairo1 = (calls) => {
+  const callArray = calls.map((call) => ({
+    to: toBigInt(call.contractAddress).toString(10),
+    selector: toBigInt(getSelectorFromName(call.entrypoint)).toString(10),
+    calldata: bigNumberishArrayToDecimalStringArray(call.calldata || [])
+  }));
+  return callArray;
+};
+var fromCallsToExecuteCalldata_cairo1 = (calls) => {
+  const callArray = transformCallsToMulticallArrays_cairo1(calls);
+  return [
+    callArray.length.toString(),
+    ...callArray.map(({ to, selector, calldata }) => [to, selector, calldata.length.toString(), ...calldata]).flat()
+  ];
+};
+var getExecuteCalldata = (calls, cairoVersion = "0") => {
+  if (cairoVersion === "1") {
+    return fromCallsToExecuteCalldata_cairo1(calls);
+  }
+  return fromCallsToExecuteCalldata(calls);
+};
 
 // src/utils/typedData/index.ts
 var typedData_exports = {};
@@ -5008,7 +5025,7 @@ var Signer = class {
     if (abis && abis.length !== transactions.length) {
       throw new Error("ABI must be provided for each transaction or no transaction");
     }
-    const calldata = fromCallsToExecuteCalldata(transactions);
+    const calldata = getExecuteCalldata(transactions, transactionsDetail.cairoVersion);
     const msgHash = calculateTransactionHash(
       transactionsDetail.walletAddress,
       transactionsDetail.version,
@@ -5099,7 +5116,7 @@ var Account = class extends Provider {
   async estimateFee(calls, estimateFeeDetails) {
     return this.estimateInvokeFee(calls, estimateFeeDetails);
   }
-  async estimateInvokeFee(calls, { nonce: providedNonce, blockIdentifier, skipValidate } = {}) {
+  async estimateInvokeFee(calls, { nonce: providedNonce, blockIdentifier, skipValidate, cairoVersion } = {}) {
     const transactions = Array.isArray(calls) ? calls : [calls];
     const nonce = toBigInt(providedNonce ?? await this.getNonce());
     const version = toBigInt(feeTransactionVersion);
@@ -5109,7 +5126,8 @@ var Account = class extends Provider {
       nonce,
       maxFee: ZERO,
       version,
-      chainId
+      chainId,
+      cairoVersion: cairoVersion ?? "0"
     };
     const invocation = await this.buildInvocation(transactions, signerDetails);
     const response = await super.getInvokeEstimateFee(
@@ -5124,13 +5142,20 @@ var Account = class extends Provider {
       suggestedMaxFee
     };
   }
-  async estimateDeclareFee({ contract, classHash: providedClassHash, casm, compiledClassHash }, { blockIdentifier, nonce: providedNonce, skipValidate } = {}) {
+  async estimateDeclareFee({ contract, classHash: providedClassHash, casm, compiledClassHash }, { blockIdentifier, nonce: providedNonce, skipValidate, cairoVersion } = {}) {
     const nonce = toBigInt(providedNonce ?? await this.getNonce());
     const version = !isSierra(contract) ? toBigInt(feeTransactionVersion) : transactionVersion_2;
     const chainId = await this.getChainId();
     const declareContractTransaction = await this.buildDeclarePayload(
       { classHash: providedClassHash, contract, casm, compiledClassHash },
-      { nonce, chainId, version, walletAddress: this.address, maxFee: ZERO }
+      {
+        nonce,
+        chainId,
+        version,
+        walletAddress: this.address,
+        maxFee: ZERO,
+        cairoVersion: cairoVersion ?? "0"
+      }
     );
     const response = await super.getDeclareEstimateFee(
       declareContractTransaction,
@@ -5149,13 +5174,20 @@ var Account = class extends Provider {
     addressSalt = 0,
     constructorCalldata = [],
     contractAddress: providedContractAddress
-  }, { blockIdentifier, skipValidate } = {}) {
+  }, { blockIdentifier, skipValidate, cairoVersion } = {}) {
     const version = toBigInt(feeTransactionVersion);
     const nonce = ZERO;
     const chainId = await this.getChainId();
     const payload = await this.buildAccountDeployPayload(
       { classHash, addressSalt, constructorCalldata, contractAddress: providedContractAddress },
-      { nonce, chainId, version, walletAddress: this.address, maxFee: ZERO }
+      {
+        nonce,
+        chainId,
+        version,
+        walletAddress: this.address,
+        maxFee: ZERO,
+        cairoVersion: cairoVersion ?? "0"
+      }
     );
     const response = await super.getDeployAccountEstimateFee(
       { ...payload },
@@ -5173,7 +5205,7 @@ var Account = class extends Provider {
     const calls = this.buildUDCContractPayload(payload);
     return this.estimateInvokeFee(calls, transactionsDetail);
   }
-  async estimateFeeBulk(transactions, { nonce: providedNonce, blockIdentifier } = {}) {
+  async estimateFeeBulk(transactions, { nonce: providedNonce, blockIdentifier, cairoVersion } = {}) {
     const nonce = toBigInt(providedNonce ?? await this.getNonce());
     const version = toBigInt(feeTransactionVersion);
     const chainId = await this.getChainId();
@@ -5184,7 +5216,8 @@ var Account = class extends Provider {
           nonce: toBigInt(Number(nonce) + index),
           maxFee: ZERO,
           version,
-          chainId
+          chainId,
+          cairoVersion: cairoVersion ?? "0"
         };
         const txPayload = transaction.payload;
         let res;
@@ -5242,7 +5275,7 @@ var Account = class extends Provider {
     });
   }
   async buildInvocation(call, signerDetails) {
-    const calldata = fromCallsToExecuteCalldata(call);
+    const calldata = getExecuteCalldata(call, signerDetails.cairoVersion);
     const signature = await this.signer.signTransaction(call, signerDetails);
     return {
       contractAddress: this.address,
@@ -5259,15 +5292,17 @@ var Account = class extends Provider {
     );
     const version = toBigInt(transactionVersion);
     const chainId = await this.getChainId();
+    const cairoVersion = transactionsDetail.cairoVersion ?? "0";
     const signerDetails = {
       walletAddress: this.address,
       nonce,
       maxFee,
       version,
-      chainId
+      chainId,
+      cairoVersion
     };
     const signature = await this.signer.signTransaction(transactions, signerDetails, abis);
-    const calldata = fromCallsToExecuteCalldata(transactions);
+    const calldata = getExecuteCalldata(transactions, cairoVersion);
     return this.invokeFunction(
       { contractAddress: this.address, calldata, signature },
       {
@@ -5292,7 +5327,8 @@ var Account = class extends Provider {
     details.chainId = await this.getChainId();
     const declareContractTransaction = await this.buildDeclarePayload(declareContractPayload, {
       ...details,
-      walletAddress: this.address
+      walletAddress: this.address,
+      cairoVersion: transactionsDetail.cairoVersion ?? "0"
     });
     return this.declareContract(declareContractTransaction, details);
   }
@@ -5402,7 +5438,7 @@ var Account = class extends Provider {
         entrypoint: "isValidSignature",
         calldata: compileCalldata({
           hash: toBigInt(hash).toString(),
-          signature: [toHex(signature.r), toHex(signature.s)]
+          signature: formatSignature(signature)
         })
       });
       return true;
@@ -5433,7 +5469,7 @@ var Account = class extends Provider {
         feeEstimate = { suggestedMaxFee: ZERO, overall_fee: ZERO };
         break;
     }
-    return feeEstimate.suggestedMaxFee.toString();
+    return feeEstimate.suggestedMaxFee;
   }
   async buildDeclarePayload(payload, { nonce, chainId, version, walletAddress, maxFee }) {
     const { classHash, contract, compiledClassHash } = extractContractHashes(payload);
@@ -5501,7 +5537,7 @@ var Account = class extends Provider {
     });
     return calls;
   }
-  async simulateTransaction(calls, { nonce: providedNonce, blockIdentifier, skipValidate } = {}) {
+  async simulateTransaction(calls, { nonce: providedNonce, blockIdentifier, skipValidate, cairoVersion } = {}) {
     const transactions = Array.isArray(calls) ? calls : [calls];
     const nonce = toBigInt(providedNonce ?? await this.getNonce());
     const version = toBigInt(feeTransactionVersion);
@@ -5511,7 +5547,8 @@ var Account = class extends Provider {
       nonce,
       maxFee: ZERO,
       version,
-      chainId
+      chainId,
+      cairoVersion: cairoVersion ?? "0"
     };
     const invocation = await this.buildInvocation(transactions, signerDetails);
     const response = await super.getSimulateTransaction(