@shapeshiftoss/swapper 17.8.0 → 19.0.0

package/dist/cjs/swappers/AvnuSwapper/swapperApi/getTradeRate.js

@@ -1,133 +1,52 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTradeRate = void 0;
-const avnu_sdk_1 = require("@avnu/avnu-sdk");
-const utils_1 = require("@shapeshiftoss/utils");
 const monads_1 = require("@sniptt/monads");
 const starknet_1 = require("starknet");
-const uuid_1 = require("uuid");
-const constants_1 = require("../../../constants");
-const types_1 = require("../../../types");
-const utils_2 = require("../../../utils");
-const affiliateFee_1 = require("../../utils/affiliateFee");
-const helpers_1 = require("../../utils/helpers/helpers");
-const constants_2 = require("../utils/constants");
-const helpers_2 = require("../utils/helpers");
+const getAvnuTradeContext_1 = require("../utils/getAvnuTradeContext");
 const getTradeRate = async (input, deps) => {
-    const { sellAsset, buyAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit: sellAmount, slippageTolerancePercentageDecimal, affiliateBps, receiveAddress, } = input;
-    if (!constants_2.AVNU_SUPPORTED_CHAIN_IDS.includes(sellAsset.chainId)) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: `Chain ${sellAsset.chainId} is not supported by AVNU`,
-            code: types_1.TradeQuoteError.UnsupportedChain,
-        }));
-    }
-    if (!constants_2.AVNU_SUPPORTED_CHAIN_IDS.includes(buyAsset.chainId)) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: `Chain ${buyAsset.chainId} is not supported by AVNU`,
-            code: types_1.TradeQuoteError.UnsupportedChain,
-        }));
-    }
-    try {
-        const sellTokenAddress = (0, helpers_2.getTokenAddress)(sellAsset);
-        const buyTokenAddress = (0, helpers_2.getTokenAddress)(buyAsset);
-        // Normalize receive address if provided (for fee estimation)
-        // Rate quotes may not have a receive address, so this is optional
-        const normalizedReceiveAddress = receiveAddress ? (0, starknet_1.validateAndParseAddress)(receiveAddress) : '';
-        const quotes = await (0, avnu_sdk_1.getQuotes)({
-            sellTokenAddress,
-            buyTokenAddress,
-            sellAmount: BigInt(sellAmount),
-            size: 1,
-            integratorFees: affiliateBps ? BigInt(affiliateBps) : undefined,
-            integratorFeeRecipient: (0, helpers_1.getTreasuryAddressFromChainId)(sellAsset.chainId),
-        });
-        if (!quotes || quotes.length === 0) {
-            return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-                message: 'No quotes available for this trade pair',
-                code: types_1.TradeQuoteError.NoRouteFound,
-            }));
+    const { accountNumber, sellAsset, receiveAddress } = input;
+    const maybeContext = await (0, getAvnuTradeContext_1.getAvnuTradeContext)({ input, takerAddress: undefined });
+    if (maybeContext.isErr())
+        return (0, monads_1.Err)(maybeContext.unwrapErr());
+    const { tradeCommon, stepCommon, protocolFees, sellTokenAddress } = maybeContext.unwrap();
+    // Rates may be walletless - normalize the receive address only when present, and use it as a
+    // stand-in sender for fee estimation
+    const normalizedReceiveAddress = receiveAddress
+        ? (0, starknet_1.validateAndParseAddress)(receiveAddress)
+        : undefined;
+    // Rates are best-effort display: without an address, or if estimation fails, degrade to a zero fee
+    const networkFeeCryptoBaseUnit = await (async () => {
+        if (!normalizedReceiveAddress)
+            return '0';
+        try {
+            const feeData = await deps.assertGetStarknetChainAdapter(sellAsset.chainId).getFeeData({
+                to: normalizedReceiveAddress,
+                value: stepCommon.sellAmountIncludingProtocolFeesCryptoBaseUnit,
+                chainSpecific: {
+                    from: normalizedReceiveAddress,
+                    tokenContractAddress: sellTokenAddress,
+                },
+                sendMax: false,
+            });
+            return feeData.fast.txFee;
         }
-        const bestQuote = quotes[0];
-        if (!bestQuote) {
-            return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-                message: 'No valid quote returned from AVNU',
-                code: types_1.TradeQuoteError.QueryFailed,
-            }));
+        catch {
+            return '0';
         }
