@shapeshiftoss/swapper 17.8.0 → 18.1.0

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

@@ -1,98 +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 types_2 = require("../types");
-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 address = receiveAddress ?? types_2.BEBOP_DUMMY_ADDRESS;
-    const maybeBebopQuoteResponse = await (0, fetchFromBebop_1.fetchBebopQuote)({
-        buyAsset,
-        sellAsset,
-        sellAmountIncludingProtocolFeesCryptoBaseUnit,
-        takerAddress: address,
-        receiverAddress: address,
-        slippageTolerancePercentageDecimal,
-        affiliateBps,
-        apiKey,
+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,
     });
-    if (maybeBebopQuoteResponse.isErr())
-        return (0, monads_1.Err)(maybeBebopQuoteResponse.unwrapErr());
-    const quote = maybeBebopQuoteResponse.unwrap();
-    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,
-    });
-    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,8 +1,15 @@
 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 BebopMetadata = {
+    name: 'bebop';
+    quoteId: string;
+};
 export type BebopQuoteResponse = {
     requestId: string;
     type: string;

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

@@ -7,10 +7,10 @@ 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/helpers");
+const helpers_1 = require("../../../utils/helpers");
 const types_2 = require("../types");
 const bebopService_1 = require("./bebopService");
-const helpers_2 = require("./helpers/helpers");
+const helpers_2 = require("./helpers");
 const fetchBebopQuote = async ({ buyAsset, sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, takerAddress, receiverAddress, slippageTolerancePercentageDecimal, affiliateBps, apiKey, }) => {
     try {
         const sellToken = (0, helpers_2.assetIdToBebopToken)(sellAsset.assetId);

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

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

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getBebopStepData = 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 utils_2 = require("../../../utils");
+const evm_1 = require("../../../utils/evm");
+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 (0, evm_1.getEvmNetworkFeeCryptoBaseUnit)({
+                    adapter,
+                    supportsEIP1559,
+                    gasLimit: (0, utils_1.bnOrZero)(tx.gas).toString(),
+                });
+            }
+            catch {
+                return (0, utils_1.bnOrZero)(tx.gas).times((0, utils_1.bnOrZero)(tx.gasPrice)).toFixed(0);
+            }
+        })();
+        const stepData = { networkFeeCryptoBaseUnit };
+        return (0, monads_1.Ok)(stepData);
+    }
+    const transactionData = {
+        type: 'evm',
+        chainId: Number((0, caip_1.fromChainId)(sellAsset.chainId).chainReference),
+        to: tx.to,
+        data: tx.data,
+        value: (0, viem_1.fromHex)(tx.value, 'bigint').toString(),
+        gasLimit: tx.gas?.toString(),
+    };
+    try {
+        const networkFeeCryptoBaseUnit = await (0, evm_1.getEvmNetworkFeeCryptoBaseUnit)({
+            adapter,
+            transactionData,
+            from,
+            supportsEIP1559,
+            stateOverride: {
+                sellAsset,
+                sellAmountCryptoBaseUnit: input.sellAmountIncludingProtocolFeesCryptoBaseUnit,
+                spenderAddress,
+            },
+        });
+        const stepData = { transactionData, networkFeeCryptoBaseUnit };
+        return (0, monads_1.Ok)(stepData);
+    }
+    catch (error) {
+        return (0, monads_1.Err)((0, utils_2.makeNetworkFeeEstimationFailedErr)('getBebopStepData', error));
+    }
+}
+exports.getBebopStepData = getBebopStepData;

package/dist/cjs/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';
+import type { GetBebopStepDataArgs } from './getBebopStepData';
+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/cjs/swappers/BebopSwapper/utils/getBebopTradeContext.js

