@across-protocol/sdk 4.3.125 → 4.3.126-alpha.0

package/dist/esm/src/gasPriceOracle/types.js

@@ -1,6 +1,6 @@
 import { bnZero, isDefined } from "../utils";
 export function isEVMGasPrice(gasPrice) {
-    var _a = gasPrice, maxFeePerGas = _a.maxFeePerGas, maxPriorityFeePerGas = _a.maxPriorityFeePerGas;
+    const { maxFeePerGas, maxPriorityFeePerGas } = gasPrice;
     return isDefined(maxFeePerGas) && isDefined(maxPriorityFeePerGas);
 }
 export function isType0Gas(gas) {
@@ -10,7 +10,7 @@ export function isType2Gas(gas) {
     return gas.maxPriorityFeePerGas.gt(bnZero);
 }
 export function isSVMGasPrice(gasPrice) {
-    var _a = gasPrice, baseFee = _a.baseFee, microLamportsPerComputeUnit = _a.microLamportsPerComputeUnit;
+    const { baseFee, microLamportsPerComputeUnit } = gasPrice;
     return isDefined(baseFee) && isDefined(microLamportsPerComputeUnit);
 }
 //# sourceMappingURL=types.js.map

package/dist/esm/src/gasPriceOracle/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/gasPriceOracle/types.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,MAAM,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAmBxD,MAAM,UAAU,aAAa,CAAC,QAA0B;IAChD,IAAA,KAAyC,QAA+B,EAAtE,YAAY,kBAAA,EAAE,oBAAoB,0BAAoC,CAAC;IAC/E,OAAO,SAAS,CAAC,YAAY,CAAC,IAAI,SAAS,CAAC,oBAAoB,CAAC,CAAC;AACpE,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,GAAwB;IACjD,OAAO,GAAG,CAAC,oBAAoB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,GAAwB;IACjD,OAAO,GAAG,CAAC,oBAAoB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,QAA0B;IAChD,IAAA,KAA2C,QAA+B,EAAxE,OAAO,aAAA,EAAE,2BAA2B,iCAAoC,CAAC;IACjF,OAAO,SAAS,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC,2BAA2B,CAAC,CAAC;AACtE,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/gasPriceOracle/types.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,MAAM,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAmBxD,MAAM,UAAU,aAAa,CAAC,QAA0B;IACtD,MAAM,EAAE,YAAY,EAAE,oBAAoB,EAAE,GAAG,QAA+B,CAAC;IAC/E,OAAO,SAAS,CAAC,YAAY,CAAC,IAAI,SAAS,CAAC,oBAAoB,CAAC,CAAC;AACpE,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,GAAwB;IACjD,OAAO,GAAG,CAAC,oBAAoB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,GAAwB;IACjD,OAAO,GAAG,CAAC,oBAAoB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,QAA0B;IACtD,MAAM,EAAE,OAAO,EAAE,2BAA2B,EAAE,GAAG,QAA+B,CAAC;IACjF,OAAO,SAAS,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC,2BAA2B,CAAC,CAAC;AACtE,CAAC"}

package/dist/esm/src/gasPriceOracle/util.js

@@ -2,12 +2,12 @@ import assert from "assert";
 import { createPublicClient, http } from "viem";
 import * as chains from "viem/chains";
 export function gasPriceError(method, chainId, data) {
-    throw new Error("Malformed ".concat(method, " response on chain ID ").concat(chainId, " (").concat(JSON.stringify(data), ")"));
+    throw new Error(`Malformed ${method} response on chain ID ${chainId} (${JSON.stringify(data)})`);
 }
 export function getPublicClient(chainId, transport) {
-    transport !== null && transport !== void 0 ? transport : (transport = http()); // @todo: Inherit URL from provider.
-    var chain = Object.values(chains).find(function (chain) { return chain.id === chainId; });
+    transport ?? (transport = http()); // @todo: Inherit URL from provider.
+    const chain = Object.values(chains).find((chain) => chain.id === chainId);
     assert(chain);
-    return createPublicClient({ chain: chain, transport: transport });
+    return createPublicClient({ chain, transport });
 }
 //# sourceMappingURL=util.js.map

package/dist/esm/src/gasPriceOracle/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../../src/gasPriceOracle/util.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAiC,kBAAkB,EAAE,IAAI,EAAa,MAAM,MAAM,CAAC;AAC1F,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC;AAEtC,MAAM,UAAU,aAAa,CAAC,MAAc,EAAE,OAAe,EAAE,IAAa;IAC1E,MAAM,IAAI,KAAK,CAAC,oBAAa,MAAM,mCAAyB,OAAO,eAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAG,CAAC,CAAC;AACnG,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,OAAe,EAAE,SAAqB;IACpE,SAAS,aAAT,SAAS,cAAT,SAAS,IAAT,SAAS,GAAK,IAAI,EAAE,EAAC,CAAC,oCAAoC;IAC1D,IAAM,KAAK,GAAsB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,UAAC,KAAK,IAAK,OAAA,KAAK,CAAC,EAAE,KAAK,OAAO,EAApB,CAAoB,CAAC,CAAC;IAC7F,MAAM,CAAC,KAAK,CAAC,CAAC;IAEd,OAAO,kBAAkB,CAAC,EAAE,KAAK,OAAA,EAAE,SAAS,WAAA,EAAE,CAAC,CAAC;AAClD,CAAC"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../../src/gasPriceOracle/util.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAiC,kBAAkB,EAAE,IAAI,EAAa,MAAM,MAAM,CAAC;AAC1F,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC;AAEtC,MAAM,UAAU,aAAa,CAAC,MAAc,EAAE,OAAe,EAAE,IAAa;IAC1E,MAAM,IAAI,KAAK,CAAC,aAAa,MAAM,yBAAyB,OAAO,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACnG,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,OAAe,EAAE,SAAqB;IACpE,SAAS,KAAT,SAAS,GAAK,IAAI,EAAE,EAAC,CAAC,oCAAoC;IAC1D,MAAM,KAAK,GAAsB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,OAAO,CAAC,CAAC;IAC7F,MAAM,CAAC,KAAK,CAAC,CAAC;IAEd,OAAO,kBAAkB,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;AAClD,CAAC"}

