@shapeshiftoss/swapper 15.4.1 → 15.5.1

package/dist/api.d.ts

@@ -38,6 +38,12 @@ declare type ChainSpecificQuoteFeeData<T extends ChainId> = ChainSpecific<T, {
         approvalFeeCryptoBaseUnit?: string;
         totalFee?: string;
     };
+    [KnownChainIds.OptimismMainnet]: {
+        estimatedGas?: string;
+        gasPriceCryptoBaseUnit?: string;
+        approvalFeeCryptoBaseUnit?: string;
+        totalFee?: string;
+    };
     [KnownChainIds.BitcoinMainnet]: {
         byteCount: string;
         satsPerByte: string;

package/dist/swappers/cow/CowSwapper.js

@@ -65,7 +65,12 @@ class CowSwapper {
             !blacklist_1.COWSWAP_UNSUPPORTED_ASSETS.includes(id));
     }
     filterAssetIdsBySellable(assetIds) {
-        return assetIds.filter((id) => (0, caip_1.fromAssetId)(id).assetNamespace === 'erc20' && !blacklist_1.COWSWAP_UNSUPPORTED_ASSETS.includes(id));
+        return assetIds.filter((id) => {
+            const { chainId, assetNamespace } = (0, caip_1.fromAssetId)(id);
+            return (chainId === types_1.KnownChainIds.EthereumMainnet &&
+                assetNamespace === caip_1.ASSET_NAMESPACE.erc20 &&
+                !blacklist_1.COWSWAP_UNSUPPORTED_ASSETS.includes(id));
+        });
     }
     async getTradeTxs(args) {
         return (0, cowGetTradeTxs_1.cowGetTradeTxs)(this.deps, args);

package/dist/swappers/osmosis/utils/helpers.js

@@ -9,19 +9,9 @@ const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
 const axios_1 = __importDefault(require("axios"));
 const lodash_1 = require("lodash");
 const api_1 = require("../../../api");
-const utils_1 = require("../../../utils");
 const bignumber_1 = require("../../utils/bignumber");
 const constants_1 = require("./constants");
-// Create cached axios service for pools endpoint because it gets called a LOT
-const cache = (0, utils_1.createCache)(3000, ['/osmosis/gamm/v1beta1/pools/']);
-const osmoPoolsService = axios_1.default.create({
-    timeout: 10000,
-    headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-    },
-    adapter: cache.adapter,
-});
+const osmoService_1 = require("./osmoService");
 exports.symbolDenomMapping = {
     OSMO: 'uosmo',
     ATOM: 'ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2',
@@ -116,7 +106,7 @@ const findPool = async (sellAssetSymbol, buyAssetSymbol, osmoUrl) => {
     const poolsUrl = osmoUrl + '/osmosis/gamm/v1beta1/pools?pagination.limit=1000';
     const poolsResponse = await (async () => {
         try {
-            return osmoPoolsService.get(poolsUrl);
+            return osmoService_1.osmoService.get(poolsUrl);
         }
         catch (e) {
             throw new api_1.SwapError('failed to get pool', {

package/dist/swappers/osmosis/utils/osmoService.d.ts

@@ -0,0 +1 @@
+export declare const osmoService: import("axios").AxiosInstance;

package/dist/swappers/osmosis/utils/osmoService.js

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.osmoService = void 0;
+const axios_1 = __importDefault(require("axios"));
+const utils_1 = require("../../../utils");
+const maxAge = 3 * 1000; // 3 seconds
+const cachedUrls = ['/osmosis/gamm/v1beta1/pools'];
+const cache = (0, utils_1.createCache)(maxAge, cachedUrls);
+const axiosConfig = {
+    timeout: 10000,
+    headers: {
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
+    },
+    adapter: cache.adapter,
+};
+exports.osmoService = axios_1.default.create(axiosConfig);

package/dist/swappers/thorchain/ThorchainSwapper.js

@@ -37,6 +37,7 @@ class ThorchainSwapper {
             [types_1.KnownChainIds.CosmosMainnet]: true,
             [types_1.KnownChainIds.ThorchainMainnet]: true,
             [types_1.KnownChainIds.AvalancheMainnet]: false,
+            [types_1.KnownChainIds.OptimismMainnet]: false,
         };
         this.buySupportedChainIds = {
             [types_1.KnownChainIds.EthereumMainnet]: true,
@@ -47,6 +48,7 @@ class ThorchainSwapper {
             [types_1.KnownChainIds.CosmosMainnet]: true,
             [types_1.KnownChainIds.ThorchainMainnet]: true,
             [types_1.KnownChainIds.AvalancheMainnet]: false,
+            [types_1.KnownChainIds.OptimismMainnet]: false,
         };
         this.supportedSellAssetIds = [caip_1.thorchainAssetId];
         this.supportedBuyAssetIds = [caip_1.thorchainAssetId];

package/dist/swappers/zrx/ZrxSwapper.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZrxSwapper = void 0;
+const caip_1 = require("@shapeshiftoss/caip");
 const types_1 = require("@shapeshiftoss/types");
 const api_1 = require("../../api");
 const getZrxTradeQuote_1 = require("./getZrxTradeQuote/getZrxTradeQuote");
@@ -51,12 +52,12 @@ class ZrxSwapper {
     }
     filterBuyAssetsBySellAssetId(args) {
         const { assetIds = [], sellAssetId } = args;
-        return assetIds.filter((id) => id.startsWith(this.chainId) &&
-            (sellAssetId === null || sellAssetId === void 0 ? void 0 : sellAssetId.startsWith(this.chainId)) &&
+        return assetIds.filter((id) => (0, caip_1.fromAssetId)(id).chainId === this.chainId &&
+            (0, caip_1.fromAssetId)(sellAssetId).chainId === this.chainId &&
             !blacklist_1.UNSUPPORTED_ASSETS.includes(id));
     }
     filterAssetIdsBySellable(assetIds = []) {
-        return assetIds.filter((id) => id.startsWith(this.chainId) && !blacklist_1.UNSUPPORTED_ASSETS.includes(id));
+        return assetIds.filter((id) => (0, caip_1.fromAssetId)(id).chainId === this.chainId && !blacklist_1.UNSUPPORTED_ASSETS.includes(id));
     }
     async getTradeTxs(tradeResult) {
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "15.4.1",
+  "version": "15.5.1",
   "description": "An interface and implementations to trade coins via various protocols",
   "repository": "https://github.com/shapeshift/lib",
   "license": "MIT",
@@ -35,7 +35,7 @@
     "@shapeshiftoss/caip": "^8.0.0",
     "@shapeshiftoss/chain-adapters": "^10.5.0",
     "@shapeshiftoss/errors": "^1.1.2",
-    "@shapeshiftoss/hdwallet-core": "^1.41.0",
+    "@shapeshiftoss/hdwallet-core": "^1.42.0",
     "@shapeshiftoss/types": "^8.1.0"
   },
   "devDependencies": {
@@ -43,7 +43,7 @@
     "@shapeshiftoss/caip": "^8.0.0",
     "@shapeshiftoss/chain-adapters": "^10.5.0",
     "@shapeshiftoss/errors": "^1.1.2",
-    "@shapeshiftoss/hdwallet-core": "^1.41.0",
+    "@shapeshiftoss/hdwallet-core": "^1.42.0",
     "@shapeshiftoss/types": "^8.1.0",
     "@shapeshiftoss/unchained-client": "^10.0.1",
     "@types/readline-sync": "^1.4.4",