@shapeshiftoss/swapper 9.2.1 → 9.2.2

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

@@ -1,6 +1,7 @@
 "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");
@@ -40,28 +41,35 @@ const estimateTradeFee = async (deps, buyAsset) => {
             details: { thorPoolChainId }
         });
     const gasRate = inboundInfo.gas_rate;
-    const { chainId, assetNamespace } = (0, caip_1.fromAssetId)(buyAsset.assetId);
-    const feeAssetId = (0, caip_1.getFeeAssetIdFromAssetId)(buyAsset.assetId);
-    if (!feeAssetId)
+    const { chainId: buyChainId, assetNamespace } = (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', {
+            code: api_1.SwapErrorTypes.VALIDATION_FAILED,
+            details: { buyChainId }
+        });
+    const buyFeeAssetId = buyAdapter.getFeeAssetId();
+    if (!buyFeeAssetId)
         throw new api_1.SwapError('[estimateTradeFee] - no fee assetId', {
             code: api_1.SwapErrorTypes.VALIDATION_FAILED,
             details: { buyAssetId: buyAsset.assetId }
         });
-    const feeAssetRatio = buyAsset.assetId !== feeAssetId
+    const feeAssetRatio = buyAsset.assetId !== buyFeeAssetId
         ? await (0, getPriceRatio_1.getPriceRatio)(deps, {
             sellAssetId: buyAsset.assetId,
-            buyAssetId: feeAssetId
+            buyAssetId: buyFeeAssetId
         })
         : '1';
-    switch (chainId) {
+    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), buyAsset.precision);
+            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), buyAsset.precision);
+                    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), buyAsset.precision);
+                    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,
@@ -71,7 +79,7 @@ const estimateTradeFee = async (deps, buyAsset) => {
         default:
             throw new api_1.SwapError('[estimateTradeFee] - unsupported chain id', {
                 code: api_1.SwapErrorTypes.VALIDATION_FAILED,
-                details: { chainId }
+                details: { chainId: buyChainId }
             });
     }
 };

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

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupThorswapDeps = void 0;
+const caip_1 = require("@shapeshiftoss/caip");
 const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
 const web3_1 = __importDefault(require("web3"));
 jest.mock('web3');
@@ -22,6 +23,7 @@ const setupThorswapDeps = () => {
                 buildBIP44Params: jest.fn(() => ({ purpose: 44, coinType: 60, accountNumber: 0 })),
                 getAddress: jest.fn(() => Promise.resolve('0xthisIsMyAddress')),
                 getFeeData: jest.fn(() => feeData),
+                getFeeAssetId: jest.fn(() => caip_1.ethAssetId),
                 getGasFeeData: jest.fn(() => ({
                     [chain_adapters_1.FeeDataKey.Slow]: {
                         gasPrice: '1',

package/package.json

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