@across-protocol/sdk 4.1.62 → 4.1.63-beta.0

package/dist/esm/{svm → arch/svm}/eventsClient.js

@@ -2,24 +2,24 @@ import { __assign, __awaiter, __generator, __spreadArray } from "tslib";
 import { getDeployedAddress, SvmSpokeIdl } from "@across-protocol/contracts";
 import { getSolanaChainId } from "@across-protocol/contracts/dist/src/svm/web3-v1";
 import web3 from "@solana/kit";
-import { bs58 } from "../utils";
-import { decodeEvent } from "./utils/events";
-import { isDevnet } from "./utils/helpers";
-var SvmSpokeEventsClient = /** @class */ (function () {
+import { bs58 } from "../../utils";
+import { decodeEvent, isDevnet } from "./utils";
+var SvmCpiEventsClient = /** @class */ (function () {
     /**
-     * Private constructor. Use the async create() method to instantiate.
+     * Protected constructor. Use the async create() method to instantiate.
      */
-    function SvmSpokeEventsClient(rpc, svmSpokeAddress, eventAuthority) {
+    function SvmCpiEventsClient(rpc, address, eventAuthority, idl) {
         this.rpc = rpc;
-        this.svmSpokeAddress = svmSpokeAddress;
-        this.svmSpokeEventAuthority = eventAuthority;
+        this.programAddress = address;
+        this.programEventAuthority = eventAuthority;
+        this.idl = idl;
     }
     /**
      * Factory method to asynchronously create an instance of SvmSpokeEventsClient.
      */
-    SvmSpokeEventsClient.create = function (rpc) {
+    SvmCpiEventsClient.create = function (rpc) {
         return __awaiter(this, void 0, void 0, function () {
-            var isTestnet, programId, svmSpokeAddress, svmSpokeEventAuthority;
+            var isTestnet, programId;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, isDevnet(rpc)];
@@ -28,14 +28,25 @@ var SvmSpokeEventsClient = /** @class */ (function () {
                         programId = getDeployedAddress("SvmSpoke", getSolanaChainId(isTestnet ? "devnet" : "mainnet").toString());
                         if (!programId)
                             throw new Error("Program not found");
-                        svmSpokeAddress = web3.address(programId);
+                        return [2 /*return*/, this.createFor(rpc, programId, SvmSpokeIdl)];
+                }
+            });
+        });
+    };
+    SvmCpiEventsClient.createFor = function (rpc, programId, idl) {
+        return __awaiter(this, void 0, void 0, function () {
+            var address, eventAuthority;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        address = web3.address(programId);
                         return [4 /*yield*/, web3.getProgramDerivedAddress({
-                                programAddress: svmSpokeAddress,
+                                programAddress: address,
                                 seeds: ["__event_authority"],
                             })];
-                    case 2:
-                        svmSpokeEventAuthority = (_a.sent())[0];
-                        return [2 /*return*/, new SvmSpokeEventsClient(rpc, svmSpokeAddress, svmSpokeEventAuthority)];
+                    case 1:
+                        eventAuthority = (_a.sent())[0];
+                        return [2 /*return*/, new SvmCpiEventsClient(rpc, address, eventAuthority, idl)];
                 }
             });
         });
@@ -49,7 +60,7 @@ var SvmSpokeEventsClient = /** @class */ (function () {
      * @param options - Options for fetching signatures.
      * @returns A promise that resolves to an array of events matching the eventName.
      */
-    SvmSpokeEventsClient.prototype.queryEvents = function (eventName, fromSlot, toSlot, options) {
+    SvmCpiEventsClient.prototype.queryEvents = function (eventName, fromSlot, toSlot, options) {
         if (options === void 0) { options = { limit: 1000, commitment: "confirmed" }; }
         return __awaiter(this, void 0, void 0, function () {
             var events;
@@ -63,22 +74,47 @@ var SvmSpokeEventsClient = /** @class */ (function () {
             });
         });
     };
+    /**
+     * Queries events for the provided derived address at instantiation filtered by event name.
+     *
+     * @param eventName - The name of the event to filter by.
+     * @param fromSlot - Optional starting slot.
+     * @param toSlot - Optional ending slot.
+     * @param options - Options for fetching signatures.
+     * @returns A promise that resolves to an array of events matching the eventName.
+     */
+    SvmCpiEventsClient.prototype.queryDerivedAddressEvents = function (eventName, derivedAddress, fromSlot, toSlot, options) {
+        if (options === void 0) { options = { limit: 1000, commitment: "confirmed" }; }
+        return __awaiter(this, void 0, void 0, function () {
+            var events;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.queryAllEvents(fromSlot, toSlot, options, derivedAddress)];
+                    case 1:
+                        events = _a.sent();
+                        return [2 /*return*/, events.filter(function (event) { return event.name === eventName; })];
+                }
+            });
+        });
+    };
     /**
      * Queries all events for a specific program.
      *
      * @param fromSlot - Optional starting slot.
      * @param toSlot - Optional ending slot.
      * @param options - Options for fetching signatures.
+     * @param forDerivedAddress - Whether to query events for the program or the derived address.
      * @returns A promise that resolves to an array of all events with additional metadata.
      */
-    SvmSpokeEventsClient.prototype.queryAllEvents = function (fromSlot, toSlot, options) {
+    SvmCpiEventsClient.prototype.queryAllEvents = function (fromSlot, toSlot, options, derivedAddress) {
         if (options === void 0) { options = { limit: 1000, commitment: "confirmed" }; }
         return __awaiter(this, void 0, void 0, function () {
-            var allSignatures, hasMoreSignatures, currentOptions, signatures, filteredSignatures, eventsWithSlots;
+            var addressToQuery, allSignatures, hasMoreSignatures, currentOptions, signatures, filteredSignatures, eventsWithSlots;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        addressToQuery = derivedAddress || this.programAddress;
                         allSignatures = [];
                         hasMoreSignatures = true;
                         currentOptions = options;
@@ -86,7 +122,7 @@ var SvmSpokeEventsClient = /** @class */ (function () {
                     case 1:
                         if (!hasMoreSignatures) return [3 /*break*/, 3];
                         return [4 /*yield*/, this.rpc
-                                .getSignaturesForAddress(this.svmSpokeAddress, currentOptions)
+                                .getSignaturesForAddress(addressToQuery, currentOptions)
                                 .send()];
                     case 2:
                         signatures = _a.sent();
@@ -134,7 +170,7 @@ var SvmSpokeEventsClient = /** @class */ (function () {
      * @param commitment - Commitment level.
      * @returns A promise that resolves to an array of events.
      */
-    SvmSpokeEventsClient.prototype.readEventsFromSignature = function (txSignature, commitment) {
+    SvmCpiEventsClient.prototype.readEventsFromSignature = function (txSignature, commitment) {
         if (commitment === void 0) { commitment = "confirmed"; }
         return __awaiter(this, void 0, void 0, function () {
             var txResult;
@@ -158,7 +194,7 @@ var SvmSpokeEventsClient = /** @class */ (function () {
      * @param txResult - The transaction result.
      * @returns A promise that resolves to an array of events with their data and name.
      */
-    SvmSpokeEventsClient.prototype.processEventFromTx = function (txResult) {
+    SvmCpiEventsClient.prototype.processEventFromTx = function (txResult) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         if (!txResult)
             return [];
@@ -177,19 +213,25 @@ var SvmSpokeEventsClient = /** @class */ (function () {
                 var singleIxAccount = ix.accounts.length === 1 ? messageAccountKeys[ix.accounts[0]] : undefined;
                 if (ixProgramId !== undefined &&
                     singleIxAccount !== undefined &&
-                    this.svmSpokeAddress === ixProgramId &&
-                    this.svmSpokeEventAuthority === singleIxAccount) {
+                    this.programAddress === ixProgramId &&
+                    this.programEventAuthority === singleIxAccount) {
                     var ixData = bs58.decode(ix.data);
                     // Skip the first 8 bytes (assumed header) and encode the rest.
                     var eventData = Buffer.from(ixData.slice(8)).toString("base64");
-                    var _m = decodeEvent(SvmSpokeIdl, eventData), name_1 = _m.name, data = _m.data;
-                    events.push({ program: this.svmSpokeAddress, name: name_1, data: data });
+                    var _m = decodeEvent(this.idl, eventData), name_1 = _m.name, data = _m.data;
+                    events.push({ program: this.programAddress, name: name_1, data: data });
                 }
             }
         }
         return events;
     };
-    return SvmSpokeEventsClient;
+    SvmCpiEventsClient.prototype.getProgramAddress = function () {
+        return this.programAddress;
+    };
+    SvmCpiEventsClient.prototype.getRpc = function () {
+        return this.rpc;
+    };
+    return SvmCpiEventsClient;
 }());
-export { SvmSpokeEventsClient };
+export { SvmCpiEventsClient };
 //# sourceMappingURL=eventsClient.js.map

package/dist/esm/arch/svm/eventsClient.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"eventsClient.js","sourceRoot":"","sources":["../../../../src/arch/svm/eventsClient.ts"],"names":[],"mappings":"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"}

package/dist/esm/arch/svm/index.d.ts

@@ -1 +1,5 @@
-export declare const platform = "svm";
+export * from "./eventsClient";
+export * from "./SpokeUtils";
+export * from "./types";
+export * from "./utils";
+export * from "./constants";

package/dist/esm/arch/svm/index.js

@@ -1,2 +1,6 @@
-export var platform = "svm"; // Placeholder for actual exports.
+export * from "./eventsClient";
+export * from "./SpokeUtils";
+export * from "./types";
+export * from "./utils";
+export * from "./constants";
 //# sourceMappingURL=index.js.map

package/dist/esm/arch/svm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/arch/svm/index.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,IAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,kCAAkC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/arch/svm/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC"}

package/dist/{types → esm/arch}/svm/types.d.ts

@@ -1,5 +1,5 @@
-import { Signature, Address, UnixTimestamp } from "@solana/kit";
 import { SvmSpokeClient } from "@across-protocol/contracts";
+import { Address, Rpc, RpcSubscriptions, RpcTransport, Signature, SignatureNotificationsApi, SlotNotificationsApi, SolanaRpcApiFromTransport, UnixTimestamp } from "@solana/kit";
 export type EventData = SvmSpokeClient.BridgedToHubPool | SvmSpokeClient.TokensBridged | SvmSpokeClient.ExecutedRelayerRefundRoot | SvmSpokeClient.RelayedRootBundle | SvmSpokeClient.PausedDeposits | SvmSpokeClient.PausedFills | SvmSpokeClient.SetXDomainAdmin | SvmSpokeClient.EnabledDepositRoute | SvmSpokeClient.FilledRelay | SvmSpokeClient.FundsDeposited | SvmSpokeClient.EmergencyDeletedRootBundle | SvmSpokeClient.RequestedSlowFill | SvmSpokeClient.ClaimedRelayerRefund | SvmSpokeClient.TransferredOwnership;
 export declare enum SVMEventNames {
     FilledRelay = "FilledRelay",
@@ -18,13 +18,17 @@ export declare enum SVMEventNames {
     TransferredOwnership = "TransferredOwnership"
 }
 export type EventName = keyof typeof SVMEventNames;
-export type EventWithData<T extends EventData> = {
+export type EventWithData = {
     confirmationStatus: string | null;
     blockTime: UnixTimestamp | null;
     signature: Signature;
     slot: bigint;
-    name: EventName;
-    data: T;
+    name: string;
+    data: unknown;
     program: Address;
 };
-//# sourceMappingURL=types.d.ts.map
+export type RpcClient = {
+    rpc: Rpc<SolanaRpcApiFromTransport<RpcTransport>>;
+    rpcSubscriptions: RpcSubscriptions<SignatureNotificationsApi & SlotNotificationsApi>;
+};
+export type SVMProvider = Rpc<SolanaRpcApiFromTransport<RpcTransport>>;

package/dist/esm/arch/svm/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/arch/svm/types.ts"],"names":[],"mappings":"AA6BA,MAAM,CAAN,IAAY,aAeX;AAfD,WAAY,aAAa;IACvB,4CAA2B,CAAA;IAC3B,kDAAiC,CAAA;IACjC,4DAA2C,CAAA;IAC3C,wDAAuC,CAAA;IACvC,wEAAuD,CAAA;IACvD,sDAAqC,CAAA;IACrC,kDAAiC,CAAA;IACjC,4CAA2B,CAAA;IAC3B,oDAAmC,CAAA;IACnC,0EAAyD,CAAA;IACzD,wDAAuC,CAAA;IACvC,8DAA6C,CAAA;IAC7C,gDAA+B,CAAA;IAC/B,8DAA6C,CAAA;AAC/C,CAAC,EAfW,aAAa,KAAb,aAAa,QAexB"}

package/dist/esm/arch/svm/utils.d.ts

@@ -0,0 +1,59 @@
+import { Idl } from "@coral-xyz/anchor";
+import { Address, type TransactionSigner } from "@solana/kit";
+import { RelayData } from "../../interfaces";
+import { EventName, SVMProvider } from "./types";
+/**
+ * Basic void TransactionSigner type
+ */
+export declare const SolanaVoidSigner: (simulationAddress: string) => TransactionSigner<string>;
+/**
+ * Helper to determine if the current RPC network is devnet.
+ */
+export declare function isDevnet(rpc: SVMProvider): Promise<boolean>;
+/**
+ * Parses event data from a transaction.
+ */
+export declare function parseEventData(eventData: any): any;
+/**
+ * Decodes a raw event according to a supplied IDL.
+ */
+export declare function decodeEvent(idl: Idl, rawEvent: string): {
+    data: unknown;
+    name: string;
+};
+/**
+ * Gets the event name from a raw name.
+ */
+export declare function getEventName(rawName: string): EventName;
+/**
+ * Unwraps any data structure and converts Address types to strings and Uint8Array to hex or BigInt.
+ * Recursively processes nested objects and arrays.
+ */
+export declare function unwrapEventData(data: unknown, uint8ArrayKeysAsBigInt?: string[], currentKey?: string): unknown;
+/**
+ * Returns the PDA for the State account.
+ * @param programId The SpokePool program ID.
+ * @returns The PDA for the State account.
+ */
+export declare function getStatePda(programId: Address): Promise<Address>;
+/**
+ * Returns the fill status PDA for the given relay data.
+ * @param programId The SpokePool program ID.
+ * @param relayData The relay data to get the fill status PDA for.
+ * @param destinationChainId The destination chain ID.
+ * @returns The PDA for the fill status.
+ */
+export declare function getFillStatusPda(programId: Address, relayData: RelayData, destinationChainId: number): Promise<Address>;
+/**
+ * Returns the PDA for a route account on SVM Spoke.
+ * @param originToken The origin token address.
+ * @param seed The seed for the route account.
+ * @param routeChainId The route chain ID.
+ * @returns The PDA for the route account.
+ */
+export declare function getRoutePda(originToken: Address, seed: bigint, routeChainId: bigint): Promise<Address>;
+/**
+ * Returns the PDA for the Event Authority.
+ * @returns The PDA for the Event Authority.
+ */
+export declare const getEventAuthority: () => Promise<Address<string>>;

package/dist/esm/arch/svm/utils.js

@@ -0,0 +1,248 @@
+import { __awaiter, __generator } from "tslib";
+import { BN, BorshEventCoder } from "@coral-xyz/anchor";
+import { address, getProgramDerivedAddress, getU64Encoder, getAddressEncoder, isAddress, } from "@solana/kit";
+import { BigNumber, getRelayDataHash, isUint8Array, SvmAddress } from "../../utils";
+import { SvmSpokeClient } from "@across-protocol/contracts";
+import { FillType } from "../../interfaces";
+import { SVMEventNames } from "./types";
+/**
+ * Basic void TransactionSigner type
+ */
+export var SolanaVoidSigner = function (simulationAddress) {
+    return {
+        address: address(simulationAddress),
+        signAndSendTransactions: function () { return __awaiter(void 0, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, Promise.resolve([])];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        }); },
+    };
+};
+/**
+ * Helper to determine if the current RPC network is devnet.
+ */
+export function isDevnet(rpc) {
+    return __awaiter(this, void 0, void 0, function () {
+        var genesisHash;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, rpc.getGenesisHash().send()];
+                case 1:
+                    genesisHash = _a.sent();
+                    return [2 /*return*/, genesisHash === "EtWTRABZaYq6iMfeYKouRu166VU2xqa1wcaWoxPkrZBG"];
+            }
+        });
+    });
+}
+/**
+ * Parses event data from a transaction.
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function parseEventData(eventData) {
+    if (!eventData)
+        return eventData;
+    if (Array.isArray(eventData)) {
+        return eventData.map(parseEventData);
+    }
+    if (typeof eventData === "object") {
+        if (eventData.constructor.name === "PublicKey") {
+            return address(eventData.toString());
+        }
+        if (BN.isBN(eventData)) {
+            return BigInt(eventData.toString());
+        }
+        // Convert each key from snake_case to camelCase and process the value recursively.
+        return Object.fromEntries(Object.entries(eventData).map(function (_a) {
+            var key = _a[0], value = _a[1];
+            return [snakeToCamel(key), parseEventData(value)];
+        }));
+    }
+    return eventData;
+}
+/**
+ * Decodes a raw event according to a supplied IDL.
+ */
+export function decodeEvent(idl, rawEvent) {
+    var event = new BorshEventCoder(idl).decode(rawEvent);
+    if (!event)
+        throw new Error("Malformed rawEvent for IDL ".concat(idl.address, ": ").concat(rawEvent));
+    return {
+        name: event.name,
+        data: parseEventData(event.data),
+    };
+}
+/**
+ * Converts a snake_case string to camelCase.
+ */
+function snakeToCamel(s) {
+    return s.replace(/(_\w)/g, function (match) { return match[1].toUpperCase(); });
+}
+/**
+ * Gets the event name from a raw name.
+ */
+export function getEventName(rawName) {
+    if (Object.values(SVMEventNames).some(function (name) { return rawName.includes(name); }))
+        return rawName;
+    throw new Error("Unknown event name: ".concat(rawName));
+}
+/**
+ * Unwraps any data structure and converts Address types to strings and Uint8Array to hex or BigInt.
+ * Recursively processes nested objects and arrays.
+ */
+export function unwrapEventData(data, uint8ArrayKeysAsBigInt, currentKey) {
+    if (uint8ArrayKeysAsBigInt === void 0) { uint8ArrayKeysAsBigInt = ["depositId"]; }
+    // Handle null/undefined
+    if (data == null) {
+        return data;
+    }
+    // Handle BigInt
+    if (typeof data === "bigint") {
+        return BigNumber.from(data);
+    }
+    // Handle Uint8Array and byte arrays
+    if (data instanceof Uint8Array || isUint8Array(data)) {
+        var bytes = data instanceof Uint8Array ? data : new Uint8Array(data);
+        var hex = "0x" + Buffer.from(bytes).toString("hex");
+        if (currentKey && uint8ArrayKeysAsBigInt.includes(currentKey)) {
+            return BigNumber.from(hex);
+        }
+        return hex;
+    }
+    // Handle regular arrays (non-byte arrays)
+    if (Array.isArray(data)) {
+        return data.map(function (item) { return unwrapEventData(item, uint8ArrayKeysAsBigInt); });
+    }
+    // Handle strings (potential addresses)
+    if (typeof data === "string" && isAddress(data)) {
+        return SvmAddress.from(data).toBytes32();
+    }
+    // Handle objects
+    if (typeof data === "object") {
+        // Special case: if an object is in the context of the fillType key, then
+        // parse out the fillType from the object
+        if (currentKey === "fillType") {
+            var fillType = Object.keys(data)[0];
+            switch (fillType) {
+                case "FastFill":
+                    return FillType.FastFill;
+                case "ReplacedSlowFill":
+                    return FillType.ReplacedSlowFill;
+                case "SlowFill":
+                    return FillType.SlowFill;
+                default:
+                    throw new Error("Unknown fill type: ".concat(fillType));
+            }
+        }
+        // Special case: if an object is empty, return 0x
+        if (Object.keys(data).length === 0) {
+            return "0x";
+        }
+        return Object.fromEntries(Object.entries(data).map(function (_a) {
+            var key = _a[0], value = _a[1];
+            return [
+                key,
+                unwrapEventData(value, uint8ArrayKeysAsBigInt, key),
+            ];
+        }));
+    }
+    // Return primitives as is
+    return data;
+}
+/**
+ * Returns the PDA for the State account.
+ * @param programId The SpokePool program ID.
+ * @returns The PDA for the State account.
+ */
+export function getStatePda(programId) {
+    return __awaiter(this, void 0, void 0, function () {
+        var intEncoder, seed, statePda;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    intEncoder = getU64Encoder();
+                    seed = intEncoder.encode(0);
+                    return [4 /*yield*/, getProgramDerivedAddress({
+                            programAddress: programId,
+                            seeds: ["state", seed],
+                        })];
+                case 1:
+                    statePda = (_a.sent())[0];
+                    return [2 /*return*/, statePda];
+            }
+        });
+    });
+}
+/**
+ * Returns the fill status PDA for the given relay data.
+ * @param programId The SpokePool program ID.
+ * @param relayData The relay data to get the fill status PDA for.
+ * @param destinationChainId The destination chain ID.
+ * @returns The PDA for the fill status.
+ */
+export function getFillStatusPda(programId, relayData, destinationChainId) {
+    return __awaiter(this, void 0, void 0, function () {
+        var relayDataHash, uint8RelayDataHash, fillStatusPda;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    relayDataHash = getRelayDataHash(relayData, destinationChainId);
+                    uint8RelayDataHash = new Uint8Array(Buffer.from(relayDataHash.slice(2), "hex"));
+                    return [4 /*yield*/, getProgramDerivedAddress({
+                            programAddress: programId,
+                            seeds: ["fills", uint8RelayDataHash],
+                        })];
+                case 1:
+                    fillStatusPda = (_a.sent())[0];
+                    return [2 /*return*/, fillStatusPda];
+            }
+        });
+    });
+}
+/**
+ * Returns the PDA for a route account on SVM Spoke.
+ * @param originToken The origin token address.
+ * @param seed The seed for the route account.
+ * @param routeChainId The route chain ID.
+ * @returns The PDA for the route account.
+ */
+export function getRoutePda(originToken, seed, routeChainId) {
+    return __awaiter(this, void 0, void 0, function () {
+        var intEncoder, addressEncoder, pda;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    intEncoder = getU64Encoder();
+                    addressEncoder = getAddressEncoder();
+                    return [4 /*yield*/, getProgramDerivedAddress({
+                            programAddress: address(SvmSpokeClient.SVM_SPOKE_PROGRAM_ADDRESS),
+                            seeds: ["route", addressEncoder.encode(originToken), intEncoder.encode(seed), intEncoder.encode(routeChainId)],
+                        })];
+                case 1:
+                    pda = (_a.sent())[0];
+                    return [2 /*return*/, pda];
+            }
+        });
+    });
+}
+/**
+ * Returns the PDA for the Event Authority.
+ * @returns The PDA for the Event Authority.
+ */
+export var getEventAuthority = function () { return __awaiter(void 0, void 0, void 0, function () {
+    var eventAuthority;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, getProgramDerivedAddress({
+                    programAddress: address(SvmSpokeClient.SVM_SPOKE_PROGRAM_ADDRESS),
+                    seeds: ["__event_authority"],
+                })];
+            case 1:
+                eventAuthority = (_a.sent())[0];
+                return [2 /*return*/, eventAuthority];
+        }
+    });
+}); };
+//# sourceMappingURL=utils.js.map

