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

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

@@ -7,6 +7,7 @@ const viem_1 = require("viem");
 const iface_1 = require("./iface");
 const definition_1 = require("../proto/definition");
 const data_1 = require("../data");
+const decimal_js_1 = tslib_1.__importDefault(require("decimal.js"));
 // https://api.bebop.xyz/{jam|pmm}/chains
 const ChainNameMapping = new Map(Object.entries({
     ethereum: 1,
@@ -42,6 +43,7 @@ class BebopAggregator {
             params: {
                 source: "arcana",
             },
+            timeout: 10_000,
         });
     }
     async getQuotes(requests) {
@@ -104,12 +106,39 @@ class BebopAggregator {
                 return null;
             }
             const buyT = bestRoute.quote.buyTokens[outputTokenAddr];
+            const sellT = bestRoute.quote.sellTokens[inputTokenAddr];
+            const outputAmountInDecimal = new decimal_js_1.default(buyT.minimumAmount)
+                .div(decimal_js_1.default.pow(10, buyT.decimals))
+                .toFixed(buyT.decimals);
+            const inputAmountInDecimal = new decimal_js_1.default(sellT.amount)
+                .div(decimal_js_1.default.pow(10, sellT.decimals))
+                .toFixed(sellT.decimals);
             return {
-                type: r.type,
-                inputAmount: BigInt(bestRoute.quote.sellTokens[inputTokenAddr].amount),
-                outputAmountMinimum: BigInt(buyT.minimumAmount),
-                outputAmountLikely: BigInt(buyT.amount),
-                originalResponse: bestRoute,
+                expiry: bestRoute.quote.expiry,
+                input: {
+                    amount: inputAmountInDecimal,
+                    amountRaw: BigInt(sellT.amount),
+                    contractAddress: inputTokenAddr,
+                    decimals: sellT.decimals,
+                    value: decimal_js_1.default.mul(inputAmountInDecimal, sellT.priceUsd).toNumber(),
+                    symbol: sellT.symbol,
+                },
+                output: {
+                    amount: outputAmountInDecimal,
+                    amountRaw: BigInt(buyT.minimumAmount),
+                    contractAddress: outputTokenAddr,
+                    decimals: buyT.decimals,
+                    value: decimal_js_1.default.mul(buyT.priceUsd, outputAmountInDecimal).toNumber(),
+                    symbol: buyT.symbol,
+                },
+                txData: {
+                    approvalAddress: bestRoute.quote.approvalTarget,
+                    tx: {
+                        to: bestRoute.quote.tx.to,
+                        value: bestRoute.quote.tx.value,
+                        data: bestRoute.quote.tx.data,
+                    },
+                },
             };
         }));
         return list.map((item) => {

package/dist/cjs/xcs/index.js

@@ -3,6 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./iface"), exports);
 tslib_1.__exportStar(require("./lifi-agg"), exports);
-tslib_1.__exportStar(require("./yieldyak-agg"), exports);
 tslib_1.__exportStar(require("./bebop-agg"), exports);
 tslib_1.__exportStar(require("./autochoice"), exports);

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

@@ -6,11 +6,13 @@ const axios_1 = tslib_1.__importStar(require("axios"));
 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"));
 class LiFiAggregator {
     static BASE_URL_V1 = "https://li.quest/v1";
     static COMMON_OPTIONS = {
         denyExchanges: "openocean",
         slippage: "0.01",
+        skipSimulation: true,
     };
     axios;
     constructor(apiKey) {
@@ -19,6 +21,7 @@ class LiFiAggregator {
             headers: {
                 "x-lifi-api-key": apiKey,
             },
+            timeout: 10_000,
         });
     }
     async getQuotes(requests) {
@@ -80,12 +83,38 @@ class LiFiAggregator {
                 }
                 throw e;
             }
+            const { estimate, transactionRequest: { to, value, data }, action: { fromToken, toToken }, } = resp.data;
+            const inputAmountInDecimal = new decimal_js_1.default(estimate.fromAmount)
+                .div(decimal_js_1.default.pow(10, fromToken.decimals))
+                .toFixed(fromToken.decimals);
+            const outputAmountInDecimal = new decimal_js_1.default(estimate.toAmountMin)
+                .div(decimal_js_1.default.pow(10, toToken.decimals))
+                .toFixed(toToken.decimals);
             return {
-                type: r.type,
-                inputAmount: BigInt(resp.data.estimate.fromAmount),
-                outputAmountMinimum: BigInt(resp.data.estimate.toAmountMin),
-                outputAmountLikely: BigInt(resp.data.estimate.toAmount),
-                originalResponse: resp.data,
+                input: {
+                    amount: inputAmountInDecimal,
+                    amountRaw: BigInt(estimate.fromAmount),
+                    contractAddress: inputTokenAddr,
+                    decimals: fromToken.decimals,
+                    value: decimal_js_1.default.mul(inputAmountInDecimal, fromToken.priceUSD).toNumber(),
+                    symbol: fromToken.symbol,
+                },
+                output: {
+                    amount: outputAmountInDecimal,
+                    amountRaw: BigInt(estimate.toAmountMin),
+                    contractAddress: outputTokenAddr,
+                    decimals: toToken.decimals,
+                    value: decimal_js_1.default.mul(outputAmountInDecimal, toToken.priceUSD).toNumber(),
+                    symbol: toToken.symbol,
+                },
+                txData: {
+                    approvalAddress: estimate.approvalAddress,
+                    tx: {
+                        to,
+                        value,
+                        data,
+                    },
+                },
             };
         }));
         return list.map((item) => {

package/dist/esm/data/chaindata.js

@@ -601,10 +601,10 @@ const RawData = [
         Currencies: [
             {
                 CurrencyID: 1,
-                TokenContractAddress: "0x000000000000000000000000590cb8868c6DeBc12CCd42E837042659cfB91504",
+                TokenContractAddress: "0x000000000000000000000000FAfDdbb3FC7688494971a79cc65DCa3EF82079E7",
                 PermitVariant: PermitVariant.EIP2612Canonical,
-                PermitContractVersion: 2,
-                TokenDecimals: 6,
+                PermitContractVersion: 1,
+                TokenDecimals: 18,
                 IsGasToken: false,
             },
             {
@@ -614,6 +614,14 @@ const RawData = [
                 TokenDecimals: 18,
                 IsGasToken: true,
             },
+            {
+                CurrencyID: 2,
+                TokenContractAddress: "0x000000000000000000000000B8CE59FC3717ada4C02eaDF9682A9e934F625ebb",
+                PermitVariant: PermitVariant.EIP2612Canonical,
+                PermitContractVersion: 1,
+                TokenDecimals: 6,
+                IsGasToken: false,
+            },
         ],
     },
     //citrea mainnet
@@ -638,7 +646,7 @@ const RawData = [
                 IsGasToken: false,
             },
             {
-                CurrencyID: 3,
+                CurrencyID: 21,
                 TokenContractAddress: "0x0000000000000000000000000000000000000000000000000000000000000000",
                 PermitVariant: PermitVariant.Unsupported,
                 TokenDecimals: 18,
@@ -753,10 +761,7 @@ export const RPCURLMap = new ChainIDKeyedMap([
         new OmniversalChainID(Universe.ETHEREUM, 50104),
         "https://sophon.gateway.tenderly.co/1d4STFT7zmG0vM5QowibCw",
     ],
-    [
-        new OmniversalChainID(Universe.ETHEREUM, 56),
-        "https://rpcs.avail.so/bsc",
-    ],
+    [new OmniversalChainID(Universe.ETHEREUM, 56), "https://rpcs.avail.so/bsc"],
     [
         new OmniversalChainID(Universe.ETHEREUM, 10143),
         "https://rpcs.avail.so/monadtestnet",

package/dist/esm/data/currency.js

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

package/dist/esm/vaultcontracts/vaultcontracts.js

@@ -65,6 +65,10 @@ const dataSets = new Map([
                 new OmniversalChainID(Universe.ETHEREUM, 4326),
                 "0x10B69f0E3c21C1187526940A615959E9ee6012F9",
             ],
+            [
+                new OmniversalChainID(Universe.ETHEREUM, 4114),
+                "0x10B69f0E3c21C1187526940A615959E9ee6012F9",
+            ],
             [
                 new OmniversalChainID(Universe.ETHEREUM, 534352),
                 "0x111111eA4f8BdfB5AE22c37ebC3eE17b82072F57",
@@ -77,6 +81,22 @@ const dataSets = new Map([
                 new OmniversalChainID(Universe.TRON, 728126428),
                 "0x46de8c7e6f1da4dd851b62c20b78971f230fca5b",
             ],
+            [
+                new OmniversalChainID(Universe.ETHEREUM, 1),
+                "0xAc73E77b4FE9BBAAA35C7147DC3Fd5286929A746",
+            ],
+            [
+                new OmniversalChainID(Universe.ETHEREUM, 143),
+                "0xAc73E77b4FE9BBAAA35C7147DC3Fd5286929A746",
+            ],
+            [
+                new OmniversalChainID(Universe.ETHEREUM, 999),
+                "0xAc73E77b4FE9BBAAA35C7147DC3Fd5286929A746",
+            ],
+            [
+                new OmniversalChainID(Universe.ETHEREUM, 43114),
+                "0xAc73E77b4FE9BBAAA35C7147DC3Fd5286929A746",
+            ],
         ],
     ],
     [
@@ -130,6 +150,14 @@ const dataSets = new Map([
                 new OmniversalChainID(Universe.ETHEREUM, 143),
                 "0xC0DED5d7F424276c821AF21F68E1e663bC671C3D",
             ],
+            [
+                new OmniversalChainID(Universe.ETHEREUM, 4114),
+                "0xAc73E77b4FE9BBAAA35C7147DC3Fd5286929A746",
+            ],
+            [
+                new OmniversalChainID(Universe.ETHEREUM, 4326),
+                "0x5f02ED27A20BbDbB90EEf98670fA36c36fc02D12",
+            ],
         ],
     ],
     [