@avail-project/ca-common 1.0.0-dev.4 → 1.0.1-beta1

package/dist/esm/proto/grpc.js

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.7.5
+//   protoc-gen-ts_proto  v2.8.3
 //   protoc               v6.32.1
 // source: grpc.proto
 /* eslint-disable */
@@ -259,19 +259,14 @@ export class GrpcWebImpl {
     unary(methodDesc, _request, metadata) {
         const request = { ..._request, ...methodDesc.requestType };
         const maybeCombinedMetadata = metadata && this.options.metadata
-            ? new BrowserHeaders({
-                ...this.options?.metadata.headersMap,
-                ...metadata?.headersMap,
-            })
-            : (metadata ?? this.options.metadata);
+            ? new BrowserHeaders({ ...this.options?.metadata.headersMap, ...metadata?.headersMap })
+            : metadata ?? this.options.metadata;
         return new Promise((resolve, reject) => {
             grpc.unary(methodDesc, {
                 request,
                 host: this.host,
                 metadata: maybeCombinedMetadata ?? {},
-                ...(this.options.transport !== undefined
-                    ? { transport: this.options.transport }
-                    : {}),
+                ...(this.options.transport !== undefined ? { transport: this.options.transport } : {}),
                 debug: this.options.debug ?? false,
                 onEnd: function (response) {
                     if (response.status === grpc.Code.OK) {

package/dist/esm/rff/rff.js

@@ -1,11 +1,8 @@
 import { bytesToBigInt } from "viem";
-import { BN } from "fuels";
 import { ezPadTo32Hex } from "../data";
-import { protobufUniverseToFuelUniverse } from "./fuel";
 export class OmniversalRFF {
     protobufRFF;
     evmRFF;
-    fuelRFF;
     constructor(protobufRFF) {
         this.protobufRFF = protobufRFF;
     }
@@ -35,37 +32,6 @@ export class OmniversalRFF {
         }
         return this.evmRFF;
     }
-    asFuelRFF() {
-        if (this.fuelRFF == null) {
-            this.fuelRFF = {
-                sources: this.protobufRFF.sources.map((s) => ({
-                    universe: protobufUniverseToFuelUniverse(s.universe),
-                    chain_id: new BN(s.chainID),
-                    asset_id: {
-                        bits: ezPadTo32Hex(s.contractAddress),
-                    },
-                    value: new BN(s.value),
-                })),
-                destination_chain_id: new BN(this.protobufRFF.destinationChainID),
-                destination_universe: protobufUniverseToFuelUniverse(this.protobufRFF.destinationUniverse),
-                destinations: this.protobufRFF.destinations.map((d) => ({
-                    asset_id: {
-                        bits: ezPadTo32Hex(d.contractAddress),
-                    },
-                    value: new BN(d.value),
-                })),
-                expiry: new BN(this.protobufRFF.expiry.toBytesBE()),
-                nonce: new BN(this.protobufRFF.nonce),
-                parties: this.protobufRFF.signatureData.map((sd) => ({
-                    universe: protobufUniverseToFuelUniverse(sd.universe),
-                    address: {
-                        bits: ezPadTo32Hex(sd.address),
-                    },
-                })),
-            };
-        }
-        return this.fuelRFF;
-    }
     asProtobufRFF() {
         return this.protobufRFF;
     }

package/dist/esm/vaultcontracts/vaultcontracts.js

@@ -12,24 +12,28 @@ const dataSets = new Map([
     [
         Environment.FOLLY,
         [
+            [
+                new OmniversalChainID(Universe.ETHEREUM, 11155111),
+                "0xd579B76e3f51884c50eB8e8efdef5C593666B8fb",
+            ],
             [
                 new OmniversalChainID(Universe.ETHEREUM, 421614),
-                "0xEFF0C81eC6D7c2a3B924e98B65303DDaa3030a81",
+                "0x10B69f0E3c21C1187526940A615959E9ee6012F9",
             ],
             [
                 new OmniversalChainID(Universe.ETHEREUM, 11155420),
-                "0xEFF0C81eC6D7c2a3B924e98B65303DDaa3030a81",
+                "0x10B69f0E3c21C1187526940A615959E9ee6012F9",
             ],
             [
-                new OmniversalChainID(Universe.ETHEREUM, 80002),
-                "0xEFF0C81eC6D7c2a3B924e98B65303DDaa3030a81",
+                new OmniversalChainID(Universe.ETHEREUM, 84532),
+                "0xA7458040272226378397C3036eda862D60C3b307",
             ],
             [
-                new OmniversalChainID(Universe.ETHEREUM, 84532),
-                "0xEFF0C81eC6D7c2a3B924e98B65303DDaa3030a81",
+                new OmniversalChainID(Universe.ETHEREUM, 5115),
+                "0x10B69f0E3c21C1187526940A615959E9ee6012F9",
             ],
             [
-                new OmniversalChainID(Universe.ETHEREUM, 11155111),
+                new OmniversalChainID(Universe.ETHEREUM, 80002),
                 "0xEFF0C81eC6D7c2a3B924e98B65303DDaa3030a81",
             ],
             [
@@ -57,6 +61,10 @@ const dataSets = new Map([
                 new OmniversalChainID(Universe.ETHEREUM, 8453),
                 "0x111111eA4f8BdfB5AE22c37ebC3eE17b82072F57",
             ],
+            [
+                new OmniversalChainID(Universe.ETHEREUM, 4326),
+                "0x10B69f0E3c21C1187526940A615959E9ee6012F9",
+            ],
             [
                 new OmniversalChainID(Universe.ETHEREUM, 534352),
                 "0x111111eA4f8BdfB5AE22c37ebC3eE17b82072F57",
@@ -122,10 +130,6 @@ const dataSets = new Map([
                 new OmniversalChainID(Universe.ETHEREUM, 143),
                 "0xC0DED5d7F424276c821AF21F68E1e663bC671C3D",
             ],
-            [
-                new OmniversalChainID(Universe.FUEL, 9889),
-                "0xe2586f908cc885e630cec6d8d578f02e6ade66983baf23f82757be502127dfb1",
-            ],
         ],
     ],
     [

package/dist/esm/xcs/autochoice.js

@@ -56,6 +56,259 @@ export async function aggregateAggregators(requests, aggregators, mode) {
     }
     return final;
 }
+/*
+In original autoSelectSources:
+Assets = [1 ETH, 1 COT, 1 ETH, 1 USDT, 1 COT]
+Output = 4
+
+First loop that just removes cot:
+quoteAssets = [1 ETH, 1 ETH, 1 USDT]
+Output = 4
+
+Outside the function we can just remove all COT's and assume those as being used
+but that's incorrect as we want to use assets in exact order as holdings array.
+We can't remove only COT's that are going to be used because we don't know which ones are going
+to get used.
+
+Proposed solution:
+It should actually use assets in exact order, so it cant be done outside the function
+1. The function has to keep an order of assets, separate out COT and non-COT assets.
+2. Get quote for non-COT assets, then loop over the original order
+3. Used either COT or quote depending on original order
+4. Send back quotes and COT's used
+
+Alg:
+Assets = [1 ETH, 1 COT, 1 ETH, 1 USDT, 1 COT]
+Output = 4
+
+1. separate into two with indexes:
+quotes = [(1 ETH, 0), (1 ETH, 2), (1 USDT, 3)]
+cots = [(1 COT, 1), (1 COT, 4)]
+
+2. Get quotes using only quotes
+3. merge quote cots and sort by order
+4. loop assets (original order):
+  if a quote:
+    output = output - quote_output_amount
+  if a cot:
+    output = output - cot_amount
+  if output <= 0:
+    break
+5. return quotes and assets used.
+*/
+export async function autoSelectSourcesV2(userAddress, holdings, outputRequired, aggregators, commonCurrencyID = CurrencyID.USDC) {
+    // Assumption: Holding is already sorted in usage priority
+    console.log("XCS | SSV2:", {
+        holdings,
+        outputRequired: outputRequired.toFixed(),
+    });
+    const fullLiquidationQuotes = [];
+    const cotList = [];
+    for (const [idx, holding] of holdings.entries()) {
+        const chain = ChaindataMap.get(holding.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;
+        }
+        if (Buffer.compare(holding.tokenAddress, correspondingCurrency.tokenAddress) === 0) {
+            const normalizedAmount = new Decimal(holding.amount).div(Decimal.pow(10, correspondingCurrency.decimals));
+            cotList.push({
+                amount: normalizedAmount,
+                idx,
+                chainID: holding.chainID,
+                currency: correspondingCurrency,
+                originalHolding: holding,
+            });
+        }
+        else {
+            fullLiquidationQuotes.push({
+                req: {
+                    userAddress,
+                    type: QuoteType.EXACT_IN,
+                    chain: chain.ChainID,
+                    inputToken: holding.tokenAddress,
+                    inputAmount: holding.amount,
+                    outputToken: correspondingCurrency.tokenAddress,
+                    seriousness: QuoteSeriousness.PRICE_SURVEY,
+                },
+                originalHolding: holding,
+                cur: correspondingCurrency,
+                idx,
+            });
+        }
+    }
+    // Check if continuous COTs from the start can cover the entire requirement
+    // We can skip quoting unused holdings
+    if (cotList.length > 0 && cotList[0].idx === 0) {
+        let continuousCOTAmount = new Decimal(0);
+        let continuousCount = 0;
+        for (const cot of cotList) {
+            // only consecutive cots allowed, otherwise we need to go to quoting
+            if (cot.idx !== continuousCount)
+                break;
+            continuousCOTAmount = continuousCOTAmount.add(cot.amount);
+            continuousCount++;
+            if (continuousCOTAmount.gte(outputRequired)) {
+                console.log("XCS | SS | Continuous COTs can satisfy requirement, skipping quotes");
+                const usedCOTs = [];
+                let remainder = outputRequired;
+                for (let i = 0; i < continuousCount; i++) {
+                    const cot = cotList[i];
+                    const amountToUse = Decimal.min(remainder, cot.amount);
+                    usedCOTs.push({
+                        originalHolding: cot.originalHolding,
+                        amountUsed: amountToUse,
+                        idx: cot.idx,
+                        cur: cot.currency,
+                    });
+                    remainder = remainder.minus(amountToUse);
+                    if (remainder.lte(0))
+                        break;
+                }
+                console.log("XCS | SS | Early return with continuous COTs:", {
+                    cots: usedCOTs,
+                });
+                return { quotes: [], usedCOTs };
+            }
+        }
+    }
+    const processingQueue = [];
+    // Add COT holdings
+    for (const cot of cotList) {
+        processingQueue.push({
+            idx: cot.idx,
+            isCOT: true,
+            cotData: cot,
+        });
+    }
+    // Add non-COT holdings
+    for (let i = 0; i < fullLiquidationQuotes.length; i++) {
+        processingQueue.push({
+            idx: fullLiquidationQuotes[i].idx,
+            isCOT: false,
+            quoteData: fullLiquidationQuotes[i],
+            responseIdx: i,
+        });
+    }
+    // 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);
+    const final = [];
+    const usedCOTs = [];
+    let remainder = outputRequired;
+    for (const item of processingQueue) {
+        if (remainder.lte(0)) {
+            break;
+        }
+        if (item.isCOT) {
+            // Process COT holding - direct usage, no quote
+            const { cotData } = item;
+            const amountToUse = Decimal.min(remainder, cotData.amount);
+            usedCOTs.push({
+                originalHolding: cotData.originalHolding,
+                amountUsed: amountToUse,
+                idx: cotData.idx,
+                cur: cotData.currency,
+            });
+            remainder = remainder.minus(amountToUse);
+            console.log("XCS | SS | Used COT", {
+                idx: cotData.idx,
+                amountToUse: amountToUse.toFixed(),
+                remainder: remainder.toFixed(),
+            });
+        }
+        else {
+            // Process non-COT holding - use existing quote logic
+            const { quoteData, responseIdx } = item;
+            const { quote: resp, aggregator: agg } = responses[responseIdx];
+            if (resp == null) {
+                continue;
+            }
+            console.log("XCS | SS | 1", {
+                i: responseIdx,
+                idx: quoteData.idx,
+                remainder,
+                q: quoteData,
+                resp,
+                agg,
+            });
+            const divisor = Decimal.pow(10, quoteData.cur.decimals);
+            const oamD = Decimal.div(resp.outputAmountMinimum, divisor);
+            if (oamD.gt(remainder)) {
+                const indicativePrice = Decimal.div(resp.inputAmount, resp.outputAmountMinimum);
+                const userBal = new Decimal(quoteData.originalHolding.amount);
+                // remainder is the output we want, so the input amount is remainder × indicativePrice
+                let expectedInput = Decimal.min(remainder.mul(divisor).mul(indicativePrice).mul(safetyMultiplier), userBal);
+                while (true) {
+                    console.log("XCS | SS | 2⒜", {
+                        indicativePrice,
+                        expectedInput,
+                        userBal,
+                    });
+                    const adequateQuoteResult = await aggregateAggregators([
+                        {
+                            ...quoteData.req,
+                            seriousness: QuoteSeriousness.SERIOUS,
+                            inputAmount: 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 = Decimal.div(adequateQuote.quote.outputAmountMinimum, divisor);
+                    if (oam2D.gte(remainder)) {
+                        final.push({
+                            ...quoteData,
+                            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.min(expectedInput.mul(safetyMultiplier), userBal); // try again with higher amount
+                    }
+                }
+            }
+            else {
+                console.log("XCS | SS | 2⒝", resp);
+                final.push({
+                    ...quoteData,
+                    quote: resp,
+                    agg,
+                });
+                remainder = remainder.minus(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 };
+}
 export async function autoSelectSources(userAddress, holdings, outputRequired, aggregators, collectionFees, commonCurrencyID = CurrencyID.USDC) {
     console.log("XCS | SS | Holdings:", holdings);
     const groupedByChainID = groupBy(holdings, (h) => bytesToHex(h.chainID.toBytes()));
@@ -205,6 +458,7 @@ export async function determineDestinationSwaps(userAddress, chainID, requiremen
     if (COT == null) {
         throw new AutoSelectionError("COT not present on the destination chain");
     }
+    // FIXME: Replace with oracle usage - should reduce time.
     // what happens if we happen to sell the requirement for the COT, what would the amount be?
     const fullLiquidationQR = {
         type: QuoteType.EXACT_IN,

package/dist/types/index.d.ts

@@ -1,13 +1,13 @@
 import "./_polyfill";
-export { ArcanaVault, ArcanaVaultFactory } from './fuelcontracts';
-export * from './proto/definition';
-export { QueryClientImpl, Query, GrpcWebError, GrpcWebImpl } from './proto/grpc';
-export * from './data';
-export * from './vaultcontracts';
-export * from './permitutils';
-export * from './xcs';
-export * from './cosmos';
-export * from './rff/rff';
-export * from './types';
-export * from './balances/ub-api';
-export * from './evmabi';
+export * from "./proto/definition";
+export { QueryClientImpl, Query, GrpcWebError, GrpcWebImpl, } from "./proto/grpc";
+export { createGrpcWebImpl } from "./proto/client";
+export * from "./data";
+export * from "./vaultcontracts";
+export * from "./permitutils";
+export * from "./xcs";
+export * from "./cosmos";
+export * from "./rff/rff";
+export * from "./types";
+export * from "./balances/ub-api";
+export * from "./evmabi";

package/dist/types/proto/client.d.ts

@@ -0,0 +1,2 @@
+import { GrpcWebImpl } from "./grpc";
+export declare const createGrpcWebImpl: (url: string) => Promise<GrpcWebImpl>;

package/dist/types/rff/rff.d.ts

@@ -1,12 +1,9 @@
 import { RequestForFunds } from "../proto/definition";
 import { type EVMRFF } from "../vaultcontracts";
-import { RequestInput as FuelRFF } from "../fuelcontracts/ArcanaVault";
 export declare class OmniversalRFF {
     readonly protobufRFF: RequestForFunds;
     private evmRFF;
-    private fuelRFF;
     constructor(protobufRFF: RequestForFunds);
     asEVMRFF(): EVMRFF;
-    asFuelRFF(): FuelRFF;
     asProtobufRFF(): RequestForFunds;
 }

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

@@ -21,6 +21,23 @@ export declare function aggregateAggregators(requests: (QuoteRequestExactInput |
     quote: Quote | null;
     aggregator: Aggregator;
 }[]>;
+export declare function autoSelectSourcesV2(userAddress: Bytes, holdings: Holding[], outputRequired: Decimal, aggregators: Aggregator[], commonCurrencyID?: CurrencyID): Promise<{
+    quotes: ({
+        req: QuoteRequestExactInput;
+        originalHolding: Holding;
+        cur: Currency;
+        idx: number;
+    } & {
+        quote: Quote;
+        agg: Aggregator;
+    })[];
+    usedCOTs: {
+        originalHolding: Holding;
+        amountUsed: Decimal;
+        idx: number;
+        cur: Currency;
+    }[];
+}>;
 export declare function autoSelectSources(userAddress: Bytes, holdings: Holding[], outputRequired: Decimal, aggregators: Aggregator[], collectionFees: FixedFeeTuple[], commonCurrencyID?: CurrencyID): Promise<({
     req: QuoteRequestExactInput;
     cfee: bigint;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@avail-project/ca-common",
-  "version": "1.0.0-dev.4",
+  "version": "1.0.1-beta1",
   "description": "common utilities for CA",
   "files": [
     "dist"
@@ -15,11 +15,6 @@
       "types": "./dist/types/index.d.ts",
       "require": "./dist/cjs/index.js",
       "import": "./dist/esm/index.js"
-    },
-    "./fuelcontracts": {
-      "types": "./dist/types/fuelcontracts/index.d.ts",
-      "require": "./dist/cjs/fuelcontracts/index.js",
-      "import": "./dist/esm/fuelcontracts/index.js"
     }
   },
   "scripts": {
@@ -29,7 +24,9 @@
     "test": "echo \"Error: no test specified\" && exit 1",
     "lint": "eslint",
     "clean": "rimraf dist/",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "npm run build",
+    "release": "release-it",
+    "prepare": "npm run build"
   },
   "author": "",
   "license": "MIT",
@@ -44,6 +41,7 @@
     "globals": "^16.3.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^3.6.2",
+    "release-it": "^19.2.3",
     "rimraf": "^6.0.1",
     "ts-proto": "^2.7.5",
     "typescript": "^5.8.3"
@@ -53,16 +51,19 @@
     "@cosmjs/stargate": "^0.34.0",
     "axios": "^1.10.0",
     "decimal.js": "^10.6.0",
-    "fuels": "^0.101.1",
     "long": "^5.3.2",
-    "viem": "^2.31.7",
-    "msgpackr": "^1.11.4"
+    "msgpackr": "^1.11.4",
+    "viem": "^2.31.7"
   },
   "dependencies": {
     "@bufbuild/protobuf": "^2.6.0",
     "@improbable-eng/grpc-web": "^0.15.0",
+    "@improbable-eng/grpc-web-node-http-transport": "0.15.0",
     "browser-headers": "^0.4.1",
     "es-toolkit": "^1.39.7",
     "tslib": "^2.8.1"
+  },
+  "repository": {
+    "url": "https://github.com/availproject/ca-common"
   }
 }