@shapeshiftoss/swapper 9.3.0 → 9.4.0

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

@@ -5,10 +5,6 @@ import { KnownChainIds } from '@shapeshiftoss/types';
 import Web3 from 'web3';
 import { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, BuildTradeInput, BuyAssetBySellIdInput, ExecuteTradeInput, GetTradeQuoteInput, Swapper, SwapperType, TradeQuote, TradeResult, TradeTxs } from '../../api';
 import { CowTrade } from './types';
-/**
- * CowSwap only supports ERC-20 swaps, hence ETH is not supported
- * In order to get rates correctly, we need WETH asset to be passed as feeAsset
- */
 export declare type CowSwapperDeps = {
     apiUrl: string;
     adapter: ethereum.ChainAdapter;

package/dist/swappers/cow/CowSwapper.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CowSwapper = void 0;
+const caip_1 = require("@shapeshiftoss/caip");
+const types_1 = require("@shapeshiftoss/types");
 const api_1 = require("../../api");
 const cowApprovalNeeded_1 = require("./cowApprovalNeeded/cowApprovalNeeded");
 const cowApproveInfinite_1 = require("./cowApproveInfinite/cowApproveInfinite");
@@ -38,15 +40,15 @@ class CowSwapper {
     }
     filterBuyAssetsBySellAssetId(args) {
         const { assetIds = [], sellAssetId } = args;
-        if (!(sellAssetId === null || sellAssetId === void 0 ? void 0 : sellAssetId.startsWith('eip155:1/erc20')) ||
+        if ((0, caip_1.fromAssetId)(sellAssetId).assetNamespace !== 'erc20' ||
             blacklist_1.COWSWAP_UNSUPPORTED_ASSETS.includes(sellAssetId))
             return [];
         return assetIds.filter((id) => id !== sellAssetId &&
-            id.startsWith('eip155:1/erc20') &&
+            (0, caip_1.fromAssetId)(id).chainId === types_1.KnownChainIds.EthereumMainnet &&
             !blacklist_1.COWSWAP_UNSUPPORTED_ASSETS.includes(id));
     }
     filterAssetIdsBySellable(assetIds) {
-        return assetIds.filter((id) => id.startsWith('eip155:1/erc20') && !blacklist_1.COWSWAP_UNSUPPORTED_ASSETS.includes(id));
+        return assetIds.filter((id) => (0, caip_1.fromAssetId)(id).assetNamespace === 'erc20' && !blacklist_1.COWSWAP_UNSUPPORTED_ASSETS.includes(id));
     }
     async getTradeTxs(args) {
         return (0, cowGetTradeTxs_1.cowGetTradeTxs)(this.deps, args);

package/dist/swappers/cow/cowBuildTrade/cowBuildTrade.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cowBuildTrade = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
+const types_1 = require("@shapeshiftoss/types");
 const api_1 = require("../../../api");
 const erc20Allowance_abi_1 = require("../../utils/abi/erc20Allowance-abi");
 const bignumber_1 = require("../../utils/bignumber");
@@ -14,13 +15,20 @@ async function cowBuildTrade(deps, input) {
         const { sellAsset, buyAsset, sellAmount, sellAssetAccountNumber, wallet } = input;
         const { adapter, web3 } = deps;
         const { assetReference: sellAssetErc20Address, assetNamespace: sellAssetNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
-        const { assetReference: buyAssetErc20Address, assetNamespace: buyAssetNamespace } = (0, caip_1.fromAssetId)(buyAsset.assetId);
-        if (buyAssetNamespace !== 'erc20' || sellAssetNamespace !== 'erc20') {
-            throw new api_1.SwapError('[cowBuildTrade] - Both assets need to be ERC-20 to use CowSwap', {
+        const { assetReference: buyAssetErc20Address, chainId: buyAssetChainId } = (0, caip_1.fromAssetId)(buyAsset.assetId);
+        if (sellAssetNamespace !== 'erc20') {
+            throw new api_1.SwapError('[cowBuildTrade] - Sell asset needs to be ERC-20 to use CowSwap', {
                 code: api_1.SwapErrorTypes.UNSUPPORTED_PAIR,
-                details: { buyAssetNamespace, sellAssetNamespace }
+                details: { sellAssetNamespace }
             });
         }
+        if (buyAssetChainId !== types_1.KnownChainIds.EthereumMainnet) {
+            throw new api_1.SwapError('[cowBuildTrade] - Buy asset needs to be on ETH mainnet to use CowSwap', {
+                code: api_1.SwapErrorTypes.UNSUPPORTED_PAIR,
+                details: { buyAssetChainId }
+            });
+        }
+        const buyToken = buyAsset.assetId !== caip_1.ethAssetId ? buyAssetErc20Address : constants_1.COW_SWAP_ETH_MARKER_ADDRESS;
         const receiveAddress = await adapter.getAddress({ wallet });
         const normalizedSellAmount = (0, helpers_1.normalizeAmount)(sellAmount);
         /**
@@ -39,7 +47,7 @@ async function cowBuildTrade(deps, input) {
          */
         const quoteResponse = await cowService_1.cowService.post(`${deps.apiUrl}/v1/quote/`, {
             sellToken: sellAssetErc20Address,
-            buyToken: buyAssetErc20Address,
+            buyToken,
             receiver: receiveAddress,
             validTo: (0, helpers_2.getNowPlusThirtyMinutesTimestamp)(),
             appData: constants_1.DEFAULT_APP_DATA,

package/dist/swappers/cow/cowExecuteTrade/cowExecuteTrade.js

@@ -4,6 +4,7 @@ exports.cowExecuteTrade = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
 const hdwallet_core_1 = require("@shapeshiftoss/hdwallet-core");
+const types_1 = require("@shapeshiftoss/types");
 const ethers_1 = require("ethers");
 const api_1 = require("../../../api");
 const constants_1 = require("../utils/constants");
@@ -13,17 +14,24 @@ async function cowExecuteTrade({ apiUrl, adapter }, { trade, wallet }) {
     const cowTrade = trade;
     const { sellAsset, buyAsset, feeAmountInSellToken, sellAmountWithoutFee } = cowTrade;
     const { assetReference: sellAssetErc20Address, assetNamespace: sellAssetNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
-    const { assetReference: buyAssetErc20Address, assetNamespace: buyAssetNamespace } = (0, caip_1.fromAssetId)(buyAsset.assetId);
-    if (buyAssetNamespace !== 'erc20' || sellAssetNamespace !== 'erc20') {
-        throw new api_1.SwapError('[cowExecuteTrade] - Both assets need to be ERC-20 to use CowSwap', {
+    const { assetReference: buyAssetErc20Address, chainId: buyAssetChainId } = (0, caip_1.fromAssetId)(buyAsset.assetId);
+    if (sellAssetNamespace !== 'erc20') {
+        throw new api_1.SwapError('[cowExecuteTrade] - Sell asset needs to be ERC-20 to use CowSwap', {
             code: api_1.SwapErrorTypes.UNSUPPORTED_PAIR,
-            details: { buyAssetNamespace, sellAssetNamespace }
+            details: { sellAssetNamespace }
         });
     }
+    if (buyAssetChainId !== types_1.KnownChainIds.EthereumMainnet) {
+        throw new api_1.SwapError('[cowExecuteTrade] - Buy asset needs to be on ETH mainnet to use CowSwap', {
+            code: api_1.SwapErrorTypes.UNSUPPORTED_PAIR,
+            details: { buyAssetChainId }
+        });
+    }
+    const buyToken = buyAsset.assetId !== caip_1.ethAssetId ? buyAssetErc20Address : constants_1.COW_SWAP_ETH_MARKER_ADDRESS;
     try {
         const orderToSign = {
             sellToken: sellAssetErc20Address,
-            buyToken: buyAssetErc20Address,
+            buyToken,
             sellAmount: sellAmountWithoutFee,
             buyAmount: trade.buyAmount,
             validTo: (0, helpers_1.getNowPlusThirtyMinutesTimestamp)(),

package/dist/swappers/cow/getCowSwapMinMax/getCowSwapMinMax.js

@@ -1,14 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCowSwapMinMax = void 0;
+const caip_1 = require("@shapeshiftoss/caip");
+const types_1 = require("@shapeshiftoss/types");
 const api_1 = require("../../../api");
 const bignumber_1 = require("../../utils/bignumber");
 const constants_1 = require("../utils/constants");
 const helpers_1 = require("../utils/helpers/helpers");
 const getCowSwapMinMax = async (deps, sellAsset, buyAsset) => {
     try {
-        if (!sellAsset.assetId.startsWith('eip155:1/erc20') ||
-            !buyAsset.assetId.startsWith('eip155:1/erc20')) {
+        const { assetNamespace: sellAssetNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
+        const { chainId: buyAssetChainId } = (0, caip_1.fromAssetId)(buyAsset.assetId);
+        if (sellAssetNamespace !== 'erc20' || buyAssetChainId !== types_1.KnownChainIds.EthereumMainnet) {
             throw new api_1.SwapError('[getCowSwapMinMax]', { code: api_1.SwapErrorTypes.UNSUPPORTED_PAIR });
         }
         const usdRate = await (0, helpers_1.getUsdRate)(deps, sellAsset);

package/dist/swappers/cow/getCowSwapTradeQuote/getCowSwapTradeQuote.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCowSwapTradeQuote = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
+const types_1 = require("@shapeshiftoss/types");
 const api_1 = require("../../../api");
 const bignumber_1 = require("../../utils/bignumber");
 const helpers_1 = require("../../utils/helpers/helpers");
@@ -14,20 +15,27 @@ async function getCowSwapTradeQuote(deps, input) {
         const { sellAsset, buyAsset, sellAmount, sellAssetAccountNumber, wallet } = input;
         const { adapter, web3 } = deps;
         const { assetReference: sellAssetErc20Address, assetNamespace: sellAssetNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
-        const { assetReference: buyAssetErc20Address, assetNamespace: buyAssetNamespace } = (0, caip_1.fromAssetId)(buyAsset.assetId);
-        if (buyAssetNamespace !== 'erc20' || sellAssetNamespace !== 'erc20') {
-            throw new api_1.SwapError('[getCowSwapTradeQuote] - Both assets need to be ERC-20 to use CowSwap', {
+        const { assetReference: buyAssetErc20Address, chainId: buyAssetChainId } = (0, caip_1.fromAssetId)(buyAsset.assetId);
+        if (sellAssetNamespace !== 'erc20') {
+            throw new api_1.SwapError('[getCowSwapTradeQuote] - Sell asset needs to be ERC-20 to use CowSwap', {
                 code: api_1.SwapErrorTypes.UNSUPPORTED_PAIR,
-                details: { buyAssetNamespace, sellAssetNamespace }
+                details: { sellAssetNamespace }
             });
         }
+        if (buyAssetChainId !== types_1.KnownChainIds.EthereumMainnet) {
+            throw new api_1.SwapError('[getCowSwapTradeQuote] - Buy asset needs to be on ETH mainnet to use CowSwap', {
+                code: api_1.SwapErrorTypes.UNSUPPORTED_PAIR,
+                details: { buyAssetChainId }
+            });
+        }
+        const buyToken = buyAsset.assetId !== caip_1.ethAssetId ? buyAssetErc20Address : constants_1.COW_SWAP_ETH_MARKER_ADDRESS;
         const { minimum, maximum } = await (0, getCowSwapMinMax_1.getCowSwapMinMax)(deps, sellAsset, buyAsset);
         const minQuoteSellAmount = (0, bignumber_1.bnOrZero)(minimum).times((0, bignumber_1.bn)(10).exponentiatedBy(sellAsset.precision));
         // making sure we do not have decimals for cowswap api (can happen at least from minQuoteSellAmount)
         const normalizedSellAmount = (0, helpers_1.normalizeIntegerAmount)((0, bignumber_1.bnOrZero)(sellAmount).lt(minQuoteSellAmount) ? minQuoteSellAmount : sellAmount);
         const apiInput = {
             sellToken: sellAssetErc20Address,
-            buyToken: buyAssetErc20Address,
+            buyToken,
             receiver: constants_1.DEFAULT_ADDRESS,
             validTo: (0, helpers_2.getNowPlusThirtyMinutesTimestamp)(),
             appData: constants_1.DEFAULT_APP_DATA,

package/dist/swappers/cow/utils/constants.d.ts

@@ -15,3 +15,4 @@ export declare const ORDER_KIND_BUY = "buy";
 export declare const SIGNING_SCHEME = "ethsign";
 export declare const ERC20_TOKEN_BALANCE = "erc20";
 export declare const ORDER_STATUS_FULFILLED = "fulfilled";
+export declare const COW_SWAP_ETH_MARKER_ADDRESS = "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE";

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ORDER_STATUS_FULFILLED = exports.ERC20_TOKEN_BALANCE = exports.SIGNING_SCHEME = exports.ORDER_KIND_BUY = exports.ORDER_KIND_SELL = exports.WETH_ASSET_ID = exports.COW_SWAP_SETTLEMENT_ADDRESS = exports.COW_SWAP_VAULT_RELAYER_ADDRESS = exports.DEFAULT_APP_DATA = exports.DEFAULT_ADDRESS = exports.DEFAULT_SOURCE = exports.MIN_COWSWAP_VALUE_USD = exports.MAX_COWSWAP_TRADE = exports.MAX_ALLOWANCE = void 0;
+exports.COW_SWAP_ETH_MARKER_ADDRESS = exports.ORDER_STATUS_FULFILLED = exports.ERC20_TOKEN_BALANCE = exports.SIGNING_SCHEME = exports.ORDER_KIND_BUY = exports.ORDER_KIND_SELL = exports.WETH_ASSET_ID = exports.COW_SWAP_SETTLEMENT_ADDRESS = exports.COW_SWAP_VAULT_RELAYER_ADDRESS = exports.DEFAULT_APP_DATA = exports.DEFAULT_ADDRESS = exports.DEFAULT_SOURCE = exports.MIN_COWSWAP_VALUE_USD = exports.MAX_COWSWAP_TRADE = exports.MAX_ALLOWANCE = void 0;
 const constants_1 = require("@ethersproject/constants");
 exports.MAX_ALLOWANCE = '100000000000000000000000000';
 exports.MAX_COWSWAP_TRADE = '100000000000000000000000000';
@@ -16,3 +16,6 @@ exports.ORDER_KIND_BUY = 'buy';
 exports.SIGNING_SCHEME = 'ethsign';
 exports.ERC20_TOKEN_BALANCE = 'erc20';
 exports.ORDER_STATUS_FULFILLED = 'fulfilled';
+// Address used by CowSwap to buy ETH
+// See https://github.com/gnosis/gp-v2-contracts/commit/821b5a8da213297b0f7f1d8b17c893c5627020af#diff-12bbbe13cd5cf42d639e34a39d8795021ba40d3ee1e1a8282df652eb161a11d6R13
+exports.COW_SWAP_ETH_MARKER_ADDRESS = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE';

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

@@ -5,8 +5,10 @@ import { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, BuildT
 import { ThorchainSwapperDeps } from './types';
 export declare class ThorchainSwapper implements Swapper<ChainId> {
     readonly name = "Thorchain";
-    private swapSupportedChainIds;
-    private supportedAssetIds;
+    private sellSupportedChainIds;
+    private buySupportedChainIds;
+    private supportedSellAssetIds;
+    private supportedBuyAssetIds;
     deps: ThorchainSwapperDeps;
     constructor(deps: ThorchainSwapperDeps);
     initialize(): Promise<void>;

package/dist/swappers/thorchain/ThorchainSwapper.js

@@ -13,24 +13,38 @@ const thorService_1 = require("./utils/thorService");
 class ThorchainSwapper {
     constructor(deps) {
         this.name = 'Thorchain';
-        this.swapSupportedChainIds = {
+        this.sellSupportedChainIds = {
             [types_1.KnownChainIds.EthereumMainnet]: true,
             [types_1.KnownChainIds.BitcoinMainnet]: true
         };
-        this.supportedAssetIds = [];
+        this.buySupportedChainIds = {
+            [types_1.KnownChainIds.EthereumMainnet]: true,
+            [types_1.KnownChainIds.BitcoinMainnet]: true,
+            [types_1.KnownChainIds.DogecoinMainnet]: true,
+            [types_1.KnownChainIds.LitecoinMainnet]: true,
+            [types_1.KnownChainIds.CosmosMainnet]: true
+        };
+        this.supportedSellAssetIds = [];
+        this.supportedBuyAssetIds = [];
         this.deps = deps;
     }
     async initialize() {
         try {
             const { data: responseData } = await thorService_1.thorService.get(`${this.deps.midgardUrl}/pools`);
-            const supportedAssetIds = responseData.reduce((acc, midgardPool) => {
+            this.supportedSellAssetIds = responseData.reduce((acc, midgardPool) => {
+                const assetId = caip_1.adapters.poolAssetIdToAssetId(midgardPool.asset);
+                if (!assetId || !this.sellSupportedChainIds[(0, caip_1.fromAssetId)(assetId).chainId])
+                    return acc;
+                acc.push(assetId);
+                return acc;
+            }, []);
+            this.supportedBuyAssetIds = responseData.reduce((acc, midgardPool) => {
                 const assetId = caip_1.adapters.poolAssetIdToAssetId(midgardPool.asset);
-                if (!assetId || !this.swapSupportedChainIds[(0, caip_1.fromAssetId)(assetId).chainId])
+                if (!assetId || !this.buySupportedChainIds[(0, caip_1.fromAssetId)(assetId).chainId])
                     return acc;
                 acc.push(assetId);
                 return acc;
             }, []);
-            this.supportedAssetIds = supportedAssetIds;
         }
         catch (e) {
             throw new api_1.SwapError('[thorchainInitialize]: initialize failed to set supportedAssetIds', {
@@ -53,12 +67,12 @@ class ThorchainSwapper {
     }
     filterBuyAssetsBySellAssetId(args) {
         const { assetIds = [], sellAssetId } = args;
-        if (!this.supportedAssetIds.includes(sellAssetId))
+        if (!this.supportedSellAssetIds.includes(sellAssetId))
             return [];
-        return assetIds.filter((assetId) => this.supportedAssetIds.includes(assetId) && assetId !== sellAssetId);
+        return assetIds.filter((assetId) => this.supportedBuyAssetIds.includes(assetId) && assetId !== sellAssetId);
     }
     filterAssetIdsBySellable() {
-        return this.supportedAssetIds;
+        return this.supportedSellAssetIds;
     }
     async buildTrade(input) {
         return (0, buildThorTrade_1.buildTrade)({ deps: this.deps, input });

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

@@ -1,7 +1,10 @@
+import { ChainId } from '@shapeshiftoss/caip';
+import BigNumber from 'bignumber.js';
 export declare const MAX_THORCHAIN_TRADE = "100000000000000000000000000";
 export declare const MAX_ALLOWANCE = "100000000000000000000000000";
 export declare const THOR_MINIMUM_PADDING = 1.2;
 export declare const THOR_ETH_GAS_LIMIT = "100000";
 export declare const THORCHAIN_FIXED_PRECISION = 8;
-export declare const THOR_TRADE_FEE_BTC_SIZE = 1000;
-export declare const THOR_TRADE_FEE_ETH_GAS = 120000;
+export declare const THORCHAIN_AFFILIATE_NAME = "ss";
+export declare const THORCHAIN_AFFILIATE_BIPS = "0";
+export declare const THOR_TRADE_FEE_MULTIPLIERS: Record<ChainId, BigNumber>;

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

@@ -1,12 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.THOR_TRADE_FEE_ETH_GAS = exports.THOR_TRADE_FEE_BTC_SIZE = exports.THORCHAIN_FIXED_PRECISION = exports.THOR_ETH_GAS_LIMIT = exports.THOR_MINIMUM_PADDING = exports.MAX_ALLOWANCE = exports.MAX_THORCHAIN_TRADE = void 0;
+exports.THOR_TRADE_FEE_MULTIPLIERS = exports.THORCHAIN_AFFILIATE_BIPS = exports.THORCHAIN_AFFILIATE_NAME = exports.THORCHAIN_FIXED_PRECISION = exports.THOR_ETH_GAS_LIMIT = exports.THOR_MINIMUM_PADDING = exports.MAX_ALLOWANCE = exports.MAX_THORCHAIN_TRADE = void 0;
+const types_1 = require("@shapeshiftoss/types");
+const bignumber_1 = require("../../utils/bignumber");
 exports.MAX_THORCHAIN_TRADE = '100000000000000000000000000';
 exports.MAX_ALLOWANCE = '100000000000000000000000000';
 exports.THOR_MINIMUM_PADDING = 1.2;
 exports.THOR_ETH_GAS_LIMIT = '100000'; // for sends of eth / erc20 into thorchain router
 exports.THORCHAIN_FIXED_PRECISION = 8; // limit values are precision 8 regardless of the chain
-// These are different from THOR_ETH_GAS_LIMIT
+exports.THORCHAIN_AFFILIATE_NAME = 'ss';
+exports.THORCHAIN_AFFILIATE_BIPS = '0'; // affiliate fee in basis points (100 = 1%)
 // Used to estimate the fee thorchain will take out of the buyAsset
-exports.THOR_TRADE_FEE_BTC_SIZE = 1000; // used for estimating thorchain side fees
-exports.THOR_TRADE_FEE_ETH_GAS = 120000; // used for estimating thorchain side fees
+// Official docs on fees are incorrect
+// https://discord.com/channels/838986635756044328/997675038675316776/998552541170253834
+// This is still not "perfect" and tends to overestimate by a small randomish amount
+// TODO figure out if its possible to accurately estimate the outbound fee.
+// Neither the discord nor official docs are correct
+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.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/estimateTradeFee/estimateTradeFee.js

@@ -1,30 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.estimateTradeFee = void 0;
-const asset_service_1 = require("@shapeshiftoss/asset-service");
 const caip_1 = require("@shapeshiftoss/caip");
 const api_1 = require("../../../../api");
-const bignumber_1 = require("../../../utils/bignumber");
 const constants_1 = require("../constants");
 const getPriceRatio_1 = require("../getPriceRatio/getPriceRatio");
 const thorService_1 = require("../thorService");
-const gweiGasPrecision = 9;
-// Official docs on fees are incorrect
-// https://discord.com/channels/838986635756044328/997675038675316776/998552541170253834
-// This is still not "perfect" and tends to overestimate by a randomish amount
-// TODO figure out if its possible to accurately estimate the outbound fee.
-// Neither the discord nor official docs are correct
-const ethEstimate = (gasRate) => (0, bignumber_1.bnOrZero)(gasRate)
-    .times(constants_1.THOR_TRADE_FEE_ETH_GAS)
-    .times(2)
-    .times((0, bignumber_1.bn)(10).exponentiatedBy(gweiGasPrecision))
-    .toString();
-const erc20Estimate = (gasRate) => (0, bignumber_1.bnOrZero)(gasRate)
-    .times(constants_1.THOR_TRADE_FEE_ETH_GAS)
-    .times(2)
-    .times((0, bignumber_1.bn)(10).exponentiatedBy(gweiGasPrecision))
-    .toString();
-const btcEstimate = (gasRate) => (0, bignumber_1.bnOrZero)(gasRate).times(constants_1.THOR_TRADE_FEE_BTC_SIZE).times(2).toString();
 const estimateTradeFee = async (deps, buyAsset) => {
     const thorId = caip_1.adapters.assetIdToPoolAssetId({ assetId: buyAsset.assetId });
     if (!thorId)
@@ -41,7 +22,7 @@ const estimateTradeFee = async (deps, buyAsset) => {
             details: { thorPoolChainId }
         });
     const gasRate = inboundInfo.gas_rate;
-    const { chainId: buyChainId, assetNamespace } = (0, caip_1.fromAssetId)(buyAsset.assetId);
+    const { chainId: buyChainId } = (0, caip_1.fromAssetId)(buyAsset.assetId);
     const buyAdapter = deps.adapterManager.get(buyChainId);
     if (!buyAdapter)
         throw new api_1.SwapError('[estimateTradeFee] - unable to get buy asset adapter', {
@@ -54,33 +35,17 @@ const estimateTradeFee = async (deps, buyAsset) => {
             code: api_1.SwapErrorTypes.VALIDATION_FAILED,
             details: { buyAssetId: buyAsset.assetId }
         });
-    const feeAssetRatio = buyAsset.assetId !== buyFeeAssetId
+    const buyFeeAssetRatio = buyAsset.assetId !== buyFeeAssetId
         ? await (0, getPriceRatio_1.getPriceRatio)(deps, {
             sellAssetId: buyAsset.assetId,
             buyAssetId: buyFeeAssetId
         })
         : '1';
-    const buyFeeAsset = new asset_service_1.AssetService().getAll()[buyFeeAssetId];
-    switch (buyChainId) {
-        case 'bip122:000000000019d6689c085ae165831e93':
-            return (0, bignumber_1.fromBaseUnit)((0, bignumber_1.bnOrZero)(btcEstimate(gasRate)).times(feeAssetRatio).dp(0), buyFeeAsset.precision);
-        case 'eip155:1':
-            switch (assetNamespace) {
-                case 'slip44':
-                    return (0, bignumber_1.fromBaseUnit)((0, bignumber_1.bnOrZero)(ethEstimate(gasRate)).times(feeAssetRatio).dp(0), buyFeeAsset.precision);
-                case 'erc20':
-                    return (0, bignumber_1.fromBaseUnit)((0, bignumber_1.bnOrZero)(erc20Estimate(gasRate)).times(feeAssetRatio).dp(0), buyFeeAsset.precision);
-                default:
-                    throw new api_1.SwapError('[estimateTradeFee] - unsupported asset namespace', {
-                        code: api_1.SwapErrorTypes.VALIDATION_FAILED,
-                        details: { assetNamespace }
-                    });
-            }
-        default:
-            throw new api_1.SwapError('[estimateTradeFee] - unsupported chain id', {
-                code: api_1.SwapErrorTypes.VALIDATION_FAILED,
-                details: { chainId: buyChainId }
-            });
-    }
+    if (!constants_1.THOR_TRADE_FEE_MULTIPLIERS[buyChainId])
+        throw new api_1.SwapError('[estimateTradeFee] - no trade fee multiplier', {
+            code: api_1.SwapErrorTypes.VALIDATION_FAILED,
+            details: { buyChainId }
+        });
+    return constants_1.THOR_TRADE_FEE_MULTIPLIERS[buyChainId].times(buyFeeAssetRatio).times(gasRate).toString();
 };
 exports.estimateTradeFee = estimateTradeFee;

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeSwapMemo = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const api_1 = require("../../../../api");
+const constants_1 = require("../constants");
 // BTC (and likely other utxo coins) can only support up to 80 character memos
 const MAX_LENGTH = 80;
 /**
@@ -16,7 +17,7 @@ const makeSwapMemo = ({ buyAssetId, destinationAddress, limit }) => {
             code: api_1.SwapErrorTypes.MAKE_MEMO_FAILED,
             details: { buyAssetId }
         });
-    const memo = `s:${thorId}:${destinationAddress}:${limit}`;
+    const memo = `s:${thorId}:${destinationAddress}:${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.3.0",
+  "version": "9.4.0",
   "description": "An interface and implementations to trade coins via various protocols",
   "repository": "https://github.com/shapeshift/lib",
   "license": "MIT",