@shapeshiftoss/swapper 9.8.0 → 9.10.1

package/dist/api.d.ts

@@ -42,6 +42,18 @@ declare type ChainSpecificQuoteFeeData<T extends ChainId> = ChainSpecific<T, {
         byteCount: string;
         satsPerByte: string;
     };
+    [KnownChainIds.DogecoinMainnet]: {
+        byteCount: string;
+        satsPerByte: string;
+    };
+    [KnownChainIds.LitecoinMainnet]: {
+        byteCount: string;
+        satsPerByte: string;
+    };
+    [KnownChainIds.BitcoinCashMainnet]: {
+        byteCount: string;
+        satsPerByte: string;
+    };
     [KnownChainIds.CosmosMainnet]: {
         estimatedGas: string;
     };
@@ -74,19 +86,20 @@ export declare type EvmSupportedChainIds = KnownChainIds.EthereumMainnet | Known
 export declare type CosmosSdkSupportedChainIds = KnownChainIds.CosmosMainnet | KnownChainIds.OsmosisMainnet;
 export declare type EvmSupportedChainAdapters = ethereum.ChainAdapter | avalanche.ChainAdapter;
 export declare type CosmosSdkSupportedChainAdapters = cosmos.ChainAdapter | osmosis.ChainAdapter;
+export declare type UtxoSupportedChainIds = KnownChainIds.BitcoinMainnet | KnownChainIds.DogecoinMainnet | KnownChainIds.LitecoinMainnet | KnownChainIds.BitcoinCashMainnet;
 export declare type GetEvmTradeQuoteInput = CommonTradeInput & {
     chainId: EvmSupportedChainIds;
 };
 export declare type GetCosmosSdkTradeQuoteInput = CommonTradeInput & {
     chainId: CosmosSdkSupportedChainIds;
 };
