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

package/dist/esm/clients/BundleDataClient/utils/FillUtils.js

@@ -1,4 +1,3 @@
-import { __assign, __awaiter, __generator } from "tslib";
 import _ from "lodash";
 import assert from "assert";
 import { providers } from "ethers";
@@ -11,23 +10,23 @@ import { isSlowFill, isValidEvmAddress, isDefined, chainIsEvm, toAddressType } f
  * @return The chain to send the refund to and the token to use for the refund.
  */
 export function getRefundInformationFromFill(relayData, hubPoolClient, bundleEndBlockForMainnet) {
-    var chainToSendRefundTo = _getRepaymentChainId(relayData, hubPoolClient, bundleEndBlockForMainnet);
+    const chainToSendRefundTo = _getRepaymentChainId(relayData, hubPoolClient, bundleEndBlockForMainnet);
     if (chainToSendRefundTo === relayData.originChainId) {
         return {
-            chainToSendRefundTo: chainToSendRefundTo,
+            chainToSendRefundTo,
             repaymentToken: relayData.inputToken,
         };
     }
     // Now figure out the equivalent L2 token for the repayment token. If the inputToken doesn't have a
     // PoolRebalanceRoute, then the repayment chain would have been the originChainId after the getRepaymentChainId()
     // call and we would have returned already, so the following call should always return a valid L1 token.
-    var l1TokenCounterpart = hubPoolClient.getL1TokenForL2TokenAtBlock(relayData.inputToken, relayData.originChainId, bundleEndBlockForMainnet);
+    const l1TokenCounterpart = hubPoolClient.getL1TokenForL2TokenAtBlock(relayData.inputToken, relayData.originChainId, bundleEndBlockForMainnet);
     assert(isDefined(l1TokenCounterpart), "getRefundInformationFromFill: l1TokenCounterpart is undefined");
-    var repaymentToken = hubPoolClient.getL2TokenForL1TokenAtBlock(l1TokenCounterpart, chainToSendRefundTo, bundleEndBlockForMainnet);
+    const repaymentToken = hubPoolClient.getL2TokenForL1TokenAtBlock(l1TokenCounterpart, chainToSendRefundTo, bundleEndBlockForMainnet);
     assert(isDefined(repaymentToken), "getRefundInformationFromFill: repaymentToken is undefined");
     return {
-        chainToSendRefundTo: chainToSendRefundTo,
-        repaymentToken: repaymentToken,
+        chainToSendRefundTo,
+        repaymentToken,
     };
 }
 /**
@@ -40,56 +39,55 @@ export function getRefundInformationFromFill(relayData, hubPoolClient, bundleEnd
  * and applied repayment address, or undefined if the applied repayment address is not valid for the
  * applied repayment chain.
  */
