@shapeshiftoss/swapper 9.5.0 → 9.7.0

package/dist/api.d.ts

@@ -168,7 +168,8 @@ export declare enum SwapErrorTypes {
     MAKE_MEMO_FAILED = "MAKE_MEMO_FAILED",
     PRICE_RATIO_FAILED = "PRICE_RATIO_FAILED",
     POOL_NOT_FOUND = "POOL_NOT_FOUND",
-    GET_TRADE_TXS_FAILED = "GET_TRADE_TXS_FAILED"
+    GET_TRADE_TXS_FAILED = "GET_TRADE_TXS_FAILED",
+    TRADE_FAILED = "TRADE_FAILED"
 }
 export interface Swapper<T extends ChainId> {
     /** Human readable swapper name */

package/dist/api.js

@@ -37,4 +37,5 @@ var SwapErrorTypes;
     SwapErrorTypes["PRICE_RATIO_FAILED"] = "PRICE_RATIO_FAILED";
     SwapErrorTypes["POOL_NOT_FOUND"] = "POOL_NOT_FOUND";
     SwapErrorTypes["GET_TRADE_TXS_FAILED"] = "GET_TRADE_TXS_FAILED";
+    SwapErrorTypes["TRADE_FAILED"] = "TRADE_FAILED";
 })(SwapErrorTypes = exports.SwapErrorTypes || (exports.SwapErrorTypes = {}));

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

@@ -25,3 +25,4 @@ export declare class CowSwapper implements Swapper<KnownChainIds.EthereumMainnet
     filterAssetIdsBySellable(assetIds: AssetId[]): AssetId[];
     getTradeTxs(args: TradeResult): Promise<TradeTxs>;
 }
+export * from './types';

package/dist/swappers/cow/CowSwapper.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.CowSwapper = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
@@ -55,3 +69,4 @@ class CowSwapper {
     }
 }
 exports.CowSwapper = CowSwapper;
+__exportStar(require("./types"), exports);

package/dist/swappers/thorchain/ThorchainSwapper.js

@@ -23,6 +23,7 @@ class ThorchainSwapper {
             [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.supportedSellAssetIds = [];
@@ -132,11 +133,38 @@ class ThorchainSwapper {
         }
     }
     async getTradeTxs(tradeResult) {
-        // TODO poll midgard for the correct buyTxid
-        return {
-            sellTxid: tradeResult.tradeId,
-            buyTxid: tradeResult.tradeId
-        };
+        var _a, _b, _c, _d, _e, _f, _g;
+        try {
+            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 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'
+                ? responseData === null || responseData === void 0 ? void 0 : responseData.actions[0].out[0].txID
+                : '';
+            // 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')
+                throw new api_1.SwapError('[getTradeTxs]: trade failed', {
+                    code: api_1.SwapErrorTypes.TRADE_FAILED,
+                    cause: responseData
+                });
+            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.'))
+                ? `0x${buyTxid}`
+                : buyTxid;
+            return {
+                sellTxid: tradeResult.tradeId,
+                buyTxid: standardBuyTxid.toLowerCase()
+            };
+        }
+        catch (e) {
+            if (e instanceof api_1.SwapError)
+                throw e;
+            throw new api_1.SwapError('[getTradeTxs]: error', {
+                code: api_1.SwapErrorTypes.GET_TRADE_TXS_FAILED,
+                cause: e
+            });
+        }
     }
 }
 exports.ThorchainSwapper = ThorchainSwapper;

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

@@ -18,6 +18,23 @@ export declare type PoolResponse = {
     units: string;
     volume24h: string;
 };
+declare type MidardCoins = {
+    asset: string;
+}[];
+declare type MidgardActionOut = {
+    coins: MidardCoins;
+    txID: string;
+};
+declare type MidgardAction = {
+    date: string;
+    height: string;
+    out: MidgardActionOut[];
+    status: string;
+    type: string;
+};
+export declare type MidgardActionsResponse = {
+    actions: MidgardAction[];
+};
 export declare type InboundResponse = {
     chain: string;
     pub_key: string;
@@ -44,3 +61,4 @@ export interface CosmosThorTrade<C extends ChainId> extends Trade<C> {
     txData: CosmosSignTx;
 }
 export declare type ThorTrade<C extends ChainId> = BtcThorTrade<C> | EthThorTrade<C> | CosmosThorTrade<C>;
+export {};

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

@@ -20,6 +20,7 @@ exports.THOR_TRADE_FEE_MULTIPLIERS = {
     [types_1.KnownChainIds.BitcoinMainnet]: (0, bignumber_1.bn)(0.00002),
     [types_1.KnownChainIds.DogecoinMainnet]: (0, bignumber_1.bn)(0.00002),
     [types_1.KnownChainIds.LitecoinMainnet]: (0, bignumber_1.bn)(0.000005),
+    [types_1.KnownChainIds.BitcoinCashMainnet]: (0, bignumber_1.bn)(0.00003),
     [types_1.KnownChainIds.CosmosMainnet]: (0, bignumber_1.bn)(0.00000002),
     [types_1.KnownChainIds.EthereumMainnet]: (0, bignumber_1.bn)(0.00024) // A value that "works". Discord recommended value (80,000 gas * 2 or 160k) is often too low
 };

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

@@ -17,7 +17,14 @@ const makeSwapMemo = ({ buyAssetId, destinationAddress, limit }) => {
             code: api_1.SwapErrorTypes.MAKE_MEMO_FAILED,
             details: { buyAssetId }
         });
-    const memo = `s:${thorId}:${destinationAddress}:${limit}:${constants_1.THORCHAIN_AFFILIATE_NAME}:${constants_1.THORCHAIN_AFFILIATE_BIPS}`;
+    // bch hack
+    // Our bitcoin cash addresses are prefixed with `bitcoincash:`
+    // But thorchain memos need to be short (under 80 bytes for utxo)
+    // For this reason thorchain doesnt allow / need bitcoincash: in the memo
+    const parsedDestinationAddress = destinationAddress.includes('bitcoincash:')
+        ? destinationAddress.replace('bitcoincash:', '')
+        : destinationAddress;
+    const memo = `s:${thorId}:${parsedDestinationAddress}:${limit}:${constants_1.THORCHAIN_AFFILIATE_NAME}:${constants_1.THORCHAIN_AFFILIATE_BIPS}`;
     if (memo.length <= MAX_LENGTH)
         return memo;
     const abbreviationAmount = memo.length - MAX_LENGTH;

package/package.json

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