starknet 9.1.1 → 9.2.1

package/dist/index.global.js

@@ -99,7 +99,7 @@ var starknet = (() => {
     TransactionExecutionStatus: () => TransactionExecutionStatus,
     TransactionFinalityStatus: () => TransactionFinalityStatus,
     TransactionType: () => TransactionType,
-    TypedDataRevision: () => TypedDataRevision,
+    TypedDataRevision: () => TypedDataRevision2,
     UINT_128_MAX: () => UINT_128_MAX,
     UINT_128_MIN: () => UINT_128_MIN,
     UINT_256_HIGH_MAX: () => UINT_256_HIGH_MAX,
@@ -229,52 +229,52 @@ var starknet = (() => {
   // src/types/api/index.ts
   var api_exports3 = {};
   __export(api_exports3, {
-    ABI_TYPE_CONSTRUCTOR: () => ABI_TYPE_CONSTRUCTOR,
-    ABI_TYPE_ENUM: () => ABI_TYPE_ENUM,
-    ABI_TYPE_FUNCTION: () => ABI_TYPE_FUNCTION,
-    ABI_TYPE_L1_HANDLER: () => ABI_TYPE_L1_HANDLER,
-    API: () => api_exports,
-    CALL_TYPE: () => CALL_TYPE,
-    CONTRACT: () => contract_exports,
-    EBlockStatus: () => EBlockStatus,
-    EBlockTag: () => EBlockTag,
-    EDAMode: () => EDAMode,
-    EDataAvailabilityMode: () => EDataAvailabilityMode,
-    ESimulationFlag: () => ESimulationFlag,
-    ETransactionExecutionStatus: () => ETransactionExecutionStatus,
-    ETransactionFinalityStatus: () => ETransactionFinalityStatus,
-    ETransactionStatus: () => ETransactionStatus,
-    ETransactionType: () => ETransactionType,
-    ETransactionVersion: () => ETransactionVersion,
-    ETransactionVersion2: () => ETransactionVersion2,
-    ETransactionVersion3: () => ETransactionVersion3,
-    EVENT_ABI_TYPE: () => EVENT_ABI_TYPE,
+    ABI_TYPE_CONSTRUCTOR: () => ABI_TYPE_CONSTRUCTOR2,
+    ABI_TYPE_ENUM: () => ABI_TYPE_ENUM2,
+    ABI_TYPE_FUNCTION: () => ABI_TYPE_FUNCTION2,
+    ABI_TYPE_L1_HANDLER: () => ABI_TYPE_L1_HANDLER2,
+    API: () => api_exports2,
+    CALL_TYPE: () => CALL_TYPE2,
+    CONTRACT: () => contract_exports2,
+    EBlockStatus: () => EBlockStatus2,
+    EBlockTag: () => EBlockTag2,
+    EDAMode: () => EDAMode2,
+    EDataAvailabilityMode: () => EDataAvailabilityMode2,
+    ESimulationFlag: () => ESimulationFlag2,
+    ETransactionExecutionStatus: () => ETransactionExecutionStatus2,
+    ETransactionFinalityStatus: () => ETransactionFinalityStatus2,
+    ETransactionStatus: () => ETransactionStatus2,
+    ETransactionType: () => ETransactionType2,
+    ETransactionVersion: () => ETransactionVersion4,
+    ETransactionVersion2: () => ETransactionVersion22,
+    ETransactionVersion3: () => ETransactionVersion32,
+    EVENT_ABI_TYPE: () => EVENT_ABI_TYPE2,
     JRPC: () => jsonrpc_exports,
-    L1_DA_MODE: () => L1_DA_MODE,
+    L1_DA_MODE: () => L1_DA_MODE2,
     PAYMASTER_API: () => snip_29_exports2,
-    PRICE_UNIT_FRI: () => PRICE_UNIT_FRI,
-    PRICE_UNIT_WEI: () => PRICE_UNIT_WEI,
-    Permission: () => Permission,
+    PRICE_UNIT_FRI: () => PRICE_UNIT_FRI2,
+    PRICE_UNIT_WEI: () => PRICE_UNIT_WEI2,
+    Permission: () => Permission2,
     RPCSPEC010: () => esm_exports2,
     RPCSPEC09: () => esm_exports,
-    STATE_MUTABILITY_EXTERNAL: () => STATE_MUTABILITY_EXTERNAL,
-    STATE_MUTABILITY_VIEW: () => STATE_MUTABILITY_VIEW,
-    STATUS_ACCEPTED_ON_L1: () => STATUS_ACCEPTED_ON_L1,
-    STATUS_ACCEPTED_ON_L2: () => STATUS_ACCEPTED_ON_L2,
-    STATUS_CANDIDATE: () => STATUS_CANDIDATE,
-    STATUS_PRE_CONFIRMED: () => STATUS_PRE_CONFIRMED,
-    STATUS_PRE_CONFIRMED_LOWERCASE: () => STATUS_PRE_CONFIRMED_LOWERCASE,
-    STATUS_RECEIVED: () => STATUS_RECEIVED,
-    STATUS_REVERTED: () => STATUS_REVERTED,
-    STATUS_SUCCEEDED: () => STATUS_SUCCEEDED,
-    STRUCT_ABI_TYPE: () => STRUCT_ABI_TYPE,
-    TXN_TYPE_DECLARE: () => TXN_TYPE_DECLARE,
-    TXN_TYPE_DEPLOY: () => TXN_TYPE_DEPLOY,
-    TXN_TYPE_DEPLOY_ACCOUNT: () => TXN_TYPE_DEPLOY_ACCOUNT,
-    TXN_TYPE_INVOKE: () => TXN_TYPE_INVOKE,
-    TXN_TYPE_L1_HANDLER: () => TXN_TYPE_L1_HANDLER,
-    TypedDataRevision: () => TypedDataRevision,
-    WALLET_API: () => wallet_api_exports
+    STATE_MUTABILITY_EXTERNAL: () => STATE_MUTABILITY_EXTERNAL2,
+    STATE_MUTABILITY_VIEW: () => STATE_MUTABILITY_VIEW2,
+    STATUS_ACCEPTED_ON_L1: () => STATUS_ACCEPTED_ON_L12,
+    STATUS_ACCEPTED_ON_L2: () => STATUS_ACCEPTED_ON_L22,
+    STATUS_CANDIDATE: () => STATUS_CANDIDATE2,
+    STATUS_PRE_CONFIRMED: () => STATUS_PRE_CONFIRMED2,
+    STATUS_PRE_CONFIRMED_LOWERCASE: () => STATUS_PRE_CONFIRMED_LOWERCASE2,
+    STATUS_RECEIVED: () => STATUS_RECEIVED2,
+    STATUS_REVERTED: () => STATUS_REVERTED2,
+    STATUS_SUCCEEDED: () => STATUS_SUCCEEDED2,
+    STRUCT_ABI_TYPE: () => STRUCT_ABI_TYPE2,
+    TXN_TYPE_DECLARE: () => TXN_TYPE_DECLARE2,
+    TXN_TYPE_DEPLOY: () => TXN_TYPE_DEPLOY2,
+    TXN_TYPE_DEPLOY_ACCOUNT: () => TXN_TYPE_DEPLOY_ACCOUNT2,
+    TXN_TYPE_INVOKE: () => TXN_TYPE_INVOKE2,
+    TXN_TYPE_L1_HANDLER: () => TXN_TYPE_L1_HANDLER2,
+    TypedDataRevision: () => TypedDataRevision2,
+    WALLET_API: () => wallet_api_exports2
   });
 
   // src/types/api/jsonrpc.ts
@@ -766,6 +766,26 @@ var starknet = (() => {
     LEGACY: "0"
   };
 
+  // src/provider/types/spec.type.ts
+  var { ETransactionVersion: ETransactionVersion5 } = esm_exports;
+  var { ETransactionVersion2: ETransactionVersion23 } = esm_exports;
+  var { ETransactionVersion3: ETransactionVersion33 } = esm_exports;
+  var { EDataAvailabilityMode: EDataAvailabilityMode3 } = esm_exports2;
+  var { EDAMode: EDAMode3 } = esm_exports2;
+  function isRPC08Plus_ResourceBounds(entry) {
+    return "l1_data_gas" in entry;
+  }
+  function isRPC08Plus_ResourceBoundsBN(entry) {
+    return "l1_data_gas" in entry;
+  }
+  var { ETransactionStatus: ETransactionStatus3 } = esm_exports2;
+  var { ETransactionExecutionStatus: ETransactionExecutionStatus3 } = esm_exports2;
+  var { ETransactionType: TransactionType } = esm_exports;
+  var { EBlockStatus: BlockStatus } = esm_exports;
+  var { ETransactionFinalityStatus: TransactionFinalityStatus } = esm_exports;
+  var { ETransactionExecutionStatus: TransactionExecutionStatus } = esm_exports;
+  var { EBlockTag: BlockTag } = esm_exports;
+
   // src/utils/encode.ts
   var encode_exports = {};
   __export(encode_exports, {
@@ -1180,7 +1200,7 @@ var starknet = (() => {
   };
   var DEFAULT_GLOBAL_CONFIG = {
     rpcVersion: "0.10.0",
-    transactionVersion: ETransactionVersion.V3,
+    transactionVersion: ETransactionVersion4.V3,
     // Starknet 0.14.0 only V3 transactions
     logLevel: "INFO",
     resourceBoundsOverhead: {
@@ -1198,6 +1218,22 @@ var starknet = (() => {
       }
     },
     defaultTipType: "recommendedTip",
+    channelDefaults: {
+      options: {
+        headers: { "Content-Type": "application/json" },
+        blockIdentifier: BlockTag.LATEST,
+        retries: 200
+      },
+      methods: {
+        simulateTransaction: {
+          skipValidate: true,
+          skipFeeCharge: true
+        },
+        getEstimateFee: {
+          skipValidate: true
+        }
+      }
+    },
     fetch: void 0,
     websocket: void 0,
     buffer: void 0,
@@ -1242,11 +1278,51 @@ var starknet = (() => {
       }
       return _Configuration.instance;
     }
+    /**
+     * Get a nested value from an object using a dot-notation path
+     * @param obj - The object to traverse
+     * @param path - The dot-notation path (e.g., 'a.b.c')
+     * @returns The value at the path, or undefined if not found
+     */
+    getNestedValue(obj, path) {
+      const keys = path.split(".");
+      return keys.reduce((current, key) => {
+        if (current === null || current === void 0) {
+          return void 0;
+        }
+        return current[key];
+      }, obj);
+    }
+    /**
+     * Set a nested value in an object using a dot-notation path
+     * @param obj - The object to modify
+     * @param path - The dot-notation path (e.g., 'a.b.c')
+     * @param value - The value to set
+     */
+    setNestedValue(obj, path, value) {
+      const keys = path.split(".");
+      const lastKey = keys.pop();
+      const target = keys.reduce((current, key) => {
+        if (!(key in current) || typeof current[key] !== "object" || current[key] === null) {
+          current[key] = {};
+        }
+        return current[key];
+      }, obj);
+      target[lastKey] = value;
+    }
     get(key, defaultValue) {
+      if (key.includes(".")) {
+        const value = this.getNestedValue(this.config, key);
+        return value ?? defaultValue;
+      }
       return this.config[key] ?? defaultValue;
     }
     set(key, value) {
-      this.config[key] = value;
+      if (key.includes(".")) {
+        this.setNestedValue(this.config, key, value);
+      } else {
+        this.config[key] = value;
+      }
     }
     update(configData) {
       this.config = {
@@ -1415,26 +1491,6 @@ ${JSON.stringify(data, null, 2)}`;
     CONSTRUCTOR: "CONSTRUCTOR"
   };
 
-  // src/provider/types/spec.type.ts
-  var { ETransactionVersion: ETransactionVersion5 } = esm_exports;
-  var { ETransactionVersion2: ETransactionVersion23 } = esm_exports;
-  var { ETransactionVersion3: ETransactionVersion33 } = esm_exports;
-  var { EDataAvailabilityMode: EDataAvailabilityMode3 } = esm_exports2;
-  var { EDAMode: EDAMode3 } = esm_exports2;
-  function isRPC08Plus_ResourceBounds(entry) {
-    return "l1_data_gas" in entry;
-  }
-  function isRPC08Plus_ResourceBoundsBN(entry) {
-    return "l1_data_gas" in entry;
-  }
-  var { ETransactionStatus: ETransactionStatus3 } = esm_exports2;
-  var { ETransactionExecutionStatus: ETransactionExecutionStatus3 } = esm_exports2;
-  var { ETransactionType: TransactionType } = esm_exports;
-  var { EBlockStatus: BlockStatus } = esm_exports;
-  var { ETransactionFinalityStatus: TransactionFinalityStatus } = esm_exports;
-  var { ETransactionExecutionStatus: TransactionExecutionStatus } = esm_exports;
-  var { EBlockTag: BlockTag } = esm_exports;
-
   // src/types/calldata.ts
   var ValidateType = {
     DEPLOY: "DEPLOY",
@@ -9174,7 +9230,7 @@ ${indent}}` : "}";
 
   // src/utils/hash/transactionHash/index.ts
   function isV3InvokeTx(args) {
-    return [ETransactionVersion.V3, ETransactionVersion.F3].includes(args.version);
+    return [ETransactionVersion4.V3, ETransactionVersion4.F3].includes(args.version);
   }
   function calculateInvokeTransactionHash2(args) {
     if (isV3InvokeTx(args)) {
@@ -9195,7 +9251,7 @@ ${indent}}` : "}";
     throw new Error("Invalid Tx version for hash calculation");
   }
   function isV3DeclareTx(args) {
-    return [ETransactionVersion.V3, ETransactionVersion.F3].includes(args.version);
+    return [ETransactionVersion4.V3, ETransactionVersion4.F3].includes(args.version);
   }
   function calculateDeclareTransactionHash3(args) {
     if (isV3DeclareTx(args)) {
@@ -9217,7 +9273,7 @@ ${indent}}` : "}";
     throw new Error("Invalid Tx version for hash calculation");
   }
   function isV3DeployAccountTx(args) {
-    return [ETransactionVersion.V3, ETransactionVersion.F3].includes(args.version);
+    return [ETransactionVersion4.V3, ETransactionVersion4.F3].includes(args.version);
   }
   function calculateDeployAccountTransactionHash3(args) {
     if (isV3DeployAccountTx(args)) {
@@ -9947,7 +10003,7 @@ ${indent}}` : "}";
     return 0;
   }
   function isPreConfirmedBlock(response) {
-    return response.status === EBlockStatus.PRE_CONFIRMED;
+    return response.status === EBlockStatus2.PRE_CONFIRMED;
   }
   function isPreConfirmedTransaction(response) {
     return !("block_hash" in response);
@@ -14956,11 +15012,6 @@ ${indent}}` : "}";
   }
 
   // src/channel/rpc_0_9_0.ts
-  var defaultOptions = {
-    headers: { "Content-Type": "application/json" },
-    blockIdentifier: BlockTag.LATEST,
-    retries: 200
-  };
   var RpcChannel = class {
     id = "RPC090";
     /**
@@ -15010,11 +15061,12 @@ ${indent}}` : "}";
           this.channelSpecVersion
         );
       }
+      const channelDefaults = config.get("channelDefaults");
       this.baseFetch = baseFetch || config.get("fetch") || fetch_default;
-      this.blockIdentifier = blockIdentifier ?? defaultOptions.blockIdentifier;
+      this.blockIdentifier = blockIdentifier ?? channelDefaults.options.blockIdentifier;
       this.chainId = chainId;
-      this.headers = { ...defaultOptions.headers, ...headers };
-      this.retries = retries ?? defaultOptions.retries;
+      this.headers = { ...channelDefaults.options.headers, ...headers };
+      this.retries = retries ?? channelDefaults.options.retries;
       this.specVersion = specVersion;
       this.transactionRetryIntervalFallback = transactionRetryIntervalFallback;
       this.waitMode = waitMode ?? false;
@@ -15228,14 +15280,16 @@ ${indent}}` : "}";
      * @param invocations AccountInvocations
      * @param simulateTransactionOptions blockIdentifier and flags to skip validation and fee charge<br/>
      * - blockIdentifier<br/>
-     * - skipValidate (default false)<br/>
+     * - skipValidate (default true)<br/>
      * - skipFeeCharge (default true)<br/>
      */
     simulateTransaction(invocations, simulateTransactionOptions = {}) {
+      const channelDefaults = config.get("channelDefaults");
+      const methodDefaults = channelDefaults.methods.simulateTransaction || {};
       const {
         blockIdentifier = this.blockIdentifier,
-        skipValidate = true,
-        skipFeeCharge = true
+        skipValidate = methodDefaults.skipValidate,
+        skipFeeCharge = methodDefaults.skipFeeCharge
       } = simulateTransactionOptions;
       const block_id = new Block(blockIdentifier).identifier;
       const simulationFlags = [];
@@ -15395,7 +15449,10 @@ ${indent}}` : "}";
         contract_address
       });
     }
-    async getEstimateFee(invocations, { blockIdentifier = this.blockIdentifier, skipValidate = true } = {}) {
+    async getEstimateFee(invocations, options = {}) {
+      const channelDefaults = config.get("channelDefaults");
+      const methodDefaults = channelDefaults.methods.getEstimateFee || {};
+      const { blockIdentifier = this.blockIdentifier, skipValidate = methodDefaults.skipValidate } = options;
       const block_id = new Block(blockIdentifier).identifier;
       const flags = {
         simulation_flags: skipValidate ? [esm_exports.ESimulationFlag.SKIP_VALIDATE] : []
@@ -15409,7 +15466,7 @@ ${indent}}` : "}";
     async invoke(functionInvocation, details) {
       const transaction = this.buildTransaction(
         {
-          type: ETransactionType.INVOKE,
+          type: ETransactionType2.INVOKE,
           ...functionInvocation,
           ...details
         },
@@ -15423,7 +15480,7 @@ ${indent}}` : "}";
     async declare(declareTransaction, details) {
       const transaction = this.buildTransaction(
         {
-          type: ETransactionType.DECLARE,
+          type: ETransactionType2.DECLARE,
           ...declareTransaction,
           ...details
         },
@@ -15437,7 +15494,7 @@ ${indent}}` : "}";
     async deployAccount(deployAccountTransaction, details) {
       const transaction = this.buildTransaction(
         {
-          type: ETransactionType.DEPLOY_ACCOUNT,
+          type: ETransactionType2.DEPLOY_ACCOUNT,
           ...deployAccountTransaction,
           ...details
         },
@@ -15510,7 +15567,7 @@ ${indent}}` : "}";
         account_deployment_data: invocation.accountDeploymentData.map((it) => toHex(it)),
         version: toTransactionVersion(defaultVersions.v3, invocation.version)
       };
-      if (invocation.type === ETransactionType.INVOKE) {
+      if (invocation.type === ETransactionType2.INVOKE) {
         const btx = {
           type: esm_exports.ETransactionType.INVOKE,
           sender_address: invocation.contractAddress,
@@ -15519,7 +15576,7 @@ ${indent}}` : "}";
         };
         return btx;
       }
-      if (invocation.type === ETransactionType.DECLARE) {
+      if (invocation.type === ETransactionType2.DECLARE) {
         assert(isSierra(invocation.contract), "Declaring non Sierra contract using RPC 0.9");
         const btx = {
           type: invocation.type,
@@ -15533,7 +15590,7 @@ ${indent}}` : "}";
         };
         return btx;
       }
-      if (invocation.type === ETransactionType.DEPLOY_ACCOUNT) {
+      if (invocation.type === ETransactionType2.DEPLOY_ACCOUNT) {
         const { account_deployment_data, ...restDetails } = details;
         const btx = {
           type: invocation.type,
@@ -15553,11 +15610,6 @@ ${indent}}` : "}";
   __export(rpc_0_10_0_exports, {
     RpcChannel: () => RpcChannel2
   });
-  var defaultOptions2 = {
-    headers: { "Content-Type": "application/json" },
-    blockIdentifier: BlockTag.LATEST,
-    retries: 200
-  };
   var RpcChannel2 = class {
     id = "RPC0.10.0";
     /**
@@ -15607,11 +15659,12 @@ ${indent}}` : "}";
           this.channelSpecVersion
         );
       }
+      const channelDefaults = config.get("channelDefaults");
       this.baseFetch = baseFetch || config.get("fetch") || fetch_default;
-      this.blockIdentifier = blockIdentifier ?? defaultOptions2.blockIdentifier;
+      this.blockIdentifier = blockIdentifier ?? channelDefaults.options.blockIdentifier;
       this.chainId = chainId;
-      this.headers = { ...defaultOptions2.headers, ...headers };
-      this.retries = retries ?? defaultOptions2.retries;
+      this.headers = { ...channelDefaults.options.headers, ...headers };
+      this.retries = retries ?? channelDefaults.options.retries;
       this.specVersion = specVersion;
       this.transactionRetryIntervalFallback = transactionRetryIntervalFallback;
       this.waitMode = waitMode ?? false;
@@ -15825,14 +15878,16 @@ ${indent}}` : "}";
      * @param invocations AccountInvocations
      * @param simulateTransactionOptions blockIdentifier and flags to skip validation and fee charge<br/>
      * - blockIdentifier<br/>
-     * - skipValidate (default false)<br/>
+     * - skipValidate (default true)<br/>
      * - skipFeeCharge (default true)<br/>
      */
     simulateTransaction(invocations, simulateTransactionOptions = {}) {
+      const channelDefaults = config.get("channelDefaults");
+      const methodDefaults = channelDefaults.methods.simulateTransaction || {};
       const {
         blockIdentifier = this.blockIdentifier,
-        skipValidate = true,
-        skipFeeCharge = true
+        skipValidate = methodDefaults.skipValidate,
+        skipFeeCharge = methodDefaults.skipFeeCharge
       } = simulateTransactionOptions;
       const block_id = new Block(blockIdentifier).identifier;
       const simulationFlags = [];
@@ -15992,7 +16047,10 @@ ${indent}}` : "}";
         contract_address
       });
     }
-    async getEstimateFee(invocations, { blockIdentifier = this.blockIdentifier, skipValidate = true } = {}) {
+    async getEstimateFee(invocations, options = {}) {
+      const channelDefaults = config.get("channelDefaults");
+      const methodDefaults = channelDefaults.methods.getEstimateFee || {};
+      const { blockIdentifier = this.blockIdentifier, skipValidate = methodDefaults.skipValidate } = options;
       const block_id = new Block(blockIdentifier).identifier;
       const flags = {
         simulation_flags: skipValidate ? [esm_exports2.ESimulationFlag.SKIP_VALIDATE] : []
@@ -16006,7 +16064,7 @@ ${indent}}` : "}";
     async invoke(functionInvocation, details) {
       const transaction = this.buildTransaction(
         {
-          type: ETransactionType.INVOKE,
+          type: ETransactionType2.INVOKE,
           ...functionInvocation,
           ...details
         },
@@ -16020,7 +16078,7 @@ ${indent}}` : "}";
     async declare(declareTransaction, details) {
       const transaction = this.buildTransaction(
         {
-          type: ETransactionType.DECLARE,
+          type: ETransactionType2.DECLARE,
           ...declareTransaction,
           ...details
         },
@@ -16034,7 +16092,7 @@ ${indent}}` : "}";
     async deployAccount(deployAccountTransaction, details) {
       const transaction = this.buildTransaction(
         {
-          type: ETransactionType.DEPLOY_ACCOUNT,
+          type: ETransactionType2.DEPLOY_ACCOUNT,
           ...deployAccountTransaction,
           ...details
         },
@@ -16107,7 +16165,7 @@ ${indent}}` : "}";
         account_deployment_data: invocation.accountDeploymentData.map((it) => toHex(it)),
         version: toTransactionVersion(defaultVersions.v3, invocation.version)
       };
-      if (invocation.type === ETransactionType.INVOKE) {
+      if (invocation.type === ETransactionType2.INVOKE) {
         const btx = {
           type: esm_exports2.ETransactionType.INVOKE,
           sender_address: invocation.contractAddress,
@@ -16116,7 +16174,7 @@ ${indent}}` : "}";
         };
         return btx;
       }
-      if (invocation.type === ETransactionType.DECLARE) {
+      if (invocation.type === ETransactionType2.DECLARE) {
         assert(isSierra(invocation.contract), "Declaring non Sierra contract using RPC 0.9");
         const btx = {
           type: invocation.type,
@@ -16130,7 +16188,7 @@ ${indent}}` : "}";
         };
         return btx;
       }
-      if (invocation.type === ETransactionType.DEPLOY_ACCOUNT) {
+      if (invocation.type === ETransactionType2.DEPLOY_ACCOUNT) {
         const { account_deployment_data, ...restDetails } = details;
         const btx = {
           type: invocation.type,
@@ -16281,7 +16339,7 @@ ${indent}}` : "}";
     }
   };
 
-  // src/channel/ws/ws_0_9.ts
+  // src/channel/ws/ws_0_10.ts
   var WebSocketChannel = class {
     /**
      * The URL of the WebSocket RPC Node.
@@ -17274,14 +17332,14 @@ ${indent}}` : "}";
     )
   };
   var revisionConfiguration = {
-    [TypedDataRevision.ACTIVE]: {
+    [TypedDataRevision2.ACTIVE]: {
       domain: "StarknetDomain",
       hashMethod: computePoseidonHashOnElements,
       hashMerkleMethod: computePoseidonHash,
       escapeTypeString: (s) => `"${s}"`,
       presetTypes
     },
-    [TypedDataRevision.LEGACY]: {
+    [TypedDataRevision2.LEGACY]: {
       domain: "StarkNetDomain",
       hashMethod: computePedersenHashOnElements,
       hashMerkleMethod: computePedersenHash,
@@ -17294,10 +17352,10 @@ ${indent}}` : "}";
     assert(value >= min && value <= max, `${value} (${type}) is out of bounds [${min}, ${max}]`);
   }
   function identifyRevision({ types, domain }) {
-    if (revisionConfiguration[TypedDataRevision.ACTIVE].domain in types && domain.revision?.toString() === TypedDataRevision.ACTIVE)
-      return TypedDataRevision.ACTIVE;
-    if (revisionConfiguration[TypedDataRevision.LEGACY].domain in types && (domain.revision ?? TypedDataRevision.LEGACY) === TypedDataRevision.LEGACY)
-      return TypedDataRevision.LEGACY;
+    if (revisionConfiguration[TypedDataRevision2.ACTIVE].domain in types && domain.revision?.toString() === TypedDataRevision2.ACTIVE)
+      return TypedDataRevision2.ACTIVE;
+    if (revisionConfiguration[TypedDataRevision2.LEGACY].domain in types && (domain.revision ?? TypedDataRevision2.LEGACY) === TypedDataRevision2.LEGACY)
+      return TypedDataRevision2.LEGACY;
     return void 0;
   }
   function getHex(value) {
@@ -17322,11 +17380,11 @@ ${indent}}` : "}";
   function isMerkleTreeType(type) {
     return type.type === "merkletree";
   }
-  function getDependencies(types, type, dependencies = [], contains = "", revision = TypedDataRevision.LEGACY) {
+  function getDependencies(types, type, dependencies = [], contains = "", revision = TypedDataRevision2.LEGACY) {
     let dependencyTypes = [type];
     if (type[type.length - 1] === "*") {
       dependencyTypes = [type.slice(0, -1)];
-    } else if (revision === TypedDataRevision.ACTIVE) {
+    } else if (revision === TypedDataRevision2.ACTIVE) {
       if (type === "enum") {
         dependencyTypes = [contains];
       } else if (type.match(/^\(.*\)$/)) {
@@ -17368,8 +17426,8 @@ ${indent}}` : "}";
     }
     return "raw";
   }
-  function encodeType(types, type, revision = TypedDataRevision.LEGACY) {
-    const allTypes = revision === TypedDataRevision.ACTIVE ? { ...types, ...revisionConfiguration[revision].presetTypes } : types;
+  function encodeType(types, type, revision = TypedDataRevision2.LEGACY) {
+    const allTypes = revision === TypedDataRevision2.ACTIVE ? { ...types, ...revisionConfiguration[revision].presetTypes } : types;
     const [primary, ...dependencies] = getDependencies(
       allTypes,
       type,
@@ -17381,17 +17439,17 @@ ${indent}}` : "}";
     const esc = revisionConfiguration[revision].escapeTypeString;
     return newTypes.map((dependency) => {
       const dependencyElements = allTypes[dependency].map((t) => {
-        const targetType = t.type === "enum" && revision === TypedDataRevision.ACTIVE ? t.contains : t.type;
+        const targetType = t.type === "enum" && revision === TypedDataRevision2.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 = TypedDataRevision.LEGACY) {
+  function getTypeHash(types, type, revision = TypedDataRevision2.LEGACY) {
     return getSelectorFromName(encodeType(types, type, revision));
   }
-  function encodeValue(types, type, data, ctx = {}, revision = TypedDataRevision.LEGACY) {
+  function encodeValue(types, type, data, ctx = {}, revision = TypedDataRevision2.LEGACY) {
     if (types[type]) {
       return [type, getStructHash(types, type, data, revision)];
     }
@@ -17414,7 +17472,7 @@ ${indent}}` : "}";
     }
     switch (type) {
       case "enum": {
-        if (revision === TypedDataRevision.ACTIVE) {
+        if (revision === TypedDataRevision2.ACTIVE) {
           const [variantKey, variantData] = Object.entries(data)[0];
           const parentType = types[ctx.parent].find((t) => t.name === ctx.key);
           const enumType = types[parentType.contains];
@@ -17447,7 +17505,7 @@ ${indent}}` : "}";
         return ["felt", prepareSelector(data)];
       }
       case "string": {
-        if (revision === TypedDataRevision.ACTIVE) {
+        if (revision === TypedDataRevision2.ACTIVE) {
           const byteArray = byteArrayFromString(data);
           const elements = [
             byteArray.data.length,
@@ -17460,7 +17518,7 @@ ${indent}}` : "}";
         return [type, getHex(data)];
       }
       case "i128": {
-        if (revision === TypedDataRevision.ACTIVE) {
+        if (revision === TypedDataRevision2.ACTIVE) {
           const value = BigInt(data);
           assertRange(value, type, RANGE_I128);
           return [type, getHex(value < 0n ? PRIME + value : value)];
@@ -17469,40 +17527,40 @@ ${indent}}` : "}";
       }
       case "timestamp":
       case "u128": {
-        if (revision === TypedDataRevision.ACTIVE) {
+        if (revision === TypedDataRevision2.ACTIVE) {
           assertRange(data, type, RANGE_U128);
         }
         return [type, getHex(data)];
       }
       case "felt":
       case "shortstring": {
-        if (revision === TypedDataRevision.ACTIVE) {
+        if (revision === TypedDataRevision2.ACTIVE) {
           assertRange(getHex(data), type, RANGE_FELT);
         }
         return [type, getHex(data)];
       }
       case "ClassHash":
       case "ContractAddress": {
-        if (revision === TypedDataRevision.ACTIVE) {
+        if (revision === TypedDataRevision2.ACTIVE) {
           assertRange(data, type, RANGE_FELT);
         }
         return [type, getHex(data)];
       }
       case "bool": {
-        if (revision === TypedDataRevision.ACTIVE) {
+        if (revision === TypedDataRevision2.ACTIVE) {
           assert(isBoolean(data), `Type mismatch for ${type} ${data}`);
         }
         return [type, getHex(data)];
       }
       default: {
-        if (revision === TypedDataRevision.ACTIVE) {
+        if (revision === TypedDataRevision2.ACTIVE) {
           throw new Error(`Unsupported type: ${type}`);
         }
         return [type, getHex(data)];
       }
     }
   }
-  function encodeData(types, type, data, revision = TypedDataRevision.LEGACY) {
+  function encodeData(types, type, data, revision = TypedDataRevision2.LEGACY) {
     const targetType = types[type] ?? revisionConfiguration[revision].presetTypes[type];
     const [returnTypes, values] = targetType.reduce(
       ([ts, vs], field) => {
@@ -17521,7 +17579,7 @@ ${indent}}` : "}";
     );
     return [returnTypes, values];
   }
-  function getStructHash(types, type, data, revision = TypedDataRevision.LEGACY) {
+  function getStructHash(types, type, data, revision = TypedDataRevision2.LEGACY) {
     return revisionConfiguration[revision].hashMethod(encodeData(types, type, data, revision)[1]);
   }
   function getMessageHash(typedData, accountAddress) {
@@ -17872,19 +17930,19 @@ ${indent}}` : "}";
     }
     async getInvokeEstimateFee(invocation, details, blockIdentifier, skipValidate) {
       return (await this.getEstimateFeeBulk(
-        [{ type: ETransactionType.INVOKE, ...invocation, ...details }],
+        [{ type: ETransactionType2.INVOKE, ...invocation, ...details }],
         { blockIdentifier, skipValidate }
       ))[0];
     }
     async getDeclareEstimateFee(invocation, details, blockIdentifier, skipValidate) {
       return (await this.getEstimateFeeBulk(
-        [{ type: ETransactionType.DECLARE, ...invocation, ...details }],
+        [{ type: ETransactionType2.DECLARE, ...invocation, ...details }],
         { blockIdentifier, skipValidate }
       ))[0];
     }
     async getDeployAccountEstimateFee(invocation, details, blockIdentifier, skipValidate) {
       return (await this.getEstimateFeeBulk(
-        [{ type: ETransactionType.DEPLOY_ACCOUNT, ...invocation, ...details }],
+        [{ type: ETransactionType2.DEPLOY_ACCOUNT, ...invocation, ...details }],
         { blockIdentifier, skipValidate }
       ))[0];
     }
@@ -17954,7 +18012,7 @@ ${indent}}` : "}";
     async prepareInvocations(invocations) {
       const bulk = [];
       for (const invocation of invocations) {
-        if (invocation.type === ETransactionType.DECLARE) {
+        if (invocation.type === ETransactionType2.DECLARE) {
           const isDeclared = await this.isClassDeclared(
             "payload" in invocation ? invocation.payload : invocation
           );
@@ -18842,7 +18900,7 @@ ${indent}}` : "}";
     async signTransaction(transactions, details) {
       const compiledCalldata = getExecuteCalldata(transactions, details.cairoVersion);
       let msgHash;
-      if (Object.values(ETransactionVersion3).includes(details.version)) {
+      if (Object.values(ETransactionVersion32).includes(details.version)) {
         const det = details;
         msgHash = calculateInvokeTransactionHash2({
           ...det,
@@ -18860,7 +18918,7 @@ ${indent}}` : "}";
     async signDeployAccountTransaction(details) {
       const compiledConstructorCalldata = CallData.compile(details.constructorCalldata);
       let msgHash;
-      if (Object.values(ETransactionVersion3).includes(details.version)) {
+      if (Object.values(ETransactionVersion32).includes(details.version)) {
         const det = details;
         msgHash = calculateDeployAccountTransactionHash3({
           ...det,
@@ -18877,7 +18935,7 @@ ${indent}}` : "}";
     }
     async signDeclareTransaction(details) {
       let msgHash;
-      if (Object.values(ETransactionVersion3).includes(details.version)) {
+      if (Object.values(ETransactionVersion32).includes(details.version)) {
         const det = details;
         msgHash = calculateDeclareTransactionHash3({
           ...det,
@@ -18939,7 +18997,7 @@ ${indent}}` : "}";
     async signTransaction(transactions, details) {
       const compiledCalldata = getExecuteCalldata(transactions, details.cairoVersion);
       let msgHash;
-      if (Object.values(ETransactionVersion3).includes(details.version)) {
+      if (Object.values(ETransactionVersion32).includes(details.version)) {
         const det = details;
         msgHash = calculateInvokeTransactionHash2({
           ...det,
@@ -18961,7 +19019,7 @@ ${indent}}` : "}";
     async signDeployAccountTransaction(details) {
       const compiledConstructorCalldata = CallData.compile(details.constructorCalldata);
       let msgHash;
-      if (Object.values(ETransactionVersion3).includes(details.version)) {
+      if (Object.values(ETransactionVersion32).includes(details.version)) {
         const det = details;
         msgHash = calculateDeployAccountTransactionHash3({
           ...det,
@@ -18982,7 +19040,7 @@ ${indent}}` : "}";
     }
     async signDeclareTransaction(details) {
       let msgHash;
-      if (Object.values(ETransactionVersion3).includes(details.version)) {
+      if (Object.values(ETransactionVersion32).includes(details.version)) {
         const det = details;
         msgHash = calculateDeclareTransactionHash3({
           ...det,
@@ -19155,7 +19213,7 @@ ${indent}}` : "}";
     async signTransaction(transactions, transactionsDetail) {
       const compiledCalldata = getExecuteCalldata(transactions, transactionsDetail.cairoVersion);
       let msgHash;
-      if (Object.values(ETransactionVersion3).includes(transactionsDetail.version)) {
+      if (Object.values(ETransactionVersion32).includes(transactionsDetail.version)) {
         const det = transactionsDetail;
         msgHash = calculateInvokeTransactionHash2({
           ...det,
@@ -19185,7 +19243,7 @@ ${indent}}` : "}";
     async signDeployAccountTransaction(details) {
       const compiledConstructorCalldata = CallData.compile(details.constructorCalldata);
       let msgHash;
-      if (Object.values(ETransactionVersion3).includes(details.version)) {
+      if (Object.values(ETransactionVersion32).includes(details.version)) {
         const det = details;
         msgHash = calculateDeployAccountTransactionHash3({
           ...det,
@@ -19214,7 +19272,7 @@ ${indent}}` : "}";
      */
     async signDeclareTransaction(details) {
       let msgHash;
-      if (Object.values(ETransactionVersion3).includes(details.version)) {
+      if (Object.values(ETransactionVersion32).includes(details.version)) {
         const det = details;
         msgHash = calculateDeclareTransactionHash3({
           ...det,
@@ -19373,7 +19431,7 @@ ${indent}}` : "}";
      */
     async signTransaction(transactions, transactionsDetail) {
       const compiledCalldata = getExecuteCalldata(transactions, transactionsDetail.cairoVersion);
-      if (Object.values(ETransactionVersion3).includes(transactionsDetail.version)) {
+      if (Object.values(ETransactionVersion32).includes(transactionsDetail.version)) {
         const det = transactionsDetail;
         const msgHash = calculateInvokeTransactionHash2({
           ...det,
@@ -19407,7 +19465,7 @@ ${indent}}` : "}";
     async signDeployAccountTransaction(details) {
       const compiledConstructorCalldata = CallData.compile(details.constructorCalldata);
       let msgHash;
-      if (Object.values(ETransactionVersion3).includes(details.version)) {
+      if (Object.values(ETransactionVersion32).includes(details.version)) {
         const det = details;
         msgHash = calculateDeployAccountTransactionHash3({
           ...det,
@@ -19513,8 +19571,8 @@ ${indent}}` : "}";
       const nonceBuf = this.convertBnToLedger(txDetails.nonce);
       const dAModeHashBuf = this.convertBnToLedger(
         hashDAMode(
-          txDetails.nonceDataAvailabilityMode === EDataAvailabilityMode.L1 ? EDAMode.L1 : EDAMode.L2,
-          txDetails.feeDataAvailabilityMode === EDataAvailabilityMode.L1 ? EDAMode.L1 : EDAMode.L2
+          txDetails.nonceDataAvailabilityMode === EDataAvailabilityMode2.L1 ? EDAMode2.L1 : EDAMode2.L2,
+          txDetails.feeDataAvailabilityMode === EDataAvailabilityMode2.L1 ? EDAMode2.L1 : EDAMode2.L2
         )
       );
       const l1_gasBuf = this.convertBnToLedger(encodeResourceBoundsL1(txDetails.resourceBounds));
@@ -19596,8 +19654,8 @@ ${indent}}` : "}";
       const nonceBuf = this.convertBnToLedger(deployAccountDetail.nonce);
       const dAModeHashBuf = this.convertBnToLedger(
         hashDAMode(
-          deployAccountDetail.nonceDataAvailabilityMode === EDataAvailabilityMode.L1 ? EDAMode.L1 : EDAMode.L2,
-          deployAccountDetail.feeDataAvailabilityMode === EDataAvailabilityMode.L1 ? EDAMode.L1 : EDAMode.L2
+          deployAccountDetail.nonceDataAvailabilityMode === EDataAvailabilityMode2.L1 ? EDAMode2.L1 : EDAMode2.L2,
+          deployAccountDetail.feeDataAvailabilityMode === EDataAvailabilityMode2.L1 ? EDAMode2.L1 : EDAMode2.L2
         )
       );
       const classHashBuf = this.convertBnToLedger(deployAccountDetail.classHash);
@@ -20166,7 +20224,7 @@ ${indent}}` : "}";
     feeMode: convertFEE_MODE(parameters.fee_mode),
     timeBounds: convertTIME_BOUNDS(parameters.time_bounds)
   });
-  var defaultOptions3 = {
+  var defaultOptions = {
     headers: { "Content-Type": "application/json" }
   };
   var PaymasterRpc = class _PaymasterRpc {
@@ -20177,14 +20235,14 @@ ${indent}}` : "}";
     constructor(options) {
       if (options instanceof _PaymasterRpc) {
         this.nodeUrl = options.nodeUrl;
-        this.headers = { ...defaultOptions3.headers, ...options.headers };
+        this.headers = { ...defaultOptions.headers, ...options.headers };
         this.baseFetch = options.baseFetch;
         this.requestId = options.requestId;
         return;
       }
       if (options && "nodeUrl" in options && "headers" in options && "baseFetch" in options) {
         this.nodeUrl = options.nodeUrl ?? getDefaultPaymasterNodeUrl(void 0);
-        this.headers = { ...defaultOptions3.headers, ...options.headers };
+        this.headers = { ...defaultOptions.headers, ...options.headers };
         this.baseFetch = options.baseFetch ?? fetch_default;
         this.requestId = 0;
         return;
@@ -20198,7 +20256,7 @@ ${indent}}` : "}";
         this.nodeUrl = getDefaultPaymasterNodeUrl(void 0, options?.default);
       }
       this.baseFetch = baseFetch ?? fetch_default;
-      this.headers = { ...defaultOptions3.headers, ...headers };
+      this.headers = { ...defaultOptions.headers, ...headers };
       this.requestId = 0;
     }
     fetch(method, params, id = 0) {
@@ -20512,7 +20570,7 @@ ${indent}}` : "}";
     }
     // TODO: TT Cairo version is still needed for invoke on existing contracts
     async estimateInvokeFee(calls, details = {}) {
-      const invocations = [{ type: ETransactionType.INVOKE, payload: [calls].flat() }];
+      const invocations = [{ type: ETransactionType2.INVOKE, payload: [calls].flat() }];
       const estimateBulk = await this.estimateFeeBulk(invocations, details);
       return estimateBulk[0];
     }
@@ -20523,7 +20581,7 @@ ${indent}}` : "}";
       );
       const invocations = [
         {
-          type: ETransactionType.DECLARE,
+          type: ETransactionType2.DECLARE,
           payload: extractContractHashes(payload, await this.channel.getStarknetVersion())
         }
       ];
@@ -20540,7 +20598,7 @@ ${indent}}` : "}";
       const contractAddressFinal = contractAddress ?? calculateContractAddressFromHash(addressSalt, classHash, compiledCalldata, 0);
       const invocations = [
         {
-          type: ETransactionType.DEPLOY_ACCOUNT,
+          type: ETransactionType2.DEPLOY_ACCOUNT,
           payload: {
             classHash,
             constructorCalldata: compiledCalldata,
@@ -20613,7 +20671,7 @@ ${indent}}` : "}";
         resourceBounds = estimateResponse.resourceBounds;
       }
       const accountInvocations = await this.accountInvocationsFactory(
-        [{ type: ETransactionType.INVOKE, payload: calls }],
+        [{ type: ETransactionType2.INVOKE, payload: calls }],
         {
           ...v3Details(detailsWithTip),
           resourceBounds,
@@ -20712,7 +20770,7 @@ ${indent}}` : "}";
         resourceBounds = estimateResponse.resourceBounds;
       }
       const accountInvocations = await this.accountInvocationsFactory(
-        [{ type: ETransactionType.DECLARE, payload: declareContractPayload }],
+        [{ type: ETransactionType2.DECLARE, payload: declareContractPayload }],
         {
           ...v3Details(detailsWithTip),
           resourceBounds,
@@ -20791,7 +20849,7 @@ ${indent}}` : "}";
       const accountInvocations = await this.accountInvocationsFactory(
         [
           {
-            type: ETransactionType.DEPLOY_ACCOUNT,
+            type: ETransactionType2.DEPLOY_ACCOUNT,
             payload: {
               classHash,
               constructorCalldata: compiledCalldata,
@@ -21063,7 +21121,7 @@ ${indent}}` : "}";
       const chainId = await this.getChainId();
       const versions = details.versions.map((it) => toTransactionVersion(it));
       const tx0Payload = "payload" in invocations[0] ? invocations[0].payload : invocations[0];
-      const cairoVersion = invocations[0].type === ETransactionType.DEPLOY_ACCOUNT ? await this.getCairoVersion(tx0Payload.classHash) : await this.getCairoVersion();
+      const cairoVersion = invocations[0].type === ETransactionType2.DEPLOY_ACCOUNT ? await this.getCairoVersion(tx0Payload.classHash) : await this.getCairoVersion();
       return Promise.all(
         [].concat(invocations).map(async (transaction, index) => {
           const txPayload = "payload" in transaction ? transaction.payload : transaction;
@@ -21082,7 +21140,7 @@ ${indent}}` : "}";
             blockIdentifier,
             version: versions[0]
           };
-          if (transaction.type === ETransactionType.INVOKE) {
+          if (transaction.type === ETransactionType2.INVOKE) {
             const payload = await this.buildInvocation(
               [].concat(txPayload),
               signerDetails
@@ -21093,17 +21151,17 @@ ${indent}}` : "}";
               ...signerDetails
             };
           }
-          if (transaction.type === ETransactionType.DEPLOY) {
+          if (transaction.type === ETransactionType2.DEPLOY) {
             const { calls } = this.deployer.buildDeployerCall(txPayload, this.address);
             const payload = await this.buildInvocation(calls, signerDetails);
             return {
               ...common2,
               ...payload,
               ...signerDetails,
-              type: ETransactionType.INVOKE
+              type: ETransactionType2.INVOKE
             };
           }
-          if (transaction.type === ETransactionType.DECLARE) {
+          if (transaction.type === ETransactionType2.DECLARE) {
             assert(
               isSierra(txPayload.contract),
               "Declare fee estimation is not supported for Cairo0 contracts"
@@ -21115,7 +21173,7 @@ ${indent}}` : "}";
               ...signerDetails
             };
           }
-          if (transaction.type === ETransactionType.DEPLOY_ACCOUNT) {
+          if (transaction.type === ETransactionType2.DEPLOY_ACCOUNT) {
             const payload = await this.buildAccountDeployPayload(txPayload, signerDetails);
             return {
               ...common2,
@@ -21590,7 +21648,10 @@ ${indent}}` : "}";
   // src/utils/events/index.ts
   var events_exports = {};
   __export(events_exports, {
+    addGetByPathMethod: () => addGetByPathMethod,
+    filterEventsByAddress: () => filterEventsByAddress,
     getAbiEvents: () => getAbiEvents,
+    getEmittedEvents: () => getEmittedEvents,
     isAbiEvent: () => isAbiEvent,
     parseEvents: () => parseEvents
   });
@@ -21664,52 +21725,79 @@ ${indent}}` : "}";
     return output;
   }
   function parseEvents(providerReceivedEvents, abiEvents, abiStructs, abiEnums, parser) {
-    const ret = providerReceivedEvents.flat().reduce((acc, recEvent) => {
-      const currentEvent = JSON.parse(JSON.stringify(recEvent));
-      let abiEvent = abiEvents[currentEvent.keys.shift() ?? 0];
+    const ret = providerReceivedEvents.reduce((acc, recEvent) => {
+      const eventKeys = [...recEvent.keys];
+      const eventData = [...recEvent.data];
+      let abiEvent = abiEvents[eventKeys.shift() ?? 0];
       if (!abiEvent) {
         return acc;
       }
       while (!abiEvent.name) {
-        const hashName = currentEvent.keys.shift();
+        const hashName = eventKeys.shift();
         assert(!!hashName, 'Not enough data in "keys" property of this event.');
         abiEvent = abiEvent[hashName];
       }
-      const parsedEvent = {};
-      parsedEvent[abiEvent.name] = {};
-      const keysIter = currentEvent.keys[Symbol.iterator]();
-      const dataIter = currentEvent.data[Symbol.iterator]();
+      const { from_address: _from, keys: _keys, data: _data, ...eventMetadata } = recEvent;
+      const parsedEvent = eventMetadata;
+      const eventName = abiEvent.name;
+      parsedEvent[eventName] = {};
+      const keysIter = eventKeys[Symbol.iterator]();
+      const dataIter = eventData[Symbol.iterator]();
       const abiEventKeys = abiEvent.members?.filter((it) => it.kind === "key") || abiEvent.keys;
       const abiEventData = abiEvent.members?.filter((it) => it.kind === "data") || abiEvent.data;
+      const parsedEventData = parsedEvent[eventName];
       abiEventKeys.forEach((key) => {
-        parsedEvent[abiEvent.name][key.name] = responseParser({
+        parsedEventData[key.name] = responseParser({
           responseIterator: keysIter,
           output: key,
           structs: abiStructs,
           enums: abiEnums,
           parser,
-          parsedResult: parsedEvent[abiEvent.name]
+          parsedResult: parsedEventData
         });
       });
       abiEventData.forEach((data) => {
-        parsedEvent[abiEvent.name][data.name] = responseParser({
+        parsedEventData[data.name] = responseParser({
           responseIterator: dataIter,
           output: data,
           structs: abiStructs,
           enums: abiEnums,
           parser,
-          parsedResult: parsedEvent[abiEvent.name]
+          parsedResult: parsedEventData
         });
       });
-      if ("block_hash" in currentEvent) parsedEvent.block_hash = currentEvent.block_hash;
-      if ("block_number" in currentEvent) parsedEvent.block_number = currentEvent.block_number;
-      if ("transaction_hash" in currentEvent)
-        parsedEvent.transaction_hash = currentEvent.transaction_hash;
       acc.push(parsedEvent);
       return acc;
     }, []);
     return ret;
   }
+  function addGetByPathMethod(parsedEvents) {
+    Object.defineProperty(parsedEvents, "getByPath", {
+      value: (path) => {
+        const event = parsedEvents.find((ev) => Object.keys(ev).some((key) => key.includes(path)));
+        const eventKey = Object.keys(event || {}).find((key) => key.includes(path));
+        return eventKey && event ? event[eventKey] : null;
+      },
+      writable: false,
+      enumerable: false,
+      configurable: false
+    });
+    return parsedEvents;
+  }
+  function getEmittedEvents(receipt, contractAddress) {
+    if (!receipt.events) return [];
+    const eventsToEnrich = contractAddress ? filterEventsByAddress(receipt.events, contractAddress) : receipt.events;
+    return eventsToEnrich.map((event) => ({
+      ...event,
+      transaction_hash: receipt.transaction_hash,
+      block_hash: receipt.block_hash,
+      block_number: receipt.block_number
+    }));
+  }
+  function filterEventsByAddress(events, contractAddress) {
+    if (!events) return [];
+    return events.filter((event) => toHex(event.from_address) === toHex(contractAddress));
+  }
 
   // src/contract/default.ts
   function buildCall(contract, functionAbi) {
@@ -21970,45 +22058,19 @@ ${indent}}` : "}";
         calldata
       };
     }
-    // TODO: Demistify what is going on here ???
-    // TODO: receipt status filtering test and fix this do not look right
     parseEvents(receipt) {
-      let parsed = [];
-      receipt.match({
-        SUCCEEDED: (txR) => {
-          const emittedEvents = txR.events?.map((event) => {
-            return {
-              // TODO: this do not check that block is production and block_hash and block_number actually exists
-              // TODO: second issue is that ts do not complains about it
-              block_hash: txR.block_hash,
-              block_number: txR.block_number,
-              transaction_hash: txR.transaction_hash,
-              ...event
-            };
-          }).filter((event) => toHex(event.from_address) === toHex(this.address), []) || [];
-          parsed = parseEvents(
-            emittedEvents,
-            this.events,
-            this.structs,
-            CallData.getAbiEnum(this.abi),
-            this.callData.parser
-          );
-        },
-        _: () => {
-          throw Error("This transaction was not successful.");
-        }
-      });
-      Object.defineProperty(parsed, "getByPath", {
-        value: (path) => {
-          const event = parsed.find((ev) => Object.keys(ev).some((key) => key.includes(path)));
-          const eventKey = Object.keys(event || {}).find((key) => key.includes(path));
-          return eventKey && event ? event[eventKey] : null;
-        },
-        writable: false,
-        enumerable: false,
-        configurable: false
-      });
-      return parsed;
+      if (!receipt.isSuccess()) {
+        throw Error("This transaction was not successful.");
+      }
+      return addGetByPathMethod(
+        parseEvents(
+          getEmittedEvents(receipt.value, this.address),
+          this.events,
+          this.structs,
+          CallData.getAbiEnum(this.abi),
+          this.callData.parser
+        )
+      );
     }
     isCairo1() {
       return cairo_exports.isCairo1Abi(this.abi);