@shapeshiftoss/swapper 20.1.1 → 20.2.0

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

@@ -27,16 +27,15 @@ export const fetchBebopQuote = async ({ buyAsset, sellAsset, sellAmountIncluding
             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', getAddress(getTreasuryAddressFromChainId(buyAsset.chainId)));
-            // PMM attributes the fee off-chain via source
-            pmmParams.set('fee', affiliateBps);
         }
         const service = bebopServiceFactory({ apiKey });
         const [maybeJam, maybePmm] = await Promise.all([
@@ -77,7 +76,7 @@ export const fetchBebopQuote = async ({ buyAsset, sellAsset, sellAmountIncluding
         }));
     }
 };
-export const fetchBebopSolanaQuote = async ({ buyAsset, sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, takerAddress, receiverAddress, slippageTolerancePercentageDecimal, affiliateBps, apiKey, }) => {
+export 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.
@@ -101,11 +100,9 @@ export const fetchBebopSolanaQuote = async ({ buyAsset, sellAsset, sellAmountInc
             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 bebopServiceFactory({ apiKey }).get('https://api.bebop.xyz/pmm/solana/v3/quote', { params });
         if (maybeResponse.isErr()) {
             const err = maybeResponse.unwrapErr();

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

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

package/dist/esm/swappers/ButterSwap/ButterSwap.js

@@ -3,7 +3,4 @@ export const butterSwap = {
     executeEvmTransaction,
     executeSolanaTransaction,
     executeTronTransaction,
-    executeUtxoTransaction: (txToSign, { signAndBroadcastTransaction }) => {
-        return signAndBroadcastTransaction(txToSign);
-    },
 };

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

@@ -2,7 +2,6 @@ import { getEvmTransactionFees, getUnsignedEvmTransaction } from '../../utils/ev
 import { getSolanaTransactionFees } from '../../utils/solana/getSolanaTransactionFees.js';
 import { getUnsignedSolanaTransaction } from '../../utils/solana/getUnsignedSolanaTransaction.js';
 import { getTronTransactionFees, getUnsignedTronTransaction } from '../../utils/tron/index.js';
-import { getUnsignedUtxoTransaction, getUtxoTransactionFees } from '../../utils/utxo/index.js';
 import { checkTradeStatus } from './swapperApi/checkTradeStatus.js';
 import { getTradeQuote } from './swapperApi/getTradeQuote.js';
 import { getTradeRate } from './swapperApi/getTradeRate.js';
@@ -12,8 +11,6 @@ export const butterSwapApi = {
     checkTradeStatus,
     getEvmTransactionFees,
     getUnsignedEvmTransaction,
-    getUnsignedUtxoTransaction,
-    getUtxoTransactionFees,
     getUnsignedSolanaTransaction,
     getSolanaTransactionFees,
     getTronTransactionFees,

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

@@ -2,8 +2,7 @@ import { KnownChainIds } from '@shapeshiftoss/types';
 import { bn } from '@shapeshiftoss/utils';
 import { Ok } from '@sniptt/monads';
 import { describe, expect, it, vi } from 'vitest';
-import { BTC, ETH, USDC_MAINNET, WETH } from '../../../utils/test-data/assets.js';
-import ethBtcRoute from '../test-data/eth-btc.json';
+import { ETH, USDC_MAINNET, WETH } from '../../../utils/test-data/assets.js';
 import { ROUTE_QUOTE } from '../test-data/routeQuote.js';
 import { butterService } from '../utils/butterSwapService.js';
 import { getTradeRate } from './getTradeRate.js';
@@ -59,51 +58,4 @@ describe('getTradeRate', () => {
         const tradeRate = result.unwrap();
         expect(tradeRate[0].rate).toBe('2296.409699');
     });
-    it('should return a correct trade rate and steps for a multi-hop ETH->BTC route', async () => {
-        const deps = {
-            assetsById: { [ETH.assetId]: ETH, [BTC.assetId]: BTC },
-            assertGetChainAdapter: () => vi.fn(),
-            assertGetEvmChainAdapter: () => mockEvmChainAdapter,
-            assertGetUtxoChainAdapter: () => vi.fn(),
-            assertGetCosmosSdkChainAdapter: () => vi.fn(),
-            assertGetSolanaChainAdapter: () => vi.fn(),
-            assertGetTronChainAdapter: () => vi.fn(),
-            assertGetSuiChainAdapter: () => vi.fn(),
-            assertGetNearChainAdapter: () => vi.fn(),
-            assertGetStarknetChainAdapter: () => vi.fn(),
-            assertGetTonChainAdapter: () => vi.fn(),
-            config: {
-                VITE_BUTTERSWAP_CLIENT_ID: 'test',
-            },
-            mixPanel: undefined,
-            fetchIsSmartContractAddressQuery: vi.fn(),
-        };
-        const input = {
-            sellAsset: ETH,
-            buyAsset: BTC,
-            sellAmountIncludingProtocolFeesCryptoBaseUnit: bn(1).shiftedBy(18).toString(),
-            affiliateBps: '0',
-            allowMultiHop: true,
-            receiveAddress: '0x123',
-            accountNumber: undefined,
-            quoteOrRate: 'rate',
-            chainId: KnownChainIds.EthereumMainnet,
-            supportsEIP1559: false,
-        };
-        // Use the first route in the eth-btc.json data
-        vi.mocked(butterService.get).mockResolvedValue(Ok({ data: ethBtcRoute }));
-        const result = await getTradeRate(input, deps);
-        expect(result.isOk()).toBe(true);
-        const tradeRate = result.unwrap()[0];
-        expect(tradeRate).toBeDefined();
-        // The expected rate is dstChain.totalAmountOut / srcChain.totalAmountIn
-        expect(tradeRate.rate).toBe('0.02284418');
-        // Should have a single step
-        expect(tradeRate.steps).toBeDefined();
-        expect(tradeRate.steps.length).toBe(1);
-        // The step should have the correct rate
-        expect(tradeRate.steps[0]?.rate).toBe('0.02284418');
-        // The buyAmountAfterFeesCryptoBaseUnit of the step should match the output in base units
-        expect(tradeRate.steps[0]?.buyAmountAfterFeesCryptoBaseUnit).toBe('2284418'); // 0.02284418 BTC in base units
-    });
 });

package/dist/esm/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.js';
-export type ButterSwapTradeQuoteInput = GetEvmTradeQuoteInput | GetUtxoTradeQuoteInput | GetSolanaTradeQuoteInput | GetTronTradeQuoteInput;
-export type ButterSwapTradeRateInput = GetEvmTradeRateInput | GetUtxoTradeRateInput | GetSolanaTradeRateInput | GetTronTradeRateInput;
+import type { GetEvmTradeQuoteInput, GetEvmTradeRateInput, GetSolanaTradeQuoteInput, GetSolanaTradeRateInput, GetTronTradeQuoteInput, GetTronTradeRateInput } from '../../types.js';
+export type ButterSwapTradeQuoteInput = GetEvmTradeQuoteInput | GetSolanaTradeQuoteInput | GetTronTradeQuoteInput;
+export type ButterSwapTradeRateInput = GetEvmTradeRateInput | GetSolanaTradeRateInput | GetTronTradeRateInput;
 export type ButterSwapTransactionMetadata = {
     to: string;
     data: string;

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

@@ -7,7 +7,6 @@ import { TradeQuoteError } from '../../../types.js';
 import { makeNetworkFeeEstimationFailedErr, makeSwapErrorRight, makeTradeStepBuildFailedErr, } from '../../../utils/index.js';
 import { getEvmNetworkFeeCryptoBaseUnit } from '../../../utils/evm/index.js';
 import { getSolanaNetworkFeeCryptoBaseUnit, omitComputeBudgetInstructions, withComputeUnitLimit, } from '../../../utils/solana/index.js';
-import { getUtxoNetworkFeeCryptoBaseUnit, UTXO_PLACEHOLDER_ADDRESS } from '../../../utils/utxo/index.js';
 import { getProviderNetworkFeeCryptoBaseUnit } from './helpers.js';
 // 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
@@ -66,56 +65,6 @@ export async function getButterSwapStepData(args) {
                 return Err(makeNetworkFeeEstimationFailedErr('getButterSwapStepData', error));
             }
         }
-        case 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 getUtxoNetworkFeeCryptoBaseUnit({
-                            adapter,
-                            pubkey,
-                            to: input.sendAddress ?? UTXO_PLACEHOLDER_ADDRESS,
-                            value: sellAmountCryptoBaseUnit,
-                        });
-                        return networkFeeCryptoBaseUnit;
-                    }
-                    catch {
-                        return getProviderNetworkFeeCryptoBaseUnit({ route, feeAsset });
-                    }
-                })();
-                const stepData = { networkFeeCryptoBaseUnit };
-                return Ok(stepData);
-            }
-            const { buildTx } = args;
-            // opReturnData routes the bridge for BTC deposits
-            if (!buildTx.memo) {
-                return Err(makeSwapErrorRight({
-                    message: '[getButterSwapStepData] Missing memo (opReturnData)',
-                    code: TradeQuoteError.InvalidResponse,
-                }));
-            }
-            const transactionData = {
-                type: 'utxo',
-                to: buildTx.to,
-                opReturnData: buildTx.memo,
-                value: sellAmountCryptoBaseUnit,
-            };
-            try {
-                const { networkFeeCryptoBaseUnit } = await getUtxoNetworkFeeCryptoBaseUnit({
-                    adapter,
-                    pubkey,
-                    to: transactionData.to,
-                    value: transactionData.value,
-                    opReturnData: transactionData.opReturnData,
-                });
-                const stepData = { transactionData, networkFeeCryptoBaseUnit };
-                return Ok(stepData);
-            }
-            catch (error) {
-                return Err(makeNetworkFeeEstimationFailedErr('getButterSwapStepData', error));
-            }
-        }
         case CHAIN_NAMESPACE.Solana: {
             const adapter = deps.assertGetSolanaChainAdapter(sellAsset.chainId);
             if (args.type === 'rate') {

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

@@ -1,7 +1,7 @@
 import { solanaChainId, tronChainId } from '@shapeshiftoss/caip';
 import { describe, expect, it, vi } from 'vitest';
 import { TradeQuoteError } from '../../../types.js';
-import { BTC, ETH, RUNE, WETH } from '../../../utils/test-data/assets.js';
+import { ETH, RUNE, WETH } from '../../../utils/test-data/assets.js';
 import { ROUTE_QUOTE } from '../test-data/routeQuote.js';
 import { getButterSwapStepData } from './getButterSwapStepData.js';
 // The override path reads live chain state - resolve to no override so estimation exercises the
@@ -134,67 +134,6 @@ describe('getButterSwapStepData', () => {
             expect(actual.unwrapErr().code).toBe(TradeQuoteError.NetworkFeeEstimationFailed);
         });
     });