package/dist/esm/src/lpFeeCalculator/lpFeeCalculator.js

@@ -3,21 +3,21 @@
 // and ethers BNs in the main entry point function calculateRealizedLpFeePct.
 import Decimal from "decimal.js";
 import { toBN, toBNWei, fromWei, min, max, fixedPointAdjustment } from "../utils";
-var ONE_HUNDRED_PERCENT = toBN(10).pow(18);
+const ONE_HUNDRED_PERCENT = toBN(10).pow(18);
 // converts an APY rate to a one week rate. Uses the Decimal library to take a fractional exponent
 function convertApyToWeeklyFee(apy) {
     // R_week = (1 + apy)^(1/52) - 1
-    var weeklyFeePct = Decimal.pow(new Decimal("1").plus(fromWei(apy)), new Decimal("1").dividedBy(new Decimal("52"))).minus(new Decimal("1"));
+    const weeklyFeePct = Decimal.pow(new Decimal("1").plus(fromWei(apy)), new Decimal("1").dividedBy(new Decimal("52"))).minus(new Decimal("1"));
     // Convert from decimal back to BN, scaled by 1e18.
     return toBN(weeklyFeePct.times(fixedPointAdjustment.toString()).floor().toString());
 }
 export function truncate18DecimalBN(input, digits) {
-    var digitsToDrop = 18 - digits;
-    var multiplier = toBN(10).pow(digitsToDrop);
+    const digitsToDrop = 18 - digits;
+    const multiplier = toBN(10).pow(digitsToDrop);
     return input.div(multiplier).mul(multiplier);
 }
