@shapeshiftoss/swapper 17.8.0 → 18.1.0

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

@@ -1,10 +1,10 @@
 import bs58 from 'bs58';
 import { bebopServiceFactory } from './utils/bebopService.js';
 export 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/esm/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.js';
-export declare function getBebopSolanaTradeQuote(input: GetSolanaTradeQuoteInput, _assetsById: AssetsByIdPartial, apiKey: string): Promise<Result<TradeQuote, SwapErrorRight>>;
+import type { GetSolanaTradeQuoteInput, SwapErrorRight, SwapperDeps, TradeQuote } from '../../../types.js';
+export declare const getBebopSolanaTradeQuote: (input: GetSolanaTradeQuoteInput, deps: SwapperDeps) => Promise<Result<TradeQuote[], SwapErrorRight>>;

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

@@ -1,87 +1,43 @@
 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.js';
-import { fetchBebopSolanaQuote } from '../utils/fetchFromBebop.js';
-import { assertValidTrade, calculateRate, isBebopSolanaTxSafe } from '../utils/helpers/helpers.js';
-export async function getBebopSolanaTradeQuote(input, _assetsById, apiKey) {
-    const { sellAsset, buyAsset, accountNumber, sendAddress, receiveAddress, affiliateBps, sellAmountIncludingProtocolFeesCryptoBaseUnit, } = input;
-    const assertion = assertValidTrade({ buyAsset, sellAsset });
-    if (assertion.isErr())
-        return Err(assertion.unwrapErr());
-    const takerAddress = sendAddress || receiveAddress;
-    if (!takerAddress) {
-        return Err(makeSwapErrorRight({
-            message: 'Cannot execute quote without a wallet address',
-            code: TradeQuoteError.UnknownError,
-        }));
-    }
-    const slippageTolerancePercentageDecimal = input.slippageTolerancePercentageDecimal ??
-        getDefaultSlippageDecimalPercentageForSwapper(SwapperName.Bebop);
-    const maybeBebopQuoteResponse = await fetchBebopSolanaQuote({
-        buyAsset,
-        sellAsset,
-        sellAmountIncludingProtocolFeesCryptoBaseUnit,
-        takerAddress,
-        receiverAddress: receiveAddress ?? takerAddress,
-        slippageTolerancePercentageDecimal,
-        affiliateBps,
-        apiKey,
+import { TradeQuoteError } from '../../../types.js';
+import { assertQuoteAddresses, makeSwapErrorRight } from '../../../utils/index.js';
+import { getBebopSolanaTradeContext } from '../utils/getBebopSolanaTradeContext.js';
+import { isBebopSolanaTxSafe } from '../utils/helpers.js';
+export const getBebopSolanaTradeQuote = async (input, deps) => {
+    const { accountNumber } = input;
+    const maybeAddresses = assertQuoteAddresses(input);
+    if (maybeAddresses.isErr())
+        return Err(maybeAddresses.unwrapErr());
+    const { sendAddress, receiveAddress } = maybeAddresses.unwrap();
+    const maybeContext = await getBebopSolanaTradeContext({
+        input,
+        deps,
+        takerAddress: sendAddress,
+        receiverAddress: receiveAddress,
     });
-    if (maybeBebopQuoteResponse.isErr())
-        return 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 Err(makeSwapErrorRight({
-            message: 'Invalid token addresses in response',
-            code: TradeQuoteError.InvalidResponse,
-        }));
-    }
-    if (bebopQuoteResponse.solana_tx &&
-        !isBebopSolanaTxSafe(bebopQuoteResponse.solana_tx, takerAddress)) {
+    if (maybeContext.isErr())
+        return Err(maybeContext.unwrapErr());
+    const { tradeCommon, stepCommon, response } = maybeContext.unwrap();
+    if (!isBebopSolanaTxSafe(response.solana_tx, sendAddress)) {
         return Err(makeSwapErrorRight({
             message: 'Bebop signer index mismatch - taker not at expected position',
             code: TradeQuoteError.NoRouteFound,
         }));
     }
-    const sellAmount = bebopQuoteResponse.sellTokens[sellTokenAddress].amount;
-    const buyAmount = bebopQuoteResponse.buyTokens[buyTokenAddress].amount;
-    const rate = 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 Ok({
-        id: uuid(),
+    const tradeQuote = {
+        ...tradeCommon,
         quoteOrRate: 'quote',
-        receiveAddress: receiveAddress ?? takerAddress,
-        affiliateBps,
-        slippageTolerancePercentageDecimal,
-        rate,
-        swapperName: SwapperName.Bebop,
+        receiveAddress,
         steps: [
             {
-                estimatedExecutionTimeMs: 0,
-                allowanceContract: '0x0',
-                buyAsset,
-                sellAsset,
+                ...stepCommon,
                 accountNumber,
-                rate,
-                feeData: {
-                    protocolFees: {},
-                    networkFeeCryptoBaseUnit,
-                },
-                buyAmountBeforeFeesCryptoBaseUnit,
-                buyAmountAfterFeesCryptoBaseUnit,
-                sellAmountIncludingProtocolFeesCryptoBaseUnit,
-                source: 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 Ok([tradeQuote]);
+};

package/dist/esm/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.js';
-export declare function getBebopSolanaTradeRate(input: GetSolanaTradeRateInput, _assetsById: AssetsByIdPartial, apiKey: string): Promise<Result<TradeRate, SwapErrorRight>>;
+import type { GetSolanaTradeRateInput, SwapErrorRight, SwapperDeps, TradeRate } from '../../../types.js';
+export declare const getBebopSolanaTradeRate: (input: GetSolanaTradeRateInput, deps: SwapperDeps) => Promise<Result<TradeRate[], SwapErrorRight>>;

package/dist/esm/swappers/BebopSwapper/getBebopSolanaTradeRate/getBebopSolanaTradeRate.js

@@ -1,88 +1,31 @@
 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.js';
 import { BEBOP_SOLANA_DUMMY_ADDRESS } from '../types.js';
-import { fetchBebopSolanaQuote } from '../utils/fetchFromBebop.js';
-import { assertValidTrade, calculateRate, isBebopSolanaTxSafe } from '../utils/helpers/helpers.js';
-export async function getBebopSolanaTradeRate(input, _assetsById, apiKey) {
-    const { sellAsset, buyAsset, accountNumber, receiveAddress, affiliateBps, sellAmountIncludingProtocolFeesCryptoBaseUnit, } = input;
-    const assertion = assertValidTrade({ buyAsset, sellAsset });
-    if (assertion.isErr())
-        return Err(assertion.unwrapErr());
-    const slippageTolerancePercentageDecimal = input.slippageTolerancePercentageDecimal ??
-        getDefaultSlippageDecimalPercentageForSwapper(SwapperName.Bebop);
+import { getBebopSolanaTradeContext } from '../utils/getBebopSolanaTradeContext.js';
+export const getBebopSolanaTradeRate = async (input, deps) => {
+    const { accountNumber, receiveAddress } = input;
+    // Rates are display-only; price against the dummy taker walletless (the quote validates the real taker)
     const address = receiveAddress ?? BEBOP_SOLANA_DUMMY_ADDRESS;
-    const maybeBebopQuoteResponse = await fetchBebopSolanaQuote({
-        buyAsset,
-        sellAsset,
-        sellAmountIncludingProtocolFeesCryptoBaseUnit,
+    const maybeContext = await getBebopSolanaTradeContext({
+        input,
+        deps,
         takerAddress: address,
         receiverAddress: address,
-        slippageTolerancePercentageDecimal,
-        affiliateBps,
-        apiKey,
     });
-    if (maybeBebopQuoteResponse.isErr())
-        return Err(maybeBebopQuoteResponse.unwrapErr());
-    const bebopPriceResponse = maybeBebopQuoteResponse.unwrap();
-    const sellTokenAddress = Object.keys(bebopPriceResponse.sellTokens)[0];
-    const buyTokenAddress = Object.keys(bebopPriceResponse.buyTokens)[0];
-    if (!sellTokenAddress || !buyTokenAddress) {
-        return Err(makeSwapErrorRight({
-            message: 'Invalid token addresses in response',
-            code: TradeQuoteError.InvalidResponse,
-        }));
-    }
-    if (bebopPriceResponse.solana_tx) {
-        if (!receiveAddress) {
-            return Err(makeSwapErrorRight({
-                message: 'Cannot validate Bebop Solana tx without a taker address',
-                code: TradeQuoteError.NoRouteFound,
-            }));
-        }
-        if (!isBebopSolanaTxSafe(bebopPriceResponse.solana_tx, receiveAddress)) {
-            return Err(makeSwapErrorRight({
-                message: 'Bebop signer index mismatch - taker not at expected position',
-                code: TradeQuoteError.NoRouteFound,
-            }));
-        }
-    }
-    const sellAmount = bebopPriceResponse.sellTokens[sellTokenAddress].amount;
-    const buyAmount = bebopPriceResponse.buyTokens[buyTokenAddress].amount;
-    const rate = calculateRate({ buyAmount, sellAmount, buyAsset, sellAsset });
-    const buyTokenData = bebopPriceResponse.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 Ok({
-        id: uuid(),
+    if (maybeContext.isErr())
+        return Err(maybeContext.unwrapErr());
+    const { tradeCommon, stepCommon } = maybeContext.unwrap();
+    const tradeRate = {
+        ...tradeCommon,
         quoteOrRate: 'rate',
-        accountNumber: undefined,
         receiveAddress,
-        affiliateBps,
-        slippageTolerancePercentageDecimal,
-        rate,
-        swapperName: SwapperName.Bebop,
         steps: [
             {
-                estimatedExecutionTimeMs: 0,
-                allowanceContract: '0x0',
-                buyAsset,
-                sellAsset,
+                ...stepCommon,
                 accountNumber,
-                rate,
-                feeData: {
-                    protocolFees: {},
-                    networkFeeCryptoBaseUnit,
-                },
-                buyAmountBeforeFeesCryptoBaseUnit,
-                buyAmountAfterFeesCryptoBaseUnit,
-                sellAmountIncludingProtocolFeesCryptoBaseUnit,
-                source: SwapperName.Bebop,
+                // Bebop Solana is gasless - Bebop pays the network fees via co-signing
+                feeData: { protocolFees: {}, networkFeeCryptoBaseUnit: '0' },
             },
         ],
-    });
-}
+    };
+    return Ok([tradeRate]);
+};

package/dist/esm/swappers/BebopSwapper/getBebopTradeQuote/getBebopTradeQuote.d.ts

@@ -1,6 +1,3 @@
-import type { ChainId } from '@shapeshiftoss/caip';
-import type { EvmChainAdapter } from '@shapeshiftoss/chain-adapters';
-import type { AssetsByIdPartial } from '@shapeshiftoss/types';
 import type { Result } from '@sniptt/monads';
-import type { GetEvmTradeQuoteInputBase, SwapErrorRight, TradeQuote } from '../../../types.js';
-export declare function getBebopTradeQuote(input: GetEvmTradeQuoteInputBase, assertGetEvmChainAdapter: (chainId: ChainId) => EvmChainAdapter, _assetsById: AssetsByIdPartial, apiKey: string): Promise<Result<TradeQuote, SwapErrorRight>>;
+import type { GetEvmTradeQuoteInput, SwapErrorRight, SwapperDeps, TradeQuote } from '../../../types.js';
+export declare const getBebopTradeQuote: (input: GetEvmTradeQuoteInput, deps: SwapperDeps) => Promise<Result<TradeQuote[], SwapErrorRight>>;

package/dist/esm/swappers/BebopSwapper/getBebopTradeQuote/getBebopTradeQuote.js

@@ -1,115 +1,39 @@
-import { evm } from '@shapeshiftoss/chain-adapters';
-import { bnOrZero } from '@shapeshiftoss/utils';
 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.js';
-import { buildAffiliateFee } from '../../utils/affiliateFee.js';
-import { isNativeEvmAsset } from '../../utils/helpers/helpers.js';
-import { BEBOP_DUMMY_ADDRESS } from '../types.js';
-import { fetchBebopQuote } from '../utils/fetchFromBebop.js';
-import { assertValidTrade, calculateRate } from '../utils/helpers/helpers.js';
-export async function getBebopTradeQuote(input, assertGetEvmChainAdapter, _assetsById, apiKey) {
-    const { sellAsset, buyAsset, accountNumber, sendAddress, receiveAddress, affiliateBps, chainId, supportsEIP1559, sellAmountIncludingProtocolFeesCryptoBaseUnit, } = input;
-    const assertion = assertValidTrade({ buyAsset, sellAsset });
-    if (assertion.isErr())
-        return Err(assertion.unwrapErr());
-    const takerAddress = (sendAddress || receiveAddress);
-    if (takerAddress === BEBOP_DUMMY_ADDRESS) {
-        return Err(makeSwapErrorRight({
-            message: 'Cannot execute quote with dummy address - wallet required',
-            code: TradeQuoteError.UnknownError,
-        }));
-    }
-    const slippageTolerancePercentageDecimal = input.slippageTolerancePercentageDecimal ??
-        getDefaultSlippageDecimalPercentageForSwapper(SwapperName.Bebop);
-    const maybeBebopQuoteResponse = await fetchBebopQuote({
-        buyAsset,
-        sellAsset,
-        sellAmountIncludingProtocolFeesCryptoBaseUnit,
-        takerAddress,
-        receiverAddress: receiveAddress,
-        slippageTolerancePercentageDecimal,
-        affiliateBps,
-        apiKey,
+import { getAddress } from 'viem';
+import { assertQuoteAddresses } from '../../../utils/index.js';
+import { getBebopStepData } from '../utils/getBebopStepData.js';
+import { getBebopTradeContext } from '../utils/getBebopTradeContext.js';
+export const getBebopTradeQuote = async (input, deps) => {
+    const { accountNumber } = input;
+    const maybeAddresses = assertQuoteAddresses(input);
+    if (maybeAddresses.isErr())
+        return Err(maybeAddresses.unwrapErr());
+    const { sendAddress, receiveAddress } = maybeAddresses.unwrap();
+    const maybeContext = await getBebopTradeContext({
+        input,
+        deps,
+        from: getAddress(sendAddress),
+        receiver: getAddress(receiveAddress),
     });
-    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 transactionMetadata = {
-        to: quote.tx.to,
-        data: quote.tx.data,
-        value: quote.tx.value,
-        gas: quote.tx.gas?.toString(),
+    if (maybeContext.isErr())
+        return Err(maybeContext.unwrapErr());
+    const { tradeCommon, stepCommon, stepDataArgs } = maybeContext.unwrap();
+    const maybeStepData = await getBebopStepData({ ...stepDataArgs, type: 'quote', input });
+    if (maybeStepData.isErr())
+        return Err(maybeStepData.unwrapErr());
+    const { transactionData, networkFeeCryptoBaseUnit } = maybeStepData.unwrap();
+    const tradeQuote = {
+        ...tradeCommon,
+        quoteOrRate: 'quote',
+        receiveAddress,
+        steps: [
+            {
+                ...stepCommon,
+                accountNumber,
+                transactionData,
+                feeData: { protocolFees: {}, networkFeeCryptoBaseUnit },
+            },
+        ],
     };
-    const rate = calculateRate({ buyAmount, sellAmount, buyAsset, sellAsset });
-    const buyTokenData = quote.buyTokens[buyTokenAddress];
-    const buyAmountBeforeFeesCryptoBaseUnit = buyTokenData.amountBeforeFee || buyAmount;
-    const buyAmountAfterFeesCryptoBaseUnit = buyAmount;
-    try {
-        const adapter = assertGetEvmChainAdapter(chainId);
-        const { fast } = await adapter.getGasFeeData();
-        const gasLimitFromQuote = bnOrZero(quote.tx.gas).toString();
-        const networkFeeCryptoBaseUnit = evm.calcNetworkFeeCryptoBaseUnit({
-            ...fast,
-            supportsEIP1559: Boolean(supportsEIP1559),
-            gasLimit: gasLimitFromQuote,
-        });
-        return Ok({
-            id: uuid(),
-            quoteOrRate: 'quote',
-            receiveAddress,
-            affiliateBps,
-            slippageTolerancePercentageDecimal,
-            rate,
-            swapperName: SwapperName.Bebop,
-            steps: [
-                {
-                    estimatedExecutionTimeMs: 0,
-                    allowanceContract: isNativeEvmAsset(sellAsset.assetId) ? undefined : quote.approvalTarget,
-                    buyAsset,
-                    sellAsset,
-                    accountNumber,
-                    rate,
-                    feeData: {
-                        protocolFees: {},
-                        networkFeeCryptoBaseUnit,
-                    },
-                    buyAmountBeforeFeesCryptoBaseUnit,
-                    buyAmountAfterFeesCryptoBaseUnit,
-                    sellAmountIncludingProtocolFeesCryptoBaseUnit,
-                    source: SwapperName.Bebop,
-                    bebopTransactionMetadata: transactionMetadata,
-                    affiliateFee: buildAffiliateFee({
-                        strategy: 'buy_asset',
-                        affiliateBps,
-                        sellAsset,
-                        buyAsset,
-                        sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
-                        buyAmountCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
-                        isEstimate: true,
-                    }),
-                },
-            ],
-        });
-    }
-    catch (err) {
-        return Err(makeSwapErrorRight({
-            message: 'Failed to get fee data',
-            cause: err,
-            code: TradeQuoteError.NetworkFeeEstimationFailed,
-        }));
-    }
-}
+    return Ok([tradeQuote]);
+};

package/dist/esm/swappers/BebopSwapper/getBebopTradeRate/getBebopTradeRate.d.ts

@@ -1,6 +1,3 @@
-import type { ChainId } from '@shapeshiftoss/caip';
-import type { EvmChainAdapter } from '@shapeshiftoss/chain-adapters';
-import type { AssetsByIdPartial } from '@shapeshiftoss/types';
 import type { Result } from '@sniptt/monads';
-import type { GetEvmTradeRateInput, SwapErrorRight, TradeRate } from '../../../types.js';
-export declare function getBebopTradeRate(input: GetEvmTradeRateInput, assertGetEvmChainAdapter: (chainId: ChainId) => EvmChainAdapter, _assetsById: AssetsByIdPartial, apiKey: string): Promise<Result<TradeRate, SwapErrorRight>>;
+import type { GetEvmTradeRateInput, SwapErrorRight, SwapperDeps, TradeRate } from '../../../types.js';
+export declare const getBebopTradeRate: (input: GetEvmTradeRateInput, deps: SwapperDeps) => Promise<Result<TradeRate[], SwapErrorRight>>;

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

@@ -1,94 +1,35 @@
-import { evm } from '@shapeshiftoss/chain-adapters';
-import { bnOrZero } from '@shapeshiftoss/utils';
 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.js';
-import { buildAffiliateFee } from '../../utils/affiliateFee.js';
-import { isNativeEvmAsset } from '../../utils/helpers/helpers.js';
+import { getAddress } from 'viem';
 import { BEBOP_DUMMY_ADDRESS } from '../types.js';
-import { fetchBebopQuote } from '../utils/fetchFromBebop.js';
-import { assertValidTrade, calculateRate } from '../utils/helpers/helpers.js';
-export async function getBebopTradeRate(input, assertGetEvmChainAdapter, _assetsById, apiKey) {
-    const { sellAsset, buyAsset, accountNumber, receiveAddress, affiliateBps, sellAmountIncludingProtocolFeesCryptoBaseUnit, } = input;
-    const assertion = assertValidTrade({ buyAsset, sellAsset });
-    if (assertion.isErr())
-        return Err(assertion.unwrapErr());
-    const slippageTolerancePercentageDecimal = input.slippageTolerancePercentageDecimal ??
-        getDefaultSlippageDecimalPercentageForSwapper(SwapperName.Bebop);
-    const address = receiveAddress ?? BEBOP_DUMMY_ADDRESS;
-    const maybeBebopQuoteResponse = await fetchBebopQuote({
-        buyAsset,
-        sellAsset,
-        sellAmountIncludingProtocolFeesCryptoBaseUnit,
-        takerAddress: address,
-        receiverAddress: address,
-        slippageTolerancePercentageDecimal,
-        affiliateBps,
-        apiKey,
+import { getBebopStepData } from '../utils/getBebopStepData.js';
+import { getBebopTradeContext } from '../utils/getBebopTradeContext.js';
+export const getBebopTradeRate = async (input, deps) => {
+    const { accountNumber, receiveAddress } = input;
+    const address = getAddress(receiveAddress ?? BEBOP_DUMMY_ADDRESS);
+    const maybeContext = await getBebopTradeContext({
+        input,
+        deps,
+        from: address,
+        receiver: address,
     });
-    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 adapter = assertGetEvmChainAdapter(sellAsset.chainId);
-    const { fast } = await adapter.getGasFeeData();
-    const gasLimit = bnOrZero(quote.tx.gas).toString();
-    const networkFeeCryptoBaseUnit = evm.calcNetworkFeeCryptoBaseUnit({
-        ...fast,
-        supportsEIP1559: Boolean(input.supportsEIP1559),
-        gasLimit,
-    });
-    return Ok({
-        id: uuid(),
+    if (maybeContext.isErr())
+        return Err(maybeContext.unwrapErr());
+    const { tradeCommon, stepCommon, stepDataArgs } = maybeContext.unwrap();
+    const maybeStepData = await getBebopStepData({ ...stepDataArgs, type: 'rate', input });
+    if (maybeStepData.isErr())
+        return Err(maybeStepData.unwrapErr());
+    const { networkFeeCryptoBaseUnit } = maybeStepData.unwrap();
+    const tradeRate = {
+        ...tradeCommon,
         quoteOrRate: 'rate',
-        accountNumber: undefined,
         receiveAddress,
-        affiliateBps,
-        slippageTolerancePercentageDecimal,
-        rate,
-        swapperName: SwapperName.Bebop,
         steps: [
             {
-                estimatedExecutionTimeMs: 0,
-                allowanceContract: isNativeEvmAsset(sellAsset.assetId) ? undefined : quote.approvalTarget,
-                buyAsset,
-                sellAsset,
+                ...stepCommon,
                 accountNumber,
-                rate,
-                feeData: {
-                    protocolFees: {},
-                    networkFeeCryptoBaseUnit,
-                },
-                buyAmountBeforeFeesCryptoBaseUnit,
-                buyAmountAfterFeesCryptoBaseUnit,
-                sellAmountIncludingProtocolFeesCryptoBaseUnit,
-                source: SwapperName.Bebop,
-                affiliateFee: buildAffiliateFee({
-                    strategy: 'buy_asset',
-                    affiliateBps,
-                    sellAsset,
-                    buyAsset,
-                    sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
-                    buyAmountCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
-                    isEstimate: true,
-                }),
+                feeData: { protocolFees: {}, networkFeeCryptoBaseUnit },
             },
         ],
-    });
-}
+    };
+    return Ok([tradeRate]);
+};

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

@@ -1,8 +1,15 @@
 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 BebopMetadata = {
+    name: 'bebop';
+    quoteId: string;
+};
 export type BebopQuoteResponse = {
     requestId: string;
     type: string;

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.js

@@ -3,11 +3,11 @@ 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 { getTreasuryAddressFromChainId } from '../../utils/helpers/helpers.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);

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 {};