@shapeshiftoss/swapper 6.0.0 → 6.2.0

package/dist/api.d.ts

@@ -155,7 +155,8 @@ export declare enum SwapErrorTypes {
     UNSUPPORTED_CHAIN = "UNSUPPORTED_CHAIN",
     VALIDATION_FAILED = "VALIDATION_FAILED",
     MAKE_MEMO_FAILED = "MAKE_MEMO_FAILED",
-    PRICE_RATIO_FAILED = "PRICE_RATIO_FAILED"
+    PRICE_RATIO_FAILED = "PRICE_RATIO_FAILED",
+    POOL_NOT_FOUND = "POOL_NOT_FOUND"
 }
 export interface Swapper {
     /** perform any necessary async initialization */

package/dist/api.js

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

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, Swapper, SwapperType, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
+import { ApprovalNeededOutput, BuyAssetBySellIdInput, ExecuteTradeInput, Swapper, SwapperType, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
 import { ThorchainSwapperDeps } from './types';
 export declare class ThorchainSwapper implements Swapper {
     private swapSupportedChainIds;
@@ -16,6 +16,6 @@ export declare class ThorchainSwapper implements Swapper {
     filterAssetIdsBySellable(): AssetId[];
     buildTrade(): Promise<Trade<SupportedChainIds>>;
     getTradeQuote(): Promise<TradeQuote<SupportedChainIds>>;
-    executeTrade(): Promise<TradeResult>;
+    executeTrade(args: ExecuteTradeInput<SupportedChainIds>): Promise<TradeResult>;
     getTradeTxs(): Promise<TradeTxs>;
 }

package/dist/swappers/thorchain/ThorchainSwapper.js

@@ -58,8 +58,21 @@ class ThorchainSwapper {
     async getTradeQuote() {
         throw new Error('ThorchainSwapper: getTradeQuote unimplemented');
     }
-    async executeTrade() {
-        throw new Error('ThorchainSwapper: executeTrade unimplemented');
+    async executeTrade(args) {
+        const { trade, wallet } = args;
+        const adapter = await this.deps.adapterManager.byChainId(trade.sellAsset.chainId);
+        if (trade.sellAsset.chainId === 'eip155:1') {
+            const thorTradeEth = trade;
+            const signedTx = await adapter.signTransaction({ txToSign: thorTradeEth.txData, wallet });
+            const txid = await adapter.broadcastTransaction(signedTx);
+            return { tradeId: txid };
+        }
+        else {
+            throw new api_1.SwapError('[executeTrade]: unsupported trade', {
+                code: api_1.SwapErrorTypes.SIGN_AND_BROADCAST_FAILED,
+                fn: 'executeTrade'
+            });
+        }
     }
     async getTradeTxs() {
         throw new Error('ThorchainSwapper: executeTrade unimplemented');

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

@@ -0,0 +1,4 @@
+import { AssetId } from '@shapeshiftoss/caip';
+import { Asset } from '@shapeshiftoss/types';
+import { ThorchainSwapperDeps } from '../../types';
+export declare const getTradeRate: (sellAsset: Asset, buyAssetId: AssetId, sellAmount: string, deps: ThorchainSwapperDeps) => Promise<string>;

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

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTradeRate = void 0;
+const caip_1 = require("@shapeshiftoss/caip");
+const api_1 = require("../../../../api");
+const bignumber_1 = require("../../../utils/bignumber");
+const makeTradeTx_1 = require("../ethereum/makeTradeTx");
+const thorService_1 = require("../thorService");
+const THOR_PRECISION = 8;
+const getSwapOutput = (inputAmount, poolData, 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);
+    return numerator.div(denominator);
+};
+const getDoubleSwapOutput = (input, inputPool, outputPool) => {
+    const runeToOutput = getSwapOutput(input, inputPool, true);
+    return getSwapOutput(runeToOutput, outputPool, false);
+};
+// https://docs.thorchain.org/how-it-works/prices
+// TODO this does not support swaps between native "RUNE"
+// Rune swaps use a different calculation because its 1 hop between pools instead of 2
+const getTradeRate = async (sellAsset, buyAssetId, sellAmount, deps) => {
+    const buyPoolId = caip_1.adapters.assetIdToPoolAssetId({ assetId: buyAssetId });
+    const sellPoolId = caip_1.adapters.assetIdToPoolAssetId({ assetId: sellAsset.assetId });
+    if (!buyPoolId || !sellPoolId)
+        throw new api_1.SwapError(`[getPriceRatio]: No thorchain pool found`, {
+            code: api_1.SwapErrorTypes.POOL_NOT_FOUND,
+            fn: 'getPriceRatio',
+            details: { buyPoolId, sellPoolId }
+        });
+    const { data: responseData } = await thorService_1.thorService.get(`${deps.midgardUrl}/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]: no pools found for`, {
+            code: api_1.SwapErrorTypes.POOL_NOT_FOUND,
+            fn: 'getPriceRatio',
+            details: { buyPoolId, sellPoolId }
+        });
+    // All thorchain pool amounts are base 8 regardless of token precision
+    const sellBaseAmount = (0, bignumber_1.bn)((0, makeTradeTx_1.toBaseUnit)((0, makeTradeTx_1.fromBaseUnit)(sellAmount, sellAsset.precision), THOR_PRECISION));
+    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)
+    };
+    const outputAmountBase8 = getDoubleSwapOutput(sellBaseAmount, sellAssetPoolData, buyAssetPoolData);
+    const outputAmount = (0, makeTradeTx_1.fromBaseUnit)(outputAmountBase8, THOR_PRECISION);
+    return (0, bignumber_1.bn)(outputAmount).div((0, makeTradeTx_1.fromBaseUnit)(sellAmount, sellAsset.precision)).toString();
+};
+exports.getTradeRate = getTradeRate;

package/dist/swappers/utils/test-data/assets.d.ts

@@ -4,3 +4,4 @@ export declare const WETH: Asset;
 export declare const FOX: Asset;
 export declare const WBTC: Asset;
 export declare const ETH: Asset;
+export declare const UNSUPPORTED: Asset;

package/dist/swappers/utils/test-data/assets.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ETH = exports.WBTC = exports.FOX = exports.WETH = exports.BTC = void 0;
+exports.UNSUPPORTED = exports.ETH = exports.WBTC = exports.FOX = exports.WETH = exports.BTC = void 0;
 const types_1 = require("@shapeshiftoss/types");
 exports.BTC = {
     assetId: 'bip122:000000000019d6689c085ae165831e93/slip44:0',
@@ -72,3 +72,17 @@ exports.ETH = {
     explorerTxLink: 'https://etherscan.io/tx/',
     explorerAddressLink: 'https://etherscan.io/address/'
 };
+exports.UNSUPPORTED = {
+    assetId: 'eip155:1/slip44:420',
+    chainId: 'eip155:1',
+    chain: types_1.ChainTypes.Ethereum,
+    network: types_1.NetworkTypes.MAINNET,
+    symbol: 'ETH',
+    name: 'Ethereum',
+    precision: 18,
+    color: '#FFFFFF',
+    icon: 'https://assets.coincap.io/assets/icons/eth@2x.png',
+    explorer: 'https://etherscan.io',
+    explorerTxLink: 'https://etherscan.io/tx/',
+    explorerAddressLink: 'https://etherscan.io/address/'
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "6.0.0",
+  "version": "6.2.0",
   "description": "TODO: description",
   "repository": "https://github.com/shapeshift/lib",
   "license": "MIT",
@@ -32,7 +32,7 @@
   "peerDependencies": {
     "@shapeshiftoss/asset-service": "^4.6.0",
     "@shapeshiftoss/caip": "^5.2.2",
-    "@shapeshiftoss/chain-adapters": "4.8.0",
+    "@shapeshiftoss/chain-adapters": "^5.0.0",
     "@shapeshiftoss/errors": "^1.1.1",
     "@shapeshiftoss/hdwallet-core": "^1.23.0",
     "@shapeshiftoss/types": "^4.4.0"
@@ -40,7 +40,7 @@
   "devDependencies": {
     "@shapeshiftoss/asset-service": "^4.6.0",
     "@shapeshiftoss/caip": "^5.2.2",
-    "@shapeshiftoss/chain-adapters": "4.8.0",
+    "@shapeshiftoss/chain-adapters": "^5.0.0",
     "@shapeshiftoss/errors": "^1.1.1",
     "@shapeshiftoss/hdwallet-core": "^1.23.0",
     "@shapeshiftoss/types": "^4.4.0",