-var LPFeeCalculator = /** @class */ (function () {
-    function LPFeeCalculator(rateModel) {
+export class LPFeeCalculator {
+    constructor(rateModel) {
         this.rateModel = rateModel;
     }
     /**
@@ -26,42 +26,42 @@ var LPFeeCalculator = /** @class */ (function () {
      * @param utilization The current utilization of the pool.
      * @returns The area under the curve of the piece-wise linear rate model.
      */
-    LPFeeCalculator.prototype.calculateAreaUnderRateCurve = function (utilization) {
+    calculateAreaUnderRateCurve(utilization) {
         // Area under first piecewise component
-        var utilizationBeforeKink = min(utilization, this.rateModel.UBar);
-        var rectangle1Area = utilizationBeforeKink.mul(this.rateModel.R0).div(fixedPointAdjustment);
-        var triangle1Area = toBNWei("0.5")
+        const utilizationBeforeKink = min(utilization, this.rateModel.UBar);
+        const rectangle1Area = utilizationBeforeKink.mul(this.rateModel.R0).div(fixedPointAdjustment);
+        const triangle1Area = toBNWei("0.5")
             .mul(this.calculateInstantaneousRate(utilizationBeforeKink).sub(this.rateModel.R0))
             .mul(utilizationBeforeKink)
             .div(fixedPointAdjustment)
             .div(fixedPointAdjustment);
         // Area under second piecewise component
-        var utilizationAfter = max(toBN("0"), utilization.sub(this.rateModel.UBar));
-        var rectangle2Area = utilizationAfter
+        const utilizationAfter = max(toBN("0"), utilization.sub(this.rateModel.UBar));
+        const rectangle2Area = utilizationAfter
             .mul(toBN(this.rateModel.R0).add(this.rateModel.R1))
             .div(fixedPointAdjustment);
-        var triangle2Area = toBNWei("0.5")
+        const triangle2Area = toBNWei("0.5")
             .mul(this.calculateInstantaneousRate(utilization).sub(toBN(this.rateModel.R0).add(this.rateModel.R1)))
             .mul(utilizationAfter)
             .div(fixedPointAdjustment)
             .div(fixedPointAdjustment);
         return rectangle1Area.add(triangle1Area).add(rectangle2Area).add(triangle2Area);
-    };
+    }
     /**
      * Calculate the instantaneous rate for a 0 sized deposit (infinitesimally small).
      * @param utilization The current utilization of the pool.
      * @returns The instantaneous rate for a 0 sized deposit.
      */
-    LPFeeCalculator.prototype.calculateInstantaneousRate = function (utilization) {
+    calculateInstantaneousRate(utilization) {
         // Assuming utilization >= 0, if UBar = 0 then the value beforeKink is 0 since min(>=0, 0) = 0.
-        var beforeKink = this.rateModel.UBar.toString() === "0"
+        const beforeKink = this.rateModel.UBar.toString() === "0"
             ? toBN(0)
             : min(utilization, this.rateModel.UBar).mul(this.rateModel.R1).div(this.rateModel.UBar);
-        var afterKink = max(toBN("0"), toBN(utilization).sub(this.rateModel.UBar))
+        const afterKink = max(toBN("0"), toBN(utilization).sub(this.rateModel.UBar))
             .mul(this.rateModel.R2)
             .div(toBNWei("1").sub(this.rateModel.UBar));
         return toBN(this.rateModel.R0).add(beforeKink).add(afterKink);
-    };
+    }
     /**
      * Calculate the realized LP Fee Percent for a given rate model, utilization before and after the deposit.
      * @param rateModel Rate model to be used in this calculation.
@@ -70,12 +70,11 @@ var LPFeeCalculator = /** @class */ (function () {
      * @param truncateDecimals Whether to truncate the decimals to 6.
      * @returns The realized LP fee percent.
      */
-    LPFeeCalculator.prototype.calculateRealizedLpFeePct = function (utilizationBeforeDeposit, utilizationAfterDeposit, truncateDecimals) {
-        if (truncateDecimals === void 0) { truncateDecimals = false; }
-        var apy = this.calculateApyFromUtilization(toBN(utilizationBeforeDeposit), toBN(utilizationAfterDeposit));
+    calculateRealizedLpFeePct(utilizationBeforeDeposit, utilizationAfterDeposit, truncateDecimals = false) {
+        const apy = this.calculateApyFromUtilization(toBN(utilizationBeforeDeposit), toBN(utilizationAfterDeposit));
         // ACROSS UMIP requires that the realized fee percent is floor rounded as decimal to 6 decimals.
         return min(ONE_HUNDRED_PERCENT, truncateDecimals ? truncate18DecimalBN(convertApyToWeeklyFee(apy), 6) : convertApyToWeeklyFee(apy));
-    };
+    }
     /**
      * Calculate the realized yearly LP Fee APY Percent for a given rate model, utilization before and after the deposit.
      * @param rateModel Rate model to be used in this calculation.
@@ -83,19 +82,17 @@ var LPFeeCalculator = /** @class */ (function () {
      * @param utilizationAfterDeposit The utilization of the pool after the deposit.
      * @returns The realized LP fee APY percent.
      */
-    LPFeeCalculator.prototype.calculateApyFromUtilization = function (utilizationBeforeDeposit, utilizationAfterDeposit) {
+    calculateApyFromUtilization(utilizationBeforeDeposit, utilizationAfterDeposit) {
         if (utilizationBeforeDeposit.eq(utilizationAfterDeposit))
             return this.calculateInstantaneousRate(utilizationBeforeDeposit);
         // Get the area of [0, utilizationBeforeDeposit] and [0, utilizationAfterDeposit]
-        var areaBeforeDeposit = this.calculateAreaUnderRateCurve(utilizationBeforeDeposit);
-        var areaAfterDeposit = this.calculateAreaUnderRateCurve(utilizationAfterDeposit);
-        var numerator = areaAfterDeposit.sub(areaBeforeDeposit);
-        var denominator = utilizationAfterDeposit.sub(utilizationBeforeDeposit);
+        const areaBeforeDeposit = this.calculateAreaUnderRateCurve(utilizationBeforeDeposit);
+        const areaAfterDeposit = this.calculateAreaUnderRateCurve(utilizationAfterDeposit);
+        const numerator = areaAfterDeposit.sub(areaBeforeDeposit);
+        const denominator = utilizationAfterDeposit.sub(utilizationBeforeDeposit);
         return numerator.mul(fixedPointAdjustment).div(denominator);
-    };
-    return LPFeeCalculator;
-}());
-export { LPFeeCalculator };
+    }
+}
 /**
  * Calculate the instantaneous rate for a 0 sized deposit (infinitesimally small).
  * @param rateModel Rate model to be used in this calculation.
@@ -123,8 +120,7 @@ export function calculateApyFromUtilization(rateModel, utilizationBeforeDeposit,
  * @param truncateDecimals Whether to truncate the decimals to 6.
  * @returns The realized LP fee percent.
  */
-export function calculateRealizedLpFeePct(rateModel, utilizationBeforeDeposit, utilizationAfterDeposit, truncateDecimals) {
-    if (truncateDecimals === void 0) { truncateDecimals = false; }
+export function calculateRealizedLpFeePct(rateModel, utilizationBeforeDeposit, utilizationAfterDeposit, truncateDecimals = false) {
     return new LPFeeCalculator(rateModel).calculateRealizedLpFeePct(utilizationBeforeDeposit, utilizationAfterDeposit, truncateDecimals);
 }
 //# sourceMappingURL=lpFeeCalculator.js.map

package/dist/esm/src/lpFeeCalculator/lpFeeCalculator.js.map

@@ -1 +1 @@
-{"version":3,"file":"lpFeeCalculator.js","sourceRoot":"","sources":["../../../../src/lpFeeCalculator/lpFeeCalculator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"lpFeeCalculator.js","sourceRoot":"","sources":["../../../../src/lpFeeCalculator/lpFeeCalculator.ts"],"names":[],"mappings":"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"}

package/dist/esm/src/lpFeeCalculator/rateModel.js

@@ -1,22 +1,20 @@
-var expectedRateModelKeys = ["UBar", "R0", "R1", "R2"];
+const expectedRateModelKeys = ["UBar", "R0", "R1", "R2"];
 /**
  * Helper method that returns parsed rate model from string, or throws.
  * @param rateModelString Stringified rate model to parse.
  * @returns Rate model object. Must conform to `expectedRateModelKeys` format.
  */
-export var parseAndReturnRateModelFromString = function (rateModelString) {
-    var rateModelFromEvent = JSON.parse(rateModelString);
+export const parseAndReturnRateModelFromString = (rateModelString) => {
+    const rateModelFromEvent = JSON.parse(rateModelString);
     // Rate model must contain the exact same keys in `expectedRateModelKeys`.
-    for (var _i = 0, expectedRateModelKeys_1 = expectedRateModelKeys; _i < expectedRateModelKeys_1.length; _i++) {
-        var key = expectedRateModelKeys_1[_i];
+    for (const key of expectedRateModelKeys) {
         if (!Object.keys(rateModelFromEvent).includes(key)) {
-            throw new Error("Rate model does not contain all expected keys. Expected keys: [".concat(expectedRateModelKeys, "], actual keys: [").concat(Object.keys(rateModelFromEvent), "]"));
+            throw new Error(`Rate model does not contain all expected keys. Expected keys: [${expectedRateModelKeys}], actual keys: [${Object.keys(rateModelFromEvent)}]`);
         }
     }
-    for (var _a = 0, _b = Object.keys(rateModelFromEvent); _a < _b.length; _a++) {
-        var key = _b[_a];
+    for (const key of Object.keys(rateModelFromEvent)) {
         if (!expectedRateModelKeys.includes(key)) {
-            throw new Error("Rate model contains unexpected keys. Expected keys: [".concat(expectedRateModelKeys, "], actual keys: [").concat(Object.keys(rateModelFromEvent), "]"));
+            throw new Error(`Rate model contains unexpected keys. Expected keys: [${expectedRateModelKeys}], actual keys: [${Object.keys(rateModelFromEvent)}]`);
         }
     }
     return {

package/dist/esm/src/lpFeeCalculator/rateModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"rateModel.js","sourceRoot":"","sources":["../../../../src/lpFeeCalculator/rateModel.ts"],"names":[],"mappings":"AAEA,IAAM,qBAAqB,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAEzD;;;;GAIG;AACH,MAAM,CAAC,IAAM,iCAAiC,GAAG,UAAC,eAAuB;IACvE,IAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAEvD,0EAA0E;IAC1E,KAAkB,UAAqB,EAArB,+CAAqB,EAArB,mCAAqB,EAArB,IAAqB,EAAE,CAAC;QAArC,IAAM,GAAG,8BAAA;QACZ,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACnD,MAAM,IAAI,KAAK,CACb,yEAAkE,qBAAqB,8BAAoB,MAAM,CAAC,IAAI,CACpH,kBAAkB,CACnB,MAAG,CACL,CAAC;QACJ,CAAC;IACH,CAAC;IAED,KAAkB,UAA+B,EAA/B,KAAA,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAA/B,cAA+B,EAA/B,IAA+B,EAAE,CAAC;QAA/C,IAAM,GAAG,SAAA;QACZ,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,KAAK,CACb,+DAAwD,qBAAqB,8BAAoB,MAAM,CAAC,IAAI,CAC1G,kBAAkB,CACnB,MAAG,CACL,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO;QACL,IAAI,EAAE,kBAAkB,CAAC,IAAI;QAC7B,EAAE,EAAE,kBAAkB,CAAC,EAAE;QACzB,EAAE,EAAE,kBAAkB,CAAC,EAAE;QACzB,EAAE,EAAE,kBAAkB,CAAC,EAAE;KAC1B,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"rateModel.js","sourceRoot":"","sources":["../../../../src/lpFeeCalculator/rateModel.ts"],"names":[],"mappings":"AAEA,MAAM,qBAAqB,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAEzD;;;;GAIG;AACH,MAAM,CAAC,MAAM,iCAAiC,GAAG,CAAC,eAAuB,EAAa,EAAE;IACtF,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAEvD,0EAA0E;IAC1E,KAAK,MAAM,GAAG,IAAI,qBAAqB,EAAE,CAAC;QACxC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACnD,MAAM,IAAI,KAAK,CACb,kEAAkE,qBAAqB,oBAAoB,MAAM,CAAC,IAAI,CACpH,kBAAkB,CACnB,GAAG,CACL,CAAC;QACJ,CAAC;IACH,CAAC;IAED,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC;QAClD,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,KAAK,CACb,wDAAwD,qBAAqB,oBAAoB,MAAM,CAAC,IAAI,CAC1G,kBAAkB,CACnB,GAAG,CACL,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO;QACL,IAAI,EAAE,kBAAkB,CAAC,IAAI;QAC7B,EAAE,EAAE,kBAAkB,CAAC,EAAE;QACzB,EAAE,EAAE,kBAAkB,CAAC,EAAE;QACzB,EAAE,EAAE,kBAAkB,CAAC,EAAE;KAC1B,CAAC;AACJ,CAAC,CAAC"}

package/dist/esm/src/merkleDistributor/MerkleDistributor.js

@@ -1,34 +1,35 @@
-import { __assign } from "tslib";
 import { MerkleTree } from "@across-protocol/contracts/dist/utils/MerkleTree";
 import { ethers } from "ethers";
-var MerkleDistributor = /** @class */ (function () {
-    function MerkleDistributor() {
-    }
+export class MerkleDistributor {
     /**
      * Generate the Merkle root and the proofs for a collection of recipients.
      *
      * @param recipients An object which describes the recipients
      * @param windowIndex Parameter to specify an window index. This allows using the same smart contract for multiple token distributions.
      */
-    MerkleDistributor.createMerkleDistributionProofs = function (recipients, windowIndex) {
-        var merkleTree = new MerkleTree(recipients, MerkleDistributor.createLeaf);
-        var recipientsWithProofs = recipients.reduce(function (acc, recipient) {
-            var _a;
-            return __assign(__assign({}, acc), (_a = {}, _a[recipient.account] = __assign(__assign({}, recipient), { proof: merkleTree.getHexProof(recipient), windowIndex: windowIndex }), _a));
+    static createMerkleDistributionProofs(recipients, windowIndex) {
+        const merkleTree = new MerkleTree(recipients, MerkleDistributor.createLeaf);
+        const recipientsWithProofs = recipients.reduce((acc, recipient) => {
+            return {
+                ...acc,
+                [recipient.account]: {
+                    ...recipient,
+                    proof: merkleTree.getHexProof(recipient),
+                    windowIndex,
+                },
+            };
         }, {});
-        return { recipientsWithProofs: recipientsWithProofs, merkleRoot: merkleTree.getHexRoot() };
-    };
+        return { recipientsWithProofs, merkleRoot: merkleTree.getHexRoot() };
+    }
     /**
      * Encode the account address, the amount and the account index into a Merkle Tree leaf.
      * It is equivalent to Solidity's keccak256(abi.encode(account, amount))
      * @param recipient The recipient of the token distribution
      * @returns The Merkle Tree leaf
      */
-    MerkleDistributor.createLeaf = function (recipient) {
-        var account = recipient.account, amount = recipient.amount, accountIndex = recipient.accountIndex;
+    static createLeaf(recipient) {
+        const { account, amount, accountIndex } = recipient;
         return ethers.utils.solidityKeccak256(["address", "uint256", "uint256"], [account, amount, accountIndex]);
-    };
-    return MerkleDistributor;
-}());
-export { MerkleDistributor };
+    }
+}
 //# sourceMappingURL=MerkleDistributor.js.map

package/dist/esm/src/merkleDistributor/MerkleDistributor.js.map

@@ -1 +1 @@
-{"version":3,"file":"MerkleDistributor.js","sourceRoot":"","sources":["../../../../src/merkleDistributor/MerkleDistributor.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AAC9E,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC;IAAA;IAgCA,CAAC;IA/BC;;;;;OAKG;IACI,gDAA8B,GAArC,UAAsC,UAAmC,EAAE,WAAmB;QAC5F,IAAM,UAAU,GAAG,IAAI,UAAU,CAAwB,UAAU,EAAE,iBAAiB,CAAC,UAAU,CAAC,CAAC;QACnG,IAAM,oBAAoB,GAAG,UAAU,CAAC,MAAM,CAAC,UAAC,GAAG,EAAE,SAAS;;YAC5D,6BACK,GAAG,gBACL,SAAS,CAAC,OAAO,0BACb,SAAS,KACZ,KAAK,EAAE,UAAU,CAAC,WAAW,CAAC,SAAS,CAAC,EACxC,WAAW,aAAA,UAEb;QACJ,CAAC,EAAE,EAAsC,CAAC,CAAC;QAC3C,OAAO,EAAE,oBAAoB,sBAAA,EAAE,UAAU,EAAE,UAAU,CAAC,UAAU,EAAE,EAAE,CAAC;IACvE,CAAC;IAED;;;;;OAKG;IACI,4BAAU,GAAjB,UAAkB,SAAgC;QACxC,IAAA,OAAO,GAA2B,SAAS,QAApC,EAAE,MAAM,GAAmB,SAAS,OAA5B,EAAE,YAAY,GAAK,SAAS,aAAd,CAAe;QACpD,OAAO,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;IAC5G,CAAC;IACH,wBAAC;AAAD,CAAC,AAhCD,IAgCC"}
+{"version":3,"file":"MerkleDistributor.js","sourceRoot":"","sources":["../../../../src/merkleDistributor/MerkleDistributor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AAC9E,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,MAAM,OAAO,iBAAiB;IAC5B;;;;;OAKG;IACH,MAAM,CAAC,8BAA8B,CAAC,UAAmC,EAAE,WAAmB;QAC5F,MAAM,UAAU,GAAG,IAAI,UAAU,CAAwB,UAAU,EAAE,iBAAiB,CAAC,UAAU,CAAC,CAAC;QACnG,MAAM,oBAAoB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE;YAChE,OAAO;gBACL,GAAG,GAAG;gBACN,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;oBACnB,GAAG,SAAS;oBACZ,KAAK,EAAE,UAAU,CAAC,WAAW,CAAC,SAAS,CAAC;oBACxC,WAAW;iBACZ;aACF,CAAC;QACJ,CAAC,EAAE,EAAsC,CAAC,CAAC;QAC3C,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,UAAU,CAAC,UAAU,EAAE,EAAE,CAAC;IACvE,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,UAAU,CAAC,SAAgC;QAChD,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,SAAS,CAAC;QACpD,OAAO,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;IAC5G,CAAC;CACF"}

package/dist/esm/src/priceClient/adapters/acrossApi.js

@@ -1,49 +1,30 @@
-import { __awaiter, __extends, __generator } from "tslib";
 import { msToS } from "../priceClient";
 import { BaseHTTPAdapter } from "./baseAdapter";
-var PriceFeed = /** @class */ (function (_super) {
-    __extends(PriceFeed, _super);
-    function PriceFeed(_a) {
-        var _b = _a === void 0 ? {} : _a, _c = _b.name, name = _c === void 0 ? "Across API" : _c, _d = _b.host, host = _d === void 0 ? "across.to" : _d, _e = _b.timeout, timeout = _e === void 0 ? 5000 : _e, // ms
-        _f = _b.retries, // ms
-        retries = _f === void 0 ? 3 : _f;
+export class PriceFeed extends BaseHTTPAdapter {
+    constructor({ name = "Across API", host = "across.to", timeout = 5000, // ms
+    retries = 3, } = {}) {
         // Allow host to be overridden for test or alternative deployments.
-        return _super.call(this, name, host, { timeout: timeout, retries: retries }) || this;
+        super(name, host, { timeout, retries });
+    }
+    async getPriceByAddress(address, currency = "usd") {
+        const queryArgs = {
+            l1Token: address,
+            baseCurrency: currency,
+        };
+        const now = msToS(Date.now()) - 60; // Assume price is 60 seconds old.
+        const response = await this.query("api/coingecko", queryArgs);
+        if (!this.validateResponse(response))
+            throw new Error(`Unexpected ${this.name} response: ${JSON.stringify(response)}`);
+        return { address: address, price: response.price, timestamp: now };
     }
-    PriceFeed.prototype.getPriceByAddress = function (address_1) {
-        return __awaiter(this, arguments, void 0, function (address, currency) {
-            var queryArgs, now, response;
-            if (currency === void 0) { currency = "usd"; }
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        queryArgs = {
-                            l1Token: address,
-                            baseCurrency: currency,
-                        };
-                        now = msToS(Date.now()) - 60;
-                        return [4 /*yield*/, this.query("api/coingecko", queryArgs)];
-                    case 1:
-                        response = _a.sent();
-                        if (!this.validateResponse(response))
-                            throw new Error("Unexpected ".concat(this.name, " response: ").concat(JSON.stringify(response)));
-                        return [2 /*return*/, { address: address, price: response.price, timestamp: now }];
-                }
-            });
-        });
-    };
     // todo: Support bundled prices in the API endpoint.
-    PriceFeed.prototype.getPricesByAddress = function (addresses, currency) {
-        var _this = this;
-        if (currency === void 0) { currency = "usd"; }
-        return Promise.all(addresses.map(function (address) { return _this.getPriceByAddress(address, currency); }));
-    };
-    PriceFeed.prototype.validateResponse = function (response) {
+    getPricesByAddress(addresses, currency = "usd") {
+        return Promise.all(addresses.map((address) => this.getPriceByAddress(address, currency)));
+    }
+    validateResponse(response) {
         if (typeof response !== "object")
             return false;
         return response !== null && typeof response.price === "number";
-    };
-    return PriceFeed;
-}(BaseHTTPAdapter));
-export { PriceFeed };
+    }
+}
 //# sourceMappingURL=acrossApi.js.map

package/dist/esm/src/priceClient/adapters/acrossApi.js.map

@@ -1 +1 @@
-{"version":3,"file":"acrossApi.js","sourceRoot":"","sources":["../../../../../src/priceClient/adapters/acrossApi.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAgC,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,eAAe,EAAuB,MAAM,eAAe,CAAC;AAQrE;IAA+B,6BAAe;IAC5C,mBAAY,EAKS;YALT,qBAKO,EAAE,KAAA,EAJnB,YAAmB,EAAnB,IAAI,mBAAG,YAAY,KAAA,EACnB,YAAkB,EAAlB,IAAI,mBAAG,WAAW,KAAA,EAClB,eAAc,EAAd,OAAO,mBAAG,IAAI,KAAA,EAAE,KAAK;QACrB,eAAW,EADK,KAAK;QACrB,OAAO,mBAAG,CAAC,KAAA;QAEX,mEAAmE;QACnE,OAAA,MAAK,YAAC,IAAI,EAAE,IAAI,EAAE,EAAE,OAAO,SAAA,EAAE,OAAO,SAAA,EAAE,CAAC,SAAC;IAC1C,CAAC;IAEK,qCAAiB,GAAvB;4DAAwB,OAAe,EAAE,QAAgB;;YAAhB,yBAAA,EAAA,gBAAgB;;;;wBACjD,SAAS,GAAG;4BAChB,OAAO,EAAE,OAAO;4BAChB,YAAY,EAAE,QAAQ;yBACvB,CAAC;wBAEI,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC;wBACT,qBAAM,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,SAAS,CAAC,EAAA;;wBAAhE,QAAQ,GAAY,SAA4C;wBACtE,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC;4BAClC,MAAM,IAAI,KAAK,CAAC,qBAAc,IAAI,CAAC,IAAI,wBAAc,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAE,CAAC,CAAC;wBAEnF,sBAAO,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,EAAC;;;;KACpE;IAED,oDAAoD;IACpD,sCAAkB,GAAlB,UAAmB,SAAmB,EAAE,QAAgB;QAAxD,iBAEC;QAFuC,yBAAA,EAAA,gBAAgB;QACtD,OAAO,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,UAAC,OAAO,IAAK,OAAA,KAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAzC,CAAyC,CAAC,CAAC,CAAC;IAC5F,CAAC;IAEO,oCAAgB,GAAxB,UAAyB,QAAiB;QACxC,IAAI,OAAO,QAAQ,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC;QAC/C,OAAO,QAAQ,KAAK,IAAI,IAAI,OAAQ,QAAuC,CAAC,KAAK,KAAK,QAAQ,CAAC;IACjG,CAAC;IACH,gBAAC;AAAD,CAAC,AAlCD,CAA+B,eAAe,GAkC7C"}
+{"version":3,"file":"acrossApi.js","sourceRoot":"","sources":["../../../../../src/priceClient/adapters/acrossApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAgC,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,eAAe,EAAuB,MAAM,eAAe,CAAC;AAQrE,MAAM,OAAO,SAAU,SAAQ,eAAe;IAC5C,YAAY,EACV,IAAI,GAAG,YAAY,EACnB,IAAI,GAAG,WAAW,EAClB,OAAO,GAAG,IAAI,EAAE,KAAK;IACrB,OAAO,GAAG,CAAC,MACM,EAAE;QACnB,mEAAmE;QACnE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAAe,EAAE,QAAQ,GAAG,KAAK;QACvD,MAAM,SAAS,GAAG;YAChB,OAAO,EAAE,OAAO;YAChB,YAAY,EAAE,QAAQ;SACvB,CAAC;QAEF,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,kCAAkC;QACtE,MAAM,QAAQ,GAAY,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;QACvE,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,cAAc,IAAI,CAAC,IAAI,cAAc,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAEnF,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC;IACrE,CAAC;IAED,oDAAoD;IACpD,kBAAkB,CAAC,SAAmB,EAAE,QAAQ,GAAG,KAAK;QACtD,OAAO,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC5F,CAAC;IAEO,gBAAgB,CAAC,QAAiB;QACxC,IAAI,OAAO,QAAQ,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC;QAC/C,OAAO,QAAQ,KAAK,IAAI,IAAI,OAAQ,QAAuC,CAAC,KAAK,KAAK,QAAQ,CAAC;IACjG,CAAC;CACF"}

package/dist/esm/src/priceClient/adapters/baseAdapter.js

@@ -1,9 +1,21 @@
-import { __awaiter, __generator } from "tslib";
 import assert from "assert";
 import axios from "axios";
-var BaseHTTPAdapter = /** @class */ (function () {
-    function BaseHTTPAdapter(name, host, _a) {
-        var _b = _a.timeout, timeout = _b === void 0 ? 1000 : _b, _c = _a.retries, retries = _c === void 0 ? 1 : _c;
+export class BaseHTTPAdapter {
+    get retries() {
+        return this._retries;
+    }
+    set retries(retries) {
+        assert(retries >= 0);
+        this._retries = retries;
+    }
+    get timeout() {
+        return this._timeout;
+    }
+    set timeout(timeout) {
+        assert(timeout >= 0);
+        this._timeout = timeout;
+    }
+    constructor(name, host, { timeout = 1000, retries = 1 }) {
         this.name = name;
         this.host = host;
         this._retries = 0;
@@ -11,70 +23,30 @@ var BaseHTTPAdapter = /** @class */ (function () {
         this.retries = retries;
         this.timeout = timeout; // ms
     }
-    Object.defineProperty(BaseHTTPAdapter.prototype, "retries", {
-        get: function () {
-            return this._retries;
-        },
-        set: function (retries) {
-            assert(retries >= 0);
-            this._retries = retries;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(BaseHTTPAdapter.prototype, "timeout", {
-        get: function () {
-            return this._timeout;
-        },
-        set: function (timeout) {
-            assert(timeout >= 0);
-            this._timeout = timeout;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    BaseHTTPAdapter.prototype.query = function (path, urlArgs) {
-        return __awaiter(this, void 0, void 0, function () {
-            var url, args, errs, tries, err_1, errMsg;
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        url = "https://".concat(this.host, "/").concat(path !== null && path !== void 0 ? path : "");
-                        args = {
-                            headers: { "User-Agent": (_a = process.env.ACROSS_USER_AGENT) !== null && _a !== void 0 ? _a : "across-protocol" },
-                            timeout: this.timeout,
-                            params: urlArgs !== null && urlArgs !== void 0 ? urlArgs : {},
-                        };
-                        errs = [];
-                        tries = 0;
-                        _b.label = 1;
-                    case 1:
-                        _b.trys.push([1, 3, , 6]);
-                        return [4 /*yield*/, axios(url, args)];
-                    case 2: return [2 /*return*/, (_b.sent()).data];
-                    case 3:
-                        err_1 = _b.sent();
-                        errMsg = axios.isAxiosError(err_1) || err_1 instanceof Error ? err_1.message : "unknown error";
-                        errs.push(errMsg);
-                        if (!(++tries <= this.retries)) return [3 /*break*/, 5];
-                        return [4 /*yield*/, this.sleep(Math.pow(1.5, tries) * 1000)];
-                    case 4:
-                        _b.sent(); // simple backoff
-                        _b.label = 5;
-                    case 5: return [3 /*break*/, 6];
-                    case 6:
-                        if (tries <= this.retries) return [3 /*break*/, 1];
-                        _b.label = 7;
-                    case 7: throw new Error("".concat(this.name, " price lookup failure (").concat(errs.join(", "), ")"));
-                }
-            });
-        });
-    };
-    BaseHTTPAdapter.prototype.sleep = function (ms) {
-        return new Promise(function (r) { return setTimeout(r, ms); });
-    };
-    return BaseHTTPAdapter;
-}());
-export { BaseHTTPAdapter };
+    async query(path, urlArgs) {
+        const url = `https://${this.host}/${path ?? ""}`;
+        const args = {
+            headers: { "User-Agent": process.env.ACROSS_USER_AGENT ?? "across-protocol" },
+            timeout: this.timeout,
+            params: urlArgs ?? {},
+        };
+        const errs = [];
+        let tries = 0;
+        do {
+            try {
+                return (await axios(url, args)).data;
+            }
+            catch (err) {
+                const errMsg = axios.isAxiosError(err) || err instanceof Error ? err.message : "unknown error";
+                errs.push(errMsg);
+                if (++tries <= this.retries)
+                    await this.sleep(Math.pow(1.5, tries) * 1000); // simple backoff
+            }
+        } while (tries <= this.retries);
+        throw new Error(`${this.name} price lookup failure (${errs.join(", ")})`);
+    }
+    sleep(ms) {
+        return new Promise((r) => setTimeout(r, ms));
+    }
+}
 //# sourceMappingURL=baseAdapter.js.map

package/dist/esm/src/priceClient/adapters/baseAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"baseAdapter.js","sourceRoot":"","sources":["../../../../../src/priceClient/adapters/baseAdapter.ts"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B;IAsBE,yBACkB,IAAY,EACZ,IAAY,EAC5B,EAAoD;YAAlD,eAAc,EAAd,OAAO,mBAAG,IAAI,KAAA,EAAE,eAAW,EAAX,OAAO,mBAAG,CAAC,KAAA;QAFb,SAAI,GAAJ,IAAI,CAAQ;QACZ,SAAI,GAAJ,IAAI,CAAQ;QAvBtB,aAAQ,GAAG,CAAC,CAAC;QACb,aAAQ,GAAG,CAAC,CAAC;QAyBnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC,KAAK;IAC/B,CAAC;IAzBD,sBAAI,oCAAO;aAAX;YACE,OAAO,IAAI,CAAC,QAAQ,CAAC;QACvB,CAAC;aAED,UAAY,OAAe;YACzB,MAAM,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC;YACrB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QAC1B,CAAC;;;OALA;IAOD,sBAAI,oCAAO;aAAX;YACE,OAAO,IAAI,CAAC,QAAQ,CAAC;QACvB,CAAC;aAED,UAAY,OAAe;YACzB,MAAM,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC;YACrB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QAC1B,CAAC;;;OALA;IAgBe,+BAAK,GAArB,UAAsB,IAAY,EAAE,OAAgB;;;;;;;wBAC5C,GAAG,GAAG,kBAAW,IAAI,CAAC,IAAI,cAAI,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,EAAE,CAAE,CAAC;wBAC3C,IAAI,GAAG;4BACX,OAAO,EAAE,EAAE,YAAY,EAAE,MAAA,OAAO,CAAC,GAAG,CAAC,iBAAiB,mCAAI,iBAAiB,EAAE;4BAC7E,OAAO,EAAE,IAAI,CAAC,OAAO;4BACrB,MAAM,EAAE,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE;yBACtB,CAAC;wBAEI,IAAI,GAAa,EAAE,CAAC;wBACtB,KAAK,GAAG,CAAC,CAAC;;;;wBAGF,qBAAM,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,EAAA;4BAA9B,sBAAO,CAAC,SAAsB,CAAC,CAAC,IAAI,EAAC;;;wBAE/B,MAAM,GAAG,KAAK,CAAC,YAAY,CAAC,KAAG,CAAC,IAAI,KAAG,YAAY,KAAK,CAAC,CAAC,CAAC,KAAG,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC;wBAC/F,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;6BACd,CAAA,EAAE,KAAK,IAAI,IAAI,CAAC,OAAO,CAAA,EAAvB,wBAAuB;wBAAE,qBAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,IAAI,CAAC,EAAA;;wBAA7C,SAA6C,CAAC,CAAC,iBAAiB;;;;4BAExF,KAAK,IAAI,IAAI,CAAC,OAAO;;4BAE9B,MAAM,IAAI,KAAK,CAAC,UAAG,IAAI,CAAC,IAAI,oCAA0B,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAG,CAAC,CAAC;;;;KAC3E;IAES,+BAAK,GAAf,UAAgB,EAAU;QACxB,OAAO,IAAI,OAAO,CAAC,UAAC,CAAC,IAAK,OAAA,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,EAAjB,CAAiB,CAAC,CAAC;IAC/C,CAAC;IACH,sBAAC;AAAD,CAAC,AAzDD,IAyDC"}
+{"version":3,"file":"baseAdapter.js","sourceRoot":"","sources":["../../../../../src/priceClient/adapters/baseAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,MAAM,OAAO,eAAe;IAI1B,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,IAAI,OAAO,CAAC,OAAe;QACzB,MAAM,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,IAAI,OAAO,CAAC,OAAe;QACzB,MAAM,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED,YACkB,IAAY,EACZ,IAAY,EAC5B,EAAE,OAAO,GAAG,IAAI,EAAE,OAAO,GAAG,CAAC,EAAuB;QAFpC,SAAI,GAAJ,IAAI,CAAQ;QACZ,SAAI,GAAJ,IAAI,CAAQ;QAvBtB,aAAQ,GAAG,CAAC,CAAC;QACb,aAAQ,GAAG,CAAC,CAAC;QAyBnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC,KAAK;IAC/B,CAAC;IAES,KAAK,CAAC,KAAK,CAAC,IAAY,EAAE,OAAgB;QAClD,MAAM,GAAG,GAAG,WAAW,IAAI,CAAC,IAAI,IAAI,IAAI,IAAI,EAAE,EAAE,CAAC;QACjD,MAAM,IAAI,GAAG;YACX,OAAO,EAAE,EAAE,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,iBAAiB,EAAE;YAC7E,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,MAAM,EAAE,OAAO,IAAI,EAAE;SACtB,CAAC;QAEF,MAAM,IAAI,GAAa,EAAE,CAAC;QAC1B,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,GAAG,CAAC;YACF,IAAI,CAAC;gBACH,OAAO,CAAC,MAAM,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;YACvC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,MAAM,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC;gBAC/F,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAClB,IAAI,EAAE,KAAK,IAAI,IAAI,CAAC,OAAO;oBAAE,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,iBAAiB;YAC/F,CAAC;QACH,CAAC,QAAQ,KAAK,IAAI,IAAI,CAAC,OAAO,EAAE;QAEhC,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC,IAAI,0BAA0B,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC5E,CAAC;IAES,KAAK,CAAC,EAAU;QACxB,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IAC/C,CAAC;CACF"}