@across-protocol/sdk 4.3.53-alpha.0 → 4.3.54

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

@@ -1,7 +1,8 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SVMBlockFinder = exports.averageBlockTime = void 0;
+exports.SVMBlockFinder = void 0;
+exports.averageBlockTime = averageBlockTime;
 var tslib_1 = require("tslib");
 var assert_1 = tslib_1.__importDefault(require("assert"));
 var lodash_1 = require("lodash");
@@ -17,7 +18,6 @@ var averageBlockTimes = (_a = {},
 function averageBlockTime() {
     return averageBlockTimes[constants_1.CHAIN_IDs.SOLANA];
 }
-exports.averageBlockTime = averageBlockTime;
 function estimateBlocksElapsed(seconds, cushionPercentage, _provider) {
     if (cushionPercentage === void 0) { cushionPercentage = 0.0; }
     var cushionMultiplier = cushionPercentage + 1.0;
@@ -34,11 +34,11 @@ var SVMBlockFinder = (function (_super) {
         _this.logger = logger;
         return _this;
     }
-    SVMBlockFinder.prototype.getBlockForTimestamp = function (timestamp, hints) {
-        if (hints === void 0) { hints = {}; }
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+    SVMBlockFinder.prototype.getBlockForTimestamp = function (timestamp_1) {
+        return tslib_1.__awaiter(this, arguments, void 0, function (timestamp, hints) {
             var block, initialBlock, cushion, incrementDistance, multiplier, distance, blockNumber, block, index;
             var _this = this;
+            if (hints === void 0) { hints = {}; }
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -87,20 +87,20 @@ var SVMBlockFinder = (function (_super) {
         return (0, utils_1.getNearestSlotTime)(this.provider, opts, this.logger);
     };
     SVMBlockFinder.prototype.getLatestBlock = function () {
-        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _b, slot, timestamp, block, index;
+            var _a, slot, timestamp, block, index;
+            var _b;
             return tslib_1.__generator(this, function (_c) {
                 switch (_c.label) {
                     case 0: return [4, this.getBlockTime()];
                     case 1:
-                        _b = _c.sent(), slot = _b.slot, timestamp = _b.timestamp;
+                        _a = _c.sent(), slot = _a.slot, timestamp = _a.timestamp;
                         block = {
                             timestamp: timestamp,
                             number: Number(slot),
                         };
                         index = (0, lodash_1.sortedIndexBy)(this.blocks, block, "number");
-                        if (((_a = this.blocks[index]) === null || _a === void 0 ? void 0 : _a.number) !== block.number)
+                        if (((_b = this.blocks[index]) === null || _b === void 0 ? void 0 : _b.number) !== block.number)
                             this.blocks.splice(index, 0, block);
                         return [2, this.blocks[index]];
                 }
@@ -108,25 +108,25 @@ var SVMBlockFinder = (function (_super) {
         });
     };
     SVMBlockFinder.prototype.getBlock = function (number) {
-        var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var index, _c, _slot, timestamp, slot, block;
+            var index, _a, _slot, timestamp, slot, block;
+            var _b, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
                         index = (0, lodash_1.sortedIndexBy)(this.blocks, { number: number }, "number");
-                        if (((_a = this.blocks[index]) === null || _a === void 0 ? void 0 : _a.number) === number)
+                        if (((_b = this.blocks[index]) === null || _b === void 0 ? void 0 : _b.number) === number)
                             return [2, this.blocks[index]];
                         return [4, this.getBlockTime(BigInt(number))];
                     case 1:
-                        _c = _d.sent(), _slot = _c.slot, timestamp = _c.timestamp;
+                        _a = _d.sent(), _slot = _a.slot, timestamp = _a.timestamp;
                         slot = Number(_slot);
                         block = {
                             timestamp: timestamp,
                             number: slot,
                         };
                         index = (0, lodash_1.sortedIndexBy)(this.blocks, { number: slot }, "number");
-                        if (((_b = this.blocks[index]) === null || _b === void 0 ? void 0 : _b.number) === slot)
+                        if (((_c = this.blocks[index]) === null || _c === void 0 ? void 0 : _c.number) === slot)
                             return [2, this.blocks[index]];
                         this.blocks.splice(index, 0, block);
                         return [2, block];

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

@@ -17,7 +17,7 @@ export declare function getSlot(provider: SVMProvider, commitment: Commitment, l
 export declare function getTimestampForSlot(provider: SVMProvider, slotNumber: bigint, maxRetries?: number, logger?: winston.Logger): 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, logger: winston.Logger, slot?: bigint, secondsLookback?: number): Promise<DepositWithBlock | undefined>;
+export declare function findDeposit(eventClient: SvmCpiEventsClient, depositId: BigNumber, logger: winston.Logger, slot?: bigint, secondsLookback?: number): Promise<Omit<DepositWithBlock, "originChainId" | "quoteBlockNumber" | "fromLiteChain" | "toLiteChain"> | undefined>;
 export declare function relayFillStatus(programId: Address, relayData: RelayDataWithMessageHash, destinationChainId: number, svmEventsClient: SvmCpiEventsClient, logger: winston.Logger, atHeight?: number): Promise<FillStatus>;
 export declare function fillStatusArray(programId: Address, relayData: RelayDataWithMessageHash[], destinationChainId: number, svmEventsClient: SvmCpiEventsClient, logger: winston.Logger, atHeight?: number): Promise<(FillStatus | undefined)[]>;
 export declare function findFillEvent(relayData: RelayDataWithMessageHash, destinationChainId: number, svmEventsClient: SvmCpiEventsClient, fromSlot: number, toSlot?: number, logger?: winston.Logger): Promise<FillWithBlock | undefined>;

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

@@ -1,6 +1,30 @@
 "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.getFillRelayViaInstructionParamsInstructions = exports.getRelayDataHash = exports.getAssociatedTokenAddress = exports.createReceiveMessageInstruction = exports.createCloseFillPdaInstruction = exports.getSlowFillRequestTx = exports.createRequestSlowFillInstruction = exports.createDepositInstruction = exports.deserializeMessage = exports.createFillInstruction = exports.getIPFillRelayTx = 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;
+exports.hasCCTPV1MessageBeenProcessed = exports.createReceiveMessageInstruction = exports.createCloseFillPdaInstruction = exports.createRequestSlowFillInstruction = exports.createDepositInstruction = exports.createFillInstruction = exports.SLOT_DURATION_MS = void 0;
+exports.getSlot = getSlot;
+exports.getTimestampForSlot = getTimestampForSlot;
+exports.getFillDeadline = getFillDeadline;
+exports.getDepositIdAtBlock = getDepositIdAtBlock;
+exports.findDeposit = findDeposit;
+exports.relayFillStatus = relayFillStatus;
+exports.fillStatusArray = fillStatusArray;
+exports.findFillEvent = findFillEvent;
+exports.fillRelayInstruction = fillRelayInstruction;
+exports.createTokenAccountsInstruction = createTokenAccountsInstruction;
+exports.getFillRelayTx = getFillRelayTx;
+exports.getIPFillRelayTx = getIPFillRelayTx;
+exports.deserializeMessage = deserializeMessage;
+exports.getSlowFillRequestTx = getSlowFillRequestTx;
+exports.getAssociatedTokenAddress = getAssociatedTokenAddress;
+exports.getRelayDataHash = getRelayDataHash;
+exports.getFillRelayViaInstructionParamsInstructions = getFillRelayViaInstructionParamsInstructions;
+exports.getDepositDelegatePda = getDepositDelegatePda;
+exports.getDepositNowDelegatePda = getDepositNowDelegatePda;
+exports.getFillRelayDelegatePda = getFillRelayDelegatePda;
+exports.getAccountMetasForTokenlessMessage = getAccountMetasForTokenlessMessage;
+exports.getCCTPV1ReceiveMessageTx = getCCTPV1ReceiveMessageTx;
+exports.finalizeCCTPV1Messages = finalizeCCTPV1Messages;
+exports.getMintInfo = getMintInfo;
 var tslib_1 = require("tslib");
 var contracts_1 = require("@across-protocol/contracts");
 var SvmSpoke_1 = require("@across-protocol/contracts/dist/src/svm/clients/SvmSpoke");
@@ -21,7 +45,6 @@ exports.SLOT_DURATION_MS = 400;
 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;
@@ -52,7 +75,6 @@ function getTimestampForSlot(provider, slotNumber, maxRetries, logger) {
     if (maxRetries === void 0) { maxRetries = 2; }
     return _callGetTimestampForSlotWithRetry(provider, slotNumber, 0, maxRetries, logger);
 }
-exports.getTimestampForSlot = getTimestampForSlot;
 function _callGetTimestampForSlotWithRetry(provider, slotNumber, retryAttempt, maxRetries, logger) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
         var _timestamp, err_2, code, slot, _a, delaySeconds, timestamp;
@@ -127,18 +149,16 @@ function getFillDeadline(provider, statePda) {
         });
     });
 }
-exports.getFillDeadline = getFillDeadline;
 function getDepositIdAtBlock(_contract, _blockTag) {
     throw new Error("getDepositIdAtBlock: not implemented");
 }
-exports.getDepositIdAtBlock = getDepositIdAtBlock;
-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 () {
-        var provider, opts, currentSlot, endSlot, slotsInElapsed, startSlot, depositEvent, unwrappedDepositEvent, destinationChainId;
-        return tslib_1.__generator(this, function (_b) {
-            switch (_b.label) {
+function findDeposit(eventClient_1, depositId_1, logger_1, slot_1) {
+    return tslib_1.__awaiter(this, arguments, void 0, function (eventClient, depositId, logger, slot, secondsLookback) {
+        var provider, opts, currentSlot, endSlot, slotsInElapsed, startSlot, depositEvent, txnIndex, logIndex, blockNumber, txnRef, rawData, _a, originChainId, deposit;
+        var _b;
+        if (secondsLookback === void 0) { secondsLookback = 2 * 24 * 60 * 60; }
+        return tslib_1.__generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
                     if ((0, utils_2.isUnsafeDepositId)(depositId)) {
                         throw new Error("Cannot binary search for depositId ".concat(depositId));
@@ -147,26 +167,29 @@ function findDeposit(eventClient, depositId, logger, slot, secondsLookback) {
                     opts = undefined;
                     return [4, (0, utils_3.getNearestSlotTime)(provider, opts, logger)];
                 case 1:
-                    currentSlot = (_b.sent()).slot;
+                    currentSlot = (_c.sent()).slot;
                     endSlot = slot !== undefined ? BigInt(Math.min(Number(slot), Number(currentSlot))) : currentSlot;
                     slotsInElapsed = BigInt(Math.round((secondsLookback * 1000) / exports.SLOT_DURATION_MS));
                     startSlot = endSlot - slotsInElapsed;
                     return [4, eventClient.queryEvents("FundsDeposited", startSlot, endSlot)];
                 case 2:
-                    depositEvent = (_a = (_b.sent())) === null || _a === void 0 ? void 0 : _a.find(function (event) {
+                    depositEvent = (_b = (_c.sent())) === null || _b === void 0 ? void 0 : _b.find(function (event) {
                         return depositId.eq(event.data.depositId);
                     });
                     if (!depositEvent) {
                         return [2, undefined];
                     }
-                    unwrappedDepositEvent = (0, _1.unwrapEventData)(depositEvent.data, ["depositId", "outputAmount"]);
-                    destinationChainId = unwrappedDepositEvent.destinationChainId;
-                    return [2, tslib_1.__assign(tslib_1.__assign({ txnRef: depositEvent.signature.toString(), blockNumber: Number(depositEvent.slot), txnIndex: 0, logIndex: 0 }, unwrappedDepositEvent), { depositor: (0, utils_2.toAddressType)(unwrappedDepositEvent.depositor, constants_1.CHAIN_IDs.SOLANA), recipient: (0, utils_2.toAddressType)(unwrappedDepositEvent.recipient, destinationChainId), inputToken: (0, utils_2.toAddressType)(unwrappedDepositEvent.inputToken, constants_1.CHAIN_IDs.SOLANA), outputToken: (0, utils_2.toAddressType)(unwrappedDepositEvent.outputToken, destinationChainId), exclusiveRelayer: (0, utils_2.toAddressType)(unwrappedDepositEvent.exclusiveRelayer, destinationChainId) })];
+                    txnIndex = 0;
+                    logIndex = 0;
+                    blockNumber = Number(depositEvent.slot);
+                    txnRef = depositEvent.signature.toString();
+                    rawData = (0, _1.unwrapEventData)(depositEvent.data, ["depositId", "outputAmount"]);
+                    _a = (0, utils_2.unpackDepositEvent)(tslib_1.__assign(tslib_1.__assign({}, rawData), { blockNumber: blockNumber, txnRef: txnRef, txnIndex: txnIndex, logIndex: logIndex }), constants_1.CHAIN_IDs.SOLANA), originChainId = _a.originChainId, deposit = tslib_1.__rest(_a, ["originChainId"]);
+                    return [2, tslib_1.__assign({}, deposit)];
             }
         });
     });
 }
-exports.findDeposit = findDeposit;
 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;
@@ -201,7 +224,6 @@ function relayFillStatus(programId, relayData, destinationChainId, svmEventsClie
         });
     });
 }
-exports.relayFillStatus = relayFillStatus;
 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, opts, toSlot, _b, _i, missingChunked_1, chunk_1, chunkResults;
@@ -288,10 +310,9 @@ function fillStatusArray(programId, relayData, destinationChainId, svmEventsClie
         });
     });
 }
-exports.fillStatusArray = fillStatusArray;
 function findFillEvent(relayData, destinationChainId, svmEventsClient, fromSlot, toSlot, logger) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
-        var opts, _a, _b, programId, fillStatusPda, fillEvents, rawFillEvent, eventData, originChainId, parsedFillEvent;
+        var opts, _a, _b, programId, fillStatusPda, fillEvents, rawEvent, rawFill, fill;
         return tslib_1.__generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -316,19 +337,17 @@ function findFillEvent(relayData, destinationChainId, svmEventsClient, fromSlot,
                 case 5:
                     fillEvents = _c.sent();
                     (0, assert_1.default)(fillEvents.length <= 1, "Expected at most one fill event for ".concat(fillStatusPda, ", got ").concat(fillEvents.length));
-                    if (fillEvents.length > 0) {
-                        rawFillEvent = fillEvents[0];
-                        eventData = (0, _1.unwrapEventData)(rawFillEvent.data, ["depositId", "inputAmount"]);
-                        originChainId = eventData.originChainId;
-                        parsedFillEvent = tslib_1.__assign(tslib_1.__assign({}, eventData), { txnRef: rawFillEvent.signature, blockNumber: Number(rawFillEvent.slot), txnIndex: 0, logIndex: 0, destinationChainId: destinationChainId, inputToken: (0, utils_2.toAddressType)(eventData.inputToken, originChainId), outputToken: (0, utils_2.toAddressType)(eventData.outputToken, destinationChainId), relayer: (0, utils_2.toAddressType)(eventData.relayer, eventData.repaymentChainId), exclusiveRelayer: (0, utils_2.toAddressType)(eventData.exclusiveRelayer, destinationChainId), depositor: (0, utils_2.toAddressType)(eventData.depositor, originChainId), recipient: (0, utils_2.toAddressType)(eventData.recipient, destinationChainId), relayExecutionInfo: tslib_1.__assign(tslib_1.__assign({}, eventData.relayExecutionInfo), { updatedRecipient: eventData.relayExecutionInfo.updatedRecipient }) });
-                        return [2, parsedFillEvent];
+                    rawEvent = fillEvents[0];
+                    if (!(0, utils_2.isDefined)(rawEvent)) {
+                        return [2];
                     }
-                    return [2, undefined];
+                    rawFill = (0, _1.unwrapEventData)(rawEvent.data, ["depositId", "inputAmount"]);
+                    fill = (0, utils_2.unpackFillEvent)(rawFill, destinationChainId);
+                    return [2, fill];
             }
         });
     });
 }
