@shapeshiftoss/swapper 17.8.0 → 19.0.0

package/dist/{esm/utils/tenderly → cjs/utils/evm}/storageSlots.d.ts

@@ -1,8 +1,8 @@
 import type { Address, Hex } from 'viem';
-export declare const getBalanceStorageSlot: (userAddress: Address, balanceSlotNumber?: number) => Hex;
-export declare const getAllowanceStorageSlot: (ownerAddress: Address, spenderAddress: Address, allowanceSlotNumber?: number) => Hex;
+export type StorageLayout = 'solidity' | 'vyper';
+export declare const getBalanceStorageSlot: (userAddress: Address, balanceSlotNumber: number, layout?: StorageLayout) => Hex;
+export declare const getAllowanceStorageSlot: (ownerAddress: Address, spenderAddress: Address, allowanceSlotNumber: number, layout?: StorageLayout) => Hex;
 export declare const KNOWN_BALANCE_SLOTS: Record<string, number>;
 export declare const KNOWN_ALLOWANCE_SLOTS: Record<string, number>;
 export declare const getTokenBalanceSlot: (tokenAddress: Address) => number;
 export declare const getTokenAllowanceSlot: (tokenAddress: Address) => number;
-export declare const getMaxBalanceValue: (tokenAddress: Address) => Hex;

package/dist/cjs/utils/{tenderly → evm}/storageSlots.js

@@ -1,22 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMaxBalanceValue = exports.getTokenAllowanceSlot = exports.getTokenBalanceSlot = exports.KNOWN_ALLOWANCE_SLOTS = exports.KNOWN_BALANCE_SLOTS = exports.getAllowanceStorageSlot = exports.getBalanceStorageSlot = void 0;
+exports.getTokenAllowanceSlot = exports.getTokenBalanceSlot = exports.KNOWN_ALLOWANCE_SLOTS = exports.KNOWN_BALANCE_SLOTS = exports.getAllowanceStorageSlot = exports.getBalanceStorageSlot = void 0;
 const viem_1 = require("viem");
