@avail-project/ca-common 1.0.1-beta1 → 2.0.0

package/dist/cjs/data/chaindata.js

@@ -604,10 +604,10 @@ const RawData = [
         Currencies: [
             {
                 CurrencyID: 1,
-                TokenContractAddress: "0x000000000000000000000000590cb8868c6DeBc12CCd42E837042659cfB91504",
+                TokenContractAddress: "0x000000000000000000000000FAfDdbb3FC7688494971a79cc65DCa3EF82079E7",
                 PermitVariant: permitutils_1.PermitVariant.EIP2612Canonical,
-                PermitContractVersion: 2,
-                TokenDecimals: 6,
+                PermitContractVersion: 1,
+                TokenDecimals: 18,
                 IsGasToken: false,
             },
             {
@@ -617,6 +617,14 @@ const RawData = [
                 TokenDecimals: 18,
                 IsGasToken: true,
             },
+            {
+                CurrencyID: 2,
+                TokenContractAddress: "0x000000000000000000000000B8CE59FC3717ada4C02eaDF9682A9e934F625ebb",
+                PermitVariant: permitutils_1.PermitVariant.EIP2612Canonical,
+                PermitContractVersion: 1,
+                TokenDecimals: 6,
+                IsGasToken: false,
+            },
         ],
     },
     //citrea mainnet
@@ -641,7 +649,7 @@ const RawData = [
                 IsGasToken: false,
             },
             {
-                CurrencyID: 3,
+                CurrencyID: 21,
                 TokenContractAddress: "0x0000000000000000000000000000000000000000000000000000000000000000",
                 PermitVariant: permitutils_1.PermitVariant.Unsupported,
                 TokenDecimals: 18,
@@ -756,10 +764,7 @@ exports.RPCURLMap = new chainid_1.ChainIDKeyedMap([
         new chainid_1.OmniversalChainID(definition_1.Universe.ETHEREUM, 50104),
         "https://sophon.gateway.tenderly.co/1d4STFT7zmG0vM5QowibCw",
     ],
-    [
-        new chainid_1.OmniversalChainID(definition_1.Universe.ETHEREUM, 56),
-        "https://rpcs.avail.so/bsc",
-    ],
+    [new chainid_1.OmniversalChainID(definition_1.Universe.ETHEREUM, 56), "https://rpcs.avail.so/bsc"],
     [
         new chainid_1.OmniversalChainID(definition_1.Universe.ETHEREUM, 10143),
         "https://rpcs.avail.so/monadtestnet",

package/dist/cjs/data/currency.js

@@ -18,6 +18,7 @@ var CurrencyID;
     CurrencyID[CurrencyID["SOPH"] = 18] = "SOPH";
     CurrencyID[CurrencyID["TRX"] = 19] = "TRX";
     CurrencyID[CurrencyID["MON"] = 20] = "MON";
+    CurrencyID[CurrencyID["CBTC"] = 21] = "CBTC";
 })(CurrencyID || (exports.CurrencyID = CurrencyID = {}));
 class Currency {
     currencyID;

package/dist/cjs/vaultcontracts/vaultcontracts.js

@@ -69,6 +69,10 @@ const dataSets = new Map([
                 new data_1.OmniversalChainID(definition_1.Universe.ETHEREUM, 4326),
                 "0x10B69f0E3c21C1187526940A615959E9ee6012F9",
             ],
+            [
+                new data_1.OmniversalChainID(definition_1.Universe.ETHEREUM, 4114),
+                "0x10B69f0E3c21C1187526940A615959E9ee6012F9",
+            ],
             [
                 new data_1.OmniversalChainID(definition_1.Universe.ETHEREUM, 534352),
                 "0x111111eA4f8BdfB5AE22c37ebC3eE17b82072F57",
@@ -81,6 +85,22 @@ const dataSets = new Map([
                 new data_1.OmniversalChainID(definition_1.Universe.TRON, 728126428),
                 "0x46de8c7e6f1da4dd851b62c20b78971f230fca5b",
             ],
+            [
+                new data_1.OmniversalChainID(definition_1.Universe.ETHEREUM, 1),
+                "0xAc73E77b4FE9BBAAA35C7147DC3Fd5286929A746",
+            ],
+            [
+                new data_1.OmniversalChainID(definition_1.Universe.ETHEREUM, 143),
+                "0xAc73E77b4FE9BBAAA35C7147DC3Fd5286929A746",
+            ],
+            [
+                new data_1.OmniversalChainID(definition_1.Universe.ETHEREUM, 999),
+                "0xAc73E77b4FE9BBAAA35C7147DC3Fd5286929A746",
+            ],
+            [
+                new data_1.OmniversalChainID(definition_1.Universe.ETHEREUM, 43114),
+                "0xAc73E77b4FE9BBAAA35C7147DC3Fd5286929A746",
+            ],
         ],
     ],
     [
@@ -134,6 +154,14 @@ const dataSets = new Map([
                 new data_1.OmniversalChainID(definition_1.Universe.ETHEREUM, 143),
                 "0xC0DED5d7F424276c821AF21F68E1e663bC671C3D",
             ],
+            [
+                new data_1.OmniversalChainID(definition_1.Universe.ETHEREUM, 4114),
+                "0xAc73E77b4FE9BBAAA35C7147DC3Fd5286929A746",
+            ],
+            [
+                new data_1.OmniversalChainID(definition_1.Universe.ETHEREUM, 4326),
+                "0x5f02ED27A20BbDbB90EEf98670fA36c36fc02D12",
+            ],
         ],
     ],
     [

package/dist/cjs/xcs/autochoice.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AutoSelectionError = void 0;
 exports.aggregateAggregators = aggregateAggregators;
 exports.autoSelectSourcesV2 = autoSelectSourcesV2;
-exports.autoSelectSources = autoSelectSources;
 exports.determineDestinationSwaps = determineDestinationSwaps;
 exports.liquidateInputHoldings = liquidateInputHoldings;
 exports.destinationSwapWithExactIn = destinationSwapWithExactIn;
@@ -36,7 +35,7 @@ async function aggregateAggregators(requests, aggregators, mode) {
     switch (mode) {
         case 0 /* AggregateAggregatorsMode.MaximizeOutput */: {
             for (let i = 0; i < requests.length; i++) {
-                const best = (0, data_1.maxByBigInt)(responses.map((ra) => ({ quote: ra.quotes[i], aggregator: ra.agg })), (r) => r.quote?.outputAmountMinimum ?? 0n);
+                const best = (0, data_1.maxByBigInt)(responses.map((ra) => ({ quote: ra.quotes[i], aggregator: ra.agg })), (r) => r.quote?.output.amountRaw ?? 0n);
                 if (best != null) {
                     final[i] = best;
                 }
@@ -51,7 +50,9 @@ async function aggregateAggregators(requests, aggregators, mode) {
         }
         case 1 /* AggregateAggregatorsMode.MinimizeInput */: {
             for (let i = 0; i < requests.length; i++) {
-                const best = (0, data_1.minByBigInt)(responses.map((ra) => ({ quote: ra.quotes[i], aggregator: ra.agg })), (r) => r.quote?.inputAmount ?? 0n);
+                const best = (0, data_1.minByBigInt)(responses.map((ra) => ({ quote: ra.quotes[i], aggregator: ra.agg })), 
+                // Default null quotes to MAX so they never win as the minimum
+                (r) => r.quote?.input.amountRaw ?? BigInt(Number.MAX_SAFE_INTEGER));
                 if (best != null) {
                     final[i] = best;
                 }
@@ -109,7 +110,7 @@ cots = [(1 COT, 1), (1 COT, 4)]
 */
 async function autoSelectSourcesV2(userAddress, holdings, outputRequired, aggregators, commonCurrencyID = data_1.CurrencyID.USDC) {
     // Assumption: Holding is already sorted in usage priority
-    console.log("XCS | SSV2:", {
+    console.debug("XCS | SSV2:", {
         holdings,
         outputRequired: outputRequired.toFixed(),
     });
@@ -122,14 +123,14 @@ async function autoSelectSourcesV2(userAddress, holdings, outputRequired, aggreg
         }
         const correspondingCurrency = chain.Currencies.find((cur) => cur.currencyID === commonCurrencyID);
         if (correspondingCurrency == null) {
-            console.log("XCS | SS | Skipping because correspondingCurrency is null", {
+            console.debug("XCS | SS | Skipping because correspondingCurrency is null", {
                 chain,
                 correspondingCurrency,
             });
             continue;
         }
         if (Buffer.compare(holding.tokenAddress, correspondingCurrency.tokenAddress) === 0) {
-            const normalizedAmount = new decimal_js_1.default(holding.amount).div(decimal_js_1.default.pow(10, correspondingCurrency.decimals));
+            const normalizedAmount = new decimal_js_1.default(holding.amountRaw).div(decimal_js_1.default.pow(10, correspondingCurrency.decimals));
             cotList.push({
                 amount: normalizedAmount,
                 idx,
@@ -145,7 +146,7 @@ async function autoSelectSourcesV2(userAddress, holdings, outputRequired, aggreg
                     type: iface_1.QuoteType.EXACT_IN,
                     chain: chain.ChainID,
                     inputToken: holding.tokenAddress,
-                    inputAmount: holding.amount,
+                    inputAmount: holding.amountRaw,
                     outputToken: correspondingCurrency.tokenAddress,
                     seriousness: iface_1.QuoteSeriousness.PRICE_SURVEY,
                 },
@@ -183,10 +184,10 @@ async function autoSelectSourcesV2(userAddress, holdings, outputRequired, aggreg
                     if (remainder.lte(0))
                         break;
                 }
-                console.log("XCS | SS | Early return with continuous COTs:", {
+                console.debug("XCS | SS | Early return with continuous COTs:", {
                     cots: usedCOTs,
                 });
-                return { quotes: [], usedCOTs };
+                return { quoteResponses: [], usedCOTs };
             }
         }
     }
@@ -211,7 +212,7 @@ async function autoSelectSourcesV2(userAddress, holdings, outputRequired, aggreg
     // Sort by original index to maintain priority
     processingQueue.sort((a, b) => a.idx - b.idx);
     const responses = await aggregateAggregators(fullLiquidationQuotes.map((fq) => fq.req), aggregators, 0 /* AggregateAggregatorsMode.MaximizeOutput */);
-    console.log("XCS | SS | Responses:", responses);
+    console.debug("AutoSelectSources:Quotes", responses);
     const final = [];
     const usedCOTs = [];
     let remainder = outputRequired;
@@ -230,7 +231,7 @@ async function autoSelectSourcesV2(userAddress, holdings, outputRequired, aggreg
                 cur: cotData.currency,
             });
             remainder = remainder.minus(amountToUse);
-            console.log("XCS | SS | Used COT", {
+            console.debug("selection:cot", {
                 idx: cotData.idx,
                 amountToUse: amountToUse.toFixed(),
                 remainder: remainder.toFixed(),
@@ -239,30 +240,32 @@ async function autoSelectSourcesV2(userAddress, holdings, outputRequired, aggreg
         else {
             // Process non-COT holding - use existing quote logic
             const { quoteData, responseIdx } = item;
-            const { quote: resp, aggregator: agg } = responses[responseIdx];
+            const { quote: resp, aggregator } = responses[responseIdx];
             if (resp == null) {
                 continue;
             }
-            console.log("XCS | SS | 1", {
-                i: responseIdx,
-                idx: quoteData.idx,
-                remainder,
-                q: quoteData,
-                resp,
-                agg,
+            console.debug("selection:quote", {
+                remainder: remainder.toFixed(),
+                input: resp.input,
+                output: resp.output,
             });
             const divisor = decimal_js_1.default.pow(10, quoteData.cur.decimals);
-            const oamD = decimal_js_1.default.div(resp.outputAmountMinimum, divisor);
+            const oamD = new decimal_js_1.default(resp.output.amount);
             if (oamD.gt(remainder)) {
-                const indicativePrice = decimal_js_1.default.div(resp.inputAmount, resp.outputAmountMinimum);
-                const userBal = new decimal_js_1.default(quoteData.originalHolding.amount);
+                const indicativePrice = decimal_js_1.default.div(resp.input.amountRaw, resp.output.amountRaw);
+                const userBal = new decimal_js_1.default(quoteData.originalHolding.amountRaw);
                 // remainder is the output we want, so the input amount is remainder × indicativePrice
                 let expectedInput = decimal_js_1.default.min(remainder.mul(divisor).mul(indicativePrice).mul(safetyMultiplier), userBal);
+                let attempts = 0;
                 while (true) {
-                    console.log("XCS | SS | 2⒜", {
-                        indicativePrice,
-                        expectedInput,
-                        userBal,
+                    if (++attempts > 10) {
+                        throw new AutoSelectionError("Partial quote did not converge");
+                    }
+                    console.debug("partial_quote_loop", {
+                        indicativePrice: indicativePrice.toFixed(),
+                        expectedInput: expectedInput.toFixed(),
+                        userBal: userBal.toFixed(),
+                        remainder: remainder.toFixed(),
                     });
                     const adequateQuoteResult = await aggregateAggregators([
                         {
@@ -272,21 +275,23 @@ async function autoSelectSourcesV2(userAddress, holdings, outputRequired, aggreg
                         },
                     ], aggregators, 0 /* AggregateAggregatorsMode.MaximizeOutput */);
                     if (adequateQuoteResult.length !== 1) {
-                        throw new AutoSelectionError("???");
+                        throw new AutoSelectionError("Unexpected response length from aggregateAggregators");
                     }
                     const adequateQuote = adequateQuoteResult[0];
                     if (adequateQuote.quote == null) {
                         throw new AutoSelectionError("Couldn't get buy quote");
                     }
-                    console.log("XCS | SS | 2⒜⑴", {
-                        adequateQuote,
+                    const quote = adequateQuote.quote;
+                    console.log("partial_quote", {
+                        quote,
                     });
-                    const oam2D = decimal_js_1.default.div(adequateQuote.quote.outputAmountMinimum, divisor);
+                    const oam2D = new decimal_js_1.default(adequateQuote.quote.output.amount);
                     if (oam2D.gte(remainder)) {
                         final.push({
-                            ...quoteData,
-                            quote: adequateQuote.quote,
-                            agg: adequateQuote.aggregator,
+                            quote,
+                            aggregator: adequateQuote.aggregator,
+                            holding: quoteData.originalHolding,
+                            chainID: Number(quoteData.req.chain.chainID),
                         });
                         remainder = remainder.minus(oam2D);
                         break;
@@ -300,168 +305,29 @@ async function autoSelectSourcesV2(userAddress, holdings, outputRequired, aggreg
                 }
             }
             else {
-                console.log("XCS | SS | 2⒝", resp);
+                console.debug("full_quote", resp);
                 final.push({
-                    ...quoteData,
                     quote: resp,
-                    agg,
-                });
-                remainder = remainder.minus((0, data_1.convertBigIntToDecimal)(resp.outputAmountMinimum).div(divisor));
-            }
-        }
-    }
-    console.log("XCS | SS | 3⒜", {
-        remainder,
-        final,
-    });
-    if (remainder.gt(0)) {
-        throw new AutoSelectionError("Failed to accumulate enough swaps to meet requirement");
-    }
-    console.log("XCS | SS | Final:", { quotes: final, cots: usedCOTs });
-    return { quotes: final, usedCOTs };
-}
-async function autoSelectSources(userAddress, holdings, outputRequired, aggregators, collectionFees, commonCurrencyID = data_1.CurrencyID.USDC) {
-    console.log("XCS | SS | Holdings:", holdings);
-    const groupedByChainID = (0, es_toolkit_1.groupBy)(holdings, (h) => (0, viem_1.bytesToHex)(h.chainID.toBytes()));
-    const fullLiquidationQuotes = [];
-    for (const holdings of Object.values(groupedByChainID)) {
-        const chain = data_1.ChaindataMap.get(holdings[0].chainID);
-        if (chain == null) {
-            throw new AutoSelectionError("Chain not found");
-        }
-        const correspondingCurrency = chain.Currencies.find((cur) => cur.currencyID === commonCurrencyID);
-        if (correspondingCurrency == null) {
-            console.log("XCS | SS | Skipping because correspondingCurrency is null", {
-                chain,
-                correspondingCurrency,
-            });
-            continue;
-        }
-        const cfeeTuple = collectionFees.find((cf) => {
-            return (cf.universe === chain.Universe &&
-                Buffer.compare(cf.chainID, chain.ChainID32) === 0 &&
-                // output token is the CA one
-                Buffer.compare(cf.tokenAddress, correspondingCurrency.tokenAddress) ===
-                    0);
-        });
-        const cfee = cfeeTuple != null ? (0, viem_1.bytesToBigInt)(cfeeTuple.fee) : 0n;
-        for (const holding of holdings) {
-            if (Buffer.compare(holding.tokenAddress, correspondingCurrency.tokenAddress) === 0) {
-                console.log("XCS | SS | Disqualifying", holding, "because holding.tokenAddress = CA asset");
-                continue;
-            }
-            fullLiquidationQuotes.push({
-                req: {
-                    userAddress,
-                    type: iface_1.QuoteType.EXACT_IN,
-                    chain: chain.ChainID,
-                    inputToken: holding.tokenAddress,
-                    inputAmount: holding.amount,
-                    outputToken: correspondingCurrency.tokenAddress,
-                    seriousness: iface_1.QuoteSeriousness.PRICE_SURVEY,
-                },
-                // necessary for various purposes
-                cfee,
-                originalHolding: holding,
-                cur: correspondingCurrency,
-            });
-        }
-    }
-    // const groupedByChainID = groupBy(quoteOutputs, h => h.chainIDHex)
-    const quotesByValue = (0, es_toolkit_1.orderBy)(fullLiquidationQuotes, [
-        (quoteOut) => quoteOut.cfee,
-        (quoteOut) => quoteOut.originalHolding.value, // once optimized for collections, we select the biggest asset we hold
-    ], ["asc", "desc"]);
-    const responses = await aggregateAggregators(quotesByValue.map((fq) => fq.req), aggregators, 0 /* AggregateAggregatorsMode.MaximizeOutput */);
-    console.log("XCS | SS | Responses:", responses);
-    const final = [];
-    let remainder = outputRequired; // assuming all that chains have the same amount of fixed point places
-    for (let i = 0; i < quotesByValue.length; i++) {
-        if (remainder.lte(0)) {
-            break;
-        }
-        const q = quotesByValue[i];
-        const { quote: resp, aggregator: agg } = responses[i];
-        if (resp == null) {
-            continue;
-        }
-        console.log("XCS | SS | 1", {
-            i,
-            remainder,
-            q,
-            resp,
-            agg,
-        });
-        const divisor = decimal_js_1.default.pow(10, q.cur.decimals);
-        const oamD = (0, data_1.convertBigIntToDecimal)(resp.outputAmountMinimum).div(divisor);
-        if (oamD.gt(remainder)) {
-            const indicativePrice = (0, data_1.convertBigIntToDecimal)(resp.inputAmount).div((0, data_1.convertBigIntToDecimal)(resp.outputAmountMinimum));
-            const userBal = (0, data_1.convertBigIntToDecimal)(q.originalHolding.amount);
-            // remainder is the output we want, so the input amount is remainder × indicativePrice
-            let expectedInput = decimal_js_1.default.min(remainder.mul(divisor).mul(indicativePrice).mul(safetyMultiplier), userBal);
-            while (true) {
-                console.log("XCS | SS | 2⒜", {
-                    indicativePrice,
-                    expectedInput,
-                    userBal,
+                    holding: quoteData.originalHolding,
+                    aggregator,
+                    chainID: Number(quoteData.req.chain.chainID),
                 });
-                const adequateQuoteResult = await aggregateAggregators([
-                    {
-                        ...q.req,
-                        seriousness: iface_1.QuoteSeriousness.SERIOUS,
-                        inputAmount: (0, data_1.convertDecimalToBigInt)(expectedInput),
-                    },
-                ], aggregators, 0 /* AggregateAggregatorsMode.MaximizeOutput */);
-                if (adequateQuoteResult.length !== 1) {
-                    throw new AutoSelectionError("???");
-                }
-                const adequateQuote = adequateQuoteResult[0];
-                if (adequateQuote.quote == null) {
-                    throw new AutoSelectionError("Couldn't get buy quote");
-                }
-                console.log("XCS | SS | 2⒜⑴", {
-                    adequateQuote,
-                });
-                const oam2D = (0, data_1.convertBigIntToDecimal)(adequateQuote.quote.outputAmountMinimum).div(divisor);
-                if (oam2D.gte(remainder)) {
-                    final.push({
-                        ...q,
-                        quote: adequateQuote.quote,
-                        agg: adequateQuote.aggregator,
-                    });
-                    remainder = remainder.minus(oam2D);
-                    break;
-                }
-                else if (expectedInput.eq(userBal)) {
-                    throw new AutoSelectionError("Holding was supposedly enough to meet the full requirement but ceased to be so subsequently");
-                }
-                else {
-                    expectedInput = decimal_js_1.default.min(expectedInput.mul(safetyMultiplier), userBal); // try again with higher amount
-                }
+                remainder = remainder.minus(resp.output.amount);
             }
         }
-        else {
-            console.log("XCS | SS | 2⒝", resp);
-            final.push({
-                ...q,
-                quote: resp,
-                agg,
-            });
-            remainder = remainder.minus((0, data_1.convertBigIntToDecimal)(resp.outputAmountMinimum).div(divisor));
-        }
     }
-    console.log("XCS | SS | 3⒜", {
-        remainder,
+    console.debug("quotes_and_remainder", {
+        remainder: remainder.toFixed(),
         final,
     });
     if (remainder.gt(0)) {
-        throw new AutoSelectionError("Failed to accumulate enough swaps to meet requirement");
+        throw new AutoSelectionError("NOT_ENOUGH_SWAP_FOR_REQUIREMENT");
     }
-    console.log("XCS | SS | Final:", final);
-    return final;
+    console.log("final_quotes", { quotes: final, cots: usedCOTs });
+    return { quoteResponses: final, usedCOTs };
 }
-async function determineDestinationSwaps(userAddress, chainID, requirement, aggregators, commonCurrencyID = data_1.CurrencyID.USDC) {
-    const chaindata = data_1.ChaindataMap.get(chainID);
+async function determineDestinationSwaps(userAddress, requirement, aggregators, commonCurrencyID = data_1.CurrencyID.USDC) {
+    const chaindata = data_1.ChaindataMap.get(requirement.chainID);
     if (chaindata == null) {
         throw new AutoSelectionError("Chain not found");
     }
@@ -473,33 +339,32 @@ async function determineDestinationSwaps(userAddress, chainID, requirement, aggr
     // what happens if we happen to sell the requirement for the COT, what would the amount be?
     const fullLiquidationQR = {
         type: iface_1.QuoteType.EXACT_IN,
-        chain: chainID,
+        chain: requirement.chainID,
         userAddress,
         inputToken: requirement.tokenAddress,
         outputToken: COT.tokenAddress,
-        inputAmount: requirement.amount,
+        inputAmount: requirement.amountRaw,
         seriousness: iface_1.QuoteSeriousness.PRICE_SURVEY,
     };
     const fullLiquidationResult = await aggregateAggregators([fullLiquidationQR], aggregators, 0 /* AggregateAggregatorsMode.MaximizeOutput */);
     if (fullLiquidationResult.length !== 1) {
-        throw new AutoSelectionError("???");
+        throw new AutoSelectionError("Unexpected response length from aggregateAggregators");
     }
     const fullLiquidationQuote = fullLiquidationResult[0];
     if (fullLiquidationQuote.quote == null) {
         throw new AutoSelectionError("Couldn't get full liquidation quote");
     }
-    let curAmount = (0, data_1.convertBigIntToDecimal)(fullLiquidationQuote.quote.outputAmountLikely).mul(safetyMultiplier);
-    console.log("XCS | DDS | 1⒜", {
-        fullLiquidationQR,
-        fullLiquidationResult,
-        COT,
-    });
+    let curAmount = (0, data_1.convertBigIntToDecimal)(fullLiquidationQuote.quote.output.amountRaw).mul(safetyMultiplier);
+    let attempts = 0;
     while (true) {
+        if (++attempts > 10) {
+            throw new AutoSelectionError("Destination swap quote did not converge");
+        }
         const buyQuoteResult = await aggregateAggregators([
             {
                 type: iface_1.QuoteType.EXACT_IN,
                 userAddress,
-                chain: chainID,
+                chain: requirement.chainID,
                 inputToken: COT.tokenAddress,
                 outputToken: requirement.tokenAddress,
                 inputAmount: (0, data_1.convertDecimalToBigInt)(curAmount),
@@ -507,21 +372,22 @@ async function determineDestinationSwaps(userAddress, chainID, requirement, aggr
             },
         ], aggregators, 0 /* AggregateAggregatorsMode.MaximizeOutput */);
         if (buyQuoteResult.length !== 1) {
-            throw new AutoSelectionError("???");
+            throw new AutoSelectionError("Unexpected response length from aggregateAggregators");
         }
         const buyQuote = buyQuoteResult[0];
         if (buyQuote.quote == null) {
             throw new AutoSelectionError("Couldn't get buy quote");
         }
-        console.log("XCS | DDS | 2⒜ iteration", {
+        console.debug("XCS | DDS | 2⒜ iteration", {
             buyQuote,
             curAmount,
         });
-        if (buyQuote.quote.outputAmountMinimum >= requirement.amount) {
+        if (buyQuote.quote.output.amountRaw >= requirement.amountRaw) {
             return {
-                ...buyQuote,
-                inputAmount: (0, data_1.convertBigIntToDecimal)(buyQuote.quote.inputAmount).div(decimal_js_1.default.pow(10, COT.decimals)),
-                outputAmount: requirement.amount,
+                chainID: Number(requirement.chainID.chainID),
+                quote: buyQuote.quote,
+                aggregator: buyQuote.aggregator,
+                holding: requirement,
             };
         }
         else {
@@ -529,8 +395,8 @@ async function determineDestinationSwaps(userAddress, chainID, requirement, aggr
         }
     }
 }
-async function liquidateInputHoldings(userAddress, holdings, aggregators, collectionFees, commonCurrencyID = data_1.CurrencyID.USDC) {
-    console.log("XCS | LIH | Holdings:", holdings);
+async function liquidateInputHoldings(userAddress, holdings, aggregators, commonCurrencyID = data_1.CurrencyID.USDC) {
+    console.debug("XCS | LIH | Holdings:", holdings);
     const groupedByChainID = (0, es_toolkit_1.groupBy)(holdings, (h) => (0, viem_1.bytesToHex)(h.chainID.toBytes()));
     const fullLiquidationQuotes = [];
     for (const holdings of Object.values(groupedByChainID)) {
@@ -540,20 +406,12 @@ async function liquidateInputHoldings(userAddress, holdings, aggregators, collec
         }
         const correspondingCurrency = chain.Currencies.find((cur) => cur.currencyID === commonCurrencyID);
         if (correspondingCurrency == null) {
-            console.log("XCS | LIH | Skipping because correspondingCurrency is null", {
+            console.debug("XCS | LIH | Skipping because correspondingCurrency is null", {
                 chain,
                 correspondingCurrency,
             });
             continue;
         }
-        const cfeeTuple = collectionFees.find((cf) => {
-            return (cf.universe === chain.Universe &&
-                Buffer.compare(cf.chainID, chain.ChainID32) === 0 &&
-                // output token is the CA one
-                Buffer.compare(cf.tokenAddress, correspondingCurrency.tokenAddress) ===
-                    0);
-        });
-        const cfee = cfeeTuple != null ? (0, viem_1.bytesToBigInt)(cfeeTuple.fee) : 0n;
         for (const holding of holdings) {
             if (Buffer.compare(holding.tokenAddress, correspondingCurrency.tokenAddress) === 0) {
                 console.log("XCS | LIH | Disqualifying", holding, "because holding.tokenAddress = CA asset");
@@ -565,48 +423,44 @@ async function liquidateInputHoldings(userAddress, holdings, aggregators, collec
                     type: iface_1.QuoteType.EXACT_IN,
                     chain: chain.ChainID,
                     inputToken: holding.tokenAddress,
-                    inputAmount: holding.amount,
+                    inputAmount: holding.amountRaw,
                     outputToken: correspondingCurrency.tokenAddress,
                     seriousness: iface_1.QuoteSeriousness.SERIOUS,
                 },
                 // necessary for various purposes
-                cfee,
                 originalHolding: holding,
                 cur: correspondingCurrency,
             });
         }
     }
     const responses = await aggregateAggregators(fullLiquidationQuotes.map((fq) => fq.req), aggregators, 0 /* AggregateAggregatorsMode.MaximizeOutput */);
-    console.log("XCS | LIH | Responses:", responses);
-    const validResponses = responses
-        .filter((r) => r.quote !== null)
-        .map((r, i) => ({
-        ...r,
-        ...fullLiquidationQuotes[i],
-        agg: r.aggregator,
-        quote: r.quote,
-    }));
-    const total = validResponses.reduce((acc, r) => {
-        return acc.add(new decimal_js_1.default(r.quote.outputAmountMinimum ?? 0n).div(decimal_js_1.default.pow(10, r.cur.decimals)));
-    }, new decimal_js_1.default(0));
-    return {
-        quotes: validResponses,
-        total,
-    };
+    console.debug("XCS | LIH | Responses:", responses);
+    const quotes = [];
+    for (const [i, response] of responses.entries()) {
+        if (response.quote !== null) {
+            quotes.push({
+                quote: response.quote,
+                aggregator: response.aggregator,
+                holding: fullLiquidationQuotes[i].originalHolding,
+                chainID: Number(fullLiquidationQuotes[i].req.chain.chainID),
+            });
+        }
+    }
+    return quotes;
 }
-async function destinationSwapWithExactIn(userAddress, chainID, inputAmount, outputToken, aggregators, commonCurrencyID = data_1.CurrencyID.USDC) {
-    const chaindata = data_1.ChaindataMap.get(chainID);
+async function destinationSwapWithExactIn(userAddress, omniChainID, inputAmount, outputToken, aggregators, inputCurrency = data_1.CurrencyID.USDC) {
+    const chaindata = data_1.ChaindataMap.get(omniChainID);
     if (chaindata == null) {
         throw new AutoSelectionError("Chain not found");
     }
-    const COT = chaindata.Currencies.find((cur) => cur.currencyID === commonCurrencyID);
+    const COT = chaindata.Currencies.find((cur) => cur.currencyID === inputCurrency);
     if (COT == null) {
         throw new AutoSelectionError("COT not present on the destination chain");
     }
     const fullLiquidationResult = await aggregateAggregators([
         {
             type: iface_1.QuoteType.EXACT_IN,
-            chain: chainID,
+            chain: omniChainID,
             userAddress,
             inputToken: COT.tokenAddress,
             outputToken: outputToken,
@@ -615,15 +469,20 @@ async function destinationSwapWithExactIn(userAddress, chainID, inputAmount, out
         },
     ], aggregators, 0 /* AggregateAggregatorsMode.MaximizeOutput */);
     if (fullLiquidationResult.length !== 1) {
-        throw new AutoSelectionError("???");
+        throw new AutoSelectionError("Unexpected response length from aggregateAggregators");
     }
     const fullLiquidationQuote = fullLiquidationResult[0];
     if (fullLiquidationQuote.quote == null) {
         throw new AutoSelectionError("Couldn't get full liquidation quote");
     }
     return {
-        ...fullLiquidationQuote,
-        inputAmount: (0, data_1.convertBigIntToDecimal)(inputAmount).div(decimal_js_1.default.pow(10, COT.decimals)),
-        outputAmount: fullLiquidationQuote.quote.outputAmountMinimum,
+        chainID: Number(omniChainID.chainID),
+        quote: fullLiquidationQuote.quote,
+        aggregator: fullLiquidationQuote.aggregator,
+        holding: {
+            amountRaw: inputAmount,
+            chainID: omniChainID,
+            tokenAddress: COT.tokenAddress,
+        },
     };
 }