@across-protocol/sdk 4.2.9-alpha.1 → 4.2.9-alpha.3

package/dist/cjs/clients/SpokePoolClient/SpokePoolClient.js

@@ -88,7 +88,7 @@ var SpokePoolClient = (function (_super) {
         return this.fills[originChainId] || [];
     };
     SpokePoolClient.prototype.getFillsForRelayer = function (relayer) {
-        return this.getFills().filter(function (fill) { return fill.relayer === relayer; });
+        return this.getFills().filter(function (fill) { return fill.relayer.eq(relayer); });
     };
     SpokePoolClient.prototype.getFillsWithBlockInRange = function (startingBlock, endingBlock) {
         return this.getFills().filter(function (fill) { return fill.blockNumber >= startingBlock && fill.blockNumber <= endingBlock; });
@@ -108,7 +108,7 @@ var SpokePoolClient = (function (_super) {
     SpokePoolClient.prototype.appendMaxSpeedUpSignatureToDeposit = function (deposit) {
         var _a;
         var depositId = deposit.depositId, depositor = deposit.depositor;
-        var speedups = (_a = this.speedUps[(0, utils_1.toAddress)(depositor)]) === null || _a === void 0 ? void 0 : _a[depositId.toString()];
+        var speedups = (_a = this.speedUps[depositor.toEvmAddress()]) === null || _a === void 0 ? void 0 : _a[depositId.toString()];
         if (!(0, utils_1.isDefined)(speedups) || speedups.length === 0) {
             return deposit;
         }
@@ -131,8 +131,7 @@ var SpokePoolClient = (function (_super) {
         return (0, EventUtils_1.sortEventsAscendingInPlace)(Object.values(this.slowFillRequests));
     };
     SpokePoolClient.prototype.getSlowFillRequest = function (relayData) {
-        var messageHash = (0, utils_1.getMessageHash)(relayData.message);
-        var hash = (0, utils_1.getRelayEventKey)(tslib_1.__assign(tslib_1.__assign({}, relayData), { messageHash: messageHash, destinationChainId: this.chainId }));
+        var hash = (0, utils_1.getRelayEventKey)(tslib_1.__assign(tslib_1.__assign({}, relayData), { destinationChainId: this.chainId }));
         return this.slowFillRequests[hash];
     };
     SpokePoolClient.prototype.getSlowFillRequestsForOriginChain = function (originChainId) {
@@ -162,7 +161,8 @@ var SpokePoolClient = (function (_super) {
                 var repaymentChainId = (0, BundleDataClient_1.getRefundInformationFromFill)(fillRepaymentData, _this.hubPoolClient, _this.hubPoolClient.latestHeightSearched).chainToSendRefundTo;
                 if (_this.hubPoolClient &&
                     !(0, utils_1.isSlowFill)(fill) &&
-                    (!(0, utils_1.chainIsEvm)(repaymentChainId) || !(0, utils_1.isValidEvmAddress)(fill.relayer))) {
+                    (0, utils_1.chainIsEvm)(repaymentChainId) &&
+                    !fill.relayer.isValidEvmAddress()) {
                     groupedFills.unrepayableFills.push(fill);
                 }
                 groupedFills.validFills.push(fill);
@@ -187,7 +187,7 @@ var SpokePoolClient = (function (_super) {
                 chainId: this.chainId,
                 message: "Invalid fills found matching deposit ID",
                 deposit: deposit,
-                invalidFills: Object.fromEntries(invalidFillsForDeposit.map(function (x) { return [x.relayer, x]; })),
+                invalidFills: Object.fromEntries(invalidFillsForDeposit.map(function (x) { return [x.relayer.toAddress(), x]; })),
                 notificationPath: "across-invalid-fills",
             });
         }
@@ -198,7 +198,7 @@ var SpokePoolClient = (function (_super) {
                 chainId: this.chainId,
                 message: "Unrepayable fills found where we need to switch repayment address and or chain",
                 deposit: deposit,
-                unrepayableFills: Object.fromEntries(unrepayableFillsForDeposit.map(function (x) { return [x.relayer, x]; })),
+                unrepayableFills: Object.fromEntries(unrepayableFillsForDeposit.map(function (x) { return [x.relayer.toAddress(), x]; })),
                 notificationPath: "across-unrepayable-fills",
             });
         }
@@ -225,13 +225,12 @@ var SpokePoolClient = (function (_super) {
         }
     };
     SpokePoolClient.prototype.update = function (eventsToQuery) {
-        var _a, _b, _c;
         if (eventsToQuery === void 0) { eventsToQuery = this._queryableEventNames(); }
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var duplicateEvents, update, queryResults, currentTime, searchEndBlock, _i, _d, event_1, queryDepositEvents, _e, _f, event_2, querySpeedUpDepositEvents, queryRequestedSlowFillEvents, queryFilledRelayEvents, enableDepositsEvents, _g, enableDepositsEvents_1, event_3, relayedRootBundleEvents, _h, relayedRootBundleEvents_1, event_4, refundEvents, _j, refundEvents_1, event_5;
+            var duplicateEvents, update, queryResults, currentTime, searchEndBlock, _i, _a, _event, event_1, queryDepositEvents, _b, _c, event_2, querySpeedUpDepositEvents, queryRequestedSlowFillEvents, queryFilledRelayEvents, enableDepositsEvents, _d, enableDepositsEvents_1, event_3, relayedRootBundleEvents, _e, relayedRootBundleEvents_1, event_4, refundEvents, _f, refundEvents_1, event_5;
             var _this = this;
-            return tslib_1.__generator(this, function (_k) {
-                switch (_k.label) {
+            return tslib_1.__generator(this, function (_g) {
+                switch (_g.label) {
                     case 0:
                         duplicateEvents = [];
                         if (this.hubPoolClient !== null && !this.hubPoolClient.isUpdated) {
@@ -239,24 +238,29 @@ var SpokePoolClient = (function (_super) {
                         }
                         return [4, this._update(eventsToQuery)];
                     case 1:
-                        update = _k.sent();
+                        update = _g.sent();
                         if (!update.success) {
                             return [2];
                         }
                         queryResults = update.events, currentTime = update.currentTime, searchEndBlock = update.searchEndBlock;
                         if (eventsToQuery.includes("TokensBridged")) {
-                            for (_i = 0, _d = queryResults[eventsToQuery.indexOf("TokensBridged")]; _i < _d.length; _i++) {
-                                event_1 = _d[_i];
-                                this.tokensBridged.push(event_1);
+                            for (_i = 0, _a = queryResults[eventsToQuery.indexOf("TokensBridged")]; _i < _a.length; _i++) {
+                                _event = _a[_i];
+                                event_1 = _event;
+                                this.tokensBridged.push(tslib_1.__assign(tslib_1.__assign({}, event_1), { l2TokenAddress: (0, utils_1.toAddressType)(event_1.l2TokenAddress, this.chainId) }));
                             }
                         }
                         queryDepositEvents = function (eventName) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                             var depositEvents, quoteBlockNumbers, _loop_1, this_1, _i, depositEvents_1, event_6;
+                            var _this = this;
                             var _a;
                             return tslib_1.__generator(this, function (_b) {
                                 switch (_b.label) {
                                     case 0:
-                                        depositEvents = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : []);
+                                        depositEvents = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : []).map(function (_event) {
+                                            var event = _event;
+                                            return tslib_1.__assign(tslib_1.__assign({}, event), { depositor: (0, utils_1.toAddressType)(event.depositor, _this.chainId), recipient: (0, utils_1.toAddressType)(event.recipient, event.destinationChainId), inputToken: (0, utils_1.toAddressType)(event.inputToken, _this.chainId), outputToken: (0, utils_1.toAddressType)(event.outputToken, event.destinationChainId), exclusiveRelayer: (0, utils_1.toAddressType)(event.exclusiveRelayer, event.destinationChainId) });
+                                        });
                                         if (depositEvents.length > 0) {
                                             this.log("debug", "Using ".concat(depositEvents.length, " newly queried ").concat(eventName, " deposit events for chain ").concat(this.chainId), {
                                                 earliestEvent: depositEvents[0].blockNumber,
@@ -293,27 +297,30 @@ var SpokePoolClient = (function (_super) {
                                 }
                             });
                         }); };
-                        _e = 0, _f = ["V3FundsDeposited", "FundsDeposited"];
-                        _k.label = 2;
+                        _b = 0, _c = ["FundsDeposited"];
+                        _g.label = 2;
                     case 2:
-                        if (!(_e < _f.length)) return [3, 5];
-                        event_2 = _f[_e];
+                        if (!(_b < _c.length)) return [3, 5];
+                        event_2 = _c[_b];
                         if (!eventsToQuery.includes(event_2)) return [3, 4];
                         return [4, queryDepositEvents(event_2)];
                     case 3:
-                        _k.sent();
-                        _k.label = 4;
+                        _g.sent();
+                        _g.label = 4;
                     case 4:
-                        _e++;
+                        _b++;
                         return [3, 2];
                     case 5:
                         querySpeedUpDepositEvents = function (eventName) {
                             var _a;
-                            var speedUpEvents = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : []);
+                            var speedUpEvents = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : []).map(function (_event) {
+                                var event = _event;
+                                return tslib_1.__assign(tslib_1.__assign({}, event), { depositor: (0, utils_1.toAddressType)(event.depositor, _this.chainId), updatedRecipient: (0, utils_1.toAddressType)(event.updatedRecipient) });
+                            });
                             for (var _i = 0, speedUpEvents_1 = speedUpEvents; _i < speedUpEvents_1.length; _i++) {
                                 var event_7 = speedUpEvents_1[_i];
                                 var speedUp = tslib_1.__assign(tslib_1.__assign({}, event_7), { originChainId: _this.chainId });
-                                (0, utils_1.assign)(_this.speedUps, [speedUp.depositor, speedUp.depositId.toString()], [speedUp]);
+                                (0, utils_1.assign)(_this.speedUps, [speedUp.depositor.toAddress(), speedUp.depositId.toString()], [speedUp]);
                                 var deposit = _this.getDeposit(speedUp.depositId);
                                 if ((0, utils_1.isDefined)(deposit)) {
                                     var eventKey = (0, utils_1.getRelayEventKey)(deposit);
@@ -321,7 +328,7 @@ var SpokePoolClient = (function (_super) {
                                 }
                             }
                         };
-                        ["RequestedSpeedUpV3Deposit", "RequestedSpeedUpDeposit"].forEach(function (event) {
+                        ["RequestedSpeedUpDeposit"].forEach(function (event) {
                             if (eventsToQuery.includes(event)) {
                                 querySpeedUpDepositEvents(event);
                             }
@@ -329,13 +336,13 @@ var SpokePoolClient = (function (_super) {
                         queryRequestedSlowFillEvents = function (eventName) {
                             var _a, _b;
                             var _c;
-                            var slowFillRequests = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : []);
+                            var slowFillRequests = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : []).map(function (_event) {
+                                var event = _event;
+                                return tslib_1.__assign(tslib_1.__assign({}, event), { depositor: (0, utils_1.toAddressType)(event.depositor, event.originChainId), recipient: (0, utils_1.toAddressType)(event.recipient, _this.chainId), inputToken: (0, utils_1.toAddressType)(event.inputToken, event.originChainId), outputToken: (0, utils_1.toAddressType)(event.outputToken, _this.chainId), exclusiveRelayer: (0, utils_1.toAddressType)(event.exclusiveRelayer, _this.chainId) });
+                            });
                             for (var _i = 0, slowFillRequests_1 = slowFillRequests; _i < slowFillRequests_1.length; _i++) {
                                 var event_8 = slowFillRequests_1[_i];
                                 var slowFillRequest = tslib_1.__assign(tslib_1.__assign({}, event_8), { destinationChainId: _this.chainId });
-                                if (eventName === "RequestedV3SlowFill") {
-                                    slowFillRequest.messageHash = (0, utils_1.getMessageHash)(slowFillRequest.message);
-                                }
                                 var depositHash = (0, utils_1.getRelayEventKey)(tslib_1.__assign(tslib_1.__assign({}, slowFillRequest), { destinationChainId: _this.chainId }));
                                 if (_this.slowFillRequests[depositHash] !== undefined) {
                                     duplicateEvents.push(event_8);
@@ -344,14 +351,17 @@ var SpokePoolClient = (function (_super) {
                                 (_b = (_c = _this.slowFillRequests)[depositHash]) !== null && _b !== void 0 ? _b : (_c[depositHash] = slowFillRequest);
                             }
                         };
-                        ["RequestedV3SlowFill", "RequestedSlowFill"].forEach(function (event) {
+                        ["RequestedSlowFill"].forEach(function (event) {
                             if (eventsToQuery.includes(event)) {
                                 queryRequestedSlowFillEvents(event);
                             }
                         });
                         queryFilledRelayEvents = function (eventName) {
                             var _a, _b;
-                            var fillEvents = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : []);
+                            var fillEvents = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : []).map(function (_event) {
+                                var event = _event;
+                                return tslib_1.__assign(tslib_1.__assign({}, event), { depositor: (0, utils_1.toAddressType)(event.depositor, event.originChainId), recipient: (0, utils_1.toAddressType)(event.recipient, _this.chainId), inputToken: (0, utils_1.toAddressType)(event.inputToken, event.originChainId), outputToken: (0, utils_1.toAddressType)(event.outputToken, _this.chainId), exclusiveRelayer: (0, utils_1.toAddressType)(event.exclusiveRelayer, _this.chainId), relayer: (0, utils_1.toAddressType)(event.relayer, _this.chainId), relayExecutionInfo: tslib_1.__assign(tslib_1.__assign({}, event.relayExecutionInfo), { updatedRecipient: (0, utils_1.toAddressType)(event.relayExecutionInfo.updatedRecipient, _this.chainId) }) });
+                            });
                             if (fillEvents.length > 0) {
                                 _this.log("debug", "Using ".concat(fillEvents.length, " newly queried ").concat(eventName, " events for chain ").concat(_this.chainId), {
                                     earliestEvent: fillEvents[0].blockNumber,
@@ -359,10 +369,6 @@ var SpokePoolClient = (function (_super) {
                             }
                             var _loop_2 = function (event_9) {
                                 var fill = tslib_1.__assign(tslib_1.__assign({}, event_9), { destinationChainId: _this.chainId });
-                                if (eventName === "FilledV3Relay") {
-                                    fill.messageHash = (0, utils_1.getMessageHash)(event_9.message);
-                                    fill.relayExecutionInfo.updatedMessageHash = (0, utils_1.getMessageHash)(event_9.relayExecutionInfo.updatedMessage);
-                                }
                                 var duplicateFill = (_b = _this.fills[fill.originChainId]) === null || _b === void 0 ? void 0 : _b.find(function (f) { return (0, EventUtils_1.duplicateEvent)(fill, f); });
                                 if (duplicateFill) {
                                     duplicateEvents.push(event_9);
@@ -376,29 +382,29 @@ var SpokePoolClient = (function (_super) {
                                 _loop_2(event_9);
                             }
                         };
-                        ["FilledV3Relay", "FilledRelay"].forEach(function (event) {
+                        ["FilledRelay"].forEach(function (event) {
                             if (eventsToQuery.includes(event)) {
                                 queryFilledRelayEvents(event);
                             }
                         });
                         if (eventsToQuery.includes("EnabledDepositRoute")) {
-                            enableDepositsEvents = ((_a = queryResults[eventsToQuery.indexOf("EnabledDepositRoute")]) !== null && _a !== void 0 ? _a : []);
-                            for (_g = 0, enableDepositsEvents_1 = enableDepositsEvents; _g < enableDepositsEvents_1.length; _g++) {
-                                event_3 = enableDepositsEvents_1[_g];
+                            enableDepositsEvents = queryResults[eventsToQuery.indexOf("EnabledDepositRoute")];
+                            for (_d = 0, enableDepositsEvents_1 = enableDepositsEvents; _d < enableDepositsEvents_1.length; _d++) {
+                                event_3 = enableDepositsEvents_1[_d];
                                 (0, utils_1.assign)(this.depositRoutes, [event_3.originToken, event_3.destinationChainId], event_3.enabled);
                             }
                         }
                         if (eventsToQuery.includes("RelayedRootBundle")) {
-                            relayedRootBundleEvents = ((_b = queryResults[eventsToQuery.indexOf("RelayedRootBundle")]) !== null && _b !== void 0 ? _b : []);
-                            for (_h = 0, relayedRootBundleEvents_1 = relayedRootBundleEvents; _h < relayedRootBundleEvents_1.length; _h++) {
-                                event_4 = relayedRootBundleEvents_1[_h];
+                            relayedRootBundleEvents = queryResults[eventsToQuery.indexOf("RelayedRootBundle")];
+                            for (_e = 0, relayedRootBundleEvents_1 = relayedRootBundleEvents; _e < relayedRootBundleEvents_1.length; _e++) {
+                                event_4 = relayedRootBundleEvents_1[_e];
                                 this.rootBundleRelays.push(event_4);
                             }
                         }
                         if (eventsToQuery.includes("ExecutedRelayerRefundRoot")) {
-                            refundEvents = ((_c = queryResults[eventsToQuery.indexOf("ExecutedRelayerRefundRoot")]) !== null && _c !== void 0 ? _c : []);
-                            for (_j = 0, refundEvents_1 = refundEvents; _j < refundEvents_1.length; _j++) {
-                                event_5 = refundEvents_1[_j];
+                            refundEvents = queryResults[eventsToQuery.indexOf("ExecutedRelayerRefundRoot")];
+                            for (_f = 0, refundEvents_1 = refundEvents; _f < refundEvents_1.length; _f++) {
+                                event_5 = refundEvents_1[_f];
                                 this.relayerRefundExecutions.push(event_5);
                             }
                         }
@@ -430,12 +436,12 @@ var SpokePoolClient = (function (_super) {
         return ((_b = (_a = this.hubPoolClient) === null || _a === void 0 ? void 0 : _a.getBlockNumbers(timestamps)) !== null && _b !== void 0 ? _b : Promise.resolve(Object.fromEntries(timestamps.map(function (timestamp) { return [timestamp, utils_1.MAX_BIG_INT.toNumber()]; }))));
     };
     SpokePoolClient.prototype.getDestinationTokenForDeposit = function (deposit) {
-        var _a;
         if (!this.canResolveZeroAddressOutputToken(deposit)) {
-            return constants_1.ZERO_ADDRESS;
+            return (0, utils_1.toAddressType)(constants_1.ZERO_ADDRESS);
         }
         var l1Token = this.hubPoolClient.getL1TokenForL2TokenAtBlock(deposit.inputToken, deposit.originChainId, deposit.quoteBlockNumber);
-        return ((_a = this.hubPoolClient.getL2TokenForL1TokenAtBlock(l1Token, deposit.destinationChainId, deposit.quoteBlockNumber)) !== null && _a !== void 0 ? _a : constants_1.ZERO_ADDRESS);
+        var counterpartToken = this.hubPoolClient.getL2TokenForL1TokenAtBlock(l1Token, deposit.destinationChainId, deposit.quoteBlockNumber);
+        return counterpartToken !== null && counterpartToken !== void 0 ? counterpartToken : (0, utils_1.toAddressType)(constants_1.ZERO_ADDRESS);
     };
     SpokePoolClient.prototype.log = function (level, message, data) {
         this.logger[level](tslib_1.__assign({ at: "SpokePoolClient", chainId: this.chainId, message: message }, data));

package/dist/cjs/clients/SpokePoolClient/SpokePoolClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"SpokePoolClient.js","sourceRoot":"","sources":["../../../../src/clients/SpokePoolClient/SpokePoolClient.ts"],"names":[],"mappings":";;;;AACA,qCAqBqB;AACrB,qDAAoF;AACpF,6CAA+C;AAgB/C,4DAAgF;AAEhF,wDAAmE;AAetD,QAAA,eAAe,GAAG;IAC7B,qBAAqB;IACrB,eAAe;IACf,mBAAmB;IACnB,2BAA2B;IAC3B,kBAAkB;IAClB,gBAAgB;IAChB,2BAA2B;IAC3B,yBAAyB;IACzB,qBAAqB;IACrB,mBAAmB;IACnB,eAAe;IACf,aAAa;CACd,CAAC;AAMF;IAA8C,2CAAkB;IAwB9D,yBACW,MAAsB,EAEtB,aAAmC,EACnC,OAAe,EACjB,eAAuB,EAC9B,iBAAsF;QAAtF,kCAAA,EAAA,sBAA6D,IAAI,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE;QANxF,YAQE,kBAAM,iBAAiB,CAAC,SAIzB;QAXU,YAAM,GAAN,MAAM,CAAgB;QAEtB,mBAAa,GAAb,aAAa,CAAsB;QACnC,aAAO,GAAP,OAAO,CAAQ;QACjB,qBAAe,GAAf,eAAe,CAAQ;QA5BtB,iBAAW,GAAG,CAAC,CAAC;QAChB,4BAAsB,GAAkD,EAAE,CAAC;QAC3E,0BAAoB,GAA+C,EAAE,CAAC;QACtE,cAAQ,GAAgF,EAAE,CAAC;QAC3F,sBAAgB,GAA0D,EAAE,CAAC;QAC7E,mBAAa,GAAyE,EAAE,CAAC;QACzF,mBAAa,GAAoB,EAAE,CAAC;QACpC,sBAAgB,GAA+B,EAAE,CAAC;QAClD,6BAAuB,GAAsC,EAAE,CAAC;QAEhE,kBAAY,GAAgB,IAAI,GAAG,EAAE,CAAC;QAChC,mBAAa,GAAgD,EAAE,CAAC;QAEzE,WAAK,GAAiD,EAAE,CAAC;QAmB9D,KAAI,CAAC,mBAAmB,GAAG,iBAAiB,CAAC,IAAI,CAAC;QAClD,KAAI,CAAC,oBAAoB,GAAG,CAAC,CAAC;QAC9B,KAAI,CAAC,iBAAiB,GAAG,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,iBAAiB,CAAC;;IAC5D,CAAC;IAOM,wDAA8B,GAArC,UAAsC,kBAA0B;QAC9D,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,UAAC,OAAO,IAAK,OAAA,OAAO,CAAC,kBAAkB,KAAK,kBAAkB,EAAjD,CAAiD,CAAC,CAAC;IAClH,CAAC;IASO,+CAAqB,GAA7B,UAA8B,OAAyB;;QACrD,IAAM,WAAW,GAAG,IAAA,wBAAgB,EAAC,OAAO,CAAC,CAAC;QAC9C,OAAO,MAAA,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,mCAAI,EAAE,CAAC;IACxD,CAAC;IASM,sEAA4C,GAAnD,UAAoD,kBAA0B;QAA9E,iBAOC;QANC,IAAM,QAAQ,GAAG,IAAI,CAAC,8BAA8B,CAAC,kBAAkB,CAAC,CAAC;QACzE,IAAM,iBAAiB,GAAG,QAAQ,CAAC,MAAM,CAAC,UAAC,GAAG,EAAE,OAAO;YACrD,IAAM,UAAU,GAAG,KAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;YACvD,OAAO,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAChC,CAAC,EAAE,EAAwB,CAAC,CAAC;QAC7B,OAAO,IAAA,uCAA0B,EAAC,QAAQ,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAC/E,CAAC;IAOM,qCAAW,GAAlB,UAAmB,MAA+C;QAChE,IAAI,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACjD,IAAI,IAAA,iBAAS,EAAC,MAAM,CAAC,EAAE;YACb,IAAA,WAAS,GAAc,MAAM,UAApB,EAAE,SAAO,GAAK,MAAM,QAAX,CAAY;YACtC,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,UAAC,EAAe;oBAAb,WAAW,iBAAA;gBAAO,OAAA,WAAW,IAAI,WAAS,IAAI,SAAO,IAAI,WAAW;YAAlD,CAAkD,CAAC,CAAC;SACrG;QAED,OAAO,IAAA,uCAA0B,EAAC,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAMM,0CAAgB,GAAvB;QACE,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAMM,0CAAgB,GAAvB;QACE,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAMM,kCAAQ,GAAf;QACE,OAAO,IAAA,uCAA0B,EAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACtE,CAAC;IAOM,gDAAsB,GAA7B,UAA8B,aAAqB;QACjD,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;IACzC,CAAC;IAOM,4CAAkB,GAAzB,UAA0B,OAAe;QACvC,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,UAAC,IAAI,IAAK,OAAA,IAAI,CAAC,OAAO,KAAK,OAAO,EAAxB,CAAwB,CAAC,CAAC;IACpE,CAAC;IAQM,kDAAwB,GAA/B,UAAgC,aAAqB,EAAE,WAAmB;QACxE,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,UAAC,IAAI,IAAK,OAAA,IAAI,CAAC,WAAW,IAAI,aAAa,IAAI,IAAI,CAAC,WAAW,IAAI,WAAW,EAApE,CAAoE,CAAC,CAAC;IAChH,CAAC;IAMM,6CAAmB,GAA1B;QACE,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAMM,+CAAqB,GAA5B;;QACE,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC;YACrC,CAAC,CAAC,CAAA,MAAA,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,0CAAE,YAAY,IAAG,CAAC;YAC3E,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;IAMM,oDAA0B,GAAjC;QACE,OAAO,IAAI,CAAC,uBAAuB,CAAC;IACtC,CAAC;IAOM,4DAAkC,GAAzC,UAA0C,OAAyB;;QACzD,IAAA,SAAS,GAAgB,OAAO,UAAvB,EAAE,SAAS,GAAK,OAAO,UAAZ,CAAa;QAGzC,IAAM,QAAQ,GAAG,MAAA,IAAI,CAAC,QAAQ,CAAC,IAAA,iBAAS,EAAC,SAAS,CAAC,CAAC,0CAAG,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QAE7E,IAAI,CAAC,IAAA,iBAAS,EAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YACjD,OAAO,OAAO,CAAC;SAChB;QAED,IAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC,UAAC,IAAI,EAAE,OAAO;YAC/C,OAAA,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO;QAAzE,CAAyE,CAC1E,CAAC;QAIF,IAAI,UAAU,CAAC,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;YAC5D,OAAO,OAAO,CAAC;SAChB;QAGD,IAAM,cAAc,yCACf,OAAO,KACV,gBAAgB,EAAE,UAAU,CAAC,kBAAkB,EAC/C,mBAAmB,EAAE,UAAU,CAAC,mBAAmB,EACnD,gBAAgB,EAAE,UAAU,CAAC,gBAAgB,EAC7C,cAAc,EAAE,UAAU,CAAC,cAAc,GAC1C,CAAC;QAEF,OAAO,cAAc,CAAC;IACxB,CAAC;IAQM,oCAAU,GAAjB,UAAkB,SAAoB;QACpC,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,UAAC,EAAyB;gBAAZ,UAAU,eAAA;YAAO,OAAA,UAAU,CAAC,EAAE,CAAC,SAAS,CAAC;QAAxB,CAAwB,CAAC,CAAC;IACzG,CAAC;IAMM,6CAAmB,GAA1B;QACE,OAAO,IAAA,uCAA0B,EAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAC1E,CAAC;IAOM,4CAAkB,GAAzB,UAA0B,SAAoB;QAC5C,IAAM,WAAW,GAAG,IAAA,sBAAc,EAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACtD,IAAM,IAAI,GAAG,IAAA,wBAAgB,wCAAM,SAAS,KAAE,WAAW,aAAA,EAAE,kBAAkB,EAAE,IAAI,CAAC,OAAO,IAAG,CAAC;QAC/F,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IAOM,2DAAiC,GAAxC,UAAyC,aAAqB;QAC5D,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,aAAa,KAAK,aAAa,EAAjC,CAAiC,CAAC,CAAC;IAC/F,CAAC;IAMM,qCAAW,GAAlB;QACE,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAOM,2CAAiB,GAAxB,UAAyB,IAAU;QACjC,IAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,IAAA,wBAAgB,EAAC,IAAI,CAAC,CAAC,CAAC;QAC3D,IAAM,KAAK,GAAG,IAAA,8BAAsB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpD,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3C,CAAC;IAEM,4CAAkB,GAAzB,UAA0B,OAAgB;QACxC,OAAO,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACjE,CAAC;IASM,0DAAgC,GAAvC,UAAwC,OAAgB;QAAxD,iBA+FC;QA1FS,IAAA,YAAY,GAAoB,OAAO,aAA3B,EAAE,aAAa,GAAK,OAAO,cAAZ,CAAa;QAChD,IAAM,eAAe,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;QAEhF,IAAI,eAAe,KAAK,SAAS,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE;YACjE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;SACzE;QAEK,IAAA,KAAiD,eAAe,CAAC,MAAM,CAC3E,UACE,YAA+G,EAC/G,IAAmB;YAEnB,IAAI,IAAA,8BAAsB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC,KAAK,EAAE;gBAC/C,IAAM,iBAAiB,yCAClB,IAAI,KACP,aAAa,EAAE,OAAO,CAAC,aAAa,GACrC,CAAC;gBACM,IAAqB,gBAAgB,GAAK,IAAA,+CAA4B,EAC5E,iBAAiB,EACjB,KAAI,CAAC,aAAc,EACnB,KAAI,CAAC,aAAc,CAAC,oBAAoB,CACzC,oBAJ4C,CAI3C;gBAOF,IACE,KAAI,CAAC,aAAa;oBAClB,CAAC,IAAA,kBAAU,EAAC,IAAI,CAAC;oBACjB,CAAC,CAAC,IAAA,kBAAU,EAAC,gBAAgB,CAAC,IAAI,CAAC,IAAA,yBAAiB,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EACnE;oBACA,YAAY,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBAC1C;gBAGD,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACpC;iBAAM;gBACL,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACtC;YACD,OAAO,YAAY,CAAC;QACtB,CAAC,EACD,EAAE,UAAU,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAE,CAC3D,EArCO,UAAU,gBAAA,EAAE,YAAY,kBAAA,EAAE,gBAAgB,sBAqCjD,CAAC;QAGF,IAAM,sBAAsB,GAAG,YAAY,CAAC,MAAM,CAAC,UAAC,CAAC;YACnD,IAAM,MAAM,GAAG,UAAG,CAAC,CAAC,MAAM,cAAI,CAAC,CAAC,QAAQ,CAAE,CAAC;YAE3C,IAAM,cAAc,GAAG,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,KAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAC3F,IAAI,cAAc,EAAE;gBAClB,KAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;aAC/B;YACD,OAAO,cAAc,CAAC;QACxB,CAAC,CAAC,CAAC;QAEH,IAAM,QAAQ,GAAG,IAAA,mBAAW,EAAC,aAAa,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;QAC/D,IAAI,sBAAsB,CAAC,MAAM,GAAG,CAAC,EAAE;YACrC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBACpB,EAAE,EAAE,iBAAiB;gBACrB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,OAAO,EAAE,yCAAyC;gBAClD,OAAO,SAAA;gBACP,YAAY,EAAE,MAAM,CAAC,WAAW,CAAC,sBAAsB,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,EAAd,CAAc,CAAC,CAAC;gBACnF,gBAAgB,EAAE,sBAAsB;aACzC,CAAC,CAAC;SACJ;QACD,IAAM,0BAA0B,GAAG,gBAAgB,CAAC,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,EAAjC,CAAiC,CAAC,CAAC;QACrG,IAAI,0BAA0B,CAAC,MAAM,GAAG,CAAC,EAAE;YACzC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBACpB,EAAE,EAAE,iBAAiB;gBACrB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,OAAO,EAAE,gFAAgF;gBACzF,OAAO,SAAA;gBACP,gBAAgB,EAAE,MAAM,CAAC,WAAW,CAAC,0BAA0B,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,EAAd,CAAc,CAAC,CAAC;gBAC3F,gBAAgB,EAAE,0BAA0B;aAC7C,CAAC,CAAC;SACJ;QAGD,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;YAC3B,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC,EAAE,YAAY,cAAA,EAAE,CAAC;SACrE;QAED,OAAO;YACL,cAAc,EAAE,cAAM;YACtB,SAAS,EAAE,UAAU,CAAC,MAAM;YAC5B,YAAY,cAAA;SACb,CAAC;IACJ,CAAC;IASM,wCAAc,GAArB,UAAsB,KAAsD;QAC1E,OAAO,UAAG,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE,cAAI,KAAK,CAAC,aAAa,CAAE,CAAC;IAChE,CAAC;IAES,0DAAgC,GAA1C,UAA2C,OAAyB;;QAClE,IACE,CAAC,CAAA,MAAA,IAAI,CAAC,aAAa,0CAAE,4BAA4B,CAC/C,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,gBAAgB,CACzB,CAAA,EACD;YACA,OAAO,KAAK,CAAC;SACd;aAAM;YACL,IAAM,OAAO,GAAG,MAAA,IAAI,CAAC,aAAa,0CAAE,2BAA2B,CAC7D,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,gBAAgB,CACzB,CAAC;YACF,OAAO,IAAI,CAAC,aAAa,CAAC,+BAA+B,CACvD,OAAO,EACP,OAAO,CAAC,kBAAkB,EAC1B,OAAO,CAAC,gBAAgB,CACzB,CAAC;SACH;IACH,CAAC;IAUY,gCAAM,GAAnB,UAAoB,aAA2C;;QAA3C,8BAAA,EAAA,gBAAgB,IAAI,CAAC,oBAAoB,EAAE;;;;;;;wBACvD,eAAe,GAAoB,EAAE,CAAC;wBAC5C,IAAI,IAAI,CAAC,aAAa,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE;4BAChE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;yBAC9C;wBAEc,WAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAA;;wBAA1C,MAAM,GAAG,SAAiC;wBAChD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;4BACnB,WAAO;yBACR;wBACe,YAAY,GAAkC,MAAM,OAAxC,EAAE,WAAW,GAAqB,MAAM,YAA3B,EAAE,cAAc,GAAK,MAAM,eAAX,CAAY;wBAErE,IAAI,aAAa,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE;4BAC3C,WAA2F,EAAvE,KAAA,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,eAAe,CAAC,CAAoB,EAAvE,cAAuE,EAAvE,IAAuE,EAAE;gCAAxF;gCACH,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAK,CAAC,CAAC;6BAChC;yBACF;wBAGK,kBAAkB,GAAG,UAAO,SAAiB;;;;;;wCAC3C,aAAa,GAAG,CAAC,MAAA,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,mCAAI,EAAE,CAAuB,CAAC;wCACnG,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;4CAC5B,IAAI,CAAC,GAAG,CACN,OAAO,EACP,gBAAS,aAAa,CAAC,MAAM,4BAAkB,SAAS,uCAA6B,IAAI,CAAC,OAAO,CAAE,EACnG;gDACE,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,WAAW;6CAC5C,CACF,CAAC;yCACH;wCAIyB,WAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,cAAc,EAAhB,CAAgB,CAAC,CAAC,EAAA;;wCAA1F,iBAAiB,GAAG,SAAsE;4DACrF,OAAK;4CACd,IAAM,gBAAgB,GAAG,iBAAiB,CAAC,MAAM,CAAC,OAAK,CAAC,cAAc,CAAC,CAAC,CAAC;4CAGzE,IAAM,OAAO,yCACR,OAAK,KACR,WAAW,EAAE,IAAA,sBAAc,EAAC,OAAK,CAAC,OAAO,CAAC,EAC1C,gBAAgB,kBAAA,EAChB,aAAa,EAAE,OAAK,OAAO,EAE3B,aAAa,EAAE,IAAI,EACnB,WAAW,EAAE,IAAI,GAClB,CAAC;4CAEF,OAAO,CAAC,aAAa,GAAG,OAAK,iBAAiB,CAAC,OAAO,CAAC,CAAC;4CACxD,OAAO,CAAC,WAAW,GAAG,OAAK,sBAAsB,CAAC,OAAO,CAAC,CAAC;4CAE3D,IAAI,IAAA,qBAAa,EAAC,OAAO,CAAC,WAAW,CAAC,EAAE;gDACtC,OAAO,CAAC,WAAW,GAAG,OAAK,6BAA6B,CAAC,OAAO,CAAC,CAAC;6CACnE;4CAED,IAAI,OAAK,aAAa,CAAC,IAAA,wBAAgB,EAAC,OAAO,CAAC,CAAC,KAAK,SAAS,EAAE;gDAE/D,IAAM,WAAW,GAAG,OAAK,qBAAqB,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,OAAK,aAAa,CAAC,IAAA,wBAAgB,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC;gDAC9G,IAAI,WAAW,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,IAAA,2BAAc,EAAC,OAAO,EAAE,CAAC,CAAC,EAA1B,CAA0B,CAAC,EAAE;oDACvD,eAAe,CAAC,IAAI,CAAC,OAAK,CAAC,CAAC;;iDAE7B;gDACD,IAAA,cAAM,EAAC,OAAK,sBAAsB,EAAE,CAAC,IAAA,wBAAgB,EAAC,OAAO,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;;6CAE7E;4CACD,IAAA,cAAM,EAAC,OAAK,aAAa,EAAE,CAAC,IAAA,wBAAgB,EAAC,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;;;wCA/BnE,WAAiC,EAAb,+BAAa,EAAb,2BAAa,EAAb,IAAa;4CAA5B;oDAAM,OAAK;yCAgCf;;;;6BACF,CAAC;8BAEwD,EAAtC,MAAC,kBAAkB,EAAE,gBAAgB,CAAC;;;6BAAtC,CAAA,cAAsC,CAAA;wBAArD;6BACC,aAAa,CAAC,QAAQ,CAAC,OAAK,CAAC,EAA7B,cAA6B;wBAC/B,WAAM,kBAAkB,CAAC,OAAK,CAAC,EAAA;;wBAA/B,SAA+B,CAAC;;;wBAFhB,IAAsC,CAAA;;;wBAOpD,yBAAyB,GAAG,UAAC,SAAiB;;4BAClD,IAAM,aAAa,GAAG,CAAC,MAAA,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,mCAAI,EAAE,CAAuB,CAAC;4BAEnG,KAAoB,UAAa,EAAb,+BAAa,EAAb,2BAAa,EAAb,IAAa,EAAE;gCAA9B,IAAM,OAAK,sBAAA;gCACd,IAAM,OAAO,yCAAQ,OAAK,KAAE,aAAa,EAAE,KAAI,CAAC,OAAO,GAAE,CAAC;gCAC1D,IAAA,cAAM,EAAC,KAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;gCAIpF,IAAM,OAAO,GAAG,KAAI,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gCAInD,IAAI,IAAA,iBAAS,EAAC,OAAO,CAAC,EAAE;oCACtB,IAAM,QAAQ,GAAG,IAAA,wBAAgB,EAAC,OAAO,CAAC,CAAC;oCAC3C,KAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,KAAI,CAAC,kCAAkC,CAAC,OAAO,CAAC,CAAC;iCACjF;6BACF;wBACH,CAAC,CAAC;wBAGF,CAAC,2BAA2B,EAAE,yBAAyB,CAAC,CAAC,OAAO,CAAC,UAAC,KAAK;4BACrE,IAAI,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gCACjC,yBAAyB,CAAC,KAAK,CAAC,CAAC;6BAClC;wBACH,CAAC,CAAC,CAAC;wBAGG,4BAA4B,GAAG,UAAC,SAAiB;;;4BACrD,IAAM,gBAAgB,GAAG,CAAC,MAAA,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,mCAAI,EAAE,CAA+B,CAAC;4BAC9G,KAAoB,UAAgB,EAAhB,qCAAgB,EAAhB,8BAAgB,EAAhB,IAAgB,EAAE;gCAAjC,IAAM,OAAK,yBAAA;gCACd,IAAM,eAAe,yCAChB,OAAK,KACR,kBAAkB,EAAE,KAAI,CAAC,OAAO,GACjC,CAAC;gCAEF,IAAI,SAAS,KAAK,qBAAqB,EAAE;oCACvC,eAAe,CAAC,WAAW,GAAG,IAAA,sBAAc,EAAC,eAAe,CAAC,OAAO,CAAC,CAAC;iCACvE;gCAED,IAAM,WAAW,GAAG,IAAA,wBAAgB,wCAAM,eAAe,KAAE,kBAAkB,EAAE,KAAI,CAAC,OAAO,IAAG,CAAC;gCAG/F,IAAI,KAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,KAAK,SAAS,EAAE;oCACpD,eAAe,CAAC,IAAI,CAAC,OAAK,CAAC,CAAC;oCAC5B,SAAS;iCACV;gCAED,YAAA,KAAI,CAAC,gBAAgB,EAAC,WAAW,wCAAX,WAAW,IAAM,eAAe,EAAC;6BACxD;wBACH,CAAC,CAAC;wBAEF,CAAC,qBAAqB,EAAE,mBAAmB,CAAC,CAAC,OAAO,CAAC,UAAC,KAAK;4BACzD,IAAI,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gCACjC,4BAA4B,CAAC,KAAK,CAAC,CAAC;6BACrC;wBACH,CAAC,CAAC,CAAC;wBAGG,sBAAsB,GAAG,UAAC,SAAiB;;4BAC/C,IAAM,UAAU,GAAG,CAAC,MAAA,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,mCAAI,EAAE,CAAoB,CAAC;4BAE7F,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;gCACzB,KAAI,CAAC,GAAG,CAAC,OAAO,EAAE,gBAAS,UAAU,CAAC,MAAM,4BAAkB,SAAS,+BAAqB,KAAI,CAAC,OAAO,CAAE,EAAE;oCAC1G,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,WAAW;iCACzC,CAAC,CAAC;6BACJ;oDAIU,OAAK;gCACd,IAAM,IAAI,yCACL,OAAK,KACR,kBAAkB,EAAE,KAAI,CAAC,OAAO,GACjC,CAAC;gCAEF,IAAI,SAAS,KAAK,eAAe,EAAE;oCACjC,IAAI,CAAC,WAAW,GAAG,IAAA,sBAAc,EAAE,OAAwC,CAAC,OAAO,CAAC,CAAC;oCACrF,IAAI,CAAC,kBAAkB,CAAC,kBAAkB,GAAG,IAAA,sBAAc,EAAC,OAAK,CAAC,kBAAkB,CAAC,cAAe,CAAC,CAAC;iCACvG;gCAGD,IAAM,aAAa,GAAG,MAAA,KAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,0CAAE,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,IAAA,2BAAc,EAAC,IAAI,EAAE,CAAC,CAAC,EAAvB,CAAuB,CAAC,CAAC;gCAC3F,IAAI,aAAa,EAAE;oCACjB,eAAe,CAAC,IAAI,CAAC,OAAK,CAAC,CAAC;;iCAE7B;gCAED,IAAA,cAAM,EAAC,KAAI,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;gCACjD,IAAA,cAAM,EAAC,KAAI,CAAC,oBAAoB,EAAE,CAAC,KAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;;4BAnBzE,KAAoB,UAAU,EAAV,yBAAU,EAAV,wBAAU,EAAV,IAAU;gCAAzB,IAAM,OAAK,mBAAA;wCAAL,OAAK;6BAoBf;wBACH,CAAC,CAAC;wBAGF,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC,OAAO,CAAC,UAAC,KAAK;4BAC7C,IAAI,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gCACjC,sBAAsB,CAAC,KAAK,CAAC,CAAC;6BAC/B;wBACH,CAAC,CAAC,CAAC;wBAEH,IAAI,aAAa,CAAC,QAAQ,CAAC,qBAAqB,CAAC,EAAE;4BAC3C,oBAAoB,GAAG,CAAC,MAAA,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC,mCACtF,EAAE,CAAmC,CAAC;4BAExC,WAAwC,EAApB,6CAAoB,EAApB,kCAAoB,EAApB,IAAoB,EAAE;gCAArC;gCACH,IAAA,cAAM,EAAC,IAAI,CAAC,aAAa,EAAE,CAAC,OAAK,CAAC,WAAW,EAAE,OAAK,CAAC,kBAAkB,CAAC,EAAE,OAAK,CAAC,OAAO,CAAC,CAAC;6BAC1F;yBACF;wBAED,IAAI,aAAa,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE;4BACzC,uBAAuB,GAAG,CAAC,MAAA,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,mCACvF,EAAE,CAA+B,CAAC;4BACpC,WAA2C,EAAvB,mDAAuB,EAAvB,qCAAuB,EAAvB,IAAuB,EAAE;gCAAxC;gCACH,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAK,CAAC,CAAC;6BACnC;yBACF;wBAED,IAAI,aAAa,CAAC,QAAQ,CAAC,2BAA2B,CAAC,EAAE;4BACjD,YAAY,GAAG,CAAC,MAAA,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC,mCACpF,EAAE,CAAsC,CAAC;4BAC3C,WAAgC,EAAZ,6BAAY,EAAZ,0BAAY,EAAZ,IAAY,EAAE;gCAA7B;gCACH,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAK,CAAC,CAAC;6BAC1C;yBACF;wBAED,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;4BAC9B,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,yBAAyB,EAAE;gCAC3C,eAAe,iBAAA;6BAChB,CAAC,CAAC;4BACH,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,6CAA6C,CAAC,CAAC;yBAClE;wBAGD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;wBAC/B,IAAI,CAAC,oBAAoB,GAAG,cAAc,CAAC;wBAC3C,IAAI,CAAC,mBAAmB,GAAG,cAAc,GAAG,CAAC,CAAC;wBAC9C,IAAI,CAAC,iBAAiB,CAAC,EAAE,GAAG,SAAS,CAAC;wBACtC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;wBACtB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,qCAA8B,IAAI,CAAC,OAAO,cAAW,EAAE;4BACvE,uBAAuB,EAAE,IAAI,CAAC,mBAAmB;yBAClD,CAAC,CAAC;;;;;KACJ;IAOS,wCAAc,GAAxB,UAAyB,SAAiB;;QACxC,OAAO,MAAA,MAAA,IAAI,CAAC,aAAa,0CAAE,cAAc,CAAC,SAAS,CAAC,mCAAI,OAAO,CAAC,OAAO,CAAC,mBAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;IAClG,CAAC;IAOS,yCAAe,GAAzB,UAA0B,UAAoB;;QAC5C,OAAO,CACL,MAAA,MAAA,IAAI,CAAC,aAAa,0CAAE,eAAe,CAAC,UAAU,CAAC,mCAC/C,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,UAAC,SAAS,IAAK,OAAA,CAAC,SAAS,EAAE,mBAAW,CAAC,QAAQ,EAAE,CAAC,EAAnC,CAAmC,CAAC,CAAC,CAAC,CACxG,CAAC;IACJ,CAAC;IAOS,uDAA6B,GAAvC,UAAwC,OAAyB;;QAC/D,IAAI,CAAC,IAAI,CAAC,gCAAgC,CAAC,OAAO,CAAC,EAAE;YACnD,OAAO,wBAAY,CAAC;SACrB;QAED,IAAM,OAAO,GAAG,IAAI,CAAC,aAAc,CAAC,2BAA2B,CAC7D,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,gBAAgB,CACxB,CAAC;QACH,OAAO,CACL,MAAA,IAAI,CAAC,aAAc,CAAC,2BAA2B,CAAC,OAAO,EAAE,OAAO,CAAC,kBAAkB,EAAE,OAAO,CAAC,gBAAgB,CAAC,mCAC9G,wBAAY,CACb,CAAC;IACJ,CAAC;IAQS,6BAAG,GAAb,UAAc,KAAuB,EAAE,OAAe,EAAE,IAAgB;QACtE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAG,EAAE,EAAE,iBAAiB,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,SAAA,IAAK,IAAI,EAAG,CAAC;IACzF,CAAC;IAMM,wCAAc,GAArB;QACE,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAQS,2CAAiB,GAA3B,UAA4B,OAAyB;;QACnD,OAAO,MAAA,MAAA,IAAI,CAAC,iBAAiB,0CAAE,2BAA2B,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,cAAc,CAAC,mCAAI,KAAK,CAAC;IACrH,CAAC;IAQS,gDAAsB,GAAhC,UAAiC,OAAyB;;QACxD,OAAO,CACL,MAAA,MAAA,IAAI,CAAC,iBAAiB,0CAAE,2BAA2B,CAAC,OAAO,CAAC,kBAAkB,EAAE,OAAO,CAAC,cAAc,CAAC,mCAAI,KAAK,CACjH,CAAC;IACJ,CAAC;IAuEH,sBAAC;AAAD,CAAC,AA9wBD,CAA8C,uCAAkB,GA8wB/D;AA9wBqB,0CAAe"}
+{"version":3,"file":"SpokePoolClient.js","sourceRoot":"","sources":["../../../../src/clients/SpokePoolClient/SpokePoolClient.ts"],"names":[],"mappings":"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"}

package/dist/cjs/clients/mocks/MockHubPoolClient.d.ts

@@ -1,7 +1,7 @@
 import winston from "winston";
 import { Contract } from "ethers";
-import { BigNumber } from "../../utils";
-import { L1Token, Log, PendingRootBundle, RealizedLpFee } from "../../interfaces";
+import { BigNumber, EvmAddress, Address } from "../../utils";
+import { TokenInfo, Log, PendingRootBundle, RealizedLpFee, L1TokenInfo } from "../../interfaces";
 import { AcrossConfigStoreClient as ConfigStoreClient } from "../AcrossConfigStoreClient";
 import { HubPoolClient, HubPoolUpdate, LpFeeRequest } from "../HubPoolClient";
 import { EventOverrides } from "./MockEvents";
@@ -19,15 +19,15 @@ export declare class MockHubPoolClient extends HubPoolClient {
     batchComputeRealizedLpFeePct(_deposits: LpFeeRequest[]): Promise<RealizedLpFee[]>;
     setCrossChainContracts(chainId: number, contract: string, blockNumber?: number): void;
     setLatestBlockNumber(blockNumber: number): void;
-    addL1Token(l1Token: L1Token): void;
-    getL1Tokens(): L1Token[];
+    addL1Token(l1Token: TokenInfo): void;
+    getL1Tokens(): L1TokenInfo[];
     setTokenMapping(l1Token: string, chainId: number, l2Token: string): void;
-    l2TokenEnabledForL1TokenAtBlock(l1Token: string, destinationChainId: number, hubBlockNumber: number): boolean;
-    l2TokenHasPoolRebalanceRoute(l2Token: string, chainId: number, hubPoolBlock: number): boolean;
+    l2TokenEnabledForL1TokenAtBlock(l1Token: EvmAddress, destinationChainId: number, hubBlockNumber: number): boolean;
+    l2TokenHasPoolRebalanceRoute(l2Token: Address, chainId: number, hubPoolBlock: number): boolean;
     deleteTokenMapping(l1Token: string, chainId: number): void;
-    getL1TokenForL2TokenAtBlock(l2Token: string, chainId: number, blockNumber: number): string;
-    getL2TokenForL1TokenAtBlock(l1Token: string, chainId: number, blockNumber: number): string;
-    getTokenInfoForL1Token(l1Token: string): L1Token | undefined;
+    getL1TokenForL2TokenAtBlock(l2Token: Address, chainId: number, blockNumber: number): EvmAddress;
+    getL2TokenForL1TokenAtBlock(l1Token: EvmAddress, chainId: number, blockNumber: number): Address;
+    getTokenInfoForL1Token(l1Token: EvmAddress): TokenInfo | undefined;
     _update(eventNames: string[]): Promise<HubPoolUpdate>;
     readonly eventSignatures: Record<string, string>;
     setCrossChainContractsEvent(l2ChainId: number, adapter: string, spokePool: string, overrides?: EventOverrides): Log;

package/dist/cjs/clients/mocks/MockHubPoolClient.js

@@ -5,11 +5,12 @@ var tslib_1 = require("tslib");
 var utils_1 = require("../../utils");
 var HubPoolClient_1 = require("../HubPoolClient");
 var MockEvents_1 = require("./MockEvents");
+var constants_1 = require("../../constants");
 var emptyRootBundle = {
     poolRebalanceRoot: "",
     relayerRefundRoot: "",
     slowRelayRoot: "",
-    proposer: "",
+    proposer: utils_1.EvmAddress.from(constants_1.ZERO_ADDRESS),
     unclaimedPoolRebalanceLeafCount: 0,
     challengePeriodEndTimestamp: 0,
     bundleEvaluationBlockNumbers: [],
@@ -86,7 +87,7 @@ var MockHubPoolClient = (function (_super) {
         if (blockNumber === void 0) { blockNumber = 0; }
         (0, utils_1.assign)(this.crossChainContracts, [chainId], [
             {
-                spokePool: contract,
+                spokePool: (0, utils_1.toAddressType)(contract),
                 blockNumber: blockNumber,
                 transactionIndex: 0,
                 logIndex: 0,
@@ -106,11 +107,11 @@ var MockHubPoolClient = (function (_super) {
         var _a;
         var _b;
         (_a = (_b = this.spokePoolTokens)[l1Token]) !== null && _a !== void 0 ? _a : (_b[l1Token] = {});
-        this.spokePoolTokens[l1Token][chainId] = l2Token;
+        this.spokePoolTokens[l1Token][chainId] = (0, utils_1.toAddressType)(l2Token);
     };
     MockHubPoolClient.prototype.l2TokenEnabledForL1TokenAtBlock = function (l1Token, destinationChainId, hubBlockNumber) {
         var _a;
-        if ((_a = this.spokePoolTokens[l1Token]) === null || _a === void 0 ? void 0 : _a[destinationChainId]) {
+        if ((_a = this.spokePoolTokens[l1Token.toEvmAddress()]) === null || _a === void 0 ? void 0 : _a[destinationChainId]) {
             return true;
         }
         else {
@@ -119,7 +120,7 @@ var MockHubPoolClient = (function (_super) {
     };
     MockHubPoolClient.prototype.l2TokenHasPoolRebalanceRoute = function (l2Token, chainId, hubPoolBlock) {
         var _this = this;
-        var l1Token = Object.keys(this.spokePoolTokens).find(function (l1Token) { var _a; return ((_a = _this.spokePoolTokens[l1Token]) === null || _a === void 0 ? void 0 : _a[chainId]) === l2Token; });
+        var l1Token = Object.keys(this.spokePoolTokens).find(function (l1Token) { var _a, _b; return (_b = (_a = _this.spokePoolTokens[l1Token]) === null || _a === void 0 ? void 0 : _a[chainId]) === null || _b === void 0 ? void 0 : _b.eq(l2Token); });
         if (!l1Token) {
             return _super.prototype.l2TokenHasPoolRebalanceRoute.call(this, l2Token, chainId, hubPoolBlock);
         }
@@ -132,16 +133,21 @@ var MockHubPoolClient = (function (_super) {
     };
     MockHubPoolClient.prototype.getL1TokenForL2TokenAtBlock = function (l2Token, chainId, blockNumber) {
         var _this = this;
-        var l1Token = Object.keys(this.spokePoolTokens).find(function (l1Token) { var _a; return ((_a = _this.spokePoolTokens[l1Token]) === null || _a === void 0 ? void 0 : _a[chainId]) === l2Token; });
-        return l1Token !== null && l1Token !== void 0 ? l1Token : _super.prototype.getL1TokenForL2TokenAtBlock.call(this, l2Token, chainId, blockNumber);
+        var l1Token = Object.keys(this.spokePoolTokens).find(function (l1Token) { var _a; return (_a = _this.spokePoolTokens[l1Token]) === null || _a === void 0 ? void 0 : _a[chainId].eq(l2Token); });
+        if ((0, utils_1.isDefined)(l1Token)) {
+            return utils_1.EvmAddress.from(l1Token);
+        }
+        else {
+            return _super.prototype.getL1TokenForL2TokenAtBlock.call(this, l2Token, chainId, blockNumber);
+        }
     };
     MockHubPoolClient.prototype.getL2TokenForL1TokenAtBlock = function (l1Token, chainId, blockNumber) {
         var _a;
-        var l2Token = (_a = this.spokePoolTokens[l1Token]) === null || _a === void 0 ? void 0 : _a[chainId];
+        var l2Token = (_a = this.spokePoolTokens[l1Token.toEvmAddress()]) === null || _a === void 0 ? void 0 : _a[chainId];
         return l2Token !== null && l2Token !== void 0 ? l2Token : _super.prototype.getL2TokenForL1TokenAtBlock.call(this, l1Token, chainId, blockNumber);
     };
     MockHubPoolClient.prototype.getTokenInfoForL1Token = function (l1Token) {
-        return this.l1TokensMock.find(function (token) { return token.address === l1Token; });
+        return this.l1TokensMock.find(function (token) { return token.address.eq(l1Token); });
     };
     MockHubPoolClient.prototype._update = function (eventNames) {
         var latestBlockSearched = this.eventManager.blockNumber;

package/dist/cjs/clients/mocks/MockHubPoolClient.js.map

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

package/dist/cjs/clients/mocks/MockSpokePoolClient.d.ts

@@ -1,7 +1,7 @@
 import { Contract } from "ethers";
 import winston from "winston";
 import { Log, Deposit, DepositWithBlock, RelayerRefundExecution, SlowFillRequest, SortableEvent, Fill, SlowFillLeaf, SpeedUp, TokensBridged } from "../../interfaces";
-import { BigNumber } from "../../utils";
+import { BigNumber, Address } from "../../utils";
 import { EVMSpokePoolClient, SpokePoolUpdate } from "../SpokePoolClient";
 import { HubPoolClient } from "../HubPoolClient";
 import { EventManager, EventOverrides } from "./MockEvents";
@@ -16,32 +16,28 @@ export declare class MockSpokePoolClient extends EVMSpokePoolClient {
     });
     setConfigStoreClient(configStore?: AcrossConfigStoreClient): void;
     setDestinationTokenForChain(chainId: number, token: string): void;
-    getDestinationTokenForDeposit(deposit: DepositWithBlock): string;
+    getDestinationTokenForDeposit(deposit: DepositWithBlock): Address;
     setLatestBlockNumber(blockNumber: number): void;
     setDepositIds(_depositIds: BigNumber[]): void;
     _getDepositIdAtBlock(blockTag: number): Promise<BigNumber>;
     _update(eventsToQuery: string[]): Promise<SpokePoolUpdate>;
     readonly eventSignatures: Record<string, string>;
     deposit(deposit: Omit<Deposit, "messageHash"> & Partial<SortableEvent>): Log;
-    depositV3(deposit: Omit<Deposit, "messageHash"> & Partial<SortableEvent>): Log;
-    protected _deposit(event: string, deposit: Omit<Deposit, "messageHash"> & Partial<SortableEvent>): Log;
-    fillV3Relay(fill: Omit<Fill, "messageHash"> & {
-        message: string;
+    protected _deposit(event: string, deposit: Omit<Deposit, "messageHash"> & {
+        message?: string;
     } & Partial<SortableEvent>): Log;
     fillRelay(fill: Omit<Fill, "messageHash"> & {
-        message: string;
+        message?: string;
     } & Partial<SortableEvent>): Log;
     protected _fillRelay(event: string, fill: Omit<Fill, "messageHash"> & {
-        message: string;
+        message?: string;
     } & Partial<SortableEvent>): Log;
-    speedUpV3Deposit(speedUp: SpeedUp): Log;
     speedUpDeposit(speedUp: SpeedUp): Log;
     protected _speedUpDeposit(event: string, speedUp: SpeedUp): Log;
     setTokensBridged(tokensBridged: TokensBridged): Log;
-    requestV3SlowFill(request: Omit<SlowFillRequest, "messageHash"> & Partial<SortableEvent>): Log;
-    requestSlowFill(request: Omit<SlowFillRequest, "messageHash"> & Partial<SortableEvent>): Log;
-    protected _requestSlowFill(event: string, request: Omit<SlowFillRequest, "messageHash"> & Partial<SortableEvent>): Log;
-    executeV3SlowRelayLeaf(leaf: Omit<SlowFillLeaf, "messageHash">): Log;
+    requestSlowFill(request: Omit<SlowFillRequest, "destinationChainId"> & Partial<SortableEvent>): Log;
+    protected _requestSlowFill(event: string, request: Omit<SlowFillRequest, "destinationChainId"> & Partial<SortableEvent>): Log;
+    executeSlowRelayLeaf(leaf: Omit<SlowFillLeaf, "messageHash">): Log;
     executeRelayerRefundLeaf(refund: RelayerRefundExecution & Partial<SortableEvent>): Log;
     setEnableRoute(originToken: string, destinationChainId: number, enabled: boolean, overrides?: EventOverrides): Log;
 }