@avail-project/ca-common 2.1.0 → 2.2.1

package/dist/cjs/xcs/autochoice.js

@@ -3,9 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AutoSelectionError = void 0;
 exports.aggregateAggregators = aggregateAggregators;
 exports.autoSelectSourcesV2 = autoSelectSourcesV2;
+exports.autoSelectSourcesV2ByRecipient = autoSelectSourcesV2ByRecipient;
 exports.determineDestinationSwaps = determineDestinationSwaps;
 exports.liquidateInputHoldings = liquidateInputHoldings;
+exports.liquidateInputHoldingsByRecipient = liquidateInputHoldingsByRecipient;
 exports.destinationSwapWithExactIn = destinationSwapWithExactIn;
+exports.getDestinationExactOutSwap = getDestinationExactOutSwap;
+exports.getDestinationExactInSwap = getDestinationExactInSwap;
+exports.liquidateSourceHoldings = liquidateSourceHoldings;
+exports.autoSelectSources = autoSelectSources;
 const tslib_1 = require("tslib");
 const es_toolkit_1 = require("es-toolkit");
 const viem_1 = require("viem");
@@ -108,7 +114,18 @@ cots = [(1 COT, 1), (1 COT, 4)]
     break
 5. return quotes and assets used.
 */
+/**
+ * @deprecated Use {@link autoSelectSources} (object args; per-holding `takerAddress` and
+ * `receiverAddress` on each `HoldingWithSwapAddresses`).
+ */
 async function autoSelectSourcesV2(userAddress, holdings, outputRequired, aggregators, commonCurrencyID = data_1.CurrencyID.USDC) {
+    return autoSelectSourcesV2ByRecipient(holdings.map((holding) => ({ ...holding, recipient: userAddress })), outputRequired, aggregators, commonCurrencyID);
+}
+/**
+ * @deprecated Use {@link autoSelectSources} (object args; per-holding `takerAddress` and
+ * `receiverAddress` on each `HoldingWithSwapAddresses`).
+ */
+async function autoSelectSourcesV2ByRecipient(holdings, outputRequired, aggregators, commonCurrencyID = data_1.CurrencyID.USDC) {
     // Assumption: Holding is already sorted in usage priority
     console.debug("XCS | SSV2:", {
         holdings,
@@ -142,7 +159,10 @@ async function autoSelectSourcesV2(userAddress, holdings, outputRequired, aggreg
         else {
             fullLiquidationQuotes.push({
                 req: {
-                    userAddress,
+                    userAddress: holding.recipient,
+                    // New wrappers thread per-holding receiver via this field. Falls back to taker
+                    // (`recipient`) when absent — preserves legacy positional-call behavior.
+                    receiverAddress: holding.receiverAddress,
                     type: iface_1.QuoteType.EXACT_IN,
                     chain: chain.ChainID,
                     inputToken: holding.tokenAddress,
@@ -326,7 +346,11 @@ async function autoSelectSourcesV2(userAddress, holdings, outputRequired, aggreg
     console.log("final_quotes", { quotes: final, cots: usedCOTs });
     return { quoteResponses: final, usedCOTs };
 }
-async function determineDestinationSwaps(userAddress, requirement, aggregators, commonCurrencyID = data_1.CurrencyID.USDC) {
+/**
+ * @deprecated Use {@link getDestinationExactOutSwap} (object args; explicit `takerAddress` and
+ * `receiverAddress`, both required).
+ */
+async function determineDestinationSwaps(userAddress, requirement, aggregators, commonCurrencyID = data_1.CurrencyID.USDC, receiverAddress) {
     const chaindata = data_1.ChaindataMap.get(requirement.chainID);
     if (chaindata == null) {
         throw new AutoSelectionError("Chain not found");
@@ -341,6 +365,7 @@ async function determineDestinationSwaps(userAddress, requirement, aggregators,
         type: iface_1.QuoteType.EXACT_IN,
         chain: requirement.chainID,
         userAddress,
+        receiverAddress,
         inputToken: requirement.tokenAddress,
         outputToken: COT.tokenAddress,
         inputAmount: requirement.amountRaw,
@@ -364,6 +389,7 @@ async function determineDestinationSwaps(userAddress, requirement, aggregators,
             {
                 type: iface_1.QuoteType.EXACT_IN,
                 userAddress,
+                receiverAddress,
                 chain: requirement.chainID,
                 inputToken: COT.tokenAddress,
                 outputToken: requirement.tokenAddress,
@@ -395,7 +421,18 @@ async function determineDestinationSwaps(userAddress, requirement, aggregators,
         }
     }
 }
-async function liquidateInputHoldings(userAddress, holdings, aggregators, commonCurrencyID = data_1.CurrencyID.USDC) {
+/**
+ * @deprecated Use {@link liquidateSourceHoldings} (object args; per-holding `takerAddress`
+ * and `receiverAddress` on each `HoldingWithSwapAddresses`).
+ */
+async function liquidateInputHoldings(userAddress, holdings, aggregators, commonCurrencyID = data_1.CurrencyID.USDC, receiverAddress) {
+    return liquidateInputHoldingsByRecipient(holdings.map((holding) => ({ ...holding, recipient: userAddress })), aggregators, commonCurrencyID, receiverAddress);
+}
+/**
+ * @deprecated Use {@link liquidateSourceHoldings} (object args; per-holding `takerAddress`
+ * and `receiverAddress` on each `HoldingWithSwapAddresses`).
+ */
+async function liquidateInputHoldingsByRecipient(holdings, aggregators, commonCurrencyID = data_1.CurrencyID.USDC, receiverAddress) {
     console.debug("XCS | LIH | Holdings:", holdings);
     const groupedByChainID = (0, es_toolkit_1.groupBy)(holdings, (h) => (0, viem_1.bytesToHex)(h.chainID.toBytes()));
     const fullLiquidationQuotes = [];
@@ -419,7 +456,10 @@ async function liquidateInputHoldings(userAddress, holdings, aggregators, common
             }
             fullLiquidationQuotes.push({
                 req: {
-                    userAddress,
+                    userAddress: holding.recipient,
+                    // Per-holding receiver wins (set by the new wrappers); shared param is the legacy
+                    // positional-call fallback.
+                    receiverAddress: holding.receiverAddress ?? receiverAddress,
                     type: iface_1.QuoteType.EXACT_IN,
                     chain: chain.ChainID,
                     inputToken: holding.tokenAddress,
@@ -448,7 +488,11 @@ async function liquidateInputHoldings(userAddress, holdings, aggregators, common
     }
     return quotes;
 }
-async function destinationSwapWithExactIn(userAddress, omniChainID, inputAmount, outputToken, aggregators, inputCurrency = data_1.CurrencyID.USDC) {
+/**
+ * @deprecated Use {@link getDestinationExactInSwap} (object args; explicit `takerAddress`
+ * and `receiverAddress`, both required).
+ */
+async function destinationSwapWithExactIn(userAddress, omniChainID, inputAmount, outputToken, aggregators, inputCurrency = data_1.CurrencyID.USDC, receiverAddress) {
     const chaindata = data_1.ChaindataMap.get(omniChainID);
     if (chaindata == null) {
         throw new AutoSelectionError("Chain not found");
@@ -462,6 +506,7 @@ async function destinationSwapWithExactIn(userAddress, omniChainID, inputAmount,
             type: iface_1.QuoteType.EXACT_IN,
             chain: omniChainID,
             userAddress,
+            receiverAddress,
             inputToken: COT.tokenAddress,
             outputToken: outputToken,
             inputAmount: inputAmount,
@@ -486,3 +531,40 @@ async function destinationSwapWithExactIn(userAddress, omniChainID, inputAmount,
         },
     };
 }
+// =====================================================================================
+// Object-arg wrappers around the legacy positional functions above.
+//
+// Aggregator vocabulary:
+//   takerAddress    — on-chain executor of the swap (drives aggregator simulation /
+//                     permit / approval routing). On 7702 chains this is the ephemeral; on
+//                     non-Pectra chains it's the deployed Safe. Maps to the underlying
+//                     QuoteRequest's `userAddress`.
+//   receiverAddress — recipient of the swap output. Maps to the underlying QuoteRequest's
+//                     `receiverAddress`. Required on all 4 wrappers — the GS013-class bug we
+//                     fixed came from forgetting this and silently defaulting to the wrong
+//                     address. Even on source side (where it equals the taker today), require
+//                     it explicitly so the type system forces every call site to acknowledge
+//                     both roles.
+//
+// Wrap-only: each wrapper delegates to the deprecated positional fn. No business logic added.
+// =====================================================================================
+async function getDestinationExactOutSwap(args) {
+    return determineDestinationSwaps(args.takerAddress, args.requirement, args.aggregators, args.commonCurrencyID, args.receiverAddress);
+}
+async function getDestinationExactInSwap(args) {
+    return destinationSwapWithExactIn(args.takerAddress, args.chain, args.inputAmount, args.outputToken, args.aggregators, args.inputCurrency, args.receiverAddress);
+}
+async function liquidateSourceHoldings(args) {
+    return liquidateInputHoldingsByRecipient(args.holdings.map((h) => ({
+        ...h,
+        recipient: h.takerAddress,
+        receiverAddress: h.receiverAddress,
+    })), args.aggregators, args.commonCurrencyID);
+}
+async function autoSelectSources(args) {
+    return autoSelectSourcesV2ByRecipient(args.holdings.map((h) => ({
+        ...h,
+        recipient: h.takerAddress,
+        receiverAddress: h.receiverAddress,
+    })), args.outputRequired, args.aggregators, args.commonCurrencyID);
+}

package/dist/cjs/xcs/bebop-agg.js

@@ -14,17 +14,11 @@ const ChainNameMapping = new Map(Object.entries({
     arbitrum: 42161,
     optimism: 10,
     base: 8453,
-    taiko: 167000,
     bsc: 56,
-    monadtestnet: 10143,
-    megaethtestnet: 6342,
-    berachain: 80094,
+    avalanche: 43114,
     polygon: 137,
-    zksync: 324,
-    blast: 81457,
-    mode: 34443,
     scroll: 534352,
-    superseed: 5330,
+    hyperevm: 999,
 }).map(([k, v]) => [(0, viem_1.bytesToHex)((0, data_1.encodeChainID36)(definition_1.Universe.ETHEREUM, v)), k]));
 class BebopAggregator {
     static BASE_URL = "https://api.bebop.xyz/router";
@@ -56,6 +50,9 @@ class BebopAggregator {
             const inputTokenAddr = (0, viem_1.getAddress)((0, viem_1.bytesToHex)(r.inputToken.subarray(12)));
             const outputTokenAddr = (0, viem_1.getAddress)((0, viem_1.bytesToHex)(r.outputToken.subarray(12)));
             const userAddrHex = (0, viem_1.getAddress)((0, viem_1.bytesToHex)(r.userAddress.subarray(12)));
+            const receiverAddrHex = r.receiverAddress != null
+                ? (0, viem_1.getAddress)((0, viem_1.bytesToHex)(r.receiverAddress.subarray(12)))
+                : userAddrHex;
             switch (r.type) {
                 case iface_1.QuoteType.EXACT_IN: {
                     respPromise = this.axios({
@@ -65,6 +62,7 @@ class BebopAggregator {
                             sell_tokens: inputTokenAddr,
                             buy_tokens: outputTokenAddr,
                             taker_address: userAddrHex,
+                            receiver_address: receiverAddrHex,
                             sell_amounts: r.inputAmount.toString(),
                             ...BebopAggregator.COMMON_OPTIONS,
                         },
@@ -79,6 +77,7 @@ class BebopAggregator {
                             sell_tokens: inputTokenAddr,
                             buy_tokens: outputTokenAddr,
                             taker_address: userAddrHex,
+                            receiver_address: receiverAddrHex,
                             buy_amounts: r.outputAmount.toString(),
                             ...BebopAggregator.COMMON_OPTIONS,
                         },

package/dist/cjs/xcs/fibrous-agg.js

@@ -10,7 +10,7 @@ const evmabi_1 = require("../evmabi");
 const definition_1 = require("../proto/definition");
 const iface_1 = require("./iface");
 const ChainNameMapping = new data_1.ChainIDKeyedMap([
-    [new data_1.OmniversalChainID(definition_1.Universe.ETHEREUM, 8453), "base"],
+    // [new OmniversalChainID(Universe.ETHEREUM, 8453), "base"], // Disabled because of few liquidity issues
     [new data_1.OmniversalChainID(definition_1.Universe.ETHEREUM, 999), "hyperevm"],
     [new data_1.OmniversalChainID(definition_1.Universe.ETHEREUM, 143), "monad"],
     [new data_1.OmniversalChainID(definition_1.Universe.ETHEREUM, 4114), "citrea"],
@@ -19,9 +19,11 @@ class FibrousAggregator {
     static BASE_URL = "https://api.fibrous.finance";
     axios;
     slippage;
+    excludeProtocols;
     constructor(options = {}) {
-        const { apiKey, slippage = 0.5 } = options;
+        const { apiKey, slippage = 0.5, excludeProtocols = "3" } = options;
         this.slippage = slippage;
+        this.excludeProtocols = excludeProtocols;
         this.axios = axios_1.default.create({
             baseURL: FibrousAggregator.BASE_URL,
             headers: apiKey != null ? { "X-API-Key": apiKey } : undefined,
@@ -43,6 +45,9 @@ class FibrousAggregator {
             const inputTokenAddr = (0, viem_1.getAddress)((0, viem_1.bytesToHex)(r.inputToken.subarray(12)));
             const outputTokenAddr = (0, viem_1.getAddress)((0, viem_1.bytesToHex)(r.outputToken.subarray(12)));
             const userAddrHex = (0, viem_1.getAddress)((0, viem_1.bytesToHex)(r.userAddress.subarray(12)));
+            const receiverAddrHex = r.receiverAddress != null
+                ? (0, viem_1.getAddress)((0, viem_1.bytesToHex)(r.receiverAddress.subarray(12)))
+                : userAddrHex;
             let resp;
             try {
                 resp = await this.axios({
@@ -53,7 +58,8 @@ class FibrousAggregator {
                         tokenInAddress: inputTokenAddr,
                         tokenOutAddress: outputTokenAddr,
                         slippage: this.slippage,
-                        destination: userAddrHex,
+                        destination: receiverAddrHex,
+                        excludeProtocols: this.excludeProtocols,
                     },
                 });
             }

package/dist/cjs/xcs/lifi-agg.js

@@ -7,6 +7,20 @@ const viem_1 = require("viem");
 const iface_1 = require("./iface");
 const definition_1 = require("../proto/definition");
 const decimal_js_1 = tslib_1.__importDefault(require("decimal.js"));
+const ALLOWED_CHAINS = new Set([
+    1, // Ethereum
+    10, // Optimism
+    56, // BSC
+    137, // Polygon
+    143, // Monad
+    999, // HyperEVM
+    4326, // MegaETH
+    8453, // Base
+    42161, // Arbitrum
+    43114, // Avalanche
+    8217, // Kaia
+    534352, // Scroll
+]);
 class LiFiAggregator {
     static BASE_URL_V1 = "https://li.quest/v1";
     static COMMON_OPTIONS = {
@@ -29,11 +43,17 @@ class LiFiAggregator {
             if (r.chain.universe !== definition_1.Universe.ETHEREUM) {
                 return null;
             }
+            if (!ALLOWED_CHAINS.has(Number(r.chain.chainID))) {
+                return null;
+            }
             let respPromise;
             const chIDStr = r.chain.chainID.toString();
             const inputTokenAddr = (0, viem_1.getAddress)((0, viem_1.bytesToHex)(r.inputToken.subarray(12)));
             const outputTokenAddr = (0, viem_1.getAddress)((0, viem_1.bytesToHex)(r.outputToken.subarray(12)));
             const userAddrHex = (0, viem_1.getAddress)((0, viem_1.bytesToHex)(r.userAddress.subarray(12)));
+            const receiverAddrHex = r.receiverAddress != null
+                ? (0, viem_1.getAddress)((0, viem_1.bytesToHex)(r.receiverAddress.subarray(12)))
+                : userAddrHex;
             switch (r.type) {
                 case iface_1.QuoteType.EXACT_IN: {
                     respPromise = this.axios({
@@ -45,6 +65,7 @@ class LiFiAggregator {
                             fromToken: inputTokenAddr,
                             toToken: outputTokenAddr,
                             fromAddress: userAddrHex,
+                            toAddress: receiverAddrHex,
                             fromAmount: r.inputAmount.toString(),
                             ...LiFiAggregator.COMMON_OPTIONS,
                         },
@@ -61,6 +82,7 @@ class LiFiAggregator {
                             fromToken: inputTokenAddr,
                             toToken: outputTokenAddr,
                             fromAddress: userAddrHex,
+                            toAddress: receiverAddrHex,
                             toAmount: r.outputAmount.toString(),
                             ...LiFiAggregator.COMMON_OPTIONS,
                         },

package/dist/esm/xcs/autochoice.js

@@ -98,7 +98,18 @@ cots = [(1 COT, 1), (1 COT, 4)]
     break
 5. return quotes and assets used.
 */
+/**
+ * @deprecated Use {@link autoSelectSources} (object args; per-holding `takerAddress` and
+ * `receiverAddress` on each `HoldingWithSwapAddresses`).
+ */
 export async function autoSelectSourcesV2(userAddress, holdings, outputRequired, aggregators, commonCurrencyID = CurrencyID.USDC) {
+    return autoSelectSourcesV2ByRecipient(holdings.map((holding) => ({ ...holding, recipient: userAddress })), outputRequired, aggregators, commonCurrencyID);
+}
+/**
+ * @deprecated Use {@link autoSelectSources} (object args; per-holding `takerAddress` and
+ * `receiverAddress` on each `HoldingWithSwapAddresses`).
+ */
+export async function autoSelectSourcesV2ByRecipient(holdings, outputRequired, aggregators, commonCurrencyID = CurrencyID.USDC) {
     // Assumption: Holding is already sorted in usage priority
     console.debug("XCS | SSV2:", {
         holdings,
@@ -132,7 +143,10 @@ export async function autoSelectSourcesV2(userAddress, holdings, outputRequired,
         else {
             fullLiquidationQuotes.push({
                 req: {
-                    userAddress,
+                    userAddress: holding.recipient,
+                    // New wrappers thread per-holding receiver via this field. Falls back to taker
+                    // (`recipient`) when absent — preserves legacy positional-call behavior.
+                    receiverAddress: holding.receiverAddress,
                     type: QuoteType.EXACT_IN,
                     chain: chain.ChainID,
                     inputToken: holding.tokenAddress,
@@ -316,7 +330,11 @@ export async function autoSelectSourcesV2(userAddress, holdings, outputRequired,
     console.log("final_quotes", { quotes: final, cots: usedCOTs });
     return { quoteResponses: final, usedCOTs };
 }
-export async function determineDestinationSwaps(userAddress, requirement, aggregators, commonCurrencyID = CurrencyID.USDC) {
+/**
+ * @deprecated Use {@link getDestinationExactOutSwap} (object args; explicit `takerAddress` and
+ * `receiverAddress`, both required).
+ */
+export async function determineDestinationSwaps(userAddress, requirement, aggregators, commonCurrencyID = CurrencyID.USDC, receiverAddress) {
     const chaindata = ChaindataMap.get(requirement.chainID);
     if (chaindata == null) {
         throw new AutoSelectionError("Chain not found");
@@ -331,6 +349,7 @@ export async function determineDestinationSwaps(userAddress, requirement, aggreg
         type: QuoteType.EXACT_IN,
         chain: requirement.chainID,
         userAddress,
+        receiverAddress,
         inputToken: requirement.tokenAddress,
         outputToken: COT.tokenAddress,
         inputAmount: requirement.amountRaw,
@@ -354,6 +373,7 @@ export async function determineDestinationSwaps(userAddress, requirement, aggreg
             {
                 type: QuoteType.EXACT_IN,
                 userAddress,
+                receiverAddress,
                 chain: requirement.chainID,
                 inputToken: COT.tokenAddress,
                 outputToken: requirement.tokenAddress,
@@ -385,7 +405,18 @@ export async function determineDestinationSwaps(userAddress, requirement, aggreg
         }
     }
 }
-export async function liquidateInputHoldings(userAddress, holdings, aggregators, commonCurrencyID = CurrencyID.USDC) {
+/**
+ * @deprecated Use {@link liquidateSourceHoldings} (object args; per-holding `takerAddress`
+ * and `receiverAddress` on each `HoldingWithSwapAddresses`).
+ */
+export async function liquidateInputHoldings(userAddress, holdings, aggregators, commonCurrencyID = CurrencyID.USDC, receiverAddress) {
+    return liquidateInputHoldingsByRecipient(holdings.map((holding) => ({ ...holding, recipient: userAddress })), aggregators, commonCurrencyID, receiverAddress);
+}
+/**
+ * @deprecated Use {@link liquidateSourceHoldings} (object args; per-holding `takerAddress`
+ * and `receiverAddress` on each `HoldingWithSwapAddresses`).
+ */
+export async function liquidateInputHoldingsByRecipient(holdings, aggregators, commonCurrencyID = CurrencyID.USDC, receiverAddress) {
     console.debug("XCS | LIH | Holdings:", holdings);
     const groupedByChainID = groupBy(holdings, (h) => bytesToHex(h.chainID.toBytes()));
     const fullLiquidationQuotes = [];
@@ -409,7 +440,10 @@ export async function liquidateInputHoldings(userAddress, holdings, aggregators,
             }
             fullLiquidationQuotes.push({
                 req: {
-                    userAddress,
+                    userAddress: holding.recipient,
+                    // Per-holding receiver wins (set by the new wrappers); shared param is the legacy
+                    // positional-call fallback.
+                    receiverAddress: holding.receiverAddress ?? receiverAddress,
                     type: QuoteType.EXACT_IN,
                     chain: chain.ChainID,
                     inputToken: holding.tokenAddress,
@@ -438,7 +472,11 @@ export async function liquidateInputHoldings(userAddress, holdings, aggregators,
     }
     return quotes;
 }
-export async function destinationSwapWithExactIn(userAddress, omniChainID, inputAmount, outputToken, aggregators, inputCurrency = CurrencyID.USDC) {
+/**
+ * @deprecated Use {@link getDestinationExactInSwap} (object args; explicit `takerAddress`
+ * and `receiverAddress`, both required).
+ */
+export async function destinationSwapWithExactIn(userAddress, omniChainID, inputAmount, outputToken, aggregators, inputCurrency = CurrencyID.USDC, receiverAddress) {
     const chaindata = ChaindataMap.get(omniChainID);
     if (chaindata == null) {
         throw new AutoSelectionError("Chain not found");
@@ -452,6 +490,7 @@ export async function destinationSwapWithExactIn(userAddress, omniChainID, input
             type: QuoteType.EXACT_IN,
             chain: omniChainID,
             userAddress,
+            receiverAddress,
             inputToken: COT.tokenAddress,
             outputToken: outputToken,
             inputAmount: inputAmount,
@@ -476,3 +515,40 @@ export async function destinationSwapWithExactIn(userAddress, omniChainID, input
         },
     };
 }
+// =====================================================================================
+// Object-arg wrappers around the legacy positional functions above.
+//
+// Aggregator vocabulary:
+//   takerAddress    — on-chain executor of the swap (drives aggregator simulation /
+//                     permit / approval routing). On 7702 chains this is the ephemeral; on
+//                     non-Pectra chains it's the deployed Safe. Maps to the underlying
+//                     QuoteRequest's `userAddress`.
+//   receiverAddress — recipient of the swap output. Maps to the underlying QuoteRequest's
+//                     `receiverAddress`. Required on all 4 wrappers — the GS013-class bug we
+//                     fixed came from forgetting this and silently defaulting to the wrong
+//                     address. Even on source side (where it equals the taker today), require
+//                     it explicitly so the type system forces every call site to acknowledge
+//                     both roles.
+//
+// Wrap-only: each wrapper delegates to the deprecated positional fn. No business logic added.
+// =====================================================================================
+export async function getDestinationExactOutSwap(args) {
+    return determineDestinationSwaps(args.takerAddress, args.requirement, args.aggregators, args.commonCurrencyID, args.receiverAddress);
+}
+export async function getDestinationExactInSwap(args) {
+    return destinationSwapWithExactIn(args.takerAddress, args.chain, args.inputAmount, args.outputToken, args.aggregators, args.inputCurrency, args.receiverAddress);
+}
+export async function liquidateSourceHoldings(args) {
+    return liquidateInputHoldingsByRecipient(args.holdings.map((h) => ({
+        ...h,
+        recipient: h.takerAddress,
+        receiverAddress: h.receiverAddress,
+    })), args.aggregators, args.commonCurrencyID);
+}
+export async function autoSelectSources(args) {
+    return autoSelectSourcesV2ByRecipient(args.holdings.map((h) => ({
+        ...h,
+        recipient: h.takerAddress,
+        receiverAddress: h.receiverAddress,
+    })), args.outputRequired, args.aggregators, args.commonCurrencyID);
+}

package/dist/esm/xcs/bebop-agg.js

@@ -10,17 +10,11 @@ const ChainNameMapping = new Map(Object.entries({
     arbitrum: 42161,
     optimism: 10,
     base: 8453,
-    taiko: 167000,
     bsc: 56,
-    monadtestnet: 10143,
-    megaethtestnet: 6342,
-    berachain: 80094,
+    avalanche: 43114,
     polygon: 137,
-    zksync: 324,
-    blast: 81457,
-    mode: 34443,
     scroll: 534352,
-    superseed: 5330,
+    hyperevm: 999,
 }).map(([k, v]) => [bytesToHex(encodeChainID36(Universe.ETHEREUM, v)), k]));
 export class BebopAggregator {
     static BASE_URL = "https://api.bebop.xyz/router";
@@ -52,6 +46,9 @@ export class BebopAggregator {
             const inputTokenAddr = getAddress(bytesToHex(r.inputToken.subarray(12)));
             const outputTokenAddr = getAddress(bytesToHex(r.outputToken.subarray(12)));
             const userAddrHex = getAddress(bytesToHex(r.userAddress.subarray(12)));
+            const receiverAddrHex = r.receiverAddress != null
+                ? getAddress(bytesToHex(r.receiverAddress.subarray(12)))
+                : userAddrHex;
             switch (r.type) {
                 case QuoteType.EXACT_IN: {
                     respPromise = this.axios({
@@ -61,6 +58,7 @@ export class BebopAggregator {
                             sell_tokens: inputTokenAddr,
                             buy_tokens: outputTokenAddr,
                             taker_address: userAddrHex,
+                            receiver_address: receiverAddrHex,
                             sell_amounts: r.inputAmount.toString(),
                             ...BebopAggregator.COMMON_OPTIONS,
                         },
@@ -75,6 +73,7 @@ export class BebopAggregator {
                             sell_tokens: inputTokenAddr,
                             buy_tokens: outputTokenAddr,
                             taker_address: userAddrHex,
+                            receiver_address: receiverAddrHex,
                             buy_amounts: r.outputAmount.toString(),
                             ...BebopAggregator.COMMON_OPTIONS,
                         },

package/dist/esm/xcs/fibrous-agg.js

@@ -6,7 +6,7 @@ import { FibrousRouterABI } from "../evmabi";
 import { Universe } from "../proto/definition";
 import { QuoteType, } from "./iface";
 const ChainNameMapping = new ChainIDKeyedMap([
-    [new OmniversalChainID(Universe.ETHEREUM, 8453), "base"],
+    // [new OmniversalChainID(Universe.ETHEREUM, 8453), "base"], // Disabled because of few liquidity issues
     [new OmniversalChainID(Universe.ETHEREUM, 999), "hyperevm"],
     [new OmniversalChainID(Universe.ETHEREUM, 143), "monad"],
     [new OmniversalChainID(Universe.ETHEREUM, 4114), "citrea"],
@@ -15,9 +15,11 @@ export class FibrousAggregator {
     static BASE_URL = "https://api.fibrous.finance";
     axios;
     slippage;
+    excludeProtocols;
     constructor(options = {}) {
-        const { apiKey, slippage = 0.5 } = options;
+        const { apiKey, slippage = 0.5, excludeProtocols = "3" } = options;
         this.slippage = slippage;
+        this.excludeProtocols = excludeProtocols;
         this.axios = axios.create({
             baseURL: FibrousAggregator.BASE_URL,
             headers: apiKey != null ? { "X-API-Key": apiKey } : undefined,
@@ -39,6 +41,9 @@ export class FibrousAggregator {
             const inputTokenAddr = getAddress(bytesToHex(r.inputToken.subarray(12)));
             const outputTokenAddr = getAddress(bytesToHex(r.outputToken.subarray(12)));
             const userAddrHex = getAddress(bytesToHex(r.userAddress.subarray(12)));
+            const receiverAddrHex = r.receiverAddress != null
+                ? getAddress(bytesToHex(r.receiverAddress.subarray(12)))
+                : userAddrHex;
             let resp;
             try {
                 resp = await this.axios({
@@ -49,7 +54,8 @@ export class FibrousAggregator {
                         tokenInAddress: inputTokenAddr,
                         tokenOutAddress: outputTokenAddr,
                         slippage: this.slippage,
-                        destination: userAddrHex,
+                        destination: receiverAddrHex,
+                        excludeProtocols: this.excludeProtocols,
                     },
                 });
             }

package/dist/esm/xcs/lifi-agg.js

@@ -3,6 +3,20 @@ import { bytesToHex, getAddress } from "viem";
 import { QuoteType, } from "./iface";
 import { Universe } from "../proto/definition";
 import Decimal from "decimal.js";
+const ALLOWED_CHAINS = new Set([
+    1, // Ethereum
+    10, // Optimism
+    56, // BSC
+    137, // Polygon
+    143, // Monad
+    999, // HyperEVM
+    4326, // MegaETH
+    8453, // Base
+    42161, // Arbitrum
+    43114, // Avalanche
+    8217, // Kaia
+    534352, // Scroll
+]);
 export class LiFiAggregator {
     static BASE_URL_V1 = "https://li.quest/v1";
     static COMMON_OPTIONS = {
@@ -25,11 +39,17 @@ export class LiFiAggregator {
             if (r.chain.universe !== Universe.ETHEREUM) {
                 return null;
             }
+            if (!ALLOWED_CHAINS.has(Number(r.chain.chainID))) {
+                return null;
+            }
             let respPromise;
             const chIDStr = r.chain.chainID.toString();
             const inputTokenAddr = getAddress(bytesToHex(r.inputToken.subarray(12)));
             const outputTokenAddr = getAddress(bytesToHex(r.outputToken.subarray(12)));
             const userAddrHex = getAddress(bytesToHex(r.userAddress.subarray(12)));
+            const receiverAddrHex = r.receiverAddress != null
+                ? getAddress(bytesToHex(r.receiverAddress.subarray(12)))
+                : userAddrHex;
             switch (r.type) {
                 case QuoteType.EXACT_IN: {
                     respPromise = this.axios({
@@ -41,6 +61,7 @@ export class LiFiAggregator {
                             fromToken: inputTokenAddr,
                             toToken: outputTokenAddr,
                             fromAddress: userAddrHex,
+                            toAddress: receiverAddrHex,
                             fromAmount: r.inputAmount.toString(),
                             ...LiFiAggregator.COMMON_OPTIONS,
                         },
@@ -57,6 +78,7 @@ export class LiFiAggregator {
                             fromToken: inputTokenAddr,
                             toToken: outputTokenAddr,
                             fromAddress: userAddrHex,
+                            toAddress: receiverAddrHex,
                             toAmount: r.outputAmount.toString(),
                             ...LiFiAggregator.COMMON_OPTIONS,
                         },

package/dist/types/xcs/autochoice.d.ts

@@ -3,6 +3,14 @@ import { Aggregator, Quote, QuoteRequestExactInput, QuoteRequestExactOutput, Quo
 import { Currency, CurrencyID, OmniversalChainID } from "../data";
 import { Bytes } from "../types";
 import { Holding } from "./iface";
+export type HoldingWithRecipient = Holding & {
+    recipient: Bytes;
+    receiverAddress?: Bytes;
+};
+export type HoldingWithSwapAddresses = Holding & {
+    takerAddress: Bytes;
+    receiverAddress: Bytes;
+};
 export declare class AutoSelectionError extends Error {
 }
 declare const enum AggregateAggregatorsMode {
@@ -13,6 +21,10 @@ export declare function aggregateAggregators(requests: (QuoteRequestExactInput |
     quote: Quote | null;
     aggregator: Aggregator;
 }[]>;
+/**
+ * @deprecated Use {@link autoSelectSources} (object args; per-holding `takerAddress` and
+ * `receiverAddress` on each `HoldingWithSwapAddresses`).
+ */
 export declare function autoSelectSourcesV2(userAddress: Bytes, holdings: Holding[], outputRequired: Decimal, aggregators: Aggregator[], commonCurrencyID?: CurrencyID): Promise<{
     quoteResponses: QuoteResponse[];
     usedCOTs: {
@@ -22,7 +34,72 @@ export declare function autoSelectSourcesV2(userAddress: Bytes, holdings: Holdin
         cur: Currency;
     }[];
 }>;
-export declare function determineDestinationSwaps(userAddress: Bytes, requirement: Holding, aggregators: Aggregator[], commonCurrencyID?: CurrencyID): Promise<QuoteResponse>;
-export declare function liquidateInputHoldings(userAddress: Bytes, holdings: Holding[], aggregators: Aggregator[], commonCurrencyID?: CurrencyID): Promise<QuoteResponse[]>;
-export declare function destinationSwapWithExactIn(userAddress: Bytes, omniChainID: OmniversalChainID, inputAmount: bigint, outputToken: Bytes, aggregators: Aggregator[], inputCurrency?: CurrencyID): Promise<QuoteResponse>;
+/**
+ * @deprecated Use {@link autoSelectSources} (object args; per-holding `takerAddress` and
+ * `receiverAddress` on each `HoldingWithSwapAddresses`).
+ */
+export declare function autoSelectSourcesV2ByRecipient(holdings: HoldingWithRecipient[], outputRequired: Decimal, aggregators: Aggregator[], commonCurrencyID?: CurrencyID): Promise<{
+    quoteResponses: QuoteResponse[];
+    usedCOTs: {
+        originalHolding: Holding;
+        amountUsed: Decimal;
+        idx: number;
+        cur: Currency;
+    }[];
+}>;
+/**
+ * @deprecated Use {@link getDestinationExactOutSwap} (object args; explicit `takerAddress` and
+ * `receiverAddress`, both required).
+ */
+export declare function determineDestinationSwaps(userAddress: Bytes, requirement: Holding, aggregators: Aggregator[], commonCurrencyID?: CurrencyID, receiverAddress?: Bytes): Promise<QuoteResponse>;
+/**
+ * @deprecated Use {@link liquidateSourceHoldings} (object args; per-holding `takerAddress`
+ * and `receiverAddress` on each `HoldingWithSwapAddresses`).
+ */
+export declare function liquidateInputHoldings(userAddress: Bytes, holdings: Holding[], aggregators: Aggregator[], commonCurrencyID?: CurrencyID, receiverAddress?: Bytes): Promise<QuoteResponse[]>;
+/**
+ * @deprecated Use {@link liquidateSourceHoldings} (object args; per-holding `takerAddress`
+ * and `receiverAddress` on each `HoldingWithSwapAddresses`).
+ */
+export declare function liquidateInputHoldingsByRecipient(holdings: HoldingWithRecipient[], aggregators: Aggregator[], commonCurrencyID?: CurrencyID, receiverAddress?: Bytes): Promise<QuoteResponse[]>;
+/**
+ * @deprecated Use {@link getDestinationExactInSwap} (object args; explicit `takerAddress`
+ * and `receiverAddress`, both required).
+ */
+export declare function destinationSwapWithExactIn(userAddress: Bytes, omniChainID: OmniversalChainID, inputAmount: bigint, outputToken: Bytes, aggregators: Aggregator[], inputCurrency?: CurrencyID, receiverAddress?: Bytes): Promise<QuoteResponse>;
+export declare function getDestinationExactOutSwap(args: {
+    takerAddress: Bytes;
+    receiverAddress: Bytes;
+    requirement: Holding;
+    aggregators: Aggregator[];
+    commonCurrencyID?: CurrencyID;
+}): Promise<QuoteResponse>;
+export declare function getDestinationExactInSwap(args: {
+    takerAddress: Bytes;
+    receiverAddress: Bytes;
+    chain: OmniversalChainID;
+    inputAmount: bigint;
+    outputToken: Bytes;
+    aggregators: Aggregator[];
+    inputCurrency?: CurrencyID;
+}): Promise<QuoteResponse>;
+export declare function liquidateSourceHoldings(args: {
+    holdings: HoldingWithSwapAddresses[];
+    aggregators: Aggregator[];
+    commonCurrencyID?: CurrencyID;
+}): Promise<QuoteResponse[]>;
+export declare function autoSelectSources(args: {
+    holdings: HoldingWithSwapAddresses[];
+    outputRequired: Decimal;
+    aggregators: Aggregator[];
+    commonCurrencyID?: CurrencyID;
+}): Promise<{
+    quoteResponses: QuoteResponse[];
+    usedCOTs: {
+        originalHolding: Holding;
+        amountUsed: Decimal;
+        idx: number;
+        cur: Currency;
+    }[];
+}>;
 export {};

package/dist/types/xcs/fibrous-agg.d.ts

@@ -44,11 +44,13 @@ export type FibrousQuote = Quote & {
 export type FibrousAggregatorOptions = {
     apiKey?: string;
     slippage?: number;
+    excludeProtocols?: string;
 };
 export declare class FibrousAggregator implements Aggregator {
     private static readonly BASE_URL;
     private readonly axios;
     private readonly slippage;
+    private readonly excludeProtocols;
     constructor(options?: FibrousAggregatorOptions);
     getQuotes(requests: (QuoteRequestExactInput | QuoteRequestExactOutput)[]): Promise<(Quote | null)[]>;
 }

package/dist/types/xcs/iface.d.ts

@@ -49,6 +49,7 @@ export interface Quote {
 }
 type CommonQuoteParameters = {
     userAddress: Bytes;
+    receiverAddress?: Bytes;
     chain: OmniversalChainID;
     inputToken: Bytes;
     outputToken: Bytes;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@avail-project/ca-common",
-  "version": "2.1.0",
+  "version": "2.2.1",
   "description": "common utilities for CA",
   "files": [
     "dist"