-    describe('utxo', () => {
-        const utxoAdapter = {
-            getFeeData: () => Promise.resolve({ fast: { txFee: '4200' } }),
-            httpProvider: {
-                getNetworkFees: () => Promise.resolve({ fast: { satsPerKiloByte: 10000 } }),
-            },
-        };
-        it('estimates off the default vsize for a rate with no pubkey', async () => {
-            const actual = await getButterSwapStepData({
-                type: 'rate',
-                input: {},
-                deps: makeDeps({ utxo: utxoAdapter }),
-                route,
-                sellAsset: BTC,
-                feeAsset: BTC,
-                sellAmountCryptoBaseUnit: '100000',
-                spenderAddress: '',
-            });
-            // 10 sats/byte * 200 vbyte default
-            expect(actual.unwrap()).toEqual({ networkFeeCryptoBaseUnit: '2000' });
-        });
-        it('builds transaction data with the memo as op return data for a quote', async () => {
-            const actual = await getButterSwapStepData({
-                type: 'quote',
-                input: { xpub: 'zpub6qux' },
-                from: 'bc1qaddress',
-                buildTx: { ...evmBuildTx, to: 'bc1qbridge', memo: 'butter-memo' },
-                deps: makeDeps({ utxo: utxoAdapter }),
-                route,
-                sellAsset: BTC,
-                feeAsset: BTC,
-                sellAmountCryptoBaseUnit: '100000',
-                spenderAddress: '',
-            });
-            expect(actual.unwrap()).toEqual({
-                networkFeeCryptoBaseUnit: '4200',
-                transactionData: {
-                    type: 'utxo',
-                    to: 'bc1qbridge',
-                    opReturnData: 'butter-memo',
-                    value: '100000',
-                },
-            });
-        });
-        it('errors when the quote is missing the memo the bridge routes on', async () => {
-            const actual = await getButterSwapStepData({
-                type: 'quote',
-                input: { xpub: 'zpub6qux' },
-                from: 'bc1qaddress',
-                buildTx: { ...evmBuildTx, to: 'bc1qbridge', memo: undefined },
-                deps: makeDeps({ utxo: utxoAdapter }),
-                route,
-                sellAsset: BTC,
-                feeAsset: BTC,
-                sellAmountCryptoBaseUnit: '100000',
-                spenderAddress: '',
-            });
-            expect(actual.isErr()).toBe(true);
-            expect(actual.unwrapErr().code).toBe(TradeQuoteError.InvalidResponse);
-        });
-    });
     describe('solana', () => {
         it('uses the provider fee for a rate, since swap instructions do not exist yet', async () => {
             const assertGetSolanaChainAdapter = vi.fn();

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

@@ -1,4 +1,4 @@
-import { btcChainId, solanaChainId, tronChainId } from '@shapeshiftoss/caip';
+import { solanaChainId, tronChainId } from '@shapeshiftoss/caip';
 import { isEvmChainId } from '@shapeshiftoss/chain-adapters';
 import { KnownChainIds } from '@shapeshiftoss/types';
 import { BigAmount, bnOrZero } from '@shapeshiftoss/utils';
@@ -17,7 +17,6 @@ const BUTTERSWAP_CHAIN_ID_TO_CHAIN_ID = {
     [avalanche.id]: KnownChainIds.AvalancheMainnet,
     [robinhood.id]: KnownChainIds.RobinhoodMainnet,
     1360108768460801: KnownChainIds.SolanaMainnet,
-    1360095883558913: KnownChainIds.BitcoinMainnet,
     [tron.id]: KnownChainIds.TronMainnet,
 };
 const CHAIN_ID_TO_BUTTERSWAP_CHAIN_ID = Object.entries(BUTTERSWAP_CHAIN_ID_TO_CHAIN_ID).reduce((acc, [butterSwapChainId, chainId]) => {
@@ -32,7 +31,6 @@ export const chainIdToButterSwapChainId = (chainId) => {
 };
 export const assertValidTrade = ({ sellAsset, }) => {
     if (!isEvmChainId(sellAsset.chainId) &&
-        sellAsset.chainId !== btcChainId &&
         sellAsset.chainId !== solanaChainId &&
         sellAsset.chainId !== tronChainId) {
         return Err(makeSwapErrorRight({

package/dist/esm/utils/helpers.js

@@ -1,6 +1,6 @@
 import { arbitrumAssetId, avalancheAssetId, baseAssetId, bscAssetId, ethAssetId, fromAssetId, gnosisAssetId, katanaAssetId, monadAssetId, optimismAssetId, plasmaAssetId, polygonAssetId, } from '@shapeshiftoss/caip';
 import { KnownChainIds } from '@shapeshiftoss/types';
-import { DAO_TREASURY_ARBITRUM, DAO_TREASURY_AVALANCHE, DAO_TREASURY_BASE, DAO_TREASURY_BITCOIN, DAO_TREASURY_BOB, DAO_TREASURY_BSC, DAO_TREASURY_ETHEREUM_MAINNET, DAO_TREASURY_GNOSIS, DAO_TREASURY_HYPEREVM, DAO_TREASURY_MONAD, DAO_TREASURY_OPTIMISM, DAO_TREASURY_POLYGON, DAO_TREASURY_SOLANA, DAO_TREASURY_STARKNET, DAO_TREASURY_TON, isTreasuryChainId, } from '@shapeshiftoss/utils';
+import { DAO_TREASURY_ARBITRUM, DAO_TREASURY_AVALANCHE, DAO_TREASURY_BASE, DAO_TREASURY_BITCOIN, DAO_TREASURY_BOB, DAO_TREASURY_BSC, DAO_TREASURY_ETHEREUM_MAINNET, DAO_TREASURY_GNOSIS, DAO_TREASURY_HYPEREVM, DAO_TREASURY_MEGAETH, DAO_TREASURY_MONAD, DAO_TREASURY_OPTIMISM, DAO_TREASURY_PLASMA, DAO_TREASURY_POLYGON, DAO_TREASURY_ROBINHOOD, DAO_TREASURY_SOLANA, DAO_TREASURY_STARKNET, DAO_TREASURY_TON, isTreasuryChainId, } from '@shapeshiftoss/utils';
 import { SwapperName } from '../types.js';
 // Deadline for providers without their own expiry - short enough to keep priced amounts honest
 export const FALLBACK_QUOTE_DEADLINE_MS = 60_000;
@@ -62,6 +62,9 @@ const DAO_TREASURY_BY_CHAIN_ID = {
     [KnownChainIds.MonadMainnet]: DAO_TREASURY_MONAD,
     [KnownChainIds.HyperEvmMainnet]: DAO_TREASURY_HYPEREVM,
     [KnownChainIds.BobMainnet]: DAO_TREASURY_BOB,
+    [KnownChainIds.RobinhoodMainnet]: DAO_TREASURY_ROBINHOOD,
+    [KnownChainIds.PlasmaMainnet]: DAO_TREASURY_PLASMA,
+    [KnownChainIds.MegaEthMainnet]: DAO_TREASURY_MEGAETH,
 };
 export const getTreasuryAddressFromChainId = (chainId) => {
     const maybeTreasuryChainId = isTreasuryChainId(chainId) ? chainId : undefined;

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

@@ -20,6 +20,9 @@ describe('getTreasuryAddressFromChainId', () => {
         [KnownChainIds.MonadMainnet]: '0xF5AA59151bE6515C4Ca68A0282CF68B3eA4846fC',
         [KnownChainIds.HyperEvmMainnet]: '0xF5AA59151bE6515C4Ca68A0282CF68B3eA4846fC',
         [KnownChainIds.BobMainnet]: '0xF5AA59151bE6515C4Ca68A0282CF68B3eA4846fC',
+        [KnownChainIds.RobinhoodMainnet]: '0xF5AA59151bE6515C4Ca68A0282CF68B3eA4846fC',
+        [KnownChainIds.PlasmaMainnet]: '0xF5AA59151bE6515C4Ca68A0282CF68B3eA4846fC',
+        [KnownChainIds.MegaEthMainnet]: '0xF5AA59151bE6515C4Ca68A0282CF68B3eA4846fC',
         [KnownChainIds.BitcoinMainnet]: 'bc1q9xrjfet2a05r3jvsxx66rru7pysevk5dvqasdw9eeea3rfqlk33qr4hghh',
         [KnownChainIds.SolanaMainnet]: 'FxXyPB5RH4uHLPPJR5H89zGwZp19juBetmRwrxfsLj2j',
         [KnownChainIds.StarknetMainnet]: '0x07ac2252f2da7cbf085e7a5ddc1318243aa818607cdd430dd2e17dd5d487606a',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "20.1.1",
+  "version": "20.2.0",
   "repository": "https://github.com/shapeshift/web",
   "license": "MIT",
   "type": "module",
@@ -53,10 +53,10 @@
     "@shapeshiftoss/caip": "^8.17.0",
     "@shapeshiftoss/chain-adapters": "^11.5.1",
     "@shapeshiftoss/contracts": "^1.0.7",
-    "@shapeshiftoss/unchained-client": "^10.14.11",
+    "@shapeshiftoss/hdwallet-core": "^1.62.41",
     "@shapeshiftoss/types": "^9.0.1",
-    "@shapeshiftoss/utils": "^1.2.0",
-    "@shapeshiftoss/hdwallet-core": "^1.62.41"
+    "@shapeshiftoss/unchained-client": "^10.14.11",
+    "@shapeshiftoss/utils": "^1.3.0"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.178",