@shapeshiftoss/swapper 17.7.3 → 18.1.0

package/dist/esm/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.js';
+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/esm/swappers/BebopSwapper/utils/bebopService.js

@@ -1,5 +1,5 @@
 import identity from 'lodash/identity';
-import { createCache, makeSwapperAxiosServiceMonadic } from '../../../utils.js';
+import { createCache, makeSwapperAxiosServiceMonadic } from '../../../utils/index.js';
 const maxAge = 5 * 1000;
 const cachedUrls = ['/quote', '/price'];
 const axiosConfig = {

package/dist/esm/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/esm/swappers/BebopSwapper/utils/fetchFromBebop.js

@@ -1,11 +1,13 @@
-import { bn } from '@shapeshiftoss/utils';
+import { solAssetId } from '@shapeshiftoss/caip';
+import { bn, bnOrZero } from '@shapeshiftoss/utils';
 import { Err, Ok } from '@sniptt/monads';
 import { getAddress } from 'viem';
 import { TradeQuoteError } from '../../../types.js';
-import { makeSwapErrorRight } from '../../../utils.js';
-import { BEBOP_DUMMY_ADDRESS, BEBOP_SOLANA_DUMMY_ADDRESS, chainIdToBebopChain } from '../types.js';
+import { makeSwapErrorRight } from '../../../utils/index.js';
+import { getTreasuryAddressFromChainId } from '../../../utils/helpers.js';
+import { chainIdToBebopChain } from '../types.js';
 import { bebopServiceFactory } from './bebopService.js';
-import { assetIdToBebopSolanaToken, assetIdToBebopToken } from './helpers/helpers.js';
+import { assetIdToBebopSolanaToken, assetIdToBebopToken } from './helpers.js';
 export const fetchBebopQuote = async ({ buyAsset, sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, takerAddress, receiverAddress, slippageTolerancePercentageDecimal, affiliateBps, apiKey, }) => {
     try {
         const sellToken = assetIdToBebopToken(sellAsset.assetId);
@@ -14,14 +16,8 @@ export const fetchBebopQuote = async ({ buyAsset, sellAsset, sellAmountIncluding
         const checksummedReceiverAddress = getAddress(receiverAddress);
         const chainName = chainIdToBebopChain[sellAsset.chainId];
         const sellAmountFormatted = 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 = bn(slippageTolerancePercentageDecimal ?? 0.003)
-            .times(100)
-            .toNumber();
-        const url = `https://api.bebop.xyz/router/${chainName}/v1/quote`;
-        const params = new URLSearchParams({
+        const slippagePercentage = bn(slippageTolerancePercentageDecimal).times(100).toNumber();
+        const baseParams = {
             sell_tokens: sellToken,
             buy_tokens: buyToken,
             sell_amounts: sellAmountFormatted,
@@ -32,38 +28,46 @@ export const fetchBebopQuote = async ({ buyAsset, sellAsset, sellAmountIncluding
             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', getAddress(getTreasuryAddressFromChainId(buyAsset.chainId)));
+            // PMM attributes the fee off-chain via source
+            pmmParams.set('fee', affiliateBps);
         }
-        const bebopService = bebopServiceFactory({ apiKey });
-        const maybeResponse = await bebopService.get(`${url}?${params}`);
-        if (maybeResponse.isErr()) {
+        const service = 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 Err(makeSwapErrorRight({
                 message: 'Failed to fetch quote from Bebop',
-                cause: maybeResponse.unwrapErr().cause,
+                cause: maybeResponses[0].unwrapErr().cause,
                 code: 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 Err(makeSwapErrorRight({
-                message: 'No routes available',
+                message: 'No route available',
                 code: TradeQuoteError.NoRouteFound,
             }));
         }
-        if (!response.data.bestPrice) {
-            return Err(makeSwapErrorRight({
-                message: 'No best price route specified',
-                code: TradeQuoteError.InvalidResponse,
-            }));
-        }
-        return Ok(response.data);
+        const getBuyAmount = (quote) => bnOrZero(Object.values(quote.buyTokens)[0]?.amount);
+        const bestQuote = quotes.reduce((best, quote) => getBuyAmount(quote).gt(getBuyAmount(best)) ? quote : best);
+        return Ok(bestQuote);
     }
     catch (error) {
         return Err(makeSwapErrorRight({
@@ -73,28 +77,20 @@ export const fetchBebopQuote = async ({ buyAsset, sellAsset, sellAmountIncluding
         }));
     }
 };
-export const fetchBebopPrice = ({ buyAsset, sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, receiveAddress, affiliateBps, apiKey, }) => {
-    const address = receiveAddress || BEBOP_DUMMY_ADDRESS;
-    return fetchBebopQuote({
-        buyAsset,
-        sellAsset,
-        sellAmountIncludingProtocolFeesCryptoBaseUnit,
-        takerAddress: address,
-        receiverAddress: address,
-        slippageTolerancePercentageDecimal: '0.01',
-        affiliateBps,
-        apiKey,
-    });
-};
 export const fetchBebopSolanaQuote = async ({ buyAsset, sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, takerAddress, receiverAddress, slippageTolerancePercentageDecimal, affiliateBps, apiKey, }) => {
     try {
+        // 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 === solAssetId) {
+            return Err(makeSwapErrorRight({
+                message: 'Bebop Solana cannot sell native SOL',
+                code: TradeQuoteError.NoRouteFound,
+            }));
+        }
         const sellToken = assetIdToBebopSolanaToken(sellAsset.assetId);
         const buyToken = assetIdToBebopSolanaToken(buyAsset.assetId);
         const sellAmountFormatted = bn(sellAmountIncludingProtocolFeesCryptoBaseUnit).toFixed(0);
-        const slippagePercentage = bn(slippageTolerancePercentageDecimal ?? 0.003)
-            .times(100)
-            .toNumber();
-        const url = 'https://api.bebop.xyz/pmm/solana/v3/quote';
+        const slippagePercentage = bn(slippageTolerancePercentageDecimal).times(100).toNumber();
         const params = new URLSearchParams({
             sell_tokens: sellToken,
             buy_tokens: buyToken,
@@ -110,8 +106,7 @@ export const fetchBebopSolanaQuote = async ({ buyAsset, sellAsset, sellAmountInc
         if (affiliateBps && affiliateBps !== '0') {
             params.set('fee', affiliateBps);
         }
-        const bebopService = bebopServiceFactory({ apiKey });
-        const maybeResponse = await bebopService.get(`${url}?${params}`);
+        const maybeResponse = await bebopServiceFactory({ apiKey }).get('https://api.bebop.xyz/pmm/solana/v3/quote', { params });
         if (maybeResponse.isErr()) {
             const err = maybeResponse.unwrapErr();
             return Err(makeSwapErrorRight({
@@ -133,19 +128,6 @@ export const fetchBebopSolanaQuote = async ({ buyAsset, sellAsset, sellAmountInc
                 code: 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 Err(makeSwapErrorRight({
-                message: `Bebop Solana quote contains AMM routing (${response.data.makers.join(', ')}), which produces malformed txs`,
-                code: TradeQuoteError.NoRouteFound,
-            }));
-        }
         return Ok(response.data);
     }
     catch (error) {
@@ -156,16 +138,3 @@ export const fetchBebopSolanaQuote = async ({ buyAsset, sellAsset, sellAmountInc
         }));
     }
 };
-export const fetchBebopSolanaPrice = ({ buyAsset, sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, receiveAddress, affiliateBps, apiKey, }) => {
-    const address = receiveAddress || BEBOP_SOLANA_DUMMY_ADDRESS;
-    return fetchBebopSolanaQuote({
-        buyAsset,
-        sellAsset,
-        sellAmountIncludingProtocolFeesCryptoBaseUnit,
-        takerAddress: address,
-        receiverAddress: address,
-        slippageTolerancePercentageDecimal: '0.01',
-        affiliateBps,
-        apiKey,
-    });
-};

package/dist/esm/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.js';
+import type { BebopSolanaQuoteResponse } from '../types.js';
+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/esm/swappers/BebopSwapper/utils/getBebopSolanaTradeContext.js

@@ -0,0 +1,63 @@
+import { Err, Ok } from '@sniptt/monads';
+import { v4 as uuid } from 'uuid';
+import { getDefaultSlippageDecimalPercentageForSwapper } from '../../../constants.js';
+import { SwapperName, TradeQuoteError } from '../../../types.js';
+import { makeSwapErrorRight } from '../../../utils/index.js';
+import { fetchBebopSolanaQuote } from './fetchFromBebop.js';
+import { assertValidTrade, calculateRate } from './helpers.js';
+export const getBebopSolanaTradeContext = async ({ input, deps, takerAddress, receiverAddress, }) => {
+    const { sellAsset, buyAsset, affiliateBps, sellAmountIncludingProtocolFeesCryptoBaseUnit } = input;
+    const assertion = assertValidTrade({ buyAsset, sellAsset });
+    if (assertion.isErr())
+        return Err(assertion.unwrapErr());
+    const slippageTolerancePercentageDecimal = input.slippageTolerancePercentageDecimal ??
+        getDefaultSlippageDecimalPercentageForSwapper(SwapperName.Bebop);
+    const maybeBebopQuoteResponse = await fetchBebopSolanaQuote({
+        buyAsset,
+        sellAsset,
+        sellAmountIncludingProtocolFeesCryptoBaseUnit,
+        takerAddress,
+        receiverAddress,
+        slippageTolerancePercentageDecimal,
+        affiliateBps,
+        apiKey: deps.config.VITE_BEBOP_API_KEY,
+    });
+    if (maybeBebopQuoteResponse.isErr())
+        return 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 Err(makeSwapErrorRight({
+            message: 'Invalid token addresses in response',
+            code: TradeQuoteError.InvalidResponse,
+        }));
+    }
+    const sellAmount = response.sellTokens[sellTokenAddress].amount;
+    const buyAmount = response.buyTokens[buyTokenAddress].amount;
+    const rate = calculateRate({ buyAmount, sellAmount, buyAsset, sellAsset });
+    const buyTokenData = response.buyTokens[buyTokenAddress];
+    const buyAmountBeforeFeesCryptoBaseUnit = buyTokenData.amountBeforeFee || buyAmount;
+    const buyAmountAfterFeesCryptoBaseUnit = buyAmount;
+    return Ok({
+        tradeCommon: {
+            id: uuid(),
+            rate,
+            swapperName: SwapperName.Bebop,
+            affiliateBps,
+            slippageTolerancePercentageDecimal,
+        },
+        stepCommon: {
+            allowanceContract: '',
+            rate,
+            buyAmountBeforeFeesCryptoBaseUnit,
+            buyAmountAfterFeesCryptoBaseUnit,
+            sellAmountIncludingProtocolFeesCryptoBaseUnit,
+            buyAsset,
+            sellAsset,
+            source: SwapperName.Bebop,
+            estimatedExecutionTimeMs: 0,
+        },
+        response,
+    });
+};

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

@@ -0,0 +1,24 @@
+import type { Result } from '@sniptt/monads';
+import type { StepDataArgs, SwapErrorRight, TxBuildData } from '../../../types.js';
+import type { BebopQuoteResponse } from '../types.js';
+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 {};

package/dist/esm/swappers/BebopSwapper/utils/getBebopStepData.js

@@ -0,0 +1,53 @@
+import { fromChainId } from '@shapeshiftoss/caip';
+import { bnOrZero } from '@shapeshiftoss/utils';
+import { Err, Ok } from '@sniptt/monads';
+import { fromHex } from 'viem';
+import { makeNetworkFeeEstimationFailedErr } from '../../../utils/index.js';
+import { getEvmNetworkFeeCryptoBaseUnit } from '../../../utils/evm/index.js';
+export async function getBebopStepData(args) {
+    const { tx, spenderAddress, sellAsset, type, input, from, deps } = args;
+    const adapter = deps.assertGetEvmChainAdapter(sellAsset.chainId);
+    const supportsEIP1559 = 'supportsEIP1559' in input ? input.supportsEIP1559 : false;
+    if (type === 'rate') {
+        const networkFeeCryptoBaseUnit = await (async () => {
+            try {
+                return await getEvmNetworkFeeCryptoBaseUnit({
+                    adapter,
+                    supportsEIP1559,
+                    gasLimit: bnOrZero(tx.gas).toString(),
+                });
+            }
+            catch {
+                return bnOrZero(tx.gas).times(bnOrZero(tx.gasPrice)).toFixed(0);
+            }
+        })();
+        const stepData = { networkFeeCryptoBaseUnit };
+        return Ok(stepData);
+    }
+    const transactionData = {
+        type: 'evm',
+        chainId: Number(fromChainId(sellAsset.chainId).chainReference),
+        to: tx.to,
+        data: tx.data,
+        value: fromHex(tx.value, 'bigint').toString(),
+        gasLimit: tx.gas?.toString(),
+    };
+    try {
+        const networkFeeCryptoBaseUnit = await getEvmNetworkFeeCryptoBaseUnit({
+            adapter,
+            transactionData,
+            from,
+            supportsEIP1559,
+            stateOverride: {
+                sellAsset,
+                sellAmountCryptoBaseUnit: input.sellAmountIncludingProtocolFeesCryptoBaseUnit,
+                spenderAddress,
+            },
+        });
+        const stepData = { transactionData, networkFeeCryptoBaseUnit };
+        return Ok(stepData);
+    }
+    catch (error) {
+        return Err(makeNetworkFeeEstimationFailedErr('getBebopStepData', error));
+    }
+}

package/dist/esm/swappers/BebopSwapper/utils/getBebopTradeContext.d.ts

@@ -0,0 +1,16 @@
+import type { Result } from '@sniptt/monads';
+import type { Address } from 'viem';
+import type { GetEvmTradeQuoteInput, GetEvmTradeRateInput, SwapErrorRight, SwapperDeps, TradeCommon, TradeStepCommon } from '../../../types.js';
+import type { GetBebopStepDataArgs } from './getBebopStepData.js';
+type BebopTradeContext = {
+    tradeCommon: TradeCommon;
+    stepCommon: Omit<TradeStepCommon, 'feeData'>;
+    stepDataArgs: Omit<GetBebopStepDataArgs, 'type' | 'input'>;
+};
+export declare const getBebopTradeContext: ({ input, deps, from, receiver, }: {
+    input: GetEvmTradeQuoteInput | GetEvmTradeRateInput;
+    deps: SwapperDeps;
+    from: Address;
+    receiver: Address;
+}) => Promise<Result<BebopTradeContext, SwapErrorRight>>;
+export {};

package/dist/esm/swappers/BebopSwapper/utils/getBebopTradeContext.js

@@ -0,0 +1,82 @@
+import { Err, Ok } from '@sniptt/monads';
+import { v4 as uuid } from 'uuid';
+import { isAddress } from 'viem';
+import { getDefaultSlippageDecimalPercentageForSwapper } from '../../../constants.js';
+import { SwapperName, TradeQuoteError } from '../../../types.js';
+import { makeSwapErrorRight } from '../../../utils/index.js';
+import { buildAffiliateFee } from '../../../utils/affiliateFee.js';
+import { isNativeEvmAsset } from '../../../utils/helpers.js';
+import { fetchBebopQuote } from './fetchFromBebop.js';
+import { assertValidTrade, calculateRate } from './helpers.js';
+export const getBebopTradeContext = async ({ input, deps, from, receiver, }) => {
+    const { sellAsset, buyAsset, affiliateBps, sellAmountIncludingProtocolFeesCryptoBaseUnit } = input;
+    const assertion = assertValidTrade({ buyAsset, sellAsset });
+    if (assertion.isErr())
+        return Err(assertion.unwrapErr());
+    const slippageTolerancePercentageDecimal = input.slippageTolerancePercentageDecimal ??
+        getDefaultSlippageDecimalPercentageForSwapper(SwapperName.Bebop);
+    const maybeBebopQuoteResponse = await fetchBebopQuote({
+        buyAsset,
+        sellAsset,
+        sellAmountIncludingProtocolFeesCryptoBaseUnit,
+        takerAddress: from,
+        receiverAddress: receiver,
+        slippageTolerancePercentageDecimal,
+        affiliateBps,
+        apiKey: deps.config.VITE_BEBOP_API_KEY,
+    });
+    if (maybeBebopQuoteResponse.isErr())
+        return Err(maybeBebopQuoteResponse.unwrapErr());
+    const quote = maybeBebopQuoteResponse.unwrap();
+    const sellTokenAddress = Object.keys(quote.sellTokens)[0];
+    const buyTokenAddress = Object.keys(quote.buyTokens)[0];
+    if (!isAddress(sellTokenAddress) || !isAddress(buyTokenAddress)) {
+        return Err(makeSwapErrorRight({
+            message: 'Invalid token addresses in response',
+            code: TradeQuoteError.InvalidResponse,
+        }));
+    }
+    const sellAmount = quote.sellTokens[sellTokenAddress].amount;
+    const buyAmount = quote.buyTokens[buyTokenAddress].amount;
+    const rate = calculateRate({ buyAmount, sellAmount, buyAsset, sellAsset });
+    const buyTokenData = quote.buyTokens[buyTokenAddress];
+    const buyAmountBeforeFeesCryptoBaseUnit = buyTokenData.amountBeforeFee || buyAmount;
+    const buyAmountAfterFeesCryptoBaseUnit = buyAmount;
+    const allowanceContract = isNativeEvmAsset(sellAsset.assetId) ? '' : quote.approvalTarget;
+    return Ok({
+        tradeCommon: {
+            id: uuid(),
+            rate,
+            swapperName: SwapperName.Bebop,
+            affiliateBps,
+            slippageTolerancePercentageDecimal,
+        },
+        stepCommon: {
+            allowanceContract,
+            rate,
+            buyAmountBeforeFeesCryptoBaseUnit,
+            buyAmountAfterFeesCryptoBaseUnit,
+            sellAmountIncludingProtocolFeesCryptoBaseUnit,
+            buyAsset,
+            sellAsset,
+            source: SwapperName.Bebop,
+            estimatedExecutionTimeMs: 0,
+            affiliateFee: buildAffiliateFee({
+                strategy: 'buy_asset',
+                affiliateBps,
+                sellAsset,
+                buyAsset,
+                sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+                buyAmountCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
+                isEstimate: true,
+            }),
+        },
+        stepDataArgs: {
+            tx: quote.tx,
+            spenderAddress: allowanceContract,
+            sellAsset,
+            from,
+            deps,
+        },
+    });
+};

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

@@ -1,13 +1,12 @@
 import type { AssetId, ChainId } from '@shapeshiftoss/caip';
 import type { Asset } from '@shapeshiftoss/types';
-export declare const isSolanaChainId: (chainId: ChainId) => boolean;
 export declare const assetIdToBebopToken: (assetId: AssetId) => string;
 export declare const assetIdToBebopSolanaToken: (assetId: AssetId) => string;
 export declare const isSupportedChainId: (chainId: ChainId) => chainId is import("@shapeshiftoss/types").KnownChainIds.EthereumMainnet | import("@shapeshiftoss/types").KnownChainIds.AvalancheMainnet | import("@shapeshiftoss/types").KnownChainIds.OptimismMainnet | import("@shapeshiftoss/types").KnownChainIds.BnbSmartChainMainnet | import("@shapeshiftoss/types").KnownChainIds.PolygonMainnet | import("@shapeshiftoss/types").KnownChainIds.ArbitrumMainnet | import("@shapeshiftoss/types").KnownChainIds.BaseMainnet | import("@shapeshiftoss/types").KnownChainIds.SolanaMainnet;
 export declare const assertValidTrade: ({ buyAsset, sellAsset, }: {
     buyAsset: Asset;
     sellAsset: Asset;
-}) => import("@sniptt/monads/build/result/result").ResErr<unknown, import("../../../../types.js").SwapErrorRight> | import("@sniptt/monads/build/result/result").ResOk<boolean, never>;
+}) => import("@sniptt/monads/build/result/result").ResOk<boolean, never> | import("@sniptt/monads/build/result/result").ResErr<unknown, import("../../../types.js").SwapErrorRight>;
 /**
  * Bebop's /order endpoint has a bug where it hardcodes the taker signature placement
  * at the last signer index. When the taker's pubkey bytes sort before the maker's,