@shapeshiftoss/swapper 14.2.3 → 14.4.0

package/dist/api.d.ts

@@ -84,7 +84,7 @@ declare type CommonTradeInput = {
 };
 export declare type EvmSupportedChainIds = KnownChainIds.EthereumMainnet | KnownChainIds.AvalancheMainnet;
 export declare type CosmosSdkSupportedChainIds = KnownChainIds.CosmosMainnet | KnownChainIds.OsmosisMainnet | KnownChainIds.ThorchainMainnet;
-export declare type EvmSupportedChainAdapters = ethereum.ChainAdapter | avalanche.ChainAdapter;
+export declare type EvmSupportedChainAdapter = 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 & {

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

@@ -1,7 +1,8 @@
 import { Asset } from '@shapeshiftoss/asset-service';
 import { AssetId, ChainId } from '@shapeshiftoss/caip';
-import { KnownChainIds } from '@shapeshiftoss/types';
-import type { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, BuildTradeInput, BuyAssetBySellIdInput, ExecuteTradeInput, GetTradeQuoteInput, Swapper, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
+import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
+import Web3 from 'web3';
+import type { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, BuildTradeInput, BuyAssetBySellIdInput, EvmSupportedChainIds, ExecuteTradeInput, GetTradeQuoteInput, Swapper, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
 import { SwapperName, SwapperType } from '../../api';
 import { ThorchainSwapperDeps } from './types';
 export * from './types';
@@ -12,12 +13,16 @@ export declare class ThorchainSwapper implements Swapper<ChainId> {
     private supportedSellAssetIds;
     private supportedBuyAssetIds;
     deps: ThorchainSwapperDeps;
+    daemonUrl: string;
+    midgardUrl: string;
+    adapterManager: ChainAdapterManager;
+    web3: Web3;
     constructor(deps: ThorchainSwapperDeps);
     initialize(): Promise<void>;
     getType(): SwapperType;
-    getUsdRate(input: Pick<Asset, 'symbol' | 'assetId'>): Promise<string>;
-    approvalNeeded(input: ApprovalNeededInput<KnownChainIds.EthereumMainnet>): Promise<ApprovalNeededOutput>;
-    approveInfinite(input: ApproveInfiniteInput<KnownChainIds.EthereumMainnet>): Promise<string>;
+    getUsdRate({ assetId }: Pick<Asset, 'assetId'>): Promise<string>;
+    approvalNeeded(input: ApprovalNeededInput<EvmSupportedChainIds>): Promise<ApprovalNeededOutput>;
+    approveInfinite(input: ApproveInfiniteInput<EvmSupportedChainIds>): Promise<string>;
     approveAmount(): Promise<string>;
     filterBuyAssetsBySellAssetId(args: BuyAssetBySellIdInput): AssetId[];
     filterAssetIdsBySellable(): AssetId[];

package/dist/swappers/thorchain/ThorchainSwapper.js

@@ -36,6 +36,7 @@ class ThorchainSwapper {
             [types_1.KnownChainIds.BitcoinCashMainnet]: true,
             [types_1.KnownChainIds.CosmosMainnet]: true,
             [types_1.KnownChainIds.ThorchainMainnet]: true,
+            [types_1.KnownChainIds.AvalancheMainnet]: true,
         };
         this.buySupportedChainIds = {
             [types_1.KnownChainIds.EthereumMainnet]: true,
@@ -45,31 +46,28 @@ class ThorchainSwapper {
             [types_1.KnownChainIds.BitcoinCashMainnet]: true,
             [types_1.KnownChainIds.CosmosMainnet]: true,
             [types_1.KnownChainIds.ThorchainMainnet]: true,
+            [types_1.KnownChainIds.AvalancheMainnet]: true,
         };
-        this.supportedSellAssetIds = [];
-        this.supportedBuyAssetIds = [];
+        this.supportedSellAssetIds = [caip_1.thorchainAssetId];
+        this.supportedBuyAssetIds = [caip_1.thorchainAssetId];
         this.deps = deps;
+        this.daemonUrl = deps.daemonUrl;
+        this.midgardUrl = deps.midgardUrl;
+        this.adapterManager = deps.adapterManager;
+        this.web3 = deps.web3;
     }
     async initialize() {
         try {
             const { data: allPools } = await thorService_1.thorService.get(`${this.deps.daemonUrl}/lcd/thorchain/pools`);
             const availablePools = allPools.filter((pool) => pool.status === 'Available');
-            this.supportedSellAssetIds = availablePools.reduce((acc, pool) => {
+            availablePools.forEach((pool) => {
                 const assetId = caip_1.adapters.poolAssetIdToAssetId(pool.asset);
-                if (!assetId || !this.sellSupportedChainIds[(0, caip_1.fromAssetId)(assetId).chainId])
-                    return acc;
-                acc.push(assetId);
-                return acc;
-            }, []);
-            this.supportedSellAssetIds.push(caip_1.thorchainAssetId);
-            this.supportedBuyAssetIds = availablePools.reduce((acc, pool) => {
-                const assetId = caip_1.adapters.poolAssetIdToAssetId(pool.asset);
-                if (!assetId || !this.buySupportedChainIds[(0, caip_1.fromAssetId)(assetId).chainId])
-                    return acc;
-                acc.push(assetId);
-                return acc;
-            }, []);
-            this.supportedBuyAssetIds.push(caip_1.thorchainAssetId);
+                if (!assetId)
+                    return;
+                const { chainId } = (0, caip_1.fromAssetId)(assetId);
+                this.sellSupportedChainIds[chainId] && this.supportedSellAssetIds.push(assetId);
+                this.buySupportedChainIds[chainId] && this.supportedBuyAssetIds.push(assetId);
+            });
         }
         catch (e) {
             throw new api_1.SwapError('[thorchainInitialize]: initialize failed to set supportedAssetIds', {
@@ -81,8 +79,8 @@ class ThorchainSwapper {
     getType() {
         return api_1.SwapperType.Thorchain;
     }
-    getUsdRate(input) {
-        return (0, getUsdRate_1.getUsdRate)({ deps: this.deps, input });
+    async getUsdRate({ assetId }) {
+        return (0, getUsdRate_1.getUsdRate)(this.daemonUrl, assetId);
     }
     async approvalNeeded(input) {
         return (0, thorTradeApprovalNeeded_1.thorTradeApprovalNeeded)({ deps: this.deps, input });
@@ -165,7 +163,7 @@ class ThorchainSwapper {
         }
     }
     async getTradeTxs(tradeResult) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d;
         try {
             const midgardTxid = tradeResult.tradeId.startsWith('0x')
                 ? tradeResult.tradeId.slice(2)
@@ -183,12 +181,15 @@ class ThorchainSwapper {
                     code: api_1.SwapErrorTypes.TRADE_FAILED,
                     cause: data,
                 });
-            const standardBuyTxid = ((_g = (_f = (_e = data === null || data === void 0 ? void 0 : data.actions[0]) === null || _e === void 0 ? void 0 : _e.out[0]) === null || _f === void 0 ? void 0 : _f.coins[0]) === null || _g === void 0 ? void 0 : _g.asset.startsWith('ETH.'))
-                ? `0x${buyTxid}`
-                : buyTxid;
+            const standardBuyTxid = (() => {
+                var _a, _b, _c;
+                const outCoinAsset = (_c = (_b = (_a = data === null || data === void 0 ? void 0 : data.actions[0]) === null || _a === void 0 ? void 0 : _a.out[0]) === null || _b === void 0 ? void 0 : _b.coins[0]) === null || _c === void 0 ? void 0 : _c.asset;
+                const isEvmCoinAsset = (outCoinAsset === null || outCoinAsset === void 0 ? void 0 : outCoinAsset.startsWith('ETH.')) || (outCoinAsset === null || outCoinAsset === void 0 ? void 0 : outCoinAsset.startsWith('AVAX.'));
+                return isEvmCoinAsset ? `0x${buyTxid}` : buyTxid;
+            })().toLowerCase();
             return {
                 sellTxid: tradeResult.tradeId,
-                buyTxid: standardBuyTxid.toLowerCase(),
+                buyTxid: standardBuyTxid,
             };
         }
         catch (e) {

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

@@ -1,7 +1,9 @@
 import { ChainId } from '@shapeshiftoss/caip';
 import { BuildTradeInput } from '../../../api';
 import { ThorchainSwapperDeps, ThorTrade } from '../types';
-export declare const buildTrade: ({ deps, input, }: {
+declare type BuildTradeArgs = {
     deps: ThorchainSwapperDeps;
     input: BuildTradeInput;
-}) => Promise<ThorTrade<ChainId>>;
+};
+export declare const buildTrade: ({ deps, input }: BuildTradeArgs) => Promise<ThorTrade<ChainId>>;
+export {};

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

@@ -8,8 +8,8 @@ const constants_1 = require("../../utils/constants");
 const getTradeQuote_1 = require("../getThorTradeQuote/getTradeQuote");
 const getThorTxData_1 = require("../utils/bitcoin/utils/getThorTxData");
 const getCosmosTxData_1 = require("../utils/cosmos/getCosmosTxData");
-const makeTradeTx_1 = require("../utils/ethereum/makeTradeTx");
-const buildTrade = async ({ deps, input, }) => {
+const makeTradeTx_1 = require("../utils/evm/makeTradeTx");
+const buildTrade = async ({ deps, input }) => {
     var _a, _b, _c, _d;
     try {
         const { buyAsset, receiveAddress: destinationAddress, sellAmountCryptoPrecision, sellAsset, bip44Params, slippage: slippageTolerance = constants_1.DEFAULT_SLIPPAGE, wallet, sendMax, } = input;
@@ -38,7 +38,7 @@ const buildTrade = async ({ deps, input, }) => {
                 buyAssetTradeFeeUsd: quote.feeData.buyAssetTradeFeeUsd,
             });
             return {
-                chainId: types_1.KnownChainIds.EthereumMainnet,
+                chainId: sellAsset.chainId,
                 ...quote,
                 receiveAddress: destinationAddress,
                 txData: ethTradeTx.txToSign,

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

@@ -12,8 +12,8 @@ const getInboundAddressDataForChain_1 = require("../utils/getInboundAddressDataF
 const getTradeRate_1 = require("../utils/getTradeRate/getTradeRate");
 const getUsdRate_1 = require("../utils/getUsdRate/getUsdRate");
 const isRune_1 = require("../utils/isRune/isRune");
-const getBtcTxFees_1 = require("../utils/txFeeHelpers/btcTxFees/getBtcTxFees");
-const getEthTxFees_1 = require("../utils/txFeeHelpers/ethTxFees/getEthTxFees");
+const getEvmTxFees_1 = require("../utils/txFeeHelpers/evmTxFees/getEvmTxFees");
+const getUtxoTxFees_1 = require("../utils/txFeeHelpers/utxoTxFees/getUtxoTxFees");
 const getThorTradeQuote = async ({ deps, input }) => {
     const { sellAsset, buyAsset, sellAmountCryptoPrecision, bip44Params, chainId, receiveAddress, sendMax, } = input;
     if (!bip44Params) {
@@ -36,11 +36,8 @@ const getThorTradeQuote = async ({ deps, input }) => {
             ? constants_2.RUNE_OUTBOUND_TRANSACTION_FEE_CRYPTO_HUMAN.toString()
             : (0, bignumber_1.fromBaseUnit)((0, bignumber_1.bnOrZero)(buyAssetAddressData === null || buyAssetAddressData === void 0 ? void 0 : buyAssetAddressData.outbound_fee), constants_3.THORCHAIN_FIXED_PRECISION);
         const buyAssetChainFeeAssetId = buyAdapter.getFeeAssetId();
-        const sellAssetUsdRate = await (0, getUsdRate_1.getUsdRate)({ deps, input: { assetId: sellAsset.assetId } });
-        const buyFeeAssetUsdRate = await (0, getUsdRate_1.getUsdRate)({
-            deps,
-            input: { assetId: buyAssetChainFeeAssetId },
-        });
+        const sellAssetUsdRate = await (0, getUsdRate_1.getUsdRate)(deps.daemonUrl, sellAsset.assetId);
+        const buyFeeAssetUsdRate = await (0, getUsdRate_1.getUsdRate)(deps.daemonUrl, buyAssetChainFeeAssetId);
         const buyAssetTradeFeeUsd = (0, bignumber_1.bn)(buyFeeAssetUsdRate)
             .times(estimatedBuyAssetTradeFeeFeeAssetCryptoHuman)
             .toString();
@@ -67,12 +64,13 @@ const getThorTradeQuote = async ({ deps, input }) => {
         switch (chainNamespace) {
             case caip_1.CHAIN_NAMESPACE.Evm:
                 return (async () => {
-                    const ethAddressData = await (0, getInboundAddressDataForChain_1.getInboundAddressDataForChain)(deps.daemonUrl, caip_1.ethAssetId);
+                    const sellChainFeeAssetId = sellAdapter.getFeeAssetId();
+                    const ethAddressData = await (0, getInboundAddressDataForChain_1.getInboundAddressDataForChain)(deps.daemonUrl, sellChainFeeAssetId);
                     const router = ethAddressData === null || ethAddressData === void 0 ? void 0 : ethAddressData.router;
                     if (!router)
-                        throw new api_1.SwapError('[getThorTradeQuote] No router address found for ETH');
-                    const feeData = await (0, getEthTxFees_1.getEthTxFees)({
-                        adapterManager: deps.adapterManager,
+                        throw new api_1.SwapError(`[getThorTradeQuote] No router address found for ${sellChainFeeAssetId}`);
+                    const feeData = await (0, getEvmTxFees_1.getEvmTxFees)({
+                        adapter: sellAdapter,
                         sellAssetReference,
                         buyAssetTradeFeeUsd,
                     });
@@ -94,7 +92,7 @@ const getThorTradeQuote = async ({ deps, input }) => {
                         xpub: input.xpub,
                         buyAssetTradeFeeUsd,
                     });
-                    const feeData = await (0, getBtcTxFees_1.getBtcTxFees)({
+                    const feeData = await (0, getUtxoTxFees_1.getUtxoTxFees)({
                         sellAmountCryptoPrecision,
                         vault,
                         opReturnData,

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

@@ -4,20 +4,6 @@ import type { BTCSignTx, CosmosSignTx, ETHSignTx } from '@shapeshiftoss/hdwallet
 import { KnownChainIds } from '@shapeshiftoss/types';
 import type Web3 from 'web3';
 import type { Trade, UtxoSupportedChainIds } from '../../api';
-export declare type MidgardPoolResponse = {
-    asset: string;
-    assetDepth: string;
-    assetPrice: string;
-    assetPriceUSD: string;
-    liquidityUnits: string;
-    poolAPY: string;
-    runeDepth: string;
-    status: string;
-    synthSupply: string;
-    synthUnits: string;
-    units: string;
-    volume24h: string;
-};
 export declare type ThornodePoolResponse = {
     LP_units: string;
     asset: string;
@@ -71,13 +57,13 @@ export interface BtcThorTrade<C extends ChainId> extends Trade<C> {
     chainId: UtxoSupportedChainIds;
     txData: BTCSignTx;
 }
-export interface EthThorTrade<C extends ChainId> extends Trade<C> {
-    chainId: KnownChainIds.EthereumMainnet;
+export interface EvmThorTrade<C extends ChainId> extends Trade<C> {
+    chainId: KnownChainIds.EthereumMainnet | KnownChainIds.AvalancheMainnet;
     txData: ETHSignTx;
 }
 export interface CosmosThorTrade<C extends ChainId> extends Trade<C> {
     chainId: KnownChainIds.CosmosMainnet;
     txData: CosmosSignTx;
 }
-export declare type ThorTrade<C extends ChainId> = BtcThorTrade<C> | EthThorTrade<C> | CosmosThorTrade<C>;
+export declare type ThorTrade<C extends ChainId> = BtcThorTrade<C> | EvmThorTrade<C> | CosmosThorTrade<C>;
 export {};

package/dist/swappers/thorchain/utils/{ethereum → evm}/makeTradeTx.d.ts

@@ -1,7 +1,7 @@
 import { Asset } from '@shapeshiftoss/asset-service';
-import { ethereum } from '@shapeshiftoss/chain-adapters';
 import { ETHSignTx, HDWallet } from '@shapeshiftoss/hdwallet-core';
 import { BIP44Params } from '@shapeshiftoss/types';
+import { EvmSupportedChainAdapter } from '../../../../api';
 import type { ThorchainSwapperDeps } from '../../types';
 declare type MakeTradeTxArgs = {
     wallet: HDWallet;
@@ -10,7 +10,7 @@ declare type MakeTradeTxArgs = {
     buyAsset: Asset;
     sellAsset: Asset;
     destinationAddress: string;
-    adapter: ethereum.ChainAdapter;
+    adapter: EvmSupportedChainAdapter;
     slippageTolerance: string;
     deps: ThorchainSwapperDeps;
     gasLimit: string;

package/dist/swappers/thorchain/utils/getLimit/getLimit.js

@@ -26,11 +26,8 @@ const getLimit = async ({ sellAsset, buyAssetId, sellAmountCryptoPrecision, deps
             details: { sellAssetChainFeeAssetId, buyAssetChainFeeAssetId },
         });
     }
-    const sellFeeAssetUsdRate = await (0, getUsdRate_1.getUsdRate)({
-        deps,
-        input: { assetId: sellAssetChainFeeAssetId },
-    });
-    const buyAssetUsdRate = await (0, getUsdRate_1.getUsdRate)({ deps, input: { assetId: buyAssetId } });
+    const sellFeeAssetUsdRate = await (0, getUsdRate_1.getUsdRate)(deps.daemonUrl, sellAssetChainFeeAssetId);
+    const buyAssetUsdRate = await (0, getUsdRate_1.getUsdRate)(deps.daemonUrl, buyAssetId);
     const expectedBuyAmountCryptoPrecision8 = (0, bignumber_1.toBaseUnit)((0, bignumber_1.fromBaseUnit)((0, bignumber_1.bnOrZero)(sellAmountCryptoPrecision).times(tradeRate), sellAsset.precision), constants_2.THORCHAIN_FIXED_PRECISION);
     const isValidSlippageRange = (0, bignumber_1.bnOrZero)(slippageTolerance).gte(0) && (0, bignumber_1.bnOrZero)(slippageTolerance).lte(1);
     if ((0, bignumber_1.bnOrZero)(expectedBuyAmountCryptoPrecision8).lt(0) || !isValidSlippageRange)

package/dist/swappers/thorchain/utils/getUsdRate/getUsdRate.d.ts

@@ -1,6 +1,2 @@
-import { Asset } from '@shapeshiftoss/asset-service';
-import { ThorchainSwapperDeps } from '../../types';
-export declare const getUsdRate: ({ deps, input, }: {
-    deps: ThorchainSwapperDeps;
-    input: Pick<Asset, 'assetId'>;
-}) => Promise<string>;
+import { AssetId } from '@shapeshiftoss/caip';
+export declare const getUsdRate: (daemonUrl: string, assetId: AssetId) => Promise<string>;

package/dist/swappers/thorchain/utils/getUsdRate/getUsdRate.js

@@ -6,42 +6,66 @@ const api_1 = require("../../../../api");
 const bignumber_1 = require("../../../utils/bignumber");
 const isRune_1 = require("../isRune/isRune");
 const thorService_1 = require("../thorService");
-const THOR_PRECISION = 8;
-// not sure what to do for rune usd rate - inverting USDC pool rate for now
-const usdcPool = 'ETH.USDC-0XA0B86991C6218B36C1D19D4A2E9EB0CE3606EB48';
-const getUsdRate = async ({ deps, input, }) => {
-    const { assetId } = input;
+const PRECISION = 18;
+const USD_POOLS = Object.freeze([
+    'AVAX.USDC-0XB97EF9EF8734C71904D8002F8B6BC66DD9C48A6E',
+    'BNB.BUSD-BD1',
+    'ETH.USDC-0XA0B86991C6218B36C1D19D4A2E9EB0CE3606EB48',
+    'ETH.USDT-0XDAC17F958D2EE523A2206206994597C13D831EC7',
+]);
+// calculate rune usd price from a usd pool (ex. USDC_POOL)
+const getRuneUsdPrice = async (daemonUrl) => {
+    const { data } = await thorService_1.thorService.get(`${daemonUrl}/lcd/thorchain/pools`);
+    const availableUsdPools = data.filter((pool) => pool.status === 'Available' && USD_POOLS.includes(pool.asset));
+    const { aggregatedRuneUsdPrice, numPools } = availableUsdPools.reduce((prev, pool) => {
+        const usdBalance = (0, bignumber_1.bnOrZero)(pool.balance_asset);
+        const runeBalance = (0, bignumber_1.bnOrZero)(pool.balance_rune);
+        if (usdBalance.isZero() || runeBalance.isZero())
+            return prev;
+        // usdBalance / runeBalance = runeUsdPrice
+        const runeUsdPrice = usdBalance.div(runeBalance);
+        prev.aggregatedRuneUsdPrice = prev.aggregatedRuneUsdPrice.plus(runeUsdPrice);
+        prev.numPools++;
+        return prev;
+    }, { aggregatedRuneUsdPrice: (0, bignumber_1.bn)(0), numPools: 0 });
+    if (!numPools) {
+        throw new api_1.SwapError('[getUsdRate]: no available usd pools', {
+            code: api_1.SwapErrorTypes.USD_RATE_FAILED,
+        });
+    }
+    // aggregatedRuneUsdPrice / numPools = averageRuneUsdPrice
+    return aggregatedRuneUsdPrice.div(numPools);
+};
+const getUsdRate = async (daemonUrl, assetId) => {
     try {
-        const thorchainPoolId = (() => {
-            if ((0, isRune_1.isRune)(assetId)) {
-                return usdcPool;
-            }
-            return caip_1.adapters.assetIdToPoolAssetId({ assetId });
-        })();
-        if (!thorchainPoolId) {
-            throw new api_1.SwapError(`[getUsdRate]: No thorchainPoolId found for assetId: ${assetId}`, {
+        if ((0, isRune_1.isRune)(assetId)) {
+            const runeUsdPrice = await getRuneUsdPrice(daemonUrl);
+            return runeUsdPrice.toFixed(PRECISION);
+        }
+        const poolId = caip_1.adapters.assetIdToPoolAssetId({ assetId });
+        if (!poolId) {
+            throw new api_1.SwapError(`[getUsdRate]: no pool found for assetId: ${assetId}`, {
                 code: api_1.SwapErrorTypes.USD_RATE_FAILED,
             });
         }
-        const { data: responseData } = await thorService_1.thorService.get(`${deps.midgardUrl}/pool/${thorchainPoolId}`);
-        const rate = (() => {
-            if ((0, isRune_1.isRune)(assetId)) {
-                const bnRate = (0, bignumber_1.bnOrZero)(responseData === null || responseData === void 0 ? void 0 : responseData.assetPrice);
-                if (bnRate.isZero()) {
-                    throw new api_1.SwapError('[getUsdRate]: cannot invert rate zero', {
-                        code: api_1.SwapErrorTypes.USD_RATE_FAILED,
-                    });
-                }
-                const inverseRate = (0, bignumber_1.bn)(1).div(bnRate);
-                return inverseRate.toFixed(THOR_PRECISION);
-            }
-            return responseData === null || responseData === void 0 ? void 0 : responseData.assetPriceUSD;
-        })();
-        if (!rate)
-            throw new api_1.SwapError(`[getUsdRate]: No rate for ${assetId}`, {
+        const { data } = await thorService_1.thorService.get(`${daemonUrl}/lcd/thorchain/pool/${poolId}`);
+        if (data.status !== 'Available') {
+            throw new api_1.SwapError('[getUsdRate]: pool is no longer available', {
                 code: api_1.SwapErrorTypes.USD_RATE_FAILED,
             });
-        return rate;
+        }
+        const assetBalance = (0, bignumber_1.bnOrZero)(data.balance_asset);
+        const runeBalance = (0, bignumber_1.bnOrZero)(data.balance_rune);
+        if (assetBalance.isZero() || runeBalance.isZero()) {
+            throw new api_1.SwapError('[getUsdRate]: pool has a zero balance', {
+                code: api_1.SwapErrorTypes.USD_RATE_FAILED,
+            });
+        }
+        const runeUsdPrice = await getRuneUsdPrice(daemonUrl);
+        // runeBalance / assetBalance = assetPriceInRune
+        const assetPriceInRune = runeBalance.div(assetBalance);
+        // runeUsdPrice * assetPriceInRune = assetUsdPrice
+        return runeUsdPrice.times(assetPriceInRune).toFixed(PRECISION);
     }
     catch (e) {
         if (e instanceof api_1.SwapError)

package/dist/swappers/thorchain/utils/test-data/responses.d.ts

@@ -1,8 +1,6 @@
-import { InboundAddressResponse, MidgardPoolResponse, ThornodePoolResponse } from '../../types';
-export declare const btcMidgardPool: MidgardPoolResponse;
+import { InboundAddressResponse, ThornodePoolResponse } from '../../types';
 export declare const btcThornodePool: ThornodePoolResponse;
-export declare const ethMidgardPool: MidgardPoolResponse;
 export declare const ethThornodePool: ThornodePoolResponse;
-export declare const foxMidgardPool: MidgardPoolResponse;
 export declare const foxThornodePool: ThornodePoolResponse;
+export declare const usdcThornodePool: ThornodePoolResponse;
 export declare const mockInboundAddresses: InboundAddressResponse[];

package/dist/swappers/thorchain/utils/test-data/responses.js

@@ -1,20 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mockInboundAddresses = exports.foxThornodePool = exports.foxMidgardPool = exports.ethThornodePool = exports.ethMidgardPool = exports.btcThornodePool = exports.btcMidgardPool = void 0;
-exports.btcMidgardPool = {
-    asset: 'BTC.BTC',
-    assetDepth: '91027798705',
-    assetPrice: '10280.68095465986',
-    assetPriceUSD: '29850.505131750208',
-    liquidityUnits: '536055974608843',
-    poolAPY: '0.09305294391574037',
-    runeDepth: '935827756491105',
-    status: 'available',
-    synthSupply: '3281284823',
-    synthUnits: '9838954536080',
-    units: '545894929144923',
-    volume24h: '15031085906495',
-};
+exports.mockInboundAddresses = exports.usdcThornodePool = exports.foxThornodePool = exports.ethThornodePool = exports.btcThornodePool = void 0;
 exports.btcThornodePool = {
     LP_units: '536055974608843',
     asset: 'BTC.BTC',
@@ -27,20 +13,6 @@ exports.btcThornodePool = {
     synth_supply: '3281284823',
     synth_units: '9838954536080',
 };
-exports.ethMidgardPool = {
-    asset: 'ETH.ETH',
-    assetDepth: '915018987646',
-    assetPrice: '676.2118757936507',
-    assetPriceUSD: '1595',
-    liquidityUnits: '273709963437801',
-    poolAPY: '0.10532151323548256',
-    runeDepth: '618746706022909',
-    status: 'available',
-    synthSupply: '3572065751',
-    synthUnits: '535301524652',
-    units: '274245264962453',
-    volume24h: '9890096673763',
-};
 exports.ethThornodePool = {
     LP_units: '273709963437801',
     asset: 'ETH.ETH',
@@ -53,20 +25,6 @@ exports.ethThornodePool = {
     synth_supply: '3572065751',
     synth_units: '535301524652',
 };
-exports.foxMidgardPool = {
-    asset: 'ETH.FOX-0XC770EEFAD204B5180DF6A14EE197D99D808EE52D',
-    assetDepth: '166650912393467',
-    assetPrice: '0.05303710198887871',
-    assetPriceUSD: '0.15399605260336216',
-    liquidityUnits: '10015457121887',
-    poolAPY: '0.2597568967423438',
-    runeDepth: '8838681437152',
-    status: 'available',
-    synthSupply: '17428372569375',
-    synthUnits: '552604585625',
-    units: '10568061707512',
-    volume24h: '251596933033',
-};
 exports.foxThornodePool = {
     LP_units: '10015457121887',
     asset: 'ETH.FOX-0XC770EEFAD204B5180DF6A14EE197D99D808EE52D',
@@ -79,6 +37,18 @@ exports.foxThornodePool = {
     synth_supply: '17428372569375',
     synth_units: '552604585625',
 };
+exports.usdcThornodePool = {
+    LP_units: '30018075345020',
+    asset: 'ETH.USDC-0XA0B86991C6218B36C1D19D4A2E9EB0CE3606EB48',
+    balance_asset: '290355330190652994811',
+    balance_rune: '100000000000000000000',
+    pending_inbound_asset: '22020062300',
+    pending_inbound_rune: '0',
+    pool_units: '31954495292990',
+    status: 'Available',
+    synth_supply: '25598723155460',
+    synth_units: '1936419947970',
+};
 exports.mockInboundAddresses = [
     {
         chain: 'BCH',

package/dist/swappers/thorchain/utils/txFeeHelpers/evmTxFees/getEvmTxFees.d.ts

@@ -0,0 +1,9 @@
+import { AssetReference } from '@shapeshiftoss/caip';
+import { EvmSupportedChainAdapter, EvmSupportedChainIds, QuoteFeeData } from '../../../../../api';
+declare type GetEvmTxFeesArgs = {
+    adapter: EvmSupportedChainAdapter;
+    sellAssetReference: AssetReference | string;
+    buyAssetTradeFeeUsd: string;
+};
+export declare const getEvmTxFees: ({ adapter, sellAssetReference, buyAssetTradeFeeUsd, }: GetEvmTxFeesArgs) => Promise<QuoteFeeData<EvmSupportedChainIds>>;
+export {};

package/dist/swappers/thorchain/utils/txFeeHelpers/{ethTxFees/getEthTxFees.js → evmTxFees/getEvmTxFees.js}

@@ -1,21 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEthTxFees = void 0;
+exports.getEvmTxFees = void 0;
 const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
-const types_1 = require("@shapeshiftoss/types");
 const api_1 = require("../../../../../api");
 const bignumber_1 = require("../../../../utils/bignumber");
 const constants_1 = require("../../../../utils/constants");
 const constants_2 = require("../../constants");
-const getEthTxFees = async ({ adapterManager, sellAssetReference, buyAssetTradeFeeUsd, }) => {
+const getEvmTxFees = async ({ adapter, sellAssetReference, buyAssetTradeFeeUsd, }) => {
     try {
-        const adapter = adapterManager.get(types_1.KnownChainIds.EthereumMainnet);
-        if (!adapter) {
-            throw new api_1.SwapError(`[getThorTxInfo] - No chain adapter found for ${types_1.KnownChainIds.EthereumMainnet}.`, {
-                code: api_1.SwapErrorTypes.UNSUPPORTED_CHAIN,
-                details: { chainId: types_1.KnownChainIds.EthereumMainnet },
-            });
-        }
         const gasFeeData = await adapter.getGasFeeData();
         // this is a good value to cover all thortrades out of eth/erc20
         // in the future we may want to look at doing this more precisely and in a future-proof way
@@ -50,4 +42,4 @@ const getEthTxFees = async ({ adapterManager, sellAssetReference, buyAssetTradeF
         throw new api_1.SwapError('[getThorTxInfo]', { cause: e, code: api_1.SwapErrorTypes.TRADE_QUOTE_FAILED });
     }
 };
-exports.getEthTxFees = getEthTxFees;
+exports.getEvmTxFees = getEvmTxFees;

package/dist/swappers/thorchain/utils/txFeeHelpers/{btcTxFees/getBtcTxFees.d.ts → utxoTxFees/getUtxoTxFees.d.ts}

@@ -1,6 +1,6 @@
 import { UtxoBaseAdapter } from '@shapeshiftoss/chain-adapters';
 import { QuoteFeeData, UtxoSupportedChainIds } from '../../../../../api';
-declare type GetBtcTxFeesInput = {
+declare type GetUtxoTxFeesInput = {
     opReturnData: string;
     vault: string;
     sellAmountCryptoPrecision: string;
@@ -9,5 +9,5 @@ declare type GetBtcTxFeesInput = {
     buyAssetTradeFeeUsd: string;
     sendMax: boolean;
 };
-export declare const getBtcTxFees: ({ opReturnData, vault, sellAmountCryptoPrecision, sellAdapter, pubkey, buyAssetTradeFeeUsd, sendMax, }: GetBtcTxFeesInput) => Promise<QuoteFeeData<UtxoSupportedChainIds>>;
+export declare const getUtxoTxFees: ({ opReturnData, vault, sellAmountCryptoPrecision, sellAdapter, pubkey, buyAssetTradeFeeUsd, sendMax, }: GetUtxoTxFeesInput) => Promise<QuoteFeeData<UtxoSupportedChainIds>>;
 export {};

package/dist/swappers/thorchain/utils/txFeeHelpers/{btcTxFees/getBtcTxFees.js → utxoTxFees/getUtxoTxFees.js}

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBtcTxFees = void 0;
+exports.getUtxoTxFees = void 0;
 const types_1 = require("@shapeshiftoss/types");
 const api_1 = require("../../../../../api");
 const bignumber_1 = require("../../../../utils/bignumber");
-const getBtcTxFees = async ({ opReturnData, vault, sellAmountCryptoPrecision, sellAdapter, pubkey, buyAssetTradeFeeUsd, sendMax, }) => {
+const getUtxoTxFees = async ({ opReturnData, vault, sellAmountCryptoPrecision, sellAdapter, pubkey, buyAssetTradeFeeUsd, sendMax, }) => {
     try {
         const feeDataOptions = await sellAdapter.getFeeData({
             to: vault,
@@ -38,7 +38,7 @@ const getBtcTxFees = async ({ opReturnData, vault, sellAmountCryptoPrecision, se
     catch (e) {
         if (e instanceof api_1.SwapError)
             throw e;
-        throw new api_1.SwapError('[getBtcTxFeess]', { cause: e, code: api_1.SwapErrorTypes.TRADE_QUOTE_FAILED });
+        throw new api_1.SwapError('[getUtxoTxFees]', { cause: e, code: api_1.SwapErrorTypes.TRADE_QUOTE_FAILED });
     }
 };
-exports.getBtcTxFees = getBtcTxFees;
+exports.getUtxoTxFees = getUtxoTxFees;

package/dist/swappers/utils/helpers/helpers.d.ts

@@ -2,10 +2,10 @@ import { Asset } from '@shapeshiftoss/asset-service';
 import { HDWallet } from '@shapeshiftoss/hdwallet-core';
 import Web3 from 'web3';
 import { AbiItem } from 'web3-utils';
-import { EvmSupportedChainAdapters, EvmSupportedChainIds, TradeQuote } from '../../../api';
+import { EvmSupportedChainAdapter, EvmSupportedChainIds, TradeQuote } from '../../../api';
 import { BN } from '../bignumber';
 export declare type IsApprovalRequiredArgs = {
-    adapter: EvmSupportedChainAdapters;
+    adapter: EvmSupportedChainAdapter;
     receiveAddress: string;
     allowanceContract: string;
     sellAsset: Asset;
@@ -28,7 +28,7 @@ export declare type GetApproveContractDataArgs = {
 declare type GrantAllowanceArgs<T extends EvmSupportedChainIds> = {
     quote: TradeQuote<T>;
     wallet: HDWallet;
-    adapter: EvmSupportedChainAdapters;
+    adapter: EvmSupportedChainAdapter;
     erc20Abi: AbiItem[];
     web3: Web3;
 };

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

@@ -1,6 +1,6 @@
 import { HDWallet } from '@shapeshiftoss/hdwallet-core';
 import type Web3 from 'web3';
-import { EvmSupportedChainAdapters, EvmSupportedChainIds, SwapSource, Trade } from '../../api';
+import { EvmSupportedChainAdapter, EvmSupportedChainIds, SwapSource, Trade } from '../../api';
 export declare type ZrxCommonResponse = {
     price: string;
     gasPrice: string;
@@ -26,6 +26,6 @@ export declare type ZrxExecuteTradeInput<T extends EvmSupportedChainIds> = {
     wallet: HDWallet;
 };
 export declare type ZrxSwapperDeps = {
-    adapter: EvmSupportedChainAdapters;
+    adapter: EvmSupportedChainAdapter;
     web3: Web3;
 };

package/package.json

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

package/dist/swappers/thorchain/utils/txFeeHelpers/ethTxFees/getEthTxFees.d.ts

@@ -1,9 +0,0 @@
-import { AssetReference } from '@shapeshiftoss/caip';
-import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
-import { KnownChainIds } from '@shapeshiftoss/types';
-import { QuoteFeeData } from '../../../../../api';
-export declare const getEthTxFees: ({ adapterManager, sellAssetReference, buyAssetTradeFeeUsd, }: {
-    adapterManager: ChainAdapterManager;
-    sellAssetReference: AssetReference | string;
-    buyAssetTradeFeeUsd: string;
-}) => Promise<QuoteFeeData<KnownChainIds.EthereumMainnet>>;