-exports.findFillEvent = findFillEvent;
 function fillRelayInstruction(spokePool, relayData, signer, recipientTokenAccount, repaymentAddress, repaymentChainId) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
         var program, messageHash, _relayDataHash, relayDataHash, relayer, _a, statePda, fillStatusPda, eventAuthority, delegatePda, relayerTokenAccount, svmRelayData;
@@ -370,14 +389,12 @@ function fillRelayInstruction(spokePool, relayData, signer, recipientTokenAccoun
         });
     });
 }
-exports.fillRelayInstruction = fillRelayInstruction;
 function createTokenAccountsInstruction(mint, relayer) {
     return contracts_1.SvmSpokeClient.getCreateTokenAccountsInstruction({
         signer: relayer,
         mint: (0, _1.toAddress)(mint),
     });
 }
-exports.createTokenAccountsInstruction = createTokenAccountsInstruction;
 function getFillRelayTx(spokePoolAddr, solanaClient, relayData, signer, repaymentChainId, repaymentAddress) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
         var svmRelayData, program, messageHash, _relayDataHash, relayDataHash, _a, state, delegate, mintInfo, fillStatus, eventAuthority, _b, recipientAta, relayerAta, remainingAccounts, acrossPlusMessage_1, fillInput;
@@ -436,7 +453,6 @@ function getFillRelayTx(spokePoolAddr, solanaClient, relayData, signer, repaymen
         });
     });
 }
