@across-protocol/sdk 4.1.63 → 4.2.0

package/dist/cjs/arch/svm/eventsClient.js

@@ -0,0 +1,253 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SvmCpiEventsClient = void 0;
+var tslib_1 = require("tslib");
+var contracts_1 = require("@across-protocol/contracts");
+var web3_v1_1 = require("@across-protocol/contracts/dist/src/svm/web3-v1");
+var kit_1 = require("@solana/kit");
+var utils_1 = require("../../utils");
+var utils_2 = require("./utils");
+var _1 = require("./");
+var assert_1 = tslib_1.__importDefault(require("assert"));
+var SvmCpiEventsClient = (function () {
+    function SvmCpiEventsClient(rpc, address, eventAuthority, idl) {
+        this.rpc = rpc;
+        this.programAddress = address;
+        this.programEventAuthority = eventAuthority;
+        this.idl = idl;
+    }
+    SvmCpiEventsClient.create = function (rpc) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var isTestnet, programId;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4, (0, utils_2.isDevnet)(rpc)];
+                    case 1:
+                        isTestnet = _a.sent();
+                        programId = (0, contracts_1.getDeployedAddress)("SvmSpoke", (0, web3_v1_1.getSolanaChainId)(isTestnet ? "devnet" : "mainnet").toString());
+                        if (!programId)
+                            throw new Error("Program not found");
+                        return [2, this.createFor(rpc, programId, contracts_1.SvmSpokeIdl)];
+                }
+            });
+        });
+    };
+    SvmCpiEventsClient.createFor = function (rpc, programId, idl) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var programAddress, eventAuthority;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        programAddress = (0, kit_1.address)(programId);
+                        return [4, (0, kit_1.getProgramDerivedAddress)({
+                                programAddress: programAddress,
+                                seeds: ["__event_authority"],
+                            })];
+                    case 1:
+                        eventAuthority = (_a.sent())[0];
+                        return [2, new SvmCpiEventsClient(rpc, programAddress, eventAuthority, idl)];
+                }
+            });
+        });
+    };
+    SvmCpiEventsClient.prototype.queryEvents = function (eventName, fromSlot, toSlot, options) {
+        if (options === void 0) { options = { limit: 1000, commitment: "confirmed" }; }
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var events;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4, this.queryAllEvents(fromSlot, toSlot, options)];
+                    case 1:
+                        events = _a.sent();
+                        return [2, events.filter(function (event) { return event.name === eventName; })];
+                }
+            });
+        });
+    };
+    SvmCpiEventsClient.prototype.queryDerivedAddressEvents = function (eventName, derivedAddress, fromSlot, toSlot, options) {
+        if (options === void 0) { options = { limit: 1000, commitment: "confirmed" }; }
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var events;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4, this.queryAllEvents(fromSlot, toSlot, options, derivedAddress)];
+                    case 1:
+                        events = _a.sent();
+                        return [2, events.filter(function (event) { return event.name === eventName; })];
+                }
+            });
+        });
+    };
+    SvmCpiEventsClient.prototype.queryAllEvents = function (fromSlot, toSlot, options, derivedAddress) {
+        if (options === void 0) { options = { limit: 1000, commitment: "confirmed" }; }
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var addressToQuery, allSignatures, hasMoreSignatures, currentOptions, signatures, filteredSignatures, eventsWithSlots;
+            var _this = this;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        addressToQuery = derivedAddress || this.programAddress;
+                        allSignatures = [];
+                        hasMoreSignatures = true;
+                        currentOptions = options;
+                        _a.label = 1;
+                    case 1:
+                        if (!hasMoreSignatures) return [3, 3];
+                        return [4, this.rpc
+                                .getSignaturesForAddress(addressToQuery, currentOptions)
+                                .send()];
+                    case 2:
+                        signatures = _a.sent();
+                        allSignatures.push.apply(allSignatures, signatures);
+                        if (signatures.length > 0) {
+                            currentOptions = tslib_1.__assign(tslib_1.__assign({}, currentOptions), { before: signatures[signatures.length - 1].signature });
+                        }
+                        if (fromSlot && allSignatures.length > 0 && allSignatures[allSignatures.length - 1].slot < fromSlot) {
+                            hasMoreSignatures = false;
+                        }
+                        hasMoreSignatures = Boolean(hasMoreSignatures && currentOptions.limit && signatures.length === currentOptions.limit);
+                        return [3, 1];
+                    case 3:
+                        filteredSignatures = allSignatures.filter(function (signatureTransaction) {
+                            if (fromSlot && signatureTransaction.slot < fromSlot)
+                                return false;
+                            if (toSlot && signatureTransaction.slot > toSlot)
+                                return false;
+                            return true;
+                        });
+                        return [4, Promise.all(filteredSignatures.map(function (signatureTransaction) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                                var events;
+                                return tslib_1.__generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0: return [4, this.readEventsFromSignature(signatureTransaction.signature, options.commitment)];
+                                        case 1:
+                                            events = _a.sent();
+                                            return [2, events.map(function (event) { return (tslib_1.__assign(tslib_1.__assign({}, event), { confirmationStatus: signatureTransaction.confirmationStatus, blockTime: signatureTransaction.blockTime, signature: signatureTransaction.signature, slot: signatureTransaction.slot })); })];
+                                    }
+                                });
+                            }); }))];
+                    case 4:
+                        eventsWithSlots = _a.sent();
+                        return [2, eventsWithSlots.flat()];
+                }
+            });
+        });
+    };
+    SvmCpiEventsClient.prototype.readEventsFromSignature = function (txSignature, commitment) {
+        if (commitment === void 0) { commitment = "confirmed"; }
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var txResult;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4, this.rpc
+                            .getTransaction(txSignature, { commitment: commitment, maxSupportedTransactionVersion: 0 })
+                            .send()];
+                    case 1:
+                        txResult = _a.sent();
+                        if (txResult === null)
+                            return [2, []];
+                        return [2, this.processEventFromTx(txResult)];
+                }
+            });
+        });
+    };
+    SvmCpiEventsClient.prototype.processEventFromTx = function (txResult) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        if (!txResult)
+            return [];
+        var events = [];
+        var accountKeys = txResult.transaction.message.accountKeys;
+        var messageAccountKeys = tslib_1.__spreadArray([], accountKeys, true);
+        messageAccountKeys.push.apply(messageAccountKeys, ((_c = (_b = (_a = txResult === null || txResult === void 0 ? void 0 : txResult.meta) === null || _a === void 0 ? void 0 : _a.loadedAddresses) === null || _b === void 0 ? void 0 : _b.writable) !== null && _c !== void 0 ? _c : []));
+        messageAccountKeys.push.apply(messageAccountKeys, ((_f = (_e = (_d = txResult === null || txResult === void 0 ? void 0 : txResult.meta) === null || _d === void 0 ? void 0 : _d.loadedAddresses) === null || _e === void 0 ? void 0 : _e.readonly) !== null && _f !== void 0 ? _f : []));
+        for (var _i = 0, _j = (_h = (_g = txResult.meta) === null || _g === void 0 ? void 0 : _g.innerInstructions) !== null && _h !== void 0 ? _h : []; _i < _j.length; _i++) {
+            var ixBlock = _j[_i];
+            for (var _k = 0, _l = ixBlock.instructions; _k < _l.length; _k++) {
+                var ix = _l[_k];
+                var ixProgramId = messageAccountKeys[ix.programIdIndex];
+                var singleIxAccount = ix.accounts.length === 1 ? messageAccountKeys[ix.accounts[0]] : undefined;
+                if (ixProgramId !== undefined &&
+                    singleIxAccount !== undefined &&
+                    this.programAddress === ixProgramId &&
+                    this.programEventAuthority === singleIxAccount) {
+                    var ixData = utils_1.bs58.decode(ix.data);
+                    var eventData = Buffer.from(ixData.slice(8)).toString("base64");
+                    var _m = (0, utils_2.decodeEvent)(this.idl, eventData), name_1 = _m.name, data = _m.data;
+                    events.push({ program: this.programAddress, name: name_1, data: data });
+                }
+            }
+        }
+        return events;
+    };
+    SvmCpiEventsClient.prototype.getDepositEventsFromSignature = function (originChainId, txSignature, commitment) {
+        if (commitment === void 0) { commitment = "confirmed"; }
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var _a, events, txDetails, depositEvents;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        (0, assert_1.default)((0, utils_1.chainIsSvm)(originChainId), "Origin chain ".concat(originChainId, " is not an SVM chain"));
+                        return [4, Promise.all([
+                                this.readEventsFromSignature(txSignature, commitment),
+                                this.rpc
+                                    .getTransaction(txSignature, {
+                                    commitment: commitment,
+                                    maxSupportedTransactionVersion: 0,
+                                })
+                                    .send(),
+                            ])];
+                    case 1:
+                        _a = _b.sent(), events = _a[0], txDetails = _a[1];
+                        depositEvents = events === null || events === void 0 ? void 0 : events.filter(function (event) { return (event === null || event === void 0 ? void 0 : event.name) === "FundsDeposited"; });
+                        if (!txDetails || !(depositEvents === null || depositEvents === void 0 ? void 0 : depositEvents.length)) {
+                            return [2];
+                        }
+                        return [2, events.map(function (event) {
+                                var unwrappedEventArgs = (0, _1.unwrapEventData)(event, ["depositId"]);
+                                return tslib_1.__assign(tslib_1.__assign({}, unwrappedEventArgs.data), { depositTimestamp: Number(txDetails.blockTime), originChainId: originChainId, messageHash: (0, utils_1.getMessageHash)(unwrappedEventArgs.data.message), blockNumber: Number(txDetails.slot), txnIndex: 0, txnRef: txSignature, logIndex: 0, destinationChainId: unwrappedEventArgs.data.destinationChainId.toNumber() });
+                            })];
+                }
+            });
+        });
+    };
+    SvmCpiEventsClient.prototype.getFillEventsFromSignature = function (destinationChainId, txSignature, commitment) {
+        if (commitment === void 0) { commitment = "confirmed"; }
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var _a, events, txDetails, fillEvents;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        (0, assert_1.default)((0, utils_1.chainIsSvm)(destinationChainId), "Destination chain ".concat(destinationChainId, " is not an SVM chain"));
+                        return [4, Promise.all([
+                                this.readEventsFromSignature(txSignature, commitment),
+                                this.rpc
+                                    .getTransaction(txSignature, {
+                                    commitment: commitment,
+                                    maxSupportedTransactionVersion: 0,
+                                })
+                                    .send(),
+                            ])];
+                    case 1:
+                        _a = _b.sent(), events = _a[0], txDetails = _a[1];
+                        fillEvents = events === null || events === void 0 ? void 0 : events.filter(function (event) { return (event === null || event === void 0 ? void 0 : event.name) === "FilledRelay"; });
+                        if (!txDetails || !(fillEvents === null || fillEvents === void 0 ? void 0 : fillEvents.length)) {
+                            return [2];
+                        }
+                        return [2, fillEvents.map(function (event) {
+                                var unwrappedEventData = (0, _1.unwrapEventData)(event);
+                                return tslib_1.__assign(tslib_1.__assign({}, unwrappedEventData.data), { fillTimestamp: Number(txDetails.blockTime), blockNumber: Number(txDetails.slot), txnRef: txSignature, txnIndex: 0, logIndex: 0, destinationChainId: destinationChainId, repaymentChainId: unwrappedEventData.data.repaymentChainId.toNumber(), originChainId: unwrappedEventData.data.originChainId.toNumber() });
+                            })];
+                }
+            });
+        });
+    };
+    SvmCpiEventsClient.prototype.getProgramAddress = function () {
+        return this.programAddress;
+    };
+    SvmCpiEventsClient.prototype.getRpc = function () {
+        return this.rpc;
+    };
+    return SvmCpiEventsClient;
+}());
+exports.SvmCpiEventsClient = SvmCpiEventsClient;
+//# sourceMappingURL=eventsClient.js.map