-        const buyAmountAfterFeesCryptoBaseUnit = bestQuote.buyAmount.toString();
-        const sellAdapter = deps.assertGetStarknetChainAdapter(sellAsset.chainId);
-        // For rate quotes, use receiveAddress as a dummy from/to for fee estimation
-        const feeData = await sellAdapter.getFeeData({
-            to: normalizedReceiveAddress,
-            value: sellAmount,
-            chainSpecific: {
-                from: normalizedReceiveAddress,
-                tokenContractAddress: sellTokenAddress,
+    })();
+    const tradeRate = {
+        ...tradeCommon,
+        receiveAddress: normalizedReceiveAddress,
+        quoteOrRate: 'rate',
+        steps: [
+            {
+                ...stepCommon,
+                accountNumber,
+                feeData: { protocolFees, networkFeeCryptoBaseUnit },
             },
-            sendMax: false,
-        });
-        const rate = (0, utils_2.getInputOutputRate)({
-            sellAmountCryptoBaseUnit: sellAmount,
-            buyAmountCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
-            sellAsset,
-            buyAsset,
-        });
-        const protocolFees = affiliateBps
-            ? {
-                [buyAsset.assetId]: {
-                    amountCryptoBaseUnit: (0, utils_1.bn)(buyAmountAfterFeesCryptoBaseUnit)
-                        .times(affiliateBps)
-                        .div(10000)
-                        .toFixed(0),
-                    requiresBalance: false,
-                    asset: buyAsset,
-                },
-            }
-            : {};
-        const tradeRate = {
-            id: (0, uuid_1.v4)(),
-            receiveAddress: normalizedReceiveAddress || receiveAddress,
-            affiliateBps,
-            rate,
-            slippageTolerancePercentageDecimal: slippageTolerancePercentageDecimal ??
-                (0, constants_1.getDefaultSlippageDecimalPercentageForSwapper)(types_1.SwapperName.Avnu),
-            quoteOrRate: 'rate',
-            swapperName: types_1.SwapperName.Avnu,
-            steps: [
-                {
-                    accountNumber: undefined,
-                    allowanceContract: '0x0',
-                    buyAmountBeforeFeesCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
-                    buyAmountAfterFeesCryptoBaseUnit,
-                    buyAsset,
-                    feeData: {
-                        protocolFees,
-                        networkFeeCryptoBaseUnit: feeData.fast.txFee,
-                    },
-                    rate,
-                    sellAmountIncludingProtocolFeesCryptoBaseUnit: sellAmount,
-                    sellAsset,
-                    source: types_1.SwapperName.Avnu,
-                    estimatedExecutionTimeMs: undefined,
-                    affiliateFee: (0, affiliateFee_1.buildAffiliateFee)({
-                        strategy: 'buy_asset',
-                        affiliateBps,
-                        sellAsset,
-                        buyAsset,
-                        sellAmountCryptoBaseUnit: sellAmount,
-                        buyAmountCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
-                    }),
-                },
-            ],
-        };
-        return (0, monads_1.Ok)([tradeRate]);
-    }
-    catch (error) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: error instanceof Error ? error.message : 'Unknown error getting AVNU rate',
-            code: types_1.TradeQuoteError.QueryFailed,
-            cause: error,
-        }));
-    }
+        ],
+    };
+    return (0, monads_1.Ok)([tradeRate]);
 };
 exports.getTradeRate = getTradeRate;

package/dist/cjs/swappers/AvnuSwapper/types.d.ts

@@ -1,2 +1,9 @@
 import type { KnownChainIds } from '@shapeshiftoss/types';
+import type { GetStarknetTradeQuoteInput, GetStarknetTradeRateInput } from '../../types';
+export type AvnuTradeQuoteInput = GetStarknetTradeQuoteInput;
+export type AvnuTradeRateInput = GetStarknetTradeRateInput;
 export type AvnuSupportedChainId = typeof KnownChainIds.StarknetMainnet;
+export type AvnuMetadata = {
+    name: 'avnu';
+    quoteId: string;
+};