-exports.getFillRelayTx = getFillRelayTx;
 function getIPFillRelayTx(spokePoolAddr, solanaClient, relayData, signer, repaymentChainId, repaymentAddress) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
         var program, _relayDataHash, relayDataHash, _a, state, delegate, instructionParams, mint, mintInfo, _b, recipientAta, relayerAta, fillStatus, eventAuthority, remainingAccounts, acrossPlusMessage_2, fillInput;
@@ -497,13 +513,16 @@ function getIPFillRelayTx(spokePoolAddr, solanaClient, relayData, signer, repaym
         });
     });
 }
-exports.getIPFillRelayTx = getIPFillRelayTx;
-var createFillInstruction = function (signer, solanaClient, fillInput, relayData, tokenDecimals, createRecipientAtaIfNeeded, remainingAccounts) {
-    if (createRecipientAtaIfNeeded === void 0) { createRecipientAtaIfNeeded = true; }
-    if (remainingAccounts === void 0) { remainingAccounts = []; }
-    return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+var createFillInstruction = function (signer_1, solanaClient_1, fillInput_1, relayData_1, tokenDecimals_1) {
+    var args_1 = [];
+    for (var _i = 5; _i < arguments.length; _i++) {
+        args_1[_i - 5] = arguments[_i];
+    }
+    return tslib_1.__awaiter(void 0, tslib_1.__spreadArray([signer_1, solanaClient_1, fillInput_1, relayData_1, tokenDecimals_1], args_1, true), void 0, function (signer, solanaClient, fillInput, relayData, tokenDecimals, createRecipientAtaIfNeeded, remainingAccounts) {
         var mintInfo, approveIx, getCreateAssociatedTokenIdempotentIx, createFillIx, _a;
         var _b;
+        if (createRecipientAtaIfNeeded === void 0) { createRecipientAtaIfNeeded = true; }
+        if (remainingAccounts === void 0) { remainingAccounts = []; }
         return tslib_1.__generator(this, function (_c) {
             switch (_c.label) {
                 case 0: return [4, getMintInfo(solanaClient, fillInput.mint)];
@@ -548,11 +567,14 @@ function deserializeMessage(_message) {
     var acrossPlusMessageDecoder = (0, _1.getAcrossPlusMessageDecoder)();
     return acrossPlusMessageDecoder.decode(message);
 }
-exports.deserializeMessage = deserializeMessage;
-var createDepositInstruction = function (signer, solanaClient, depositInput, tokenDecimals, createVaultAtaIfNeeded) {
-    if (createVaultAtaIfNeeded === void 0) { createVaultAtaIfNeeded = true; }
-    return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+var createDepositInstruction = function (signer_1, solanaClient_1, depositInput_1, tokenDecimals_1) {
+    var args_1 = [];
+    for (var _i = 4; _i < arguments.length; _i++) {
+        args_1[_i - 4] = arguments[_i];
+    }
+    return tslib_1.__awaiter(void 0, tslib_1.__spreadArray([signer_1, solanaClient_1, depositInput_1, tokenDecimals_1], args_1, true), void 0, function (signer, solanaClient, depositInput, tokenDecimals, createVaultAtaIfNeeded) {
         var getCreateAssociatedTokenIdempotentIx, mintInfo, approveIx, depositIx, _a;
+        if (createVaultAtaIfNeeded === void 0) { createVaultAtaIfNeeded = true; }
         return tslib_1.__generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
@@ -639,7 +661,6 @@ function getSlowFillRequestTx(spokePoolAddr, solanaClient, relayData, signer) {
         });
     });
 }
-exports.getSlowFillRequestTx = getSlowFillRequestTx;
 var createCloseFillPdaInstruction = function (signer, solanaClient, fillStatusPda) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
     var closeFillPdaIx, _a, _b, _c;
     var _d;
@@ -681,10 +702,10 @@ var createReceiveMessageInstruction = function (signer, solanaClient, input, rem
     });
 }); };
 exports.createReceiveMessageInstruction = createReceiveMessageInstruction;
-function getAssociatedTokenAddress(owner, mint, tokenProgramId) {
-    if (tokenProgramId === void 0) { tokenProgramId = token_1.TOKEN_PROGRAM_ADDRESS; }
-    return tslib_1.__awaiter(this, void 0, void 0, function () {
+function getAssociatedTokenAddress(owner_1, mint_1) {
+    return tslib_1.__awaiter(this, arguments, void 0, function (owner, mint, tokenProgramId) {
         var encoder, associatedToken;
+        if (tokenProgramId === void 0) { tokenProgramId = token_1.TOKEN_PROGRAM_ADDRESS; }
         return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -700,7 +721,6 @@ function getAssociatedTokenAddress(owner, mint, tokenProgramId) {
         });
     });
 }
-exports.getAssociatedTokenAddress = getAssociatedTokenAddress;
 function getRelayDataHash(relayData, destinationChainId) {
     (0, assert_1.default)(relayData.messageHash.startsWith("0x"), "Message hash must be a hex string");
     var uint64Encoder = (0, kit_1.getU64Encoder)();
@@ -717,7 +737,6 @@ function getRelayDataHash(relayData, destinationChainId) {
     ]);
     return (0, utils_2.keccak256)(contentToHash);
 }
-exports.getRelayDataHash = getRelayDataHash;
 function resolveFillStatusFromPdaEvents(fillStatusPda, toSlot, svmEventsClient) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
         var eventsToQuery, relevantEvents, fillStatusEvent;
@@ -777,10 +796,10 @@ function fetchBatchFillStatusFromPdaAccounts(provider, fillStatusPdas, relayData
         });
     });
 }
