@shapeshiftoss/swapper 20.1.0 → 20.2.0

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

@@ -13,13 +13,12 @@ export declare const fetchBebopQuote: ({ buyAsset, sellAsset, sellAmountIncludin
     affiliateBps?: string | undefined;
     apiKey: string;
 }) => Promise<Result<BebopQuoteResponse, SwapErrorRight>>;
-export declare const fetchBebopSolanaQuote: ({ buyAsset, sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, takerAddress, receiverAddress, slippageTolerancePercentageDecimal, affiliateBps, apiKey, }: {
+export declare const fetchBebopSolanaQuote: ({ buyAsset, sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, takerAddress, receiverAddress, slippageTolerancePercentageDecimal, apiKey, }: {
     buyAsset: Asset;
     sellAsset: Asset;
     sellAmountIncludingProtocolFeesCryptoBaseUnit: string;
     takerAddress: string;
     receiverAddress: string;
     slippageTolerancePercentageDecimal: string;
-    affiliateBps?: string | undefined;
     apiKey: string;
 }) => Promise<Result<BebopSolanaQuoteResponse, SwapErrorRight>>;

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

@@ -30,16 +30,15 @@ const fetchBebopQuote = async ({ buyAsset, sellAsset, sellAmountIncludingProtoco
             approval_type: 'Standard',
             skip_validation: 'true',
             gasless: 'false',
+            // PMM fees are configured against our api key on Bebop's side, not sent per quote
             source: 'shapeshift',
         };
         const jamParams = new URLSearchParams(baseParams);
         const pmmParams = new URLSearchParams(baseParams);
+        // JAM settles the fee on-chain, so it still takes our bps and a recipient per quote
         if (affiliateBps && affiliateBps !== '0') {
-            // JAM collects the fee on-chain and requires a recipient
             jamParams.set('fee', affiliateBps);
             jamParams.set('fee_recipient', (0, viem_1.getAddress)((0, helpers_1.getTreasuryAddressFromChainId)(buyAsset.chainId)));
-            // PMM attributes the fee off-chain via source
-            pmmParams.set('fee', affiliateBps);
         }
         const service = (0, bebopService_1.bebopServiceFactory)({ apiKey });
         const [maybeJam, maybePmm] = await Promise.all([
@@ -81,7 +80,7 @@ const fetchBebopQuote = async ({ buyAsset, sellAsset, sellAmountIncludingProtoco
     }
 };
 exports.fetchBebopQuote = fetchBebopQuote;
-const fetchBebopSolanaQuote = async ({ buyAsset, sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, takerAddress, receiverAddress, slippageTolerancePercentageDecimal, affiliateBps, apiKey, }) => {
+const fetchBebopSolanaQuote = async ({ buyAsset, sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, takerAddress, receiverAddress, slippageTolerancePercentageDecimal, 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.
@@ -105,11 +104,9 @@ const fetchBebopSolanaQuote = async ({ buyAsset, sellAsset, sellAmountIncludingP
             approval_type: 'Standard',
             skip_validation: 'false',
             gasless: 'true',
+            // Solana is PMM only, so its fees are configured against our api key on Bebop's side
             source: 'shapeshift',
         });
-        if (affiliateBps && affiliateBps !== '0') {
-            params.set('fee', affiliateBps);
-        }
         const maybeResponse = await (0, bebopService_1.bebopServiceFactory)({ apiKey }).get('https://api.bebop.xyz/pmm/solana/v3/quote', { params });
         if (maybeResponse.isErr()) {
             const err = maybeResponse.unwrapErr();

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

@@ -22,7 +22,6 @@ const getBebopSolanaTradeContext = async ({ input, deps, takerAddress, receiverA
         takerAddress,
         receiverAddress,
         slippageTolerancePercentageDecimal,
-        affiliateBps,
         apiKey: deps.config.VITE_BEBOP_API_KEY,
     });
     if (maybeBebopQuoteResponse.isErr())

package/dist/cjs/swappers/ButterSwap/ButterSwap.js

@@ -6,7 +6,4 @@ exports.butterSwap = {
     executeEvmTransaction: utils_1.executeEvmTransaction,
     executeSolanaTransaction: utils_1.executeSolanaTransaction,
     executeTronTransaction: utils_1.executeTronTransaction,
-    executeUtxoTransaction: (txToSign, { signAndBroadcastTransaction }) => {
-        return signAndBroadcastTransaction(txToSign);
-    },
 };

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

@@ -5,7 +5,6 @@ const evm_1 = require("../../utils/evm");
 const getSolanaTransactionFees_1 = require("../../utils/solana/getSolanaTransactionFees");
 const getUnsignedSolanaTransaction_1 = require("../../utils/solana/getUnsignedSolanaTransaction");
 const tron_1 = require("../../utils/tron");
-const utxo_1 = require("../../utils/utxo");
 const checkTradeStatus_1 = require("./swapperApi/checkTradeStatus");
 const getTradeQuote_1 = require("./swapperApi/getTradeQuote");
 const getTradeRate_1 = require("./swapperApi/getTradeRate");
@@ -15,8 +14,6 @@ exports.butterSwapApi = {
     checkTradeStatus: checkTradeStatus_1.checkTradeStatus,
     getEvmTransactionFees: evm_1.getEvmTransactionFees,
     getUnsignedEvmTransaction: evm_1.getUnsignedEvmTransaction,
-    getUnsignedUtxoTransaction: utxo_1.getUnsignedUtxoTransaction,
-    getUtxoTransactionFees: utxo_1.getUtxoTransactionFees,
     getUnsignedSolanaTransaction: getUnsignedSolanaTransaction_1.getUnsignedSolanaTransaction,
     getSolanaTransactionFees: getSolanaTransactionFees_1.getSolanaTransactionFees,
     getTronTransactionFees: tron_1.getTronTransactionFees,

package/dist/cjs/swappers/ButterSwap/swapperApi/getTradeRate.test.js

@@ -1,14 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@shapeshiftoss/types");
 const utils_1 = require("@shapeshiftoss/utils");
 const monads_1 = require("@sniptt/monads");
 const vitest_1 = require("vitest");
 const assets_1 = require("../../../utils/test-data/assets");
-const eth_btc_json_1 = __importDefault(require("../test-data/eth-btc.json"));
 const routeQuote_1 = require("../test-data/routeQuote");
 const butterSwapService_1 = require("../utils/butterSwapService");
 const getTradeRate_1 = require("./getTradeRate");
@@ -64,51 +60,4 @@ const mockEvmChainAdapter = {
         const tradeRate = result.unwrap();
         (0, vitest_1.expect)(tradeRate[0].rate).toBe('2296.409699');
     });
-    (0, vitest_1.it)('should return a correct trade rate and steps for a multi-hop ETH->BTC route', async () => {
-        const deps = {
-            assetsById: { [assets_1.ETH.assetId]: assets_1.ETH, [assets_1.BTC.assetId]: assets_1.BTC },
-            assertGetChainAdapter: () => vitest_1.vi.fn(),
-            assertGetEvmChainAdapter: () => mockEvmChainAdapter,
-            assertGetUtxoChainAdapter: () => vitest_1.vi.fn(),
-            assertGetCosmosSdkChainAdapter: () => vitest_1.vi.fn(),
-            assertGetSolanaChainAdapter: () => vitest_1.vi.fn(),
-            assertGetTronChainAdapter: () => vitest_1.vi.fn(),
-            assertGetSuiChainAdapter: () => vitest_1.vi.fn(),
-            assertGetNearChainAdapter: () => vitest_1.vi.fn(),
-            assertGetStarknetChainAdapter: () => vitest_1.vi.fn(),
-            assertGetTonChainAdapter: () => vitest_1.vi.fn(),
-            config: {
-                VITE_BUTTERSWAP_CLIENT_ID: 'test',
-            },
-            mixPanel: undefined,
-            fetchIsSmartContractAddressQuery: vitest_1.vi.fn(),
-        };
-        const input = {
-            sellAsset: assets_1.ETH,
-            buyAsset: assets_1.BTC,
-            sellAmountIncludingProtocolFeesCryptoBaseUnit: (0, utils_1.bn)(1).shiftedBy(18).toString(),
-            affiliateBps: '0',
-            allowMultiHop: true,
-            receiveAddress: '0x123',
-            accountNumber: undefined,
-            quoteOrRate: 'rate',
-            chainId: types_1.KnownChainIds.EthereumMainnet,
-            supportsEIP1559: false,
-        };
-        // Use the first route in the eth-btc.json data
-        vitest_1.vi.mocked(butterSwapService_1.butterService.get).mockResolvedValue((0, monads_1.Ok)({ data: eth_btc_json_1.default }));
-        const result = await (0, getTradeRate_1.getTradeRate)(input, deps);
-        (0, vitest_1.expect)(result.isOk()).toBe(true);
-        const tradeRate = result.unwrap()[0];
-        (0, vitest_1.expect)(tradeRate).toBeDefined();
-        // The expected rate is dstChain.totalAmountOut / srcChain.totalAmountIn
-        (0, vitest_1.expect)(tradeRate.rate).toBe('0.02284418');
-        // Should have a single step
-        (0, vitest_1.expect)(tradeRate.steps).toBeDefined();
-        (0, vitest_1.expect)(tradeRate.steps.length).toBe(1);
-        // The step should have the correct rate
-        (0, vitest_1.expect)(tradeRate.steps[0]?.rate).toBe('0.02284418');
-        // The buyAmountAfterFeesCryptoBaseUnit of the step should match the output in base units
-        (0, vitest_1.expect)(tradeRate.steps[0]?.buyAmountAfterFeesCryptoBaseUnit).toBe('2284418'); // 0.02284418 BTC in base units
-    });
 });

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

@@ -1,7 +1,7 @@
 import type { Hex } from 'viem';
-import type { GetEvmTradeQuoteInput, GetEvmTradeRateInput, GetSolanaTradeQuoteInput, GetSolanaTradeRateInput, GetTronTradeQuoteInput, GetTronTradeRateInput, GetUtxoTradeQuoteInput, GetUtxoTradeRateInput } from '../../types';
-export type ButterSwapTradeQuoteInput = GetEvmTradeQuoteInput | GetUtxoTradeQuoteInput | GetSolanaTradeQuoteInput | GetTronTradeQuoteInput;
-export type ButterSwapTradeRateInput = GetEvmTradeRateInput | GetUtxoTradeRateInput | GetSolanaTradeRateInput | GetTronTradeRateInput;
+import type { GetEvmTradeQuoteInput, GetEvmTradeRateInput, GetSolanaTradeQuoteInput, GetSolanaTradeRateInput, GetTronTradeQuoteInput, GetTronTradeRateInput } from '../../types';
+export type ButterSwapTradeQuoteInput = GetEvmTradeQuoteInput | GetSolanaTradeQuoteInput | GetTronTradeQuoteInput;
+export type ButterSwapTradeRateInput = GetEvmTradeRateInput | GetSolanaTradeRateInput | GetTronTradeRateInput;
 export type ButterSwapTransactionMetadata = {
     to: string;
     data: string;

package/dist/cjs/swappers/ButterSwap/utils/getButterSwapStepData.js

@@ -10,7 +10,6 @@ const types_1 = require("../../../types");
 const utils_2 = require("../../../utils");
 const evm_1 = require("../../../utils/evm");
 const solana_1 = require("../../../utils/solana");
-const utxo_1 = require("../../../utils/utxo");
 const helpers_1 = require("./helpers");
 // Jupiter swap legs can consume more units than simulated when pool state moves between
 // simulation and landing (CLMM tick crossings), 1.4 matches Jupiter's dynamicComputeUnitLimit margin
@@ -69,56 +68,6 @@ async function getButterSwapStepData(args) {
                 return (0, monads_1.Err)((0, utils_2.makeNetworkFeeEstimationFailedErr)('getButterSwapStepData', error));
             }
         }
-        case caip_1.CHAIN_NAMESPACE.Utxo: {
-            const adapter = deps.assertGetUtxoChainAdapter(sellAsset.chainId);
-            const pubkey = 'xpub' in input ? input.xpub : undefined;
-            if (args.type === 'rate') {
-                const networkFeeCryptoBaseUnit = await (async () => {
-                    try {
-                        const { networkFeeCryptoBaseUnit } = await (0, utxo_1.getUtxoNetworkFeeCryptoBaseUnit)({
-                            adapter,
-                            pubkey,
-                            to: input.sendAddress ?? utxo_1.UTXO_PLACEHOLDER_ADDRESS,
-                            value: sellAmountCryptoBaseUnit,
-                        });
-                        return networkFeeCryptoBaseUnit;
-                    }
-                    catch {
-                        return (0, helpers_1.getProviderNetworkFeeCryptoBaseUnit)({ route, feeAsset });
-                    }
-                })();
-                const stepData = { networkFeeCryptoBaseUnit };
-                return (0, monads_1.Ok)(stepData);
-            }
-            const { buildTx } = args;
-            // opReturnData routes the bridge for BTC deposits
-            if (!buildTx.memo) {
-                return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-                    message: '[getButterSwapStepData] Missing memo (opReturnData)',
-                    code: types_1.TradeQuoteError.InvalidResponse,
-                }));
-            }
-            const transactionData = {
-                type: 'utxo',
-                to: buildTx.to,
-                opReturnData: buildTx.memo,
-                value: sellAmountCryptoBaseUnit,
-            };
-            try {
-                const { networkFeeCryptoBaseUnit } = await (0, utxo_1.getUtxoNetworkFeeCryptoBaseUnit)({
-                    adapter,
-                    pubkey,
-                    to: transactionData.to,
-                    value: transactionData.value,
-                    opReturnData: transactionData.opReturnData,
-                });
-                const stepData = { transactionData, networkFeeCryptoBaseUnit };
-                return (0, monads_1.Ok)(stepData);
-            }
-            catch (error) {
-                return (0, monads_1.Err)((0, utils_2.makeNetworkFeeEstimationFailedErr)('getButterSwapStepData', error));
-            }
-        }
         case caip_1.CHAIN_NAMESPACE.Solana: {
             const adapter = deps.assertGetSolanaChainAdapter(sellAsset.chainId);
             if (args.type === 'rate') {

package/dist/cjs/swappers/ButterSwap/utils/getButterSwapStepData.test.js

@@ -136,67 +136,6 @@ const evmQuoteInput = { supportsEIP1559: false };
             (0, vitest_1.expect)(actual.unwrapErr().code).toBe(types_1.TradeQuoteError.NetworkFeeEstimationFailed);
         });
     });
-    (0, vitest_1.describe)('utxo', () => {
-        const utxoAdapter = {
-            getFeeData: () => Promise.resolve({ fast: { txFee: '4200' } }),
-            httpProvider: {
-                getNetworkFees: () => Promise.resolve({ fast: { satsPerKiloByte: 10000 } }),
-            },
-        };
-        (0, vitest_1.it)('estimates off the default vsize for a rate with no pubkey', async () => {
-            const actual = await (0, getButterSwapStepData_1.getButterSwapStepData)({
-                type: 'rate',
-                input: {},
-                deps: makeDeps({ utxo: utxoAdapter }),
-                route,
-                sellAsset: assets_1.BTC,
-                feeAsset: assets_1.BTC,
-                sellAmountCryptoBaseUnit: '100000',
-                spenderAddress: '',
-            });
-            // 10 sats/byte * 200 vbyte default
-            (0, vitest_1.expect)(actual.unwrap()).toEqual({ networkFeeCryptoBaseUnit: '2000' });
-        });
-        (0, vitest_1.it)('builds transaction data with the memo as op return data for a quote', async () => {
-            const actual = await (0, getButterSwapStepData_1.getButterSwapStepData)({
-                type: 'quote',
-                input: { xpub: 'zpub6qux' },
-                from: 'bc1qaddress',
-                buildTx: { ...evmBuildTx, to: 'bc1qbridge', memo: 'butter-memo' },
-                deps: makeDeps({ utxo: utxoAdapter }),
-                route,
-                sellAsset: assets_1.BTC,
-                feeAsset: assets_1.BTC,
-                sellAmountCryptoBaseUnit: '100000',
-                spenderAddress: '',
-            });
-            (0, vitest_1.expect)(actual.unwrap()).toEqual({
-                networkFeeCryptoBaseUnit: '4200',
-                transactionData: {
-                    type: 'utxo',
-                    to: 'bc1qbridge',
-                    opReturnData: 'butter-memo',
-                    value: '100000',
-                },
-            });
-        });
-        (0, vitest_1.it)('errors when the quote is missing the memo the bridge routes on', async () => {
-            const actual = await (0, getButterSwapStepData_1.getButterSwapStepData)({
-                type: 'quote',
-                input: { xpub: 'zpub6qux' },
-                from: 'bc1qaddress',
-                buildTx: { ...evmBuildTx, to: 'bc1qbridge', memo: undefined },
-                deps: makeDeps({ utxo: utxoAdapter }),
-                route,
-                sellAsset: assets_1.BTC,
-                feeAsset: assets_1.BTC,
-                sellAmountCryptoBaseUnit: '100000',
-                spenderAddress: '',
-            });
-            (0, vitest_1.expect)(actual.isErr()).toBe(true);
-            (0, vitest_1.expect)(actual.unwrapErr().code).toBe(types_1.TradeQuoteError.InvalidResponse);
-        });
-    });
     (0, vitest_1.describe)('solana', () => {
         (0, vitest_1.it)('uses the provider fee for a rate, since swap instructions do not exist yet', async () => {
             const assertGetSolanaChainAdapter = vitest_1.vi.fn();

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

@@ -20,7 +20,6 @@ const BUTTERSWAP_CHAIN_ID_TO_CHAIN_ID = {
     [chains_1.avalanche.id]: types_1.KnownChainIds.AvalancheMainnet,
     [chains_1.robinhood.id]: types_1.KnownChainIds.RobinhoodMainnet,
     1360108768460801: types_1.KnownChainIds.SolanaMainnet,
-    1360095883558913: types_1.KnownChainIds.BitcoinMainnet,
     [chains_1.tron.id]: types_1.KnownChainIds.TronMainnet,
 };
 const CHAIN_ID_TO_BUTTERSWAP_CHAIN_ID = Object.entries(BUTTERSWAP_CHAIN_ID_TO_CHAIN_ID).reduce((acc, [butterSwapChainId, chainId]) => {
@@ -37,7 +36,6 @@ const chainIdToButterSwapChainId = (chainId) => {
 exports.chainIdToButterSwapChainId = chainIdToButterSwapChainId;
 const assertValidTrade = ({ sellAsset, }) => {
     if (!(0, chain_adapters_1.isEvmChainId)(sellAsset.chainId) &&
-        sellAsset.chainId !== caip_1.btcChainId &&
         sellAsset.chainId !== caip_1.solanaChainId &&
         sellAsset.chainId !== caip_1.tronChainId) {
         return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({

package/dist/cjs/swappers/ZrxSwapper/utils/fetchFromZrx.js

@@ -30,7 +30,7 @@ const fetchFromZrx = async ({ quoteOrRate, buyAsset, sellAsset, sellAmountInclud
             swapFeeToken: (0, helpers_2.assetIdToZrxToken)(buyAsset.assetId),
             slippageBps: (0, utils_1.convertDecimalPercentageToBasisPoints)(slippageTolerancePercentageDecimal).toNumber(),
             swapFeeRecipient: maybeTreasuryAddress,
-            feeRecipientTradeSurplus: maybeTreasuryAddress, // Where trade surplus is sent
+            tradeSurplusRecipient: maybeTreasuryAddress, // Where trade surplus is sent
         },
     });
     if (maybeZrxPriceResponse.isErr()) {

package/dist/cjs/utils/helpers.js

@@ -68,6 +68,9 @@ const DAO_TREASURY_BY_CHAIN_ID = {
     [types_1.KnownChainIds.MonadMainnet]: utils_1.DAO_TREASURY_MONAD,
     [types_1.KnownChainIds.HyperEvmMainnet]: utils_1.DAO_TREASURY_HYPEREVM,
     [types_1.KnownChainIds.BobMainnet]: utils_1.DAO_TREASURY_BOB,
+    [types_1.KnownChainIds.RobinhoodMainnet]: utils_1.DAO_TREASURY_ROBINHOOD,
+    [types_1.KnownChainIds.PlasmaMainnet]: utils_1.DAO_TREASURY_PLASMA,
+    [types_1.KnownChainIds.MegaEthMainnet]: utils_1.DAO_TREASURY_MEGAETH,
 };
 const getTreasuryAddressFromChainId = (chainId) => {
     const maybeTreasuryChainId = (0, utils_1.isTreasuryChainId)(chainId) ? chainId : undefined;

package/dist/cjs/utils/helpers.test.js

@@ -22,6 +22,9 @@ const helpers_1 = require("./helpers");
         [types_1.KnownChainIds.MonadMainnet]: '0xF5AA59151bE6515C4Ca68A0282CF68B3eA4846fC',
         [types_1.KnownChainIds.HyperEvmMainnet]: '0xF5AA59151bE6515C4Ca68A0282CF68B3eA4846fC',
         [types_1.KnownChainIds.BobMainnet]: '0xF5AA59151bE6515C4Ca68A0282CF68B3eA4846fC',
+        [types_1.KnownChainIds.RobinhoodMainnet]: '0xF5AA59151bE6515C4Ca68A0282CF68B3eA4846fC',
+        [types_1.KnownChainIds.PlasmaMainnet]: '0xF5AA59151bE6515C4Ca68A0282CF68B3eA4846fC',
+        [types_1.KnownChainIds.MegaEthMainnet]: '0xF5AA59151bE6515C4Ca68A0282CF68B3eA4846fC',
         [types_1.KnownChainIds.BitcoinMainnet]: 'bc1q9xrjfet2a05r3jvsxx66rru7pysevk5dvqasdw9eeea3rfqlk33qr4hghh',
         [types_1.KnownChainIds.SolanaMainnet]: 'FxXyPB5RH4uHLPPJR5H89zGwZp19juBetmRwrxfsLj2j',
         [types_1.KnownChainIds.StarknetMainnet]: '0x07ac2252f2da7cbf085e7a5ddc1318243aa818607cdd430dd2e17dd5d487606a',