-declare type GetBtcTradeQuoteInput = CommonTradeInput & {
-    chainId: KnownChainIds.BitcoinMainnet;
+export declare type GetUtxoTradeQuoteInput = CommonTradeInput & {
+    chainId: UtxoSupportedChainIds;
     accountType: UtxoAccountType;
     bip44Params: BIP44Params;
     wallet: HDWallet;
 };
-export declare type GetTradeQuoteInput = GetBtcTradeQuoteInput | GetEvmTradeQuoteInput | GetCosmosSdkTradeQuoteInput;
+export declare type GetTradeQuoteInput = GetUtxoTradeQuoteInput | GetEvmTradeQuoteInput | GetCosmosSdkTradeQuoteInput;
 export declare type BuildTradeInput = GetTradeQuoteInput & {
     slippage?: string;
     wallet: HDWallet;

package/dist/swappers/cow/cowBuildTrade/cowBuildTrade.js

@@ -65,20 +65,12 @@ async function cowBuildTrade(deps, input) {
             spenderAddress: constants_1.COW_SWAP_VAULT_RELAYER_ADDRESS,
             contractAddress: sellAssetErc20Address
         });
-        const [feeDataOptions, sellAssetUsdRate] = await Promise.all([
-            adapter.getFeeData({
-                to: sellAssetErc20Address,
-                value: '0',
-                chainSpecific: { from: receiveAddress, contractData: data }
-            }),
-            (0, helpers_2.getUsdRate)(deps, sellAsset)
-        ]);
+        const feeDataOptions = await adapter.getFeeData({
+            to: sellAssetErc20Address,
+            value: '0',
+            chainSpecific: { from: receiveAddress, contractData: data }
+        });
         const feeData = feeDataOptions['fast'];
-        // calculating trade fee in USD
-        const tradeFeeFiat = (0, bignumber_1.bnOrZero)(quote.feeAmount)
-            .div((0, bignumber_1.bn)(10).exponentiatedBy(sellAsset.precision))
-            .multipliedBy((0, bignumber_1.bnOrZero)(sellAssetUsdRate))
-            .toString();
         const trade = {
             rate,
             feeData: {
@@ -87,7 +79,7 @@ async function cowBuildTrade(deps, input) {
                     estimatedGas: feeData.chainSpecific.gasLimit,
                     gasPrice: feeData.chainSpecific.gasPrice
                 },
-                tradeFee: tradeFeeFiat
+                tradeFee: '0' // Trade fees for buy Asset are always 0 since trade fees are subtracted from sell asset
             },
             sellAmount: normalizedSellAmount,
             buyAmount: quote.buyAmount,

package/dist/swappers/cow/utils/constants.d.ts

@@ -6,7 +6,7 @@ export declare const DEFAULT_SOURCE: {
     proportion: string;
 }[];
 export declare const DEFAULT_ADDRESS = "0x0000000000000000000000000000000000000000";
-export declare const DEFAULT_APP_DATA = "0x0000000000000000000000000000000000000000000000000000000000000000";
+export declare const DEFAULT_APP_DATA = "0x68a7b5781dfe48bd5d7aeb11261c17517f5c587da682e4fade9b6a00a59b8970";
 export declare const COW_SWAP_VAULT_RELAYER_ADDRESS = "0xc92e8bdf79f0507f65a392b0ab4667716bfe0110";
 export declare const COW_SWAP_SETTLEMENT_ADDRESS = "0x9008D19f58AAbD9eD0D60971565AA8510560ab41";
 export declare const WETH_ASSET_ID = "eip155:1/erc20:0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2";

package/dist/swappers/cow/utils/constants.js

@@ -7,7 +7,7 @@ exports.MAX_COWSWAP_TRADE = '100000000000000000000000000';
 exports.MIN_COWSWAP_VALUE_USD = 20;
 exports.DEFAULT_SOURCE = [{ name: 'CowSwap', proportion: '1' }];
 exports.DEFAULT_ADDRESS = constants_1.AddressZero;
-exports.DEFAULT_APP_DATA = constants_1.HashZero;
+exports.DEFAULT_APP_DATA = '0x68a7b5781dfe48bd5d7aeb11261c17517f5c587da682e4fade9b6a00a59b8970';
 exports.COW_SWAP_VAULT_RELAYER_ADDRESS = '0xc92e8bdf79f0507f65a392b0ab4667716bfe0110';
 exports.COW_SWAP_SETTLEMENT_ADDRESS = '0x9008D19f58AAbD9eD0D60971565AA8510560ab41';
 exports.WETH_ASSET_ID = 'eip155:1/erc20:0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2';

package/dist/swappers/thorchain/ThorchainSwapper.d.ts

@@ -3,6 +3,7 @@ import { AssetId, ChainId } from '@shapeshiftoss/caip';
 import { KnownChainIds } from '@shapeshiftoss/types';
 import { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, BuildTradeInput, BuyAssetBySellIdInput, ExecuteTradeInput, GetTradeQuoteInput, Swapper, SwapperType, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
 import { ThorchainSwapperDeps } from './types';
+export * from './types';
 export declare class ThorchainSwapper implements Swapper<ChainId> {
     readonly name = "Thorchain";
     private sellSupportedChainIds;

package/dist/swappers/thorchain/ThorchainSwapper.js

@@ -1,4 +1,18 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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.ThorchainSwapper = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
@@ -10,12 +24,16 @@ const thorTradeApprovalNeeded_1 = require("./thorTradeApprovalNeeded/thorTradeAp
 const thorTradeApproveInfinite_1 = require("./thorTradeApproveInfinite/thorTradeApproveInfinite");
 const getUsdRate_1 = require("./utils/getUsdRate/getUsdRate");
 const thorService_1 = require("./utils/thorService");
+__exportStar(require("./types"), exports);
 class ThorchainSwapper {
     constructor(deps) {
         this.name = 'Thorchain';
         this.sellSupportedChainIds = {
             [types_1.KnownChainIds.EthereumMainnet]: true,
             [types_1.KnownChainIds.BitcoinMainnet]: true,
+            [types_1.KnownChainIds.DogecoinMainnet]: true,
+            [types_1.KnownChainIds.LitecoinMainnet]: true,
+            [types_1.KnownChainIds.BitcoinCashMainnet]: true,
             [types_1.KnownChainIds.CosmosMainnet]: true
         };
         this.buySupportedChainIds = {
@@ -92,7 +110,8 @@ class ThorchainSwapper {
                     details: { chainId: trade.sellAsset.chainId },
                     fn: 'executeTrade'
                 });
-            if (trade.sellAsset.chainId === types_1.KnownChainIds.EthereumMainnet) {
+            const { chainNamespace } = (0, caip_1.fromAssetId)(trade.sellAsset.assetId);
+            if (chainNamespace === caip_1.CHAIN_NAMESPACE.Ethereum) {
                 const signedTx = await adapter.signTransaction({
                     txToSign: trade.txData,
                     wallet
@@ -100,7 +119,7 @@ class ThorchainSwapper {
                 const txid = await adapter.broadcastTransaction(signedTx);
                 return { tradeId: txid };
             }
-            else if (trade.sellAsset.chainId === types_1.KnownChainIds.BitcoinMainnet) {
+            else if (chainNamespace === caip_1.CHAIN_NAMESPACE.Bitcoin) {
                 const signedTx = await adapter.signTransaction({
                     txToSign: trade.txData,
                     wallet
@@ -108,7 +127,7 @@ class ThorchainSwapper {
                 const txid = await adapter.broadcastTransaction(signedTx);
                 return { tradeId: txid };
             }
-            else if (trade.sellAsset.chainId === types_1.KnownChainIds.CosmosMainnet) {
+            else if (chainNamespace === caip_1.CHAIN_NAMESPACE.Cosmos) {
                 const signedTx = await adapter.signTransaction({
                     txToSign: trade.txData,
                     wallet

package/dist/swappers/thorchain/buildThorTrade/buildThorTrade.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildTrade = void 0;
+const caip_1 = require("@shapeshiftoss/caip");
 const types_1 = require("@shapeshiftoss/types");
 const api_1 = require("../../../api");
 const constants_1 = require("../../utils/constants");
@@ -20,10 +21,11 @@ const buildTrade = async ({ deps, input }) => {
                 fn: 'buildTrade',
                 details: { sellAsset }
             });
-        const sellAssetBip44Params = sellAdapter.buildBIP44Params({
-            accountNumber: sellAssetAccountNumber
-        });
-        if (input.chainId === types_1.KnownChainIds.EthereumMainnet) {
+        const { chainNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
+        if (chainNamespace === caip_1.CHAIN_NAMESPACE.Ethereum) {
+            const sellAssetBip44Params = sellAdapter.buildBIP44Params({
+                accountNumber: sellAssetAccountNumber
+            });
             const ethTradeTx = await (0, makeTradeTx_1.makeTradeTx)({
                 wallet,
                 slippageTolerance,
@@ -45,7 +47,7 @@ const buildTrade = async ({ deps, input }) => {
                 txData: ethTradeTx.txToSign
             };
         }
-        else if (input.chainId === types_1.KnownChainIds.BitcoinMainnet) {
+        else if (chainNamespace === caip_1.CHAIN_NAMESPACE.Bitcoin) {
             const { vault, opReturnData } = await (0, getThorTxData_1.getThorTxInfo)({
                 deps,
                 sellAsset,
@@ -54,7 +56,7 @@ const buildTrade = async ({ deps, input }) => {
                 slippageTolerance,
                 destinationAddress,
                 wallet,
-                bip44Params: sellAssetBip44Params,
+                bip44Params: input.bip44Params,
                 accountType: input.accountType,
                 tradeFee: quote.feeData.tradeFee
             });
@@ -62,6 +64,7 @@ const buildTrade = async ({ deps, input }) => {
                 value: sellAmount,
                 wallet,
                 to: vault,
+                bip44Params: input.bip44Params,
                 chainSpecific: {
                     accountType: input.accountType,
                     satoshiPerByte: quote.feeData.chainSpecific
@@ -70,13 +73,13 @@ const buildTrade = async ({ deps, input }) => {
                 }
             });
             return {
-                chainId: types_1.KnownChainIds.BitcoinMainnet,
+                chainId: sellAsset.chainId,
                 ...quote,
                 receiveAddress: destinationAddress,
                 txData: buildTxResponse.txToSign
             };
         }
-        else if (input.chainId === types_1.KnownChainIds.CosmosMainnet) {
+        else if (chainNamespace === caip_1.CHAIN_NAMESPACE.Cosmos) {
             const txData = await (0, cosmosTxData_1.cosmosTxData)({
                 deps,
                 sellAdapter: sellAdapter,

package/dist/swappers/thorchain/getThorTradeQuote/getTradeQuote.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getThorTradeQuote = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
-const types_1 = require("@shapeshiftoss/types");
 const api_1 = require("../../../api");
 const bignumber_1 = require("../../utils/bignumber");
 const constants_1 = require("../../utils/constants");
@@ -46,8 +45,9 @@ const getThorTradeQuote = async ({ deps, input }) => {
             sellAssetAccountNumber,
             minimum
         };
-        switch (chainId) {
-            case types_1.KnownChainIds.EthereumMainnet:
+        const { chainNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
+        switch (chainNamespace) {
+            case caip_1.CHAIN_NAMESPACE.Ethereum:
                 return (async () => {
                     const { router } = await (0, getThorTxData_2.getThorTxInfo)({
                         deps,
@@ -69,7 +69,7 @@ const getThorTradeQuote = async ({ deps, input }) => {
                         feeData
                     };
                 })();
-            case types_1.KnownChainIds.BitcoinMainnet:
+            case caip_1.CHAIN_NAMESPACE.Bitcoin:
                 return (async () => {
                     const { vault, opReturnData, pubkey } = await (0, getThorTxData_1.getThorTxInfo)({
                         deps,
@@ -88,7 +88,7 @@ const getThorTradeQuote = async ({ deps, input }) => {
                         vault,
                         opReturnData,
                         pubkey,
-                        adapterManager: deps.adapterManager,
+                        sellAdapter: sellAdapter,
                         tradeFee
                     });
                     return {
@@ -97,7 +97,7 @@ const getThorTradeQuote = async ({ deps, input }) => {
                         feeData
                     };
                 })();
-            case types_1.KnownChainIds.CosmosMainnet:
+            case caip_1.CHAIN_NAMESPACE.Cosmos:
                 return (async () => {
                     const feeData = await sellAdapter.getFeeData({});
                     return {

package/dist/swappers/thorchain/types.d.ts

@@ -3,7 +3,7 @@ import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
 import { BTCSignTx, CosmosSignTx, ETHSignTx } from '@shapeshiftoss/hdwallet-core';
 import { KnownChainIds } from '@shapeshiftoss/types';
 import type Web3 from 'web3';
-import { Trade } from '../../api';
+import { Trade, UtxoSupportedChainIds } from '../../api';
 export declare type PoolResponse = {
     asset: string;
     assetDepth: string;
@@ -49,7 +49,7 @@ export declare type ThorchainSwapperDeps = {
     web3: Web3;
 };
 export interface BtcThorTrade<C extends ChainId> extends Trade<C> {
-    chainId: KnownChainIds.BitcoinMainnet;
+    chainId: UtxoSupportedChainIds;
     txData: BTCSignTx;
 }
 export interface EthThorTrade<C extends ChainId> extends Trade<C> {

package/dist/swappers/thorchain/utils/bitcoin/utils/getThorTxData.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getThorTxInfo = void 0;
-const caip_1 = require("@shapeshiftoss/caip");
 const api_1 = require("../../../../../api");
 const getLimit_1 = require("../../getLimit/getLimit");
 const makeSwapMemo_1 = require("../../makeSwapMemo/makeSwapMemo");
@@ -9,12 +8,12 @@ const thorService_1 = require("../../thorService");
 const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmount, slippageTolerance, destinationAddress, wallet, bip44Params, accountType, tradeFee }) => {
     try {
         const { data: inboundAddresses } = await thorService_1.thorService.get(`${deps.midgardUrl}/thorchain/inbound_addresses`);
-        const btcInboundAddresses = inboundAddresses.find((inbound) => inbound.chain === 'BTC');
-        const vault = btcInboundAddresses === null || btcInboundAddresses === void 0 ? void 0 : btcInboundAddresses.address;
+        const sellAssetInboundAddresses = inboundAddresses.find((inbound) => inbound.chain === sellAsset.symbol.toUpperCase());
+        const vault = sellAssetInboundAddresses === null || sellAssetInboundAddresses === void 0 ? void 0 : sellAssetInboundAddresses.address;
         if (!vault)
-            throw new api_1.SwapError(`[getThorTxInfo]: vault not found for BTC`, {
+            throw new api_1.SwapError(`[getThorTxInfo]: vault not found for asset`, {
                 code: api_1.SwapErrorTypes.RESPONSE_ERROR,
-                details: { inboundAddresses }
+                details: { inboundAddresses, sellAsset }
             });
         const limit = await (0, getLimit_1.getLimit)({
             buyAssetId: buyAsset.assetId,
@@ -31,7 +30,7 @@ const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmount, slippageTo
             destinationAddress,
             limit
         });
-        const adapter = deps.adapterManager.get(caip_1.btcChainId);
+        const adapter = deps.adapterManager.get(sellAsset.chainId);
         const pubkey = await adapter.getPublicKey(wallet, bip44Params, accountType);
         return {
             opReturnData: memo,

package/dist/swappers/thorchain/utils/txFeeHelpers/btcTxFees/getBtcTxFees.d.ts

@@ -1,11 +1,10 @@
-import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
-import { KnownChainIds } from '@shapeshiftoss/types';
-import { QuoteFeeData } from '../../../../../api';
-export declare const getBtcTxFees: ({ opReturnData, vault, sellAmount, adapterManager, pubkey, tradeFee }: {
+import { UtxoBaseAdapter } from '@shapeshiftoss/chain-adapters';
+import { QuoteFeeData, UtxoSupportedChainIds } from '../../../../../api';
+export declare const getBtcTxFees: ({ opReturnData, vault, sellAmount, sellAdapter, pubkey, tradeFee }: {
     opReturnData: string;
     vault: string;
     sellAmount: string;
-    adapterManager: ChainAdapterManager;
+    sellAdapter: UtxoBaseAdapter<UtxoSupportedChainIds>;
     pubkey: string;
     tradeFee: string;
-}) => Promise<QuoteFeeData<KnownChainIds.BitcoinMainnet>>;
+}) => Promise<QuoteFeeData<UtxoSupportedChainIds>>;

package/dist/swappers/thorchain/utils/txFeeHelpers/btcTxFees/getBtcTxFees.js

@@ -1,27 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBtcTxFees = void 0;
+const types_1 = require("@shapeshiftoss/types");
 const api_1 = require("../../../../../api");
 const bignumber_1 = require("../../../../utils/bignumber");
-const getBtcTxFees = async ({ opReturnData, vault, sellAmount, adapterManager, pubkey, tradeFee }) => {
+const getBtcTxFees = async ({ opReturnData, vault, sellAmount, sellAdapter, pubkey, tradeFee }) => {
     try {
-        const adapter = adapterManager.get('bip122:000000000019d6689c085ae165831e93');
-        if (!adapter)
-            throw new api_1.SwapError(`[getBtcTxFees] - No chain adapter found for bip122:000000000019d6689c085ae165831e93.`, {
-                code: api_1.SwapErrorTypes.UNSUPPORTED_CHAIN,
-                details: { chainId: 'bip122:000000000019d6689c085ae165831e93' }
-            });
-        const feeDataOptions = await adapter.getFeeData({
+        const feeDataOptions = await sellAdapter.getFeeData({
             to: vault,
             value: sellAmount,
             chainSpecific: { pubkey, opReturnData }
         });
         const feeData = feeDataOptions['fast'];
+        // BCH specific hack:
+        // For some reason when sats per byte comes back as 1 (which is very common for bch)
+        // broadcast will fail because it thinks the intrinsic fee is too low
+        // it feels like possibly an off by-a-few-bytes bug with how we are using coinselect with opReturnData
+        // Bumping BCH fees here resolves this for now until we have time to find a better solution
+        const isFromBch = sellAdapter.getChainId() === types_1.KnownChainIds.BitcoinCashMainnet;
+        const feeMultiplier = isFromBch ? (0, bignumber_1.bn)(1.5) : (0, bignumber_1.bn)(1);
+        const fee = feeMultiplier.times(feeData.txFee).dp(0).toString();
+        const satsPerByte = feeMultiplier.times(feeData.chainSpecific.satoshiPerByte).dp(0).toString();
         return {
-            fee: feeData.txFee,
+            fee,
             tradeFee,
             chainSpecific: {
-                satsPerByte: feeData.chainSpecific.satoshiPerByte,
+                satsPerByte,
                 byteCount: (0, bignumber_1.bn)(feeData.txFee)
                     .dividedBy(feeData.chainSpecific.satoshiPerByte)
                     .dp(0)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "9.8.0",
+  "version": "9.10.1",
   "description": "An interface and implementations to trade coins via various protocols",
   "repository": "https://github.com/shapeshift/lib",
   "license": "MIT",