-function getFillRelayViaInstructionParamsInstructions(spokePool, relayData, repaymentChainId, repaymentAddress, signer, maxWriteSize) {
-    if (maxWriteSize === void 0) { maxWriteSize = 450; }
-    return tslib_1.__awaiter(this, void 0, void 0, function () {
+function getFillRelayViaInstructionParamsInstructions(spokePool_1, relayData_1, repaymentChainId_1, repaymentAddress_1, signer_1) {
+    return tslib_1.__awaiter(this, arguments, void 0, function (spokePool, relayData, repaymentChainId, repaymentAddress, signer, maxWriteSize) {
         var instructionParams, relayDataEncoder, svmRelayData, encodedRelayData, initInstructionParamsIx, instructions, i, offset, offsetEnd, fragment, writeInstructionParamsIx;
+        if (maxWriteSize === void 0) { maxWriteSize = 450; }
         return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4, (0, _1.getInstructionParamsPda)(spokePool, signer.address)];
@@ -816,7 +835,6 @@ function getFillRelayViaInstructionParamsInstructions(spokePool, relayData, repa
         });
     });
 }
-exports.getFillRelayViaInstructionParamsInstructions = getFillRelayViaInstructionParamsInstructions;
 function getDepositDelegatePda(depositData, programId) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
         var addrEnc, u64, u32, parts, seedHash, pda;
@@ -853,7 +871,6 @@ function getDepositDelegatePda(depositData, programId) {
         });
     });
 }