package/dist/cjs/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/cjs/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/cjs/arch/svm/index.js

@@ -1,5 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.platform = void 0;
-exports.platform = "svm";
+var tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./eventsClient"), exports);
+tslib_1.__exportStar(require("./SpokeUtils"), exports);
+tslib_1.__exportStar(require("./types"), exports);
+tslib_1.__exportStar(require("./utils"), exports);
+tslib_1.__exportStar(require("./constants"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/arch/svm/index.ts"],"names":[],"mappings":";;;AAAa,QAAA,QAAQ,GAAG,KAAK,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/arch/svm/index.ts"],"names":[],"mappings":";;;AAAA,yDAA+B;AAC/B,uDAA6B;AAC7B,kDAAwB;AACxB,kDAAwB;AACxB,sDAA4B"}

package/dist/cjs/{svm → 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,12 +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;
 };
+export type RpcClient = {
+    rpc: Rpc<SolanaRpcApiFromTransport<RpcTransport>>;
+    rpcSubscriptions: RpcSubscriptions<SignatureNotificationsApi & SlotNotificationsApi>;
+};
+export type SVMProvider = Rpc<SolanaRpcApiFromTransport<RpcTransport>>;

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

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

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

@@ -0,0 +1,18 @@
+import { Idl } from "@coral-xyz/anchor";
+import { Address, type TransactionSigner } from "@solana/kit";
+import { RelayData } from "../../interfaces";
+import { EventName, SVMProvider } from "./types";
+export declare const SolanaVoidSigner: (simulationAddress: string) => TransactionSigner<string>;
+export declare function isDevnet(rpc: SVMProvider): Promise<boolean>;
+export declare function parseEventData(eventData: any): any;
+export declare function decodeEvent(idl: Idl, rawEvent: string): {
+    data: unknown;
+    name: string;
+};
+export declare function getEventName(rawName: string): EventName;
+export declare function unwrapEventData(data: unknown, uint8ArrayKeysAsBigInt?: string[], currentKey?: string): unknown;
+export declare function getStatePda(programId: Address): Promise<Address>;
+export declare function getFillStatusPda(programId: Address, relayData: RelayData, destinationChainId: number): Promise<Address>;
+export declare function getRoutePda(originToken: Address, seed: bigint, routeChainId: bigint): Promise<Address>;
+export declare const getEventAuthority: () => Promise<Address<string>>;
+export declare function getRandomSvmAddress(): Address<string>;

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

@@ -0,0 +1,212 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRandomSvmAddress = exports.getEventAuthority = exports.getRoutePda = exports.getFillStatusPda = exports.getStatePda = exports.unwrapEventData = exports.getEventName = exports.decodeEvent = exports.parseEventData = exports.isDevnet = exports.SolanaVoidSigner = void 0;
+var tslib_1 = require("tslib");
+var bs58_1 = tslib_1.__importDefault(require("bs58"));
+var ethers_1 = require("ethers");
+var anchor_1 = require("@coral-xyz/anchor");
+var kit_1 = require("@solana/kit");
+var contracts_1 = require("@across-protocol/contracts");
+var interfaces_1 = require("../../interfaces");
+var utils_1 = require("../../utils");
+var types_1 = require("./types");
+var SolanaVoidSigner = function (simulationAddress) {
+    return {
+        address: (0, kit_1.address)(simulationAddress),
+        signAndSendTransactions: function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4, Promise.resolve([])];
+                    case 1: return [2, _a.sent()];
+                }
+            });
+        }); },
+    };
+};
+exports.SolanaVoidSigner = SolanaVoidSigner;
+function isDevnet(rpc) {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        var genesisHash;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4, rpc.getGenesisHash().send()];
+                case 1:
+                    genesisHash = _a.sent();
+                    return [2, genesisHash === "EtWTRABZaYq6iMfeYKouRu166VU2xqa1wcaWoxPkrZBG"];
+            }
+        });
+    });
+}
+exports.isDevnet = isDevnet;
+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 (0, kit_1.address)(eventData.toString());
+        }
+        if (anchor_1.BN.isBN(eventData)) {
+            return BigInt(eventData.toString());
+        }
+        return Object.fromEntries(Object.entries(eventData).map(function (_a) {
+            var key = _a[0], value = _a[1];
+            return [snakeToCamel(key), parseEventData(value)];
+        }));
+    }
+    return eventData;
+}
+exports.parseEventData = parseEventData;
+function decodeEvent(idl, rawEvent) {
+    var event = new anchor_1.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),
+    };
+}
+exports.decodeEvent = decodeEvent;
+function snakeToCamel(s) {
+    return s.replace(/(_\w)/g, function (match) { return match[1].toUpperCase(); });
+}
+function getEventName(rawName) {
+    if (Object.values(types_1.SVMEventNames).some(function (name) { return rawName.includes(name); }))
+        return rawName;
+    throw new Error("Unknown event name: ".concat(rawName));
+}
+exports.getEventName = getEventName;
+function unwrapEventData(data, uint8ArrayKeysAsBigInt, currentKey) {
+    if (uint8ArrayKeysAsBigInt === void 0) { uint8ArrayKeysAsBigInt = ["depositId"]; }
+    if (data == null) {
+        return data;
+    }
+    if (typeof data === "bigint") {
+        return utils_1.BigNumber.from(data);
+    }
+    if (data instanceof Uint8Array || (0, utils_1.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 utils_1.BigNumber.from(hex);
+        }
+        return hex;
+    }
+    if (Array.isArray(data)) {
+        return data.map(function (item) { return unwrapEventData(item, uint8ArrayKeysAsBigInt); });
+    }
+    if (typeof data === "string" && (0, kit_1.isAddress)(data)) {
+        return utils_1.SvmAddress.from(data).toBytes32();
+    }
+    if (typeof data === "object") {
+        if (currentKey === "fillType") {
+            var fillType = Object.keys(data)[0];
+            switch (fillType) {
+                case "FastFill":
+                    return interfaces_1.FillType.FastFill;
+                case "ReplacedSlowFill":
+                    return interfaces_1.FillType.ReplacedSlowFill;
+                case "SlowFill":
+                    return interfaces_1.FillType.SlowFill;
+                default:
+                    throw new Error("Unknown fill type: ".concat(fillType));
+            }
+        }
+        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 data;
+}
+exports.unwrapEventData = unwrapEventData;
+function getStatePda(programId) {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        var intEncoder, seed, statePda;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    intEncoder = (0, kit_1.getU64Encoder)();
+                    seed = intEncoder.encode(0);
+                    return [4, (0, kit_1.getProgramDerivedAddress)({
+                            programAddress: programId,
+                            seeds: ["state", seed],
+                        })];
+                case 1:
+                    statePda = (_a.sent())[0];
+                    return [2, statePda];
+            }
+        });
+    });
+}
+exports.getStatePda = getStatePda;
+function getFillStatusPda(programId, relayData, destinationChainId) {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        var relayDataHash, uint8RelayDataHash, fillStatusPda;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    relayDataHash = (0, utils_1.getRelayDataHash)(relayData, destinationChainId);
+                    uint8RelayDataHash = new Uint8Array(Buffer.from(relayDataHash.slice(2), "hex"));
+                    return [4, (0, kit_1.getProgramDerivedAddress)({
+                            programAddress: programId,
+                            seeds: ["fills", uint8RelayDataHash],
+                        })];
+                case 1:
+                    fillStatusPda = (_a.sent())[0];
+                    return [2, fillStatusPda];
+            }
+        });
+    });
+}
+exports.getFillStatusPda = getFillStatusPda;
+function getRoutePda(originToken, seed, routeChainId) {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        var intEncoder, addressEncoder, pda;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    intEncoder = (0, kit_1.getU64Encoder)();
+                    addressEncoder = (0, kit_1.getAddressEncoder)();
+                    return [4, (0, kit_1.getProgramDerivedAddress)({
+                            programAddress: (0, kit_1.address)(contracts_1.SvmSpokeClient.SVM_SPOKE_PROGRAM_ADDRESS),
+                            seeds: ["route", addressEncoder.encode(originToken), intEncoder.encode(seed), intEncoder.encode(routeChainId)],
+                        })];
+                case 1:
+                    pda = (_a.sent())[0];
+                    return [2, pda];
+            }
+        });
+    });
+}
+exports.getRoutePda = getRoutePda;
+var getEventAuthority = function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+    var eventAuthority;
+    return tslib_1.__generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4, (0, kit_1.getProgramDerivedAddress)({
+                    programAddress: (0, kit_1.address)(contracts_1.SvmSpokeClient.SVM_SPOKE_PROGRAM_ADDRESS),
+                    seeds: ["__event_authority"],
+                })];
+            case 1:
+                eventAuthority = (_a.sent())[0];
+                return [2, eventAuthority];
+        }
+    });
+}); };
+exports.getEventAuthority = getEventAuthority;
+function getRandomSvmAddress() {
+    var bytes = ethers_1.ethers.utils.randomBytes(32);
+    var base58Address = bs58_1.default.encode(bytes);
+    return (0, kit_1.address)(base58Address);
+}
+exports.getRandomSvmAddress = getRandomSvmAddress;
+//# sourceMappingURL=utils.js.map

