@shapeshiftoss/swapper 7.9.0 → 8.0.1

package/README.md

@@ -31,16 +31,16 @@ import { SwapperManager, SwapperType, ZrxSwapper } from '@shapeshiftoss/swapper'
 // in code
 const manager = new SwapperManager<MyCustomSwapperTypes>()
 
-// Add a swapper to the manager, you can add your own if they follow the `Swapper` api spec
+// Add a swapper to the manager, you can add your own if it follows the `Swapper` API spec
 manager
-  .addSwapper(SwapperType.Zrx, new ZrxSwapper())
-  .addSwapper(SwapperType.Thorchain, new ThorchainSwapper())
+  .addSwapper(new ZrxSwapper())
+  .addSwapper(new ThorchainSwapper())
 
 // Get a swapper from the manager
 const swapper = manager.getSwapper(SwapperType.Zrx)
 
 // Remove a swapper from the manager
-manager.removeSwapper(SwapperType.Zrx)
+manager.removeSwapper(SwapperType.ZrxEthereum)
 ```
 
 ### Working with the manager

package/dist/api.d.ts

@@ -1,5 +1,6 @@
 import { AssetId, ChainId } from '@shapeshiftoss/caip';
-import { BTCSignTx, ETHSignTx, HDWallet } from '@shapeshiftoss/hdwallet-core';
+import { avalanche, ethereum } from '@shapeshiftoss/chain-adapters';
+import { HDWallet } from '@shapeshiftoss/hdwallet-core';
 import { Asset, BIP44Params, ChainSpecific, KnownChainIds, UtxoAccountType } from '@shapeshiftoss/types';
 export declare const SwapError: {
     new <V extends {
@@ -24,13 +25,19 @@ export declare const SwapError: {
     stackTraceLimit: number;
 };
 declare type ChainSpecificQuoteFeeData<T extends ChainId> = ChainSpecific<T, {
-    'eip155:1': {
+    [KnownChainIds.EthereumMainnet]: {
         estimatedGas?: string;
         gasPrice?: string;
         approvalFee?: string;
         totalFee?: string;
     };
-    'bip122:000000000019d6689c085ae165831e93': {
+    [KnownChainIds.AvalancheMainnet]: {
+        estimatedGas?: string;
+        gasPrice?: string;
+        approvalFee?: string;
+        totalFee?: string;
+    };
+    [KnownChainIds.BitcoinMainnet]: {
         byteCount: string;
         satsPerByte: string;
     };
@@ -50,7 +57,7 @@ export declare type BuyAssetBySellIdInput = {
 export declare type SupportedSellAssetsInput = {
     assetIds: AssetId[];
 };
-export declare type CommonTradeInput = {
+declare type CommonTradeInput = {
     sellAsset: Asset;
     buyAsset: Asset;
     sellAmount: string;
@@ -58,16 +65,18 @@ export declare type CommonTradeInput = {
     sellAssetAccountNumber: number;
     wallet?: HDWallet;
 };
-export declare type GetEthTradeQuoteInput = CommonTradeInput & {
-    chainId: 'eip155:1';
+export declare type EvmSupportedChainIds = KnownChainIds.EthereumMainnet | KnownChainIds.AvalancheMainnet;
+export declare type EvmSupportedChainAdapters = ethereum.ChainAdapter | avalanche.ChainAdapter;
+export declare type GetEvmTradeQuoteInput = CommonTradeInput & {
+    chainId: EvmSupportedChainIds;
 };
-export declare type GetBtcTradeQuoteInput = CommonTradeInput & {
-    chainId: 'bip122:000000000019d6689c085ae165831e93';
+declare type GetBtcTradeQuoteInput = CommonTradeInput & {
+    chainId: KnownChainIds.BitcoinMainnet;
     accountType: UtxoAccountType;
     bip44Params: BIP44Params;
     wallet: HDWallet;
 };
-export declare type GetTradeQuoteInput = GetEthTradeQuoteInput | GetBtcTradeQuoteInput;
+export declare type GetTradeQuoteInput = GetBtcTradeQuoteInput | GetEvmTradeQuoteInput;
 export declare type BuildTradeInput = GetTradeQuoteInput & {
     buyAssetAccountNumber: number;
     slippage?: string;
@@ -91,19 +100,6 @@ export interface TradeQuote<C extends ChainId> extends TradeBase<C> {
 export interface Trade<C extends ChainId> extends TradeBase<C> {
     receiveAddress: string;
 }
-export interface ZrxTrade extends Trade<'eip155:1'> {
-    txData: string;
-    depositAddress: string;
-}
-export interface BtcThorTrade<C extends ChainId> extends Trade<C> {
-    chainId: KnownChainIds.BitcoinMainnet;
-    txData: BTCSignTx;
-}
-export interface EthThorTrade<C extends ChainId> extends Trade<C> {
-    chainId: KnownChainIds.EthereumMainnet;
-    txData: ETHSignTx;
-}
-export declare type ThorTrade<C extends ChainId> = BtcThorTrade<C> | EthThorTrade<C>;
 export declare type ExecuteTradeInput<C extends ChainId> = {
     trade: Trade<C>;
     wallet: HDWallet;
@@ -131,7 +127,8 @@ export declare type ApprovalNeededOutput = {
     approvalNeeded: boolean;
 };
 export declare enum SwapperType {
-    Zrx = "0x",
+    ZrxEthereum = "0xEthereum",
+    ZrxAvalanche = "0xAvalanche",
     Thorchain = "Thorchain",
     CowSwap = "CowSwap",
     Test = "Test"

package/dist/api.js

@@ -2,10 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SwapErrorTypes = exports.SwapperType = exports.SwapError = void 0;
 const errors_1 = require("@shapeshiftoss/errors");
+const types_1 = require("@shapeshiftoss/types");
 exports.SwapError = (0, errors_1.createErrorClass)('SwapError');
 var SwapperType;
 (function (SwapperType) {
-    SwapperType["Zrx"] = "0x";
+    SwapperType["ZrxEthereum"] = "0xEthereum";
+    SwapperType["ZrxAvalanche"] = "0xAvalanche";
     SwapperType["Thorchain"] = "Thorchain";
     SwapperType["CowSwap"] = "CowSwap";
     SwapperType["Test"] = "Test";

package/dist/manager/SwapperManager.d.ts

@@ -6,16 +6,14 @@ export declare class SwapperManager {
     constructor();
     /**
      *
-     * @param swapperType swapper type {SwapperType|string}
      * @param swapperInstance swapper instance {Swapper}
      * @returns {SwapperManager}
      */
-    addSwapper(swapperType: SwapperType, swapperInstance: Swapper<ChainId>): this;
+    addSwapper(swapperInstance: Swapper<ChainId>): this;
     /**
      *
      * @param swapperType swapper type {SwapperType|string}
      * @returns {Swapper}
-     * @deprecated this will be removed, currently used in swapper tests
      */
     getSwapper(swapperType: SwapperType): Swapper<ChainId>;
     /**

package/dist/manager/SwapperManager.js

@@ -19,18 +19,18 @@ class SwapperManager {
     }
     /**
      *
-     * @param swapperType swapper type {SwapperType|string}
      * @param swapperInstance swapper instance {Swapper}
      * @returns {SwapperManager}
      */
-    addSwapper(swapperType, swapperInstance) {
+    addSwapper(swapperInstance) {
+        validateSwapper(swapperInstance);
+        const swapperType = swapperInstance.getType();
         const swapper = this.swappers.get(swapperType);
         if (swapper)
             throw new api_1.SwapError('[addSwapper] - swapper already exists', {
                 code: api_1.SwapErrorTypes.MANAGER_ERROR,
                 details: { swapperType }
             });
-        validateSwapper(swapperInstance);
         this.swappers.set(swapperType, swapperInstance);
         return this;
     }
@@ -38,7 +38,6 @@ class SwapperManager {
      *
      * @param swapperType swapper type {SwapperType|string}
      * @returns {Swapper}
-     * @deprecated this will be removed, currently used in swapper tests
      */
     getSwapper(swapperType) {
         const swapper = this.swappers.get(swapperType);

package/dist/swappercli.js

@@ -29,12 +29,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const asset_service_1 = require("@shapeshiftoss/asset-service");
 const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
 const hdwallet_native_1 = require("@shapeshiftoss/hdwallet-native");
+const types_1 = require("@shapeshiftoss/types");
 const unchained = __importStar(require("@shapeshiftoss/unchained-client"));
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const dotenv_1 = __importDefault(require("dotenv"));
 const readline_sync_1 = __importDefault(require("readline-sync"));
 const web3_1 = __importDefault(require("web3"));
-const api_1 = require("./api");
 const SwapperManager_1 = require("./manager/SwapperManager");
 const ZrxSwapper_1 = require("./swappers/zrx/ZrxSwapper");
 dotenv_1.default.config();
@@ -98,7 +98,7 @@ const main = async () => {
     const zrxSwapperDeps = { wallet, adapter: ethChainAdapter, web3 };
     const manager = new SwapperManager_1.SwapperManager();
     const zrxSwapper = new ZrxSwapper_1.ZrxSwapper(zrxSwapperDeps);
-    manager.addSwapper(api_1.SwapperType.Zrx, zrxSwapper);
+    manager.addSwapper(zrxSwapper);
     const swapper = await manager.getBestSwapper({
         sellAssetId: 'eip155:1/slip44:60',
         buyAssetId: 'eip155:1/erc20:0xc770eefad204b5180df6a14ee197d99d808ee52d'
@@ -109,7 +109,7 @@ const main = async () => {
     let quote;
     try {
         quote = await swapper.getTradeQuote({
-            chainId: 'eip155:1',
+            chainId: types_1.KnownChainIds.EthereumMainnet,
             sellAsset,
             buyAsset,
             sellAmount: sellAmountBase,
@@ -128,7 +128,7 @@ const main = async () => {
     const answer = readline_sync_1.default.question(`Swap ${sellAmount} ${sellAsset.symbol} for ${buyAmount} ${buyAsset.symbol} on ${swapper.getType()}? (y/n): `);
     if (answer === 'y') {
         const trade = await swapper.buildTrade({
-            chainId: 'eip155:1',
+            chainId: types_1.KnownChainIds.EthereumMainnet,
             wallet,
             buyAsset,
             sendMax: false,

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

@@ -1,6 +1,6 @@
 import { AssetId } from '@shapeshiftoss/caip';
 import { ethereum } from '@shapeshiftoss/chain-adapters';
-import { Asset } from '@shapeshiftoss/types';
+import { Asset, KnownChainIds } from '@shapeshiftoss/types';
 import Web3 from 'web3';
 import { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, BuildTradeInput, BuyAssetBySellIdInput, ExecuteTradeInput, GetTradeQuoteInput, Swapper, SwapperType, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
 /**
@@ -13,17 +13,17 @@ export declare type CowSwapperDeps = {
     web3: Web3;
     feeAsset: Asset;
 };
-export declare class CowSwapper implements Swapper<'eip155:1'> {
+export declare class CowSwapper implements Swapper<KnownChainIds.EthereumMainnet> {
     static swapperName: string;
     deps: CowSwapperDeps;
     constructor(deps: CowSwapperDeps);
     getType(): SwapperType;
-    buildTrade(args: BuildTradeInput): Promise<Trade<'eip155:1'>>;
-    getTradeQuote(input: GetTradeQuoteInput): Promise<TradeQuote<'eip155:1'>>;
+    buildTrade(args: BuildTradeInput): Promise<Trade<KnownChainIds.EthereumMainnet>>;
+    getTradeQuote(input: GetTradeQuoteInput): Promise<TradeQuote<KnownChainIds.EthereumMainnet>>;
     getUsdRate(input: Asset): Promise<string>;
-    executeTrade(args: ExecuteTradeInput<'eip155:1'>): Promise<TradeResult>;
-    approvalNeeded(args: ApprovalNeededInput<'eip155:1'>): Promise<ApprovalNeededOutput>;
-    approveInfinite(args: ApproveInfiniteInput<'eip155:1'>): Promise<string>;
+    executeTrade(args: ExecuteTradeInput<KnownChainIds.EthereumMainnet>): Promise<TradeResult>;
+    approvalNeeded(args: ApprovalNeededInput<KnownChainIds.EthereumMainnet>): Promise<ApprovalNeededOutput>;
+    approveInfinite(args: ApproveInfiniteInput<KnownChainIds.EthereumMainnet>): Promise<string>;
     filterBuyAssetsBySellAssetId(args: BuyAssetBySellIdInput): AssetId[];
     filterAssetIdsBySellable(assetIds: AssetId[]): AssetId[];
     getTradeTxs(): Promise<TradeTxs>;

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

@@ -1,3 +1,4 @@
+import { KnownChainIds } from '@shapeshiftoss/types';
 import { ApprovalNeededInput, ApprovalNeededOutput } from '../../../api';
 import { CowSwapperDeps } from '../CowSwapper';
-export declare function cowApprovalNeeded({ adapter, web3 }: CowSwapperDeps, { quote, wallet }: ApprovalNeededInput<'eip155:1'>): Promise<ApprovalNeededOutput>;
+export declare function cowApprovalNeeded({ adapter, web3 }: CowSwapperDeps, { quote, wallet }: ApprovalNeededInput<KnownChainIds.EthereumMainnet>): Promise<ApprovalNeededOutput>;

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

@@ -1,3 +1,4 @@
+import { KnownChainIds } from '@shapeshiftoss/types';
 import { ApproveInfiniteInput } from '../../../api';
 import { CowSwapperDeps } from '../CowSwapper';
-export declare function cowApproveInfinite({ adapter, web3 }: CowSwapperDeps, { quote, wallet }: ApproveInfiniteInput<'eip155:1'>): Promise<string>;
+export declare function cowApproveInfinite({ adapter, web3 }: CowSwapperDeps, { quote, wallet }: ApproveInfiniteInput<KnownChainIds.EthereumMainnet>): Promise<string>;

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

@@ -1,3 +1,4 @@
+import { KnownChainIds } from '@shapeshiftoss/types';
 import { GetTradeQuoteInput, TradeQuote } from '../../../api';
 import { CowSwapperDeps } from '../CowSwapper';
 export declare type CowSwapQuoteApiInput = {
@@ -11,4 +12,4 @@ export declare type CowSwapQuoteApiInput = {
     sellToken: string;
     validTo: number;
 };
-export declare function getCowSwapTradeQuote(deps: CowSwapperDeps, input: GetTradeQuoteInput): Promise<TradeQuote<'eip155:1'>>;
+export declare function getCowSwapTradeQuote(deps: CowSwapperDeps, input: GetTradeQuoteInput): Promise<TradeQuote<KnownChainIds.EthereumMainnet>>;

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

@@ -1,5 +1,6 @@
 import { AssetId, ChainId } from '@shapeshiftoss/caip';
 import type { Asset } from '@shapeshiftoss/types';
+import { KnownChainIds } from '@shapeshiftoss/types';
 import { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, BuyAssetBySellIdInput, ExecuteTradeInput, GetTradeQuoteInput, Swapper, SwapperType, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
 import { ThorchainSwapperDeps } from './types';
 export declare class ThorchainSwapper implements Swapper<ChainId> {
@@ -10,8 +11,8 @@ export declare class ThorchainSwapper implements Swapper<ChainId> {
     initialize(): Promise<void>;
     getType(): SwapperType;
     getUsdRate(input: Pick<Asset, 'symbol' | 'assetId'>): Promise<string>;
-    approvalNeeded(input: ApprovalNeededInput<'eip155:1'>): Promise<ApprovalNeededOutput>;
-    approveInfinite(input: ApproveInfiniteInput<'eip155:1'>): Promise<string>;
+    approvalNeeded(input: ApprovalNeededInput<KnownChainIds.EthereumMainnet>): Promise<ApprovalNeededOutput>;
+    approveInfinite(input: ApproveInfiniteInput<KnownChainIds.EthereumMainnet>): Promise<string>;
     filterBuyAssetsBySellAssetId(args: BuyAssetBySellIdInput): AssetId[];
     filterAssetIdsBySellable(): AssetId[];
     buildTrade(): Promise<Trade<ChainId>>;

package/dist/swappers/thorchain/ThorchainSwapper.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ThorchainSwapper = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
+const types_1 = require("@shapeshiftoss/types");
 const api_1 = require("../../api");
 const getTradeQuote_1 = require("./getThorTradeQuote/getTradeQuote");
 const thorTradeApprovalNeeded_1 = require("./thorTradeApprovalNeeded/thorTradeApprovalNeeded");
@@ -64,7 +65,7 @@ class ThorchainSwapper {
     async executeTrade(args) {
         const { trade, wallet } = args;
         const adapter = this.deps.adapterManager.get(trade.sellAsset.chainId);
-        if (adapter && trade.sellAsset.chainId === 'eip155:1') {
+        if (adapter && trade.sellAsset.chainId === types_1.KnownChainIds.EthereumMainnet) {
             const thorTradeEth = trade;
             const signedTx = await adapter.signTransaction({
                 txToSign: thorTradeEth.txData,

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

@@ -1,6 +1,7 @@
+import { KnownChainIds } from '@shapeshiftoss/types';
 import { ApprovalNeededInput, ApprovalNeededOutput } from '../../../api';
 import { ThorchainSwapperDeps } from '../types';
 export declare const thorTradeApprovalNeeded: ({ deps, input }: {
     deps: ThorchainSwapperDeps;
-    input: ApprovalNeededInput<'eip155:1'>;
+    input: ApprovalNeededInput<KnownChainIds.EthereumMainnet>;
 }) => Promise<ApprovalNeededOutput>;

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

@@ -1,6 +1,7 @@
+import { KnownChainIds } from '@shapeshiftoss/types';
 import { ApproveInfiniteInput } from '../../../api';
 import { ThorchainSwapperDeps } from '../types';
 export declare const thorTradeApproveInfinite: ({ deps, input }: {
     deps: ThorchainSwapperDeps;
-    input: ApproveInfiniteInput<'eip155:1'>;
+    input: ApproveInfiniteInput<KnownChainIds.EthereumMainnet>;
 }) => Promise<string>;

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

@@ -1,5 +1,9 @@
+import { ChainId } from '@shapeshiftoss/caip';
 import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
-import Web3 from 'web3';
+import { BTCSignTx, ETHSignTx } from '@shapeshiftoss/hdwallet-core';
+import { KnownChainIds } from '@shapeshiftoss/types';
+import type Web3 from 'web3';
+import { Trade } from '../../api';
 export declare type PoolResponse = {
     asset: string;
     assetDepth: string;
@@ -27,3 +31,12 @@ export declare type ThorchainSwapperDeps = {
     adapterManager: ChainAdapterManager;
     web3: Web3;
 };
+export interface BtcThorTrade<C extends ChainId> extends Trade<C> {
+    chainId: KnownChainIds.BitcoinMainnet;
+    txData: BTCSignTx;
+}
+export interface EthThorTrade<C extends ChainId> extends Trade<C> {
+    chainId: KnownChainIds.EthereumMainnet;
+    txData: ETHSignTx;
+}
+export declare type ThorTrade<C extends ChainId> = BtcThorTrade<C> | EthThorTrade<C>;

package/dist/swappers/thorchain/utils/txFeeHelpers/btcTxFees/getBtcTxFees.d.ts

@@ -1,5 +1,5 @@
 import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
-import { Asset } from '@shapeshiftoss/types';
+import { Asset, KnownChainIds } from '@shapeshiftoss/types';
 import { QuoteFeeData } from '../../../../../api';
 import { ThorchainSwapperDeps } from '../../../types';
 export declare const getBtcTxFees: ({ deps, opReturnData, vault, buyAsset, sellAmount, adapterManager, pubkey }: {
@@ -10,4 +10,4 @@ export declare const getBtcTxFees: ({ deps, opReturnData, vault, buyAsset, sellA
     sellAmount: string;
     adapterManager: ChainAdapterManager;
     pubkey: string;
-}) => Promise<QuoteFeeData<'bip122:000000000019d6689c085ae165831e93'>>;
+}) => Promise<QuoteFeeData<KnownChainIds.BitcoinMainnet>>;

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

@@ -1,6 +1,6 @@
 import { AssetReference } from '@shapeshiftoss/caip';
 import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
-import { Asset } from '@shapeshiftoss/types';
+import { Asset, KnownChainIds } from '@shapeshiftoss/types';
 import { QuoteFeeData } from '../../../../../api';
 import { ThorchainSwapperDeps } from '../../../types';
 export declare const getEthTxFees: ({ deps, data, router, buyAsset, sellAmount, adapterManager, receiveAddress, sellAssetReference }: {
@@ -12,4 +12,4 @@ export declare const getEthTxFees: ({ deps, data, router, buyAsset, sellAmount,
     sellAssetReference: AssetReference | string;
     adapterManager: ChainAdapterManager;
     receiveAddress: string;
-}) => Promise<QuoteFeeData<'eip155:1'>>;
+}) => Promise<QuoteFeeData<KnownChainIds.EthereumMainnet>>;

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

@@ -1,12 +1,12 @@
-import { ethereum } from '@shapeshiftoss/chain-adapters';
 import { HDWallet } from '@shapeshiftoss/hdwallet-core';
 import { Asset } from '@shapeshiftoss/types';
 import BigNumber from 'bignumber.js';
 import Web3 from 'web3';
 import { AbiItem } from 'web3-utils';
-import { TradeQuote } from '../../../api';
+import { EvmSupportedChainAdapters, EvmSupportedChainIds, TradeQuote } from '../../../api';
 import { BN } from '../bignumber';
 export declare type GetAllowanceRequiredArgs = {
+    adapter: EvmSupportedChainAdapters;
     receiveAddress: string;
     allowanceContract: string;
     sellAsset: Asset;
@@ -21,16 +21,16 @@ export declare type GetERC20AllowanceArgs = {
     ownerAddress: string;
     spenderAddress: string;
 };
-declare type GrantAllowanceArgs = {
-    quote: TradeQuote<'eip155:1'>;
+declare type GrantAllowanceArgs<T extends EvmSupportedChainIds> = {
+    quote: TradeQuote<T>;
     wallet: HDWallet;
-    adapter: ethereum.ChainAdapter;
+    adapter: EvmSupportedChainAdapters;
     erc20Abi: AbiItem[];
     web3: Web3;
 };
 export declare const getERC20Allowance: ({ erc20AllowanceAbi, web3, sellAssetErc20Address, ownerAddress, spenderAddress }: GetERC20AllowanceArgs) => Promise<any>;
-export declare const getAllowanceRequired: ({ receiveAddress, allowanceContract, sellAsset, sellAmount, web3, erc20AllowanceAbi }: GetAllowanceRequiredArgs) => Promise<BigNumber>;
-export declare const grantAllowance: ({ quote, wallet, adapter, erc20Abi, web3 }: GrantAllowanceArgs) => Promise<string>;
+export declare const getAllowanceRequired: ({ adapter, receiveAddress, allowanceContract, sellAsset, sellAmount, web3, erc20AllowanceAbi }: GetAllowanceRequiredArgs) => Promise<BigNumber>;
+export declare const grantAllowance: <T extends EvmSupportedChainIds>({ 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/helpers/helpers.js

@@ -10,9 +10,9 @@ const getERC20Allowance = async ({ erc20AllowanceAbi, web3, sellAssetErc20Addres
     return erc20Contract.methods.allowance(ownerAddress, spenderAddress).call();
 };
 exports.getERC20Allowance = getERC20Allowance;
-const getAllowanceRequired = async ({ receiveAddress, allowanceContract, sellAsset, sellAmount, web3, erc20AllowanceAbi }) => {
+const getAllowanceRequired = async ({ adapter, receiveAddress, allowanceContract, sellAsset, sellAmount, web3, erc20AllowanceAbi }) => {
     try {
-        if (sellAsset.assetId === 'eip155:1/slip44:60') {
+        if (sellAsset.assetId === adapter.getFeeAssetId()) {
             return (0, bignumber_1.bn)(0);
         }
         const ownerAddress = receiveAddress;

package/dist/swappers/utils/test-data/setupDeps.js

@@ -27,6 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupDeps = void 0;
+const caip_1 = require("@shapeshiftoss/caip");
 const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
 const unchained = __importStar(require("@shapeshiftoss/unchained-client"));
 const web3_1 = __importDefault(require("web3"));
@@ -43,6 +44,7 @@ const setupDeps = () => {
         },
         rpcUrl: 'https://mainnet.infura.io/v3/d734c7eebcdf400185d7eb67322a7e57'
     });
+    ethChainAdapter.getFeeAssetId = () => caip_1.ethAssetId;
     const ethNodeUrl = 'http://localhost:1000';
     const web3Provider = new web3_1.default.providers.HttpProvider(ethNodeUrl);
     return { web3: new web3_1.default(web3Provider), adapter: ethChainAdapter, feeAsset: assets_1.WETH };

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

@@ -1,8 +1,8 @@
-import { Asset } from '@shapeshiftoss/types';
+import { Asset, KnownChainIds } from '@shapeshiftoss/types';
 import { TradeQuote } from '../../../api';
 export declare const setupQuote: () => {
-    quoteInput: import("../../../api").GetEthTradeQuoteInput;
-    tradeQuote: TradeQuote<"eip155:1">;
+    quoteInput: import("../../../api").GetEvmTradeQuoteInput;
+    tradeQuote: TradeQuote<KnownChainIds.EthereumMainnet>;
     buyAsset: Asset;
     sellAsset: Asset;
 };

package/dist/swappers/utils/test-data/setupSwapQuote.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupQuote = void 0;
+const types_1 = require("@shapeshiftoss/types");
 const assets_1 = require("./assets");
 const setupQuote = () => {
     const sellAsset = { ...assets_1.FOX };
@@ -19,7 +20,7 @@ const setupQuote = () => {
         sources: []
     };
     const quoteInput = {
-        chainId: 'eip155:1',
+        chainId: types_1.KnownChainIds.EthereumMainnet,
         sellAmount: '1000000000000000000',
         sellAsset,
         buyAsset,

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

@@ -1,23 +1,19 @@
-import { AssetId } from '@shapeshiftoss/caip';
-import { ethereum } from '@shapeshiftoss/chain-adapters';
+import { AssetId, ChainId } from '@shapeshiftoss/caip';
 import { Asset } from '@shapeshiftoss/types';
-import Web3 from 'web3';
-import { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, BuildTradeInput, BuyAssetBySellIdInput, ExecuteTradeInput, GetTradeQuoteInput, Swapper, SwapperType, TradeQuote, TradeResult, TradeTxs, ZrxTrade } from '../../api';
-export declare type ZrxSwapperDeps = {
-    adapter: ethereum.ChainAdapter;
-    web3: Web3;
-};
-export declare class ZrxSwapper implements Swapper<'eip155:1'> {
+import { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, BuildTradeInput, BuyAssetBySellIdInput, EvmSupportedChainIds, GetEvmTradeQuoteInput, Swapper, SwapperType, TradeQuote, TradeResult, TradeTxs } from '../../api';
+import { ZrxExecuteTradeInput, ZrxSwapperDeps, ZrxTrade } from './types';
+export declare class ZrxSwapper<T extends EvmSupportedChainIds> implements Swapper<T> {
     static swapperName: string;
     deps: ZrxSwapperDeps;
+    chainId: ChainId;
     constructor(deps: ZrxSwapperDeps);
-    getType(): SwapperType;
-    buildTrade(args: BuildTradeInput): Promise<ZrxTrade>;
-    getTradeQuote(input: GetTradeQuoteInput): Promise<TradeQuote<'eip155:1'>>;
+    getType(): SwapperType.ZrxEthereum | SwapperType.ZrxAvalanche;
+    buildTrade(args: BuildTradeInput): Promise<ZrxTrade<T>>;
+    getTradeQuote(input: GetEvmTradeQuoteInput): Promise<TradeQuote<T>>;
     getUsdRate(input: Asset): Promise<string>;
-    executeTrade(args: ExecuteTradeInput<'eip155:1'>): Promise<TradeResult>;
-    approvalNeeded(args: ApprovalNeededInput<'eip155:1'>): Promise<ApprovalNeededOutput>;
-    approveInfinite(args: ApproveInfiniteInput<'eip155:1'>): Promise<string>;
+    executeTrade(args: ZrxExecuteTradeInput<T>): Promise<TradeResult>;
+    approvalNeeded(args: ApprovalNeededInput<T>): Promise<ApprovalNeededOutput>;
+    approveInfinite(args: ApproveInfiniteInput<T>): Promise<string>;
     filterBuyAssetsBySellAssetId(args: BuyAssetBySellIdInput): AssetId[];
     filterAssetIdsBySellable(assetIds?: AssetId[]): AssetId[];
     getTradeTxs(tradeResult: TradeResult): Promise<TradeTxs>;

package/dist/swappers/zrx/ZrxSwapper.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZrxSwapper = void 0;
+const types_1 = require("@shapeshiftoss/types");
 const api_1 = require("../../api");
 const getZrxTradeQuote_1 = require("./getZrxTradeQuote/getZrxTradeQuote");
 const blacklist_1 = require("./utils/blacklist");
@@ -12,9 +13,19 @@ const zrxExecuteTrade_1 = require("./zrxExecuteTrade/zrxExecuteTrade");
 class ZrxSwapper {
     constructor(deps) {
         this.deps = deps;
+        this.chainId = deps.adapter.getChainId();
     }
     getType() {
-        return api_1.SwapperType.Zrx;
+        switch (this.chainId) {
+            case types_1.KnownChainIds.EthereumMainnet:
+                return api_1.SwapperType.ZrxEthereum;
+            case types_1.KnownChainIds.AvalancheMainnet:
+                return api_1.SwapperType.ZrxAvalanche;
+            default:
+                throw new api_1.SwapError('[getType]', {
+                    code: api_1.SwapErrorTypes.UNSUPPORTED_CHAIN
+                });
+        }
     }
     async buildTrade(args) {
         return (0, zrxBuildTrade_1.zrxBuildTrade)(this.deps, args);
@@ -36,12 +47,12 @@ class ZrxSwapper {
     }
     filterBuyAssetsBySellAssetId(args) {
         const { assetIds = [], sellAssetId } = args;
-        return assetIds.filter((id) => id.startsWith('eip155:1') &&
-            (sellAssetId === null || sellAssetId === void 0 ? void 0 : sellAssetId.startsWith('eip155:1')) &&
+        return assetIds.filter((id) => id.startsWith(this.chainId) &&
+            (sellAssetId === null || sellAssetId === void 0 ? void 0 : sellAssetId.startsWith(this.chainId)) &&
             !blacklist_1.UNSUPPORTED_ASSETS.includes(id));
     }
     filterAssetIdsBySellable(assetIds = []) {
-        return assetIds.filter((id) => id.startsWith('eip155:1') && !blacklist_1.UNSUPPORTED_ASSETS.includes(id));
+        return assetIds.filter((id) => id.startsWith(this.chainId) && !blacklist_1.UNSUPPORTED_ASSETS.includes(id));
     }
     async getTradeTxs(tradeResult) {
         return {

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

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

package/dist/swappers/zrx/getZrxTradeQuote/getZrxTradeQuote.js

@@ -8,13 +8,14 @@ const constants_1 = require("../../utils/constants");
 const helpers_1 = require("../../utils/helpers/helpers");
 const getZrxMinMax_1 = require("../getZrxMinMax/getZrxMinMax");
 const constants_2 = require("../utils/constants");
+const helpers_2 = require("../utils/helpers/helpers");
 const zrxService_1 = require("../utils/zrxService");
 async function getZrxTradeQuote(input) {
     var _a;
     try {
         const { sellAsset, buyAsset, sellAmount, sellAssetAccountNumber } = input;
-        if (buyAsset.chainId !== 'eip155:1' || sellAsset.chainId !== 'eip155:1') {
-            throw new api_1.SwapError('[getZrxTradeQuote] - Both assets need to be on the Ethereum chain to use Zrx', {
+        if (buyAsset.chainId !== input.chainId || sellAsset.chainId !== input.chainId) {
+            throw new api_1.SwapError('[getZrxTradeQuote] - Both assets need to be on the same supported EVM chain to use Zrx', {
                 code: api_1.SwapErrorTypes.UNSUPPORTED_PAIR,
                 details: { buyAssetChainId: buyAsset.chainId, sellAssetChainId: sellAsset.chainId }
             });
@@ -27,16 +28,18 @@ async function getZrxTradeQuote(input) {
         const { minimum, maximum } = await (0, getZrxMinMax_1.getZrxMinMax)(sellAsset, buyAsset);
         const minQuoteSellAmount = (0, bignumber_1.bnOrZero)(minimum).times((0, bignumber_1.bn)(10).exponentiatedBy(sellAsset.precision));
         const normalizedSellAmount = (0, helpers_1.normalizeAmount)((0, bignumber_1.bnOrZero)(sellAmount).eq(0) ? minQuoteSellAmount : sellAmount);
+        const baseUrl = (0, helpers_2.baseUrlFromChainId)(buyAsset.chainId);
+        const zrxService = (0, zrxService_1.zrxServiceFactory)(baseUrl);
         /**
          * /swap/v1/price
          * params: {
          *   sellToken: contract address (or symbol) of token to sell
          *   buyToken: contractAddress (or symbol) of token to buy
          *   sellAmount?: integer string value of the smallest increment of the sell token
-         *   buyAmount?: integer string value of the smallest incremtent of the buy token
+         *   buyAmount?: integer string value of the smallest increment of the buy token
          * }
          */
-        const quoteResponse = await zrxService_1.zrxService.get('/swap/v1/price', {
+        const quoteResponse = await zrxService.get('/swap/v1/price', {
             params: {
                 sellToken,
                 buyToken,

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

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

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

@@ -1,2 +1,6 @@
+import { AssetId } from '@shapeshiftoss/caip';
 import { Asset } from '@shapeshiftoss/types';
+export declare const baseUrlFromChainId: (chainId: string) => string;
+export declare const usdcContractFromChainId: (chainId: string) => string;
+export declare const isNativeEvmAsset: (assetId: AssetId) => boolean;
 export declare const getUsdRate: (asset: Asset) => Promise<string>;

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

@@ -1,18 +1,61 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUsdRate = void 0;
+exports.getUsdRate = exports.isNativeEvmAsset = exports.usdcContractFromChainId = exports.baseUrlFromChainId = 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 zrxService_1 = require("../zrxService");
+const baseUrlFromChainId = (chainId) => {
+    switch (chainId) {
+        case types_1.KnownChainIds.EthereumMainnet: {
+            return 'https://api.0x.org/';
+        }
+        case types_1.KnownChainIds.AvalancheMainnet:
+            return 'https://avalanche.api.0x.org/';
+        default:
+            throw new api_1.SwapError(`baseUrlFromChainId] - Unsupported chainId: ${chainId}`, {
+                code: api_1.SwapErrorTypes.UNSUPPORTED_CHAIN
+            });
+    }
+};
+exports.baseUrlFromChainId = baseUrlFromChainId;
+const usdcContractFromChainId = (chainId) => {
+    switch (chainId) {
+        case types_1.KnownChainIds.EthereumMainnet: {
+            return '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48';
+        }
+        case types_1.KnownChainIds.AvalancheMainnet:
+            return '0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e';
+        default:
+            throw new api_1.SwapError(`usdcContractFromChainId] - Unsupported chainId: ${chainId}`, {
+                code: api_1.SwapErrorTypes.UNSUPPORTED_CHAIN
+            });
+    }
+};
+exports.usdcContractFromChainId = usdcContractFromChainId;
+const isNativeEvmAsset = (assetId) => {
+    const { chainId } = (0, caip_1.fromAssetId)(assetId);
+    switch (chainId) {
+        case types_1.KnownChainIds.EthereumMainnet:
+            return assetId === caip_1.ethAssetId;
+        case types_1.KnownChainIds.AvalancheMainnet:
+            return assetId === caip_1.avalancheAssetId;
+        default:
+            return false;
+    }
+};
+exports.isNativeEvmAsset = isNativeEvmAsset;
 const getUsdRate = async (asset) => {
     const { assetReference: erc20Address, assetNamespace } = (0, caip_1.fromAssetId)(asset.assetId);
     const { symbol } = asset;
     try {
-        const USDC_CONTRACT_ADDRESS = '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48';
+        const USDC_CONTRACT_ADDRESS = (0, exports.usdcContractFromChainId)(asset.chainId);
         if ((erc20Address === null || erc20Address === void 0 ? void 0 : erc20Address.toLowerCase()) === USDC_CONTRACT_ADDRESS)
             return '1'; // Will break if comparing against usdc
-        const rateResponse = await zrxService_1.zrxService.get('/swap/v1/price', {
+        const baseUrl = (0, exports.baseUrlFromChainId)(asset.chainId);
+        const zrxService = (0, zrxService_1.zrxServiceFactory)(baseUrl);
+        const rateResponse = await zrxService.get('/swap/v1/price', {
             params: {
                 buyToken: USDC_CONTRACT_ADDRESS,
                 buyAmount: '1000000000',

package/dist/swappers/zrx/utils/test-data/setupZrxSwapQuote.d.ts

@@ -7,8 +7,15 @@ export declare const setupZrxTradeQuoteResponse: () => {
     sellAsset: Asset;
 };
 export declare const setupBuildTrade: () => {
-    buildTradeInput: import("../../../../api").CommonTradeInput & {
-        chainId: "eip155:1";
+    buildTradeInput: {
+        sellAsset: Asset;
+        buyAsset: Asset;
+        sellAmount: string;
+        sendMax: boolean;
+        sellAssetAccountNumber: number;
+        wallet?: HDWallet | undefined;
+    } & {
+        chainId: import("../../../../api").EvmSupportedChainIds;
     } & {
         buyAssetAccountNumber: number;
         slippage?: string | undefined;

package/dist/swappers/zrx/utils/test-data/setupZrxSwapQuote.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupExecuteTrade = exports.setupBuildTrade = exports.setupZrxTradeQuoteResponse = void 0;
+const types_1 = require("@shapeshiftoss/types");
 const assets_1 = require("../../../utils/test-data/assets");
 const setupZrxTradeQuoteResponse = () => {
     const sellAsset = { ...assets_1.FOX };
@@ -23,7 +24,7 @@ const setupBuildTrade = () => {
     const sellAsset = { ...assets_1.FOX };
     const buyAsset = { ...assets_1.WETH };
     const buildTradeInput = {
-        chainId: 'eip155:1',
+        chainId: types_1.KnownChainIds.EthereumMainnet,
         sellAmount: '1000000000000000000',
         buyAsset,
         sendMax: false,

package/dist/swappers/zrx/utils/zrxService.d.ts

@@ -1 +1,2 @@
-export declare const zrxService: import("axios").AxiosInstance;
+import { AxiosInstance } from 'axios';
+export declare const zrxServiceFactory: (baseUrl: string) => AxiosInstance;

package/dist/swappers/zrx/utils/zrxService.js

@@ -3,14 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.zrxService = void 0;
+exports.zrxServiceFactory = void 0;
 const axios_1 = __importDefault(require("axios"));
 const axiosConfig = {
-    baseURL: 'https://api.0x.org/',
     timeout: 10000,
     headers: {
         Accept: 'application/json',
         'Content-Type': 'application/json'
     }
 };
-exports.zrxService = axios_1.default.create(axiosConfig);
+const zrxServiceFactory = (baseUrl) => axios_1.default.create({ ...axiosConfig, baseURL: baseUrl });
+exports.zrxServiceFactory = zrxServiceFactory;

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

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

package/dist/swappers/zrx/zrxApprovalNeeded/zrxApprovalNeeded.js

@@ -11,7 +11,7 @@ async function zrxApprovalNeeded({ adapter, web3 }, { quote, wallet }) {
     const { sellAsset } = quote;
     const { assetReference: sellAssetErc20Address } = (0, caip_1.fromAssetId)(sellAsset.assetId);
     try {
-        if (sellAsset.chainId !== 'eip155:1') {
+        if (sellAsset.chainId !== adapter.getChainId()) {
             throw new api_1.SwapError('[zrxApprovalNeeded] - sellAsset chainId is not supported', {
                 code: api_1.SwapErrorTypes.UNSUPPORTED_CHAIN,
                 details: { chainId: sellAsset.chainId }

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

@@ -1,3 +1,3 @@
-import { ApproveInfiniteInput } from '../../../api';
-import { ZrxSwapperDeps } from '../ZrxSwapper';
-export declare function zrxApproveInfinite({ adapter, web3 }: ZrxSwapperDeps, { quote, wallet }: ApproveInfiniteInput<'eip155:1'>): Promise<string>;
+import { ApproveInfiniteInput, EvmSupportedChainIds } from '../../../api';
+import { ZrxSwapperDeps } from '../types';
+export declare function zrxApproveInfinite<T extends EvmSupportedChainIds>({ adapter, web3 }: ZrxSwapperDeps, { quote, wallet }: ApproveInfiniteInput<T>): Promise<string>;

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

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

package/dist/swappers/zrx/zrxBuildTrade/zrxBuildTrade.js

@@ -26,14 +26,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.zrxBuildTrade = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const rax = __importStar(require("retry-axios"));
-const __1 = require("../../..");
+const api_1 = require("../../../api");
 const erc20Allowance_abi_1 = require("../../utils/abi/erc20Allowance-abi");
 const bignumber_1 = require("../../utils/bignumber");
 const constants_1 = require("../../utils/constants");
 const helpers_1 = require("../../utils/helpers/helpers");
-const helpers_2 = require("../../utils/helpers/helpers");
 const applyAxiosRetry_1 = require("../utils/applyAxiosRetry");
 const constants_2 = require("../utils/constants");
+const helpers_2 = require("../utils/helpers/helpers");
 const zrxService_1 = require("../utils/zrxService");
 async function zrxBuildTrade({ adapter, web3 }, input) {
     var _a, _b, _c;
@@ -43,15 +43,18 @@ async function zrxBuildTrade({ adapter, web3 }, input) {
         const { assetReference: sellAssetErc20Address, assetNamespace: sellAssetNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
         const buyToken = buyAssetNamespace === 'erc20' ? buyAssetErc20Address : buyAsset.symbol;
         const sellToken = sellAssetNamespace === 'erc20' ? sellAssetErc20Address : sellAsset.symbol;
-        if (buyAsset.chainId !== 'eip155:1') {
-            throw new __1.SwapError('[zrxBuildTrade] - buyAsset must be on chainId eip155:1', {
-                code: __1.SwapErrorTypes.VALIDATION_FAILED,
+        const adapterChainId = adapter.getChainId();
+        if (buyAsset.chainId !== adapterChainId) {
+            throw new api_1.SwapError(`[zrxBuildTrade] - buyAsset must be on chainId ${adapterChainId}`, {
+                code: api_1.SwapErrorTypes.VALIDATION_FAILED,
                 details: { chainId: sellAsset.chainId }
             });
         }
         const bip44Params = adapter.buildBIP44Params({ accountNumber: Number(buyAssetAccountNumber) });
         const receiveAddress = await adapter.getAddress({ wallet, bip44Params });
         const slippagePercentage = slippage ? (0, bignumber_1.bnOrZero)(slippage).div(100).toString() : constants_1.DEFAULT_SLIPPAGE;
+        const baseUrl = (0, helpers_2.baseUrlFromChainId)(buyAsset.chainId);
+        const zrxService = (0, zrxService_1.zrxServiceFactory)(baseUrl);
         /**
          * /swap/v1/quote
          * params: {
@@ -60,7 +63,7 @@ async function zrxBuildTrade({ adapter, web3 }, input) {
          *   sellAmount?: integer string value of the smallest increment of the sell token
          * }
          */
-        const zrxRetry = (0, applyAxiosRetry_1.applyAxiosRetry)(zrxService_1.zrxService, {
+        const zrxRetry = (0, applyAxiosRetry_1.applyAxiosRetry)(zrxService, {
             statusCodesToRetry: [[400, 400]],
             shouldRetry: (err) => {
                 var _a, _b, _c, _d;
@@ -81,7 +84,7 @@ async function zrxBuildTrade({ adapter, web3 }, input) {
             params: {
                 buyToken,
                 sellToken,
-                sellAmount: (0, helpers_2.normalizeAmount)(sellAmount),
+                sellAmount: (0, helpers_1.normalizeAmount)(sellAmount),
                 takerAddress: receiveAddress,
                 slippagePercentage,
                 skipValidation: false,
@@ -111,6 +114,7 @@ async function zrxBuildTrade({ adapter, web3 }, input) {
             sources: ((_a = data.sources) === null || _a === void 0 ? void 0 : _a.filter((s) => parseFloat(s.proportion) > 0)) || constants_2.DEFAULT_SOURCE
         };
         const allowanceRequired = await (0, helpers_1.getAllowanceRequired)({
+            adapter,
             sellAsset,
             allowanceContract: data.allowanceTarget,
             receiveAddress,
@@ -131,10 +135,10 @@ async function zrxBuildTrade({ adapter, web3 }, input) {
         return trade;
     }
     catch (e) {
-        if (e instanceof __1.SwapError)
+        if (e instanceof api_1.SwapError)
             throw e;
-        throw new __1.SwapError('[zrxBuildTrade]', {
-            code: __1.SwapErrorTypes.BUILD_TRADE_FAILED
+        throw new api_1.SwapError('[zrxBuildTrade]', {
+            code: api_1.SwapErrorTypes.BUILD_TRADE_FAILED
         });
     }
 }

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

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

package/dist/swappers/zrx/zrxExecuteTrade/zrxExecuteTrade.js

@@ -3,20 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.zrxExecuteTrade = void 0;
 const web3_utils_1 = require("web3-utils");
 const api_1 = require("../../../api");
+const helpers_1 = require("../utils/helpers/helpers");
 async function zrxExecuteTrade({ adapter }, { trade, wallet }) {
     var _a, _b, _c, _d, _e, _f;
-    const zrxTrade = trade;
-    const { sellAsset } = zrxTrade;
+    const { sellAsset } = trade;
     try {
         // value is 0 for erc20s
-        const value = sellAsset.assetId === 'eip155:1/slip44:60' ? trade.sellAmount : '0';
+        const value = (0, helpers_1.isNativeEvmAsset)(sellAsset.assetId) ? trade.sellAmount : '0';
         const bip44Params = adapter.buildBIP44Params({
             accountNumber: trade.sellAssetAccountNumber
         });
         const buildTxResponse = await adapter.buildSendTransaction({
             value,
             wallet,
-            to: zrxTrade.depositAddress,
+            to: trade.depositAddress,
             chainSpecific: {
                 gasPrice: (0, web3_utils_1.numberToHex)(((_b = (_a = trade.feeData) === null || _a === void 0 ? void 0 : _a.chainSpecific) === null || _b === void 0 ? void 0 : _b.gasPrice) || 0),
                 gasLimit: (0, web3_utils_1.numberToHex)(((_d = (_c = trade.feeData) === null || _c === void 0 ? void 0 : _c.chainSpecific) === null || _d === void 0 ? void 0 : _d.estimatedGas) || 0)
@@ -24,7 +24,7 @@ async function zrxExecuteTrade({ adapter }, { trade, wallet }) {
             bip44Params
         });
         const { txToSign } = buildTxResponse;
-        const txWithQuoteData = { ...txToSign, data: (_e = zrxTrade.txData) !== null && _e !== void 0 ? _e : '' };
+        const txWithQuoteData = { ...txToSign, data: (_e = trade.txData) !== null && _e !== void 0 ? _e : '' };
         if (wallet.supportsOfflineSigning()) {
             const signedTx = await adapter.signTransaction({ txToSign: txWithQuoteData, wallet });
             const txid = await adapter.broadcastTransaction(signedTx);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "7.9.0",
+  "version": "8.0.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/chain-adapters": "^7.2.0",
     "@shapeshiftoss/errors": "^1.1.2",
     "@shapeshiftoss/hdwallet-core": "^1.23.0",
-    "@shapeshiftoss/types": "^6.2.0"
+    "@shapeshiftoss/types": "^7.0.0"
   },
   "devDependencies": {
     "@shapeshiftoss/asset-service": "^6.2.1",
@@ -43,7 +43,7 @@
     "@shapeshiftoss/chain-adapters": "^7.2.0",
     "@shapeshiftoss/errors": "^1.1.2",
     "@shapeshiftoss/hdwallet-core": "^1.23.0",
-    "@shapeshiftoss/types": "^6.2.0",
+    "@shapeshiftoss/types": "^7.0.0",
     "@types/readline-sync": "^1.4.4",
     "readline-sync": "^1.4.10",
     "web3-utils": "1.7.4",