@shapeshiftoss/swapper 17.8.0 → 18.1.0

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

@@ -1,22 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertValidTrade = exports.getBobGatewayAllowanceContract = exports.parseBobGatewayQuote = exports.mapBobGatewayOrderStatusToTxStatus = exports.getBobGatewayRateNetworkFeeCryptoBaseUnit = exports.getBobGatewayQuoteFeeData = exports.registerBobGatewayTx = exports.createBobGatewayOrderMetadata = exports.getBobGatewayQuote = exports.getBobGatewayAffiliates = exports.assetIdToBobGatewayToken = exports.getBobGatewayClient = void 0;
+exports.assertValidTrade = exports.getBobGatewayAllowanceContract = exports.parseBobGatewayQuote = exports.mapBobGatewayOrderStatusToTxStatus = exports.registerBobGatewayTx = exports.createBobGatewayOrder = exports.getBobGatewayQuote = exports.getBobGatewayAffiliates = exports.assetIdToBobGatewayToken = exports.toTronBase58 = exports.getBobGatewayClient = exports.dummyAddressForChainId = void 0;
 const bob_sdk_1 = require("@gobob/bob-sdk");
 const caip_1 = require("@shapeshiftoss/caip");
 const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
 const unchained_client_1 = require("@shapeshiftoss/unchained-client");
 const utils_1 = require("@shapeshiftoss/utils");
 const monads_1 = require("@sniptt/monads");
+const tronweb_1 = require("tronweb");
 const viem_1 = require("viem");
 const constants_1 = require("../../../constants");
 const types_1 = require("../../../types");
 const utils_2 = require("../../../utils");
-const helpers_1 = require("../../utils/helpers/helpers");
+const helpers_1 = require("../../../utils/helpers");
 const constants_2 = require("./constants");
+const dummyAddressForChainId = (chainId) => {
+    if (chainId === caip_1.btcChainId)
+        return constants_2.DUMMY_BTC_ADDRESS;
+    if (chainId === caip_1.tronChainId)
+        return constants_2.DUMMY_TRON_ADDRESS;
+    return constants_2.DUMMY_EVM_ADDRESS;
+};
+exports.dummyAddressForChainId = dummyAddressForChainId;
 const getBobGatewayClient = (config) => {
     return new bob_sdk_1.GatewaySDK({ basePath: constants_2.BOB_GATEWAY_BASE_URL, apiKey: config.VITE_BOB_GATEWAY_API_KEY });
 };
 exports.getBobGatewayClient = getBobGatewayClient;