package/dist/cjs/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/cjs/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;
     protected implicitChainIdIndices(chainId?: number): number[];

package/dist/cjs/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.js

@@ -39,7 +39,7 @@ var KNOWN_INVALID_TOKEN_CONFIG_UPDATE_HASHES = [
 var AcrossConfigStoreClient = (function (_super) {
     tslib_1.__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 = (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) {
@@ -229,7 +229,7 @@ var AcrossConfigStoreClient = (function (_super) {
                         return [2, {
                                 success: true,
                                 chainId: chainId,
-                                searchEndBlock: searchConfig.toBlock,
+                                searchEndBlock: searchConfig.to,
                                 events: {
                                     updatedTokenConfigEvents: updatedTokenConfigSortableEvents,
                                     updatedGlobalConfigEvents: updatedGlobalConfigSortableEvents,
@@ -396,9 +396,9 @@ var AcrossConfigStoreClient = (function (_super) {
                             _loop_1(i);
                         }
                         this.hasLatestConfigStoreVersion = this.hasValidConfigStoreVersionForTimestamp();
-                        this.latestBlockSearched = result.searchEndBlock;
-                        this.firstBlockToSearch = result.searchEndBlock + 1;
-                        this.eventSearchConfig.toBlock = undefined;
+                        this.latestHeightSearched = result.searchEndBlock;
+                        this.firstHeightToSearch = result.searchEndBlock + 1;
+                        this.eventSearchConfig.to = undefined;
                         this.chainId = (_e = this.chainId) !== null && _e !== void 0 ? _e : chainId;
                         this.isUpdated = true;
                         this.logger.debug({ at: "ConfigStore", message: "ConfigStore client updated!" });