-exports.getDepositDelegatePda = getDepositDelegatePda;
 function getDepositNowDelegatePda(depositData, programId) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
         var addrEnc, u64, u32, parts, seedHash, pda;
@@ -889,7 +906,6 @@ function getDepositNowDelegatePda(depositData, programId) {
         });
     });
 }
-exports.getDepositNowDelegatePda = getDepositNowDelegatePda;
 function getFillRelayDelegatePda(relayHash, repaymentChainId, repaymentAddress, programId) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
         var addrEnc, u64, parts, seedHash, pda;
@@ -915,7 +931,6 @@ function getFillRelayDelegatePda(relayHash, repaymentChainId, repaymentAddress,
         });
     });
 }
-exports.getFillRelayDelegatePda = getFillRelayDelegatePda;
 var hasCCTPV1MessageBeenProcessed = function (solanaClient, signer, nonce, sourceDomain) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
     var noncePda, e_1, isNonceUsedIx, parserFunction;
     return tslib_1.__generator(this, function (_a) {
@@ -929,20 +944,18 @@ var hasCCTPV1MessageBeenProcessed = function (solanaClient, signer, nonce, sourc
             case 2:
                 e_1 = _a.sent();
                 return [2, false];
-            case 3: return [4, contracts_1.MessageTransmitterClient.getIsNonceUsedInstruction({
+            case 3:
+                isNonceUsedIx = contracts_1.MessageTransmitterClient.getIsNonceUsedInstruction({
                     nonce: nonce,
                     usedNonces: noncePda,
-                })];
-            case 4:
-                isNonceUsedIx = _a.sent();
+                });
                 parserFunction = function (buf) {
                     if (buf.length != 1) {
                         throw new Error("Invalid buffer length for isNonceUsedIx");
                     }
                     return Boolean(buf[0]);
                 };
-                return [4, (0, _1.simulateAndDecode)(solanaClient, isNonceUsedIx, signer, parserFunction)];
-            case 5: return [2, _a.sent()];
+                return [2, (0, _1.simulateAndDecode)(solanaClient, isNonceUsedIx, signer, parserFunction)];
         }
     });
 }); };