-export function verifyFillRepayment(_fill, destinationChainProvider, matchedDeposit, hubPoolClient, bundleEndBlockForMainnet) {
-    return __awaiter(this, void 0, void 0, function () {
-        var fill, repaymentChainId, fillTransaction, destinationRelayer;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    fill = _.cloneDeep(_fill);
-                    // Slow fills don't result in repayments so they're always valid.
-                    if (isSlowFill(fill)) {
-                        return [2 /*return*/, fill];
-                    }
-                    repaymentChainId = _getRepaymentChainId(__assign(__assign({}, fill), { fromLiteChain: matchedDeposit.fromLiteChain }), hubPoolClient, bundleEndBlockForMainnet);
-                    if (!_repaymentAddressNeedsToBeOverwritten(fill)) return [3 /*break*/, 3];
-                    if (!chainIsEvm(fill.destinationChainId)) return [3 /*break*/, 2];
-                    assert(destinationChainProvider instanceof providers.Provider, "BundleDataClient#verifyFillRepayment: unexpected destination chain provider for chain ID ".concat(fill.destinationChainId));
-                    return [4 /*yield*/, destinationChainProvider.getTransaction(fill.txnRef)];
-                case 1:
-                    fillTransaction = _a.sent();
-                    destinationRelayer = fillTransaction === null || fillTransaction === void 0 ? void 0 : fillTransaction.from;
-                    // Repayment chain is still an EVM chain, but the msg.sender is a bytes32 address, so the fill is invalid.
-                    if (!isDefined(destinationRelayer) || !isValidEvmAddress(destinationRelayer)) {
-                        return [2 /*return*/, undefined];
-                    }
-                    // If we can switch the repayment chain to the destination chain, then do so. We should only switch if the
-                    // destination chain has a valid repayment token that is equivalent to the deposited input token. This would
-                    // also be the same mapping as the repayment token on the repayment chain.
-                    if (!matchedDeposit.fromLiteChain &&
-                        hubPoolClient.areTokensEquivalent(fill.inputToken, fill.originChainId, fill.outputToken, fill.destinationChainId)) {
-                        repaymentChainId = fill.destinationChainId;
-                    }
-                    // If we can't switch the chain, then we need to verify that the msg.sender is a valid address on the repayment chain.
-                    // Because we already checked that the `destinationRelayer` was a valid EVM address above, we only need to check
-                    // that the repayment chain is an EVM chain.
-                    else {
-                        if (!chainIsEvm(repaymentChainId)) {
-                            return [2 /*return*/, undefined];
-                        }
-                    }
-                    fill.relayer = toAddressType(destinationRelayer, fill.destinationChainId);
-                    assert(fill.relayer.isValidOn(fill.destinationChainId), "Cannot re-assign fill to msg.sender: ".concat(destinationRelayer));
-                    return [3 /*break*/, 3];
-                case 2: return [2 /*return*/, undefined];
-                case 3:
-                    // Repayment address is now valid and repayment chain is either origin chain for lite chain or the destination
-                    // chain for cases where the repayment address was invalid. Fill should be valid now.
-                    fill.repaymentChainId = repaymentChainId;
-                    return [2 /*return*/, fill];
+export async function verifyFillRepayment(_fill, destinationChainProvider, matchedDeposit, hubPoolClient, bundleEndBlockForMainnet) {
+    const fill = _.cloneDeep(_fill);
+    // Slow fills don't result in repayments so they're always valid.
+    if (isSlowFill(fill)) {
+        return fill;
+    }
+    let repaymentChainId = _getRepaymentChainId({
+        ...fill,
+        fromLiteChain: matchedDeposit.fromLiteChain,
+    }, hubPoolClient, bundleEndBlockForMainnet);
+    // Repayments will always go to the fill.relayer address so check if its a valid EVM address. If its not, attempt
+    // to change it to the msg.sender of the FilledRelay.
+    if (_repaymentAddressNeedsToBeOverwritten(fill)) {
+        // TODO: Handle case where fill was sent on non-EVM chain, in which case the following call would fail
+        // or return something unexpected. We'd want to return undefined here.
+        if (chainIsEvm(fill.destinationChainId)) {
+            assert(destinationChainProvider instanceof providers.Provider, `BundleDataClient#verifyFillRepayment: unexpected destination chain provider for chain ID ${fill.destinationChainId}`);
+            const fillTransaction = await destinationChainProvider.getTransaction(fill.txnRef);
+            const destinationRelayer = fillTransaction?.from;
+            // Repayment chain is still an EVM chain, but the msg.sender is a bytes32 address, so the fill is invalid.
+            if (!isDefined(destinationRelayer) || !isValidEvmAddress(destinationRelayer)) {
+                return undefined;
             }
-        });
-    });
+            // If we can switch the repayment chain to the destination chain, then do so. We should only switch if the
+            // destination chain has a valid repayment token that is equivalent to the deposited input token. This would
+            // also be the same mapping as the repayment token on the repayment chain.
+            if (!matchedDeposit.fromLiteChain &&
+                hubPoolClient.areTokensEquivalent(fill.inputToken, fill.originChainId, fill.outputToken, fill.destinationChainId)) {
+                repaymentChainId = fill.destinationChainId;
+            }
+            // If we can't switch the chain, then we need to verify that the msg.sender is a valid address on the repayment chain.
+            // Because we already checked that the `destinationRelayer` was a valid EVM address above, we only need to check
+            // that the repayment chain is an EVM chain.
+            else {
+                if (!chainIsEvm(repaymentChainId)) {
+                    return undefined;
+                }
+            }
+            fill.relayer = toAddressType(destinationRelayer, fill.destinationChainId);
+            assert(fill.relayer.isValidOn(fill.destinationChainId), `Cannot re-assign fill to msg.sender: ${destinationRelayer}`);
+        }
+        else {
+            return undefined;
+        }
+    }
+    // Repayment address is now valid and repayment chain is either origin chain for lite chain or the destination
+    // chain for cases where the repayment address was invalid. Fill should be valid now.
+    fill.repaymentChainId = repaymentChainId;
+    return fill;
 }
 function _getRepaymentChainId(relayData, hubPoolClient, bundleEndBlockForMainnet) {
     if (relayData.fromLiteChain) {
@@ -102,8 +100,8 @@ function _getRepaymentChainId(relayData, hubPoolClient, bundleEndBlockForMainnet
         return relayData.destinationChainId;
     }
     // Repayment chain is valid if the input token and repayment chain are mapped to the same PoolRebalanceRoute and the repayment chain is not disabled in protocol.
-    var repaymentTokenIsValid = _repaymentChainTokenIsValid(relayData, hubPoolClient, bundleEndBlockForMainnet);
-    var repaymentChainIsValid = !hubPoolClient.configStoreClient
+    const repaymentTokenIsValid = _repaymentChainTokenIsValid(relayData, hubPoolClient, bundleEndBlockForMainnet);
+    const repaymentChainIsValid = !hubPoolClient.configStoreClient
         .getDisabledChainsForBlock(bundleEndBlockForMainnet)
         .includes(relayData.repaymentChainId);
     if (repaymentTokenIsValid && repaymentChainIsValid) {
@@ -116,7 +114,7 @@ function _repaymentChainTokenIsValid(relayData, hubPoolClient, bundleEndBlockFor
     if (!hubPoolClient.l2TokenHasPoolRebalanceRoute(relayData.inputToken, relayData.originChainId, bundleEndBlockForMainnet)) {
         return false;
     }
-    var l1TokenCounterpart = hubPoolClient.getL1TokenForL2TokenAtBlock(relayData.inputToken, relayData.originChainId, bundleEndBlockForMainnet);
+    const l1TokenCounterpart = hubPoolClient.getL1TokenForL2TokenAtBlock(relayData.inputToken, relayData.originChainId, bundleEndBlockForMainnet);
     if (!l1TokenCounterpart) {
         return false;
     }

package/dist/esm/clients/BundleDataClient/utils/FillUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"FillUtils.js","sourceRoot":"","sources":["../../../../../src/clients/BundleDataClient/utils/FillUtils.ts"],"names":[],"mappings":";AAAA,OAAO,CAAC,MAAM,QAAQ,CAAC;AACvB,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,SAAS,EAAE,UAAU,EAAW,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAU9G;;;;;;GAMG;AACH,MAAM,UAAU,4BAA4B,CAC1C,SAAmC,EACnC,aAA4B,EAC5B,wBAAgC;IAKhC,IAAM,mBAAmB,GAAG,oBAAoB,CAAC,SAAS,EAAE,aAAa,EAAE,wBAAwB,CAAC,CAAC;IACrG,IAAI,mBAAmB,KAAK,SAAS,CAAC,aAAa,EAAE,CAAC;QACpD,OAAO;YACL,mBAAmB,qBAAA;YACnB,cAAc,EAAE,SAAS,CAAC,UAAU;SACrC,CAAC;IACJ,CAAC;IAED,mGAAmG;IACnG,iHAAiH;IACjH,wGAAwG;IACxG,IAAM,kBAAkB,GAAG,aAAa,CAAC,2BAA2B,CAClE,SAAS,CAAC,UAAU,EACpB,SAAS,CAAC,aAAa,EACvB,wBAAwB,CACzB,CAAC;IAEF,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC,EAAE,+DAA+D,CAAC,CAAC;IAEvG,IAAM,cAAc,GAAG,aAAa,CAAC,2BAA2B,CAC9D,kBAAkB,EAClB,mBAAmB,EACnB,wBAAwB,CACzB,CAAC;IACF,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,2DAA2D,CAAC,CAAC;IAE/F,OAAO;QACL,mBAAmB,qBAAA;QACnB,cAAc,gBAAA;KACf,CAAC;AACJ,CAAC;AACD;;;;;;;;;GASG;AACH,MAAM,UAAgB,mBAAmB,CACvC,KAAoB,EACpB,wBAA0D,EAC1D,cAAgC,EAChC,aAA4B,EAC5B,wBAAgC;;;;;;oBAE1B,IAAI,GAAG,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBAEhC,iEAAiE;oBACjE,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;wBACrB,sBAAO,IAAI,EAAC;oBACd,CAAC;oBAEG,gBAAgB,GAAG,oBAAoB,uBAEpC,IAAI,KACP,aAAa,EAAE,cAAc,CAAC,aAAa,KAE7C,aAAa,EACb,wBAAwB,CACzB,CAAC;yBAIE,qCAAqC,CAAC,IAAI,CAAC,EAA3C,wBAA2C;yBAGzC,UAAU,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAnC,wBAAmC;oBACrC,MAAM,CACJ,wBAAwB,YAAY,SAAS,CAAC,QAAQ,EACtD,mGAA4F,IAAI,CAAC,kBAAkB,CAAE,CACtH,CAAC;oBACsB,qBAAM,wBAAwB,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,EAAA;;oBAA5E,eAAe,GAAG,SAA0D;oBAC5E,kBAAkB,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAI,CAAC;oBACjD,0GAA0G;oBAC1G,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,EAAE,CAAC;wBAC7E,sBAAO,SAAS,EAAC;oBACnB,CAAC;oBACD,0GAA0G;oBAC1G,4GAA4G;oBAC5G,0EAA0E;oBAC1E,IACE,CAAC,cAAc,CAAC,aAAa;wBAC7B,aAAa,CAAC,mBAAmB,CAC/B,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,kBAAkB,CACxB,EACD,CAAC;wBACD,gBAAgB,GAAG,IAAI,CAAC,kBAAkB,CAAC;oBAC7C,CAAC;oBACD,sHAAsH;oBACtH,gHAAgH;oBAChH,4CAA4C;yBACvC,CAAC;wBACJ,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;4BAClC,sBAAO,SAAS,EAAC;wBACnB,CAAC;oBACH,CAAC;oBACD,IAAI,CAAC,OAAO,GAAG,aAAa,CAAC,kBAAkB,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;oBAC1E,MAAM,CACJ,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAC/C,+CAAwC,kBAAkB,CAAE,CAC7D,CAAC;;wBAEF,sBAAO,SAAS,EAAC;;oBAIrB,8GAA8G;oBAC9G,qFAAqF;oBACrF,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;oBACzC,sBAAO,IAAI,EAAC;;;;CACb;AAED,SAAS,oBAAoB,CAC3B,SAAmC,EACnC,aAA4B,EAC5B,wBAAgC;IAEhC,IAAI,SAAS,CAAC,aAAa,EAAE,CAAC;QAC5B,MAAM,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,yEAAyE,CAAC,CAAC;QAC1G,OAAO,SAAS,CAAC,aAAa,CAAC;IACjC,CAAC;IAED,oGAAoG;IACpG,yDAAyD;IACzD,IAAI,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAC1B,OAAO,SAAS,CAAC,kBAAkB,CAAC;IACtC,CAAC;IAED,iKAAiK;IACjK,IAAM,qBAAqB,GAAG,2BAA2B,CAAC,SAAS,EAAE,aAAa,EAAE,wBAAwB,CAAC,CAAC;IAC9G,IAAM,qBAAqB,GAAG,CAAC,aAAa,CAAC,iBAAiB;SAC3D,yBAAyB,CAAC,wBAAwB,CAAC;SACnD,QAAQ,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;IACxC,IAAI,qBAAqB,IAAI,qBAAqB,EAAE,CAAC;QACnD,OAAO,SAAS,CAAC,gBAAgB,CAAC;IACpC,CAAC;IAED,iHAAiH;IACjH,OAAO,SAAS,CAAC,aAAa,CAAC;AACjC,CAAC;AAED,SAAS,2BAA2B,CAClC,SAAmC,EACnC,aAA4B,EAC5B,wBAAgC;IAEhC,IACE,CAAC,aAAa,CAAC,4BAA4B,CAAC,SAAS,CAAC,UAAU,EAAE,SAAS,CAAC,aAAa,EAAE,wBAAwB,CAAC,EACpH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAM,kBAAkB,GAAG,aAAa,CAAC,2BAA2B,CAClE,SAAS,CAAC,UAAU,EACpB,SAAS,CAAC,aAAa,EACvB,wBAAwB,CACzB,CAAC;IACF,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IACE,CAAC,aAAa,CAAC,+BAA+B,CAC5C,kBAAkB,EAClB,SAAS,CAAC,gBAAgB,EAC1B,wBAAwB,CACzB,EACD,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,qCAAqC,CAAC,IAAU;IACvD,iEAAiE;IACjE,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACrB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,iGAAiG;IACjG,wGAAwG;IACxG,YAAY;IACZ,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;AACxD,CAAC"}
+{"version":3,"file":"FillUtils.js","sourceRoot":"","sources":["../../../../../src/clients/BundleDataClient/utils/FillUtils.ts"],"names":[],"mappings":"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"}

package/dist/esm/clients/BundleDataClient/utils/MerkleTreeUtils.js

@@ -1,9 +1,8 @@
-import { __assign } from "tslib";
 import { MerkleTree } from "@across-protocol/contracts";
 import { getParamType } from "../../../utils/ContractUtils";
 import { utils } from "ethers";
 export function buildPoolRebalanceLeafTree(poolRebalanceLeaves) {
-    for (var i = 0; i < poolRebalanceLeaves.length; i++) {
+    for (let i = 0; i < poolRebalanceLeaves.length; i++) {
         // The 4 provided parallel arrays must be of equal length. Running Balances can optionally be 2x the length
         if (poolRebalanceLeaves[i].l1Tokens.length !== poolRebalanceLeaves[i].bundleLpFees.length ||
             poolRebalanceLeaves[i].netSendAmounts.length !== poolRebalanceLeaves[i].bundleLpFees.length) {
@@ -14,9 +13,12 @@ export function buildPoolRebalanceLeafTree(poolRebalanceLeaves) {
             throw new Error("Running balances length unexpected");
         }
     }
-    var paramType = getParamType("MerkleLibTest", "verifyPoolRebalance", "rebalance");
-    var hashFn = function (input) {
-        var ethersLeaf = __assign(__assign({}, input), { l1Tokens: input.l1Tokens.map(function (l1Token) { return l1Token.toEvmAddress(); }) });
+    const paramType = getParamType("MerkleLibTest", "verifyPoolRebalance", "rebalance");
+    const hashFn = (input) => {
+        const ethersLeaf = {
+            ...input,
+            l1Tokens: input.l1Tokens.map((l1Token) => l1Token.toEvmAddress()),
+        };
         return utils.keccak256(utils.defaultAbiCoder.encode([paramType], [ethersLeaf]));
     };
     return new MerkleTree(poolRebalanceLeaves, hashFn);

package/dist/esm/clients/BundleDataClient/utils/MerkleTreeUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"MerkleTreeUtils.js","sourceRoot":"","sources":["../../../../../src/clients/BundleDataClient/utils/MerkleTreeUtils.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAE/B,MAAM,UAAU,0BAA0B,CAAC,mBAAwC;IACjF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,mBAAmB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACpD,2GAA2G;QAC3G,IACE,mBAAmB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,KAAK,mBAAmB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM;YACrF,mBAAmB,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,KAAK,mBAAmB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,EAC3F,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACjE,CAAC;QACD,IACE,mBAAmB,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,KAAK,mBAAmB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC;YAChG,mBAAmB,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,KAAK,mBAAmB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,EAC5F,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QACxD,CAAC;IACH,CAAC;IAED,IAAM,SAAS,GAAG,YAAY,CAAC,eAAe,EAAE,qBAAqB,EAAE,WAAW,CAAC,CAAC;IACpF,IAAM,MAAM,GAAG,UAAC,KAAwB;QACtC,IAAM,UAAU,yBACX,KAAK,KACR,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAC,OAAO,IAAK,OAAA,OAAO,CAAC,YAAY,EAAE,EAAtB,CAAsB,CAAC,GAClE,CAAC;QACF,OAAO,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAClF,CAAC,CAAC;IACF,OAAO,IAAI,UAAU,CAAoB,mBAAmB,EAAE,MAAM,CAAC,CAAC;AACxE,CAAC"}
+{"version":3,"file":"MerkleTreeUtils.js","sourceRoot":"","sources":["../../../../../src/clients/BundleDataClient/utils/MerkleTreeUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAE/B,MAAM,UAAU,0BAA0B,CAAC,mBAAwC;IACjF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,mBAAmB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACpD,2GAA2G;QAC3G,IACE,mBAAmB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,KAAK,mBAAmB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM;YACrF,mBAAmB,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,KAAK,mBAAmB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,EAC3F,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACjE,CAAC;QACD,IACE,mBAAmB,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,KAAK,mBAAmB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC;YAChG,mBAAmB,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,KAAK,mBAAmB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,EAC5F,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QACxD,CAAC;IACH,CAAC;IAED,MAAM,SAAS,GAAG,YAAY,CAAC,eAAe,EAAE,qBAAqB,EAAE,WAAW,CAAC,CAAC;IACpF,MAAM,MAAM,GAAG,CAAC,KAAwB,EAAE,EAAE;QAC1C,MAAM,UAAU,GAAG;YACjB,GAAG,KAAK;YACR,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;SAClE,CAAC;QACF,OAAO,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAClF,CAAC,CAAC;IACF,OAAO,IAAI,UAAU,CAAoB,mBAAmB,EAAE,MAAM,CAAC,CAAC;AACxE,CAAC"}

package/dist/esm/clients/BundleDataClient/utils/PoolRebalanceUtils.js

@@ -1,4 +1,3 @@
-import { __awaiter, __generator } from "tslib";
 import { isSVMSpokePoolClient } from "../../SpokePoolClient";
 import { bnZero, chainIsEvm, chainIsSvm, compareAddresses, EvmAddress, isDefined } from "../../../utils";
 import { getLatestFinalizedSlotWithBlock } from "../../../arch/svm";
@@ -7,61 +6,53 @@ import assert from "assert";
 // when evaluating  pending root bundle. The block end numbers must be less than the latest blocks for each chain ID
 // (because we can't evaluate events in the future), and greater than the expected start blocks, which are the
 // greater of 0 and the latest bundle end block for an executed root bundle proposal + 1.
-export function getWidestPossibleExpectedBlockRange(chainIds_1, spokeClients_1, endBlockBuffers_1, clients_1, latestMainnetBlock_1, enabledChains_1) {
-    return __awaiter(this, arguments, void 0, function (chainIds, spokeClients, endBlockBuffers, clients, latestMainnetBlock, enabledChains, optimistic) {
-        var resolveEndBlock, resolveSVMEndBlock, latestPossibleBundleEndBlockNumbers;
-        if (optimistic === void 0) { optimistic = false; }
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    resolveEndBlock = function (chainId, idx) {
-                        return Math.max(spokeClients[chainId].latestHeightSearched - endBlockBuffers[idx], 0);
-                    };
-                    resolveSVMEndBlock = function (chainId, idx) {
-                        var spokePoolClient = spokeClients[chainId];
-                        assert(isSVMSpokePoolClient(spokePoolClient));
-                        var maxSlot = resolveEndBlock(chainId, idx); // Respect any configured buffer for Solana.
-                        return getLatestFinalizedSlotWithBlock(spokePoolClient.svmEventsClient.getRpc(), spokePoolClient.logger, BigInt(maxSlot));
-                    };
-                    return [4 /*yield*/, Promise.all(chainIds.map(function (chainId, idx) {
-                            if (!enabledChains.includes(chainId) || !isDefined(spokeClients[chainId])) {
-                                return -1; // Chain is disabled; end block is redundant and will be overridden later.
-                            }
-                            if (chainIsEvm(chainId)) {
-                                return Promise.resolve(resolveEndBlock(chainId, idx));
-                            }
-                            if (chainIsSvm(chainId)) {
-                                return resolveSVMEndBlock(chainId, idx);
-                            }
-                            assert(false, "Unsupported chainId: ".concat(chainId));
-                        }))];
-                case 1:
-                    latestPossibleBundleEndBlockNumbers = _a.sent();
-                    return [2 /*return*/, chainIds.map(function (chainId, index) {
-                            var lastEndBlockForChain = clients.hubPoolClient.getLatestBundleEndBlockForChain(chainIds, latestMainnetBlock, chainId);
-                            // If chain is disabled, re-use the latest bundle end block for the chain as both the start
-                            // and end block.
-                            if (!enabledChains.includes(chainId)) {
-                                return [lastEndBlockForChain, lastEndBlockForChain];
-                            }
-                            // If the latest block hasn't advanced enough from the previous proposed end block, then re-use it. It will
-                            // be regarded as disabled by the Dataworker clients. Otherwise, add 1 to the previous proposed end block.
-                            if (lastEndBlockForChain >= latestPossibleBundleEndBlockNumbers[index]) {
-                                // @dev: Without this check, then `getNextBundleStartBlockNumber` could return `latestBlock+1` even when the
-                                // latest block for the chain hasn't advanced, resulting in an invalid range being produced.
-                                return [lastEndBlockForChain, lastEndBlockForChain];
-                            }
-                            // Chain has advanced far enough including the buffer, return range from previous proposed end block + 1 to
-                            // latest block for chain minus buffer.
-                            return [
-                                optimistic
-                                    ? clients.hubPoolClient.getOptimisticBundleStartBlockNumber(chainIds, latestMainnetBlock, chainId)
-                                    : clients.hubPoolClient.getNextBundleStartBlockNumber(chainIds, latestMainnetBlock, chainId),
-                                latestPossibleBundleEndBlockNumbers[index],
-                            ];
-                        })];
-            }
-        });
+export async function getWidestPossibleExpectedBlockRange(chainIds, spokeClients, endBlockBuffers, clients, latestMainnetBlock, enabledChains, optimistic = false) {
+    // We impose a buffer on the head of the chain to increase the probability that the received blocks are final.
+    // Reducing the latest block that we query also gives partially filled deposits slightly more buffer for relayers
+    // to fully fill the deposit and reduces the chance that the data worker includes a slow fill payment that gets
+    // filled during the challenge period.
+    const resolveEndBlock = (chainId, idx) => Math.max(spokeClients[chainId].latestHeightSearched - endBlockBuffers[idx], 0);
+    // Across bundles are bounded by slots on Solana. The UMIP requires that the bundle end slot is backed by a block.
+    const resolveSVMEndBlock = (chainId, idx) => {
+        const spokePoolClient = spokeClients[chainId];
+        assert(isSVMSpokePoolClient(spokePoolClient));
+        const maxSlot = resolveEndBlock(chainId, idx); // Respect any configured buffer for Solana.
+        return getLatestFinalizedSlotWithBlock(spokePoolClient.svmEventsClient.getRpc(), spokePoolClient.logger, BigInt(maxSlot));
+    };
+    const latestPossibleBundleEndBlockNumbers = await Promise.all(chainIds.map((chainId, idx) => {
+        if (!enabledChains.includes(chainId) || !isDefined(spokeClients[chainId])) {
+            return -1; // Chain is disabled; end block is redundant and will be overridden later.
+        }
+        if (chainIsEvm(chainId)) {
+            return Promise.resolve(resolveEndBlock(chainId, idx));
+        }
+        if (chainIsSvm(chainId)) {
+            return resolveSVMEndBlock(chainId, idx);
+        }
+        assert(false, `Unsupported chainId: ${chainId}`);
+    }));
+    return chainIds.map((chainId, index) => {
+        const lastEndBlockForChain = clients.hubPoolClient.getLatestBundleEndBlockForChain(chainIds, latestMainnetBlock, chainId);
+        // If chain is disabled, re-use the latest bundle end block for the chain as both the start
+        // and end block.
+        if (!enabledChains.includes(chainId)) {
+            return [lastEndBlockForChain, lastEndBlockForChain];
+        }
+        // If the latest block hasn't advanced enough from the previous proposed end block, then re-use it. It will
+        // be regarded as disabled by the Dataworker clients. Otherwise, add 1 to the previous proposed end block.
+        if (lastEndBlockForChain >= latestPossibleBundleEndBlockNumbers[index]) {
+            // @dev: Without this check, then `getNextBundleStartBlockNumber` could return `latestBlock+1` even when the
+            // latest block for the chain hasn't advanced, resulting in an invalid range being produced.
+            return [lastEndBlockForChain, lastEndBlockForChain];
+        }
+        // Chain has advanced far enough including the buffer, return range from previous proposed end block + 1 to
+        // latest block for chain minus buffer.
+        return [
+            optimistic
+                ? clients.hubPoolClient.getOptimisticBundleStartBlockNumber(chainIds, latestMainnetBlock, chainId)
+                : clients.hubPoolClient.getNextBundleStartBlockNumber(chainIds, latestMainnetBlock, chainId),
+            latestPossibleBundleEndBlockNumbers[index],
+        ];
     });
 }
 export function isChainDisabledAtBlock(chainId, mainnetBlock, configStoreClient) {
@@ -81,7 +72,7 @@ export function computeDesiredTransferAmountToSpoke(runningBalance, spokePoolTar
     }
     // We are left with the case where the spoke pool is beyond the threshold.
     // A transfer needs to be initiated to bring it down to the target.
-    var transferSize = runningBalance.abs().sub(spokePoolTargetBalance.target);
+    const transferSize = runningBalance.abs().sub(spokePoolTargetBalance.target);
     // If the transferSize is < 0, this indicates that the target is still above the running balance.
     // This can only happen if the threshold is less than the target. This is likely due to a misconfiguration.
     // In this case, we transfer nothing until the target is exceeded.
@@ -99,7 +90,7 @@ export function getNetSendAmountForL1Token(spokePoolTargetBalance, runningBalanc
     return computeDesiredTransferAmountToSpoke(runningBalance, spokePoolTargetBalance);
 }
 export function getRunningBalanceForL1Token(spokePoolTargetBalance, runningBalance) {
-    var desiredTransferAmount = computeDesiredTransferAmountToSpoke(runningBalance, spokePoolTargetBalance);
+    const desiredTransferAmount = computeDesiredTransferAmountToSpoke(runningBalance, spokePoolTargetBalance);
     return runningBalance.sub(desiredTransferAmount);
 }
 export function updateRunningBalance(runningBalances, l2ChainId, l1Token, updateAmount) {
@@ -107,7 +98,7 @@ export function updateRunningBalance(runningBalances, l2ChainId, l1Token, update
     if (!runningBalances[l2ChainId]) {
         runningBalances[l2ChainId] = {};
     }
-    var runningBalance = runningBalances[l2ChainId][l1Token];
+    const runningBalance = runningBalances[l2ChainId][l1Token];
     if (runningBalance) {
         runningBalances[l2ChainId][l1Token] = runningBalance.add(updateAmount);
     }
@@ -116,9 +107,9 @@ export function updateRunningBalance(runningBalances, l2ChainId, l1Token, update
     }
 }
 export function addLastRunningBalance(latestMainnetBlock, runningBalances, hubPoolClient) {
-    Object.keys(runningBalances).forEach(function (repaymentChainId) {
-        Object.keys(runningBalances[Number(repaymentChainId)]).forEach(function (l1TokenAddress) {
-            var runningBalance = hubPoolClient.getRunningBalanceBeforeBlockForChain(latestMainnetBlock, Number(repaymentChainId), EvmAddress.from(l1TokenAddress)).runningBalance;
+    Object.keys(runningBalances).forEach((repaymentChainId) => {
+        Object.keys(runningBalances[Number(repaymentChainId)]).forEach((l1TokenAddress) => {
+            const { runningBalance } = hubPoolClient.getRunningBalanceBeforeBlockForChain(latestMainnetBlock, Number(repaymentChainId), EvmAddress.from(l1TokenAddress));
             if (!runningBalance.eq(bnZero)) {
                 updateRunningBalance(runningBalances, Number(repaymentChainId), l1TokenAddress, runningBalance);
             }
@@ -126,26 +117,26 @@ export function addLastRunningBalance(latestMainnetBlock, runningBalances, hubPo
     });
 }
 export function updateRunningBalanceForDeposit(runningBalances, hubPoolClient, deposit, updateAmount, mainnetBundleEndBlock) {
-    var l1TokenCounterpart = hubPoolClient.getL1TokenForL2TokenAtBlock(deposit.inputToken, deposit.originChainId, mainnetBundleEndBlock);
+    const l1TokenCounterpart = hubPoolClient.getL1TokenForL2TokenAtBlock(deposit.inputToken, deposit.originChainId, mainnetBundleEndBlock);
     assert(isDefined(l1TokenCounterpart), "updateRunningBalanceForDeposit: l1TokenCounterpart is undefined");
     updateRunningBalance(runningBalances, deposit.originChainId, l1TokenCounterpart.toEvmAddress(), updateAmount);
 }
 export function constructPoolRebalanceLeaves(latestMainnetBlock, runningBalances, realizedLpFees, chainsWithRefundsOnly, configStoreClient, maxL1TokenCount) {
     // Add a leaf for each chain ID with no L1 tokens or running balances
-    assert(chainsWithRefundsOnly.every(function (chainId) { return runningBalances[chainId] === undefined; }) &&
-        chainsWithRefundsOnly.every(function (chainId) { return realizedLpFees[chainId] === undefined; }), "Refund-only chains should not have running balances or realized LP fees.");
+    assert(chainsWithRefundsOnly.every((chainId) => runningBalances[chainId] === undefined) &&
+        chainsWithRefundsOnly.every((chainId) => realizedLpFees[chainId] === undefined), "Refund-only chains should not have running balances or realized LP fees.");
     // Create one leaf per L2 chain ID. First we'll create a leaf with all L1 tokens for each chain ID, and then
     // we'll split up any leaves with too many L1 tokens.
-    var leaves = [];
+    const leaves = [];
     Object.keys(runningBalances)
-        .map(function (chainId) { return Number(chainId); })
+        .map((chainId) => Number(chainId))
         .concat(chainsWithRefundsOnly)
         // Leaves should be sorted by ascending chain ID
-        .sort(function (chainIdA, chainIdB) { return chainIdA - chainIdB; })
-        .map(function (chainId) {
+        .sort((chainIdA, chainIdB) => chainIdA - chainIdB)
+        .map((chainId) => {
         if (chainsWithRefundsOnly.includes(chainId)) {
             leaves.push({
-                chainId: chainId,
+                chainId,
                 bundleLpFees: [],
                 netSendAmounts: [],
                 runningBalances: [],
@@ -156,32 +147,25 @@ export function constructPoolRebalanceLeaves(latestMainnetBlock, runningBalances
             return;
         }
         // Sort addresses.
-        var sortedL1Tokens = Object.keys(runningBalances[chainId]).sort(function (addressA, addressB) {
+        const sortedL1Tokens = Object.keys(runningBalances[chainId]).sort((addressA, addressB) => {
             return compareAddresses(addressA, addressB);
         });
         // This begins at 0 and increments for each leaf for this { chainId, L1Token } combination.
-        var groupIndexForChainId = 0;
+        let groupIndexForChainId = 0;
         // Split addresses into multiple leaves if there are more L1 tokens than allowed per leaf.
-        var maxL1TokensPerLeaf = maxL1TokenCount || configStoreClient.getMaxRefundCountForRelayerRefundLeafForBlock(latestMainnetBlock);
-        var _loop_1 = function (i) {
-            var l1TokensToIncludeInThisLeaf = sortedL1Tokens.slice(i, i + maxL1TokensPerLeaf);
-            var spokeTargetBalances = l1TokensToIncludeInThisLeaf.map(function (l1Token) {
-                return configStoreClient.getSpokeTargetBalancesForBlock(l1Token, chainId, latestMainnetBlock);
-            });
+        const maxL1TokensPerLeaf = maxL1TokenCount || configStoreClient.getMaxRefundCountForRelayerRefundLeafForBlock(latestMainnetBlock);
+        for (let i = 0; i < sortedL1Tokens.length; i += maxL1TokensPerLeaf) {
+            const l1TokensToIncludeInThisLeaf = sortedL1Tokens.slice(i, i + maxL1TokensPerLeaf);
+            const spokeTargetBalances = l1TokensToIncludeInThisLeaf.map((l1Token) => configStoreClient.getSpokeTargetBalancesForBlock(l1Token, chainId, latestMainnetBlock));
             // Build leaves using running balances and realized lp fees data for l1Token + chain, or default to
             // zero if undefined.
-            var leafBundleLpFees = l1TokensToIncludeInThisLeaf.map(function (l1Token) { var _a, _b; return (_b = (_a = realizedLpFees[chainId]) === null || _a === void 0 ? void 0 : _a[l1Token]) !== null && _b !== void 0 ? _b : bnZero; });
-            var leafNetSendAmounts = l1TokensToIncludeInThisLeaf.map(function (l1Token, index) {
-                return runningBalances[chainId] && runningBalances[chainId][l1Token]
-                    ? getNetSendAmountForL1Token(spokeTargetBalances[index], runningBalances[chainId][l1Token])
-                    : bnZero;
-            });
-            var leafRunningBalances = l1TokensToIncludeInThisLeaf.map(function (l1Token, index) {
-                var _a;
-                return ((_a = runningBalances[chainId]) === null || _a === void 0 ? void 0 : _a[l1Token])
-                    ? getRunningBalanceForL1Token(spokeTargetBalances[index], runningBalances[chainId][l1Token])
-                    : bnZero;
-            });
+            const leafBundleLpFees = l1TokensToIncludeInThisLeaf.map((l1Token) => realizedLpFees[chainId]?.[l1Token] ?? bnZero);
+            const leafNetSendAmounts = l1TokensToIncludeInThisLeaf.map((l1Token, index) => runningBalances[chainId] && runningBalances[chainId][l1Token]
+                ? getNetSendAmountForL1Token(spokeTargetBalances[index], runningBalances[chainId][l1Token])
+                : bnZero);
+            const leafRunningBalances = l1TokensToIncludeInThisLeaf.map((l1Token, index) => runningBalances[chainId]?.[l1Token]
+                ? getRunningBalanceForL1Token(spokeTargetBalances[index], runningBalances[chainId][l1Token])
+                : bnZero);
             leaves.push({
                 chainId: chainId,
                 bundleLpFees: leafBundleLpFees,
@@ -189,11 +173,8 @@ export function constructPoolRebalanceLeaves(latestMainnetBlock, runningBalances
                 runningBalances: leafRunningBalances,
                 groupIndex: groupIndexForChainId++,
                 leafId: leaves.length,
-                l1Tokens: l1TokensToIncludeInThisLeaf.map(function (l1TokenAddr) { return EvmAddress.from(l1TokenAddr); }),
+                l1Tokens: l1TokensToIncludeInThisLeaf.map((l1TokenAddr) => EvmAddress.from(l1TokenAddr)),
             });
-        };
-        for (var i = 0; i < sortedL1Tokens.length; i += maxL1TokensPerLeaf) {
-            _loop_1(i);
         }
     });
     return leaves;

package/dist/esm/clients/BundleDataClient/utils/PoolRebalanceUtils.js.map

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