@across-protocol/sdk 4.3.110 → 4.3.111-alpha.1

package/dist/esm/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/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/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 ??= 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/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,KAAK,IAAI,EAAE,CAAC,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/lpFeeCalculator/lpFeeCalculator.js

@@ -3,21 +3,22 @@
 // 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 {
+    rateModel;
+    constructor(rateModel) {
         this.rateModel = rateModel;
     }
     /**
@@ -26,42 +27,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 +71,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 +83,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 +121,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/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/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/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/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/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/pool/TransactionManager.js

@@ -1,122 +1,67 @@
-import { __awaiter, __generator } from "tslib";
 import assert from "assert";
 function makeKey(tx) {
-    return JSON.stringify(Object.entries(tx).map(function (_a) {
-        var key = _a[0], value = _a[1];
+    return JSON.stringify(Object.entries(tx).map(([key, value]) => {
         return [key, (value || "").toString()];
     }));
 }
-export default (function (config, signer, emit) {
-    if (emit === void 0) { emit = function () { return null; }; }
+export default (config, signer, emit = () => null) => {
     assert(signer.provider, "signer requires a provider, use signer.connect(provider)");
-    var _a = config.confirmations, confirmations = _a === void 0 ? 3 : _a;
-    var requests = new Map();
-    var submissions = new Map();
-    var mined = new Map();
+    const { confirmations = 3 } = config;
+    const requests = new Map();
+    const submissions = new Map();
+    const mined = new Map();
     function request(unsignedTx) {
         // this no longer calls signer.populateTransaction, to allow metamask to fill in missing details instead
         // use overrides if you want to manually fill in other tx details, including the overrides.customData field.
-        var populated = unsignedTx;
-        var key = makeKey(populated);
+        const populated = unsignedTx;
+        const key = makeKey(populated);
         assert(!requests.has(key), "Transaction already in progress");
         requests.set(key, populated);
         return key;
     }
-    function processRequest(key) {
-        return __awaiter(this, void 0, void 0, function () {
-            var request, sent, err_1;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        request = requests.get(key);
-                        assert(request, "invalid request");
-                        // always delete request, it should only be submitted once
-                        requests.delete(key);
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, signer.sendTransaction(request)];
-                    case 2:
-                        sent = _a.sent();
-                        submissions.set(key, sent.hash);
-                        emit("submitted", key, sent.hash);
-                        return [3 /*break*/, 4];
-                    case 3:
-                        err_1 = _a.sent();
-                        emit("error", key, err_1);
-                        return [3 /*break*/, 4];
-                    case 4: return [2 /*return*/];
-                }
-            });
-        });
+    async function processRequest(key) {
+        const request = requests.get(key);
+        assert(request, "invalid request");
+        // always delete request, it should only be submitted once
+        requests.delete(key);
+        try {
+            const sent = await signer.sendTransaction(request);
+            submissions.set(key, sent.hash);
+            emit("submitted", key, sent.hash);
+        }
+        catch (err) {
+            emit("error", key, err);
+        }
     }
-    function processSubmission(key) {
-        return __awaiter(this, void 0, void 0, function () {
-            var hash, receipt;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        hash = submissions.get(key);
-                        assert(hash, "invalid submission");
-                        assert(signer.provider, "signer requires a provider, use signer.connect(provider)");
-                        return [4 /*yield*/, signer.provider.getTransactionReceipt(hash).catch(function () { return undefined; })];
-                    case 1:
-                        receipt = _a.sent();
-                        if (receipt == null)
-                            return [2 /*return*/];
-                        if (receipt.confirmations < confirmations)
-                            return [2 /*return*/];
-                        submissions.delete(key);
-                        mined.set(key, receipt);
-                        emit("mined", key, receipt);
-                        return [2 /*return*/];
-                }
-            });
-        });
+    async function processSubmission(key) {
+        const hash = submissions.get(key);
+        assert(hash, "invalid submission");
+        assert(signer.provider, "signer requires a provider, use signer.connect(provider)");
+        // we look for this transaction, but it may never find it if its sped up
+        const receipt = await signer.provider.getTransactionReceipt(hash).catch(() => undefined);
+        if (receipt == null)
+            return;
+        if (receipt.confirmations < confirmations)
+            return;
+        submissions.delete(key);
+        mined.set(key, receipt);
+        emit("mined", key, receipt);
     }
     function isMined(key) {
         return mined.get(key);
     }
-    function update() {
-        return __awaiter(this, void 0, void 0, function () {
-            var _i, _a, key, _b, _c, key;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        _i = 0, _a = Object.keys(requests);
-                        _d.label = 1;
-                    case 1:
-                        if (!(_i < _a.length)) return [3 /*break*/, 4];
-                        key = _a[_i];
-                        return [4 /*yield*/, processRequest(key)];
-                    case 2:
-                        _d.sent();
-                        _d.label = 3;
-                    case 3:
-                        _i++;
-                        return [3 /*break*/, 1];
-                    case 4:
-                        _b = 0, _c = Object.keys(submissions);
-                        _d.label = 5;
-                    case 5:
-                        if (!(_b < _c.length)) return [3 /*break*/, 8];
-                        key = _c[_b];
-                        return [4 /*yield*/, processSubmission(key)];
-                    case 6:
-                        _d.sent();
-                        _d.label = 7;
-                    case 7:
-                        _b++;
-                        return [3 /*break*/, 5];
-                    case 8: return [2 /*return*/];
-                }
-            });
-        });
+    async function update() {
+        for (const key of Object.keys(requests)) {
+            await processRequest(key);
+        }
+        for (const key of Object.keys(submissions)) {
+            await processSubmission(key);
+        }
     }
     return {
-        request: request,
-        isMined: isMined,
-        update: update,
+        request,
+        isMined,
+        update,
     };
-});
+};
 //# sourceMappingURL=TransactionManager.js.map

package/dist/esm/pool/TransactionManager.js.map

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