package/dist/cjs/swappers/AvnuSwapper/utils/getAvnuTradeContext.d.ts

@@ -0,0 +1,15 @@
+import type { Result } from '@sniptt/monads';
+import type { GetStarknetTradeQuoteInput, GetStarknetTradeRateInput, QuoteFeeData, SwapErrorRight, TradeCommon, TradeStepCommon } from '../../../types';
+type AvnuTradeContext = {
+    tradeCommon: TradeCommon;
+    stepCommon: Omit<TradeStepCommon, 'feeData'>;
+    protocolFees: QuoteFeeData['protocolFees'];
+    quoteId: string;
+    sellTokenAddress: string;
+    deadline: number | undefined;
+};
+export declare const getAvnuTradeContext: ({ input, takerAddress, }: {
+    input: GetStarknetTradeQuoteInput | GetStarknetTradeRateInput;
+    takerAddress: string | undefined;
+}) => Promise<Result<AvnuTradeContext, SwapErrorRight>>;
+export {};

package/dist/cjs/swappers/AvnuSwapper/utils/getAvnuTradeContext.js

@@ -0,0 +1,107 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAvnuTradeContext = void 0;
+const avnu_sdk_1 = require("@avnu/avnu-sdk");
+const caip_1 = require("@shapeshiftoss/caip");
+const utils_1 = require("@shapeshiftoss/utils");
+const monads_1 = require("@sniptt/monads");
+const uuid_1 = require("uuid");
+const constants_1 = require("../../../constants");
+const types_1 = require("../../../types");
+const utils_2 = require("../../../utils");
+const affiliateFee_1 = require("../../../utils/affiliateFee");
+const helpers_1 = require("../../../utils/helpers");
+const helpers_2 = require("./helpers");
+const getAvnuTradeContext = async ({ input, takerAddress, }) => {
+    const { sellAsset, buyAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit: sellAmount, slippageTolerancePercentageDecimal, affiliateBps, } = input;
+    const assertion = (0, helpers_2.assertValidTrade)({ sellAsset, buyAsset });
+    if (assertion.isErr())
+        return (0, monads_1.Err)(assertion.unwrapErr());
+    const sellTokenAddress = (0, helpers_2.getTokenAddress)(sellAsset);
+    const buyTokenAddress = (0, helpers_2.getTokenAddress)(buyAsset);
+    try {
+        const quotes = await (0, avnu_sdk_1.getQuotes)({
+            sellTokenAddress,
+            buyTokenAddress,
+            sellAmount: BigInt(sellAmount),
+            takerAddress,
+            size: 1,
+            integratorFees: affiliateBps ? BigInt(affiliateBps) : undefined,
+            integratorFeeRecipient: (0, helpers_1.getTreasuryAddressFromChainId)(caip_1.starknetChainId),
+            integratorName: 'shapeshift',
+        });
+        if (!quotes || quotes.length === 0) {
+            return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
+                message: 'No quotes available for this trade pair',
+                code: types_1.TradeQuoteError.NoRouteFound,
+            }));
+        }
+        const bestQuote = quotes[0];
+        if (!bestQuote) {
+            return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
+                message: 'No valid quote returned from AVNU',
+                code: types_1.TradeQuoteError.QueryFailed,
+            }));
+        }
+        const buyAmountAfterFeesCryptoBaseUnit = bestQuote.buyAmount.toString();
+        const rate = (0, utils_2.getInputOutputRate)({
+            sellAmountCryptoBaseUnit: sellAmount,
+            buyAmountCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
+            sellAsset,
+            buyAsset,
+        });
+        const protocolFees = affiliateBps
+            ? {
+                [buyAsset.assetId]: {
+                    amountCryptoBaseUnit: (0, utils_1.bn)(buyAmountAfterFeesCryptoBaseUnit)
+                        .times(affiliateBps)
+                        .div(10000)
+                        .toFixed(0),
+                    requiresBalance: false,
+                    asset: buyAsset,
+                },
+            }
+            : {};
+        return (0, monads_1.Ok)({
+            tradeCommon: {
+                id: (0, uuid_1.v4)(),
+                rate,
+                affiliateBps,
+                slippageTolerancePercentageDecimal: slippageTolerancePercentageDecimal ??
+                    (0, constants_1.getDefaultSlippageDecimalPercentageForSwapper)(types_1.SwapperName.Avnu),
+                swapperName: types_1.SwapperName.Avnu,
+            },
+            stepCommon: {
+                allowanceContract: '',
+                buyAmountBeforeFeesCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
+                buyAmountAfterFeesCryptoBaseUnit,
+                buyAsset,
+                rate,
+                sellAmountIncludingProtocolFeesCryptoBaseUnit: sellAmount,
+                sellAsset,
+                source: types_1.SwapperName.Avnu,
+                estimatedExecutionTimeMs: undefined,
+                affiliateFee: (0, affiliateFee_1.buildAffiliateFee)({
+                    strategy: 'buy_asset',
+                    affiliateBps,
+                    sellAsset,
+                    buyAsset,
+                    sellAmountCryptoBaseUnit: sellAmount,
+                    buyAmountCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
+                }),
+            },
+            protocolFees,
+            quoteId: bestQuote.quoteId,
+            sellTokenAddress,
+            deadline: bestQuote.expiry ? (0, helpers_1.normalizeEpochToMs)(bestQuote.expiry) : undefined,
+        });
+    }
+    catch (error) {
+        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
+            message: error instanceof Error ? error.message : 'Unknown error getting AVNU quote',
+            code: types_1.TradeQuoteError.QueryFailed,
+            cause: error,
+        }));
+    }
+};
+exports.getAvnuTradeContext = getAvnuTradeContext;