@@ -1007,7 +1020,6 @@ function getAccountMetasForTokenlessMessage(solanaClient, signer, messageBytes)
         });
     });
 }
-exports.getAccountMetasForTokenlessMessage = getAccountMetasForTokenlessMessage;
 function getAccountMetasForDepositMessage(message, hubChainId, tokenMessengerMinter, recipientAta) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
         var l1Usdc, l2Usdc, tokenMessengerPda, tokenMinterPda, localTokenPda, tokenMessengerEventAuthorityPda, custodyTokenAccountPda, tokenPairPda, remoteTokenMessengerPda;
@@ -1139,7 +1151,6 @@ function getCCTPV1ReceiveMessageTx(solanaClient, signer, message, hubChainId, re
         });
     });
 }
-exports.getCCTPV1ReceiveMessageTx = getCCTPV1ReceiveMessageTx;
 function finalizeCCTPV1Messages(solanaClient, attestedMessages, signer, recipientAta, simulate, hubChainId) {
     var _this = this;
     if (simulate === void 0) { simulate = false; }
@@ -1182,7 +1193,6 @@ function finalizeCCTPV1Messages(solanaClient, attestedMessages, signer, recipien
         });
     }); });
 }
-exports.finalizeCCTPV1Messages = finalizeCCTPV1Messages;
 function getMintInfo(solanaClient, mint, config) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
         return tslib_1.__generator(this, function (_a) {
@@ -1193,5 +1203,4 @@ function getMintInfo(solanaClient, mint, config) {
         });
     });
 }
-exports.getMintInfo = getMintInfo;
 //# sourceMappingURL=SpokeUtils.js.map