package/dist/esm/arch/svm/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/arch/svm/utils.ts"],"names":[],"mappings":"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"}

package/dist/esm/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.d.ts

@@ -43,7 +43,7 @@ export declare class AcrossConfigStoreClient extends BaseAbstractClient {
     cumulativeDisabledChainUpdates: DisabledChainsUpdate[];
     hasLatestConfigStoreVersion: boolean;
     chainId: number | undefined;
-    constructor(logger: winston.Logger, configStore: Contract, eventSearchConfig: MakeOptional<EventSearchConfig, "toBlock"> | undefined, configStoreVersion: number);
+    constructor(logger: winston.Logger, configStore: Contract, eventSearchConfig: MakeOptional<EventSearchConfig, "to"> | undefined, configStoreVersion: number);
     getRateModelForBlockNumber(l1Token: string, originChainId: number | string, destinationChainId: number | string, blockNumber?: number | undefined): RateModel;
     getRouteRateModelForBlockNumber(l1Token: string, route: string, blockNumber?: number | undefined): RateModel | undefined;
     /**

package/dist/esm/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.js

@@ -39,7 +39,7 @@ var KNOWN_INVALID_TOKEN_CONFIG_UPDATE_HASHES = [
 var AcrossConfigStoreClient = /** @class */ (function (_super) {
     __extends(AcrossConfigStoreClient, _super);
     function AcrossConfigStoreClient(logger, configStore, eventSearchConfig, configStoreVersion) {
-        if (eventSearchConfig === void 0) { eventSearchConfig = { fromBlock: 0, maxBlockLookBack: 0 }; }
+        if (eventSearchConfig === void 0) { eventSearchConfig = { from: 0, maxLookBack: 0 }; }
         var _this = _super.call(this, eventSearchConfig) || this;
         _this.logger = logger;
         _this.configStore = configStore;
@@ -54,8 +54,8 @@ var AcrossConfigStoreClient = /** @class */ (function (_super) {
         _this.cumulativeConfigStoreVersionUpdates = [];
         _this.cumulativeDisabledChainUpdates = [];
         _this.hasLatestConfigStoreVersion = false;
-        _this.firstBlockToSearch = eventSearchConfig.fromBlock;
-        _this.latestBlockSearched = 0;
+        _this.firstHeightToSearch = eventSearchConfig.from;
+        _this.latestHeightSearched = 0;
         return _this;
     }
     AcrossConfigStoreClient.prototype.getRateModelForBlockNumber = function (l1Token, originChainId, destinationChainId, blockNumber) {
@@ -299,7 +299,7 @@ var AcrossConfigStoreClient = /** @class */ (function (_super) {
                         return [2 /*return*/, {
                                 success: true,
                                 chainId: chainId,
-                                searchEndBlock: searchConfig.toBlock,
+                                searchEndBlock: searchConfig.to,
                                 events: {
                                     updatedTokenConfigEvents: updatedTokenConfigSortableEvents,
                                     updatedGlobalConfigEvents: updatedGlobalConfigSortableEvents,
@@ -498,9 +498,9 @@ var AcrossConfigStoreClient = /** @class */ (function (_super) {
                             _loop_1(i);
                         }
                         this.hasLatestConfigStoreVersion = this.hasValidConfigStoreVersionForTimestamp();
-                        this.latestBlockSearched = result.searchEndBlock;
-                        this.firstBlockToSearch = result.searchEndBlock + 1; // Next iteration should start off from where this one ended.
-                        this.eventSearchConfig.toBlock = undefined; // Caller can re-set on subsequent updates if necessary
+                        this.latestHeightSearched = result.searchEndBlock;
+                        this.firstHeightToSearch = result.searchEndBlock + 1; // Next iteration should start off from where this one ended.
+                        this.eventSearchConfig.to = undefined; // Caller can re-set on subsequent updates if necessary
                         this.chainId = (_e = this.chainId) !== null && _e !== void 0 ? _e : chainId; // Update on the first run only.
                         this.isUpdated = true;
                         this.logger.debug({ at: "ConfigStore", message: "ConfigStore client updated!" });