@shapeshiftoss/swapper 17.8.0 → 19.0.0

package/dist/cjs/swappers/ArbitrumBridgeSwapper/utils/helpers.js

@@ -1,29 +1,44 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNetworkFeeOrFallbackCryptoBaseUnit = exports.assertValidTrade = void 0;
+exports.getParentToChildMessageDataFromParentTxHash = exports.buildArbitrumBridgeRequest = exports.getArbitrumBridgeAllowanceContract = exports.assertValidTrade = exports.getArbitrumBridgeType = exports.isArbitrumBridgeWithdrawal = void 0;
 const sdk_1 = require("@arbitrum/sdk");
 const caip_1 = require("@shapeshiftoss/caip");
-const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
 const contracts_1 = require("@shapeshiftoss/contracts");
 const types_1 = require("@shapeshiftoss/types");
+const utils_1 = require("@shapeshiftoss/utils");
 const build_1 = require("@sniptt/monads/build");
+const ethers5_1 = require("ethers5");
 const viem_1 = require("viem");
 const chains_1 = require("viem/chains");
 const types_2 = require("../../../types");
-const utils_1 = require("../../../utils");
-const constants_1 = require("./constants");
-const types_3 = require("./types");
+const utils_2 = require("../../../utils");
+const types_3 = require("../types");
+const types_4 = require("./types");
+const isArbitrumBridgeWithdrawal = (quote) => {
+    // withdrawal = selling from Arbitrum (deposit = selling from Ethereum to Arbitrum)
+    return (quote?.swapperName === types_2.SwapperName.ArbitrumBridge &&
+        quote.steps[0]?.sellAsset.chainId === caip_1.arbitrumChainId);
+};
+exports.isArbitrumBridgeWithdrawal = isArbitrumBridgeWithdrawal;
+const getArbitrumBridgeType = ({ sellAsset, buyAsset, }) => {
+    const isDeposit = sellAsset.chainId === caip_1.ethChainId;
+    const isEthBridge = isDeposit ? sellAsset.assetId === caip_1.ethAssetId : buyAsset.assetId === caip_1.ethAssetId;
+    if (isDeposit)
+        return isEthBridge ? types_3.BRIDGE_TYPE.ETH_DEPOSIT : types_3.BRIDGE_TYPE.ERC20_DEPOSIT;
+    return isEthBridge ? types_3.BRIDGE_TYPE.ETH_WITHDRAWAL : types_3.BRIDGE_TYPE.ERC20_WITHDRAWAL;
+};
+exports.getArbitrumBridgeType = getArbitrumBridgeType;
 const assertValidTrade = async ({ buyAsset, sellAsset, }) => {
-    if (!types_3.arbitrumBridgeSupportedChainIds.includes(sellAsset.chainId) ||
-        !types_3.arbitrumBridgeSupportedChainIds.includes(buyAsset.chainId)) {
-        return (0, build_1.Err)((0, utils_1.makeSwapErrorRight)({
+    if (!types_4.arbitrumBridgeSupportedChainIds.includes(sellAsset.chainId) ||
+        !types_4.arbitrumBridgeSupportedChainIds.includes(buyAsset.chainId)) {
+        return (0, build_1.Err)((0, utils_2.makeSwapErrorRight)({
             message: `[ArbitrumBridge: assertValidTrade] - unsupported chainId`,
             code: types_2.TradeQuoteError.UnsupportedChain,
             details: { buyAsset, sellAsset },
         }));
     }
     if (buyAsset.chainId === sellAsset.chainId) {
-        return (0, build_1.Err)((0, utils_1.makeSwapErrorRight)({
+        return (0, build_1.Err)((0, utils_2.makeSwapErrorRight)({
             message: `[ArbitrumBridge: assertValidTrade] - both assets must be on different chainIds`,
             code: types_2.TradeQuoteError.UnsupportedTradePair,
             details: { buyAsset, sellAsset },
@@ -39,7 +54,7 @@ const assertValidTrade = async ({ buyAsset, sellAsset, }) => {
             ? buyAsset.assetId !== caip_1.arbitrumAssetId
             : buyAsset.assetId !== caip_1.ethAssetId;
         if (isInvalidPair) {
-            return (0, build_1.Err)((0, utils_1.makeSwapErrorRight)({
+            return (0, build_1.Err)((0, utils_2.makeSwapErrorRight)({
                 message: `[ArbitrumBridge: tradeQuote] - Invalid ETH bridge pair`,
                 code: types_2.TradeQuoteError.UnsupportedTradePair,
                 details: { buyAsset, sellAsset },
@@ -55,16 +70,27 @@ const assertValidTrade = async ({ buyAsset, sellAsset, }) => {
         const childProvider = (0, contracts_1.getEthersV5Provider)(types_1.KnownChainIds.ArbitrumMainnet);
         // Since our related assets list isn't exhaustive and won't cut it to determine the Parent <-> Child mapping, we double check that the bridge is valid
         // by checking against Arbitrum bridge's own mappings, which uses different sources (Coingecko, Gemini, Uni and its own lists at the time of writing)
-        const arbitrumBridgeErc20ChildAddress = await bridger.getChildErc20Address(erc20ParentAddress, parentProvider);
-        const arbitrumBridgeErc20ParentAddress = await bridger.getParentErc20Address(erc20ChildAddress, childProvider);
+        // Tokens that aren't gateway-registered revert these lookups (e.g. native circle USDC has no
+        // l1Address()) - the bridge can't move them, so a lookup failure is an unsupported pair
+        const [arbitrumBridgeErc20ChildAddress, arbitrumBridgeErc20ParentAddress] = await Promise.all([
+            bridger.getChildErc20Address(erc20ParentAddress, parentProvider),
+            bridger.getParentErc20Address(erc20ChildAddress, childProvider),
+        ]).catch(() => [undefined, undefined]);
+        if (!arbitrumBridgeErc20ChildAddress || !arbitrumBridgeErc20ParentAddress) {
+            return (0, build_1.Err)((0, utils_2.makeSwapErrorRight)({
+                message: `[ArbitrumBridge: tradeQuote] - Token is not registered with the arbitrum bridge`,
+                code: types_2.TradeQuoteError.UnsupportedTradePair,
+                details: { buyAsset, sellAsset },
+            }));
+        }
         if (!(0, viem_1.isAddressEqual)((0, viem_1.getAddress)(arbitrumBridgeErc20ParentAddress), (0, viem_1.getAddress)(erc20ParentAddress))) {
-            return (0, build_1.Err)((0, utils_1.makeSwapErrorRight)({
+            return (0, build_1.Err)((0, utils_2.makeSwapErrorRight)({
                 message: `[ArbitrumBridge: tradeQuote] - Invalid Parent ERC20 address: ${erc20ParentAddress}`,
                 code: types_2.TradeQuoteError.UnsupportedTradePair,
             }));
         }
         if (!(0, viem_1.isAddressEqual)((0, viem_1.getAddress)(arbitrumBridgeErc20ChildAddress), (0, viem_1.getAddress)(erc20ChildAddress))) {
-            return (0, build_1.Err)((0, utils_1.makeSwapErrorRight)({
+            return (0, build_1.Err)((0, utils_2.makeSwapErrorRight)({
                 message: `[ArbitrumBridge: tradeQuote] - Invalid Child ERC20 address: ${erc20ChildAddress}`,
                 code: types_2.TradeQuoteError.UnsupportedTradePair,
             }));
@@ -73,28 +99,123 @@ const assertValidTrade = async ({ buyAsset, sellAsset, }) => {
     return (0, build_1.Ok)(true);
 };
 exports.assertValidTrade = assertValidTrade;
-const getNetworkFeeOrFallbackCryptoBaseUnit = async ({ maybeRequest, bridgeType, supportsEIP1559, adapter, }) => {
-    // Fallback fees
-    if (!maybeRequest) {
-        const { average } = await adapter.getGasFeeData();
-        const { gasPrice, maxFeePerGas } = average;
-        const fallbackGasLimit = constants_1.BRIDGE_TYPE_TO_FALLBACK_GAS_LIMIT[bridgeType];
-        // eip1559 fees
-        if (supportsEIP1559 && maxFeePerGas) {
-            return fallbackGasLimit.times(maxFeePerGas).toFixed();
+// ERC20 deposits approve the Parent gateway; everything else needs no approval
+const getArbitrumBridgeAllowanceContract = ({ bridgeType, sellAsset, }) => {
+    if (bridgeType !== types_3.BRIDGE_TYPE.ERC20_DEPOSIT)
+        return Promise.resolve('');
+    const l2Network = (0, sdk_1.getArbitrumNetwork)(chains_1.arbitrum.id);
+    const bridger = new sdk_1.Erc20Bridger(l2Network);
+    const erc20ParentAddress = (0, caip_1.fromAssetId)(sellAsset.assetId).assetReference;
+    const parentProvider = (0, contracts_1.getEthersV5Provider)(types_1.KnownChainIds.EthereumMainnet);
+    return bridger.getParentGatewayAddress(erc20ParentAddress, parentProvider);
+};
+exports.getArbitrumBridgeAllowanceContract = getArbitrumBridgeAllowanceContract;
+// Builds the executable bridge request via the Arbitrum SDK. The retryable estimation runs on the
+// child node, so this builds before approval - only our own L1 fee estimation reverts pre-approval
+const buildArbitrumBridgeRequest = ({ bridgeType, sellAmountCryptoBaseUnit, from, receiveAddress, sellAsset, buyAsset, }) => {
+    const l2Network = (0, sdk_1.getArbitrumNetwork)(chains_1.arbitrum.id);
+    const parentProvider = (0, contracts_1.getEthersV5Provider)(types_1.KnownChainIds.EthereumMainnet);
+    const childProvider = (0, contracts_1.getEthersV5Provider)(types_1.KnownChainIds.ArbitrumMainnet);
+    const amount = ethers5_1.BigNumber.from(sellAmountCryptoBaseUnit);
+    switch (bridgeType) {
+        case types_3.BRIDGE_TYPE.ETH_DEPOSIT: {
+            const bridger = new sdk_1.EthBridger(l2Network);
+            return bridger
+                .getDepositToRequest({
+                parentProvider,
+                childProvider,
+                amount,
+                from,
+                destinationAddress: receiveAddress,
+            })
+                .catch(e => {
+                console.error('Error getting ETH deposit request', e);
+                return undefined;
+            });
+        }
+        case types_3.BRIDGE_TYPE.ETH_WITHDRAWAL: {
+            const bridger = new sdk_1.EthBridger(l2Network);
+            return bridger
+                .getWithdrawalRequest({ amount, from, destinationAddress: receiveAddress })
+                .catch(e => {
+                console.error('Error getting ETH withdraw request', e);
+                return undefined;
+            });
+        }
+        case types_3.BRIDGE_TYPE.ERC20_DEPOSIT: {
+            const bridger = new sdk_1.Erc20Bridger(l2Network);
+            const erc20ParentAddress = (0, caip_1.fromAssetId)(sellAsset.assetId).assetReference;
+            return bridger
+                .getDepositRequest({
+                amount,
+                parentProvider,
+                childProvider,
+                erc20ParentAddress,
+                from,
+                destinationAddress: receiveAddress,
+                retryableGasOverrides: {
+                    // https://github.com/OffchainLabs/arbitrum-token-bridge/blob/d17c88ef3eef3f4ffc61a04d34d50406039f045d/packages/arb-token-bridge-ui/src/util/TokenDepositUtils.ts#L159
+                    // the gas limit may vary by about 20k due to SSTORE (zero vs nonzero)
+                    // the 30% gas limit increase should cover the difference
+                    gasLimit: { percentIncrease: ethers5_1.BigNumber.from(30) },
+                },
+            })
+                .catch(e => {
+                console.error('Error getting ERC20 deposit request', e);
+                return undefined;
+            });
         }
-        // legacy fees
-        return fallbackGasLimit.times(gasPrice).toFixed();
+        case types_3.BRIDGE_TYPE.ERC20_WITHDRAWAL: {
+            const bridger = new sdk_1.Erc20Bridger(l2Network);
+            const erc20ParentAddress = (0, caip_1.fromAssetId)(buyAsset.assetId).assetReference;
+            return bridger
+                .getWithdrawalRequest({
+                amount,
+                erc20ParentAddress,
+                from,
+                destinationAddress: receiveAddress,
+            })
+                .catch(e => {
+                console.error('Error getting ERC20 withdraw request', e);
+                return undefined;
+            });
+        }
+        default:
+            return (0, utils_1.assertUnreachable)(bridgeType);
+    }
+};
+exports.buildArbitrumBridgeRequest = buildArbitrumBridgeRequest;
+// https://github.com/OffchainLabs/arbitrum-token-bridge/blob/d17c88ef3eef3f4ffc61a04d34d50406039f045d/packages/arb-token-bridge-ui/src/util/deposits/helpers.ts#L268
+const getParentToChildMessageDataFromParentTxHash = async ({ depositTxId, parentProvider, childProvider, isClassic, // optional: if we already know if tx is classic (eg. through subgraph) then no need to re-check in this fn
+ }) => {
+    // fetch Parent transaction receipt
+    const depositTxReceipt = await parentProvider.getTransactionReceipt(depositTxId);
+    if (!depositTxReceipt)
+        return;
+    const parentTxReceipt = new sdk_1.ParentTransactionReceipt(depositTxReceipt);
+    // classic (pre-nitro) handling
+    const getClassicDepositMessage = async () => {
+        const [parentToChildMsg] = await parentTxReceipt.getParentToChildMessagesClassic(childProvider);
+        return {
+            isClassic: true,
+            parentToChildMsg,
+        };
+    };
+    // post-nitro handling
+    const getNitroDepositMessage = async () => {
+        const [parentToChildMsg] = await parentTxReceipt.getParentToChildMessages(childProvider);
+        return {
+            isClassic: false,
+            parentToChildMsg,
+        };
+    };
+    // if it is unknown whether the transaction isClassic or not, fetch the result
+    const safeIsClassic = isClassic ?? (await parentTxReceipt.isClassic(childProvider));
+    if (safeIsClassic) {
+        // classic (pre-nitro) deposit - both eth + token
+        return getClassicDepositMessage();
     }
-    // Actual fees
-    const feeData = await chain_adapters_1.evm.getFees({
-        adapter,
-        data: maybeRequest.txRequest.data.toString(),
-        to: maybeRequest.txRequest.to,
-        value: maybeRequest.txRequest.value.toString(),
-        from: maybeRequest.txRequest.from,
-        supportsEIP1559,
-    });
-    return feeData.networkFeeCryptoBaseUnit;
+    // post-nitro deposit - both eth + token
+    return getNitroDepositMessage();
 };
-exports.getNetworkFeeOrFallbackCryptoBaseUnit = getNetworkFeeOrFallbackCryptoBaseUnit;
+exports.getParentToChildMessageDataFromParentTxHash = getParentToChildMessageDataFromParentTxHash;

package/dist/cjs/swappers/AvnuSwapper/endpoints.js

@@ -7,44 +7,18 @@ const starknet_1 = require("starknet");
 const utils_1 = require("../../utils");
 const getTradeQuote_1 = require("./swapperApi/getTradeQuote");
 const getTradeRate_1 = require("./swapperApi/getTradeRate");
-/**
- * Normalize a value to hex format for Starknet RPC
- * Handles various input types: decimal strings, hex strings (with/without 0x), numbers, BigInts
- */
-const toHexString = (value) => {
-    const strValue = String(value);
-    // Already a proper hex string with 0x prefix
-    if (strValue.startsWith('0x')) {
-        return strValue;
-    }
-    // Check if it looks like a hex string without 0x prefix (contains a-f characters)
-    // Starknet addresses and felts often come as hex without 0x prefix
-    if (/^[0-9a-fA-F]+$/.test(strValue) && /[a-fA-F]/.test(strValue)) {
-        return `0x${strValue}`;
-    }
-    // Otherwise treat as decimal and convert to hex
-    try {
-        return starknet_1.num.toHex(strValue);
-    }
-    catch {
-        // If conversion fails, assume it's already hex and add prefix
-        return `0x${strValue}`;
-    }
-};
+const helpers_1 = require("./utils/helpers");
 exports.avnuApi = {
-    getTradeQuote: getTradeQuote_1.getTradeQuote,
-    getTradeRate: (input, deps) => {
-        return (0, getTradeRate_1.getTradeRate)(input, deps);
-    },
+    getTradeQuote: (input, deps) => (0, getTradeQuote_1.getTradeQuote)(input, deps),
+    getTradeRate: (input, deps) => (0, getTradeRate_1.getTradeRate)(input, deps),
     getUnsignedStarknetTransaction: async ({ stepIndex, tradeQuote, from, slippageTolerancePercentageDecimal, assertGetStarknetChainAdapter, }) => {
         if (!(0, utils_1.isExecutableTradeQuote)(tradeQuote))
             throw new Error('Unable to execute a trade rate quote');
         const step = (0, utils_1.getExecutableTradeStep)(tradeQuote, stepIndex);
-        const { accountNumber, sellAsset, avnuSpecific } = step;
-        if (!avnuSpecific)
-            throw new Error('avnuSpecific is required');
-        if (!avnuSpecific.quoteId)
-            throw new Error('quoteId is required in avnuSpecific');
+        const { accountNumber, sellAsset } = step;
+        const { quoteId } = (0, utils_1.getSwapMetadata)(step.swapperMetadata, 'avnu');
+        if (!quoteId)
+            throw new Error('quoteId is required in avnu swapper metadata');
         const adapter = assertGetStarknetChainAdapter(sellAsset.chainId);
         // Normalize the from address to ensure consistent format
         // Starknet addresses can have different representations (with/without leading zeros)
@@ -56,7 +30,7 @@ exports.avnuApi = {
             : 0.02;
         // Get the swap calls from AVNU SDK
         const { calls: avnuCalls } = await (0, avnu_sdk_1.quoteToCalls)({
-            quoteId: avnuSpecific.quoteId,
+            quoteId,
             slippage,
             takerAddress: normalizedFrom,
         });
@@ -75,7 +49,7 @@ exports.avnuApi = {
             fullCalldata.push(normalizedContractAddress, selector, calldataArray.length.toString(), ...calldataArray.map(cd => String(cd)));
         }
         // Format calldata for RPC (convert all values to proper hex format)
-        const formattedCalldata = fullCalldata.map(toHexString);
+        const formattedCalldata = fullCalldata.map(helpers_1.toHexString);
         // Get nonce using adapter method (checks deployment status and returns appropriate nonce)
         const chainIdHex = await adapter.getStarknetProvider().getChainId();
         const nonce = await adapter.getNonce(normalizedFrom);

package/dist/cjs/swappers/AvnuSwapper/index.d.ts

@@ -1 +1,3 @@
 export { AVNU_SUPPORTED_CHAIN_IDS } from './utils/constants';
+export { avnuApi } from './endpoints';
+export { avnuSwapper } from './AvnuSwapper';

package/dist/cjs/swappers/AvnuSwapper/index.js

@@ -1,5 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AVNU_SUPPORTED_CHAIN_IDS = void 0;
+exports.avnuSwapper = exports.avnuApi = exports.AVNU_SUPPORTED_CHAIN_IDS = void 0;
 var constants_1 = require("./utils/constants");
 Object.defineProperty(exports, "AVNU_SUPPORTED_CHAIN_IDS", { enumerable: true, get: function () { return constants_1.AVNU_SUPPORTED_CHAIN_IDS; } });
+var endpoints_1 = require("./endpoints");
+Object.defineProperty(exports, "avnuApi", { enumerable: true, get: function () { return endpoints_1.avnuApi; } });
+var AvnuSwapper_1 = require("./AvnuSwapper");
+Object.defineProperty(exports, "avnuSwapper", { enumerable: true, get: function () { return AvnuSwapper_1.avnuSwapper; } });

package/dist/cjs/swappers/AvnuSwapper/swapperApi/getTradeQuote.d.ts

@@ -1,3 +1,4 @@
 import type { Result } from '@sniptt/monads';
-import type { CommonTradeQuoteInput, SwapErrorRight, SwapperDeps, TradeQuote } from '../../../types';
-export declare const getTradeQuote: (input: CommonTradeQuoteInput, deps: SwapperDeps) => Promise<Result<TradeQuote[], SwapErrorRight>>;
+import type { SwapErrorRight, SwapperDeps, TradeQuote } from '../../../types';
+import type { AvnuTradeQuoteInput } from '../types';
+export declare const getTradeQuote: (input: AvnuTradeQuoteInput, deps: SwapperDeps) => Promise<Result<TradeQuote[], SwapErrorRight>>;

package/dist/cjs/swappers/AvnuSwapper/swapperApi/getTradeQuote.js

@@ -1,154 +1,55 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTradeQuote = void 0;
-const avnu_sdk_1 = require("@avnu/avnu-sdk");
-const caip_1 = require("@shapeshiftoss/caip");
-const utils_1 = require("@shapeshiftoss/utils");
 const monads_1 = require("@sniptt/monads");
 const starknet_1 = require("starknet");
-const uuid_1 = require("uuid");
-const constants_1 = require("../../../constants");
 const types_1 = require("../../../types");
-const utils_2 = require("../../../utils");
-const affiliateFee_1 = require("../../utils/affiliateFee");
-const helpers_1 = require("../../utils/helpers/helpers");
-const constants_2 = require("../utils/constants");
-const helpers_2 = require("../utils/helpers");
+const utils_1 = require("../../../utils");
+const helpers_1 = require("../../../utils/helpers");
+const getAvnuTradeContext_1 = require("../utils/getAvnuTradeContext");
 const getTradeQuote = async (input, deps) => {
-    const { sellAsset, buyAsset, accountNumber, sendAddress, receiveAddress, sellAmountIncludingProtocolFeesCryptoBaseUnit: sellAmount, slippageTolerancePercentageDecimal, affiliateBps, } = input;
-    if (!constants_2.AVNU_SUPPORTED_CHAIN_IDS.includes(sellAsset.chainId)) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: `Chain ${sellAsset.chainId} is not supported by AVNU`,
-            code: types_1.TradeQuoteError.UnsupportedChain,
-        }));
-    }
-    if (!constants_2.AVNU_SUPPORTED_CHAIN_IDS.includes(buyAsset.chainId)) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: `Chain ${buyAsset.chainId} is not supported by AVNU`,
-            code: types_1.TradeQuoteError.UnsupportedChain,
-        }));
-    }
-    if (accountNumber === undefined) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: `accountNumber is required`,
-            code: types_1.TradeQuoteError.UnknownError,
-        }));
-    }
-    if (sendAddress === undefined) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: `sendAddress is required`,
-            code: types_1.TradeQuoteError.UnknownError,
-        }));
-    }
-    if (receiveAddress === undefined) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: `receiveAddress is required`,
-            code: types_1.TradeQuoteError.UnknownError,
-        }));
-    }
+    const { sellAsset, accountNumber } = input;
+    const maybeAddresses = (0, utils_1.assertQuoteAddresses)(input);
+    if (maybeAddresses.isErr())
+        return (0, monads_1.Err)(maybeAddresses.unwrapErr());
+    const { sendAddress, receiveAddress } = maybeAddresses.unwrap();
     try {
-        const sellTokenAddress = (0, helpers_2.getTokenAddress)(sellAsset);
-        const buyTokenAddress = (0, helpers_2.getTokenAddress)(buyAsset);
-        // Normalize addresses to ensure consistent format across quote and execution
-        // Starknet addresses can have different representations (with/without leading zeros)
+        // Starknet addresses can have different representations (with/without leading zeros) - normalize
+        // to keep the quote and execution consistent
         const normalizedSendAddress = (0, starknet_1.validateAndParseAddress)(sendAddress);
         const normalizedReceiveAddress = (0, starknet_1.validateAndParseAddress)(receiveAddress);
-        const quotes = await (0, avnu_sdk_1.getQuotes)({
-            sellTokenAddress,
-            buyTokenAddress,
-            sellAmount: BigInt(sellAmount),
-            takerAddress: normalizedSendAddress,
-            size: 1,
-            integratorFees: affiliateBps ? BigInt(affiliateBps) : undefined,
-            integratorFeeRecipient: (0, helpers_1.getTreasuryAddressFromChainId)(caip_1.starknetChainId),
-            integratorName: 'shapeshift',
-        });
-        if (!quotes || quotes.length === 0) {
-            return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-                message: 'No quotes available for this trade pair',
-                code: types_1.TradeQuoteError.NoRouteFound,
-            }));
-        }
-        const bestQuote = quotes[0];
-        if (!bestQuote) {
-            return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-                message: 'No valid quote returned from AVNU',
-                code: types_1.TradeQuoteError.QueryFailed,
-            }));
-        }
-        const buyAmountAfterFeesCryptoBaseUnit = bestQuote.buyAmount.toString();
-        const sellAdapter = deps.assertGetStarknetChainAdapter(sellAsset.chainId);
-        const feeData = await sellAdapter.getFeeData({
+        const maybeContext = await (0, getAvnuTradeContext_1.getAvnuTradeContext)({ input, takerAddress: normalizedSendAddress });
+        if (maybeContext.isErr())
+            return (0, monads_1.Err)(maybeContext.unwrapErr());
+        const { tradeCommon, stepCommon, protocolFees, quoteId, sellTokenAddress, deadline } = maybeContext.unwrap();
+        const adapter = deps.assertGetStarknetChainAdapter(sellAsset.chainId);
+        const feeData = await adapter.getFeeData({
             to: normalizedReceiveAddress,
-            value: sellAmount,
+            value: stepCommon.sellAmountIncludingProtocolFeesCryptoBaseUnit,
             chainSpecific: {
                 from: normalizedSendAddress,
                 tokenContractAddress: sellTokenAddress,
             },
             sendMax: false,
         });
-        const rate = (0, utils_2.getInputOutputRate)({
-            sellAmountCryptoBaseUnit: sellAmount,
-            buyAmountCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
-            sellAsset,
-            buyAsset,
-        });
-        const protocolFees = affiliateBps
-            ? {
-                [buyAsset.assetId]: {
-                    amountCryptoBaseUnit: (0, utils_1.bn)(buyAmountAfterFeesCryptoBaseUnit)
-                        .times(affiliateBps)
-                        .div(10000)
-                        .toFixed(0),
-                    requiresBalance: false,
-                    asset: buyAsset,
-                },
-            }
-            : {};
         const tradeQuote = {
-            id: (0, uuid_1.v4)(),
+            ...tradeCommon,
             receiveAddress: normalizedReceiveAddress,
-            affiliateBps,
-            rate,
-            slippageTolerancePercentageDecimal: slippageTolerancePercentageDecimal ??
-                (0, constants_1.getDefaultSlippageDecimalPercentageForSwapper)(types_1.SwapperName.Avnu),
             quoteOrRate: 'quote',
-            swapperName: types_1.SwapperName.Avnu,
+            deadline: deadline ?? Date.now() + helpers_1.FALLBACK_QUOTE_DEADLINE_MS,
             steps: [
                 {
+                    ...stepCommon,
                     accountNumber,
-                    allowanceContract: '0x0',
-                    buyAmountBeforeFeesCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
-                    buyAmountAfterFeesCryptoBaseUnit,
-                    buyAsset,
-                    feeData: {
-                        protocolFees,
-                        networkFeeCryptoBaseUnit: feeData.fast.txFee,
-                    },
-                    rate,
-                    sellAmountIncludingProtocolFeesCryptoBaseUnit: sellAmount,
-                    sellAsset,
-                    source: types_1.SwapperName.Avnu,
-                    estimatedExecutionTimeMs: undefined,
-                    avnuSpecific: {
-                        quoteId: bestQuote.quoteId,
-                        routes: bestQuote.routes,
-                    },
-                    affiliateFee: (0, affiliateFee_1.buildAffiliateFee)({
-                        strategy: 'buy_asset',
-                        affiliateBps,
-                        sellAsset,
-                        buyAsset,
-                        sellAmountCryptoBaseUnit: sellAmount,
-                        buyAmountCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
-                    }),
+                    feeData: { protocolFees, networkFeeCryptoBaseUnit: feeData.fast.txFee },
+                    swapperMetadata: { name: 'avnu', quoteId },
                 },
             ],
         };
         return (0, monads_1.Ok)([tradeQuote]);
     }
     catch (error) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
+        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
             message: error instanceof Error ? error.message : 'Unknown error getting AVNU quote',
             code: types_1.TradeQuoteError.QueryFailed,
             cause: error,

package/dist/cjs/swappers/AvnuSwapper/swapperApi/getTradeRate.d.ts

@@ -1,3 +1,4 @@
 import type { Result } from '@sniptt/monads';
-import type { GetTradeRateInput, SwapErrorRight, SwapperDeps, TradeRate } from '../../../types';
-export declare const getTradeRate: (input: GetTradeRateInput, deps: SwapperDeps) => Promise<Result<TradeRate[], SwapErrorRight>>;
+import type { SwapErrorRight, SwapperDeps, TradeRate } from '../../../types';
+import type { AvnuTradeRateInput } from '../types';
+export declare const getTradeRate: (input: AvnuTradeRateInput, deps: SwapperDeps) => Promise<Result<TradeRate[], SwapErrorRight>>;