package/dist/cjs/swappers/AvnuSwapper/utils/helpers.d.ts

@@ -1,7 +1,18 @@
 import type { Asset } from '@shapeshiftoss/types';
+import type { Result } from '@sniptt/monads';
+import type { SwapErrorRight } from '../../../types';
 /**
  * Get the token address for AVNU swaps
  * For native STRK token (slip44 namespace), returns the STRK contract address
  * For other tokens, returns the token contract address from assetReference
  */
 export declare const getTokenAddress: (asset: Asset) => string;
+export declare const assertValidTrade: ({ sellAsset, buyAsset, }: {
+    sellAsset: Asset;
+    buyAsset: Asset;
+}) => Result<void, SwapErrorRight>;
+/**
+ * Normalize a value to hex format for Starknet RPC
+ * Handles various input types: decimal strings, hex strings (with/without 0x), numbers, BigInts
+ */
+export declare const toHexString: (value: unknown) => string;

package/dist/cjs/swappers/AvnuSwapper/utils/helpers.js

@@ -1,7 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTokenAddress = void 0;
+exports.toHexString = exports.assertValidTrade = exports.getTokenAddress = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
+const monads_1 = require("@sniptt/monads");
+const starknet_1 = require("starknet");
+const types_1 = require("../../../types");
+const utils_1 = require("../../../utils");
+const constants_1 = require("./constants");
 // STRK native token contract address on Starknet
 const AVNU_STRK_NATIVE_ADDRESS = '0x04718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d';
 /**
@@ -19,3 +24,44 @@ const getTokenAddress = (asset) => {
     return assetReference;
 };
 exports.getTokenAddress = getTokenAddress;
+const assertValidTrade = ({ sellAsset, buyAsset, }) => {
+    if (!constants_1.AVNU_SUPPORTED_CHAIN_IDS.includes(sellAsset.chainId)) {
+        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
+            message: `Chain ${sellAsset.chainId} is not supported by AVNU`,
+            code: types_1.TradeQuoteError.UnsupportedChain,
+        }));
+    }
+    if (!constants_1.AVNU_SUPPORTED_CHAIN_IDS.includes(buyAsset.chainId)) {
+        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
+            message: `Chain ${buyAsset.chainId} is not supported by AVNU`,
+            code: types_1.TradeQuoteError.UnsupportedChain,
+        }));
+    }
+    return (0, monads_1.Ok)(undefined);
+};
+exports.assertValidTrade = assertValidTrade;
+/**
+ * Normalize a value to hex format for Starknet RPC
+ * Handles various input types: decimal strings, hex strings (with/without 0x), numbers, BigInts
+ */
+const toHexString = (value) => {
+    const strValue = String(value);
+    // Already a proper hex string with 0x prefix
+    if (strValue.startsWith('0x')) {
+        return strValue;
+    }
+    // Check if it looks like a hex string without 0x prefix (contains a-f characters)
+    // Starknet addresses and felts often come as hex without 0x prefix
+    if (/^[0-9a-fA-F]+$/.test(strValue) && /[a-fA-F]/.test(strValue)) {
+        return `0x${strValue}`;
+    }
+    // Otherwise treat as decimal and convert to hex
+    try {
+        return starknet_1.num.toHex(strValue);
+    }
+    catch {
+        // If conversion fails, assume it's already hex and add prefix
+        return `0x${strValue}`;
+    }
+};
+exports.toHexString = toHexString;

