@shapeshiftoss/swapper 17.7.1 → 17.7.2

package/dist/esm/swappers/ZrxSwapper/utils/fetchFromZrx.js

@@ -24,9 +24,9 @@ const fetchFromZrx = async ({ quoteOrRate, buyAsset, sellAsset, sellAmountInclud
             sellAmount: sellAmountIncludingProtocolFeesCryptoBaseUnit,
             taker: sellAddress,
             swapFeeBps: bn(affiliateBps).toNumber(),
-            swapFeeToken: assetIdToZrxToken(buyAsset.assetId),
+            swapFeeToken: assetIdToZrxToken(buyAsset.assetId), // must be set to the buy asset to simplify fee calcs
             slippageBps: convertDecimalPercentageToBasisPoints(slippageTolerancePercentageDecimal).toNumber(),
-            swapFeeRecipient: maybeTreasuryAddress,
+            swapFeeRecipient: maybeTreasuryAddress, // Where affiliate fees are sent
             feeRecipientTradeSurplus: maybeTreasuryAddress, // Where trade surplus is sent
         },
     });

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

@@ -1,10 +1,9 @@
 import type { AssetId, ChainId } from '@shapeshiftoss/caip';
 import type { Asset, AssetsByIdPartial } from '@shapeshiftoss/types';
-import { KnownChainIds } from '@shapeshiftoss/types';
-import type { ZrxFees } from '../../types.js';
+import type { ZrxFees, ZrxSupportedChainId } from '../../types.js';
 export declare const assetIdToZrxToken: (assetId: AssetId) => string;
 export declare const zrxTokenToAssetId: (token: string, chainId: ChainId) => AssetId;
