starknet 6.6.6 → 6.7.0

package/dist/index.mjs

@@ -528,11 +528,9 @@ var BlockTag = /* @__PURE__ */ ((BlockTag2) => {
 })(BlockTag || {});
 
 // src/types/typedData.ts
-var TypedDataRevision = /* @__PURE__ */ ((TypedDataRevision2) => {
-  TypedDataRevision2["Active"] = "1";
-  TypedDataRevision2["Legacy"] = "0";
-  return TypedDataRevision2;
-})(TypedDataRevision || {});
+import {
+  TypedDataRevision
+} from "starknet-types";
 
 // src/utils/assert.ts
 function assert(condition, message) {
@@ -3175,6 +3173,23 @@ function contractClassResponseToLegacyCompiledContract(ccr) {
   return { ...contract, program: decompressProgram(contract.program) };
 }
 
+// src/utils/eth.ts
+var eth_exports = {};
+__export(eth_exports, {
+  ethRandomPrivateKey: () => ethRandomPrivateKey,
+  validateAndParseEthAddress: () => validateAndParseEthAddress
+});
+import { secp256k1 } from "@noble/curves/secp256k1";
+function ethRandomPrivateKey() {
+  return sanitizeHex(buf2hex(secp256k1.utils.randomPrivateKey()));
+}
+function validateAndParseEthAddress(address) {
+  assertInRange(address, ZERO, 2n ** 160n - 1n, "Ethereum Address ");
+  const result = addHexPrefix(removeHexPrefix(toHex(address)).padStart(40, "0"));
+  assert(result.match(/^(0x)?[0-9a-f]{40}$/), "Invalid Ethereum Address Format");
+  return result;
+}
+
 // src/utils/fetchPonyfill.ts
 import makeFetchCookie from "fetch-cookie";
 import isomorphicFetch from "isomorphic-fetch";
@@ -3853,7 +3868,7 @@ var RpcChannel = class {
   estimateMessageFee(message, blockIdentifier = this.blockIdentifier) {
     const { from_address, to_address, entry_point_selector, payload } = message;
     const formattedMessage = {
-      from_address: toHex(from_address),
+      from_address: validateAndParseEthAddress(from_address),
       to_address: toHex(to_address),
       entry_point_selector: getSelector(entry_point_selector),
       payload: getHexStringArray(payload)
@@ -3965,11 +3980,11 @@ var RpcChannel2 = class {
   requestId;
   blockIdentifier;
   chainId;
-  speckVersion;
+  specVersion;
   waitMode;
   // behave like web2 rpc and return when tx is processed
   constructor(optionsOrProvider) {
-    const { nodeUrl, retries, headers, blockIdentifier, chainId, waitMode } = optionsOrProvider || {};
+    const { nodeUrl, retries, headers, blockIdentifier, chainId, specVersion, waitMode } = optionsOrProvider || {};
     if (Object.values(NetworkName).includes(nodeUrl)) {
       this.nodeUrl = getDefaultNodeUrl(nodeUrl, optionsOrProvider?.default);
     } else if (nodeUrl) {
@@ -3981,6 +3996,7 @@ var RpcChannel2 = class {
     this.headers = { ...defaultOptions2.headers, ...headers };
     this.blockIdentifier = blockIdentifier || defaultOptions2.blockIdentifier;
     this.chainId = chainId;
+    this.specVersion = specVersion;
     this.waitMode = waitMode || false;
     this.requestId = 0;
   }
@@ -4032,8 +4048,8 @@ var RpcChannel2 = class {
     return this.chainId;
   }
   async getSpecVersion() {
-    this.speckVersion ??= await this.fetchEndpoint("starknet_specVersion");
-    return this.speckVersion;
+    this.specVersion ??= await this.fetchEndpoint("starknet_specVersion");
+    return this.specVersion;
   }
   getNonceForAddress(contractAddress, blockIdentifier = this.blockIdentifier) {
     const contract_address = toHex(contractAddress);
@@ -4390,7 +4406,7 @@ var RpcChannel2 = class {
   estimateMessageFee(message, blockIdentifier = this.blockIdentifier) {
     const { from_address, to_address, entry_point_selector, payload } = message;
     const formattedMessage = {
-      from_address: toHex(from_address),
+      from_address: validateAndParseEthAddress(from_address),
       to_address: toHex(to_address),
       entry_point_selector: getSelector(entry_point_selector),
       payload: getHexStringArray(payload)
@@ -4524,7 +4540,9 @@ var RPCResponseParser = class {
       gas_price: toBigInt(val.gas_price),
       unit: val.unit,
       suggestedMaxFee: this.estimatedFeeToMaxFee(val.overall_fee),
-      resourceBounds: this.estimateFeeToBounds(val)
+      resourceBounds: this.estimateFeeToBounds(val),
+      data_gas_consumed: val.data_gas_consumed ? toBigInt(val.data_gas_consumed) : 0n,
+      data_gas_price: val.data_gas_price ? toBigInt(val.data_gas_price) : 0n
     };
   }
   parseFeeEstimateBulkResponse(res) {
@@ -4534,7 +4552,9 @@ var RPCResponseParser = class {
       gas_price: toBigInt(val.gas_price),
       unit: val.unit,
       suggestedMaxFee: this.estimatedFeeToMaxFee(val.overall_fee),
-      resourceBounds: this.estimateFeeToBounds(val)
+      resourceBounds: this.estimateFeeToBounds(val),
+      data_gas_consumed: val.data_gas_consumed ? toBigInt(val.data_gas_consumed) : 0n,
+      data_gas_price: val.data_gas_price ? toBigInt(val.data_gas_price) : 0n
     }));
   }
   parseSimulateTransactionResponse(res) {
@@ -5404,14 +5424,14 @@ var presetTypes = {
   )
 };
 var revisionConfiguration = {
-  ["1" /* Active */]: {
+  [TypedDataRevision.Active]: {
     domain: "StarknetDomain",
     hashMethod: computePoseidonHashOnElements,
     hashMerkleMethod: computePoseidonHash,
     escapeTypeString: (s) => `"${s}"`,
     presetTypes
   },
-  ["0" /* Legacy */]: {
+  [TypedDataRevision.Legacy]: {
     domain: "StarkNetDomain",
     hashMethod: computePedersenHashOnElements,
     hashMerkleMethod: computePedersenHash,
@@ -5424,10 +5444,10 @@ function assertRange(data, type, { min, max }) {
   assert(value >= min && value <= max, `${value} (${type}) is out of bounds [${min}, ${max}]`);
 }
 function identifyRevision({ types, domain }) {
-  if (revisionConfiguration["1" /* Active */].domain in types && domain.revision === "1" /* Active */)
-    return "1" /* Active */;
-  if (revisionConfiguration["0" /* Legacy */].domain in types && (domain.revision ?? "0" /* Legacy */) === "0" /* Legacy */)
-    return "0" /* Legacy */;
+  if (revisionConfiguration[TypedDataRevision.Active].domain in types && domain.revision === TypedDataRevision.Active)
+    return TypedDataRevision.Active;
+  if (revisionConfiguration[TypedDataRevision.Legacy].domain in types && (domain.revision ?? TypedDataRevision.Legacy) === TypedDataRevision.Legacy)
+    return TypedDataRevision.Legacy;
   return void 0;
 }
 function getHex(value) {
@@ -5452,10 +5472,10 @@ function prepareSelector(selector) {
 function isMerkleTreeType(type) {
   return type.type === "merkletree";
 }
-function getDependencies(types, type, dependencies = [], contains = "", revision = "0" /* Legacy */) {
+function getDependencies(types, type, dependencies = [], contains = "", revision = TypedDataRevision.Legacy) {
   if (type[type.length - 1] === "*") {
     type = type.slice(0, -1);
-  } else if (revision === "1" /* Active */) {
+  } else if (revision === TypedDataRevision.Active) {
     if (type === "enum") {
       type = contains;
     } else if (type.match(/^\(.*\)$/)) {
@@ -5493,8 +5513,8 @@ function getMerkleTreeType(types, ctx) {
   }
   return "raw";
 }
-function encodeType(types, type, revision = "0" /* Legacy */) {
-  const allTypes = revision === "1" /* Active */ ? { ...types, ...revisionConfiguration[revision].presetTypes } : types;
+function encodeType(types, type, revision = TypedDataRevision.Legacy) {
+  const allTypes = revision === TypedDataRevision.Active ? { ...types, ...revisionConfiguration[revision].presetTypes } : types;
   const [primary, ...dependencies] = getDependencies(
     allTypes,
     type,
@@ -5506,17 +5526,17 @@ function encodeType(types, type, revision = "0" /* Legacy */) {
   const esc = revisionConfiguration[revision].escapeTypeString;
   return newTypes.map((dependency) => {
     const dependencyElements = allTypes[dependency].map((t) => {
-      const targetType = t.type === "enum" && revision === "1" /* Active */ ? t.contains : t.type;
+      const targetType = t.type === "enum" && revision === TypedDataRevision.Active ? t.contains : t.type;
       const typeString = targetType.match(/^\(.*\)$/) ? `(${targetType.slice(1, -1).split(",").map((e) => e ? esc(e) : e).join(",")})` : esc(targetType);
       return `${esc(t.name)}:${typeString}`;
     });
     return `${esc(dependency)}(${dependencyElements})`;
   }).join("");
 }
-function getTypeHash(types, type, revision = "0" /* Legacy */) {
+function getTypeHash(types, type, revision = TypedDataRevision.Legacy) {
   return getSelectorFromName(encodeType(types, type, revision));
 }
-function encodeValue(types, type, data, ctx = {}, revision = "0" /* Legacy */) {
+function encodeValue(types, type, data, ctx = {}, revision = TypedDataRevision.Legacy) {
   if (types[type]) {
     return [type, getStructHash(types, type, data, revision)];
   }
@@ -5539,7 +5559,7 @@ function encodeValue(types, type, data, ctx = {}, revision = "0" /* Legacy */) {
   }
   switch (type) {
     case "enum": {
-      if (revision === "1" /* Active */) {
+      if (revision === TypedDataRevision.Active) {
         const [variantKey, variantData] = Object.entries(data)[0];
         const parentType = types[ctx.parent][0];
         const enumType = types[parentType.contains];
@@ -5573,7 +5593,7 @@ function encodeValue(types, type, data, ctx = {}, revision = "0" /* Legacy */) {
       return ["felt", prepareSelector(data)];
     }
     case "string": {
-      if (revision === "1" /* Active */) {
+      if (revision === TypedDataRevision.Active) {
         const byteArray = byteArrayFromString(data);
         const elements = [
           byteArray.data.length,
@@ -5586,7 +5606,7 @@ function encodeValue(types, type, data, ctx = {}, revision = "0" /* Legacy */) {
       return [type, getHex(data)];
     }
     case "i128": {
-      if (revision === "1" /* Active */) {
+      if (revision === TypedDataRevision.Active) {
         const value = BigInt(data);
         assertRange(value, type, RANGE_I128);
         return [type, getHex(value < 0n ? PRIME + value : value)];
@@ -5595,40 +5615,40 @@ function encodeValue(types, type, data, ctx = {}, revision = "0" /* Legacy */) {
     }
     case "timestamp":
     case "u128": {
-      if (revision === "1" /* Active */) {
+      if (revision === TypedDataRevision.Active) {
         assertRange(data, type, RANGE_U128);
       }
       return [type, getHex(data)];
     }
     case "felt":
     case "shortstring": {
-      if (revision === "1" /* Active */) {
+      if (revision === TypedDataRevision.Active) {
         assertRange(getHex(data), type, RANGE_FELT);
       }
       return [type, getHex(data)];
     }
     case "ClassHash":
     case "ContractAddress": {
-      if (revision === "1" /* Active */) {
+      if (revision === TypedDataRevision.Active) {
         assertRange(data, type, RANGE_FELT);
       }
       return [type, getHex(data)];
     }
     case "bool": {
-      if (revision === "1" /* Active */) {
+      if (revision === TypedDataRevision.Active) {
         assert(typeof data === "boolean", `Type mismatch for ${type} ${data}`);
       }
       return [type, getHex(data)];
     }
     default: {
-      if (revision === "1" /* Active */) {
+      if (revision === TypedDataRevision.Active) {
         throw new Error(`Unsupported type: ${type}`);
       }
       return [type, getHex(data)];
     }
   }
 }
-function encodeData(types, type, data, revision = "0" /* Legacy */) {
+function encodeData(types, type, data, revision = TypedDataRevision.Legacy) {
   const targetType = types[type] ?? revisionConfiguration[revision].presetTypes[type];
   const [returnTypes, values] = targetType.reduce(
     ([ts, vs], field) => {
@@ -5647,7 +5667,7 @@ function encodeData(types, type, data, revision = "0" /* Legacy */) {
   );
   return [returnTypes, values];
 }
-function getStructHash(types, type, data, revision = "0" /* Legacy */) {
+function getStructHash(types, type, data, revision = TypedDataRevision.Legacy) {
   return revisionConfiguration[revision].hashMethod(encodeData(types, type, data, revision)[1]);
 }
 function getMessageHash(typedData, account) {
@@ -5759,16 +5779,6 @@ var Signer = class {
 // src/signer/ethSigner.ts
 import { secp256k1 as secp256k12 } from "@noble/curves/secp256k1";
 
-// src/utils/eth.ts
-var eth_exports = {};
-__export(eth_exports, {
-  ethRandomPrivateKey: () => ethRandomPrivateKey
-});
-import { secp256k1 } from "@noble/curves/secp256k1";
-function ethRandomPrivateKey() {
-  return sanitizeHex(buf2hex(secp256k1.utils.randomPrivateKey()));
-}
-
 // src/utils/uint256.ts
 var uint256_exports = {};
 __export(uint256_exports, {
@@ -6131,8 +6141,9 @@ var Account = class extends RpcProvider2 {
       skipExecute
     });
   }
-  async execute(calls, abis = void 0, details = {}) {
-    const transactions = Array.isArray(calls) ? calls : [calls];
+  async execute(transactions, arg2, transactionsDetail = {}) {
+    const details = arg2 === void 0 || Array.isArray(arg2) ? transactionsDetail : arg2;
+    const calls = Array.isArray(transactions) ? transactions : [transactions];
     const nonce = toBigInt(details.nonce ?? await this.getNonce());
     const version = toTransactionVersion(
       this.getPreferredVersion("0x1" /* V1 */, "0x3" /* V3 */),
@@ -6141,7 +6152,7 @@ var Account = class extends RpcProvider2 {
     );
     const estimate = await this.getUniversalSuggestedFee(
       version,
-      { type: "INVOKE_FUNCTION" /* INVOKE */, payload: calls },
+      { type: "INVOKE_FUNCTION" /* INVOKE */, payload: transactions },
       {
         ...details,
         version
@@ -6158,8 +6169,8 @@ var Account = class extends RpcProvider2 {
       chainId,
       cairoVersion: await this.getCairoVersion()
     };
-    const signature = await this.signer.signTransaction(transactions, signerDetails, abis);
-    const calldata = getExecuteCalldata(transactions, await this.getCairoVersion());
+    const signature = await this.signer.signTransaction(calls, signerDetails);
+    const calldata = getExecuteCalldata(calls, await this.getCairoVersion());
     return this.invokeFunction(
       { contractAddress: this.address, calldata, signature },
       {
@@ -6371,7 +6382,9 @@ var Account = class extends RpcProvider2 {
           overall_fee: ZERO,
           unit: "FRI",
           suggestedMaxFee: ZERO,
-          resourceBounds: estimateFeeToBounds(ZERO)
+          resourceBounds: estimateFeeToBounds(ZERO),
+          data_gas_consumed: 0n,
+          data_gas_price: 0n
         };
         break;
     }
@@ -6540,6 +6553,23 @@ var AccountInterface = class extends ProviderInterface {
 };
 
 // src/wallet/connect.ts
+var connect_exports = {};
+__export(connect_exports, {
+  addDeclareTransaction: () => addDeclareTransaction,
+  addDeployAccountTransaction: () => addDeployAccountTransaction,
+  addInvokeTransaction: () => addInvokeTransaction,
+  addStarknetChain: () => addStarknetChain,
+  deploymentData: () => deploymentData,
+  getPermissions: () => getPermissions,
+  onAccountChange: () => onAccountChange,
+  onNetworkChanged: () => onNetworkChanged,
+  requestAccounts: () => requestAccounts,
+  requestChainId: () => requestChainId,
+  signMessage: () => signMessage,
+  supportedSpecs: () => supportedSpecs,
+  switchStarknetChain: () => switchStarknetChain,
+  watchAsset: () => watchAsset
+});
 function requestAccounts(swo, silentMode = false) {
   return swo.request({
     type: "wallet_requestAccounts",
@@ -7225,17 +7255,12 @@ export {
   ValidateType,
   WalletAccount,
   addAddressPadding,
-  addDeclareTransaction,
-  addDeployAccountTransaction,
-  addInvokeTransaction,
-  addStarknetChain,
   buildUrl,
   byteArray_exports as byteArray,
   cairo_exports as cairo,
   constants_exports as constants,
   contractClassResponseToLegacyCompiledContract,
   defaultProvider,
-  deploymentData,
   ec_exports as ec,
   encode_exports as encode,
   eth_exports as eth,
@@ -7245,7 +7270,6 @@ export {
   fixStack,
   getCalldata,
   getChecksumAddress,
-  getPermissions,
   hash_exports as hash,
   isSierra,
   isUrl,
@@ -7253,20 +7277,13 @@ export {
   merkle_exports as merkle,
   num_exports as num,
   number,
-  onAccountChange,
-  onNetworkChanged,
   parseUDCEvent,
   provider_exports as provider,
-  requestAccounts,
-  requestChainId,
   selector_exports as selector,
   shortString_exports as shortString,
-  signMessage,
   splitArgsAndOptions,
   stark_exports as stark,
   starknetId_exports as starknetId,
-  supportedSpecs,
-  switchStarknetChain,
   transaction_exports as transaction,
   typedData_exports as typedData,
   types_exports as types,
@@ -7275,6 +7292,6 @@ export {
   v3_exports as v3hash,
   validateAndParseAddress,
   validateChecksumAddress,
-  watchAsset
+  connect_exports as wallet
 };
 //# sourceMappingURL=index.mjs.map