@shapeshiftoss/swapper 17.7.3 → 18.1.0

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

@@ -1,102 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBebopTradeRate = void 0;
-const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
-const utils_1 = require("@shapeshiftoss/utils");
 const monads_1 = require("@sniptt/monads");
-const uuid_1 = require("uuid");
 const viem_1 = require("viem");
-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 fetchFromBebop_1 = require("../utils/fetchFromBebop");
-const helpers_2 = require("../utils/helpers/helpers");
-async function getBebopTradeRate(input, assertGetEvmChainAdapter, _assetsById, apiKey) {
-    const { sellAsset, buyAsset, accountNumber, receiveAddress, affiliateBps, sellAmountIncludingProtocolFeesCryptoBaseUnit, } = input;
-    const assertion = (0, helpers_2.assertValidTrade)({ buyAsset, sellAsset });
-    if (assertion.isErr())
-        return (0, monads_1.Err)(assertion.unwrapErr());
-    const slippageTolerancePercentageDecimal = input.slippageTolerancePercentageDecimal ??
-        (0, constants_1.getDefaultSlippageDecimalPercentageForSwapper)(types_1.SwapperName.Bebop);
-    const maybeBebopPriceResponse = await (0, fetchFromBebop_1.fetchBebopPrice)({
-        buyAsset,
-        sellAsset,
-        sellAmountIncludingProtocolFeesCryptoBaseUnit,
-        receiveAddress,
-        affiliateBps,
-        apiKey,
-    });
-    if (maybeBebopPriceResponse.isErr())
-        return (0, monads_1.Err)(maybeBebopPriceResponse.unwrapErr());
-    const bebopPriceResponse = maybeBebopPriceResponse.unwrap();
-    const bestRoute = bebopPriceResponse.routes.find(r => r.type === bebopPriceResponse.bestPrice);
-    if (!bestRoute || !bestRoute.quote) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: 'No best route found',
-            code: types_1.TradeQuoteError.NoRouteFound,
-        }));
-    }
-    const quote = bestRoute.quote;
-    const sellTokenAddress = Object.keys(quote.sellTokens)[0];
-    const buyTokenAddress = Object.keys(quote.buyTokens)[0];
-    if (!(0, viem_1.isAddress)(sellTokenAddress) || !(0, viem_1.isAddress)(buyTokenAddress)) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: 'Invalid token addresses in response',
-            code: types_1.TradeQuoteError.InvalidResponse,
-        }));
-    }
-    const sellAmount = quote.sellTokens[sellTokenAddress].amount;
-    const buyAmount = quote.buyTokens[buyTokenAddress].amount;
-    const rate = (0, helpers_2.calculateRate)({ buyAmount, sellAmount, buyAsset, sellAsset });
-    const buyTokenData = quote.buyTokens[buyTokenAddress];
-    const buyAmountBeforeFeesCryptoBaseUnit = buyTokenData.amountBeforeFee || buyAmount;
-    const buyAmountAfterFeesCryptoBaseUnit = buyAmount;
-    const adapter = assertGetEvmChainAdapter(sellAsset.chainId);
-    const { fast } = await adapter.getGasFeeData();
-    const gasLimit = (0, utils_1.bnOrZero)(quote.tx.gas).toString();
-    const networkFeeCryptoBaseUnit = chain_adapters_1.evm.calcNetworkFeeCryptoBaseUnit({
-        ...fast,
-        supportsEIP1559: Boolean(input.supportsEIP1559),
-        gasLimit,
+const types_1 = require("../types");
+const getBebopStepData_1 = require("../utils/getBebopStepData");
+const getBebopTradeContext_1 = require("../utils/getBebopTradeContext");
+const getBebopTradeRate = async (input, deps) => {
+    const { accountNumber, receiveAddress } = input;
+    const address = (0, viem_1.getAddress)(receiveAddress ?? types_1.BEBOP_DUMMY_ADDRESS);
+    const maybeContext = await (0, getBebopTradeContext_1.getBebopTradeContext)({
+        input,
+        deps,
+        from: address,
+        receiver: address,
     });
-    return (0, monads_1.Ok)({
-        id: (0, uuid_1.v4)(),
+    if (maybeContext.isErr())
+        return (0, monads_1.Err)(maybeContext.unwrapErr());
+    const { tradeCommon, stepCommon, stepDataArgs } = maybeContext.unwrap();
+    const maybeStepData = await (0, getBebopStepData_1.getBebopStepData)({ ...stepDataArgs, type: 'rate', input });
+    if (maybeStepData.isErr())
+        return (0, monads_1.Err)(maybeStepData.unwrapErr());
+    const { networkFeeCryptoBaseUnit } = maybeStepData.unwrap();
+    const tradeRate = {
+        ...tradeCommon,
         quoteOrRate: 'rate',
-        accountNumber: undefined,
         receiveAddress,
-        affiliateBps,
-        slippageTolerancePercentageDecimal,
-        rate,
-        swapperName: types_1.SwapperName.Bebop,
         steps: [
             {
-                estimatedExecutionTimeMs: 0,
-                allowanceContract: (0, helpers_1.isNativeEvmAsset)(sellAsset.assetId) ? undefined : quote.approvalTarget,
-                buyAsset,
-                sellAsset,
+                ...stepCommon,
                 accountNumber,
-                rate,
-                feeData: {
-                    protocolFees: {},
-                    networkFeeCryptoBaseUnit,
-                },
-                buyAmountBeforeFeesCryptoBaseUnit,
-                buyAmountAfterFeesCryptoBaseUnit,
-                sellAmountIncludingProtocolFeesCryptoBaseUnit,
-                source: types_1.SwapperName.Bebop,
-                affiliateFee: (0, affiliateFee_1.buildAffiliateFee)({
-                    strategy: 'buy_asset',
-                    affiliateBps,
-                    sellAsset,
-                    buyAsset,
-                    sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
-                    buyAmountCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
-                    isEstimate: true,
-                }),
+                feeData: { protocolFees: {}, networkFeeCryptoBaseUnit },
             },
         ],
-    });
-}
+    };
+    return (0, monads_1.Ok)([tradeRate]);
+};
 exports.getBebopTradeRate = getBebopTradeRate;

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

@@ -1,89 +1,82 @@
 import { KnownChainIds } from '@shapeshiftoss/types';
 import type { Address, Hex } from 'viem';
+import type { GetEvmTradeQuoteInput, GetEvmTradeRateInput, GetSolanaTradeQuoteInput, GetSolanaTradeRateInput } from '../../types';
+export type BebopTradeQuoteInput = GetEvmTradeQuoteInput | GetSolanaTradeQuoteInput;
+export type BebopTradeRateInput = GetEvmTradeRateInput | GetSolanaTradeRateInput;
 export declare const bebopSupportedEvmChainIds: readonly [KnownChainIds.EthereumMainnet, KnownChainIds.PolygonMainnet, KnownChainIds.ArbitrumMainnet, KnownChainIds.BaseMainnet, KnownChainIds.AvalancheMainnet, KnownChainIds.OptimismMainnet, KnownChainIds.BnbSmartChainMainnet];
 export declare const bebopSupportedChainIds: readonly [KnownChainIds.EthereumMainnet, KnownChainIds.PolygonMainnet, KnownChainIds.ArbitrumMainnet, KnownChainIds.BaseMainnet, KnownChainIds.AvalancheMainnet, KnownChainIds.OptimismMainnet, KnownChainIds.BnbSmartChainMainnet, KnownChainIds.SolanaMainnet];
 export type BebopSupportedChainId = (typeof bebopSupportedChainIds)[number];
-export type BebopQuoteRoute = {
+export type BebopMetadata = {
+    name: 'bebop';
+    quoteId: string;
+};
+export type BebopQuoteResponse = {
+    requestId: string;
     type: string;
-    quote: {
-        requestId: string;
-        type: string;
-        status: string;
-        quoteId: string;
-        chainId: number;
-        approvalType: 'Standard' | 'Permit2';
-        nativeToken: string;
-        taker: Address;
-        receiver: Address;
+    status: string;
+    quoteId: string;
+    chainId: number;
+    approvalType: 'Standard' | 'Permit' | 'Permit2';
+    nativeToken: string;
+    taker: Address;
+    receiver: Address;
+    expiry: number;
+    slippage: number;
+    gasFee: {
+        native: string;
+        usd: number;
+    };
+    buyTokens: Record<Address, {
+        amount: string;
+        decimals: number;
+        priceUsd: number;
+        symbol: string;
+        minimumAmount: string;
+        price: number;
+        priceBeforeFee: number;
+        amountBeforeFee: string;
+        deltaFromExpected: number;
+    }>;
+    sellTokens: Record<Address, {
+        amount: string;
+        decimals: number;
+        priceUsd: number;
+        symbol: string;
+        price: number;
+        priceBeforeFee: number;
+    }>;
+    settlementAddress: Address;
+    approvalTarget: Address;
+    requiredSignatures: string[];
+    priceImpact: number;
+    warnings: string[];
+    toSign: {
+        partner_id: number;
         expiry: number;
-        slippage: number;
-        gasFee: {
-            native: string;
-            usd: number;
-        };
-        buyTokens: Record<Address, {
-            amount: string;
-            decimals: number;
-            priceUsd: number;
-            symbol: string;
-            minimumAmount: string;
-            price: number;
-            priceBeforeFee: number;
-            amountBeforeFee: string;
-            deltaFromExpected: number;
-        }>;
-        sellTokens: Record<Address, {
-            amount: string;
-            decimals: number;
-            priceUsd: number;
-            symbol: string;
-            price: number;
-            priceBeforeFee: number;
-        }>;
-        settlementAddress: Address;
-        approvalTarget: Address;
-        requiredSignatures: string[];
-        priceImpact: number;
-        warnings: string[];
-        toSign: {
-            partner_id: number;
-            expiry: number;
-            taker_address: Address;
-            maker_address: Address;
-            maker_nonce: string;
-            taker_token: Address;
-            maker_token: Address;
-            taker_amount: string;
-            maker_amount: string;
-            receiver: Address;
-            packed_commands: string;
-        };
-        onchainOrderType?: string;
-        solver?: string;
-        makers?: string[];
-        partialFillOffset?: number;
-        tx: {
-            to: Address;
-            from: Address;
-            data: Hex;
-            value: Hex;
-            gas?: number;
-            gasPrice?: number;
-        };
-        partnerFee?: Record<Address, string>;
-        protocolFee?: Record<Address, string>;
+        taker_address: Address;
+        maker_address: Address;
+        maker_nonce: string;
+        taker_token: Address;
+        maker_token: Address;
+        taker_amount: string;
+        maker_amount: string;
+        receiver: Address;
+        packed_commands: string;
     };
-};
-export type BebopError = {
-    errorCode: number;
-    message: string;
-    requestId: string;
-};
-export type BebopQuoteResponse = {
-    routes: BebopQuoteRoute[];
-    errors: Record<string, BebopError>;
-    link: string;
-    bestPrice: string;
+    onchainOrderType?: string;
+    solver?: string;
+    makers?: string[];
+    partialFillOffset?: number;
+    tx: {
+        to: Address;
+        from: Address;
+        data: Hex;
+        value: Hex;
+        gas?: number;
+        gasPrice?: number;
+    };
+    partnerFee?: Record<Address, string>;
+    protocolFee?: Record<Address, string>;
 };
 export declare const chainIdToBebopChain: Record<BebopSupportedChainId, string>;
 export declare const BEBOP_NATIVE_MARKER = "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE";

package/dist/cjs/swappers/BebopSwapper/utils/fetchFromBebop.d.ts

@@ -13,14 +13,6 @@ export declare const fetchBebopQuote: ({ buyAsset, sellAsset, sellAmountIncludin
     affiliateBps?: string | undefined;
     apiKey: string;
 }) => Promise<Result<BebopQuoteResponse, SwapErrorRight>>;
-export declare const fetchBebopPrice: ({ buyAsset, sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, receiveAddress, affiliateBps, apiKey, }: {
-    buyAsset: Asset;
-    sellAsset: Asset;
-    sellAmountIncludingProtocolFeesCryptoBaseUnit: string;
-    receiveAddress: string | undefined;
-    affiliateBps?: string | undefined;
-    apiKey: string;
-}) => Promise<Result<BebopQuoteResponse, SwapErrorRight>>;
 export declare const fetchBebopSolanaQuote: ({ buyAsset, sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, takerAddress, receiverAddress, slippageTolerancePercentageDecimal, affiliateBps, apiKey, }: {
     buyAsset: Asset;
     sellAsset: Asset;
@@ -31,11 +23,3 @@ export declare const fetchBebopSolanaQuote: ({ buyAsset, sellAsset, sellAmountIn
     affiliateBps?: string | undefined;
     apiKey: string;
 }) => Promise<Result<BebopSolanaQuoteResponse, SwapErrorRight>>;
-export declare const fetchBebopSolanaPrice: ({ buyAsset, sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, receiveAddress, affiliateBps, apiKey, }: {
-    buyAsset: Asset;
-    sellAsset: Asset;
-    sellAmountIncludingProtocolFeesCryptoBaseUnit: string;
-    receiveAddress: string | undefined;
-    affiliateBps?: string | undefined;
-    apiKey: string;
-}) => Promise<Result<BebopSolanaQuoteResponse, SwapErrorRight>>;

package/dist/cjs/swappers/BebopSwapper/utils/fetchFromBebop.js

@@ -1,30 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchBebopSolanaPrice = exports.fetchBebopSolanaQuote = exports.fetchBebopPrice = exports.fetchBebopQuote = void 0;
+exports.fetchBebopSolanaQuote = exports.fetchBebopQuote = void 0;
+const caip_1 = require("@shapeshiftoss/caip");
 const utils_1 = require("@shapeshiftoss/utils");
 const monads_1 = require("@sniptt/monads");
 const viem_1 = require("viem");
 const types_1 = require("../../../types");
 const utils_2 = require("../../../utils");
+const helpers_1 = require("../../../utils/helpers");
 const types_2 = require("../types");
 const bebopService_1 = require("./bebopService");
-const helpers_1 = require("./helpers/helpers");
+const helpers_2 = require("./helpers");
 const fetchBebopQuote = async ({ buyAsset, sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, takerAddress, receiverAddress, slippageTolerancePercentageDecimal, affiliateBps, apiKey, }) => {
     try {
-        const sellToken = (0, helpers_1.assetIdToBebopToken)(sellAsset.assetId);
-        const buyToken = (0, helpers_1.assetIdToBebopToken)(buyAsset.assetId);
+        const sellToken = (0, helpers_2.assetIdToBebopToken)(sellAsset.assetId);
+        const buyToken = (0, helpers_2.assetIdToBebopToken)(buyAsset.assetId);
         const checksummedTakerAddress = (0, viem_1.getAddress)(takerAddress);
         const checksummedReceiverAddress = (0, viem_1.getAddress)(receiverAddress);
         const chainName = types_2.chainIdToBebopChain[sellAsset.chainId];
         const sellAmountFormatted = (0, utils_1.bn)(sellAmountIncludingProtocolFeesCryptoBaseUnit).toFixed(0);
-        // Bebop API expects slippage as percentage (not basis points like other APIs)
-        // e.g. 0.3% → send as 0.3, not 30
-        // See: https://api.bebop.xyz/pmm/ethereum/docs#/v3/quote_v3_quote_get
-        const slippagePercentage = (0, utils_1.bn)(slippageTolerancePercentageDecimal ?? 0.003)
-            .times(100)
-            .toNumber();
-        const url = `https://api.bebop.xyz/router/${chainName}/v1/quote`;
-        const params = new URLSearchParams({
+        const slippagePercentage = (0, utils_1.bn)(slippageTolerancePercentageDecimal).times(100).toNumber();
+        const baseParams = {
             sell_tokens: sellToken,
             buy_tokens: buyToken,
             sell_amounts: sellAmountFormatted,
@@ -35,38 +31,46 @@ const fetchBebopQuote = async ({ buyAsset, sellAsset, sellAmountIncludingProtoco
             skip_validation: 'true',
             gasless: 'false',
             source: 'shapeshift',
-        });
+        };
+        const jamParams = new URLSearchParams(baseParams);
+        const pmmParams = new URLSearchParams(baseParams);
         if (affiliateBps && affiliateBps !== '0') {
-            params.set('fee', affiliateBps);
+            // JAM collects the fee on-chain and requires a recipient
+            jamParams.set('fee', affiliateBps);
+            jamParams.set('fee_recipient', (0, viem_1.getAddress)((0, helpers_1.getTreasuryAddressFromChainId)(buyAsset.chainId)));
+            // PMM attributes the fee off-chain via source
+            pmmParams.set('fee', affiliateBps);
         }
-        const bebopService = (0, bebopService_1.bebopServiceFactory)({ apiKey });
-        const maybeResponse = await bebopService.get(`${url}?${params}`);
-        if (maybeResponse.isErr()) {
+        const service = (0, bebopService_1.bebopServiceFactory)({ apiKey });
+        const [maybeJam, maybePmm] = await Promise.all([
+            service.get(`https://api.bebop.xyz/jam/${chainName}/v2/quote`, {
+                params: jamParams,
+            }),
+            service.get(`https://api.bebop.xyz/pmm/${chainName}/v3/quote`, {
+                params: pmmParams,
+            }),
+        ]);
+        const maybeResponses = [maybeJam, maybePmm];
+        if (maybeResponses.every(maybeResponse => maybeResponse.isErr())) {
             return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
                 message: 'Failed to fetch quote from Bebop',
-                cause: maybeResponse.unwrapErr().cause,
+                cause: maybeResponses[0].unwrapErr().cause,
                 code: types_1.TradeQuoteError.QueryFailed,
             }));
         }
-        const response = maybeResponse.unwrap();
-        // Log partial route failures for debugging (these are normal and don't indicate quote failure)
-        if (response.data.errors && Object.keys(response.data.errors).length > 0) {
-            console.debug('[Bebop] Some routes failed (this is normal):', response.data.errors);
-        }
-        // Validate response has routes - only fail if there are NO valid routes
-        if (!response.data.routes || response.data.routes.length === 0) {
+        const quotes = maybeResponses
+            .filter(maybeResponse => maybeResponse.isOk())
+            .map(maybeResponse => maybeResponse.unwrap().data)
+            .filter(quote => Boolean(quote.tx?.data));
+        if (!quotes.length) {
             return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-                message: 'No routes available',
+                message: 'No route available',
                 code: types_1.TradeQuoteError.NoRouteFound,
             }));
         }
-        if (!response.data.bestPrice) {
-            return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-                message: 'No best price route specified',
-                code: types_1.TradeQuoteError.InvalidResponse,
-            }));
-        }
-        return (0, monads_1.Ok)(response.data);
+        const getBuyAmount = (quote) => (0, utils_1.bnOrZero)(Object.values(quote.buyTokens)[0]?.amount);
+        const bestQuote = quotes.reduce((best, quote) => getBuyAmount(quote).gt(getBuyAmount(best)) ? quote : best);
+        return (0, monads_1.Ok)(bestQuote);
     }
     catch (error) {
         return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
@@ -77,29 +81,20 @@ const fetchBebopQuote = async ({ buyAsset, sellAsset, sellAmountIncludingProtoco
     }
 };
 exports.fetchBebopQuote = fetchBebopQuote;
-const fetchBebopPrice = ({ buyAsset, sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, receiveAddress, affiliateBps, apiKey, }) => {
-    const address = receiveAddress || types_2.BEBOP_DUMMY_ADDRESS;
-    return (0, exports.fetchBebopQuote)({
-        buyAsset,
-        sellAsset,
-        sellAmountIncludingProtocolFeesCryptoBaseUnit,
-        takerAddress: address,
-        receiverAddress: address,
-        slippageTolerancePercentageDecimal: '0.01',
-        affiliateBps,
-        apiKey,
-    });
-};
-exports.fetchBebopPrice = fetchBebopPrice;
 const fetchBebopSolanaQuote = async ({ buyAsset, sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, takerAddress, receiverAddress, slippageTolerancePercentageDecimal, affiliateBps, apiKey, }) => {
     try {
-        const sellToken = (0, helpers_1.assetIdToBebopSolanaToken)(sellAsset.assetId);
-        const buyToken = (0, helpers_1.assetIdToBebopSolanaToken)(buyAsset.assetId);
+        // Bebop's Solana routes don't wrap native SOL on the input side, so selling native SOL
+        // always fails on-chain. Reject up front instead of returning an unexecutable quote.
+        if (sellAsset.assetId === caip_1.solAssetId) {
+            return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
+                message: 'Bebop Solana cannot sell native SOL',
+                code: types_1.TradeQuoteError.NoRouteFound,
+            }));
+        }
+        const sellToken = (0, helpers_2.assetIdToBebopSolanaToken)(sellAsset.assetId);
+        const buyToken = (0, helpers_2.assetIdToBebopSolanaToken)(buyAsset.assetId);
         const sellAmountFormatted = (0, utils_1.bn)(sellAmountIncludingProtocolFeesCryptoBaseUnit).toFixed(0);
-        const slippagePercentage = (0, utils_1.bn)(slippageTolerancePercentageDecimal ?? 0.003)
-            .times(100)
-            .toNumber();
-        const url = 'https://api.bebop.xyz/pmm/solana/v3/quote';
+        const slippagePercentage = (0, utils_1.bn)(slippageTolerancePercentageDecimal).times(100).toNumber();
         const params = new URLSearchParams({
             sell_tokens: sellToken,
             buy_tokens: buyToken,
@@ -115,8 +110,7 @@ const fetchBebopSolanaQuote = async ({ buyAsset, sellAsset, sellAmountIncludingP
         if (affiliateBps && affiliateBps !== '0') {
             params.set('fee', affiliateBps);
         }
-        const bebopService = (0, bebopService_1.bebopServiceFactory)({ apiKey });
-        const maybeResponse = await bebopService.get(`${url}?${params}`);
+        const maybeResponse = await (0, bebopService_1.bebopServiceFactory)({ apiKey }).get('https://api.bebop.xyz/pmm/solana/v3/quote', { params });
         if (maybeResponse.isErr()) {
             const err = maybeResponse.unwrapErr();
             return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
@@ -138,19 +132,6 @@ const fetchBebopSolanaQuote = async ({ buyAsset, sellAsset, sellAmountIncludingP
                 code: types_1.TradeQuoteError.InvalidResponse,
             }));
         }
-        // Reject routes containing ANY AMM/CLMM makers - these produce malformed txs
-        // (wrong signature count in wire format) and require pre-existing ATAs that
-        // Bebop's gasless co-signed flow can't create. This includes mixed routes
-        // like ["raydium clmm-rfqm", "🦊"] where Bebop serializes the tx with fewer
-        // signature slots than the message header requires.
-        // When rejected, other swappers like Jupiter will handle these pairs instead.
-        const hasAmmRoute = response.data.makers.some(maker => maker.toLowerCase().includes('clmm') || maker.toLowerCase().includes('amm'));
-        if (hasAmmRoute) {
-            return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-                message: `Bebop Solana quote contains AMM routing (${response.data.makers.join(', ')}), which produces malformed txs`,
-                code: types_1.TradeQuoteError.NoRouteFound,
-            }));
-        }
         return (0, monads_1.Ok)(response.data);
     }
     catch (error) {
@@ -162,17 +143,3 @@ const fetchBebopSolanaQuote = async ({ buyAsset, sellAsset, sellAmountIncludingP
     }
 };
 exports.fetchBebopSolanaQuote = fetchBebopSolanaQuote;
-const fetchBebopSolanaPrice = ({ buyAsset, sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, receiveAddress, affiliateBps, apiKey, }) => {
-    const address = receiveAddress || types_2.BEBOP_SOLANA_DUMMY_ADDRESS;
-    return (0, exports.fetchBebopSolanaQuote)({
-        buyAsset,
-        sellAsset,
-        sellAmountIncludingProtocolFeesCryptoBaseUnit,
-        takerAddress: address,
-        receiverAddress: address,
-        slippageTolerancePercentageDecimal: '0.01',
-        affiliateBps,
-        apiKey,
-    });
-};
-exports.fetchBebopSolanaPrice = fetchBebopSolanaPrice;

package/dist/cjs/swappers/BebopSwapper/utils/getBebopSolanaTradeContext.d.ts

@@ -0,0 +1,15 @@
+import type { Result } from '@sniptt/monads';
+import type { GetSolanaTradeQuoteInput, GetSolanaTradeRateInput, SwapErrorRight, SwapperDeps, TradeCommon, TradeStepCommon } from '../../../types';
+import type { BebopSolanaQuoteResponse } from '../types';
+type BebopSolanaTradeContext = {
+    tradeCommon: TradeCommon;
+    stepCommon: Omit<TradeStepCommon, 'feeData'>;
+    response: BebopSolanaQuoteResponse;
+};
+export declare const getBebopSolanaTradeContext: ({ input, deps, takerAddress, receiverAddress, }: {
+    input: GetSolanaTradeQuoteInput | GetSolanaTradeRateInput;
+    deps: SwapperDeps;
+    takerAddress: string;
+    receiverAddress: string;
+}) => Promise<Result<BebopSolanaTradeContext, SwapErrorRight>>;
+export {};

package/dist/cjs/swappers/BebopSwapper/utils/getBebopSolanaTradeContext.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getBebopSolanaTradeContext = 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("./fetchFromBebop");
+const helpers_1 = require("./helpers");
+const getBebopSolanaTradeContext = async ({ input, deps, takerAddress, receiverAddress, }) => {
+    const { sellAsset, buyAsset, affiliateBps, sellAmountIncludingProtocolFeesCryptoBaseUnit } = input;
+    const assertion = (0, helpers_1.assertValidTrade)({ buyAsset, sellAsset });
+    if (assertion.isErr())
+        return (0, monads_1.Err)(assertion.unwrapErr());
+    const slippageTolerancePercentageDecimal = input.slippageTolerancePercentageDecimal ??
+        (0, constants_1.getDefaultSlippageDecimalPercentageForSwapper)(types_1.SwapperName.Bebop);
+    const maybeBebopQuoteResponse = await (0, fetchFromBebop_1.fetchBebopSolanaQuote)({
+        buyAsset,
+        sellAsset,
+        sellAmountIncludingProtocolFeesCryptoBaseUnit,
+        takerAddress,
+        receiverAddress,
+        slippageTolerancePercentageDecimal,
+        affiliateBps,
+        apiKey: deps.config.VITE_BEBOP_API_KEY,
+    });
+    if (maybeBebopQuoteResponse.isErr())
+        return (0, monads_1.Err)(maybeBebopQuoteResponse.unwrapErr());
+    const response = maybeBebopQuoteResponse.unwrap();
+    const sellTokenAddress = Object.keys(response.sellTokens)[0];
+    const buyTokenAddress = Object.keys(response.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,
+        }));
+    }
+    const sellAmount = response.sellTokens[sellTokenAddress].amount;
+    const buyAmount = response.buyTokens[buyTokenAddress].amount;
+    const rate = (0, helpers_1.calculateRate)({ buyAmount, sellAmount, buyAsset, sellAsset });
+    const buyTokenData = response.buyTokens[buyTokenAddress];
+    const buyAmountBeforeFeesCryptoBaseUnit = buyTokenData.amountBeforeFee || buyAmount;
+    const buyAmountAfterFeesCryptoBaseUnit = buyAmount;
+    return (0, monads_1.Ok)({
+        tradeCommon: {
+            id: (0, uuid_1.v4)(),
+            rate,
+            swapperName: types_1.SwapperName.Bebop,
+            affiliateBps,
+            slippageTolerancePercentageDecimal,
+        },
+        stepCommon: {
+            allowanceContract: '',
+            rate,
+            buyAmountBeforeFeesCryptoBaseUnit,
+            buyAmountAfterFeesCryptoBaseUnit,
+            sellAmountIncludingProtocolFeesCryptoBaseUnit,
+            buyAsset,
+            sellAsset,
+            source: types_1.SwapperName.Bebop,
+            estimatedExecutionTimeMs: 0,
+        },
+        response,
+    });
+};
+exports.getBebopSolanaTradeContext = getBebopSolanaTradeContext;

package/dist/cjs/swappers/BebopSwapper/utils/getBebopStepData.d.ts

@@ -0,0 +1,24 @@
+import type { Result } from '@sniptt/monads';
+import type { StepDataArgs, SwapErrorRight, TxBuildData } from '../../../types';
+import type { BebopQuoteResponse } from '../types';
+type BaseArgs = {
+    tx: BebopQuoteResponse['tx'];
+    spenderAddress: string;
+};
+export type GetBebopStepDataArgs = StepDataArgs<BaseArgs, {
+    from: string;
+}>;
+type BebopRateStepData = {
+    networkFeeCryptoBaseUnit: string;
+};
+type BebopQuoteStepData = {
+    transactionData: TxBuildData;
+    networkFeeCryptoBaseUnit: string;
+};
+export declare function getBebopStepData(args: Extract<GetBebopStepDataArgs, {
+    type: 'rate';
+}>): Promise<Result<BebopRateStepData, SwapErrorRight>>;
+export declare function getBebopStepData(args: Extract<GetBebopStepDataArgs, {
+    type: 'quote';
+}>): Promise<Result<BebopQuoteStepData, SwapErrorRight>>;
+export {};