-export declare const isSupportedChainId: (chainId: ChainId) => chainId is KnownChainIds.EthereumMainnet | KnownChainIds.AvalancheMainnet | KnownChainIds.OptimismMainnet | KnownChainIds.BnbSmartChainMainnet | KnownChainIds.PolygonMainnet | KnownChainIds.ArbitrumMainnet | KnownChainIds.BaseMainnet;
+export declare const isSupportedChainId: (chainId: ChainId) => chainId is ZrxSupportedChainId;
 export declare const assertValidTrade: ({ buyAsset, sellAsset, }: {
     buyAsset: Asset;
     sellAsset: Asset;

package/dist/esm/swappers/ZrxSwapper/utils/zrxService.d.ts

@@ -4,6 +4,6 @@ import type { MonadicSwapperAxiosService } from '../../../types.js';
 type AxiosInstanceHoF = (instance: AxiosInstance, options?: Omit<RetryConfig, 'instance'>) => AxiosInstance;
 export declare const zrxServiceFactory: ({ baseUrl, wrapper, }: {
     baseUrl: string;
-    wrapper?: AxiosInstanceHoF | undefined;
+    wrapper?: AxiosInstanceHoF;
 }) => MonadicSwapperAxiosService;
 export {};

package/dist/esm/swappers/utils/test-data/cryptoMarketDataById.d.ts

@@ -1,5 +1,39 @@
+import { AVAX, BSC, BTC, ETH, FOX_GNOSIS, FOX_MAINNET, OPTIMISM, RUNE, USDC_GNOSIS, USDC_MAINNET, WBTC, WETH } from './assets.js';
 export declare const marketDataByAssetIdUsd: {
-    [x: string]: {
+    [FOX_MAINNET.assetId]: {
+        price: string;
+    };
+    [FOX_GNOSIS.assetId]: {
+        price: string;
+    };
+    [ETH.assetId]: {
+        price: string;
+    };
+    [AVAX.assetId]: {
+        price: string;
+    };
+    [BSC.assetId]: {
+        price: string;
+    };
+    [BTC.assetId]: {
+        price: string;
+    };
+    [RUNE.assetId]: {
+        price: string;
+    };
+    [OPTIMISM.assetId]: {
+        price: string;
+    };
+    [USDC_MAINNET.assetId]: {
+        price: string;
+    };
+    [USDC_GNOSIS.assetId]: {
+        price: string;
+    };
+    [WBTC.assetId]: {
+        price: string;
+    };
+    [WETH.assetId]: {
         price: string;
     };
 };

package/dist/esm/thorchain-utils/getCallDataFromQuote.d.ts

@@ -1,7 +1,7 @@
 import type { Asset } from '@shapeshiftoss/types';
 import type { SwapperConfig, SwapperName } from '../types.js';
 import type { ThorEvmTradeQuote } from './types.js';
-export declare const getCallDataFromQuote: ({ tradeType, data, sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, memo: tcMemo, expiry, config, longtailData, slippageTolerancePercentageDecimal, vault, swapperName, }: Pick<ThorEvmTradeQuote, "data" | "slippageTolerancePercentageDecimal" | "memo" | "expiry" | "tradeType" | "aggregator" | "vault" | "longtailData"> & {
+export declare const getCallDataFromQuote: ({ tradeType, data, sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, memo: tcMemo, expiry, config, longtailData, slippageTolerancePercentageDecimal, vault, swapperName, }: Pick<ThorEvmTradeQuote, "vault" | "aggregator" | "data" | "memo" | "tradeType" | "expiry" | "longtailData" | "slippageTolerancePercentageDecimal"> & {
     sellAmountIncludingProtocolFeesCryptoBaseUnit: string;
     config: SwapperConfig;
     sellAsset: Asset;

package/dist/esm/thorchain-utils/getL1RateOrQuote.js

@@ -258,7 +258,7 @@ export const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType
                 })();
                 return makeThorTradeRateOrQuote({
                     route,
-                    allowanceContract: '0x0',
+                    allowanceContract: '0x0', // not applicable to UTXOs
                     memo,
                     feeData,
                 });
@@ -279,7 +279,7 @@ export const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType
                 return makeThorTradeRateOrQuote({
                     route,
                     memo: getMemo(route),
-                    allowanceContract: '0x0',
+                    allowanceContract: '0x0', // not applicable to cosmossdk
                     feeData: {
                         networkFeeCryptoBaseUnit: fast.txFee,
                         protocolFees: getProtocolFees(route.quote),
@@ -364,7 +364,7 @@ export const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType
                             // TRC20: Estimate energy with actual recipient
                             try {
                                 const result = await tronWeb.transactionBuilder.triggerConstantContract(contractAddress, 'transfer(address,uint256)', {}, [
-                                    { type: 'address', value: vault },
+                                    { type: 'address', value: vault }, // Use vault as recipient
                                     {
                                         type: 'uint256',
                                         value: sellAmountIncludingProtocolFeesCryptoBaseUnit,
@@ -398,7 +398,7 @@ export const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType
                 // For quotes, fees will be calculated in getTronTransactionFees when executing
                 return Promise.resolve(makeThorTradeRateOrQuote({
                     route,
-                    allowanceContract: '0x0',
+                    allowanceContract: '0x0', // not applicable to TRON
                     memo,
                     feeData: {
                         networkFeeCryptoBaseUnit,

package/dist/esm/thorchain-utils/parseBuyTxHash.d.ts

@@ -1,2 +1,2 @@
 import type { ThorNodeTxSchema } from './types.js';
-export declare const parseThorBuyTxHash: (sellTxId: string, latestOutTx: ThorNodeTxSchema | undefined, nativeChain: 'THOR' | 'MAYA') => string | undefined;
+export declare const parseThorBuyTxHash: (sellTxId: string, latestOutTx: ThorNodeTxSchema | undefined, nativeChain: "THOR" | "MAYA") => string | undefined;

package/dist/esm/thorchain-utils/service.d.ts

@@ -1,5 +1,5 @@
 export declare const thorService: {
-    get: <T = any>(url: string, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("@sniptt/monads").Result<import("axios").AxiosResponse<T, any, {}>, import("../index.js").SwapErrorRight>>;
-    post: <T_1 = any>(url: string, data: any, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("@sniptt/monads").Result<import("axios").AxiosResponse<T_1, any, {}>, import("../index.js").SwapErrorRight>>;
-    delete: <T_2 = any>(url: string, data: any, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("@sniptt/monads").Result<import("axios").AxiosResponse<T_2, any, {}>, import("../index.js").SwapErrorRight>>;
+    get: <T = any>(url: string, config?: import("axios").AxiosRequestConfig<any>) => Promise<import("@sniptt/monads").Result<import("axios").AxiosResponse<T>, import("../index.js").SwapErrorRight>>;
+    post: <T = any>(url: string, data: any, config?: import("axios").AxiosRequestConfig<any>) => Promise<import("@sniptt/monads").Result<import("axios").AxiosResponse<T>, import("../index.js").SwapErrorRight>>;
+    delete: <T = any>(url: string, data: any, config?: import("axios").AxiosRequestConfig<any>) => Promise<import("@sniptt/monads").Result<import("axios").AxiosResponse<T>, import("../index.js").SwapErrorRight>>;
 };

package/dist/esm/tron-utils/getTronTransactionFees.d.ts

@@ -1,2 +1,2 @@
 import type { GetUnsignedTronTransactionArgs } from '../types.js';
-export declare const getTronTransactionFees: ({ tradeQuote, stepIndex, }: Pick<GetUnsignedTronTransactionArgs, 'tradeQuote' | 'stepIndex'>) => Promise<string>;
+export declare const getTronTransactionFees: ({ tradeQuote, stepIndex, }: Pick<GetUnsignedTronTransactionArgs, "tradeQuote" | "stepIndex">) => Promise<string>;

package/dist/esm/utils/tenderly/storageSlots.js

@@ -23,39 +23,39 @@ export const getAllowanceStorageSlot = (ownerAddress, spenderAddress, allowanceS
 // USDC (BEP20 - BSC): balance at slot 1, allowance at slot 2
 export const KNOWN_BALANCE_SLOTS = {
     // USDT - Native Tether deployment (custom slot 2)
-    '0xdac17f958d2ee523a2206206994597c13d831ec7': 2,
+    '0xdac17f958d2ee523a2206206994597c13d831ec7': 2, // USDT Ethereum
     // Slot 51 pattern (L2GatewayToken + ERC20Upgradeable + storage gaps)
     // Various L2 tokens use this pattern with different implementations
-    '0xfd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9': 51,
-    '0x912ce59144191c1204e64559fe8253a0e49e6548': 51,
-    '0x9702230a8ea53601f5cd2dc00fdbc13d4df4a8c7': 51,
-    '0x01bff41798a0bcf287b996046ca68b395dbc1071': 51,
+    '0xfd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9': 51, // USDT Arbitrum (StandardArbERC20)
+    '0x912ce59144191c1204e64559fe8253a0e49e6548': 51, // ARB Arbitrum (StandardArbERC20)
+    '0x9702230a8ea53601f5cd2dc00fdbc13d4df4a8c7': 51, // USDT Avalanche (TransparentProxy)
+    '0x01bff41798a0bcf287b996046ca68b395dbc1071': 51, // USDT0 Optimism (LayerZero OFT - https://docs.usdt0.to)
     // Wormhole bridge pattern (slot 5)
-    '0xca7dec8550f43a5e46e3dfb95801f64280e75b27': 5,
+    '0xca7dec8550f43a5e46e3dfb95801f64280e75b27': 5, // SWEAT Arbitrum (Wormhole bridge)
     // USDT - BEP20 pattern (slot 1 - Binance-Peg token)
-    '0x55d398326f99059ff775485246999027b3197955': 1,
+    '0x55d398326f99059ff775485246999027b3197955': 1, // USDT BSC (confirmed)
     // USDT - xDai bridge pattern (slot 3)
-    '0x4ecaba5870353805a9f068101a40e0f32ed605c6': 3,
+    '0x4ecaba5870353805a9f068101a40e0f32ed605c6': 3, // USDT Gnosis (confirmed)
     // USDT - Standard ERC20 deployments (slot 0)
     // Polygon confirmed, Optimism bridged USDT (0x94b008aa...) also uses slot 0
     // USDC (Circle native deployments - all use slot 9)
-    '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48': 9,
-    '0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e': 9,
-    '0x0b2c639c533813f4aa9d7837caf62653d097ff85': 9,
-    '0x3c499c542cef5e3811e1192ce70d8cc03d5c3359': 9,
-    '0xaf88d065e77c8cc2239327c5edb3a432268e5831': 9,
-    '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913': 9,
+    '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48': 9, // USDC Ethereum
+    '0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e': 9, // USDC Avalanche
+    '0x0b2c639c533813f4aa9d7837caf62653d097ff85': 9, // USDC Optimism
+    '0x3c499c542cef5e3811e1192ce70d8cc03d5c3359': 9, // USDC Polygon
+    '0xaf88d065e77c8cc2239327c5edb3a432268e5831': 9, // USDC Arbitrum
+    '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913': 9, // USDC Base
     // USDC (BEP20 pattern on BSC - slot 1)
     '0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d': 1, // USDC BSC (BEP20)
 };
 export const KNOWN_ALLOWANCE_SLOTS = {
     // USDT allowance slots (explicit mapping for all non-standard implementations)
-    '0xdac17f958d2ee523a2206206994597c13d831ec7': 5,
-    '0xfd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9': 52,
-    '0x9702230a8ea53601f5cd2dc00fdbc13d4df4a8c7': 52,
-    '0x01bff41798a0bcf287b996046ca68b395dbc1071': 52,
-    '0x55d398326f99059ff775485246999027b3197955': 2,
-    '0x4ecaba5870353805a9f068101a40e0f32ed605c6': 4,
+    '0xdac17f958d2ee523a2206206994597c13d831ec7': 5, // USDT Ethereum (native Tether)
+    '0xfd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9': 52, // USDT Arbitrum (StandardArbERC20)
+    '0x9702230a8ea53601f5cd2dc00fdbc13d4df4a8c7': 52, // USDT Avalanche (StandardArbERC20)
+    '0x01bff41798a0bcf287b996046ca68b395dbc1071': 52, // USDT0 Optimism (LayerZero OFT)
+    '0x55d398326f99059ff775485246999027b3197955': 2, // USDT BSC (BEP20)
+    '0x4ecaba5870353805a9f068101a40e0f32ed605c6': 4, // USDT Gnosis (xDai bridge)
     // Note: Polygon and Optimism standard bridged USDT (0x94b008aa...) use slot 1 (fallback)
     // Note: SWEAT (slot 5) allowance auto-inferred to slot 6 via Wormhole pattern
     // USDC allowance slots (BSC uses BEP20 pattern, not Circle FiatToken)

package/dist/esm/utils.d.ts

@@ -12,7 +12,7 @@ export declare const makeSwapErrorRight: ({ details, cause, code, message, }: {
     message: string;
     details?: unknown;
     cause?: unknown;
-    code?: TradeQuoteError | undefined;
+    code?: TradeQuoteError;
 }) => SwapErrorRight;
 export declare const createTradeAmountTooSmallErr: (details?: {
     minAmountCryptoBaseUnit: string;
@@ -21,9 +21,9 @@ export declare const createTradeAmountTooSmallErr: (details?: {
 export declare const createCache: (maxAge: number, cachedUrls: string[], axiosConfig: AxiosRequestConfig) => AxiosInstance;
 export declare const AsyncResultOf: <T>(promise: Promise<T>) => Promise<Result<T, Error>>;
 export declare const makeSwapperAxiosServiceMonadic: (service: AxiosInstance) => {
-    get: <T = any>(url: string, config?: AxiosRequestConfig<any>) => Promise<Result<AxiosResponse<T, any, {}>, SwapErrorRight>>;
-    post: <T_1 = any>(url: string, data: any, config?: AxiosRequestConfig<any>) => Promise<Result<AxiosResponse<T_1, any, {}>, SwapErrorRight>>;
-    delete: <T_2 = any>(url: string, data: any, config?: AxiosRequestConfig<any>) => Promise<Result<AxiosResponse<T_2, any, {}>, SwapErrorRight>>;
+    get: <T = any>(url: string, config?: AxiosRequestConfig<any>) => Promise<Result<AxiosResponse<T>, SwapErrorRight>>;
+    post: <T = any>(url: string, data: any, config?: AxiosRequestConfig<any>) => Promise<Result<AxiosResponse<T>, SwapErrorRight>>;
+    delete: <T = any>(url: string, data: any, config?: AxiosRequestConfig<any>) => Promise<Result<AxiosResponse<T>, SwapErrorRight>>;
 };
 export declare const getHopByIndex: (quote: TradeQuote | TradeRate | undefined, index: SupportedTradeQuoteStepIndex) => TradeQuoteStep | undefined;
 export declare const executeEvmTransaction: (txToSign: SignTx<EvmChainId>, callbacks: EvmTransactionExecutionProps) => Promise<string>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "17.7.1",
+  "version": "17.7.2",
   "repository": "https://github.com/shapeshift/web",
   "license": "MIT",
   "type": "module",
@@ -51,9 +51,9 @@
     "viem": "2.43.5",
     "@shapeshiftoss/caip": "^8.16.7",
     "@shapeshiftoss/chain-adapters": "^11.3.9",
-    "@shapeshiftoss/contracts": "^1.0.5-coderabbit-fix.2",
-    "@shapeshiftoss/hdwallet-core": "^1.62.41",
     "@shapeshiftoss/types": "^8.6.7",
+    "@shapeshiftoss/hdwallet-core": "^1.62.41",
+    "@shapeshiftoss/contracts": "^1.0.5-coderabbit-fix.2",
     "@shapeshiftoss/unchained-client": "^10.14.10",
     "@shapeshiftoss/utils": "^1.0.5"
   },