@across-protocol/sdk 4.3.12 → 4.3.14

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

@@ -8,6 +8,7 @@ export declare class SVMBlockFinder extends BlockFinder<SVMBlock> {
     private readonly blocks;
     constructor(provider: SVMProvider, blocks?: SVMBlock[]);
     getBlockForTimestamp(timestamp: number | string, hints?: BlockFinderHints): Promise<SVMBlock>;
+    private getBlockTime;
     private getLatestBlock;
     private getBlock;
     private findBlock;

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

@@ -9,6 +9,7 @@ var BlockFinder_1 = require("../../utils/BlockFinder");
 var TypeGuards_1 = require("../../utils/TypeGuards");
 var TimeUtils_1 = require("../../utils/TimeUtils");
 var constants_1 = require("../../constants");
+var SpokeUtils_1 = require("./SpokeUtils");
 var now = (0, TimeUtils_1.getCurrentTime)();
 var averageBlockTimes = (_a = {},
     _a[constants_1.CHAIN_IDs.SOLANA] = { average: 0.4, timestamp: now, blockRange: 1 },
@@ -19,19 +20,9 @@ function averageBlockTime() {
 exports.averageBlockTime = averageBlockTime;
 function estimateBlocksElapsed(seconds, cushionPercentage, _provider) {
     if (cushionPercentage === void 0) { cushionPercentage = 0.0; }
-    return tslib_1.__awaiter(this, void 0, void 0, function () {
-        var cushionMultiplier, average;
-        return tslib_1.__generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    cushionMultiplier = cushionPercentage + 1.0;
-                    return [4, averageBlockTime()];
-                case 1:
-                    average = (_a.sent()).average;
-                    return [2, Math.floor((seconds * cushionMultiplier) / average)];
-            }
-        });
-    });
+    var cushionMultiplier = cushionPercentage + 1.0;
+    var average = averageBlockTime().average;
+    return Math.floor((seconds * cushionMultiplier) / average);
 }
 var SVMBlockFinder = (function (_super) {
     tslib_1.__extends(SVMBlockFinder, _super);
@@ -45,69 +36,94 @@ var SVMBlockFinder = (function (_super) {
     SVMBlockFinder.prototype.getBlockForTimestamp = function (timestamp, hints) {
         if (hints === void 0) { hints = {}; }
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var block, initialBlock, cushion, incrementDistance, _a, _b, multiplier, distance, blockNumber, block, index;
+            var block, initialBlock, cushion, incrementDistance, multiplier, distance, blockNumber, block, index;
             var _this = this;
-            return tslib_1.__generator(this, function (_c) {
-                switch (_c.label) {
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
                         timestamp = Number(timestamp);
                         (0, assert_1.default)(timestamp !== undefined && timestamp !== null, "timestamp must be provided");
                         if (!(this.blocks.length === 0 || this.blocks[this.blocks.length - 1].timestamp < timestamp)) return [3, 2];
                         return [4, this.getLatestBlock()];
                     case 1:
-                        block = _c.sent();
+                        block = _a.sent();
                         if (timestamp >= block.timestamp)
                             return [2, block];
-                        _c.label = 2;
+                        _a.label = 2;
                     case 2: return [4, Promise.all(Object.values(hints)
                             .filter(TypeGuards_1.isDefined)
                             .map(function (blockNumber) { return _this.getBlock(blockNumber); }))];
                     case 3:
-                        _c.sent();
-                        if (!(this.blocks[0].timestamp > timestamp)) return [3, 8];
+                        _a.sent();
+                        if (!(this.blocks[0].timestamp > timestamp)) return [3, 7];
                         initialBlock = this.blocks[0];
                         cushion = 1;
-                        _b = (_a = Math).max;
-                        return [4, estimateBlocksElapsed(initialBlock.timestamp - timestamp, cushion, this.provider)];
-                    case 4:
-                        incrementDistance = _b.apply(_a, [_c.sent(), 1]);
+                        incrementDistance = Math.max(estimateBlocksElapsed(initialBlock.timestamp - timestamp, cushion, this.provider), 1);
                         multiplier = 1;
-                        _c.label = 5;
-                    case 5:
+                        _a.label = 4;
+                    case 4:
                         distance = multiplier * incrementDistance;
                         blockNumber = Math.max(0, initialBlock.number - distance);
                         return [4, this.getBlock(blockNumber)];
-                    case 6:
-                        block = _c.sent();
+                    case 5:
+                        block = _a.sent();
                         if (block.timestamp <= timestamp)
-                            return [3, 8];
+                            return [3, 7];
                         (0, assert_1.default)(blockNumber > 0, "timestamp is before block 0");
-                        _c.label = 7;
-                    case 7:
+                        _a.label = 6;
+                    case 6:
                         multiplier++;
-                        return [3, 5];
-                    case 8:
+                        return [3, 4];
+                    case 7:
                         index = (0, lodash_1.sortedIndexBy)(this.blocks, { timestamp: timestamp }, "timestamp");
                         return [2, this.findBlock(this.blocks[index - 1], this.blocks[index], timestamp)];
                 }
             });
         });
     };
-    SVMBlockFinder.prototype.getLatestBlock = function () {
-        var _a;
+    SVMBlockFinder.prototype.getBlockTime = function (_slot) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var latestSlot, estimatedSlotTime, block, index;
+            var timestamp, slot, _a;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
-                    case 0: return [4, this.provider.getSlot().send()];
-                    case 1:
-                        latestSlot = _b.sent();
-                        return [4, this.provider.getBlockTime(latestSlot).send()];
+                    case 0:
+                        if (!(_slot !== null && _slot !== void 0)) return [3, 1];
+                        _a = _slot;
+                        return [3, 3];
+                    case 1: return [4, this.provider.getSlot({ commitment: "finalized" }).send()];
                     case 2:
-                        estimatedSlotTime = _b.sent();
+                        _a = (_b.sent());
+                        _b.label = 3;
+                    case 3:
+                        slot = _a;
+                        _b.label = 4;
+                    case 4: return [4, (0, SpokeUtils_1.getTimestampForSlot)(this.provider, slot)];
+                    case 5:
+                        timestamp = _b.sent();
+                        _b.label = 6;
+                    case 6:
+                        if (!(0, TypeGuards_1.isDefined)(timestamp) && --slot) return [3, 4];
+                        _b.label = 7;
+                    case 7:
+                        (0, assert_1.default)((0, TypeGuards_1.isDefined)(timestamp), "Unable to resolve block time for SVM slot ".concat(_slot !== null && _slot !== void 0 ? _slot : "latest"));
+                        (0, assert_1.default)(BigInt(Number(timestamp) === timestamp), "Unexpected SVM block timestamp: ".concat(timestamp));
+                        return [2, { slot: slot, timestamp: Number(timestamp) }];
+                }
+            });
+        });
+    };
+    SVMBlockFinder.prototype.getLatestBlock = function () {
+        var _a;
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var _b, slot, timestamp, block, index;
+            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;
                         block = {
-                            timestamp: Number(estimatedSlotTime),
-                            number: Number(latestSlot),
+                            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)
@@ -120,22 +136,23 @@ var SVMBlockFinder = (function (_super) {
     SVMBlockFinder.prototype.getBlock = function (number) {
         var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var index, estimatedSlotTime, block;
-            return tslib_1.__generator(this, function (_c) {
-                switch (_c.label) {
+            var index, _c, _slot, timestamp, slot, block;
+            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)
                             return [2, this.blocks[index]];
-                        return [4, this.provider.getBlockTime(BigInt(number)).send()];
+                        return [4, this.getBlockTime(BigInt(number))];
                     case 1:
-                        estimatedSlotTime = _c.sent();
+                        _c = _d.sent(), _slot = _c.slot, timestamp = _c.timestamp;
+                        slot = Number(_slot);
                         block = {
-                            timestamp: Number(estimatedSlotTime),
-                            number: number,
+                            timestamp: timestamp,
+                            number: slot,
                         };
-                        index = (0, lodash_1.sortedIndexBy)(this.blocks, { number: number }, "number");
-                        if (((_b = this.blocks[index]) === null || _b === void 0 ? void 0 : _b.number) === number)
+                        index = (0, lodash_1.sortedIndexBy)(this.blocks, { number: slot }, "number");
+                        if (((_b = this.blocks[index]) === null || _b === void 0 ? void 0 : _b.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

@@ -1,10 +1,10 @@
-import { SvmSpokeClient } from "@across-protocol/contracts";
-import { Address, ReadonlyUint8Array, type TransactionSigner } from "@solana/kit";
+import { MessageTransmitterClient, SvmSpokeClient } from "@across-protocol/contracts";
+import { Address, IAccountMeta, KeyPairSigner, ReadonlyUint8Array, type TransactionSigner } from "@solana/kit";
 import { Logger } from "winston";
 import { DepositWithBlock, FillStatus, FillWithBlock, RelayData } from "../../interfaces";
-import { BigNumber, EvmAddress, SvmAddress, Address as SdkAddress } from "../../utils";
+import { BigNumber, EvmAddress, Address as SdkAddress, SvmAddress } from "../../utils";
 import { SvmCpiEventsClient } from "./eventsClient";
-import { SVMProvider } from "./types";
+import { AttestedCCTPMessage, SVMProvider } from "./types";
 export declare const SLOT_DURATION_MS = 400;
 type ProtoFill = Omit<RelayData, "recipient" | "outputToken"> & {
     destinationChainId: number;
@@ -25,19 +25,19 @@ export declare function getFillRelayTx(spokePoolAddr: SvmAddress, solanaClient:
     recipient: SvmAddress;
     outputToken: SvmAddress;
 }, signer: TransactionSigner, repaymentChainId: number, repaymentAddress: SdkAddress): Promise<import("@solana/kit").TransactionMessageWithBlockhashLifetime & import("@solana/kit").ITransactionMessageWithFeePayerSigner<string, TransactionSigner<string>> & Omit<Readonly<{
-    instructions: readonly import("@solana/kit").IInstruction<string, readonly (import("@solana/kit").IAccountLookupMeta<string, string> | import("@solana/kit").IAccountMeta<string>)[]>[];
+    instructions: readonly import("@solana/kit").IInstruction<string, readonly (import("@solana/kit").IAccountLookupMeta<string, string> | IAccountMeta<string>)[]>[];
     version: 0;
 }>, "feePayer">>;
 export declare const createFillInstruction: (signer: TransactionSigner, solanaClient: SVMProvider, fillInput: SvmSpokeClient.FillRelayInput, tokenDecimals: number, createRecipientAtaIfNeeded?: boolean) => Promise<import("@solana/kit").TransactionMessageWithBlockhashLifetime & import("@solana/kit").ITransactionMessageWithFeePayerSigner<string, TransactionSigner<string>> & Omit<Readonly<{
-    instructions: readonly import("@solana/kit").IInstruction<string, readonly (import("@solana/kit").IAccountLookupMeta<string, string> | import("@solana/kit").IAccountMeta<string>)[]>[];
+    instructions: readonly import("@solana/kit").IInstruction<string, readonly (import("@solana/kit").IAccountLookupMeta<string, string> | IAccountMeta<string>)[]>[];
     version: 0;
 }>, "feePayer">>;
 export declare const createDepositInstruction: (signer: TransactionSigner, solanaClient: SVMProvider, depositInput: SvmSpokeClient.DepositInput, tokenDecimals: number, createVaultAtaIfNeeded?: boolean) => Promise<import("@solana/kit").TransactionMessageWithBlockhashLifetime & import("@solana/kit").ITransactionMessageWithFeePayerSigner<string, TransactionSigner<string>> & Omit<Readonly<{
-    instructions: readonly import("@solana/kit").IInstruction<string, readonly (import("@solana/kit").IAccountLookupMeta<string, string> | import("@solana/kit").IAccountMeta<string>)[]>[];
+    instructions: readonly import("@solana/kit").IInstruction<string, readonly (import("@solana/kit").IAccountLookupMeta<string, string> | IAccountMeta<string>)[]>[];
     version: 0;
 }>, "feePayer">>;
 export declare const createRequestSlowFillInstruction: (signer: TransactionSigner, solanaClient: SVMProvider, requestSlowFillInput: SvmSpokeClient.RequestSlowFillInput) => Promise<import("@solana/kit").TransactionMessageWithBlockhashLifetime & import("@solana/kit").ITransactionMessageWithFeePayerSigner<string, TransactionSigner<string>> & Omit<Readonly<{
-    instructions: readonly import("@solana/kit").IInstruction<string, readonly (import("@solana/kit").IAccountLookupMeta<string, string> | import("@solana/kit").IAccountMeta<string>)[]>[];
+    instructions: readonly import("@solana/kit").IInstruction<string, readonly (import("@solana/kit").IAccountLookupMeta<string, string> | IAccountMeta<string>)[]>[];
     version: 0;
 }>, "feePayer">>;
 export declare function getSlowFillRequestTx(spokePoolAddr: SvmAddress, solanaClient: SVMProvider, relayData: Omit<RelayData, "recipient" | "outputToken"> & {
@@ -45,11 +45,15 @@ export declare function getSlowFillRequestTx(spokePoolAddr: SvmAddress, solanaCl
     recipient: SvmAddress;
     outputToken: SvmAddress;
 }, signer: TransactionSigner): Promise<import("@solana/kit").TransactionMessageWithBlockhashLifetime & import("@solana/kit").ITransactionMessageWithFeePayerSigner<string, TransactionSigner<string>> & Omit<Readonly<{
-    instructions: readonly import("@solana/kit").IInstruction<string, readonly (import("@solana/kit").IAccountLookupMeta<string, string> | import("@solana/kit").IAccountMeta<string>)[]>[];
+    instructions: readonly import("@solana/kit").IInstruction<string, readonly (import("@solana/kit").IAccountLookupMeta<string, string> | IAccountMeta<string>)[]>[];
     version: 0;
 }>, "feePayer">>;
 export declare const createCloseFillPdaInstruction: (signer: TransactionSigner, solanaClient: SVMProvider, fillStatusPda: Address) => Promise<import("@solana/kit").TransactionMessageWithBlockhashLifetime & import("@solana/kit").ITransactionMessageWithFeePayerSigner<string, TransactionSigner<string>> & Omit<Readonly<{
-    instructions: readonly import("@solana/kit").IInstruction<string, readonly (import("@solana/kit").IAccountLookupMeta<string, string> | import("@solana/kit").IAccountMeta<string>)[]>[];
+    instructions: readonly import("@solana/kit").IInstruction<string, readonly (import("@solana/kit").IAccountLookupMeta<string, string> | IAccountMeta<string>)[]>[];
+    version: 0;
+}>, "feePayer">>;
+export declare const createReceiveMessageInstruction: (signer: TransactionSigner, solanaClient: SVMProvider, input: MessageTransmitterClient.ReceiveMessageInput, remainingAccounts: IAccountMeta<string>[]) => Promise<import("@solana/kit").TransactionMessageWithBlockhashLifetime & import("@solana/kit").ITransactionMessageWithFeePayerSigner<string, TransactionSigner<string>> & Omit<Readonly<{
+    instructions: readonly import("@solana/kit").IInstruction<string, readonly (import("@solana/kit").IAccountLookupMeta<string, string> | IAccountMeta<string>)[]>[];
     version: 0;
 }>, "feePayer">>;
 export declare function getAssociatedTokenAddress(owner: SvmAddress, mint: SvmAddress, tokenProgramId?: Address<string>): Promise<Address<string>>;
@@ -82,4 +86,11 @@ export declare function getDepositNowDelegatePda(depositData: {
     message: Uint8Array;
 }, programId: Address<string>): Promise<Address<string>>;
 export declare function getFillRelayDelegatePda(relayHash: Uint8Array, repaymentChainId: bigint, repaymentAddress: Address<string>, programId: Address<string>): Promise<Address<string>>;
+export declare const hasCCTPV1MessageBeenProcessed: (solanaClient: SVMProvider, signer: KeyPairSigner, nonce: number, sourceDomain: number) => Promise<boolean>;
+export declare function getAccountMetasForTokenlessMessage(): Promise<IAccountMeta<string>[]>;
+export declare function getCCTPV1ReceiveMessageTx(solanaClient: SVMProvider, signer: KeyPairSigner, message: AttestedCCTPMessage, hubChainId: number): Promise<import("@solana/kit").TransactionMessageWithBlockhashLifetime & import("@solana/kit").ITransactionMessageWithFeePayerSigner<string, TransactionSigner<string>> & Omit<Readonly<{
+    instructions: readonly import("@solana/kit").IInstruction<string, readonly (import("@solana/kit").IAccountLookupMeta<string, string> | IAccountMeta<string>)[]>[];
+    version: 0;
+}>, "feePayer">>;
+export declare function finalizeCCTPV1Messages(solanaClient: SVMProvider, attestedMessages: AttestedCCTPMessage[], signer: KeyPairSigner, simulate?: boolean, hubChainId?: number): Promise<string[]>;
 export {};