@shapeshiftoss/swapper 11.3.1 → 11.4.0

package/dist/swappercli.js

@@ -85,7 +85,12 @@ const main = async () => {
     const swapManager = new SwapperManager_1.SwapperManager();
     const zrxSwapper = new ZrxSwapper_1.ZrxSwapper(zrxSwapperDeps);
     swapManager.addSwapper(zrxSwapper);
-    const tcDeps = { midgardUrl: MIDGARD_URL, web3, adapterManager };
+    const tcDeps = {
+        midgardUrl: MIDGARD_URL,
+        daemonUrl: '',
+        web3,
+        adapterManager,
+    };
     const tc = new swappers_1.ThorchainSwapper(tcDeps);
     await tc.initialize();
     swapManager.addSwapper(tc);

package/dist/swappers/thorchain/ThorchainSwapper.js

@@ -50,17 +50,17 @@ class ThorchainSwapper {
     }
     async initialize() {
         try {
-            const { data: responseData } = await thorService_1.thorService.get(`${this.deps.midgardUrl}/pools`);
-            this.supportedSellAssetIds = responseData.reduce((acc, midgardPool) => {
-                const assetId = caip_1.adapters.poolAssetIdToAssetId(midgardPool.asset);
+            const { data } = await thorService_1.thorService.get(`${this.deps.daemonUrl}/lcd/thorchain/pools`);
+            this.supportedSellAssetIds = data.reduce((acc, 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 = responseData.reduce((acc, midgardPool) => {
-                const assetId = caip_1.adapters.poolAssetIdToAssetId(midgardPool.asset);
+            this.supportedBuyAssetIds = data.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);
@@ -164,21 +164,20 @@ class ThorchainSwapper {
             const midgardTxid = tradeResult.tradeId.startsWith('0x')
                 ? tradeResult.tradeId.slice(2)
                 : tradeResult.tradeId;
-            const { data: responseData } = await thorService_1.thorService.get(`${this.deps.midgardUrl}/actions?txid=${midgardTxid}`);
+            const { data } = await thorService_1.thorService.get(`${this.deps.midgardUrl}/actions?txid=${midgardTxid}`);
             // https://gitlab.com/thorchain/thornode/-/blob/develop/common/tx.go#L22
             // responseData?.actions[0].out[0].txID should be the txId for consistency, but the outbound Tx for Thor rune swaps is actually a BlankTxId
             // so we use the buyTxId for completion detection
-            const buyTxid = ((_a = responseData === null || responseData === void 0 ? void 0 : responseData.actions[0]) === null || _a === void 0 ? void 0 : _a.status) === 'success' && ((_b = responseData === null || responseData === void 0 ? void 0 : responseData.actions[0]) === null || _b === void 0 ? void 0 : _b.type) === 'swap'
+            const buyTxid = ((_a = data === null || data === void 0 ? void 0 : data.actions[0]) === null || _a === void 0 ? void 0 : _a.status) === 'success' && ((_b = data === null || data === void 0 ? void 0 : data.actions[0]) === null || _b === void 0 ? void 0 : _b.type) === 'swap'
                 ? midgardTxid
                 : '';
             // This will detect all the errors I have seen.
-            if (((_c = responseData === null || responseData === void 0 ? void 0 : responseData.actions[0]) === null || _c === void 0 ? void 0 : _c.status) === 'success' &&
-                ((_d = responseData === null || responseData === void 0 ? void 0 : responseData.actions[0]) === null || _d === void 0 ? void 0 : _d.type) !== 'swap')
+            if (((_c = data === null || data === void 0 ? void 0 : data.actions[0]) === null || _c === void 0 ? void 0 : _c.status) === 'success' && ((_d = data === null || data === void 0 ? void 0 : data.actions[0]) === null || _d === void 0 ? void 0 : _d.type) !== 'swap')
                 throw new api_1.SwapError('[getTradeTxs]: trade failed', {
                     code: api_1.SwapErrorTypes.TRADE_FAILED,
-                    cause: responseData,
+                    cause: data,
                 });
-            const standardBuyTxid = ((_g = (_f = (_e = responseData === null || responseData === void 0 ? void 0 : responseData.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.'))
+            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;
             return {

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

@@ -4,7 +4,7 @@ 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 PoolResponse = {
+export declare type MidgardPoolResponse = {
     asset: string;
     assetDepth: string;
     assetPrice: string;
@@ -18,6 +18,18 @@ export declare type PoolResponse = {
     units: string;
     volume24h: string;
 };
+export declare type ThornodePoolResponse = {
+    LP_units: string;
+    asset: string;
+    balance_asset: string;
+    balance_rune: string;
+    pending_inbound_asset: string;
+    pending_inbound_rune: string;
+    pool_units: string;
+    status: string;
+    synth_supply: string;
+    synth_units: string;
+};
 declare type MidgardCoins = {
     asset: string;
 }[];
@@ -44,6 +56,7 @@ export declare type InboundResponse = {
     router?: string;
 };
 export declare type ThorchainSwapperDeps = {
+    daemonUrl: string;
     midgardUrl: string;
     adapterManager: ChainAdapterManager;
     web3: Web3;

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

@@ -7,7 +7,7 @@ const makeSwapMemo_1 = require("../../makeSwapMemo/makeSwapMemo");
 const thorService_1 = require("../../thorService");
 const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmount, slippageTolerance, destinationAddress, xpub, tradeFee, }) => {
     try {
-        const { data: inboundAddresses } = await thorService_1.thorService.get(`${deps.midgardUrl}/thorchain/inbound_addresses`);
+        const { data: inboundAddresses } = await thorService_1.thorService.get(`${deps.daemonUrl}/lcd/thorchain/inbound_addresses`);
         const sellAssetInboundAddresses = inboundAddresses.find((inbound) => inbound.chain === sellAsset.symbol.toUpperCase());
         const vault = sellAssetInboundAddresses === null || sellAssetInboundAddresses === void 0 ? void 0 : sellAssetInboundAddresses.address;
         if (!vault)

package/dist/swappers/thorchain/utils/cosmos/cosmosTxData.js

@@ -9,7 +9,7 @@ const thorService_1 = require("../thorService");
 const cosmosTxData = async (input) => {
     const { bip44Params, deps, destinationAddress, sellAmount, sellAsset, buyAsset, slippageTolerance, quote, wallet, sellAdapter, } = input;
     const fromThorAsset = sellAsset.chainId == types_1.KnownChainIds.ThorchainMainnet;
-    const { data: inboundAddresses } = await thorService_1.thorService.get(`${deps.midgardUrl}/thorchain/inbound_addresses`);
+    const { data: inboundAddresses } = await thorService_1.thorService.get(`${deps.daemonUrl}/lcd/thorchain/inbound_addresses`);
     const atomInboundAddresses = inboundAddresses.find((inbound) => inbound.chain === 'GAIA');
     const vault = atomInboundAddresses === null || atomInboundAddresses === void 0 ? void 0 : atomInboundAddresses.address;
     if (!vault && !fromThorAsset)

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

@@ -19,7 +19,7 @@ const estimateTradeFee = async (deps, buyAsset) => {
             details: { buyAssetId: buyAsset.assetId },
         });
     const thorPoolChainId = thorId.slice(0, thorId.indexOf('.'));
-    const { data: inboundAddresses } = await thorService_1.thorService.get(`${deps.midgardUrl}/thorchain/inbound_addresses`);
+    const { data: inboundAddresses } = await thorService_1.thorService.get(`${deps.daemonUrl}/lcd/thorchain/inbound_addresses`);
     const inboundInfo = inboundAddresses.find((inbound) => inbound.chain === thorPoolChainId);
     if (!inboundInfo)
         throw new api_1.SwapError('[estimateTradeFee] - unable to locate inbound pool info', {

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

@@ -11,7 +11,7 @@ const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmount, slippageTo
     try {
         const { assetReference, assetNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
         const isErc20Trade = assetNamespace === 'erc20';
-        const { data: inboundAddresses } = await thorService_1.thorService.get(`${deps.midgardUrl}/thorchain/inbound_addresses`);
+        const { data: inboundAddresses } = await thorService_1.thorService.get(`${deps.daemonUrl}/lcd/thorchain/inbound_addresses`);
         const ethInboundAddresses = inboundAddresses.find((inbound) => inbound.chain === 'ETH');
         const vault = ethInboundAddresses === null || ethInboundAddresses === void 0 ? void 0 : ethInboundAddresses.address;
         const router = ethInboundAddresses === null || ethInboundAddresses === void 0 ? void 0 : ethInboundAddresses.router;

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

@@ -6,25 +6,34 @@ const api_1 = require("../../../../api");
 const bignumber_1 = require("../../../utils/bignumber");
 const thorService_1 = require("../thorService");
 const getPriceRatio = async (deps, input) => {
-    var _a, _b;
     const { buyAssetId, sellAssetId } = input;
     try {
         const buyPoolId = caip_1.adapters.assetIdToPoolAssetId({ assetId: buyAssetId });
         const sellPoolId = caip_1.adapters.assetIdToPoolAssetId({ assetId: sellAssetId });
-        if (!buyPoolId || !sellPoolId)
+        if (!buyPoolId || !sellPoolId) {
             throw new api_1.SwapError(`[getPriceRatio]: No thorchain pool found`, {
                 code: api_1.SwapErrorTypes.RESPONSE_ERROR,
                 details: { buyPoolId, sellPoolId },
             });
-        const { data: responseData } = await thorService_1.thorService.get(`${deps.midgardUrl}/pools`);
-        const buyUsdPrice = (_a = responseData.find((response) => response.asset === buyPoolId)) === null || _a === void 0 ? void 0 : _a.assetPrice;
-        const sellUsdPrice = (_b = responseData.find((response) => response.asset === sellPoolId)) === null || _b === void 0 ? void 0 : _b.assetPrice;
-        if (!buyUsdPrice || !sellUsdPrice)
-            throw new api_1.SwapError(`[getPriceRatio]: No rate found for pools`, {
+        }
+        const { data: responseData } = await thorService_1.thorService.get(`${deps.daemonUrl}/lcd/thorchain/pools`);
+        const buyPool = responseData.find((response) => response.asset === buyPoolId);
+        const sellPool = responseData.find((response) => response.asset === sellPoolId);
+        if (!buyPool || !sellPool) {
+            throw new api_1.SwapError(`[getPriceRatio]: pools not found`, {
                 code: api_1.SwapErrorTypes.RESPONSE_ERROR,
                 details: { buyPoolId, sellPoolId },
             });
-        return (0, bignumber_1.bnOrZero)(sellUsdPrice).dividedBy(buyUsdPrice).toString();
+        }
+        const buyPrice = (0, bignumber_1.bn)(buyPool.balance_rune).dividedBy(buyPool.balance_asset);
+        const sellPrice = (0, bignumber_1.bn)(sellPool.balance_rune).dividedBy(sellPool.balance_asset);
+        if (!buyPrice.gt(0) || !sellPrice.gt(0)) {
+            throw new api_1.SwapError(`[getPriceRatio]: invalid pool price`, {
+                code: api_1.SwapErrorTypes.RESPONSE_ERROR,
+                details: { buyPrice, sellPrice },
+            });
+        }
+        return sellPrice.dividedBy(buyPrice).toString();
     }
     catch (e) {
         if (e instanceof api_1.SwapError)

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

@@ -8,12 +8,12 @@ const getPriceRatio_1 = require("../getPriceRatio/getPriceRatio");
 const isRune_1 = require("../isRune/isRune");
 const thorService_1 = require("../thorService");
 const THOR_PRECISION = 8;
-const getSwapOutput = (inputAmount, poolData, toRune) => {
+const getSwapOutput = (inputAmount, pool, toRune) => {
     const x = inputAmount;
-    const X = toRune ? poolData.assetBalance : poolData.runeBalance;
-    const Y = toRune ? poolData.runeBalance : poolData.assetBalance;
-    const numerator = x.times(X).times(Y);
-    const denominator = x.plus(X).pow(2);
+    const X = toRune ? pool.balance_asset : pool.balance_rune;
+    const Y = toRune ? pool.balance_rune : pool.balance_asset;
+    const numerator = (0, bignumber_1.bn)(x).times(X).times(Y);
+    const denominator = (0, bignumber_1.bn)(x).plus(X).pow(2);
     return numerator.div(denominator);
 };
 const getDoubleSwapOutput = (input, inputPool, outputPool) => {
@@ -47,59 +47,18 @@ const getTradeRate = async (sellAsset, buyAssetId, sellAmount, deps) => {
             details: { sellAsset: sellAsset.assetId },
         });
     }
-    const { data: responseData } = await thorService_1.thorService.get(`${deps.midgardUrl}/pools`);
-    const buyPool = buyPoolId && responseData.find((response) => response.asset === buyPoolId);
-    const sellPool = sellPoolId && responseData.find((response) => response.asset === sellPoolId);
-    if (buyPoolId && !buyPool) {
-        throw new api_1.SwapError(`[getTradeRate]: No buyPool for poolId ${buyPoolId}`, {
+    const { data } = await thorService_1.thorService.get(`${deps.daemonUrl}/lcd/thorchain/pools`);
+    const buyPool = buyPoolId && data.find((response) => response.asset === buyPoolId);
+    const sellPool = sellPoolId && data.find((response) => response.asset === sellPoolId);
+    if (!buyPool || !sellPool)
+        throw new api_1.SwapError(`[getPriceRatio]: no pools found`, {
             code: api_1.SwapErrorTypes.POOL_NOT_FOUND,
-            fn: 'getTradeRate',
-            details: { buyPoolId },
-        });
-    }
-    if (sellPoolId && !sellPool) {
-        throw new api_1.SwapError(`[getTradeRate]: No sellPool for poolId ${sellPoolId}`, {
-            code: api_1.SwapErrorTypes.POOL_NOT_FOUND,
-            fn: 'getTradeRate',
-            details: { sellPoolId },
+            fn: 'getPriceRatio',
+            details: { buyPoolId, sellPoolId },
         });
-    }
     // All thorchain pool amounts are base 8 regardless of token precision
     const sellBaseAmount = (0, bignumber_1.bn)((0, bignumber_1.toBaseUnit)((0, bignumber_1.fromBaseUnit)(sellAmount, sellAsset.precision), THOR_PRECISION));
-    const doubleSwap = buyPool != undefined && sellPool != undefined;
-    const toRune = buyAssetId === caip_1.thorchainAssetId;
-    const outputAmountBase8 = (() => {
-        if (doubleSwap && sellPool && buyPool) {
-            const sellAssetPoolData = {
-                assetBalance: (0, bignumber_1.bn)(sellPool.assetDepth),
-                runeBalance: (0, bignumber_1.bn)(sellPool.runeDepth),
-            };
-            const buyAssetPoolData = {
-                assetBalance: (0, bignumber_1.bn)(buyPool.assetDepth),
-                runeBalance: (0, bignumber_1.bn)(buyPool.runeDepth),
-            };
-            return getDoubleSwapOutput(sellBaseAmount, sellAssetPoolData, buyAssetPoolData);
-        }
-        else {
-            const poolData = sellPool
-                ? {
-                    assetBalance: (0, bignumber_1.bn)(sellPool.assetDepth),
-                    runeBalance: (0, bignumber_1.bn)(sellPool.runeDepth),
-                }
-                : buyPool && {
-                    assetBalance: (0, bignumber_1.bn)(buyPool.assetDepth),
-                    runeBalance: (0, bignumber_1.bn)(buyPool.runeDepth),
-                };
-            if (!poolData) {
-                throw new api_1.SwapError(`[getPriceRatio]: No pool data for rune swap`, {
-                    code: api_1.SwapErrorTypes.POOL_NOT_FOUND,
-                    fn: 'getPriceRatio',
-                    details: { buyAssetId, sellAsset, buyPool, sellPool },
-                });
-            }
-            return getSwapOutput(sellBaseAmount, poolData, toRune);
-        }
-    })();
+    const outputAmountBase8 = getDoubleSwapOutput(sellBaseAmount, sellPool, buyPool);
     const outputAmount = (0, bignumber_1.fromBaseUnit)(outputAmountBase8, THOR_PRECISION);
     return (0, bignumber_1.bn)(outputAmount).div((0, bignumber_1.fromBaseUnit)(sellAmount, sellAsset.precision)).toString();
 };

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

@@ -18,10 +18,11 @@ const getUsdRate = async ({ deps, input, }) => {
             }
             return caip_1.adapters.assetIdToPoolAssetId({ assetId });
         })();
-        if (!thorchainPoolId)
+        if (!thorchainPoolId) {
             throw new api_1.SwapError(`[getUsdRate]: No thorchainPoolId 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)) {

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

@@ -0,0 +1,8 @@
+import { InboundResponse, MidgardPoolResponse, ThornodePoolResponse } from '../../types';
+export declare const btcMidgardPool: MidgardPoolResponse;
+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 mockInboundAdresses: InboundResponse[];

package/dist/swappers/thorchain/utils/test-data/{midgardResponse.js → responses.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.poolResponse = exports.mockInboundAdresses = exports.foxMidgardPool = exports.ethMidgardPool = exports.btcMidgardPool = void 0;
+exports.mockInboundAdresses = exports.foxThornodePool = exports.foxMidgardPool = exports.ethThornodePool = exports.ethMidgardPool = exports.btcThornodePool = exports.btcMidgardPool = void 0;
 exports.btcMidgardPool = {
     asset: 'BTC.BTC',
     assetDepth: '91027798705',
@@ -15,6 +15,18 @@ exports.btcMidgardPool = {
     units: '545894929144923',
     volume24h: '15031085906495',
 };
+exports.btcThornodePool = {
+    LP_units: '536055974608843',
+    asset: 'BTC.BTC',
+    balance_asset: '91027798705',
+    balance_rune: '935827756491105',
+    pending_inbound_asset: '0',
+    pending_inbound_rune: '0',
+    pool_units: '545894929144923',
+    status: 'Available',
+    synth_supply: '3281284823',
+    synth_units: '9838954536080',
+};
 exports.ethMidgardPool = {
     asset: 'ETH.ETH',
     assetDepth: '915018987646',
@@ -29,6 +41,18 @@ exports.ethMidgardPool = {
     units: '274245264962453',
     volume24h: '9890096673763',
 };
+exports.ethThornodePool = {
+    LP_units: '273709963437801',
+    asset: 'ETH.ETH',
+    balance_asset: '915018987646',
+    balance_rune: '618746706022909',
+    pending_inbound_asset: '0',
+    pending_inbound_rune: '0',
+    pool_units: '274245264962453',
+    status: 'Available',
+    synth_supply: '3572065751',
+    synth_units: '535301524652',
+};
 exports.foxMidgardPool = {
     asset: 'ETH.FOX-0XC770EEFAD204B5180DF6A14EE197D99D808EE52D',
     assetDepth: '166650912393467',
@@ -43,6 +67,18 @@ exports.foxMidgardPool = {
     units: '10568061707512',
     volume24h: '251596933033',
 };
+exports.foxThornodePool = {
+    LP_units: '10015457121887',
+    asset: 'ETH.FOX-0XC770EEFAD204B5180DF6A14EE197D99D808EE52D',
+    balance_asset: '166650912393467',
+    balance_rune: '8838681437152',
+    pending_inbound_asset: '0',
+    pending_inbound_rune: '0',
+    pool_units: '10568061707512',
+    status: 'Available',
+    synth_supply: '17428372569375',
+    synth_units: '552604585625',
+};
 exports.mockInboundAdresses = [
     {
         chain: 'BCH',
@@ -95,4 +131,3 @@ exports.mockInboundAdresses = [
         gas_rate: '182523800',
     },
 ];
-exports.poolResponse = [exports.btcMidgardPool, exports.ethMidgardPool, exports.foxMidgardPool];

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

@@ -44,9 +44,7 @@ const setupThorswapDeps = () => {
             },
         ],
     ]);
-    const midgardUrl = 'localhost:3000';
-    const ethNodeUrl = 'http://localhost:1000';
-    const web3Provider = new web3_1.default.providers.HttpProvider(ethNodeUrl);
-    return { adapterManager, midgardUrl, web3: new web3_1.default(web3Provider) };
+    const web3Provider = new web3_1.default.providers.HttpProvider('');
+    return { adapterManager, midgardUrl: '', daemonUrl: '', web3: new web3_1.default(web3Provider) };
 };
 exports.setupThorswapDeps = setupThorswapDeps;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "11.3.1",
+  "version": "11.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/test-data/midgardResponse.d.ts

@@ -1,6 +0,0 @@
-import { InboundResponse, PoolResponse } from '../../types';
-export declare const btcMidgardPool: PoolResponse;
-export declare const ethMidgardPool: PoolResponse;
-export declare const foxMidgardPool: PoolResponse;
-export declare const mockInboundAdresses: InboundResponse[];
-export declare const poolResponse: PoolResponse[];