package/dist/cjs/swappers/BebopSwapper/endpoints.js

@@ -1,86 +1,42 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bebopApi = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
-const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
-const bignumber_js_1 = __importDefault(require("bignumber.js"));
-const viem_1 = require("viem");
 const utils_1 = require("../../utils");
+const evm_1 = require("../../utils/evm");
 const getBebopSolanaTradeQuote_1 = require("./getBebopSolanaTradeQuote/getBebopSolanaTradeQuote");
 const getBebopSolanaTradeRate_1 = require("./getBebopSolanaTradeRate/getBebopSolanaTradeRate");
 const getBebopTradeQuote_1 = require("./getBebopTradeQuote/getBebopTradeQuote");
 const getBebopTradeRate_1 = require("./getBebopTradeRate/getBebopTradeRate");
-const helpers_1 = require("./utils/helpers/helpers");
 exports.bebopApi = {
-    getTradeQuote: async (input, { assertGetEvmChainAdapter, assetsById, config }) => {
-        if ((0, helpers_1.isSolanaChainId)(input.sellAsset.chainId)) {
-            const tradeQuoteResult = await (0, getBebopSolanaTradeQuote_1.getBebopSolanaTradeQuote)(input, assetsById, config.VITE_BEBOP_API_KEY);
-            return tradeQuoteResult.map(tradeQuote => [tradeQuote]);
-        }
-        const tradeQuoteResult = await (0, getBebopTradeQuote_1.getBebopTradeQuote)(input, assertGetEvmChainAdapter, assetsById, config.VITE_BEBOP_API_KEY);
-        return tradeQuoteResult.map(tradeQuote => [tradeQuote]);
+    getTradeQuote: (input, deps) => {
+        const quoteInput = input;
+        return 'supportsEIP1559' in quoteInput
+            ? (0, getBebopTradeQuote_1.getBebopTradeQuote)(quoteInput, deps)
+            : (0, getBebopSolanaTradeQuote_1.getBebopSolanaTradeQuote)(quoteInput, deps);
     },
-    getTradeRate: async (input, { assertGetEvmChainAdapter, assetsById, config }) => {
-        if ((0, helpers_1.isSolanaChainId)(input.sellAsset.chainId)) {
-            const tradeRateResult = await (0, getBebopSolanaTradeRate_1.getBebopSolanaTradeRate)(input, assetsById, config.VITE_BEBOP_API_KEY);
-            return tradeRateResult.map(tradeRate => [tradeRate]);
-        }
-        const tradeRateResult = await (0, getBebopTradeRate_1.getBebopTradeRate)(input, assertGetEvmChainAdapter, assetsById, config.VITE_BEBOP_API_KEY);
-        return tradeRateResult.map(tradeRate => [tradeRate]);
-    },
-    getUnsignedEvmTransaction: async ({ from, stepIndex, tradeQuote, supportsEIP1559, assertGetEvmChainAdapter, }) => {
-        if (!(0, utils_1.isExecutableTradeQuote)(tradeQuote))
-            throw new Error('Unable to execute a trade rate quote');
-        const step = (0, utils_1.getExecutableTradeStep)(tradeQuote, stepIndex);
-        const { accountNumber, sellAsset, bebopTransactionMetadata } = step;
-        if (!bebopTransactionMetadata)
-            throw new Error('Transaction metadata is required');
-        const { value: hexValue, to, data, gas } = bebopTransactionMetadata;
-        const value = (0, viem_1.fromHex)(hexValue, 'bigint').toString();
-        const adapter = assertGetEvmChainAdapter(sellAsset.chainId);
-        const feeData = await chain_adapters_1.evm.getFees({ adapter, data, to, value, from, supportsEIP1559 });
-        if (!gas) {
-            throw new Error('Bebop API did not provide gas estimate - cannot execute trade safely');
-        }
-        return adapter.buildCustomApiTx({
-            accountNumber,
-            data,
-            from,
-            to,
-            value,
-            ...feeData,
-            gasLimit: bignumber_js_1.default.max(feeData.gasLimit, gas).toFixed(),
-        });
+    getTradeRate: (input, deps) => {
+        const rateInput = input;
+        return 'supportsEIP1559' in rateInput
+            ? (0, getBebopTradeRate_1.getBebopTradeRate)(rateInput, deps)
+            : (0, getBebopSolanaTradeRate_1.getBebopSolanaTradeRate)(rateInput, deps);
     },
+    getUnsignedEvmTransaction: evm_1.getUnsignedEvmTransaction,
+    getEvmTransactionFees: evm_1.getEvmTransactionFees,
     getUnsignedSolanaMessage: ({ tradeQuote, stepIndex }) => {
         if (!(0, utils_1.isExecutableTradeQuote)(tradeQuote))
             throw new Error('Unable to execute a trade rate quote');
         const step = (0, utils_1.getExecutableTradeStep)(tradeQuote, stepIndex);
-        const { bebopSolanaSerializedTx, bebopQuoteId } = step;
-        if (!bebopSolanaSerializedTx || !bebopQuoteId) {
-            throw new Error('Bebop Solana transaction metadata is required');
+        const { transactionData } = step;
+        const { quoteId } = (0, utils_1.getSwapMetadata)(step.swapperMetadata, 'bebop');
+        if (transactionData?.type !== 'solana_serialized_tx' || !quoteId) {
+            throw new Error('Bebop Solana transaction data is required');
         }
         return Promise.resolve({
-            serializedTx: bebopSolanaSerializedTx,
-            quoteId: bebopQuoteId,
+            serializedTx: transactionData.serializedTx,
+            quoteId,
         });
     },
-    getEvmTransactionFees: async ({ from, stepIndex, tradeQuote, supportsEIP1559, assertGetEvmChainAdapter, }) => {
-        if (!(0, utils_1.isExecutableTradeQuote)(tradeQuote))
-            throw new Error('Unable to execute a trade rate quote');
-        const step = (0, utils_1.getExecutableTradeStep)(tradeQuote, stepIndex);
-        const { sellAsset, bebopTransactionMetadata } = step;
-        if (!bebopTransactionMetadata)
-            throw new Error('Transaction metadata is required');
-        const { value: hexValue, to, data } = bebopTransactionMetadata;
-        const value = (0, viem_1.fromHex)(hexValue, 'bigint').toString();
-        const adapter = assertGetEvmChainAdapter(sellAsset.chainId);
-        const feeData = await chain_adapters_1.evm.getFees({ adapter, data, to, value, from, supportsEIP1559 });
-        return feeData.networkFeeCryptoBaseUnit;
-    },
     checkTradeStatus: input => {
         if (input.chainId === caip_1.solanaChainId) {
             return (0, utils_1.checkSolanaSwapStatus)({

package/dist/cjs/swappers/BebopSwapper/executeSolanaMessage.js

@@ -7,10 +7,10 @@ exports.executeSolanaMessage = void 0;
 const bs58_1 = __importDefault(require("bs58"));
 const bebopService_1 = require("./utils/bebopService");
 const executeSolanaMessage = async (messageData, { signSerializedTransaction }, config) => {
-    const { serializedTx, quoteId } = messageData;
-    if (!serializedTx || !quoteId) {
+    if (!('quoteId' in messageData) || !messageData.quoteId || !messageData.serializedTx) {
         throw new Error('Missing serializedTx or quoteId in message data');
     }
+    const { serializedTx, quoteId } = messageData;
     const signatures = await signSerializedTransaction(serializedTx);
     if (!signatures.length) {
         throw new Error('No signatures returned from wallet');

package/dist/cjs/swappers/BebopSwapper/getBebopSolanaTradeQuote/getBebopSolanaTradeQuote.d.ts

@@ -1,4 +1,3 @@
-import type { AssetsByIdPartial } from '@shapeshiftoss/types';
 import type { Result } from '@sniptt/monads';
-import type { GetSolanaTradeQuoteInput, SwapErrorRight, TradeQuote } from '../../../types';
-export declare function getBebopSolanaTradeQuote(input: GetSolanaTradeQuoteInput, _assetsById: AssetsByIdPartial, apiKey: string): Promise<Result<TradeQuote, SwapErrorRight>>;
+import type { GetSolanaTradeQuoteInput, SwapErrorRight, SwapperDeps, TradeQuote } from '../../../types';
+export declare const getBebopSolanaTradeQuote: (input: GetSolanaTradeQuoteInput, deps: SwapperDeps) => Promise<Result<TradeQuote[], SwapErrorRight>>;

package/dist/cjs/swappers/BebopSwapper/getBebopSolanaTradeQuote/getBebopSolanaTradeQuote.js

@@ -2,90 +2,49 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBebopSolanaTradeQuote = void 0;
 const monads_1 = require("@sniptt/monads");
-const uuid_1 = require("uuid");
-const constants_1 = require("../../../constants");
 const types_1 = require("../../../types");
 const utils_1 = require("../../../utils");
-const fetchFromBebop_1 = require("../utils/fetchFromBebop");
-const helpers_1 = require("../utils/helpers/helpers");
-async function getBebopSolanaTradeQuote(input, _assetsById, apiKey) {
-    const { sellAsset, buyAsset, accountNumber, sendAddress, receiveAddress, affiliateBps, sellAmountIncludingProtocolFeesCryptoBaseUnit, } = input;
-    const assertion = (0, helpers_1.assertValidTrade)({ buyAsset, sellAsset });
-    if (assertion.isErr())
-        return (0, monads_1.Err)(assertion.unwrapErr());
-    const takerAddress = sendAddress || receiveAddress;
-    if (!takerAddress) {
-        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
-            message: 'Cannot execute quote without a wallet address',
-            code: types_1.TradeQuoteError.UnknownError,
-        }));
-    }
-    const slippageTolerancePercentageDecimal = input.slippageTolerancePercentageDecimal ??
-        (0, constants_1.getDefaultSlippageDecimalPercentageForSwapper)(types_1.SwapperName.Bebop);
-    const maybeBebopQuoteResponse = await (0, fetchFromBebop_1.fetchBebopSolanaQuote)({
-        buyAsset,
-        sellAsset,
-        sellAmountIncludingProtocolFeesCryptoBaseUnit,
-        takerAddress,
-        receiverAddress: receiveAddress ?? takerAddress,
-        slippageTolerancePercentageDecimal,
-        affiliateBps,
-        apiKey,
+const helpers_1 = require("../../../utils/helpers");
+const getBebopSolanaTradeContext_1 = require("../utils/getBebopSolanaTradeContext");
+const helpers_2 = require("../utils/helpers");
+const getBebopSolanaTradeQuote = async (input, deps) => {
+    const { accountNumber } = input;
+    const maybeAddresses = (0, utils_1.assertQuoteAddresses)(input);
+    if (maybeAddresses.isErr())
+        return (0, monads_1.Err)(maybeAddresses.unwrapErr());
+    const { sendAddress, receiveAddress } = maybeAddresses.unwrap();
+    const maybeContext = await (0, getBebopSolanaTradeContext_1.getBebopSolanaTradeContext)({
+        input,
+        deps,
+        takerAddress: sendAddress,
+        receiverAddress: receiveAddress,
     });
-    if (maybeBebopQuoteResponse.isErr())
-        return (0, monads_1.Err)(maybeBebopQuoteResponse.unwrapErr());
-    const bebopQuoteResponse = maybeBebopQuoteResponse.unwrap();
-    const sellTokenAddress = Object.keys(bebopQuoteResponse.sellTokens)[0];
-    const buyTokenAddress = Object.keys(bebopQuoteResponse.buyTokens)[0];
-    if (!sellTokenAddress || !buyTokenAddress) {
-        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
-            message: 'Invalid token addresses in response',
-            code: types_1.TradeQuoteError.InvalidResponse,
-        }));
-    }
-    if (bebopQuoteResponse.solana_tx &&
-        !(0, helpers_1.isBebopSolanaTxSafe)(bebopQuoteResponse.solana_tx, takerAddress)) {
+    if (maybeContext.isErr())
+        return (0, monads_1.Err)(maybeContext.unwrapErr());
+    const { tradeCommon, stepCommon, response } = maybeContext.unwrap();
+    if (!(0, helpers_2.isBebopSolanaTxSafe)(response.solana_tx, sendAddress)) {
         return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
             message: 'Bebop signer index mismatch - taker not at expected position',
             code: types_1.TradeQuoteError.NoRouteFound,
         }));
     }
-    const sellAmount = bebopQuoteResponse.sellTokens[sellTokenAddress].amount;
-    const buyAmount = bebopQuoteResponse.buyTokens[buyTokenAddress].amount;
-    const rate = (0, helpers_1.calculateRate)({ buyAmount, sellAmount, buyAsset, sellAsset });
-    const buyTokenData = bebopQuoteResponse.buyTokens[buyTokenAddress];
-    const buyAmountBeforeFeesCryptoBaseUnit = buyTokenData.amountBeforeFee || buyAmount;
-    const buyAmountAfterFeesCryptoBaseUnit = buyAmount;
-    // Bebop Solana is gasless - Bebop pays the network fees via co-signing
-    const networkFeeCryptoBaseUnit = '0';
-    return (0, monads_1.Ok)({
-        id: (0, uuid_1.v4)(),
+    const tradeQuote = {
+        ...tradeCommon,
         quoteOrRate: 'quote',
-        receiveAddress: receiveAddress ?? takerAddress,
-        affiliateBps,
-        slippageTolerancePercentageDecimal,
-        rate,
-        swapperName: types_1.SwapperName.Bebop,
+        // The sealed multi-signer tx is blockhash-pinned, so the provider expiry governs
+        deadline: (0, helpers_1.normalizeEpochToMs)(response.expiry),
+        receiveAddress,
         steps: [
             {
-                estimatedExecutionTimeMs: 0,
-                allowanceContract: '0x0',
-                buyAsset,
-                sellAsset,
+                ...stepCommon,
                 accountNumber,
-                rate,
-                feeData: {
-                    protocolFees: {},
-                    networkFeeCryptoBaseUnit,
-                },
-                buyAmountBeforeFeesCryptoBaseUnit,
-                buyAmountAfterFeesCryptoBaseUnit,
-                sellAmountIncludingProtocolFeesCryptoBaseUnit,
-                source: types_1.SwapperName.Bebop,
-                bebopSolanaSerializedTx: bebopQuoteResponse.solana_tx,
-                bebopQuoteId: bebopQuoteResponse.quoteId,
+                // Bebop Solana is gasless - Bebop pays the network fees via co-signing
+                feeData: { protocolFees: {}, networkFeeCryptoBaseUnit: '0' },
+                transactionData: { type: 'solana_serialized_tx', serializedTx: response.solana_tx },
+                swapperMetadata: { name: 'bebop', quoteId: response.quoteId },
             },
         ],
-    });
-}
+    };
+    return (0, monads_1.Ok)([tradeQuote]);
+};
 exports.getBebopSolanaTradeQuote = getBebopSolanaTradeQuote;

package/dist/cjs/swappers/BebopSwapper/getBebopSolanaTradeRate/getBebopSolanaTradeRate.d.ts

@@ -1,4 +1,3 @@
-import type { AssetsByIdPartial } from '@shapeshiftoss/types';
 import type { Result } from '@sniptt/monads';
-import type { GetSolanaTradeRateInput, SwapErrorRight, TradeRate } from '../../../types';
-export declare function getBebopSolanaTradeRate(input: GetSolanaTradeRateInput, _assetsById: AssetsByIdPartial, apiKey: string): Promise<Result<TradeRate, SwapErrorRight>>;
+import type { GetSolanaTradeRateInput, SwapErrorRight, SwapperDeps, TradeRate } from '../../../types';
+export declare const getBebopSolanaTradeRate: (input: GetSolanaTradeRateInput, deps: SwapperDeps) => Promise<Result<TradeRate[], SwapErrorRight>>;