@shapeshiftoss/swapper 16.0.2 → 17.0.0

package/dist/api.d.ts

@@ -1,6 +1,6 @@
 import { Asset } from '@shapeshiftoss/asset-service';
 import { AssetId, ChainId } from '@shapeshiftoss/caip';
-import { avalanche, cosmos, ethereum, optimism, osmosis } from '@shapeshiftoss/chain-adapters';
+import { CosmosSdkChainId, EvmChainId, UtxoChainId } from '@shapeshiftoss/chain-adapters';
 import { HDWallet } from '@shapeshiftoss/hdwallet-core';
 import { ChainSpecific, KnownChainIds, UtxoAccountType } from '@shapeshiftoss/types';
 export declare const SwapError: {
@@ -63,6 +63,9 @@ declare type ChainSpecificQuoteFeeData<T extends ChainId> = ChainSpecific<T, {
     [KnownChainIds.CosmosMainnet]: {
         estimatedGas: string;
     };
+    [KnownChainIds.ThorchainMainnet]: {
+        estimatedGas: string;
+    };
 }>;
 export declare type QuoteFeeData<T extends ChainId> = {
     networkFeeCryptoBaseUnit: string;
@@ -97,19 +100,14 @@ declare type CommonTradeInput = {
     receiveAddress: string;
     accountNumber: number;
 };
-export declare type EvmSupportedChainIds = KnownChainIds.EthereumMainnet | KnownChainIds.AvalancheMainnet | KnownChainIds.OptimismMainnet;
-export declare type CosmosSdkSupportedChainIds = KnownChainIds.CosmosMainnet | KnownChainIds.OsmosisMainnet | KnownChainIds.ThorchainMainnet;
-export declare type EvmSupportedChainAdapter = ethereum.ChainAdapter | avalanche.ChainAdapter | optimism.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 & {
-    chainId: EvmSupportedChainIds;
+    chainId: EvmChainId;
 };
 export declare type GetCosmosSdkTradeQuoteInput = CommonTradeInput & {
-    chainId: CosmosSdkSupportedChainIds;
+    chainId: CosmosSdkChainId;
 };
 export declare type GetUtxoTradeQuoteInput = CommonTradeInput & {
-    chainId: UtxoSupportedChainIds;
+    chainId: UtxoChainId;
     accountType: UtxoAccountType;
     accountNumber: number;
     xpub: string;

package/dist/manager/testData.d.ts

@@ -1,9 +1,9 @@
 import { KnownChainIds } from '@shapeshiftoss/types';
 import { TradeQuote } from '../api';
 import { CowSwapper, ThorchainSwapper, ZrxSwapper } from '../swappers';
-export declare const getZrxEthereumSwapper: () => ZrxSwapper<import("../api").EvmSupportedChainIds>;
-export declare const getZrxAvalancheSwapper: () => ZrxSwapper<import("../api").EvmSupportedChainIds>;
-export declare const getZrxOptimismSwapper: () => ZrxSwapper<import("../api").EvmSupportedChainIds>;
+export declare const getZrxEthereumSwapper: () => ZrxSwapper<import("../swappers").ZrxSupportedChainId>;
+export declare const getZrxAvalancheSwapper: () => ZrxSwapper<import("../swappers").ZrxSupportedChainId>;
+export declare const getZrxOptimismSwapper: () => ZrxSwapper<import("../swappers").ZrxSupportedChainId>;
 export declare const getCowSwapper: () => CowSwapper;
 export declare const getThorchainSwapper: () => ThorchainSwapper;
 export declare const tradeQuote: TradeQuote<KnownChainIds.EthereumMainnet>;

package/dist/swappers/osmosis/OsmosisSwapper.d.ts

@@ -1,7 +1,11 @@
 import { Asset } from '@shapeshiftoss/asset-service';
 import { AssetId, ChainId } from '@shapeshiftoss/caip';
+import { cosmos, osmosis } from '@shapeshiftoss/chain-adapters';
+import { KnownChainIds } from '@shapeshiftoss/types';
 import { ApprovalNeededOutput, BuildTradeInput, BuyAssetBySellIdInput, ExecuteTradeInput, GetTradeQuoteInput, MinMaxOutput, Swapper, SwapperName, SwapperType, Trade, TradeQuote, TradeTxs } from '../../api';
 import { OsmosisTradeResult, OsmoSwapperDeps } from './utils/types';
+export declare type OsmosisSupportedChainId = KnownChainIds.CosmosMainnet | KnownChainIds.OsmosisMainnet;
+export declare type OsmosisSupportedChainAdapter = cosmos.ChainAdapter | osmosis.ChainAdapter;
 export declare class OsmosisSwapper implements Swapper<ChainId> {
     readonly name = SwapperName.Osmosis;
     supportedAssetIds: string[];

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

@@ -1,6 +1,7 @@
 import { osmosis } from '@shapeshiftoss/chain-adapters';
 import { HDWallet, Osmosis } from '@shapeshiftoss/hdwallet-core';
-import { CosmosSdkSupportedChainAdapters, TradeResult } from '../../../api';
+import { TradeResult } from '../../../api';
+import { OsmosisSupportedChainAdapter } from '../OsmosisSwapper';
 import { IbcTransferInput } from './types';
 export interface SymbolDenomMapping {
     OSMO: string;
@@ -21,7 +22,7 @@ export declare const getRateInfo: (sellAsset: string, buyAsset: string, sellAmou
     buyAssetTradeFeeUsd: string;
     buyAmountCryptoBaseUnit: string;
 }>;
-export declare const performIbcTransfer: (input: IbcTransferInput, adapter: CosmosSdkSupportedChainAdapters, wallet: HDWallet, blockBaseUrl: string, denom: string, sourceChannel: string, feeAmount: string, accountNumber: number, ibcAccountNumber: number, sequence: string, gas: string, feeDenom: string) => Promise<TradeResult>;
+export declare const performIbcTransfer: (input: IbcTransferInput, adapter: OsmosisSupportedChainAdapter, wallet: HDWallet, blockBaseUrl: string, denom: string, sourceChannel: string, feeAmount: string, accountNumber: number, ibcAccountNumber: number, sequence: string, gas: string, feeDenom: string) => Promise<TradeResult>;
 export declare const buildTradeTx: ({ osmoAddress, adapter, accountNumber, buyAssetDenom, sellAssetDenom, sellAmount, gas, wallet, }: {
     osmoAddress: string;
     adapter: osmosis.ChainAdapter;

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

@@ -1,11 +1,15 @@
 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, EvmSupportedChainIds, ExecuteTradeInput, GetTradeQuoteInput, Swapper, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
+import type { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, BuildTradeInput, BuyAssetBySellIdInput, ExecuteTradeInput, GetTradeQuoteInput, Swapper, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
 import { SwapperName, SwapperType } from '../../api';
 import { ThorchainSwapperDeps } from './types';
 export * from './types';
+export declare type ThorUtxoSupportedChainId = KnownChainIds.BitcoinMainnet | KnownChainIds.DogecoinMainnet | KnownChainIds.LitecoinMainnet | KnownChainIds.BitcoinCashMainnet;
+export declare type ThorEvmSupportedChainId = KnownChainIds.EthereumMainnet | KnownChainIds.AvalancheMainnet;
+export declare type ThorCosmosSdkSupportedChainId = KnownChainIds.ThorchainMainnet | KnownChainIds.CosmosMainnet;
 export declare class ThorchainSwapper implements Swapper<ChainId> {
     readonly name = SwapperName.Thorchain;
     private sellSupportedChainIds;
@@ -21,8 +25,8 @@ export declare class ThorchainSwapper implements Swapper<ChainId> {
     initialize(): Promise<void>;
     getType(): SwapperType;
     getUsdRate({ assetId }: Pick<Asset, 'assetId'>): Promise<string>;
-    approvalNeeded(input: ApprovalNeededInput<EvmSupportedChainIds>): Promise<ApprovalNeededOutput>;
-    approveInfinite(input: ApproveInfiniteInput<EvmSupportedChainIds>): Promise<string>;
+    approvalNeeded(input: ApprovalNeededInput<ThorEvmSupportedChainId>): Promise<ApprovalNeededOutput>;
+    approveInfinite(input: ApproveInfiniteInput<ThorEvmSupportedChainId>): Promise<string>;
     approveAmount(): Promise<string>;
     filterBuyAssetsBySellAssetId(args: BuyAssetBySellIdInput): AssetId[];
     filterAssetIdsBySellable(): AssetId[];

package/dist/swappers/thorchain/ThorchainSwapper.js

@@ -113,17 +113,19 @@ class ThorchainSwapper {
     async executeTrade(args) {
         try {
             const { trade, wallet } = args;
-            const adapter = this.deps.adapterManager.get(trade.sellAsset.chainId);
-            if (!adapter)
+            const { chainNamespace, chainId } = (0, caip_1.fromAssetId)(trade.sellAsset.assetId);
+            const adapter = this.deps.adapterManager.get(chainId);
+            if (!adapter) {
                 throw new api_1.SwapError('[executeTrade]: no adapter for sell asset chain id', {
                     code: api_1.SwapErrorType.SIGN_AND_BROADCAST_FAILED,
-                    details: { chainId: trade.sellAsset.chainId },
+                    details: { chainId },
                     fn: 'executeTrade',
                 });
-            const { chainNamespace } = (0, caip_1.fromAssetId)(trade.sellAsset.assetId);
+            }
             if (chainNamespace === caip_1.CHAIN_NAMESPACE.Evm) {
                 const evmAdapter = adapter;
-                const txToSign = trade.txData;
+                const txToSign = trade
+                    .txData;
                 if (wallet.supportsBroadcast()) {
                     const tradeId = await evmAdapter.signAndBroadcastTransaction({ txToSign, wallet });
                     return { tradeId };
@@ -134,7 +136,8 @@ class ThorchainSwapper {
             }
             else if (chainNamespace === caip_1.CHAIN_NAMESPACE.Utxo) {
                 const signedTx = await adapter.signTransaction({
-                    txToSign: trade.txData,
+                    txToSign: trade
+                        .txData,
                     wallet,
                 });
                 const txid = await adapter.broadcastTransaction(signedTx);
@@ -142,7 +145,8 @@ class ThorchainSwapper {
             }
             else if (chainNamespace === caip_1.CHAIN_NAMESPACE.CosmosSdk) {
                 const signedTx = await adapter.signTransaction({
-                    txToSign: trade.txData,
+                    txToSign: trade
+                        .txData,
                     wallet,
                 });
                 const txid = await adapter.broadcastTransaction(signedTx);

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

@@ -2,13 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildTrade = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
-const types_1 = require("@shapeshiftoss/types");
 const api_1 = require("../../../api");
 const constants_1 = require("../../utils/constants");
+const getCosmosTxData_1 = require("../cosmossdk/getCosmosTxData");
+const makeTradeTx_1 = require("../evm/makeTradeTx");
 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/evm/makeTradeTx");
+const getThorTxData_1 = require("../utxo/utils/getThorTxData");
 const buildTrade = async ({ deps, input }) => {
     var _a, _b, _c, _d;
     try {
@@ -90,7 +89,7 @@ const buildTrade = async ({ deps, input }) => {
                 quote: quote,
             });
             return {
-                chainId: types_1.KnownChainIds.CosmosMainnet,
+                chainId: sellAsset.chainId,
                 ...quote,
                 receiveAddress: destinationAddress,
                 txData,

package/dist/swappers/thorchain/{utils/cosmos → cosmossdk}/getCosmosTxData.d.ts

@@ -1,10 +1,10 @@
 import { Asset } from '@shapeshiftoss/asset-service';
 import { ChainId } from '@shapeshiftoss/caip';
-import { ChainAdapter } from '@shapeshiftoss/chain-adapters';
+import { CosmosSdkBaseAdapter } from '@shapeshiftoss/chain-adapters';
 import { HDWallet } from '@shapeshiftoss/hdwallet-core';
-import { KnownChainIds } from '@shapeshiftoss/types';
-import { TradeQuote } from '../../../../api';
-import type { ThorchainSwapperDeps } from '../../types';
+import { TradeQuote } from '../../../api';
+import { ThorCosmosSdkSupportedChainId } from '../ThorchainSwapper';
+import type { ThorchainSwapperDeps } from '../types';
 declare type GetCosmosTxDataInput = {
     accountNumber: number;
     destinationAddress: string;
@@ -14,9 +14,9 @@ declare type GetCosmosTxDataInput = {
     buyAsset: Asset;
     slippageTolerance: string;
     wallet: HDWallet;
-    quote: TradeQuote<KnownChainIds.CosmosMainnet>;
+    quote: TradeQuote<ThorCosmosSdkSupportedChainId>;
     chainId: ChainId;
-    sellAdapter: ChainAdapter<KnownChainIds.CosmosMainnet>;
+    sellAdapter: CosmosSdkBaseAdapter<ThorCosmosSdkSupportedChainId>;
 };
-export declare const getCosmosTxData: (input: GetCosmosTxDataInput) => Promise<import("@shapeshiftoss/hdwallet-core").CosmosSignTx>;
+export declare const getCosmosTxData: (input: GetCosmosTxDataInput) => Promise<import("@shapeshiftoss/hdwallet-core").CosmosSignTx | import("@shapeshiftoss/hdwallet-core").ThorchainSignTx>;
 export {};

package/dist/swappers/thorchain/{utils/cosmos → cosmossdk}/getCosmosTxData.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCosmosTxData = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const types_1 = require("@shapeshiftoss/types");
-const api_1 = require("../../../../api");
-const getInboundAddressDataForChain_1 = require("../getInboundAddressDataForChain");
-const getLimit_1 = require("../getLimit/getLimit");
-const makeSwapMemo_1 = require("../makeSwapMemo/makeSwapMemo");
+const api_1 = require("../../../api");
+const getInboundAddressDataForChain_1 = require("../utils/getInboundAddressDataForChain");
+const getLimit_1 = require("../utils/getLimit/getLimit");
+const makeSwapMemo_1 = require("../utils/makeSwapMemo/makeSwapMemo");
 const getCosmosTxData = async (input) => {
     const { accountNumber, deps, destinationAddress, sellAmountCryptoBaseUnit, sellAsset, buyAsset, slippageTolerance, quote, wallet, sellAdapter, } = input;
     const fromThorAsset = sellAsset.chainId == types_1.KnownChainIds.ThorchainMainnet;

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

@@ -1,7 +1,8 @@
 import { Asset } from '@shapeshiftoss/asset-service';
+import { EvmBaseAdapter } from '@shapeshiftoss/chain-adapters';
 import { ETHSignTx, HDWallet } from '@shapeshiftoss/hdwallet-core';
-import { EvmSupportedChainAdapter } from '../../../../api';
-import type { ThorchainSwapperDeps } from '../../types';
+import { ThorEvmSupportedChainId } from '../ThorchainSwapper';
+import type { ThorchainSwapperDeps } from '../types';
 declare type MakeTradeTxArgs = {
     wallet: HDWallet;
     accountNumber: number;
@@ -9,7 +10,7 @@ declare type MakeTradeTxArgs = {
     buyAsset: Asset;
     sellAsset: Asset;
     destinationAddress: string;
-    adapter: EvmSupportedChainAdapter;
+    adapter: EvmBaseAdapter<ThorEvmSupportedChainId>;
     slippageTolerance: string;
     deps: ThorchainSwapperDeps;
     gasLimit: string;

package/dist/swappers/thorchain/{utils/evm → evm}/makeTradeTx.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeTradeTx = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const web3_utils_1 = require("web3-utils");
-const api_1 = require("../../../../api");
+const api_1 = require("../../../api");
 const getThorTxData_1 = require("./utils/getThorTxData");
 const makeTradeTx = async ({ wallet, accountNumber, sellAmountCryptoBaseUnit, buyAsset, sellAsset, destinationAddress, adapter, maxFeePerGas, maxPriorityFeePerGas, gasPriceCryptoBaseUnit, slippageTolerance, deps, gasLimit, buyAssetTradeFeeUsd, }) => {
     try {

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

@@ -1,5 +1,5 @@
 import { Asset } from '@shapeshiftoss/asset-service';
-import type { ThorchainSwapperDeps } from '../../../types';
+import type { ThorchainSwapperDeps } from '../../types';
 declare type GetBtcThorTxInfoArgs = {
     deps: ThorchainSwapperDeps;
     sellAsset: Asset;

package/dist/swappers/thorchain/{utils/evm → evm}/utils/getThorTxData.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getThorTxInfo = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
-const api_1 = require("../../../../../api");
-const getInboundAddressDataForChain_1 = require("../../getInboundAddressDataForChain");
-const getLimit_1 = require("../../getLimit/getLimit");
-const makeSwapMemo_1 = require("../../makeSwapMemo/makeSwapMemo");
+const api_1 = require("../../../../api");
+const getInboundAddressDataForChain_1 = require("../../utils/getInboundAddressDataForChain");
+const getLimit_1 = require("../../utils/getLimit/getLimit");
+const makeSwapMemo_1 = require("../../utils/makeSwapMemo/makeSwapMemo");
 const routerCalldata_1 = require("../routerCalldata");
 const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmountCryptoBaseUnit, slippageTolerance, destinationAddress, buyAssetTradeFeeUsd, }) => {
     try {

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

@@ -6,7 +6,6 @@ const api_1 = require("../../../api");
 const bignumber_1 = require("../../utils/bignumber");
 const constants_1 = require("../../utils/constants");
 const constants_2 = require("../constants");
-const getThorTxData_1 = require("../utils/bitcoin/utils/getThorTxData");
 const constants_3 = require("../utils/constants");
 const getInboundAddressDataForChain_1 = require("../utils/getInboundAddressDataForChain");
 const getTradeRate_1 = require("../utils/getTradeRate/getTradeRate");
@@ -14,6 +13,7 @@ const getUsdRate_1 = require("../utils/getUsdRate/getUsdRate");
 const isRune_1 = require("../utils/isRune/isRune");
 const getEvmTxFees_1 = require("../utils/txFeeHelpers/evmTxFees/getEvmTxFees");
 const getUtxoTxFees_1 = require("../utils/txFeeHelpers/utxoTxFees/getUtxoTxFees");
+const getThorTxData_1 = require("../utxo/utils/getThorTxData");
 const getSlippage_1 = require("./getSlippage");
 const getThorTradeQuote = async ({ deps, input }) => {
     const { sellAsset, buyAsset, sellAmountBeforeFeesCryptoBaseUnit: sellAmountCryptoBaseUnit, accountNumber, chainId, receiveAddress, sendMax, } = input;

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

@@ -1,9 +1,8 @@
 import { ChainId } from '@shapeshiftoss/caip';
-import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
-import type { BTCSignTx, CosmosSignTx, ETHSignTx } from '@shapeshiftoss/hdwallet-core';
-import { KnownChainIds } from '@shapeshiftoss/types';
+import { ChainAdapterManager, SignTx } from '@shapeshiftoss/chain-adapters';
 import type Web3 from 'web3';
-import type { Trade, UtxoSupportedChainIds } from '../../api';
+import type { Trade } from '../../api';
+import { ThorCosmosSdkSupportedChainId, ThorEvmSupportedChainId, ThorUtxoSupportedChainId } from './ThorchainSwapper';
 export declare type ThornodePoolResponse = {
     LP_units: string;
     asset: string;
@@ -57,17 +56,17 @@ export declare type ThorchainSwapperDeps = {
     adapterManager: ChainAdapterManager;
     web3: Web3;
 };
-export interface BtcThorTrade<C extends ChainId> extends Trade<C> {
-    chainId: UtxoSupportedChainIds;
-    txData: BTCSignTx;
+export interface UtxoThorTrade<C extends ChainId> extends Trade<C> {
+    chainId: ThorUtxoSupportedChainId;
+    txData: SignTx<ThorUtxoSupportedChainId>;
 }
 export interface EvmThorTrade<C extends ChainId> extends Trade<C> {
-    chainId: KnownChainIds.EthereumMainnet | KnownChainIds.AvalancheMainnet | KnownChainIds.OptimismMainnet;
-    txData: ETHSignTx;
+    chainId: ThorEvmSupportedChainId;
+    txData: SignTx<ThorEvmSupportedChainId>;
 }
-export interface CosmosThorTrade<C extends ChainId> extends Trade<C> {
-    chainId: KnownChainIds.CosmosMainnet;
-    txData: CosmosSignTx;
+export interface CosmosSdkThorTrade<C extends ChainId> extends Trade<C> {
+    chainId: ThorCosmosSdkSupportedChainId;
+    txData: SignTx<ThorCosmosSdkSupportedChainId>;
 }
-export declare type ThorTrade<C extends ChainId> = BtcThorTrade<C> | EvmThorTrade<C> | CosmosThorTrade<C>;
+export declare type ThorTrade<C extends ChainId> = UtxoThorTrade<C> | EvmThorTrade<C> | CosmosSdkThorTrade<C>;
 export {};

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

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

package/dist/swappers/thorchain/utils/txFeeHelpers/utxoTxFees/getUtxoTxFees.d.ts

@@ -1,13 +1,14 @@
 import { UtxoBaseAdapter } from '@shapeshiftoss/chain-adapters';
-import { QuoteFeeData, UtxoSupportedChainIds } from '../../../../../api';
+import { QuoteFeeData } from '../../../../../api';
+import { ThorUtxoSupportedChainId } from '../../../ThorchainSwapper';
 declare type GetUtxoTxFeesInput = {
     opReturnData: string;
     vault: string;
     sellAmountCryptoBaseUnit: string;
-    sellAdapter: UtxoBaseAdapter<UtxoSupportedChainIds>;
+    sellAdapter: UtxoBaseAdapter<ThorUtxoSupportedChainId>;
     pubkey: string;
     buyAssetTradeFeeUsd: string;
     sendMax: boolean;
 };
-export declare const getUtxoTxFees: ({ opReturnData, vault, sellAmountCryptoBaseUnit, sellAdapter, pubkey, buyAssetTradeFeeUsd, sendMax, }: GetUtxoTxFeesInput) => Promise<QuoteFeeData<UtxoSupportedChainIds>>;
+export declare const getUtxoTxFees: ({ opReturnData, vault, sellAmountCryptoBaseUnit, sellAdapter, pubkey, buyAssetTradeFeeUsd, sendMax, }: GetUtxoTxFeesInput) => Promise<QuoteFeeData<ThorUtxoSupportedChainId>>;
 export {};

package/dist/swappers/thorchain/{utils/bitcoin → utxo}/utils/getThorTxData.d.ts

@@ -1,6 +1,6 @@
 import { Asset } from '@shapeshiftoss/asset-service';
-import type { ThorchainSwapperDeps } from '../../../types';
-declare type GetBtcThorTxInfoArgs = {
+import type { ThorchainSwapperDeps } from '../../types';
+declare type GetThorTxInfoArgs = {
     deps: ThorchainSwapperDeps;
     sellAsset: Asset;
     buyAsset: Asset;
@@ -10,11 +10,11 @@ declare type GetBtcThorTxInfoArgs = {
     xpub: string;
     buyAssetTradeFeeUsd: string;
 };
-declare type GetBtcThorTxInfoReturn = Promise<{
+declare type GetThorTxInfoReturn = Promise<{
     opReturnData: string;
     vault: string;
     pubkey: string;
 }>;
-declare type GetBtcThorTxInfo = (args: GetBtcThorTxInfoArgs) => GetBtcThorTxInfoReturn;
-export declare const getThorTxInfo: GetBtcThorTxInfo;
+declare type GetThorTxInfo = (args: GetThorTxInfoArgs) => GetThorTxInfoReturn;
+export declare const getThorTxInfo: GetThorTxInfo;
 export {};

package/dist/swappers/thorchain/{utils/bitcoin → utxo}/utils/getThorTxData.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getThorTxInfo = void 0;
-const api_1 = require("../../../../../api");
-const getInboundAddressDataForChain_1 = require("../../getInboundAddressDataForChain");
-const getLimit_1 = require("../../getLimit/getLimit");
-const makeSwapMemo_1 = require("../../makeSwapMemo/makeSwapMemo");
+const api_1 = require("../../../../api");
+const getInboundAddressDataForChain_1 = require("../../utils/getInboundAddressDataForChain");
+const getLimit_1 = require("../../utils/getLimit/getLimit");
+const makeSwapMemo_1 = require("../../utils/makeSwapMemo/makeSwapMemo");
 const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmountCryptoBaseUnit, slippageTolerance, destinationAddress, xpub, buyAssetTradeFeeUsd, }) => {
     try {
         const inboundAddress = await (0, getInboundAddressDataForChain_1.getInboundAddressDataForChain)(deps.daemonUrl, sellAsset.assetId, false);

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

@@ -1,11 +1,12 @@
 import { Asset } from '@shapeshiftoss/asset-service';
+import { EvmChainAdapter, EvmChainId } from '@shapeshiftoss/chain-adapters';
 import { HDWallet } from '@shapeshiftoss/hdwallet-core';
 import Web3 from 'web3';
 import { AbiItem } from 'web3-utils';
-import { EvmSupportedChainAdapter, EvmSupportedChainIds, TradeQuote } from '../../../api';
+import { TradeQuote } from '../../../api';
 import { BN } from '../bignumber';
 export declare type IsApprovalRequiredArgs = {
-    adapter: EvmSupportedChainAdapter;
+    adapter: EvmChainAdapter;
     receiveAddress: string;
     allowanceContract: string;
     sellAsset: Asset;
@@ -25,16 +26,16 @@ export declare type GetApproveContractDataArgs = {
     spenderAddress: string;
     contractAddress: string;
 };
-declare type GrantAllowanceArgs<T extends EvmSupportedChainIds> = {
+declare type GrantAllowanceArgs<T extends EvmChainId> = {
     quote: TradeQuote<T>;
     wallet: HDWallet;
-    adapter: EvmSupportedChainAdapter;
+    adapter: EvmChainAdapter;
     erc20Abi: AbiItem[];
     web3: Web3;
 };
 export declare const getERC20Allowance: ({ erc20AllowanceAbi, web3, sellAssetErc20Address, ownerAddress, spenderAddress, }: GetERC20AllowanceArgs) => Promise<any>;
 export declare const isApprovalRequired: ({ adapter, receiveAddress, allowanceContract, sellAsset, sellAmountExcludeFeeCryptoBaseUnit, web3, erc20AllowanceAbi, }: IsApprovalRequiredArgs) => Promise<boolean>;
-export declare const grantAllowance: <T extends EvmSupportedChainIds>({ quote, wallet, adapter, erc20Abi, web3, }: GrantAllowanceArgs<T>) => Promise<string>;
+export declare const grantAllowance: <T extends import("@shapeshiftoss/types").KnownChainIds.EthereumMainnet | import("@shapeshiftoss/types").KnownChainIds.AvalancheMainnet | import("@shapeshiftoss/types").KnownChainIds.OptimismMainnet>({ quote, wallet, adapter, erc20Abi, web3, }: GrantAllowanceArgs<T>) => Promise<string>;
 /**
  * This function keeps 17 significant digits, so even if we try to trade 1 Billion of an
  * ETH or ERC20, we still keep 7 decimal places.

package/dist/swappers/utils/test-data/setupSwapQuote.d.ts

@@ -17,7 +17,7 @@ export declare const setupBuildTrade: () => {
         receiveAddress: string;
         accountNumber: number;
     } & {
-        chainId: import("../../../api").EvmSupportedChainIds;
+        chainId: KnownChainIds.EthereumMainnet | KnownChainIds.AvalancheMainnet | KnownChainIds.OptimismMainnet;
     } & {
         slippage?: string | undefined;
         wallet: HDWallet;

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

@@ -1,8 +1,12 @@
 import { Asset } from '@shapeshiftoss/asset-service';
 import { AssetId, ChainId } from '@shapeshiftoss/caip';
-import { ApprovalNeededInput, ApprovalNeededOutput, ApproveAmountInput, ApproveInfiniteInput, BuildTradeInput, BuyAssetBySellIdInput, EvmSupportedChainIds, GetEvmTradeQuoteInput, Swapper, SwapperName, SwapperType, TradeQuote, TradeResult, TradeTxs } from '../../api';
+import { avalanche, ethereum, optimism } from '@shapeshiftoss/chain-adapters';
+import { KnownChainIds } from '@shapeshiftoss/types';
+import { ApprovalNeededInput, ApprovalNeededOutput, ApproveAmountInput, ApproveInfiniteInput, BuildTradeInput, BuyAssetBySellIdInput, GetEvmTradeQuoteInput, Swapper, SwapperName, SwapperType, TradeQuote, TradeResult, TradeTxs } from '../../api';
 import { ZrxExecuteTradeInput, ZrxSwapperDeps, ZrxTrade } from './types';
-export declare class ZrxSwapper<T extends EvmSupportedChainIds> implements Swapper<T> {
+export declare type ZrxSupportedChainId = KnownChainIds.EthereumMainnet | KnownChainIds.AvalancheMainnet | KnownChainIds.OptimismMainnet;
+export declare type ZrxSupportedChainAdapter = ethereum.ChainAdapter | avalanche.ChainAdapter | optimism.ChainAdapter;
+export declare class ZrxSwapper<T extends ZrxSupportedChainId> implements Swapper<T> {
     readonly name = SwapperName.Zrx;
     deps: ZrxSwapperDeps;
     chainId: ChainId;

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

@@ -1,2 +1,3 @@
-import { EvmSupportedChainIds, GetEvmTradeQuoteInput, TradeQuote } from '../../../api';
-export declare function getZrxTradeQuote<T extends EvmSupportedChainIds>(input: GetEvmTradeQuoteInput): Promise<TradeQuote<T>>;
+import { GetEvmTradeQuoteInput, TradeQuote } from '../../../api';
+import { ZrxSupportedChainId } from '../ZrxSwapper';
+export declare function getZrxTradeQuote<T extends ZrxSupportedChainId>(input: GetEvmTradeQuoteInput): Promise<TradeQuote<T>>;

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

@@ -1,6 +1,7 @@
 import { HDWallet } from '@shapeshiftoss/hdwallet-core';
 import type Web3 from 'web3';
-import { EvmSupportedChainAdapter, EvmSupportedChainIds, SwapSource, Trade } from '../../api';
+import { SwapSource, Trade } from '../../api';
+import { ZrxSupportedChainAdapter, ZrxSupportedChainId } from './ZrxSwapper';
 export declare type ZrxCommonResponse = {
     price: string;
     gasPrice: string;
@@ -17,15 +18,15 @@ export declare type ZrxQuoteResponse = ZrxCommonResponse & {
     data: string;
     gas: string;
 };
-export interface ZrxTrade<T extends EvmSupportedChainIds> extends Trade<T> {
+export interface ZrxTrade<T extends ZrxSupportedChainId> extends Trade<T> {
     txData: string;
     depositAddress: string;
 }
-export declare type ZrxExecuteTradeInput<T extends EvmSupportedChainIds> = {
+export declare type ZrxExecuteTradeInput<T extends ZrxSupportedChainId> = {
     trade: ZrxTrade<T>;
     wallet: HDWallet;
 };
 export declare type ZrxSwapperDeps = {
-    adapter: EvmSupportedChainAdapter;
+    adapter: ZrxSupportedChainAdapter;
     web3: Web3;
 };

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

@@ -1,3 +1,4 @@
-import { ApprovalNeededInput, ApprovalNeededOutput, EvmSupportedChainIds } from '../../../api';
+import { ApprovalNeededInput, ApprovalNeededOutput } from '../../../api';
 import { ZrxSwapperDeps } from '../types';
-export declare function zrxApprovalNeeded<T extends EvmSupportedChainIds>({ adapter, web3 }: ZrxSwapperDeps, { quote, wallet }: ApprovalNeededInput<T>): Promise<ApprovalNeededOutput>;
+import { ZrxSupportedChainId } from '../ZrxSwapper';
+export declare function zrxApprovalNeeded<T extends ZrxSupportedChainId>({ adapter, web3 }: ZrxSwapperDeps, { quote, wallet }: ApprovalNeededInput<T>): Promise<ApprovalNeededOutput>;

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

@@ -1,4 +1,5 @@
-import { ApproveAmountInput, ApproveInfiniteInput, EvmSupportedChainIds } from '../../../api';
+import { ApproveAmountInput, ApproveInfiniteInput } from '../../../api';
 import { ZrxSwapperDeps } from '../types';
-export declare function zrxApproveAmount<T extends EvmSupportedChainIds>(deps: ZrxSwapperDeps, args: ApproveAmountInput<T>): Promise<string>;
-export declare function zrxApproveInfinite<T extends EvmSupportedChainIds>(deps: ZrxSwapperDeps, args: ApproveInfiniteInput<T>): Promise<string>;
+import { ZrxSupportedChainId } from '../ZrxSwapper';
+export declare function zrxApproveAmount<T extends ZrxSupportedChainId>(deps: ZrxSwapperDeps, args: ApproveAmountInput<T>): Promise<string>;
+export declare function zrxApproveInfinite<T extends ZrxSupportedChainId>(deps: ZrxSwapperDeps, args: ApproveInfiniteInput<T>): Promise<string>;

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

@@ -1,3 +1,4 @@
-import { BuildTradeInput, EvmSupportedChainIds } from '../../../api';
+import { BuildTradeInput } from '../../../api';
 import { ZrxSwapperDeps, ZrxTrade } from '../types';
-export declare function zrxBuildTrade<T extends EvmSupportedChainIds>({ adapter, web3 }: ZrxSwapperDeps, input: BuildTradeInput): Promise<ZrxTrade<T>>;
+import { ZrxSupportedChainId } from '../ZrxSwapper';
+export declare function zrxBuildTrade<T extends ZrxSupportedChainId>({ adapter, web3 }: ZrxSwapperDeps, input: BuildTradeInput): Promise<ZrxTrade<T>>;

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

@@ -1,3 +1,4 @@
-import { EvmSupportedChainIds, TradeResult } from '../../../api';
+import { TradeResult } from '../../../api';
 import { ZrxExecuteTradeInput, ZrxSwapperDeps } from '../types';
-export declare function zrxExecuteTrade<T extends EvmSupportedChainIds>({ adapter }: ZrxSwapperDeps, { trade, wallet }: ZrxExecuteTradeInput<T>): Promise<TradeResult>;
+import { ZrxSupportedChainId } from '../ZrxSwapper';
+export declare function zrxExecuteTrade<T extends ZrxSupportedChainId>({ adapter }: ZrxSwapperDeps, { trade, wallet }: ZrxExecuteTradeInput<T>): Promise<TradeResult>;

package/package.json

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