@shapeshiftoss/swapper 14.3.0 → 14.4.0

package/dist/api.d.ts

@@ -84,7 +84,7 @@ declare type CommonTradeInput = {
 };
 export declare type EvmSupportedChainIds = KnownChainIds.EthereumMainnet | KnownChainIds.AvalancheMainnet;
 export declare type CosmosSdkSupportedChainIds = KnownChainIds.CosmosMainnet | KnownChainIds.OsmosisMainnet | KnownChainIds.ThorchainMainnet;
-export declare type EvmSupportedChainAdapters = ethereum.ChainAdapter | avalanche.ChainAdapter;
+export declare type EvmSupportedChainAdapter = ethereum.ChainAdapter | avalanche.ChainAdapter;
 export declare type CosmosSdkSupportedChainAdapters = cosmos.ChainAdapter | osmosis.ChainAdapter;
 export declare type UtxoSupportedChainIds = KnownChainIds.BitcoinMainnet | KnownChainIds.DogecoinMainnet | KnownChainIds.LitecoinMainnet | KnownChainIds.BitcoinCashMainnet;
 export declare type GetEvmTradeQuoteInput = CommonTradeInput & {

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

@@ -1,9 +1,8 @@
 import { Asset } from '@shapeshiftoss/asset-service';
 import { AssetId, ChainId } from '@shapeshiftoss/caip';
 import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
-import { KnownChainIds } from '@shapeshiftoss/types';
 import Web3 from 'web3';
-import type { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, BuildTradeInput, BuyAssetBySellIdInput, ExecuteTradeInput, GetTradeQuoteInput, Swapper, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
+import type { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, BuildTradeInput, BuyAssetBySellIdInput, EvmSupportedChainIds, ExecuteTradeInput, GetTradeQuoteInput, Swapper, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
 import { SwapperName, SwapperType } from '../../api';
 import { ThorchainSwapperDeps } from './types';
 export * from './types';
@@ -22,8 +21,8 @@ export declare class ThorchainSwapper implements Swapper<ChainId> {
     initialize(): Promise<void>;
     getType(): SwapperType;
     getUsdRate({ assetId }: Pick<Asset, 'assetId'>): Promise<string>;
-    approvalNeeded(input: ApprovalNeededInput<KnownChainIds.EthereumMainnet>): Promise<ApprovalNeededOutput>;
-    approveInfinite(input: ApproveInfiniteInput<KnownChainIds.EthereumMainnet>): Promise<string>;
+    approvalNeeded(input: ApprovalNeededInput<EvmSupportedChainIds>): Promise<ApprovalNeededOutput>;
+    approveInfinite(input: ApproveInfiniteInput<EvmSupportedChainIds>): Promise<string>;
     approveAmount(): Promise<string>;
     filterBuyAssetsBySellAssetId(args: BuyAssetBySellIdInput): AssetId[];
     filterAssetIdsBySellable(): AssetId[];

package/dist/swappers/thorchain/ThorchainSwapper.js

@@ -36,6 +36,7 @@ class ThorchainSwapper {
             [types_1.KnownChainIds.BitcoinCashMainnet]: true,
             [types_1.KnownChainIds.CosmosMainnet]: true,
             [types_1.KnownChainIds.ThorchainMainnet]: true,
+            [types_1.KnownChainIds.AvalancheMainnet]: true,
         };
         this.buySupportedChainIds = {
             [types_1.KnownChainIds.EthereumMainnet]: true,
@@ -45,6 +46,7 @@ class ThorchainSwapper {
             [types_1.KnownChainIds.BitcoinCashMainnet]: true,
             [types_1.KnownChainIds.CosmosMainnet]: true,
             [types_1.KnownChainIds.ThorchainMainnet]: true,
+            [types_1.KnownChainIds.AvalancheMainnet]: true,
         };
         this.supportedSellAssetIds = [caip_1.thorchainAssetId];
         this.supportedBuyAssetIds = [caip_1.thorchainAssetId];
@@ -161,7 +163,7 @@ class ThorchainSwapper {
         }
     }
     async getTradeTxs(tradeResult) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d;
         try {
             const midgardTxid = tradeResult.tradeId.startsWith('0x')
                 ? tradeResult.tradeId.slice(2)
@@ -179,12 +181,15 @@ class ThorchainSwapper {
                     code: api_1.SwapErrorTypes.TRADE_FAILED,
                     cause: data,
                 });
-            const standardBuyTxid = ((_g = (_f = (_e = data === null || data === void 0 ? void 0 : data.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;
+            const standardBuyTxid = (() => {
+                var _a, _b, _c;
+                const outCoinAsset = (_c = (_b = (_a = data === null || data === void 0 ? void 0 : data.actions[0]) === null || _a === void 0 ? void 0 : _a.out[0]) === null || _b === void 0 ? void 0 : _b.coins[0]) === null || _c === void 0 ? void 0 : _c.asset;
+                const isEvmCoinAsset = (outCoinAsset === null || outCoinAsset === void 0 ? void 0 : outCoinAsset.startsWith('ETH.')) || (outCoinAsset === null || outCoinAsset === void 0 ? void 0 : outCoinAsset.startsWith('AVAX.'));
+                return isEvmCoinAsset ? `0x${buyTxid}` : buyTxid;
+            })().toLowerCase();
             return {
                 sellTxid: tradeResult.tradeId,
-                buyTxid: standardBuyTxid.toLowerCase(),
+                buyTxid: standardBuyTxid,
             };
         }
         catch (e) {

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

@@ -1,7 +1,9 @@
 import { ChainId } from '@shapeshiftoss/caip';
 import { BuildTradeInput } from '../../../api';
 import { ThorchainSwapperDeps, ThorTrade } from '../types';
-export declare const buildTrade: ({ deps, input, }: {
+declare type BuildTradeArgs = {
     deps: ThorchainSwapperDeps;
     input: BuildTradeInput;
-}) => Promise<ThorTrade<ChainId>>;
+};
+export declare const buildTrade: ({ deps, input }: BuildTradeArgs) => Promise<ThorTrade<ChainId>>;
+export {};

package/dist/swappers/thorchain/buildThorTrade/buildThorTrade.js

@@ -8,8 +8,8 @@ const constants_1 = require("../../utils/constants");
 const getTradeQuote_1 = require("../getThorTradeQuote/getTradeQuote");
 const getThorTxData_1 = require("../utils/bitcoin/utils/getThorTxData");
 const getCosmosTxData_1 = require("../utils/cosmos/getCosmosTxData");
-const makeTradeTx_1 = require("../utils/ethereum/makeTradeTx");
-const buildTrade = async ({ deps, input, }) => {
+const makeTradeTx_1 = require("../utils/evm/makeTradeTx");
+const buildTrade = async ({ deps, input }) => {
     var _a, _b, _c, _d;
     try {
         const { buyAsset, receiveAddress: destinationAddress, sellAmountCryptoPrecision, sellAsset, bip44Params, slippage: slippageTolerance = constants_1.DEFAULT_SLIPPAGE, wallet, sendMax, } = input;
@@ -38,7 +38,7 @@ const buildTrade = async ({ deps, input, }) => {
                 buyAssetTradeFeeUsd: quote.feeData.buyAssetTradeFeeUsd,
             });
             return {
-                chainId: types_1.KnownChainIds.EthereumMainnet,
+                chainId: sellAsset.chainId,
                 ...quote,
                 receiveAddress: destinationAddress,
                 txData: ethTradeTx.txToSign,

package/dist/swappers/thorchain/getThorTradeQuote/getTradeQuote.js

@@ -12,8 +12,8 @@ const getInboundAddressDataForChain_1 = require("../utils/getInboundAddressDataF
 const getTradeRate_1 = require("../utils/getTradeRate/getTradeRate");
 const getUsdRate_1 = require("../utils/getUsdRate/getUsdRate");
 const isRune_1 = require("../utils/isRune/isRune");
-const getBtcTxFees_1 = require("../utils/txFeeHelpers/btcTxFees/getBtcTxFees");
-const getEthTxFees_1 = require("../utils/txFeeHelpers/ethTxFees/getEthTxFees");
+const getEvmTxFees_1 = require("../utils/txFeeHelpers/evmTxFees/getEvmTxFees");
+const getUtxoTxFees_1 = require("../utils/txFeeHelpers/utxoTxFees/getUtxoTxFees");
 const getThorTradeQuote = async ({ deps, input }) => {
     const { sellAsset, buyAsset, sellAmountCryptoPrecision, bip44Params, chainId, receiveAddress, sendMax, } = input;
     if (!bip44Params) {
@@ -64,12 +64,13 @@ const getThorTradeQuote = async ({ deps, input }) => {
         switch (chainNamespace) {
             case caip_1.CHAIN_NAMESPACE.Evm:
                 return (async () => {
-                    const ethAddressData = await (0, getInboundAddressDataForChain_1.getInboundAddressDataForChain)(deps.daemonUrl, caip_1.ethAssetId);
+                    const sellChainFeeAssetId = sellAdapter.getFeeAssetId();
+                    const ethAddressData = await (0, getInboundAddressDataForChain_1.getInboundAddressDataForChain)(deps.daemonUrl, sellChainFeeAssetId);
                     const router = ethAddressData === null || ethAddressData === void 0 ? void 0 : ethAddressData.router;
                     if (!router)
-                        throw new api_1.SwapError('[getThorTradeQuote] No router address found for ETH');
-                    const feeData = await (0, getEthTxFees_1.getEthTxFees)({
-                        adapterManager: deps.adapterManager,
+                        throw new api_1.SwapError(`[getThorTradeQuote] No router address found for ${sellChainFeeAssetId}`);
+                    const feeData = await (0, getEvmTxFees_1.getEvmTxFees)({
+                        adapter: sellAdapter,
                         sellAssetReference,
                         buyAssetTradeFeeUsd,
                     });
@@ -91,7 +92,7 @@ const getThorTradeQuote = async ({ deps, input }) => {
                         xpub: input.xpub,
                         buyAssetTradeFeeUsd,
                     });
-                    const feeData = await (0, getBtcTxFees_1.getBtcTxFees)({
+                    const feeData = await (0, getUtxoTxFees_1.getUtxoTxFees)({
                         sellAmountCryptoPrecision,
                         vault,
                         opReturnData,

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

@@ -57,13 +57,13 @@ export interface BtcThorTrade<C extends ChainId> extends Trade<C> {
     chainId: UtxoSupportedChainIds;
     txData: BTCSignTx;
 }
-export interface EthThorTrade<C extends ChainId> extends Trade<C> {
-    chainId: KnownChainIds.EthereumMainnet;
+export interface EvmThorTrade<C extends ChainId> extends Trade<C> {
+    chainId: KnownChainIds.EthereumMainnet | KnownChainIds.AvalancheMainnet;
     txData: ETHSignTx;
 }
 export interface CosmosThorTrade<C extends ChainId> extends Trade<C> {
     chainId: KnownChainIds.CosmosMainnet;
     txData: CosmosSignTx;
 }
-export declare type ThorTrade<C extends ChainId> = BtcThorTrade<C> | EthThorTrade<C> | CosmosThorTrade<C>;
+export declare type ThorTrade<C extends ChainId> = BtcThorTrade<C> | EvmThorTrade<C> | CosmosThorTrade<C>;
 export {};

package/dist/swappers/thorchain/utils/{ethereum → evm}/makeTradeTx.d.ts

@@ -1,7 +1,7 @@
 import { Asset } from '@shapeshiftoss/asset-service';
-import { ethereum } from '@shapeshiftoss/chain-adapters';
 import { ETHSignTx, HDWallet } from '@shapeshiftoss/hdwallet-core';
 import { BIP44Params } from '@shapeshiftoss/types';
+import { EvmSupportedChainAdapter } from '../../../../api';
 import type { ThorchainSwapperDeps } from '../../types';
 declare type MakeTradeTxArgs = {
     wallet: HDWallet;
@@ -10,7 +10,7 @@ declare type MakeTradeTxArgs = {
     buyAsset: Asset;
     sellAsset: Asset;
     destinationAddress: string;
-    adapter: ethereum.ChainAdapter;
+    adapter: EvmSupportedChainAdapter;
     slippageTolerance: string;
     deps: ThorchainSwapperDeps;
     gasLimit: string;

package/dist/swappers/thorchain/utils/txFeeHelpers/evmTxFees/getEvmTxFees.d.ts

@@ -0,0 +1,9 @@
+import { AssetReference } from '@shapeshiftoss/caip';
+import { EvmSupportedChainAdapter, EvmSupportedChainIds, QuoteFeeData } from '../../../../../api';
+declare type GetEvmTxFeesArgs = {
+    adapter: EvmSupportedChainAdapter;
+    sellAssetReference: AssetReference | string;
+    buyAssetTradeFeeUsd: string;
+};
+export declare const getEvmTxFees: ({ adapter, sellAssetReference, buyAssetTradeFeeUsd, }: GetEvmTxFeesArgs) => Promise<QuoteFeeData<EvmSupportedChainIds>>;
+export {};

package/dist/swappers/thorchain/utils/txFeeHelpers/{ethTxFees/getEthTxFees.js → evmTxFees/getEvmTxFees.js}

@@ -1,21 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEthTxFees = void 0;
+exports.getEvmTxFees = void 0;
 const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
-const types_1 = require("@shapeshiftoss/types");
 const api_1 = require("../../../../../api");
 const bignumber_1 = require("../../../../utils/bignumber");
 const constants_1 = require("../../../../utils/constants");
 const constants_2 = require("../../constants");
-const getEthTxFees = async ({ adapterManager, sellAssetReference, buyAssetTradeFeeUsd, }) => {
+const getEvmTxFees = async ({ adapter, sellAssetReference, buyAssetTradeFeeUsd, }) => {
     try {
-        const adapter = adapterManager.get(types_1.KnownChainIds.EthereumMainnet);
-        if (!adapter) {
-            throw new api_1.SwapError(`[getThorTxInfo] - No chain adapter found for ${types_1.KnownChainIds.EthereumMainnet}.`, {
-                code: api_1.SwapErrorTypes.UNSUPPORTED_CHAIN,
-                details: { chainId: types_1.KnownChainIds.EthereumMainnet },
-            });
-        }
         const gasFeeData = await adapter.getGasFeeData();
         // this is a good value to cover all thortrades out of eth/erc20
         // in the future we may want to look at doing this more precisely and in a future-proof way
@@ -50,4 +42,4 @@ const getEthTxFees = async ({ adapterManager, sellAssetReference, buyAssetTradeF
         throw new api_1.SwapError('[getThorTxInfo]', { cause: e, code: api_1.SwapErrorTypes.TRADE_QUOTE_FAILED });
     }
 };
-exports.getEthTxFees = getEthTxFees;
+exports.getEvmTxFees = getEvmTxFees;

package/dist/swappers/thorchain/utils/txFeeHelpers/{btcTxFees/getBtcTxFees.d.ts → utxoTxFees/getUtxoTxFees.d.ts}

@@ -1,6 +1,6 @@
 import { UtxoBaseAdapter } from '@shapeshiftoss/chain-adapters';
 import { QuoteFeeData, UtxoSupportedChainIds } from '../../../../../api';
-declare type GetBtcTxFeesInput = {
+declare type GetUtxoTxFeesInput = {
     opReturnData: string;
     vault: string;
     sellAmountCryptoPrecision: string;
@@ -9,5 +9,5 @@ declare type GetBtcTxFeesInput = {
     buyAssetTradeFeeUsd: string;
     sendMax: boolean;
 };
-export declare const getBtcTxFees: ({ opReturnData, vault, sellAmountCryptoPrecision, sellAdapter, pubkey, buyAssetTradeFeeUsd, sendMax, }: GetBtcTxFeesInput) => Promise<QuoteFeeData<UtxoSupportedChainIds>>;
+export declare const getUtxoTxFees: ({ opReturnData, vault, sellAmountCryptoPrecision, sellAdapter, pubkey, buyAssetTradeFeeUsd, sendMax, }: GetUtxoTxFeesInput) => Promise<QuoteFeeData<UtxoSupportedChainIds>>;
 export {};

package/dist/swappers/thorchain/utils/txFeeHelpers/{btcTxFees/getBtcTxFees.js → utxoTxFees/getUtxoTxFees.js}

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBtcTxFees = void 0;
+exports.getUtxoTxFees = void 0;
 const types_1 = require("@shapeshiftoss/types");
 const api_1 = require("../../../../../api");
 const bignumber_1 = require("../../../../utils/bignumber");
-const getBtcTxFees = async ({ opReturnData, vault, sellAmountCryptoPrecision, sellAdapter, pubkey, buyAssetTradeFeeUsd, sendMax, }) => {
+const getUtxoTxFees = async ({ opReturnData, vault, sellAmountCryptoPrecision, sellAdapter, pubkey, buyAssetTradeFeeUsd, sendMax, }) => {
     try {
         const feeDataOptions = await sellAdapter.getFeeData({
             to: vault,
@@ -38,7 +38,7 @@ const getBtcTxFees = async ({ opReturnData, vault, sellAmountCryptoPrecision, se
     catch (e) {
         if (e instanceof api_1.SwapError)
             throw e;
-        throw new api_1.SwapError('[getBtcTxFeess]', { cause: e, code: api_1.SwapErrorTypes.TRADE_QUOTE_FAILED });
+        throw new api_1.SwapError('[getUtxoTxFees]', { cause: e, code: api_1.SwapErrorTypes.TRADE_QUOTE_FAILED });
     }
 };
-exports.getBtcTxFees = getBtcTxFees;
+exports.getUtxoTxFees = getUtxoTxFees;

package/dist/swappers/utils/helpers/helpers.d.ts

@@ -2,10 +2,10 @@ import { Asset } from '@shapeshiftoss/asset-service';
 import { HDWallet } from '@shapeshiftoss/hdwallet-core';
 import Web3 from 'web3';
 import { AbiItem } from 'web3-utils';
-import { EvmSupportedChainAdapters, EvmSupportedChainIds, TradeQuote } from '../../../api';
+import { EvmSupportedChainAdapter, EvmSupportedChainIds, TradeQuote } from '../../../api';
 import { BN } from '../bignumber';
 export declare type IsApprovalRequiredArgs = {
-    adapter: EvmSupportedChainAdapters;
+    adapter: EvmSupportedChainAdapter;
     receiveAddress: string;
     allowanceContract: string;
     sellAsset: Asset;
@@ -28,7 +28,7 @@ export declare type GetApproveContractDataArgs = {
 declare type GrantAllowanceArgs<T extends EvmSupportedChainIds> = {
     quote: TradeQuote<T>;
     wallet: HDWallet;
-    adapter: EvmSupportedChainAdapters;
+    adapter: EvmSupportedChainAdapter;
     erc20Abi: AbiItem[];
     web3: Web3;
 };

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

@@ -1,6 +1,6 @@
 import { HDWallet } from '@shapeshiftoss/hdwallet-core';
 import type Web3 from 'web3';
-import { EvmSupportedChainAdapters, EvmSupportedChainIds, SwapSource, Trade } from '../../api';
+import { EvmSupportedChainAdapter, EvmSupportedChainIds, SwapSource, Trade } from '../../api';
 export declare type ZrxCommonResponse = {
     price: string;
     gasPrice: string;
@@ -26,6 +26,6 @@ export declare type ZrxExecuteTradeInput<T extends EvmSupportedChainIds> = {
     wallet: HDWallet;
 };
 export declare type ZrxSwapperDeps = {
-    adapter: EvmSupportedChainAdapters;
+    adapter: EvmSupportedChainAdapter;
     web3: Web3;
 };

package/package.json

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

package/dist/swappers/thorchain/utils/txFeeHelpers/ethTxFees/getEthTxFees.d.ts

@@ -1,9 +0,0 @@
-import { AssetReference } from '@shapeshiftoss/caip';
-import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
-import { KnownChainIds } from '@shapeshiftoss/types';
-import { QuoteFeeData } from '../../../../../api';
-export declare const getEthTxFees: ({ adapterManager, sellAssetReference, buyAssetTradeFeeUsd, }: {
-    adapterManager: ChainAdapterManager;
-    sellAssetReference: AssetReference | string;
-    buyAssetTradeFeeUsd: string;
-}) => Promise<QuoteFeeData<KnownChainIds.EthereumMainnet>>;