-// keccak256(concat(pad(address), pad(slot)))
-const getBalanceStorageSlot = (userAddress, balanceSlotNumber = 0) => {
-    const paddedAddress = (0, viem_1.pad)(userAddress.toLowerCase(), { size: 32 });
-    const paddedSlot = (0, viem_1.pad)((0, viem_1.toHex)(balanceSlotNumber), { size: 32 });
-    return (0, viem_1.keccak256)((0, viem_1.concat)([paddedAddress, paddedSlot]));
+const getMappingStorageSlot = (key, slot, layout) => {
+    const paddedKey = (0, viem_1.pad)(key.toLowerCase(), { size: 32 });
+    const paddedSlot = (0, viem_1.pad)(typeof slot === 'number' ? (0, viem_1.toHex)(slot) : slot, { size: 32 });
+    return (0, viem_1.keccak256)((0, viem_1.concat)(layout === 'vyper' ? [paddedSlot, paddedKey] : [paddedKey, paddedSlot]));
 };
+const getBalanceStorageSlot = (userAddress, balanceSlotNumber, layout = 'solidity') => getMappingStorageSlot(userAddress, balanceSlotNumber, layout);
 exports.getBalanceStorageSlot = getBalanceStorageSlot;
-// keccak256(spender, keccak256(owner, slot))
-const getAllowanceStorageSlot = (ownerAddress, spenderAddress, allowanceSlotNumber = 1) => {
-    const paddedOwner = (0, viem_1.pad)(ownerAddress.toLowerCase(), { size: 32 });
-    const paddedAllowanceSlot = (0, viem_1.pad)((0, viem_1.toHex)(allowanceSlotNumber), { size: 32 });
-    const innerSlot = (0, viem_1.keccak256)((0, viem_1.concat)([paddedOwner, paddedAllowanceSlot]));
-    const paddedSpender = (0, viem_1.pad)(spenderAddress.toLowerCase(), { size: 32 });
-    return (0, viem_1.keccak256)((0, viem_1.concat)([paddedSpender, innerSlot]));
-};
+// Nested mapping - the outer (spender) hash chains onto the inner (owner) hash
+const getAllowanceStorageSlot = (ownerAddress, spenderAddress, allowanceSlotNumber, layout = 'solidity') => getMappingStorageSlot(spenderAddress, getMappingStorageSlot(ownerAddress, allowanceSlotNumber, layout), layout);
 exports.getAllowanceStorageSlot = getAllowanceStorageSlot;
 // Most ERC20s: balance at slot 0, allowance at slot 1
 // Slot 51/52 pattern (StandardArbERC20, some L2 implementations)
@@ -86,9 +80,3 @@ const getTokenAllowanceSlot = (tokenAddress) => {
     return 1;
 };
 exports.getTokenAllowanceSlot = getTokenAllowanceSlot;
-// USDC slot 9: bit 255 is blacklist flag, must keep cleared
-const getMaxBalanceValue = (tokenAddress) => {
-    const slot = (0, exports.getTokenBalanceSlot)(tokenAddress);
-    return slot === 9 ? (0, viem_1.toHex)(viem_1.maxUint256 >> 1n) : (0, viem_1.toHex)(viem_1.maxUint256);
-};
-exports.getMaxBalanceValue = getMaxBalanceValue;

package/dist/cjs/{swappers/utils/helpers → utils}/helpers.d.ts

@@ -1,3 +1,5 @@
 import type { AssetId, ChainId } from '@shapeshiftoss/caip';
+export declare const FALLBACK_QUOTE_DEADLINE_MS = 60000;
+export declare const normalizeEpochToMs: (value: number) => number;
 export declare const isNativeEvmAsset: (assetId: AssetId) => boolean;
 export declare const getTreasuryAddressFromChainId: (chainId: ChainId) => string;

package/dist/cjs/{swappers/utils/helpers → utils}/helpers.js

@@ -1,9 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTreasuryAddressFromChainId = exports.isNativeEvmAsset = void 0;
+exports.getTreasuryAddressFromChainId = exports.isNativeEvmAsset = exports.normalizeEpochToMs = exports.FALLBACK_QUOTE_DEADLINE_MS = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const types_1 = require("@shapeshiftoss/types");
 const utils_1 = require("@shapeshiftoss/utils");
+// Deadline for providers without their own expiry - short enough to keep priced amounts honest
+exports.FALLBACK_QUOTE_DEADLINE_MS = 60_000;
+// Bands are unambiguous for any realistic date: unix s land ~2e9, ms ~2e12, µs ~2e15, ns ~2e18
+const normalizeEpochToMs = (value) => {
+    if (value < 1e12)
+        return value * 1000;
+    if (value < 1e15)
+        return value;
+    if (value < 1e18)
+        return Math.floor(value / 1000);
+    return Math.floor(value / 1e6);
+};
+exports.normalizeEpochToMs = normalizeEpochToMs;
 const isNativeEvmAsset = (assetId) => {
     const { chainId } = (0, caip_1.fromAssetId)(assetId);
     switch (chainId) {

package/dist/cjs/utils/helpers.test.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const caip_1 = require("@shapeshiftoss/caip");
+const types_1 = require("@shapeshiftoss/types");
+const utils_1 = require("@shapeshiftoss/utils");
+const vitest_1 = require("vitest");
+const helpers_1 = require("./helpers");
+(0, vitest_1.describe)('getTreasuryAddressFromChainId', () => {
+    // Affiliate and fee recipient addresses for every swapper flow through here, so pin the values
+    // rather than the wiring - a chain pointing at another chain's treasury misroutes revenue silently
+    const expectedTreasuryAddressByChainId = {
+        [types_1.KnownChainIds.EthereumMainnet]: '0x90a48d5cf7343b08da12e067680b4c6dbfe551be',
+        [types_1.KnownChainIds.OptimismMainnet]: '0x6268d07327f4fb7380732dc6d63d95F88c0E083b',
+        [types_1.KnownChainIds.AvalancheMainnet]: '0x74d63F31C2335b5b3BA7ad2812357672b2624cEd',
+        [types_1.KnownChainIds.PolygonMainnet]: '0xB5F944600785724e31Edb90F9DFa16dBF01Af000',
+        [types_1.KnownChainIds.GnosisMainnet]: '0xb0E3175341794D1dc8E5F02a02F9D26989EbedB3',
+        [types_1.KnownChainIds.BnbSmartChainMainnet]: '0x8b92b1698b57bEDF2142297e9397875ADBb2297E',
+        [types_1.KnownChainIds.ArbitrumMainnet]: '0x38276553F8fbf2A027D901F8be45f00373d8Dd48',
+        [types_1.KnownChainIds.BaseMainnet]: '0x9c9aA90363630d4ab1D9dbF416cc3BBC8d3Ed502',
+        [types_1.KnownChainIds.MonadMainnet]: '0xF5AA59151bE6515C4Ca68A0282CF68B3eA4846fC',
+        [types_1.KnownChainIds.HyperEvmMainnet]: '0xF5AA59151bE6515C4Ca68A0282CF68B3eA4846fC',
+        [types_1.KnownChainIds.BobMainnet]: '0xF5AA59151bE6515C4Ca68A0282CF68B3eA4846fC',
+        [types_1.KnownChainIds.BitcoinMainnet]: 'bc1q9xrjfet2a05r3jvsxx66rru7pysevk5dvqasdw9eeea3rfqlk33qr4hghh',
+        [types_1.KnownChainIds.SolanaMainnet]: 'FxXyPB5RH4uHLPPJR5H89zGwZp19juBetmRwrxfsLj2j',
+        [types_1.KnownChainIds.StarknetMainnet]: '0x07ac2252f2da7cbf085e7a5ddc1318243aa818607cdd430dd2e17dd5d487606a',
+        [types_1.KnownChainIds.TonMainnet]: 'UQAHHeOhXst-zSGGigQ8KgDzz89nACBR4TxXwXNjU4DsriLb',
+    };
+    vitest_1.it.each(utils_1.treasuryChainIds)('returns the treasury address for %s', chainId => {
+        (0, vitest_1.expect)((0, helpers_1.getTreasuryAddressFromChainId)(chainId)).toBe(expectedTreasuryAddressByChainId[chainId]);
+    });
+    (0, vitest_1.it)('throws for unsupported chains', () => {
+        (0, vitest_1.expect)(() => (0, helpers_1.getTreasuryAddressFromChainId)(caip_1.thorchainChainId)).toThrow('[getTreasuryAddressFromChainId] - Unsupported chainId');
+    });
+});
+(0, vitest_1.describe)('normalizeEpochToMs', () => {
+    // 2026-08-05T00:00:00Z expressed in each unit
+    const epochS = 1785888000;
+    const epochMs = epochS * 1000;
+    (0, vitest_1.it)('converts unix seconds to ms', () => {
+        (0, vitest_1.expect)((0, helpers_1.normalizeEpochToMs)(epochS)).toBe(epochMs);
+    });
+    (0, vitest_1.it)('passes milliseconds through', () => {
+        (0, vitest_1.expect)((0, helpers_1.normalizeEpochToMs)(epochMs)).toBe(epochMs);
+    });
+    (0, vitest_1.it)('converts microseconds to ms', () => {
+        (0, vitest_1.expect)((0, helpers_1.normalizeEpochToMs)(epochMs * 1000)).toBe(epochMs);
+    });
+    (0, vitest_1.it)('converts nanoseconds to ms', () => {
+        (0, vitest_1.expect)((0, helpers_1.normalizeEpochToMs)(epochMs * 1e6)).toBe(epochMs);
+    });
+});

package/dist/{esm/utils.d.ts → cjs/utils/index.d.ts}

@@ -6,26 +6,36 @@ import type { Asset, EvmChainId } from '@shapeshiftoss/types';
 import { TxStatus } from '@shapeshiftoss/unchained-client';
 import type { Result } from '@sniptt/monads';
 import type { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
-import type { EvmTransactionExecutionProps, ExecutableTradeStep, NearTransactionExecutionProps, SolanaTransactionExecutionProps, StarknetTransactionExecutionProps, SuiTransactionExecutionProps, SupportedTradeQuoteStepIndex, SwapErrorRight, TonTransactionExecutionProps, TradeQuote, TradeQuoteStep, TradeRate, TradeStatus, TronTransactionExecutionProps } from './types.js';
-import { TradeQuoteError } from './types.js';
+import type { TypedData } from 'eip-712';
+import type { CommonSwapMetadata, EvmTransactionExecutionProps, NearTransactionExecutionProps, SolanaTransactionExecutionProps, StarknetTransactionExecutionProps, SuiTransactionExecutionProps, SupportedTradeQuoteStepIndex, SwapErrorRight, SwapMetadata, SwapperMetadata, TonTransactionExecutionProps, TradeQuote, TradeQuoteStep, TradeRate, TradeRateStep, TradeStatus, TronTransactionExecutionProps } from '../types';
+import { TradeQuoteError } from '../types';
+export declare const getPermit2Eip712: (step: TradeQuoteStep | TradeRateStep | undefined) => TypedData | undefined;
 export declare const makeSwapErrorRight: ({ details, cause, code, message, }: {
     message: string;
     details?: unknown;
     cause?: unknown;
     code?: TradeQuoteError | undefined;
 }) => SwapErrorRight;
+export declare const assertQuoteAddresses: ({ sendAddress, receiveAddress, }: {
+    sendAddress?: string | undefined;
+    receiveAddress?: string | undefined;
+}) => Result<{
+    sendAddress: string;
+    receiveAddress: string;
+}, SwapErrorRight>;
 export declare const createTradeAmountTooSmallErr: (details?: {
     minAmountCryptoBaseUnit: string;
     assetId: AssetId;
 }) => SwapErrorRight;
+export declare const makeNetworkFeeEstimationFailedErr: (context: string, cause?: unknown) => SwapErrorRight;
+export declare const makeTradeStepBuildFailedErr: (context: string, cause?: unknown) => SwapErrorRight;
 export declare const createCache: (maxAge: number, cachedUrls: string[], axiosConfig: AxiosRequestConfig) => AxiosInstance;
-export declare const AsyncResultOf: <T>(promise: Promise<T>) => Promise<Result<T, Error>>;
 export declare const makeSwapperAxiosServiceMonadic: (service: AxiosInstance) => {
     get: <T = any>(url: string, config?: AxiosRequestConfig<any>) => Promise<Result<AxiosResponse<T, any, {}>, SwapErrorRight>>;
     post: <T_1 = any>(url: string, data: any, config?: AxiosRequestConfig<any>) => Promise<Result<AxiosResponse<T_1, any, {}>, SwapErrorRight>>;
     delete: <T_2 = any>(url: string, data: any, config?: AxiosRequestConfig<any>) => Promise<Result<AxiosResponse<T_2, any, {}>, SwapErrorRight>>;
 };
-export declare const getHopByIndex: (quote: TradeQuote | TradeRate | undefined, index: SupportedTradeQuoteStepIndex) => TradeQuoteStep | undefined;
+export declare const getHopByIndex: (quote: TradeQuote | TradeRate | undefined, index: SupportedTradeQuoteStepIndex) => TradeQuoteStep | TradeRateStep | undefined;
 export declare const executeEvmTransaction: (txToSign: SignTx<EvmChainId>, callbacks: EvmTransactionExecutionProps) => Promise<string>;
 export declare const executeSolanaTransaction: (txToSign: SolanaSignTx, callbacks: SolanaTransactionExecutionProps) => Promise<string>;
 export declare const executeTronTransaction: (txToSign: TronSignTx, callbacks: TronTransactionExecutionProps) => Promise<string>;
@@ -59,8 +69,7 @@ export declare const getInputOutputRate: ({ sellAmountCryptoBaseUnit, buyAmountC
     buyAsset: Asset;
 }) => string;
 export declare const isExecutableTradeQuote: (quote: TradeQuote | TradeRate) => quote is TradeQuote;
-export declare const isExecutableTradeStep: (step: TradeQuoteStep) => step is ExecutableTradeStep;
-export declare const getExecutableTradeStep: (tradeQuote: TradeQuote, stepIndex: SupportedTradeQuoteStepIndex) => ExecutableTradeStep;
+export declare const getExecutableTradeStep: (tradeQuote: TradeQuote, stepIndex: SupportedTradeQuoteStepIndex) => TradeQuoteStep;
 export declare const checkSolanaSwapStatus: ({ txHash, address, assertGetSolanaChainAdapter, }: {
     txHash: string;
     address: string | undefined;
@@ -78,3 +87,25 @@ export declare const checkStarknetSwapStatus: ({ txHash, assertGetStarknetChainA
 export declare class SolanaLogsError extends Error {
     constructor(name: string);
 }
+export declare const buildSwapMetadata: (step: TradeQuoteStep | TradeRateStep, common: CommonSwapMetadata) => SwapMetadata;
+export declare const getSwapMetadata: <S extends "avnu" | "bebop" | "bob" | "chainflip" | "debridge" | "nearIntents" | "relay" | "stonfi" | "thorchain" | "mayachain">(metadata: SwapperMetadata | undefined, name: S) => Extract<import("../swappers/AvnuSwapper/types").AvnuMetadata, {
+    name: S;
+}> | Extract<import("../swappers/BebopSwapper/types").BebopMetadata, {
+    name: S;
+}> | Extract<import("../swappers/BobGatewaySwapper/types").BobGatewayMetadata, {
+    name: S;
+}> | Extract<import("..").ChainflipMetadata, {
+    name: S;
+}> | Extract<import("../swappers/DebridgeSwapper/utils/types").DebridgeMetadata, {
+    name: S;
+}> | Extract<import("../swappers/NearIntentsSwapper").NearIntentsMetadata, {
+    name: S;
+}> | Extract<import("../swappers/RelaySwapper/utils/types").RelayMetadata, {
+    name: S;
+}> | Extract<import("../swappers/StonfiSwapper").StonfiMetadata, {
+    name: S;
+}> | Extract<import("./thorchain").ThorchainMetadata, {
+    name: S;
+}> | Extract<import("./thorchain").MayachainMetadata, {
+    name: S;
+}>;

package/dist/cjs/{utils.js → utils/index.js}

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SolanaLogsError = exports.checkStarknetSwapStatus = exports.checkSuiSwapStatus = exports.checkSolanaSwapStatus = exports.getExecutableTradeStep = exports.isExecutableTradeStep = exports.isExecutableTradeQuote = exports.getInputOutputRate = exports.checkEvmSwapStatus = exports.checkSafeTransactionStatus = exports.createDefaultStatusResponse = exports.executeTonTransaction = exports.executeStarknetTransaction = exports.executeNearTransaction = exports.executeSuiTransaction = exports.executeTronTransaction = exports.executeSolanaTransaction = exports.executeEvmTransaction = exports.getHopByIndex = exports.makeSwapperAxiosServiceMonadic = exports.AsyncResultOf = exports.createCache = exports.createTradeAmountTooSmallErr = exports.makeSwapErrorRight = void 0;
+exports.getSwapMetadata = exports.buildSwapMetadata = exports.SolanaLogsError = exports.checkStarknetSwapStatus = exports.checkSuiSwapStatus = exports.checkSolanaSwapStatus = exports.getExecutableTradeStep = exports.isExecutableTradeQuote = exports.getInputOutputRate = exports.checkEvmSwapStatus = exports.checkSafeTransactionStatus = exports.createDefaultStatusResponse = exports.executeTonTransaction = exports.executeStarknetTransaction = exports.executeNearTransaction = exports.executeSuiTransaction = exports.executeTronTransaction = exports.executeSolanaTransaction = exports.executeEvmTransaction = exports.getHopByIndex = exports.makeSwapperAxiosServiceMonadic = exports.createCache = exports.makeTradeStepBuildFailedErr = exports.makeNetworkFeeEstimationFailedErr = exports.createTradeAmountTooSmallErr = exports.assertQuoteAddresses = exports.makeSwapErrorRight = exports.getPermit2Eip712 = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
 const unchained_client_1 = require("@shapeshiftoss/unchained-client");
@@ -11,8 +11,14 @@ const utils_1 = require("@shapeshiftoss/utils");
 const monads_1 = require("@sniptt/monads");
 const axios_1 = __importDefault(require("axios"));
 const axios_cache_interceptor_1 = require("axios-cache-interceptor");
-const safe_utils_1 = require("./safe-utils");
-const types_1 = require("./types");
+const types_1 = require("../types");
+const safe_1 = require("./safe");
+const getPermit2Eip712 = (step) => {
+    return step?.transactionData?.type === 'evm'
+        ? step.transactionData.signatureRequired?.eip712
+        : undefined;
+};
+exports.getPermit2Eip712 = getPermit2Eip712;
 const makeSwapErrorRight = ({ details, cause, code, message, }) => ({
     name: 'SwapError',
     message,
@@ -21,12 +27,40 @@ const makeSwapErrorRight = ({ details, cause, code, message, }) => ({
     code,
 });
 exports.makeSwapErrorRight = makeSwapErrorRight;
+const assertQuoteAddresses = ({ sendAddress, receiveAddress, }) => {
+    if (!sendAddress) {
+        return (0, monads_1.Err)((0, exports.makeSwapErrorRight)({
+            message: 'sendAddress is required',
+            code: types_1.TradeQuoteError.UnknownError,
+        }));
+    }
+    if (!receiveAddress) {
+        return (0, monads_1.Err)((0, exports.makeSwapErrorRight)({
+            message: 'receiveAddress is required',
+            code: types_1.TradeQuoteError.UnknownError,
+        }));
+    }
+    return (0, monads_1.Ok)({ sendAddress, receiveAddress });
+};
+exports.assertQuoteAddresses = assertQuoteAddresses;
 const createTradeAmountTooSmallErr = (details) => (0, exports.makeSwapErrorRight)({
     code: types_1.TradeQuoteError.SellAmountBelowMinimum,
     message: 'Sell amount is too small',
     details,
 });
 exports.createTradeAmountTooSmallErr = createTradeAmountTooSmallErr;
+const makeNetworkFeeEstimationFailedErr = (context, cause) => (0, exports.makeSwapErrorRight)({
+    code: types_1.TradeQuoteError.NetworkFeeEstimationFailed,
+    message: `[${context}] Error estimating network fee`,
+    cause,
+});
+exports.makeNetworkFeeEstimationFailedErr = makeNetworkFeeEstimationFailedErr;
+const makeTradeStepBuildFailedErr = (context, cause) => (0, exports.makeSwapErrorRight)({
+    code: types_1.TradeQuoteError.InvalidResponse,
+    message: `[${context}] Error building trade step`,
+    cause,
+});
+exports.makeTradeStepBuildFailedErr = makeTradeStepBuildFailedErr;
 const getRequestFilter = (cachedUrls) => (request) => !cachedUrls.some(url => request.url?.includes(url));
 const createCache = (maxAge, cachedUrls, axiosConfig) => {
     const filter = getRequestFilter(cachedUrls);
@@ -50,7 +84,6 @@ const AsyncResultOf = async (promise) => {
         return (0, monads_1.Err)(err);
     }
 };
-exports.AsyncResultOf = AsyncResultOf;
 const makeSwapperAxiosServiceMonadic = (service) => new Proxy(service, {
     get: (trappedAxios, method) => {
         const originalMethodPromise = trappedAxios[method];
@@ -60,7 +93,7 @@ const makeSwapperAxiosServiceMonadic = (service) => new Proxy(service, {
             //   url: args[0],
             //   method,
             // })
-            const result = await (0, exports.AsyncResultOf)(originalMethodPromise(...args));
+            const result = await AsyncResultOf(originalMethodPromise(...args));
             return result
                 .mapErr(e => (0, exports.makeSwapErrorRight)({
                 message: 'makeSwapperAxiosServiceMonadic',
@@ -125,7 +158,7 @@ const createDefaultStatusResponse = (buyTxHash) => ({
 });
 exports.createDefaultStatusResponse = createDefaultStatusResponse;
 const checkSafeTransactionStatus = async ({ address, txHash, chainId, assertGetEvmChainAdapter, fetchIsSmartContractAddressQuery, }) => {
-    const { isExecutedSafeTx, isQueuedSafeTx, transaction } = await (0, safe_utils_1.fetchSafeTransactionInfo)({
+    const { isExecutedSafeTx, isQueuedSafeTx, transaction } = await (0, safe_1.fetchSafeTransactionInfo)({
         address,
         chainId,
         fetchIsSmartContractAddressQuery,
@@ -209,14 +242,11 @@ const getInputOutputRate = ({ sellAmountCryptoBaseUnit, buyAmountCryptoBaseUnit,
 exports.getInputOutputRate = getInputOutputRate;
 const isExecutableTradeQuote = (quote) => quote.quoteOrRate === 'quote';
 exports.isExecutableTradeQuote = isExecutableTradeQuote;
-const isExecutableTradeStep = (step) => step.accountNumber !== undefined;
-exports.isExecutableTradeStep = isExecutableTradeStep;
 const getExecutableTradeStep = (tradeQuote, stepIndex) => {
-    const step = (0, exports.getHopByIndex)(tradeQuote, stepIndex);
+    // A TradeQuote is executable by construction, so its steps are TradeQuoteStep (accountNumber set)
+    const step = tradeQuote.steps[stepIndex];
     if (!step)
         throw new Error(`No hop found for stepIndex ${stepIndex}`);
-    if (!(0, exports.isExecutableTradeStep)(step))
-        throw Error('Unable to execute a trade rate step');
     return step;
 };
 exports.getExecutableTradeStep = getExecutableTradeStep;
@@ -322,3 +352,14 @@ class SolanaLogsError extends Error {
     }
 }
 exports.SolanaLogsError = SolanaLogsError;
+const buildSwapMetadata = (step, common) => ({
+    ...common,
+    swapperMetadata: step.swapperMetadata,
+});
+exports.buildSwapMetadata = buildSwapMetadata;
+const getSwapMetadata = (metadata, name) => {
+    if (metadata?.name !== name)
+        throw new Error(`Expected ${name} swap metadata`);
+    return metadata;
+};
+exports.getSwapMetadata = getSwapMetadata;

package/dist/cjs/utils/solana/calculateAccountCreationCosts.d.ts

@@ -0,0 +1,3 @@
+import type { TransactionInstruction } from '@solana/web3.js';
+export declare const ATA_RENT_LAMPORTS = 2040000;
+export declare const calculateAccountCreationCosts: (instructions: TransactionInstruction[]) => string;

package/dist/cjs/utils/solana/calculateAccountCreationCosts.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.calculateAccountCreationCosts = exports.ATA_RENT_LAMPORTS = void 0;
+const token_1 = require("@coral-xyz/anchor/dist/cjs/utils/token");
+const utils_1 = require("@shapeshiftoss/utils");
+exports.ATA_RENT_LAMPORTS = 2040000;
+// Rent paid to create any associated token accounts the transaction opens (e.g. a first-time
+// transfer of an SPL token to a recipient that doesn't yet hold it). Included in reported
+// network fees so the displayed cost matches what the payer actually spends.
+const calculateAccountCreationCosts = (instructions) => {
+    const ataCreationCount = instructions.filter(instruction => instruction.programId.toString() === token_1.ASSOCIATED_PROGRAM_ID.toString()).length;
+    return (0, utils_1.bnOrZero)(exports.ATA_RENT_LAMPORTS).times(ataCreationCount).toString();
+};
+exports.calculateAccountCreationCosts = calculateAccountCreationCosts;

package/dist/cjs/utils/solana/computeBudgetInstructions.d.ts

@@ -0,0 +1,13 @@
+import type { TransactionInstruction } from '@solana/web3.js';
+export type SolanaComputeBudgetOptions = {
+    marginMultiplier?: number;
+    minComputeUnits?: number;
+};
+export declare const isComputeBudgetInstruction: (instruction: TransactionInstruction) => boolean;
+export declare const omitComputeBudgetInstructions: (instructions: TransactionInstruction[]) => TransactionInstruction[];
+export declare const withComputeUnitLimit: ({ instructions, computeUnits, includeComputeBudget, computeBudget, }: {
+    instructions: TransactionInstruction[];
+    computeUnits: string;
+    includeComputeBudget: boolean;
+    computeBudget?: SolanaComputeBudgetOptions | undefined;
+}) => TransactionInstruction[];

package/dist/cjs/utils/solana/computeBudgetInstructions.js

@@ -0,0 +1,28 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withComputeUnitLimit = exports.omitComputeBudgetInstructions = exports.isComputeBudgetInstruction = void 0;
+const utils_1 = require("@shapeshiftoss/utils");
+const web3_js_1 = require("@solana/web3.js");
+const bignumber_js_1 = __importDefault(require("bignumber.js"));
+const isComputeBudgetInstruction = (instruction) => instruction.programId.toString() === web3_js_1.ComputeBudgetProgram.programId.toString();
+exports.isComputeBudgetInstruction = isComputeBudgetInstruction;
+// Provider payloads carry their own budget instructions - strip them so ours are set from
+// measured simulation and the payload never carries duplicates (solana rejects them)
+const omitComputeBudgetInstructions = (instructions) => instructions.filter(instruction => !(0, exports.isComputeBudgetInstruction)(instruction));
+exports.omitComputeBudgetInstructions = omitComputeBudgetInstructions;
+// Quote transaction data carries a static compute unit limit so api consumers can execute
+// without simulating - the dynamic priority fee is added at execution time
+const withComputeUnitLimit = ({ instructions, computeUnits, includeComputeBudget, computeBudget = {}, }) => {
+    // Plain native transfers broadcast without a compute budget
+    if (!includeComputeBudget)
+        return instructions;
+    const { marginMultiplier, minComputeUnits } = computeBudget;
+    const units = Number(bignumber_js_1.default.max((0, utils_1.bnOrZero)(computeUnits), minComputeUnits ?? 0)
+        .times(marginMultiplier ?? 1)
+        .toFixed(0));
+    return [...instructions, web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units })];
+};
+exports.withComputeUnitLimit = withComputeUnitLimit;

package/dist/cjs/utils/solana/constants.d.ts

@@ -0,0 +1 @@
+export declare const SOLANA_PLACEHOLDER_ADDRESS = "FxXyPB5RH4uHLPPJR5H89zGwZp19juBetmRwrxfsLj2j";

package/dist/cjs/utils/solana/constants.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SOLANA_PLACEHOLDER_ADDRESS = void 0;
+const utils_1 = require("@shapeshiftoss/utils");
+// The DAO treasury is a rent-exempt system account we control, usable as a payer stand-in for
+// rate estimation without a connected wallet (simulation requires the payer to exist and cover
+// the transfer, so estimation transfers 1 lamport - compute consumption is amount-independent)
+exports.SOLANA_PLACEHOLDER_ADDRESS = utils_1.DAO_TREASURY_SOLANA;

package/dist/cjs/utils/solana/getSolanaExecutionContext.d.ts

@@ -0,0 +1,10 @@
+import type { GetUnsignedSolanaTransactionArgs } from '../../types';
+export declare const getSolanaExecutionContext: ({ stepIndex, tradeQuote, assertGetSolanaChainAdapter, }: GetUnsignedSolanaTransactionArgs) => {
+    step: import("../../types").TradeQuoteStep;
+    adapter: import("packages/chain-adapters/src/solana").ChainAdapter;
+    transactionData: {
+        type: "solana_instructions";
+        instructions: import("@solana/web3.js").TransactionInstruction[];
+        addressLookupTableAddresses: string[];
+    };
+};

package/dist/cjs/utils/solana/getSolanaExecutionContext.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSolanaExecutionContext = void 0;
+const utils_1 = require("../../utils");
+const getSolanaExecutionContext = ({ stepIndex, tradeQuote, assertGetSolanaChainAdapter, }) => {
+    if (!(0, utils_1.isExecutableTradeQuote)(tradeQuote))
+        throw new Error('unable to execute a trade rate');
+    const step = (0, utils_1.getExecutableTradeStep)(tradeQuote, stepIndex);
+    const { transactionData, sellAsset } = step;
+    if (transactionData?.type !== 'solana_instructions')
+        throw new Error('invalid solana transaction');
+    const adapter = assertGetSolanaChainAdapter(sellAsset.chainId);
+    return { step, adapter, transactionData };
+};
+exports.getSolanaExecutionContext = getSolanaExecutionContext;

package/dist/cjs/utils/solana/getSolanaNetworkFeeCryptoBaseUnit.d.ts

@@ -0,0 +1,15 @@
+import type { solana } from '@shapeshiftoss/chain-adapters';
+import type { TransactionInstruction } from '@solana/web3.js';
+type GetSolanaNetworkFeeCryptoBaseUnitArgs = {
+    adapter: solana.ChainAdapter;
+    from: string;
+    instructions: TransactionInstruction[];
+    addressLookupTableAddresses?: string[];
+    tokenId?: string;
+};
+export declare const getSolanaNetworkFeeCryptoBaseUnit: ({ adapter, from, instructions, addressLookupTableAddresses, tokenId, }: GetSolanaNetworkFeeCryptoBaseUnitArgs) => Promise<{
+    networkFeeCryptoBaseUnit: string;
+    feeData: import("@shapeshiftoss/chain-adapters").FeeData<import("@shapeshiftoss/types").KnownChainIds.SolanaMainnet>;
+    includeComputeBudget: boolean;
+}>;
+export {};

package/dist/cjs/utils/solana/getSolanaNetworkFeeCryptoBaseUnit.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSolanaNetworkFeeCryptoBaseUnit = void 0;
+const utils_1 = require("@shapeshiftoss/utils");
+const web3_js_1 = require("@solana/web3.js");
+const calculateAccountCreationCosts_1 = require("./calculateAccountCreationCosts");
+const computeBudgetInstructions_1 = require("./computeBudgetInstructions");
+const MAX_COMPUTE_UNITS = 1_400_000;
+const getSolanaNetworkFeeCryptoBaseUnit = async ({ adapter, from, instructions, addressLookupTableAddresses = [], tokenId, }) => {
+    // Plain native transfers broadcast without a compute budget (matching wallet sends); anything
+    // else includes one - token transfers (tokenId covers native shape estimations), memos, swaps
+    const includeComputeBudget = Boolean(tokenId) ||
+        instructions.some(instruction => !instruction.programId.equals(web3_js_1.SystemProgram.programId));
+    const hasComputeBudgetInstructions = instructions.some(computeBudgetInstructions_1.isComputeBudgetInstruction);
+    const estimationInstructions = includeComputeBudget && !hasComputeBudgetInstructions
+        ? [
+            web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: MAX_COMPUTE_UNITS }),
+            web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: 0 }),
+            ...instructions,
+        ]
+        : instructions;
+    const { fast } = await adapter.getFeeData({
+        to: '',
+        value: '0',
+        chainSpecific: {
+            from,
+            addressLookupTableAccounts: addressLookupTableAddresses,
+            instructions: estimationInstructions,
+        },
+    });
+    // Rent for any token account creation in the instructions is part of what the payer spends
+    const networkFeeCryptoBaseUnit = (0, utils_1.bn)(fast.txFee)
+        .plus((0, calculateAccountCreationCosts_1.calculateAccountCreationCosts)(instructions))
+        .toString();
+    return { networkFeeCryptoBaseUnit, feeData: fast, includeComputeBudget };
+};
+exports.getSolanaNetworkFeeCryptoBaseUnit = getSolanaNetworkFeeCryptoBaseUnit;

package/dist/cjs/utils/solana/getSolanaTransactionFees.d.ts

@@ -0,0 +1,2 @@
+import type { GetUnsignedSolanaTransactionArgs } from '../../types';
+export declare const getSolanaTransactionFees: (args: GetUnsignedSolanaTransactionArgs) => Promise<string>;

package/dist/cjs/utils/solana/getSolanaTransactionFees.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSolanaTransactionFees = void 0;
+const utils_1 = require("@shapeshiftoss/utils");
+const getSolanaExecutionContext_1 = require("./getSolanaExecutionContext");
+const getSolanaNetworkFeeCryptoBaseUnit_1 = require("./getSolanaNetworkFeeCryptoBaseUnit");
+const getSolanaTransactionFees = async (args) => {
+    const { step, adapter, transactionData } = (0, getSolanaExecutionContext_1.getSolanaExecutionContext)(args);
+    const { networkFeeCryptoBaseUnit } = await (0, getSolanaNetworkFeeCryptoBaseUnit_1.getSolanaNetworkFeeCryptoBaseUnit)({
+        adapter,
+        from: args.from,
+        instructions: transactionData.instructions,
+        addressLookupTableAddresses: transactionData.addressLookupTableAddresses,
+        tokenId: (0, utils_1.contractAddressOrUndefined)(step.sellAsset.assetId),
+    });
+    return networkFeeCryptoBaseUnit;
+};
+exports.getSolanaTransactionFees = getSolanaTransactionFees;

package/dist/cjs/utils/solana/getUnsignedSolanaTransaction.d.ts

@@ -0,0 +1,3 @@
+import type { SolanaSignTx } from '@shapeshiftoss/hdwallet-core';
+import type { GetUnsignedSolanaTransactionArgs } from '../../types';
+export declare const getUnsignedSolanaTransaction: (args: GetUnsignedSolanaTransactionArgs) => Promise<SolanaSignTx>;

package/dist/cjs/utils/solana/getUnsignedSolanaTransaction.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getUnsignedSolanaTransaction = void 0;
+const computeBudgetInstructions_1 = require("./computeBudgetInstructions");
+const getSolanaExecutionContext_1 = require("./getSolanaExecutionContext");
+// Quote instructions carry the static compute unit limit - only the dynamic priority fee is
+// fetched here, mirroring evm's quote-time gas limit + execution-time gas price split
+const getUnsignedSolanaTransaction = async (args) => {
+    const { step, adapter, transactionData } = (0, getSolanaExecutionContext_1.getSolanaExecutionContext)(args);
+    const { accountNumber } = step;
+    const { instructions, addressLookupTableAddresses } = transactionData;
+    // Plain native transfers carry no compute budget and broadcast without one
+    const includeComputeBudget = instructions.some(computeBudgetInstructions_1.isComputeBudgetInstruction);
+    const priorityFees = includeComputeBudget ? await adapter.getPriorityFees() : undefined;
+    return adapter.buildSendApiTransaction({
+        from: args.from,
+        to: '',
+        value: '0',
+        accountNumber,
+        chainSpecific: {
+            addressLookupTableAccounts: addressLookupTableAddresses,
+            instructions: instructions.map(instruction => adapter.convertInstruction(instruction)),
+            ...(priorityFees && { computeUnitPrice: priorityFees.fast }),
+        },
+    });
+};
+exports.getUnsignedSolanaTransaction = getUnsignedSolanaTransaction;

package/dist/cjs/utils/solana/index.d.ts

@@ -0,0 +1,7 @@
+export * from './calculateAccountCreationCosts';
+export * from './computeBudgetInstructions';
+export * from './constants';
+export * from './getSolanaNetworkFeeCryptoBaseUnit';
+export * from './getSolanaTransactionFees';
+export * from './getUnsignedSolanaTransaction';
+export * from './isSolanaTransactionOversized';

package/dist/cjs/utils/solana/index.js

@@ -0,0 +1,23 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./calculateAccountCreationCosts"), exports);
+__exportStar(require("./computeBudgetInstructions"), exports);
+__exportStar(require("./constants"), exports);
+__exportStar(require("./getSolanaNetworkFeeCryptoBaseUnit"), exports);
+__exportStar(require("./getSolanaTransactionFees"), exports);
+__exportStar(require("./getUnsignedSolanaTransaction"), exports);
+__exportStar(require("./isSolanaTransactionOversized"), exports);

package/dist/cjs/utils/solana/isSolanaTransactionOversized.d.ts

@@ -0,0 +1,8 @@
+import type { solana } from '@shapeshiftoss/chain-adapters';
+import type { TransactionInstruction } from '@solana/web3.js';
+export declare const isSolanaTransactionOversized: ({ adapter, from, instructions, addressLookupTableAddresses, }: {
+    adapter: solana.ChainAdapter;
+    from: string;
+    instructions: TransactionInstruction[];
+    addressLookupTableAddresses: string[];
+}) => Promise<boolean>;

package/dist/cjs/utils/solana/isSolanaTransactionOversized.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isSolanaTransactionOversized = void 0;
+const web3_js_1 = require("@solana/web3.js");
+// Solana caps a single transaction at 1232 bytes (anything larger must be split into a Jito bundle).
+const SOLANA_MAX_TX_SIZE_BYTES = 1232;
+const isSolanaTransactionOversized = async ({ adapter, from, instructions, addressLookupTableAddresses, }) => {
+    if (!instructions.length)
+        return false;
+    const lookupTableInfos = await adapter.getAddressLookupTableAccounts(addressLookupTableAddresses);
+    const lookupTableAccounts = lookupTableInfos.map(info => new web3_js_1.AddressLookupTableAccount({
+        key: new web3_js_1.PublicKey(info.key),
+        state: web3_js_1.AddressLookupTableAccount.deserialize(new Uint8Array(info.data)),
+    }));
+    const messageV0 = web3_js_1.MessageV0.compile({
+        payerKey: new web3_js_1.PublicKey(from),
+        instructions,
+        recentBlockhash: web3_js_1.PublicKey.default.toString(),
+        addressLookupTableAccounts: lookupTableAccounts,
+    });
+    return new web3_js_1.VersionedTransaction(messageV0).serialize().length > SOLANA_MAX_TX_SIZE_BYTES;
+};
+exports.isSolanaTransactionOversized = isSolanaTransactionOversized;