@@ -0,0 +1,86 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getBebopTradeContext = void 0;
+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_1 = require("../../../utils");
+const affiliateFee_1 = require("../../../utils/affiliateFee");
+const helpers_1 = require("../../../utils/helpers");
+const fetchFromBebop_1 = require("./fetchFromBebop");
+const helpers_2 = require("./helpers");
+const getBebopTradeContext = async ({ input, deps, from, receiver, }) => {
+    const { sellAsset, buyAsset, 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 maybeBebopQuoteResponse = await (0, fetchFromBebop_1.fetchBebopQuote)({
+        buyAsset,
+        sellAsset,
+        sellAmountIncludingProtocolFeesCryptoBaseUnit,
+        takerAddress: from,
+        receiverAddress: receiver,
+        slippageTolerancePercentageDecimal,
+        affiliateBps,
+        apiKey: deps.config.VITE_BEBOP_API_KEY,
+    });
+    if (maybeBebopQuoteResponse.isErr())
+        return (0, monads_1.Err)(maybeBebopQuoteResponse.unwrapErr());
+    const quote = maybeBebopQuoteResponse.unwrap();
+    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_1.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 allowanceContract = (0, helpers_1.isNativeEvmAsset)(sellAsset.assetId) ? '' : quote.approvalTarget;
+    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,
+            affiliateFee: (0, affiliateFee_1.buildAffiliateFee)({
+                strategy: 'buy_asset',
+                affiliateBps,
+                sellAsset,
+                buyAsset,
+                sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+                buyAmountCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
+                isEstimate: true,
+            }),
+        },
+        stepDataArgs: {
+            tx: quote.tx,
+            spenderAddress: allowanceContract,
+            sellAsset,
+            from,
+            deps,
+        },
+    });
+};
+exports.getBebopTradeContext = getBebopTradeContext;

package/dist/cjs/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").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").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,

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

@@ -1,18 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateRate = exports.isBebopSolanaTxSafe = exports.assertValidTrade = exports.isSupportedChainId = exports.assetIdToBebopSolanaToken = exports.assetIdToBebopToken = exports.isSolanaChainId = void 0;
+exports.calculateRate = exports.isBebopSolanaTxSafe = exports.assertValidTrade = exports.isSupportedChainId = exports.assetIdToBebopSolanaToken = exports.assetIdToBebopToken = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const utils_1 = require("@shapeshiftoss/utils");
 const monads_1 = require("@sniptt/monads");
 const web3_js_1 = require("@solana/web3.js");
 const viem_1 = require("viem");