+const toTronBase58 = (address) => {
+    if (address.startsWith('T'))
+        return address;
+    if (address.startsWith('0x'))
+        return tronweb_1.TronWeb.address.fromHex(address.slice(2));
+    return tronweb_1.TronWeb.address.fromHex(address);
+};
+exports.toTronBase58 = toTronBase58;
 const assetIdToBobGatewayToken = (assetId) => {
     // BOB Gateway uses the zero address as the token address for native assets
     if (!(0, utils_1.isToken)(assetId))
@@ -45,6 +62,7 @@ const getBobGatewayQuote = async ({ config, sellAsset, buyAsset, sellChainName,
             toUserAddress: recipient,
             amount,
             maxSlippage: Number(slippage),
+            ownerAddress: sellChainName === 'bitcoin' ? recipient : sender,
             affiliates: (0, exports.getBobGatewayAffiliates)(affiliateBps),
         });
         return (0, monads_1.Ok)(quote);
@@ -87,32 +105,10 @@ const getBobGatewayQuote = async ({ config, sellAsset, buyAsset, sellChainName,
     }
 };
 exports.getBobGatewayQuote = getBobGatewayQuote;
-const createBobGatewayOrderMetadata = async (config, gatewayQuote) => {
+const createBobGatewayOrder = async (config, quote) => {
     try {
-        const orderResponse = await (0, exports.getBobGatewayClient)(config).api.createOrderV2({
-            gatewayQuoteV2: gatewayQuote,
-        });
-        // onramp (BTC→EVM)
-        if ('onramp' in orderResponse) {
-            return (0, monads_1.Ok)({
-                orderId: orderResponse.onramp.orderId,
-                utxoTx: {
-                    depositAddress: orderResponse.onramp.address,
-                    opReturnData: orderResponse.onramp.opReturnData ?? undefined,
-                },
-            });
-        }
-        // offramp (EVM→BTC) and tokenSwap (EVM→EVM) orders share the same tx shape
-        const order = 'offramp' in orderResponse ? orderResponse.offramp : orderResponse.tokenSwap;
-        return (0, monads_1.Ok)({
-            orderId: order.orderId,
-            evmTx: {
-                to: order.tx.to,
-                data: order.tx.data,
-                value: order.tx.value,
-                chain: order.tx.chain,
-            },
-        });
+        const order = await (0, exports.getBobGatewayClient)(config).api.createOrderV3({ gatewayQuoteV3: quote });
+        return (0, monads_1.Ok)(order);
     }
     catch (err) {
         if ((0, bob_sdk_1.isGatewayError)(err) && err.code === bob_sdk_1.GatewayErrorCode.InsufficientConfirmedFunds) {
@@ -129,84 +125,24 @@ const createBobGatewayOrderMetadata = async (config, gatewayQuote) => {
         }));
     }
 };
-exports.createBobGatewayOrderMetadata = createBobGatewayOrderMetadata;
+exports.createBobGatewayOrder = createBobGatewayOrder;
 const registerBobGatewayTx = async ({ config, orderId, txHash, sellAsset, buyAsset, }) => {
-    const registerTxV2 = (() => {
+    const registerTxV3 = (() => {
+        const sellChainName = constants_2.chainIdToBobGatewayChainName[sellAsset.chainId];
         // BTC→EVM
-        if (constants_2.chainIdToBobGatewayChainName[sellAsset.chainId] === 'bitcoin') {
+        if (sellChainName === 'bitcoin') {
             return { onramp: { orderId, bitcoinTxid: txHash } };
         }
         // EVM→BTC
         if (constants_2.chainIdToBobGatewayChainName[buyAsset.chainId] === 'bitcoin') {
-            return { offramp: { orderId, evmTxhash: txHash } };
+            return { offramp: { orderId, srcChain: sellChainName, srcTxHash: txHash } };
         }
         // EVM→EVM
-        return { tokenSwap: { orderId, evmTxhash: txHash } };
+        return { tokenSwap: { orderId, srcChain: sellChainName, srcTxHash: txHash } };
     })();
-    await (0, exports.getBobGatewayClient)(config).api.registerTxV2({ registerTxV2 });
+    await (0, exports.getBobGatewayClient)(config).api.registerTxV3({ registerTxV3 });
 };
 exports.registerBobGatewayTx = registerBobGatewayTx;
-const getBobGatewayQuoteFeeData = async (input, { assertGetUtxoChainAdapter, assertGetEvmChainAdapter }, orderMetadata) => {
-    const { sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit } = input;
-    try {
-        if (orderMetadata.utxoTx && 'xpub' in input) {
-            const { depositAddress, opReturnData } = orderMetadata.utxoTx;
-            const { fast } = await assertGetUtxoChainAdapter(sellAsset.chainId).getFeeData({
-                to: depositAddress,
-                value: sellAmountIncludingProtocolFeesCryptoBaseUnit,
-                chainSpecific: { pubkey: input.xpub, opReturnData },
-                sendMax: false,
-            });
-            return (0, monads_1.Ok)({
-                networkFeeCryptoBaseUnit: fast.txFee,
-                chainSpecific: { satsPerByte: fast.chainSpecific.satoshiPerByte },
-            });
-        }
-        if (orderMetadata.evmTx && input.sendAddress && 'supportsEIP1559' in input) {
-            const { to, data, value } = orderMetadata.evmTx;
-            const { networkFeeCryptoBaseUnit } = await chain_adapters_1.evm.getFees({
-                adapter: assertGetEvmChainAdapter(sellAsset.chainId),
-                to,
-                data,
-                value,
-                from: input.sendAddress,
-                supportsEIP1559: input.supportsEIP1559,
-            });
-            return (0, monads_1.Ok)({ networkFeeCryptoBaseUnit });
-        }
-        throw new Error('[BobGateway] invalid quote');
-    }
-    catch (err) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: '[BobGateway] failed to estimate network fee',
-            code: types_1.TradeQuoteError.NetworkFeeEstimationFailed,
-            cause: err,
-        }));
-    }
-};
-exports.getBobGatewayQuoteFeeData = getBobGatewayQuoteFeeData;
-const getBobGatewayRateNetworkFeeCryptoBaseUnit = async (quote, sellAsset, { assertGetEvmChainAdapter, assertGetUtxoChainAdapter }) => {
-    try {
-        if ('onramp' in quote) {
-            const adapter = assertGetUtxoChainAdapter(sellAsset.chainId);
-            const { fast } = await adapter.httpProvider.getNetworkFees();
-            if (!fast?.satsPerKiloByte)
-                return undefined;
-            const satsPerByte = Math.max(1, Math.ceil(fast.satsPerKiloByte / 1000));
-            return (0, utils_1.bnOrZero)(satsPerByte).times(constants_2.BOB_GATEWAY_ONRAMP_DEFAULT_TX_VSIZE).toFixed(0);
-        }
-        const defaultGasLimit = 'offramp' in quote
-            ? constants_2.BOB_GATEWAY_OFFRAMP_DEFAULT_GAS_LIMIT
-            : constants_2.BOB_GATEWAY_TOKENSWAP_DEFAULT_GAS_LIMIT;
-        const { average } = await assertGetEvmChainAdapter(sellAsset.chainId).getGasFeeData();
-        const feePerGas = (0, utils_1.bnOrZero)(average.maxFeePerGas).gt(0) ? average.maxFeePerGas : average.gasPrice;
-        return (0, utils_1.bnOrZero)(defaultGasLimit).times((0, utils_1.bnOrZero)(feePerGas)).toFixed(0);
-    }
-    catch {
-        return undefined;
-    }
-};
-exports.getBobGatewayRateNetworkFeeCryptoBaseUnit = getBobGatewayRateNetworkFeeCryptoBaseUnit;
 const mapBobGatewayOrderStatusToTxStatus = (status) => {
     if ('inProgress' in status)
         return unchained_client_1.TxStatus.Pending;
@@ -225,6 +161,13 @@ const bobGatewayFeeToAssetId = (fee) => {
         return;
     if (fee.address.toLowerCase() === viem_1.zeroAddress)
         return (0, utils_1.chainIdToFeeAssetId)(chainId);
+    if (chainId === caip_1.tronChainId) {
+        return (0, caip_1.toAssetId)({
+            chainId,
+            assetNamespace: caip_1.ASSET_NAMESPACE.trc20,
+            assetReference: (0, exports.toTronBase58)(fee.address),
+        });
+    }
     return (0, caip_1.toAssetId)({
         chainId,
         assetNamespace: caip_1.ASSET_NAMESPACE.erc20,
@@ -281,15 +224,23 @@ const parseBobGatewayQuote = (quote, buyAsset, assetsById) => {
 };
 exports.parseBobGatewayQuote = parseBobGatewayQuote;
 const getBobGatewayAllowanceContract = (quote, sellAsset) => {
-    if (!(0, chain_adapters_1.isEvmChainId)(sellAsset.chainId))
+    const isTron = sellAsset.chainId === caip_1.tronChainId;
+    if (!(0, chain_adapters_1.isEvmChainId)(sellAsset.chainId) && !isTron)
         return '';
     if (!(0, utils_1.contractAddressOrUndefined)(sellAsset.assetId))
         return '';
-    if ('offramp' in quote)
-        return quote.offramp.txTo;
-    if ('tokenSwap' in quote)
-        return quote.tokenSwap.txTo;
-    return '';
+    const txTo = (() => {
+        if ('offramp' in quote)
+            return quote.offramp.txTo;
+        if ('tokenSwap' in quote)
+            return quote.tokenSwap.txTo;
+        return '';
+    })();
+    if (!txTo)
+        return '';
+    if (isTron)
+        return (0, exports.toTronBase58)(txTo);
+    return txTo;
 };
 exports.getBobGatewayAllowanceContract = getBobGatewayAllowanceContract;
 const assertValidTrade = ({ sellAsset, buyAsset, }) => {

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

@@ -1,131 +1,24 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.butterSwapApi = void 0;
-const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
-const bignumber_js_1 = __importDefault(require("bignumber.js"));
-const getSolanaTransactionFees_1 = require("../../solana-utils/getSolanaTransactionFees");
-const getUnsignedSolanaTransaction_1 = require("../../solana-utils/getUnsignedSolanaTransaction");
-const getTronTransactionFees_1 = require("../../tron-utils/getTronTransactionFees");
-const getUnsignedTronTransaction_1 = require("../../tron-utils/getUnsignedTronTransaction");
-const utils_1 = require("../../utils");
+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");
 exports.butterSwapApi = {
-    getTradeQuote: getTradeQuote_1.getTradeQuote,
-    getTradeRate: getTradeRate_1.getTradeRate,
+    getTradeQuote: (input, deps) => (0, getTradeQuote_1.getTradeQuote)(input, deps),
+    getTradeRate: (input, deps) => (0, getTradeRate_1.getTradeRate)(input, deps),
     checkTradeStatus: checkTradeStatus_1.checkTradeStatus,
-    getEvmTransactionFees: async ({ from, stepIndex, tradeQuote, supportsEIP1559, assertGetEvmChainAdapter, }) => {
-        if (!(0, utils_1.isExecutableTradeQuote)(tradeQuote))
-            throw new Error('Unable to execute a trade rate quote');
-        const step = (0, utils_1.getExecutableTradeStep)(tradeQuote, stepIndex);
-        const { butterSwapTransactionMetadata, sellAsset } = step;
-        if (!butterSwapTransactionMetadata)
-            throw new Error('Transaction metadata is required');
-        const { to, data, gasLimit, value } = butterSwapTransactionMetadata;
-        const adapter = assertGetEvmChainAdapter(sellAsset.chainId);
-        const feeData = await chain_adapters_1.evm.getFees({
-            adapter,
-            data,
-            to,
-            value: BigInt(value).toString(),
-            from,
-            supportsEIP1559,
-        });
-        const networkFeeCryptoBaseUnit = chain_adapters_1.evm.calcNetworkFeeCryptoBaseUnit({
-            gasLimit,
-            gasPrice: feeData.gasPrice ?? '0',
-            maxFeePerGas: feeData.maxFeePerGas,
-            maxPriorityFeePerGas: feeData.maxPriorityFeePerGas,
-            supportsEIP1559,
-        });
-        return bignumber_js_1.default.max(feeData.networkFeeCryptoBaseUnit, networkFeeCryptoBaseUnit).toFixed();
-    },
-    getUnsignedEvmTransaction: async (args) => {
-        const { from, stepIndex, tradeQuote, supportsEIP1559, assertGetEvmChainAdapter } = args;
-        if (!(0, utils_1.isExecutableTradeQuote)(tradeQuote))
-            throw new Error('Unable to execute a trade rate quote');
-        const step = (0, utils_1.getExecutableTradeStep)(tradeQuote, stepIndex);
-        const { accountNumber, sellAsset, butterSwapTransactionMetadata } = step;
-        if (!butterSwapTransactionMetadata)
-            throw new Error('Transaction metadata is required');
-        const { to, data, gasLimit, value } = butterSwapTransactionMetadata;
-        const adapter = assertGetEvmChainAdapter(sellAsset.chainId);
-        const feeData = await chain_adapters_1.evm.getFees({
-            adapter,
-            data,
-            to,
-            value: BigInt(value).toString(),
-            from,
-            supportsEIP1559,
-        });
-        return adapter.buildCustomApiTx({
-            accountNumber,
-            data,
-            from,
-            to,
-            value: BigInt(value).toString(),
-            ...feeData,
-            gasLimit: bignumber_js_1.default.max(feeData.gasLimit, gasLimit).toFixed(),
-        });
-    },
-    getUnsignedUtxoTransaction: async ({ stepIndex, tradeQuote, xpub, accountType, assertGetUtxoChainAdapter, }) => {
-        if (!(0, utils_1.isExecutableTradeQuote)(tradeQuote))
-            throw new Error('Unable to execute a trade rate quote');
-        const step = (0, utils_1.getExecutableTradeStep)(tradeQuote, stepIndex);
-        const { accountNumber, sellAsset, butterSwapTransactionMetadata } = step;
-        if (!butterSwapTransactionMetadata)
-            throw new Error('Transaction metadata is required');
-        const { to, memo } = butterSwapTransactionMetadata;
-        if (!to)
-            throw new Error('Missing deposit address');
-        if (!memo)
-            throw new Error('Missing memo (opReturnData)');
-        const adapter = assertGetUtxoChainAdapter(sellAsset.chainId);
-        const { fast } = await adapter.getFeeData({
-            to,
-            value: step.sellAmountIncludingProtocolFeesCryptoBaseUnit,
-            chainSpecific: { pubkey: xpub, opReturnData: memo },
-            sendMax: false,
-        });
-        return adapter.buildSendApiTransaction({
-            value: step.sellAmountIncludingProtocolFeesCryptoBaseUnit,
-            xpub,
-            to,
-            accountNumber,
-            chainSpecific: {
-                accountType,
-                opReturnData: memo,
-                satoshiPerByte: fast.chainSpecific.satoshiPerByte,
-            },
-        });
-    },
-    getUtxoTransactionFees: async ({ stepIndex, tradeQuote, xpub, assertGetUtxoChainAdapter }) => {
-        if (!(0, utils_1.isExecutableTradeQuote)(tradeQuote))
-            throw new Error('Unable to execute a trade rate quote');
-        const step = (0, utils_1.getExecutableTradeStep)(tradeQuote, stepIndex);
-        const { sellAsset, butterSwapTransactionMetadata } = step;
-        if (!butterSwapTransactionMetadata)
-            throw new Error('Transaction metadata is required');
-        const { to, memo } = butterSwapTransactionMetadata;
-        if (!to)
-            throw new Error('Missing deposit address');
-        if (!memo)
-            throw new Error('Missing memo (opReturnData)');
-        const adapter = assertGetUtxoChainAdapter(sellAsset.chainId);
-        const { fast } = await adapter.getFeeData({
-            to,
-            value: step.sellAmountIncludingProtocolFeesCryptoBaseUnit,
-            chainSpecific: { pubkey: xpub, opReturnData: memo },
-            sendMax: false,
-        });
-        return fast.txFee;
-    },
+    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: getTronTransactionFees_1.getTronTransactionFees,
-    getUnsignedTronTransaction: getUnsignedTronTransaction_1.getUnsignedTronTransaction,
+    getTronTransactionFees: tron_1.getTronTransactionFees,
+    getUnsignedTronTransaction: tron_1.getUnsignedTronTransaction,
 };

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

@@ -1 +1,2 @@
 export * from './endpoints';
+export { butterSwap } from './ButterSwap';

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

@@ -14,4 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.butterSwap = void 0;
 __exportStar(require("./endpoints"), exports);
+var ButterSwap_1 = require("./ButterSwap");
+Object.defineProperty(exports, "butterSwap", { enumerable: true, get: function () { return ButterSwap_1.butterSwap; } });

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

@@ -75,7 +75,7 @@ const checkTradeStatus = async (input) => {
         // Use toHash as the destination chain tx hash if present
         const destinationTxHash = bridgeInfo.toHash ?? undefined;
         const relayerTxHash = bridgeInfo.relayerHash ?? undefined;
-        const relayerExplorerTxLink = bridgeInfo.relayerChain?.scanUrl ?? undefined;
+        const relayerScanUrl = bridgeInfo.relayerChain?.scanUrl ?? undefined;
         // State mapping: 0 = pending, 1 = complete, 6 = refunded/failed
         let status = (() => {
             // Optimistically return Confirmed if we have a destination tx hash, useful to chains with long block
@@ -96,8 +96,8 @@ const checkTradeStatus = async (input) => {
         return {
             status,
             buyTxHash: destinationTxHash,
-            relayerTxHash,
-            relayerExplorerTxLink,
+            swapperTxId: relayerTxHash,
+            swapperTxLink: relayerTxHash && relayerScanUrl ? `${relayerScanUrl}tx/${relayerTxHash}` : undefined,
             message: undefined,
         };
     }

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

@@ -148,7 +148,7 @@ vitest_1.vi.mock('../xhr', () => ({
             state: 1,
             toHash: 'dest-tx',
             relayerHash: 'relayer-tx',
-            relayerChain: { scanUrl: 'https://scan.url' },
+            relayerChain: { scanUrl: 'https://scan.url/' },
         };
         vitest_1.vi.mocked(xhr.getBridgeInfoBySourceHash).mockResolvedValue((0, monads_1.Ok)(mockBridgeInfo));
         const input = {
@@ -174,8 +174,8 @@ vitest_1.vi.mock('../xhr', () => ({
         (0, vitest_1.expect)(result).toEqual({
             status: unchained_client_1.TxStatus.Confirmed,
             buyTxHash: 'dest-tx',
-            relayerTxHash: 'relayer-tx',
-            relayerExplorerTxLink: 'https://scan.url',
+            swapperTxId: 'relayer-tx',
+            swapperTxLink: 'https://scan.url/tx/relayer-tx',
             message: undefined,
         });
     });

package/dist/cjs/swappers/ButterSwap/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 getTradeQuote: (input: CommonTradeQuoteInput, _deps: SwapperDeps) => Promise<Result<TradeQuote[], SwapErrorRight>>;
+import type { SwapErrorRight, SwapperDeps, TradeQuote } from '../../../types';
+import type { ButterSwapTradeQuoteInput } from '../types';
+export declare const getTradeQuote: (input: ButterSwapTradeQuoteInput, deps: SwapperDeps) => Promise<Result<TradeQuote[], SwapErrorRight>>;