@shapeshiftoss/swapper 5.7.0 → 5.9.0

package/dist/api.d.ts

@@ -123,8 +123,6 @@ export declare type GetMinMaxInput = {
 };
 export declare type ApprovalNeededOutput = {
     approvalNeeded: boolean;
-    gas?: string;
-    gasPrice?: string;
 };
 export declare enum SwapperType {
     Zrx = "0x",
@@ -153,7 +151,8 @@ export declare enum SwapErrorTypes {
     USD_RATE_FAILED = "USD_RATE_FAILED",
     UNSUPPORTED_CHAIN = "UNSUPPORTED_CHAIN",
     VALIDATION_FAILED = "VALIDATION_FAILED",
-    MAKE_MEMO_FAILED = "MAKE_MEMO_FAILED"
+    MAKE_MEMO_FAILED = "MAKE_MEMO_FAILED",
+    PRICE_RATIO_FAILED = "PRICE_RATIO_FAILED"
 }
 export interface Swapper {
     /** perform any necessary async initialization */
@@ -172,10 +171,6 @@ export interface Swapper {
      * Get the usd rate from either the assets symbol or tokenId
      */
     getUsdRate(input: Pick<Asset, 'symbol' | 'tokenId'>): Promise<string>;
-    /**
-     * Get the minimum and maximum trade value of the sellAsset and buyAsset
-     */
-    getMinMax(input: GetMinMaxInput): Promise<MinMaxOutput>;
     /**
      * Execute a trade built with buildTrade by signing and broadcasting
      */

package/dist/api.js

@@ -30,4 +30,5 @@ var SwapErrorTypes;
     SwapErrorTypes["UNSUPPORTED_CHAIN"] = "UNSUPPORTED_CHAIN";
     SwapErrorTypes["VALIDATION_FAILED"] = "VALIDATION_FAILED";
     SwapErrorTypes["MAKE_MEMO_FAILED"] = "MAKE_MEMO_FAILED";
+    SwapErrorTypes["PRICE_RATIO_FAILED"] = "PRICE_RATIO_FAILED";
 })(SwapErrorTypes = exports.SwapErrorTypes || (exports.SwapErrorTypes = {}));

package/dist/swappercli.js

@@ -84,7 +84,8 @@ const main = async () => {
     const web3 = new web3_1.default(web3Provider);
     const zrxSwapperDeps = { wallet, adapterManager, web3 };
     const thorchainSwapperDeps = {
-        midgardUrl: 'https://midgard.thorchain.info/v2'
+        midgardUrl: 'https://midgard.thorchain.info/v2',
+        adapterManager: {}
     };
     const manager = new SwapperManager_1.SwapperManager();
     const zrxSwapper = new ZrxSwapper_1.ZrxSwapper(zrxSwapperDeps);

package/dist/swappers/cow/CowSwapper.d.ts

@@ -1,6 +1,6 @@
 import { AssetId } from '@shapeshiftoss/caip';
 import { Asset, SupportedChainIds } from '@shapeshiftoss/types';
-import { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, BuildTradeInput, BuyAssetBySellIdInput, ExecuteTradeInput, GetMinMaxInput, GetTradeQuoteInput, MinMaxOutput, Swapper, SwapperType, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
+import { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, BuildTradeInput, BuyAssetBySellIdInput, ExecuteTradeInput, GetTradeQuoteInput, Swapper, SwapperType, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
 export declare class CowSwapper implements Swapper {
     static swapperName: string;
     initialize(): Promise<void>;
@@ -8,7 +8,6 @@ export declare class CowSwapper implements Swapper {
     buildTrade(args: BuildTradeInput): Promise<Trade<SupportedChainIds>>;
     getTradeQuote(input: GetTradeQuoteInput): Promise<TradeQuote<SupportedChainIds>>;
     getUsdRate(input: Pick<Asset, 'symbol' | 'assetId'>): Promise<string>;
-    getMinMax(input: GetMinMaxInput): Promise<MinMaxOutput>;
     executeTrade(args: ExecuteTradeInput<SupportedChainIds>): Promise<TradeResult>;
     approvalNeeded(args: ApprovalNeededInput<SupportedChainIds>): Promise<ApprovalNeededOutput>;
     approveInfinite(args: ApproveInfiniteInput<SupportedChainIds>): Promise<string>;

package/dist/swappers/cow/CowSwapper.js

@@ -20,10 +20,6 @@ class CowSwapper {
         console.info(input);
         throw new Error('CowSwapper: getUsdRate unimplemented');
     }
-    getMinMax(input) {
-        console.info(input);
-        throw new Error('CowSwapper: getMinMax unimplemented');
-    }
     async executeTrade(args) {
         console.info(args);
         throw new Error('CowSwapper: executeTrade unimplemented');

package/dist/swappers/test/TestSwapper.d.ts

@@ -1,6 +1,6 @@
 import { AssetId } from '@shapeshiftoss/caip';
 import { Asset, SupportedChainIds } from '@shapeshiftoss/types';
-import { ApprovalNeededOutput, BuyAssetBySellIdInput, GetMinMaxInput, MinMaxOutput, Swapper, SwapperType, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
+import { ApprovalNeededOutput, BuyAssetBySellIdInput, Swapper, SwapperType, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
 /**
  * Playground for testing different scenarios of multiple swappers in the manager.
  * Meant for local testing only
@@ -11,7 +11,6 @@ export declare class TestSwapper implements Swapper {
     getType(): SwapperType;
     constructor();
     getUsdRate(input: Pick<Asset, 'symbol' | 'assetId'>): Promise<string>;
-    getMinMax(input: GetMinMaxInput): Promise<MinMaxOutput>;
     approvalNeeded(): Promise<ApprovalNeededOutput>;
     approveInfinite(): Promise<string>;
     filterBuyAssetsBySellAssetId(args: BuyAssetBySellIdInput): AssetId[];

package/dist/swappers/test/TestSwapper.js

@@ -24,10 +24,6 @@ class TestSwapper {
         console.info(input);
         throw new Error('TestSwapper: getUsdRate unimplemented');
     }
-    getMinMax(input) {
-        console.info(input);
-        throw new Error('TestSwapper: getMinMax unimplemented');
-    }
     async approvalNeeded() {
         throw new Error('TestSwapper: approvalNeeded unimplemented');
     }

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

@@ -1,6 +1,6 @@
 import { AssetId } from '@shapeshiftoss/caip';
 import { Asset, SupportedChainIds } from '@shapeshiftoss/types';
-import { ApprovalNeededOutput, BuyAssetBySellIdInput, GetMinMaxInput, MinMaxOutput, Swapper, SwapperType, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
+import { ApprovalNeededOutput, BuyAssetBySellIdInput, Swapper, SwapperType, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
 import { ThorchainSwapperDeps } from './types';
 export declare class ThorchainSwapper implements Swapper {
     private supportedAssetIds;
@@ -9,7 +9,6 @@ export declare class ThorchainSwapper implements Swapper {
     initialize(): Promise<void>;
     getType(): SwapperType;
     getUsdRate(input: Pick<Asset, 'symbol' | 'assetId'>): Promise<string>;
-    getMinMax(input: GetMinMaxInput): Promise<MinMaxOutput>;
     approvalNeeded(): Promise<ApprovalNeededOutput>;
     approveInfinite(): Promise<string>;
     filterBuyAssetsBySellAssetId(args: BuyAssetBySellIdInput): AssetId[];

package/dist/swappers/thorchain/ThorchainSwapper.js

@@ -35,10 +35,6 @@ class ThorchainSwapper {
     getUsdRate(input) {
         return (0, getUsdRate_1.getUsdRate)({ deps: this.deps, input });
     }
-    getMinMax(input) {
-        console.info(input);
-        throw new Error('ThorchainSwapper: getMinMax unimplemented');
-    }
     async approvalNeeded() {
         throw new Error('ThorchainSwapper: approvalNeeded unimplemented');
     }

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

@@ -1,3 +1,4 @@
+import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
 export declare type MidgardResponse = {
     asset: string;
     assetDepth: string;
@@ -12,6 +13,15 @@ export declare type MidgardResponse = {
     units: string;
     volume24h: string;
 };
+export declare type InboundResponse = {
+    chain: string;
+    pub_key: string;
+    address: string;
+    halted: boolean;
+    gas_rate: string;
+    router?: string;
+};
 export declare type ThorchainSwapperDeps = {
     midgardUrl: string;
+    adapterManager: ChainAdapterManager;
 };

package/dist/swappers/thorchain/utils/ethereum/makeTradeTx.d.ts

@@ -0,0 +1,23 @@
+import { ethereum } from '@shapeshiftoss/chain-adapters';
+import { ETHSignTx, HDWallet } from '@shapeshiftoss/hdwallet-core';
+import { Asset, BIP44Params } from '@shapeshiftoss/types';
+import BigNumber from 'bignumber.js';
+import { ThorchainSwapperDeps } from '../../types';
+export declare const fromBaseUnit: (value: BigNumber.Value, decimals: number, displayDecimals?: number) => string;
+export declare const toBaseUnit: (amount: BigNumber.Value | undefined, precision: number) => string;
+export declare const makeTradeTx: ({ wallet, bip44Params, sellAmount, buyAsset, sellAsset, destinationAddress, adapter, maxFeePerGas, maxPriorityFeePerGas, slippageTolerance, deps, gasLimit }: {
+    wallet: HDWallet;
+    bip44Params: BIP44Params;
+    sellAmount: string;
+    buyAsset: Asset;
+    sellAsset: Asset;
+    destinationAddress: string;
+    adapter: ethereum.ChainAdapter;
+    maxFeePerGas: string;
+    maxPriorityFeePerGas: string;
+    slippageTolerance: string;
+    deps: ThorchainSwapperDeps;
+    gasLimit: string;
+}) => Promise<{
+    txToSign: ETHSignTx;
+}>;

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

@@ -0,0 +1,81 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeTradeTx = exports.toBaseUnit = exports.fromBaseUnit = void 0;
+const caip_1 = require("@shapeshiftoss/caip");
+const bignumber_js_1 = __importDefault(require("bignumber.js"));
+const api_1 = require("../../../../api");
+const bignumber_1 = require("../../../zrx/utils/bignumber");
+const getPriceRatio_1 = require("../getPriceRatio/getPriceRatio");
+const makeSwapMemo_1 = require("../makeSwapMemo/makeSwapMemo");
+const thorService_1 = require("../thorService");
+const routerCalldata_1 = require("./routerCalldata");
+const fromBaseUnit = (value, decimals, displayDecimals = 6) => {
+    return (0, bignumber_1.bnOrZero)(value)
+        .div(`1e+${decimals}`)
+        .decimalPlaces(displayDecimals, bignumber_js_1.default.ROUND_DOWN)
+        .toString();
+};
+exports.fromBaseUnit = fromBaseUnit;
+const toBaseUnit = (amount, precision) => {
+    return (0, bignumber_1.bnOrZero)(amount)
+        .times(new bignumber_js_1.default(10).exponentiatedBy((0, bignumber_1.bnOrZero)(precision)))
+        .toFixed(0);
+};
+exports.toBaseUnit = toBaseUnit;
+const makeTradeTx = async ({ wallet, bip44Params, sellAmount, buyAsset, sellAsset, destinationAddress, adapter, maxFeePerGas, maxPriorityFeePerGas, slippageTolerance, deps, gasLimit }) => {
+    try {
+        const { assetReference } = (0, caip_1.fromAssetId)(sellAsset.assetId);
+        const isErc20Trade = assetReference.startsWith('0x');
+        const { data: inboundAddresses } = await thorService_1.thorService.get(`${deps.midgardUrl}/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;
+        if (!vault || !router)
+            throw new api_1.SwapError(`[getPriceRatio]: router or vault found for ETH`, {
+                code: api_1.SwapErrorTypes.RESPONSE_ERROR,
+                details: { inboundAddresses }
+            });
+        const priceRatio = await (0, getPriceRatio_1.getPriceRatio)(deps, {
+            buyAssetId: buyAsset.assetId,
+            sellAssetId: sellAsset.assetId
+        });
+        const expectedBuyAmount = (0, exports.toBaseUnit)((0, exports.fromBaseUnit)((0, bignumber_1.bnOrZero)(sellAmount).dividedBy(priceRatio), sellAsset.precision), buyAsset.precision);
+        if (!(0, bignumber_1.bnOrZero)(expectedBuyAmount).gte(0) ||
+            !((0, bignumber_1.bnOrZero)(slippageTolerance).gte(0) && (0, bignumber_1.bnOrZero)(slippageTolerance).lte(1)))
+            throw new api_1.SwapError('[makeTradeTx]: bad expected buy amount or bad slippage tolerance', {
+                code: api_1.SwapErrorTypes.BUILD_TRADE_FAILED
+            });
+        const limit = (0, bignumber_1.bnOrZero)(expectedBuyAmount)
+            .times(new bignumber_js_1.default(1).minus(slippageTolerance))
+            .decimalPlaces(0)
+            .toString();
+        const memo = (0, makeSwapMemo_1.makeSwapMemo)({
+            buyAssetId: buyAsset.assetId,
+            destinationAddress,
+            limit
+        });
+        const data = await (0, routerCalldata_1.deposit)(vault, router, isErc20Trade ? assetReference : '0x0000000000000000000000000000000000000000', sellAmount, memo);
+        return adapter.buildCustomTx({
+            wallet,
+            bip44Params,
+            to: router,
+            gasLimit,
+            maxFeePerGas,
+            maxPriorityFeePerGas,
+            value: isErc20Trade ? '0' : sellAmount,
+            data
+        });
+    }
+    catch (e) {
+        if (e instanceof api_1.SwapError)
+            throw e;
+        throw new api_1.SwapError('[makeTradeTx]: error making trade tx', {
+            code: api_1.SwapErrorTypes.BUILD_TRADE_FAILED,
+            cause: e
+        });
+    }
+};
+exports.makeTradeTx = makeTradeTx;

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

@@ -0,0 +1,6 @@
+import { AssetId } from '@shapeshiftoss/caip';
+import { ThorchainSwapperDeps } from '../../types';
+export declare const getPriceRatio: (deps: ThorchainSwapperDeps, input: {
+    buyAssetId: AssetId;
+    sellAssetId: AssetId;
+}) => Promise<string>;

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

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPriceRatio = void 0;
+const caip_1 = require("@shapeshiftoss/caip");
+const api_1 = require("../../../../api");
+const bignumber_1 = require("../../../zrx/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)
+            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`, {
+                code: api_1.SwapErrorTypes.RESPONSE_ERROR,
+                details: { buyPoolId, sellPoolId }
+            });
+        return (0, bignumber_1.bnOrZero)(buyUsdPrice).dividedBy(sellUsdPrice).toString();
+    }
+    catch (e) {
+        if (e instanceof api_1.SwapError)
+            throw e;
+        throw new api_1.SwapError('[getUsdRate]: Thorchain getUsdRate failed', {
+            code: api_1.SwapErrorTypes.PRICE_RATIO_FAILED,
+            cause: e
+        });
+    }
+};
+exports.getPriceRatio = getPriceRatio;

package/dist/swappers/zrx/ZrxApprovalNeeded/ZrxApprovalNeeded.js

@@ -5,10 +5,9 @@ const caip_1 = require("@shapeshiftoss/caip");
 const api_1 = require("../../../api");
 const erc20Allowance_abi_1 = require("../utils/abi/erc20Allowance-abi");
 const bignumber_1 = require("../utils/bignumber");
-const constants_1 = require("../utils/constants");
 const helpers_1 = require("../utils/helpers/helpers");
 async function ZrxApprovalNeeded({ adapterManager, web3 }, { quote, wallet }) {
-    var _a, _b;
+    var _a;
     const { sellAsset } = quote;
     const { assetReference: sellAssetErc20Address } = (0, caip_1.fromAssetId)(sellAsset.assetId);
     try {
@@ -46,9 +45,7 @@ async function ZrxApprovalNeeded({ adapterManager, web3 }, { quote, wallet }) {
                 details: { feeData: quote.feeData }
             });
         return {
-            approvalNeeded: allowanceOnChain.lte((0, bignumber_1.bnOrZero)(quote.sellAmount)),
-            gas: constants_1.APPROVAL_GAS_LIMIT,
-            gasPrice: (_b = quote.feeData.chainSpecific) === null || _b === void 0 ? void 0 : _b.gasPrice
+            approvalNeeded: allowanceOnChain.lte((0, bignumber_1.bnOrZero)(quote.sellAmount))
         };
     }
     catch (e) {

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

@@ -2,7 +2,7 @@ import { AssetId } from '@shapeshiftoss/caip';
 import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
 import { Asset, SupportedChainIds } from '@shapeshiftoss/types';
 import Web3 from 'web3';
-import { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, BuildTradeInput, BuyAssetBySellIdInput, ExecuteTradeInput, GetMinMaxInput, GetTradeQuoteInput, MinMaxOutput, Swapper, SwapperType, TradeQuote, TradeResult, TradeTxs, ZrxTrade } from '../../api';
+import { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, BuildTradeInput, BuyAssetBySellIdInput, ExecuteTradeInput, GetTradeQuoteInput, Swapper, SwapperType, TradeQuote, TradeResult, TradeTxs, ZrxTrade } from '../../api';
 export declare type ZrxSwapperDeps = {
     adapterManager: ChainAdapterManager;
     web3: Web3;
@@ -16,7 +16,6 @@ export declare class ZrxSwapper implements Swapper {
     buildTrade(args: BuildTradeInput): Promise<ZrxTrade<SupportedChainIds>>;
     getTradeQuote(input: GetTradeQuoteInput): Promise<TradeQuote<SupportedChainIds>>;
     getUsdRate(input: Pick<Asset, 'symbol' | 'assetId'>): Promise<string>;
-    getMinMax(input: GetMinMaxInput): Promise<MinMaxOutput>;
     executeTrade(args: ExecuteTradeInput<SupportedChainIds>): Promise<TradeResult>;
     approvalNeeded(args: ApprovalNeededInput<SupportedChainIds>): Promise<ApprovalNeededOutput>;
     approveInfinite(args: ApproveInfiniteInput<SupportedChainIds>): Promise<string>;

package/dist/swappers/zrx/ZrxSwapper.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZrxSwapper = void 0;
 const api_1 = require("../../api");
-const getZrxMinMax_1 = require("./getZrxMinMax/getZrxMinMax");
 const getZrxTradeQuote_1 = require("./getZrxTradeQuote/getZrxTradeQuote");
 const blacklist_1 = require("./utils/blacklist");
 const helpers_1 = require("./utils/helpers/helpers");
@@ -29,9 +28,6 @@ class ZrxSwapper {
     async getUsdRate(input) {
         return (0, helpers_1.getUsdRate)(input);
     }
-    async getMinMax(input) {
-        return (0, getZrxMinMax_1.getZrxMinMax)(input.sellAsset, input.buyAsset);
-    }
     async executeTrade(args) {
         return (0, zrxExecuteTrade_1.zrxExecuteTrade)(this.deps, args);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "5.7.0",
+  "version": "5.9.0",
   "description": "TODO: description",
   "repository": "https://github.com/shapeshift/lib",
   "license": "MIT",
@@ -34,7 +34,7 @@
     "@shapeshiftoss/caip": "^5.2.1",
     "@shapeshiftoss/chain-adapters": "^4.3.3",
     "@shapeshiftoss/hdwallet-core": "1.20.0",
-    "@shapeshiftoss/types": "^4.3.1",
+    "@shapeshiftoss/types": "4.3.1",
     "@shapeshiftoss/errors": "^1.1.0"
   },
   "devDependencies": {
@@ -42,7 +42,7 @@
     "@shapeshiftoss/caip": "^5.2.1",
     "@shapeshiftoss/chain-adapters": "^4.3.3",
     "@shapeshiftoss/hdwallet-core": "^1.20.0",
-    "@shapeshiftoss/types": "^4.3.1",
+    "@shapeshiftoss/types": "4.3.1",
     "@shapeshiftoss/errors": "^1.1.0",
     "@types/readline-sync": "^1.4.4",
     "readline-sync": "^1.4.10",