-const types_1 = require("../../../../types");
-const utils_2 = require("../../../../utils");
-const types_2 = require("../../types");
-const isSolanaChainId = (chainId) => {
-    return chainId === caip_1.solanaChainId;
-};
-exports.isSolanaChainId = isSolanaChainId;
+const types_1 = require("../../../types");
+const utils_2 = require("../../../utils");
+const types_2 = require("../types");
 const assetIdToBebopToken = (assetId) => {
     if (!(0, utils_1.isToken)(assetId))
         return types_2.BEBOP_NATIVE_MARKER;

package/dist/cjs/swappers/BobGatewaySwapper/BobGatewaySwapper.js

@@ -5,4 +5,5 @@ const utils_1 = require("../../utils");
 exports.bobGatewaySwapper = {
     executeEvmTransaction: utils_1.executeEvmTransaction,
     executeUtxoTransaction: (txToSign, { signAndBroadcastTransaction }) => signAndBroadcastTransaction(txToSign),
+    executeTronTransaction: utils_1.executeTronTransaction,
 };

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

@@ -2,104 +2,45 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bobGatewayApi = void 0;
 const bob_sdk_1 = require("@gobob/bob-sdk");
-const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
 const unchained_client_1 = require("@shapeshiftoss/unchained-client");
-const utils_1 = require("@shapeshiftoss/utils");
-const utils_2 = require("../../utils");
+const utils_1 = require("../../utils");
+const evm_1 = require("../../utils/evm");
+const tron_1 = require("../../utils/tron");
+const utxo_1 = require("../../utils/utxo");
 const getTradeQuote_1 = require("./swapperApi/getTradeQuote");
 const getTradeRate_1 = require("./swapperApi/getTradeRate");
 const helpers_1 = require("./utils/helpers");
 const registeredSwapIds = new Set();
 exports.bobGatewayApi = {
-    getTradeRate: async (input, deps) => {
-        return (await (0, getTradeRate_1.getBobGatewayTradeRate)(input, deps)).map(tradeRate => [tradeRate]);
-    },
-    getTradeQuote: async (input, deps) => {
-        return (await (0, getTradeQuote_1.getBobGatewayTradeQuote)(input, deps)).map(tradeQuote => [tradeQuote]);
-    },
-    getUnsignedUtxoTransaction: ({ stepIndex, tradeQuote, xpub, accountType, assertGetUtxoChainAdapter, }) => {
-        if (!(0, utils_2.isExecutableTradeQuote)(tradeQuote)) {
+    getTradeRate: (input, deps) => (0, getTradeRate_1.getBobGatewayTradeRate)(input, deps),
+    getTradeQuote: (input, deps) => (0, getTradeQuote_1.getBobGatewayTradeQuote)(input, deps),
+    getUnsignedUtxoTransaction: utxo_1.getUnsignedUtxoTransaction,
+    getUtxoTransactionFees: utxo_1.getUtxoTransactionFees,
+    getUnsignedEvmTransaction: evm_1.getUnsignedEvmTransaction,
+    getEvmTransactionFees: evm_1.getEvmTransactionFees,
+    getUnsignedTronTransaction: ({ from, stepIndex, tradeQuote, assertGetTronChainAdapter }) => {
+        if (!(0, utils_1.isExecutableTradeQuote)(tradeQuote)) {
             throw new Error('[BobGateway] unable to execute a trade rate');
         }
-        const step = (0, utils_2.getExecutableTradeStep)(tradeQuote, stepIndex);
-        const { bobSpecific, sellAsset } = step;
-        const adapter = assertGetUtxoChainAdapter(sellAsset.chainId);
-        if (!bobSpecific?.utxoTx)
-            throw new Error('[BobGateway] invalid utxo transaction');
-        const { depositAddress, opReturnData } = bobSpecific.utxoTx;
-        return adapter.buildSendApiTransaction({
-            value: step.sellAmountIncludingProtocolFeesCryptoBaseUnit,
-            xpub,
-            to: depositAddress,
-            accountNumber: step.accountNumber,
-            skipToAddressValidation: true,
-            chainSpecific: {
-                accountType,
-                opReturnData,
-                satoshiPerByte: step.feeData.chainSpecific.satsPerByte,
-            },
-        });
-    },
-    getUtxoTransactionFees: async ({ stepIndex, tradeQuote, xpub, assertGetUtxoChainAdapter }) => {
-        if (!(0, utils_2.isExecutableTradeQuote)(tradeQuote)) {
-            throw new Error('[BobGateway] unable to execute a trade rate');
-        }
-        const step = (0, utils_2.getExecutableTradeStep)(tradeQuote, stepIndex);
-        const { bobSpecific, sellAsset } = step;
-        const adapter = assertGetUtxoChainAdapter(sellAsset.chainId);
-        if (!bobSpecific?.utxoTx)
-            throw new Error('[BobGateway] invalid utxo transaction');
-        const { depositAddress, opReturnData } = bobSpecific.utxoTx;
-        const { fast } = await adapter.getFeeData({
-            to: depositAddress,
-            value: step.sellAmountIncludingProtocolFeesCryptoBaseUnit,
-            chainSpecific: { pubkey: xpub, opReturnData },
-            sendMax: false,
-        });
-        return fast.txFee;
-    },
-    getUnsignedEvmTransaction: async ({ from, stepIndex, tradeQuote, assertGetEvmChainAdapter, supportsEIP1559, }) => {
-        if (!(0, utils_2.isExecutableTradeQuote)(tradeQuote)) {
-            throw new Error('[BobGateway] unable to execute a trade rate');
-        }
-        const step = (0, utils_2.getExecutableTradeStep)(tradeQuote, stepIndex);
-        const { accountNumber, bobSpecific, sellAsset } = step;
-        const adapter = assertGetEvmChainAdapter(sellAsset.chainId);
-        if (!bobSpecific?.evmTx)
-            throw new Error('[BobGateway] invalid evm transaction');
-        const { to, data, value } = bobSpecific.evmTx;
-        const feeData = await chain_adapters_1.evm.getFees({ adapter, data, to, value, from, supportsEIP1559 });
-        // Pad the gas limit of the tx we actually broadcast to reduce the risk of out-of-gas reverts.
-        const gasLimit = (0, utils_1.bnOrZero)(feeData.gasLimit).times(1.2).toFixed(0);
+        const step = (0, utils_1.getExecutableTradeStep)(tradeQuote, stepIndex);
+        const { accountNumber, sellAsset, transactionData } = step;
+        if (transactionData?.type !== 'tron')
+            throw new Error('[BobGateway] invalid tron transaction');
+        const adapter = assertGetTronChainAdapter(sellAsset.chainId);
+        const { to, data, value } = transactionData;
         return adapter.buildCustomApiTx({
             accountNumber,
             from,
-            to,
+            to: (0, helpers_1.toTronBase58)(to),
             value,
             data,
-            ...feeData,
-            gasLimit,
         });
     },
-    getEvmTransactionFees: async ({ from, stepIndex, tradeQuote, supportsEIP1559, assertGetEvmChainAdapter, }) => {
-        if (!(0, utils_2.isExecutableTradeQuote)(tradeQuote)) {
-            throw new Error('[BobGateway] unable to execute a trade rate');
-        }
-        const step = (0, utils_2.getExecutableTradeStep)(tradeQuote, stepIndex);
-        const { bobSpecific, sellAsset } = step;
-        const adapter = assertGetEvmChainAdapter(sellAsset.chainId);
-        if (!bobSpecific?.evmTx)
-            throw new Error('[BobGateway] invalid evm transaction');
-        const { to, data, value } = bobSpecific.evmTx;
-        const feeData = await chain_adapters_1.evm.getFees({ adapter, data, to, value, from, supportsEIP1559 });
-        return feeData.networkFeeCryptoBaseUnit;
-    },
+    getTronTransactionFees: tron_1.getTronTransactionFees,
     checkTradeStatus: async ({ swap, config, txHash }) => {
         if (!swap)
             throw new Error('[BobGateway] swap is required for status check');
-        const orderId = swap.metadata.bobSpecific?.orderId;
-        if (!orderId)
-            throw new Error('[BobGateway] orderId is required for status check');
+        const { orderId } = (0, utils_1.getSwapMetadata)(swap.metadata.swapperMetadata, 'bob');
         if (txHash && !registeredSwapIds.has(swap.id)) {
             try {
                 await (0, helpers_1.registerBobGatewayTx)({

package/dist/cjs/swappers/BobGatewaySwapper/swapperApi/getTradeQuote.d.ts

@@ -1,3 +1,4 @@
 import type { Result } from '@sniptt/monads';
-import type { CommonTradeQuoteInput, SwapErrorRight, SwapperDeps, TradeQuote } from '../../../types';
-export declare const getBobGatewayTradeQuote: (input: CommonTradeQuoteInput, deps: SwapperDeps) => Promise<Result<TradeQuote, SwapErrorRight>>;
+import type { SwapErrorRight, SwapperDeps, TradeQuote } from '../../../types';
+import type { BobGatewayTradeQuoteInput } from '../types';
+export declare const getBobGatewayTradeQuote: (input: BobGatewayTradeQuoteInput, deps: SwapperDeps) => Promise<Result<TradeQuote[], SwapErrorRight>>;