@across-protocol/sdk 4.3.37 → 4.3.40

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

@@ -1,12 +1,14 @@
 import { BlockFinder, type Block, type BlockTimeAverage, type BlockFinderHints } from "../../utils/BlockFinder";
 import { SVMProvider } from "./";
+import winston from "winston";
 interface SVMBlock extends Block {
 }
 export declare function averageBlockTime(): Pick<BlockTimeAverage, "average" | "blockRange">;
 export declare class SVMBlockFinder extends BlockFinder<SVMBlock> {
+    private readonly logger;
     private readonly provider;
     private readonly blocks;
-    constructor(provider: SVMProvider, blocks?: SVMBlock[]);
+    constructor(logger: winston.Logger, provider: SVMProvider, blocks?: SVMBlock[]);
     getBlockForTimestamp(timestamp: number | string, hints?: BlockFinderHints): Promise<SVMBlock>;
     private getBlockTime;
     private getLatestBlock;

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

@@ -26,9 +26,10 @@ function estimateBlocksElapsed(seconds, cushionPercentage, _provider) {
 }
 var SVMBlockFinder = (function (_super) {
     tslib_1.__extends(SVMBlockFinder, _super);
-    function SVMBlockFinder(provider, blocks) {
+    function SVMBlockFinder(logger, provider, blocks) {
         if (blocks === void 0) { blocks = []; }
         var _this = _super.call(this) || this;
+        _this.logger = logger;
         _this.provider = provider;
         _this.blocks = blocks;
         return _this;
@@ -83,7 +84,7 @@ var SVMBlockFinder = (function (_super) {
     };
     SVMBlockFinder.prototype.getBlockTime = function (slot) {
         var opts = (0, TypeGuards_1.isDefined)(slot) ? { slot: slot } : undefined;
-        return (0, utils_1.getNearestSlotTime)(this.provider, opts);
+        return (0, utils_1.getNearestSlotTime)(this.provider, this.logger, opts);
     };
     SVMBlockFinder.prototype.getLatestBlock = function () {
         var _a;

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

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

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

@@ -1,7 +1,7 @@
 import { MessageTransmitterClient, SvmSpokeClient } from "@across-protocol/contracts";
 import { Mint } from "@solana-program/token";
-import { Account, Address, FetchAccountConfig, IAccountMeta, KeyPairSigner, ReadonlyUint8Array, type TransactionSigner } from "@solana/kit";
-import { Logger } from "winston";
+import { Account, Address, FetchAccountConfig, IAccountMeta, KeyPairSigner, ReadonlyUint8Array, type TransactionSigner, type Commitment } from "@solana/kit";
+import winston from "winston";
 import { DepositWithBlock, FillStatus, FillWithBlock, RelayData } from "../../interfaces";
 import { BigNumber, EvmAddress, Address as SdkAddress, SvmAddress } from "../../utils";
 import { SvmCpiEventsClient } from "./eventsClient";
@@ -12,14 +12,15 @@ type ProtoFill = Omit<RelayData, "recipient" | "outputToken"> & {
     recipient: SvmAddress;
     outputToken: SvmAddress;
 };
-export declare function getTimestampForSlot(provider: SVMProvider, slotNumber: bigint, maxRetries?: number): Promise<number | undefined>;
+export declare function getSlot(provider: SVMProvider, commitment: Commitment, logger: winston.Logger): Promise<bigint>;
+export declare function getTimestampForSlot(provider: SVMProvider, slotNumber: bigint, logger: winston.Logger, maxRetries?: number): Promise<number | undefined>;
 export declare function getFillDeadline(provider: SVMProvider, statePda: Address): Promise<number>;
 export declare function getDepositIdAtBlock(_contract: unknown, _blockTag: number): Promise<BigNumber>;
-export declare function findDeposit(eventClient: SvmCpiEventsClient, depositId: BigNumber, slot?: bigint, secondsLookback?: number): Promise<DepositWithBlock | undefined>;
-export declare function relayFillStatus(programId: Address, relayData: RelayData, destinationChainId: number, svmEventsClient: SvmCpiEventsClient, atHeight?: number): Promise<FillStatus>;
-export declare function fillStatusArray(programId: Address, relayData: RelayData[], destinationChainId: number, svmEventsClient: SvmCpiEventsClient, atHeight?: number, logger?: Logger): Promise<(FillStatus | undefined)[]>;
-export declare function findFillEvent(relayData: RelayData, destinationChainId: number, svmEventsClient: SvmCpiEventsClient, fromSlot: number, toSlot?: number): Promise<FillWithBlock | undefined>;
-export declare function fillRelayInstruction(spokePool: SvmAddress, relayData: ProtoFill, signer: TransactionSigner<string>, recipientTokenAccount: Address<string>, repaymentAddress?: EvmAddress | SvmAddress, repaymentChainId?: number): Promise<SvmSpokeClient.FillRelayInstruction<Address<"DLv3NggMiSaef97YCkew5xKUHDh13tVGZ7tydt3ZeAru">, string, string, string, string, string, string, string, string, string, string, string, string, string, []>>;
+export declare function findDeposit(eventClient: SvmCpiEventsClient, depositId: BigNumber, logger: winston.Logger, slot?: bigint, secondsLookback?: number): Promise<DepositWithBlock | undefined>;
+export declare function relayFillStatus(programId: Address, relayData: RelayData, destinationChainId: number, svmEventsClient: SvmCpiEventsClient, logger: winston.Logger, atHeight?: number): Promise<FillStatus>;
+export declare function fillStatusArray(programId: Address, relayData: RelayData[], destinationChainId: number, svmEventsClient: SvmCpiEventsClient, logger: winston.Logger, atHeight?: number): Promise<(FillStatus | undefined)[]>;
+export declare function findFillEvent(relayData: RelayData, destinationChainId: number, svmEventsClient: SvmCpiEventsClient, logger: winston.Logger, fromSlot: number, toSlot?: number): Promise<FillWithBlock | undefined>;
+export declare function fillRelayInstruction(spokePool: SvmAddress, relayData: ProtoFill, signer: TransactionSigner<string>, recipientTokenAccount: Address<string>, repaymentAddress: EvmAddress | SvmAddress, repaymentChainId: number): Promise<SvmSpokeClient.FillRelayInstruction<Address<"DLv3NggMiSaef97YCkew5xKUHDh13tVGZ7tydt3ZeAru">, string, string, string, string, string, string, string, string, string, string, string, string, string, []>>;
 export declare function createTokenAccountsInstruction(mint: SvmAddress, relayer: TransactionSigner<string>): SvmSpokeClient.CreateTokenAccountsInstruction;
 export declare function getFillRelayTx(spokePoolAddr: SvmAddress, solanaClient: SVMProvider, relayData: Omit<RelayData, "recipient" | "outputToken"> & {
     destinationChainId: number;

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

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMintInfo = exports.finalizeCCTPV1Messages = exports.getCCTPV1ReceiveMessageTx = exports.getAccountMetasForTokenlessMessage = exports.hasCCTPV1MessageBeenProcessed = exports.getFillRelayDelegatePda = exports.getDepositNowDelegatePda = exports.getDepositDelegatePda = exports.getRelayDataHash = exports.getAssociatedTokenAddress = exports.createReceiveMessageInstruction = exports.createCloseFillPdaInstruction = exports.getSlowFillRequestTx = exports.createRequestSlowFillInstruction = exports.createDepositInstruction = exports.createFillInstruction = exports.getFillRelayTx = exports.createTokenAccountsInstruction = exports.fillRelayInstruction = exports.findFillEvent = exports.fillStatusArray = exports.relayFillStatus = exports.findDeposit = exports.getDepositIdAtBlock = exports.getFillDeadline = exports.getTimestampForSlot = exports.SLOT_DURATION_MS = void 0;
+exports.getMintInfo = exports.finalizeCCTPV1Messages = exports.getCCTPV1ReceiveMessageTx = exports.getAccountMetasForTokenlessMessage = exports.hasCCTPV1MessageBeenProcessed = exports.getFillRelayDelegatePda = exports.getDepositNowDelegatePda = exports.getDepositDelegatePda = exports.getRelayDataHash = exports.getAssociatedTokenAddress = exports.createReceiveMessageInstruction = exports.createCloseFillPdaInstruction = exports.getSlowFillRequestTx = exports.createRequestSlowFillInstruction = exports.createDepositInstruction = exports.createFillInstruction = exports.getFillRelayTx = exports.createTokenAccountsInstruction = exports.fillRelayInstruction = exports.findFillEvent = exports.fillStatusArray = exports.relayFillStatus = exports.findDeposit = exports.getDepositIdAtBlock = exports.getFillDeadline = exports.getTimestampForSlot = exports.getSlot = exports.SLOT_DURATION_MS = void 0;
 var tslib_1 = require("tslib");
 var contracts_1 = require("@across-protocol/contracts");
 var SvmSpoke_1 = require("@across-protocol/contracts/dist/src/svm/clients/SvmSpoke");
 var web3_v1_1 = require("@across-protocol/contracts/dist/src/svm/web3-v1");
-var conversionUtils_1 = require("@across-protocol/contracts/dist/src/svm/web3-v1/conversionUtils");
 var system_1 = require("@solana-program/system");
 var token_1 = require("@solana-program/token");
 var kit_1 = require("@solana/kit");
@@ -19,14 +18,44 @@ var provider_1 = require("./provider");
 var types_1 = require("./types");
 var utils_3 = require("./utils");
 exports.SLOT_DURATION_MS = 400;
-function getTimestampForSlot(provider, slotNumber, maxRetries) {
+function getSlot(provider, commitment, logger) {
+    return _callGetSlotWithRetry(provider, commitment, logger);
+}
+exports.getSlot = getSlot;
+function _callGetSlotWithRetry(provider, commitment, logger) {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        var err_1, code;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _a.trys.push([0, 2, , 3]);
+                    return [4, provider.getSlot({ commitment: commitment }).send()];
+                case 1: return [2, _a.sent()];
+                case 2:
+                    err_1 = _a.sent();
+                    if ((0, provider_1.isSolanaError)(err_1)) {
+                        code = err_1.context.__code;
+                        logger.debug({
+                            at: "_getSlotWithRetry",
+                            message: "Caught error from getSlot()",
+                            code: code,
+                            commitment: commitment,
+                        });
+                    }
+                    throw err_1;
+                case 3: return [2];
+            }
+        });
+    });
+}
+function getTimestampForSlot(provider, slotNumber, logger, maxRetries) {
     if (maxRetries === void 0) { maxRetries = 2; }
-    return _callGetTimestampForSlotWithRetry(provider, slotNumber, 0, maxRetries);
+    return _callGetTimestampForSlotWithRetry(provider, slotNumber, 0, maxRetries, logger);
 }
 exports.getTimestampForSlot = getTimestampForSlot;
-function _callGetTimestampForSlotWithRetry(provider, slotNumber, retryAttempt, maxRetries) {
+function _callGetTimestampForSlotWithRetry(provider, slotNumber, retryAttempt, maxRetries, logger) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
-        var _timestamp, err_1, code, slot, _a, delaySeconds, timestamp;
+        var _timestamp, err_2, code, slot, _a, delaySeconds, timestamp;
         return tslib_1.__generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
@@ -36,13 +65,13 @@ function _callGetTimestampForSlotWithRetry(provider, slotNumber, retryAttempt, m
                     _timestamp = _b.sent();
                     return [3, 8];
                 case 2:
-                    err_1 = _b.sent();
-                    if (!(0, provider_1.isSolanaError)(err_1)) {
-                        throw err_1;
+                    err_2 = _b.sent();
+                    if (!(0, provider_1.isSolanaError)(err_2)) {
+                        throw err_2;
                     }
-                    code = err_1.context.__code;
+                    code = err_2.context.__code;
                     slot = slotNumber.toString();
-                    _a = err_1.context.__code;
+                    _a = err_2.context.__code;
                     switch (_a) {
                         case provider_1.SVM_SLOT_SKIPPED: return [3, 3];
                         case provider_1.SVM_BLOCK_NOT_AVAILABLE: return [3, 4];
@@ -54,11 +83,28 @@ function _callGetTimestampForSlotWithRetry(provider, slotNumber, retryAttempt, m
                     if (retryAttempt >= maxRetries) {
                         throw new Error("Timeout on SVM getBlockTime() for slot ".concat(slot, " after ").concat(retryAttempt, " retry attempts"));
                     }
+                    logger.debug({
+                        at: "getTimestampForSlot",
+                        message: "Retrying getBlockTime() after ".concat(delaySeconds, " seconds for retry attempt #").concat(retryAttempt),
+                        slot: slot,
+                        retryAttempt: retryAttempt,
+                        maxRetries: maxRetries,
+                        delaySeconds: delaySeconds,
+                    });
                     return [4, (0, utils_2.delay)(delaySeconds)];
                 case 5:
                     _b.sent();
-                    return [2, _callGetTimestampForSlotWithRetry(provider, slotNumber, ++retryAttempt, maxRetries)];
-                case 6: throw new Error("Unhandled SVM getBlockTime() error for slot ".concat(slot, ": ").concat(code), { cause: err_1 });
+                    return [2, _callGetTimestampForSlotWithRetry(provider, slotNumber, ++retryAttempt, maxRetries, logger)];
+                case 6:
+                    logger.debug({
+                        at: "getTimestampForSlot",
+                        message: "Caught error from getBlockTime()",
+                        errorCode: code,
+                        slot: slot,
+                        retryAttempt: retryAttempt,
+                        maxRetries: maxRetries,
+                    });
+                    throw new Error("Unhandled SVM getBlockTime() error for slot ".concat(slot, ": ").concat(code), { cause: err_2 });
                 case 7: return [3, 8];
                 case 8:
                     timestamp = Number(_timestamp);
@@ -86,7 +132,7 @@ function getDepositIdAtBlock(_contract, _blockTag) {
     throw new Error("getDepositIdAtBlock: not implemented");
 }
 exports.getDepositIdAtBlock = getDepositIdAtBlock;
-function findDeposit(eventClient, depositId, slot, secondsLookback) {
+function findDeposit(eventClient, depositId, logger, slot, secondsLookback) {
     var _a;
     if (secondsLookback === void 0) { secondsLookback = 2 * 24 * 60 * 60; }
     return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -98,7 +144,7 @@ function findDeposit(eventClient, depositId, slot, secondsLookback) {
                         throw new Error("Cannot binary search for depositId ".concat(depositId));
                     }
                     provider = eventClient.getRpc();
-                    return [4, (0, utils_3.getNearestSlotTime)(provider)];
+                    return [4, (0, utils_3.getNearestSlotTime)(provider, logger)];
                 case 1:
                     currentSlot = (_b.sent()).slot;
                     endSlot = slot !== undefined ? BigInt(Math.min(Number(slot), Number(currentSlot))) : currentSlot;
@@ -120,7 +166,7 @@ function findDeposit(eventClient, depositId, slot, secondsLookback) {
     });
 }
 exports.findDeposit = findDeposit;
-function relayFillStatus(programId, relayData, destinationChainId, svmEventsClient, atHeight) {
+function relayFillStatus(programId, relayData, destinationChainId, svmEventsClient, logger, atHeight) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
         var provider, fillStatusPda, toSlot, commitment, _a, fillStatusAccount, _b, currentSlot, timestamp, decodedAccountData;
         return tslib_1.__generator(this, function (_c) {
@@ -136,7 +182,7 @@ function relayFillStatus(programId, relayData, destinationChainId, svmEventsClie
                     commitment = "confirmed";
                     return [4, Promise.all([
                             (0, kit_1.fetchEncodedAccount)(provider, fillStatusPda, { commitment: commitment }),
-                            (0, utils_3.getNearestSlotTime)(provider, { commitment: commitment }),
+                            (0, utils_3.getNearestSlotTime)(provider, logger, { commitment: commitment }),
                         ])];
                 case 2:
                     _a = _c.sent(), fillStatusAccount = _a[0], _b = _a[1], currentSlot = _b.slot, timestamp = _b.timestamp;
@@ -155,7 +201,7 @@ function relayFillStatus(programId, relayData, destinationChainId, svmEventsClie
     });
 }
 exports.relayFillStatus = relayFillStatus;
-function fillStatusArray(programId, relayData, destinationChainId, svmEventsClient, atHeight, logger) {
+function fillStatusArray(programId, relayData, destinationChainId, svmEventsClient, logger, atHeight) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
         var provider, chunkSize, chunkedRelayData, fillStatusPdas, fillStatuses, _a, missingStatuses, missingChunked, missingResults, toSlot, _b, _i, missingChunked_1, chunk_1, chunkResults;
         var _this = this;
@@ -178,7 +224,7 @@ function fillStatusArray(programId, relayData, destinationChainId, svmEventsClie
                         });
                     }
                     if (!(atHeight === undefined)) return [3, 3];
-                    return [4, fetchBatchFillStatusFromPdaAccounts(provider, fillStatusPdas, relayData)];
+                    return [4, fetchBatchFillStatusFromPdaAccounts(provider, fillStatusPdas, relayData, logger)];
                 case 2:
                     _a = _c.sent();
                     return [3, 4];
@@ -198,7 +244,7 @@ function fillStatusArray(programId, relayData, destinationChainId, svmEventsClie
                     if (!atHeight) return [3, 5];
                     _b = BigInt(atHeight);
                     return [3, 7];
-                case 5: return [4, (0, utils_3.getNearestSlotTime)(provider)];
+                case 5: return [4, (0, utils_3.getNearestSlotTime)(provider, logger)];
                 case 6:
                     _b = (_c.sent()).slot;
                     _c.label = 7;
@@ -241,7 +287,7 @@ function fillStatusArray(programId, relayData, destinationChainId, svmEventsClie
     });
 }
 exports.fillStatusArray = fillStatusArray;
-function findFillEvent(relayData, destinationChainId, svmEventsClient, fromSlot, toSlot) {
+function findFillEvent(relayData, destinationChainId, svmEventsClient, logger, fromSlot, toSlot) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
         var _a, _b, programId, fillStatusPda, fillEvents, rawFillEvent, eventData, originChainId, parsedFillEvent;
         return tslib_1.__generator(this, function (_c) {
@@ -253,7 +299,7 @@ function findFillEvent(relayData, destinationChainId, svmEventsClient, fromSlot,
                     return [3, 3];
                 case 1:
                     _b = Number;
-                    return [4, (0, utils_3.getNearestSlotTime)(svmEventsClient.getRpc())];
+                    return [4, (0, utils_3.getNearestSlotTime)(svmEventsClient.getRpc(), logger)];
                 case 2:
                     _a = (toSlot = _b.apply(void 0, [(_c.sent()).slot]));
                     _c.label = 3;
@@ -281,68 +327,40 @@ function findFillEvent(relayData, destinationChainId, svmEventsClient, fromSlot,
 }
 exports.findFillEvent = findFillEvent;
 function fillRelayInstruction(spokePool, relayData, signer, recipientTokenAccount, repaymentAddress, repaymentChainId) {
-    if (repaymentAddress === void 0) { repaymentAddress = utils_2.SvmAddress.from(signer.address); }
-    if (repaymentChainId === void 0) { repaymentChainId = relayData.destinationChainId; }
     return tslib_1.__awaiter(this, void 0, void 0, function () {
-        var program, _relayDataHash, relayDataHash, relayer, relayerTokenAccount, _a, statePda, fillStatusPda, eventAuthority, depositIdBuffer, shortenedBuffer, delegatePda, _b, recipient, outputToken, exclusiveRelayer, depositor, inputToken;
-        return tslib_1.__generator(this, function (_c) {
-            switch (_c.label) {
+        var program, _relayDataHash, relayDataHash, relayer, _a, statePda, fillStatusPda, eventAuthority, delegatePda, relayerTokenAccount, svmRelayData;
+        return tslib_1.__generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
                     program = (0, _1.toAddress)(spokePool);
                     (0, assert_1.default)(repaymentAddress.isValidOn(repaymentChainId), "Invalid repayment address for chain ".concat(repaymentChainId, ": ").concat(repaymentAddress.toNative(), "."));
                     _relayDataHash = getRelayDataHash(relayData, relayData.destinationChainId);
                     relayDataHash = new Uint8Array(Buffer.from(_relayDataHash.slice(2), "hex"));
                     relayer = utils_2.SvmAddress.from(signer.address);
-                    return [4, getAssociatedTokenAddress(relayer, relayData.outputToken)];
-                case 1:
-                    relayerTokenAccount = _c.sent();
                     return [4, Promise.all([
                             (0, _1.getStatePda)(program),
                             (0, _1.getFillStatusPda)(program, relayData, relayData.destinationChainId),
                             (0, _1.getEventAuthority)(program),
+                            getFillRelayDelegatePda(relayDataHash, BigInt(repaymentChainId), signer.address, program),
+                            getAssociatedTokenAddress(relayer, relayData.outputToken),
                         ])];
-                case 2:
-                    _a = _c.sent(), statePda = _a[0], fillStatusPda = _a[1], eventAuthority = _a[2];
-                    depositIdBuffer = new Uint8Array(32);
-                    shortenedBuffer = new Uint8Array(Buffer.from(relayData.depositId.toHexString().slice(2), "hex"));
-                    depositIdBuffer.set(shortenedBuffer, 32 - shortenedBuffer.length);
-                    return [4, getFillRelayDelegatePda(relayDataHash, BigInt(repaymentChainId), (0, _1.toAddress)(relayer), program)];
-                case 3:
-                    delegatePda = _c.sent();
-                    _b = [
-                        relayData.recipient,
-                        relayData.outputToken,
-                        relayData.exclusiveRelayer,
-                        relayData.depositor,
-                        relayData.inputToken,
-                    ].map(_1.toAddress), recipient = _b[0], outputToken = _b[1], exclusiveRelayer = _b[2], depositor = _b[3], inputToken = _b[4];
+                case 1:
+                    _a = _b.sent(), statePda = _a[0], fillStatusPda = _a[1], eventAuthority = _a[2], delegatePda = _a[3], relayerTokenAccount = _a[4];
+                    svmRelayData = (0, _1.toSvmRelayData)(relayData);
                     return [2, contracts_1.SvmSpokeClient.getFillRelayInstruction({
                             signer: signer,
                             state: statePda,
                             delegate: (0, _1.toAddress)(utils_2.SvmAddress.from(delegatePda.toString())),
-                            mint: outputToken,
+                            mint: svmRelayData.outputToken,
                             relayerTokenAccount: relayerTokenAccount,
                             recipientTokenAccount: recipientTokenAccount,
                             fillStatus: fillStatusPda,
                             eventAuthority: eventAuthority,
                             program: program,
                             relayHash: relayDataHash,
-                            relayData: (0, kit_1.some)({
-                                depositor: depositor,
-                                recipient: recipient,
-                                exclusiveRelayer: exclusiveRelayer,
-                                inputToken: inputToken,
-                                outputToken: outputToken,
-                                inputAmount: (0, _1.bigToU8a32)(relayData.inputAmount.toBigInt()),
-                                outputAmount: relayData.outputAmount.toBigInt(),
-                                originChainId: BigInt(relayData.originChainId),
-                                fillDeadline: relayData.fillDeadline,
-                                exclusivityDeadline: relayData.exclusivityDeadline,
-                                depositId: depositIdBuffer,
-                                message: new Uint8Array(Buffer.from(relayData.message.slice(2), "hex")),
-                            }),
+                            relayData: (0, kit_1.some)(svmRelayData),
                             repaymentChainId: (0, kit_1.some)(BigInt(repaymentChainId)),
-                            repaymentAddress: (0, _1.toAddress)(repaymentAddress),
+                            repaymentAddress: (0, kit_1.some)((0, _1.toAddress)(repaymentAddress)),
                         })];
             }
         });
@@ -358,52 +376,35 @@ function createTokenAccountsInstruction(mint, relayer) {
 exports.createTokenAccountsInstruction = createTokenAccountsInstruction;
 function getFillRelayTx(spokePoolAddr, solanaClient, relayData, signer, repaymentChainId, repaymentAddress) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
-        var depositor, recipient, inputToken, outputToken, exclusiveRelayer, destinationChainId, program, _relayDataHash, relayDataHash, _a, state, delegate, mint, mintInfo, _b, recipientAta, relayerAta, fillStatus, eventAuthority, svmRelayData, fillInput;
+        var svmRelayData, program, _relayDataHash, relayDataHash, _a, state, delegate, mintInfo, fillStatus, eventAuthority, _b, recipientAta, relayerAta, fillInput;
         return tslib_1.__generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
-                    depositor = relayData.depositor, recipient = relayData.recipient, inputToken = relayData.inputToken, outputToken = relayData.outputToken, exclusiveRelayer = relayData.exclusiveRelayer, destinationChainId = relayData.destinationChainId;
+                    svmRelayData = (0, _1.toSvmRelayData)(relayData);
                     (0, assert_1.default)(repaymentAddress.isValidOn(repaymentChainId), "getFillRelayTx: repayment address ".concat(repaymentAddress, " not valid on chain ").concat(repaymentChainId, ")"));
                     program = (0, _1.toAddress)(spokePoolAddr);
-                    _relayDataHash = getRelayDataHash(relayData, destinationChainId);
+                    _relayDataHash = getRelayDataHash(relayData, relayData.destinationChainId);
                     relayDataHash = new Uint8Array(Buffer.from(_relayDataHash.slice(2), "hex"));
                     return [4, Promise.all([
                             (0, _1.getStatePda)(program),
                             getFillRelayDelegatePda(relayDataHash, BigInt(repaymentChainId), (0, _1.toAddress)(repaymentAddress), program),
+                            getMintInfo(solanaClient, svmRelayData.outputToken),
+                            (0, _1.getFillStatusPda)(program, relayData, relayData.destinationChainId),
+                            (0, _1.getEventAuthority)(program),
                         ])];
                 case 1:
-                    _a = _c.sent(), state = _a[0], delegate = _a[1];
-                    mint = (0, _1.toAddress)(outputToken);
-                    return [4, getMintInfo(solanaClient, mint)];
-                case 2:
-                    mintInfo = _c.sent();
+                    _a = _c.sent(), state = _a[0], delegate = _a[1], mintInfo = _a[2], fillStatus = _a[3], eventAuthority = _a[4];
                     return [4, Promise.all([
-                            getAssociatedTokenAddress(recipient, outputToken, mintInfo.programAddress),
-                            getAssociatedTokenAddress(utils_2.SvmAddress.from(signer.address), outputToken, mintInfo.programAddress),
-                            (0, _1.getFillStatusPda)(program, relayData, destinationChainId),
-                            (0, _1.getEventAuthority)(program),
+                            getAssociatedTokenAddress(relayData.recipient, relayData.outputToken, mintInfo.programAddress),
+                            getAssociatedTokenAddress(utils_2.SvmAddress.from(signer.address), relayData.outputToken, mintInfo.programAddress),
                         ])];
-                case 3:
-                    _b = _c.sent(), recipientAta = _b[0], relayerAta = _b[1], fillStatus = _b[2], eventAuthority = _b[3];
-                    svmRelayData = {
-                        depositor: (0, _1.toAddress)(depositor),
-                        recipient: (0, _1.toAddress)(recipient),
-                        exclusiveRelayer: (0, _1.toAddress)(exclusiveRelayer),
-                        inputToken: (0, _1.toAddress)(inputToken),
-                        outputToken: mint,
-                        inputAmount: (0, _1.bigToU8a32)(relayData.inputAmount.toBigInt()),
-                        outputAmount: relayData.outputAmount.toBigInt(),
-                        originChainId: relayData.originChainId,
-                        depositId: new Uint8Array((0, conversionUtils_1.intToU8Array32)(relayData.depositId.toNumber())),
-                        fillDeadline: relayData.fillDeadline,
-                        exclusivityDeadline: relayData.exclusivityDeadline,
-                        message: new Uint8Array(Buffer.from(relayData.message, "hex")),
-                    };
+                case 2:
+                    _b = _c.sent(), recipientAta = _b[0], relayerAta = _b[1];
                     fillInput = {
                         signer: signer,
                         state: state,
                         delegate: delegate,
-                        mint: mint,
+                        mint: svmRelayData.outputToken,
                         relayerTokenAccount: relayerAta,
                         recipientTokenAccount: recipientAta,
                         fillStatus: fillStatus,
@@ -525,37 +526,20 @@ var createRequestSlowFillInstruction = function (signer, solanaClient, requestSl
 exports.createRequestSlowFillInstruction = createRequestSlowFillInstruction;
 function getSlowFillRequestTx(spokePoolAddr, solanaClient, relayData, signer) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
-        var depositor, recipient, inputToken, outputToken, exclusiveRelayer, destinationChainId, originChainId, depositId, fillDeadline, exclusivityDeadline, message, program, relayDataHash, _a, state, fillStatus, eventAuthority, depositIdBuffer, shortenedBuffer, relayDataInput, requestSlowFillInput;
+        var program, relayDataHash, _a, state, fillStatus, eventAuthority, svmRelayData, requestSlowFillInput;
         return tslib_1.__generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    depositor = relayData.depositor, recipient = relayData.recipient, inputToken = relayData.inputToken, outputToken = relayData.outputToken, exclusiveRelayer = relayData.exclusiveRelayer, destinationChainId = relayData.destinationChainId, originChainId = relayData.originChainId, depositId = relayData.depositId, fillDeadline = relayData.fillDeadline, exclusivityDeadline = relayData.exclusivityDeadline, message = relayData.message;
                     program = (0, _1.toAddress)(spokePoolAddr);
-                    relayDataHash = getRelayDataHash(relayData, destinationChainId);
+                    relayDataHash = getRelayDataHash(relayData, relayData.destinationChainId);
                     return [4, Promise.all([
                             (0, _1.getStatePda)(program),
-                            (0, _1.getFillStatusPda)(program, relayData, destinationChainId),
+                            (0, _1.getFillStatusPda)(program, relayData, relayData.destinationChainId),
                             (0, _1.getEventAuthority)(program),
                         ])];
                 case 1:
                     _a = _b.sent(), state = _a[0], fillStatus = _a[1], eventAuthority = _a[2];
-                    depositIdBuffer = new Uint8Array(32);
-                    shortenedBuffer = (0, utils_1.arrayify)(depositId.toHexString());
-                    depositIdBuffer.set(shortenedBuffer, 32 - shortenedBuffer.length);
-                    relayDataInput = {
-                        depositor: (0, _1.toAddress)(depositor),
-                        recipient: (0, _1.toAddress)(recipient),
-                        exclusiveRelayer: (0, _1.toAddress)(exclusiveRelayer),
-                        inputToken: (0, _1.toAddress)(inputToken),
-                        outputToken: (0, _1.toAddress)(outputToken),
-                        inputAmount: (0, _1.bigToU8a32)(relayData.inputAmount.toBigInt()),
-                        outputAmount: relayData.outputAmount.toBigInt(),
-                        originChainId: BigInt(originChainId),
-                        depositId: depositIdBuffer,
-                        fillDeadline: fillDeadline,
-                        exclusivityDeadline: exclusivityDeadline,
-                        message: (0, utils_1.arrayify)(message),
-                    };
+                    svmRelayData = (0, _1.toSvmRelayData)(relayData);
                     requestSlowFillInput = {
                         signer: signer,
                         state: state,
@@ -563,7 +547,7 @@ function getSlowFillRequestTx(spokePoolAddr, solanaClient, relayData, signer) {
                         eventAuthority: eventAuthority,
                         program: program,
                         relayHash: (0, utils_1.arrayify)(relayDataHash),
-                        relayData: relayDataInput,
+                        relayData: svmRelayData,
                         systemProgram: system_1.SYSTEM_PROGRAM_ADDRESS,
                     };
                     return [2, (0, exports.createRequestSlowFillInstruction)(signer, solanaClient, requestSlowFillInput)];
@@ -634,24 +618,16 @@ function getAssociatedTokenAddress(owner, mint, tokenProgramId) {
 }
 exports.getAssociatedTokenAddress = getAssociatedTokenAddress;
 function getRelayDataHash(relayData, destinationChainId) {
-    var addressEncoder = (0, kit_1.getAddressEncoder)();
-    var uint64Encoder = (0, kit_1.getU64Encoder)();
-    var uint32Encoder = (0, kit_1.getU32Encoder)();
     (0, assert_1.default)(relayData.message.startsWith("0x"), "Message must be a hex string");
-    var encodeAddress = function (data) { return Uint8Array.from(addressEncoder.encode((0, _1.toAddress)(data))); };
+    var uint64Encoder = (0, kit_1.getU64Encoder)();
+    var svmRelayData = (0, _1.toSvmRelayData)(relayData);
+    var relayDataEncoder = contracts_1.SvmSpokeClient.getRelayDataEncoder();
+    var encodedRelayData = relayDataEncoder.encode(svmRelayData);
+    var encodedMessage = Buffer.from(relayData.message.slice(2), "hex");
+    var messageOffset = encodedRelayData.length - 4 - encodedMessage.length;
     var contentToHash = Buffer.concat([
-        encodeAddress(relayData.depositor),
-        encodeAddress(relayData.recipient),
-        encodeAddress(relayData.exclusiveRelayer),
-        encodeAddress(relayData.inputToken),
-        encodeAddress(relayData.outputToken),
-        (0, utils_1.arrayify)((0, utils_1.hexZeroPad)((0, utils_1.hexlify)(relayData.inputAmount), 32)),
-        Uint8Array.from(uint64Encoder.encode(BigInt(relayData.outputAmount.toString()))),
-        Uint8Array.from(uint64Encoder.encode(BigInt(relayData.originChainId.toString()))),
-        (0, utils_1.arrayify)((0, utils_1.hexZeroPad)((0, utils_1.hexlify)(relayData.depositId), 32)),
-        Uint8Array.from(uint32Encoder.encode(relayData.fillDeadline)),
-        Uint8Array.from(uint32Encoder.encode(relayData.exclusivityDeadline)),
-        (0, web3_v1_1.hashNonEmptyMessage)(Buffer.from((0, utils_1.arrayify)(relayData.message))),
+        encodedRelayData.slice(0, messageOffset),
+        (0, web3_v1_1.hashNonEmptyMessage)(encodedMessage),
         Uint8Array.from(uint64Encoder.encode(BigInt(destinationChainId))),
     ]);
     return (0, utils_2.keccak256)(contentToHash);
@@ -687,7 +663,7 @@ function resolveFillStatusFromPdaEvents(fillStatusPda, toSlot, svmEventsClient)
         });
     });
 }
-function fetchBatchFillStatusFromPdaAccounts(provider, fillStatusPdas, relayDataArray) {
+function fetchBatchFillStatusFromPdaAccounts(provider, fillStatusPdas, relayDataArray, logger) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
         var chunkSize, commitment, _a, pdaAccounts, timestamp, fillStatuses;
         return tslib_1.__generator(this, function (_b) {
@@ -697,7 +673,7 @@ function fetchBatchFillStatusFromPdaAccounts(provider, fillStatusPdas, relayData
                     commitment = "confirmed";
                     return [4, Promise.all([
                             Promise.all((0, utils_2.chunk)(fillStatusPdas, chunkSize).map(function (chunk) { return (0, kit_1.fetchEncodedAccounts)(provider, chunk, { commitment: commitment }); })),
-                            (0, utils_3.getNearestSlotTime)(provider, { commitment: commitment }),
+                            (0, utils_3.getNearestSlotTime)(provider, logger, { commitment: commitment }),
                         ])];
                 case 1:
                     _a = _b.sent(), pdaAccounts = _a[0], timestamp = _a[1].timestamp;