starknet 9.2.0 → 9.2.1

package/dist/index.mjs

@@ -78,8 +78,8 @@ import { PAYMASTER_API } from "@starknet-io/starknet-types-010";
 
 // src/types/api/rpc.ts
 var rpc_exports = {};
-__reExport(rpc_exports, starknet_types_09_star);
-import * as starknet_types_09_star from "@starknet-io/starknet-types-09";
+__reExport(rpc_exports, starknet_types_010_star);
+import * as starknet_types_010_star from "@starknet-io/starknet-types-010";
 
 // src/types/api/index.ts
 __reExport(api_exports, rpc_exports);
@@ -7102,7 +7102,7 @@ var Subscription = class {
   }
 };
 
-// src/channel/ws/ws_0_9.ts
+// src/channel/ws/ws_0_10.ts
 var WebSocketChannel = class {
   /**
    * The URL of the WebSocket RPC Node.
@@ -12194,7 +12194,10 @@ var WalletAccountV5 = class _WalletAccountV5 extends Account {
 // src/utils/events/index.ts
 var events_exports = {};
 __export(events_exports, {
+  addGetByPathMethod: () => addGetByPathMethod,
+  filterEventsByAddress: () => filterEventsByAddress,
   getAbiEvents: () => getAbiEvents,
+  getEmittedEvents: () => getEmittedEvents,
   isAbiEvent: () => isAbiEvent,
   parseEvents: () => parseEvents
 });
@@ -12268,52 +12271,79 @@ function mergeAbiEvents(target, source) {
   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) {
@@ -12574,45 +12604,19 @@ var Contract = class _Contract {
       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);