@hyperlane-xyz/cli 35.0.0 → 35.0.1

package/bundle/index.js

@@ -403460,7 +403460,7 @@ async function __wbg_init(module_or_path, memory) {
     return __wbg_finalize_init(instance, module, thread_stack_size);
 }
 
-const module$1 = __nccwpck_require__.ab + "aleo_wasm1.wasm";
+const module$1 = __nccwpck_require__.ab + "aleo_wasm.wasm";
                 
                     await __wbg_init({ module_or_path: pathToFileURL(module$1).href });
 
@@ -403471,7 +403471,7 @@ async function initThreadPool(threads) {
 
     console.info(`Spawning ${threads} threads`);
 
-    await initThreadPool$1(__nccwpck_require__.ab + "worker3.js", threads);
+    await initThreadPool$1(__nccwpck_require__.ab + "worker2.js", threads);
 }
 
 
@@ -417591,7 +417591,7 @@ async function __wbg_init(module_or_path, memory) {
     return __wbg_finalize_init(instance, module, thread_stack_size);
 }
 
-const module$1 = __nccwpck_require__.ab + "aleo_wasm.wasm";
+const module$1 = __nccwpck_require__.ab + "aleo_wasm1.wasm";
                 
                     await __wbg_init({ module_or_path: pathToFileURL(module$1).href });
 
@@ -417602,7 +417602,7 @@ async function initThreadPool(threads) {
 
     console.info(`Spawning ${threads} threads`);
 
-    await initThreadPool$1(__nccwpck_require__.ab + "worker2.js", threads);
+    await initThreadPool$1(__nccwpck_require__.ab + "worker3.js", threads);
 }
 
 
@@ -694227,7 +694227,7 @@ __webpack_async_result__();
 /* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
 /* harmony export */   x: () => (/* binding */ VERSION)
 /* harmony export */ });
-const VERSION = '35.0.0';
+const VERSION = '35.0.1';
 //# sourceMappingURL=version.js.map
 
 /***/ }),
@@ -745983,6 +745983,10 @@ const defaultMultisigConfigs = {
                 alias: AW_VALIDATOR_ALIAS,
             },
             DEFAULT_MITOSIS_VALIDATOR,
+            {
+                address: '0xd2e26f9089e9ff6a1ea9f7e90575e985cfea7f03',
+                alias: 'Citrea',
+            },
         ],
     },
     coredao: {
@@ -746159,6 +746163,10 @@ const defaultMultisigConfigs = {
                 address: '0x36a669703ad0e11a0382b098574903d2084be22c',
                 alias: 'Enigma',
             },
+            {
+                address: '0xef2e5bb2bc45dd092ff7f9d4d4485f022185aeae',
+                alias: 'Citrea',
+            },
         ],
     },
     everclear: {
@@ -746895,12 +746903,13 @@ const defaultMultisigConfigs = {
         ],
     },
     nesa: {
-        threshold: 1,
+        threshold: 2,
         validators: [
             {
                 address: '0x990f548e766b830f69642d36cdd47fb20a2aa405',
                 alias: AW_VALIDATOR_ALIAS,
             },
+            DEFAULT_MITOSIS_VALIDATOR,
         ],
     },
     neutron: {
@@ -756703,15 +756712,16 @@ class EvmHookModule extends _core_AbstractHyperlaneModule_js__WEBPACK_IMPORTED_M
 /* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
 /* harmony export */   F: () => (/* binding */ EvmHookReader)
 /* harmony export */ });
-/* harmony import */ var ethers__WEBPACK_IMPORTED_MODULE_6__ = __nccwpck_require__(61934);
+/* harmony import */ var ethers__WEBPACK_IMPORTED_MODULE_7__ = __nccwpck_require__(61934);
 /* harmony import */ var _hyperlane_xyz_core__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(50653);
 /* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(94523);
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(73938);
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_7__ = __nccwpck_require__(14918);
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_8__ = __nccwpck_require__(93142);
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_9__ = __nccwpck_require__(21387);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_6__ = __nccwpck_require__(73938);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_8__ = __nccwpck_require__(14918);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_9__ = __nccwpck_require__(93142);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_10__ = __nccwpck_require__(21387);
 /* harmony import */ var _consts_concurrency_js__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(92573);
 /* harmony import */ var _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(49680);
+/* harmony import */ var _utils_contract_js__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(76709);
 /* harmony import */ var _types_js__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(52116);
 
 
@@ -756719,6 +756729,13 @@ class EvmHookModule extends _core_AbstractHyperlaneModule_js__WEBPACK_IMPORTED_M
 
 
 
+
+function isUnsupportedIgpDomainError(error, domainId) {
+    // Mirrors InterchainGasPaymaster.getExchangeRateAndGasPrice in
+    // solidity/contracts/hooks/igp/InterchainGasPaymaster.sol.
+    return (error instanceof Error &&
+        error.message.includes(`Configured IGP doesn't support domain ${domainId}`));
+}
 class EvmHookReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1__/* .HyperlaneReader */ .S {
     multiProvider;
     chain;
@@ -756807,8 +756824,7 @@ class EvmHookReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1
         }
         catch (e) {
             let customMessage = `Failed to derive ${onchainHookType} hook (${address})`;
-            if (!onchainHookType &&
-                e.message.includes('Invalid response from provider')) {
+            if (!onchainHookType && (0,_utils_contract_js__WEBPACK_IMPORTED_MODULE_5__/* .isMissingSelectorCallException */ .pJ)(e)) {
                 customMessage = customMessage.concat(` [The provided hook contract might be outdated and not support hookType()]`);
                 this.logger.info(`${customMessage}:\n\t${e}`);
             }
@@ -756843,7 +756859,7 @@ class EvmHookReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1
         switch (config.type) {
             case _types_js__WEBPACK_IMPORTED_MODULE_4__/* .HookType */ .WD.FALLBACK_ROUTING:
             case _types_js__WEBPACK_IMPORTED_MODULE_4__/* .HookType */ .WD.ROUTING:
-                config.domains = await (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .promiseObjAll */ .a1)((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .objMap */ .Yp)(config.domains, async (_, hook) => {
+                config.domains = await (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_6__/* .promiseObjAll */ .a1)((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_6__/* .objMap */ .Yp)(config.domains, async (_, hook) => {
                     const derived = await this.deriveHookConfig(hook);
                     return this.preserveUnredeployable(hook, derived);
                 }));
@@ -756899,24 +756915,26 @@ class EvmHookReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1
     }
     async deriveIdAuthIsmConfig(address) {
         // First check if it's a CCIP hook
+        const ccipHook = _hyperlane_xyz_core__WEBPACK_IMPORTED_MODULE_0__/* .CCIPHook__factory */ .TaE.connect(address, this.provider);
         try {
-            const ccipHook = _hyperlane_xyz_core__WEBPACK_IMPORTED_MODULE_0__/* .CCIPHook__factory */ .TaE.connect(address, this.provider);
             // This method only exists on CCIPHook
             await ccipHook.ccipDestination();
-            return this.deriveCcipConfig(address);
         }
-        catch {
+        catch (error) {
+            (0,_utils_contract_js__WEBPACK_IMPORTED_MODULE_5__/* .throwIfNotMissingSelector */ .KT)(error);
             // Not a CCIP hook, try OPStack
+            const opStackHook = _hyperlane_xyz_core__WEBPACK_IMPORTED_MODULE_0__/* .OPStackHook__factory */ .Luq.connect(address, this.provider);
             try {
-                const opStackHook = _hyperlane_xyz_core__WEBPACK_IMPORTED_MODULE_0__/* .OPStackHook__factory */ .Luq.connect(address, this.provider);
                 // This method only exists on OPStackHook
                 await opStackHook.l1Messenger();
-                return this.deriveOpStackConfig(address);
             }
-            catch {
+            catch (innerError) {
+                (0,_utils_contract_js__WEBPACK_IMPORTED_MODULE_5__/* .throwIfNotMissingSelector */ .KT)(innerError);
                 throw new Error(`Could not determine hook type - neither CCIP nor OPStack methods found`);
             }
+            return this.deriveOpStackConfig(address);
         }
+        return this.deriveCcipConfig(address);
     }
     async deriveCcipConfig(address) {
         const ccipHook = _hyperlane_xyz_core__WEBPACK_IMPORTED_MODULE_0__/* .CCIPHook__factory */ .TaE.connect(address, this.provider);
@@ -756962,10 +756980,10 @@ class EvmHookReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1
         // Parallelize hookType and hooks list fetching
         const [hookType, hooks] = await Promise.all([
             hook.hookType(),
-            hook.hooks(ethers__WEBPACK_IMPORTED_MODULE_6__.ethers.constants.AddressZero),
+            hook.hooks(ethers__WEBPACK_IMPORTED_MODULE_7__.ethers.constants.AddressZero),
         ]);
         this.assertHookType(hookType, _types_js__WEBPACK_IMPORTED_MODULE_4__/* .OnchainHookType */ .c0.AGGREGATION);
-        const hookConfigs = await (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_7__/* .concurrentMap */ .q1)(this.concurrency, hooks, async (hookAddress) => {
+        const hookConfigs = await (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_8__/* .concurrentMap */ .q1)(this.concurrency, hooks, async (hookAddress) => {
             const derived = await this.deriveHookConfigFromAddress(hookAddress);
             return this.preserveUnredeployable(hookAddress, derived);
         });
@@ -756997,7 +757015,8 @@ class EvmHookReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1
             hook.owner(),
             hook.beneficiary(),
             // quoteSigners() not available on IGP versions before offchain fee quoting
-            hook.quoteSigners().catch(() => {
+            hook.quoteSigners().catch((error) => {
+                (0,_utils_contract_js__WEBPACK_IMPORTED_MODULE_5__/* .throwIfNotMissingSelector */ .KT)(error);
                 this.logger.debug('quoteSigners() not available on this IGP version, skipping');
                 return [];
             }),
@@ -757006,7 +757025,7 @@ class EvmHookReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1
         const overhead = {};
         const oracleConfig = {};
         let oracleKey;
-        const allKeys = await (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_7__/* .concurrentMap */ .q1)(this.concurrency, this.possibleDomainIds(), async (domainId) => {
+        const allKeys = await (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_8__/* .concurrentMap */ .q1)(this.concurrency, this.possibleDomainIds(), async (domainId) => {
             const { name: chainName, nativeToken } = this.multiProvider.getChainMetadata(domainId);
             try {
                 const { tokenExchangeRate, gasPrice } = await hook.getExchangeRateAndGasPrice(domainId);
@@ -757021,15 +757040,17 @@ class EvmHookReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1
                 const oracle = _hyperlane_xyz_core__WEBPACK_IMPORTED_MODULE_0__/* .StorageGasOracle__factory */ .T8$.connect(gasOracle, this.provider);
                 return oracle.owner();
             }
-            catch {
+            catch (error) {
+                if (!isUnsupportedIgpDomainError(error, domainId))
+                    throw error;
                 this.logger.debug('Domain not configured on IGP Hook', domainId, chainName);
                 return null;
             }
         });
         const resolvedOracleKeys = allKeys.filter((key) => key !== null);
         if (resolvedOracleKeys.length > 0) {
-            const allKeysMatch = resolvedOracleKeys.every((key) => (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_8__/* .eqAddress */ .fv)(resolvedOracleKeys[0], key));
-            (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_9__/* .assert */ .v)(allKeysMatch, 'Not all oracle keys match');
+            const allKeysMatch = resolvedOracleKeys.every((key) => (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_9__/* .eqAddress */ .fv)(resolvedOracleKeys[0], key));
+            (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_10__/* .assert */ .v)(allKeysMatch, 'Not all oracle keys match');
             oracleKey = resolvedOracleKeys[0];
         }
         const config = {
@@ -757151,17 +757172,12 @@ class EvmHookReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1
     }
     async fetchDomainHooks(hook) {
         const domainHooks = {};
-        await (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_7__/* .concurrentMap */ .q1)(this.concurrency, this.possibleDomainIds(), async (domainId) => {
+        await (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_8__/* .concurrentMap */ .q1)(this.concurrency, this.possibleDomainIds(), async (domainId) => {
             const chainName = this.multiProvider.getChainName(domainId);
-            try {
-                const domainHook = await hook.hooks(domainId);
-                if (domainHook !== ethers__WEBPACK_IMPORTED_MODULE_6__.ethers.constants.AddressZero) {
-                    const derived = await this.deriveHookConfigFromAddress(domainHook);
-                    domainHooks[chainName] = this.preserveUnredeployable(domainHook, derived);
-                }
-            }
-            catch {
-                this.logger.debug(`Domain not configured on ${hook.constructor.name}`, domainId, chainName);
+            const domainHook = await hook.hooks(domainId);
+            if (!(0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_9__/* .isZeroishAddress */ .Hi)(domainHook)) {
+                const derived = await this.deriveHookConfigFromAddress(domainHook);
+                domainHooks[chainName] = this.preserveUnredeployable(domainHook, derived);
             }
         });
         return domainHooks;
@@ -757212,7 +757228,7 @@ class EvmHookReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1
         return config;
     }
     assertHookType(hookType, expectedType) {
-        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_9__/* .assert */ .v)(hookType === expectedType, `expected hook type to be ${expectedType}, got ${hookType}`);
+        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_10__/* .assert */ .v)(hookType === expectedType, `expected hook type to be ${expectedType}, got ${hookType}`);
     }
 }
 //# sourceMappingURL=EvmHookReader.js.map
@@ -757624,13 +757640,15 @@ const isHookCompatible = ({ hookType, chainTechnicalStack, }) => !(hookType ===
 /* harmony export */   e: () => (/* binding */ EvmIcaRouterReader)
 /* harmony export */ });
 /* harmony import */ var _hyperlane_xyz_core__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(50653);
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(94523);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(94523);
 /* harmony import */ var _router_EvmRouterReader_js__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(26623);
+/* harmony import */ var _utils_contract_js__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(76709);
 /* harmony import */ var _types_js__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(89972);
 
 
 
 
+
 class EvmIcaRouterReader extends _router_EvmRouterReader_js__WEBPACK_IMPORTED_MODULE_1__/* .EvmRouterReader */ .V {
     async deriveConfig(address) {
         const icaRouterInstance = _hyperlane_xyz_core__WEBPACK_IMPORTED_MODULE_0__/* .InterchainAccountRouter__factory */ .ojJ.connect(address, this.provider);
@@ -757640,8 +757658,9 @@ class EvmIcaRouterReader extends _router_EvmRouterReader_js__WEBPACK_IMPORTED_MO
             commitmentIsmAddress = await icaRouterInstance.CCIP_READ_ISM();
             routerType = _types_js__WEBPACK_IMPORTED_MODULE_2__/* .IcaRouterType */ .vn.REGULAR;
         }
-        catch {
-            _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .rootLogger */ .Jk.debug(`No CCIP_READ_ISM on ${address} — MinimalInterchainAccountRouter`);
+        catch (error) {
+            (0,_utils_contract_js__WEBPACK_IMPORTED_MODULE_3__/* .throwIfNotMissingSelector */ .KT)(error);
+            _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .rootLogger */ .Jk.debug(`No CCIP_READ_ISM on ${address} — MinimalInterchainAccountRouter`);
             routerType = _types_js__WEBPACK_IMPORTED_MODULE_2__/* .IcaRouterType */ .vn.MINIMAL;
         }
         const routerConfig = await this.readRouterConfig(address);
@@ -757999,7 +758018,7 @@ class EvmIsmModule extends _core_AbstractHyperlaneModule_js__WEBPACK_IMPORTED_MO
 /* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
 /* harmony export */   N: () => (/* binding */ EvmIsmReader)
 /* harmony export */ });
-/* harmony import */ var ethers__WEBPACK_IMPORTED_MODULE_7__ = __nccwpck_require__(61934);
+/* harmony import */ var ethers__WEBPACK_IMPORTED_MODULE_8__ = __nccwpck_require__(61934);
 /* harmony import */ var _hyperlane_xyz_core__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(50653);
 /* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(94523);
 /* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_6__ = __nccwpck_require__(73938);
@@ -758009,7 +758028,7 @@ class EvmIsmModule extends _core_AbstractHyperlaneModule_js__WEBPACK_IMPORTED_MO
 /* harmony import */ var _consts_concurrency_js__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(92573);
 /* harmony import */ var _metadata_chainMetadataTypes_js__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(1430);
 /* harmony import */ var _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(49680);
-/* harmony import */ var _utils_contract_js__WEBPACK_IMPORTED_MODULE_8__ = __nccwpck_require__(76709);
+/* harmony import */ var _utils_contract_js__WEBPACK_IMPORTED_MODULE_7__ = __nccwpck_require__(76709);
 /* harmony import */ var _types_js__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(69352);
 
 
@@ -758164,7 +758183,8 @@ class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_2_
         try {
             owner = await ownableIsm.owner();
         }
-        catch {
+        catch (error) {
+            (0,_utils_contract_js__WEBPACK_IMPORTED_MODULE_7__/* .throwIfNotMissingSelector */ .KT)(error);
             this.logger.debug('Error accessing owner property, implying that this is not a DefaultFallbackRoutingIsm.', address);
         }
         // If the current ISM does not have an owner then it is an Amount Router
@@ -758174,7 +758194,7 @@ class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_2_
                     type: _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.INTERCHAIN_ACCOUNT_ROUTING,
                     isms: {},
                     address,
-                    owner: ethers__WEBPACK_IMPORTED_MODULE_7__.ethers.constants.AddressZero,
+                    owner: ethers__WEBPACK_IMPORTED_MODULE_8__.ethers.constants.AddressZero,
                 };
             }
             return this.deriveNonOwnableRoutingConfig(address);
@@ -758186,26 +758206,27 @@ class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_2_
             const icaRouter = _hyperlane_xyz_core__WEBPACK_IMPORTED_MODULE_0__/* .InterchainAccountRouter__factory */ .ojJ.connect(address, this.provider);
             return {
                 type: _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.INTERCHAIN_ACCOUNT_ROUTING,
-                isms: await this.deriveRemoteIsmConfigs(domainIds, abstractRoutingIsm, icaRouter.isms, 
+                isms: await this.deriveRemoteIsmConfigs(domainIds, abstractRoutingIsm, (domain) => icaRouter.isms(domain), 
                 // The isms here are deployed on remote chains and can't be derived
                 false),
                 address,
                 owner,
             };
         }
-        const domains = await this.deriveRemoteIsmConfigs(domainIds, abstractRoutingIsm, defaultFallbackIsmInstance.module, true);
+        const domains = await this.deriveRemoteIsmConfigs(domainIds, abstractRoutingIsm, (domain) => defaultFallbackIsmInstance.module(domain), true);
         // Fallback routing ISM extends from MailboxClient, default routing
         let ismType = _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.FALLBACK_ROUTING;
         try {
             await defaultFallbackIsmInstance.mailbox();
         }
-        catch {
+        catch (error) {
+            (0,_utils_contract_js__WEBPACK_IMPORTED_MODULE_7__/* .throwIfNotMissingSelector */ .KT)(error);
             ismType = _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.ROUTING;
             this.logger.debug('Error accessing mailbox property, implying this is not a fallback routing ISM.', address);
         }
         // Check if it's an incremental routing ISM by looking for the unique error message in bytecode
         if (ismType === _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.ROUTING) {
-            if (await (0,_utils_contract_js__WEBPACK_IMPORTED_MODULE_8__/* .contractHasString */ .u)(this.provider, address, INCREMENTAL_REVERT_STRING)) {
+            if (await (0,_utils_contract_js__WEBPACK_IMPORTED_MODULE_7__/* .contractHasString */ .uu)(this.provider, address, INCREMENTAL_REVERT_STRING)) {
                 ismType = _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.INCREMENTAL_ROUTING;
                 this.logger.debug({ address }, 'Detected incremental routing ISM');
             }
@@ -758227,12 +758248,14 @@ class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_2_
             await icaInstance.CCIP_READ_ISM();
             return true;
         }
-        catch {
+        catch (error) {
+            (0,_utils_contract_js__WEBPACK_IMPORTED_MODULE_7__/* .throwIfNotMissingSelector */ .KT)(error);
             try {
                 await icaInstance.bytecodeHash();
                 return true;
             }
-            catch {
+            catch (innerError) {
+                (0,_utils_contract_js__WEBPACK_IMPORTED_MODULE_7__/* .throwIfNotMissingSelector */ .KT)(innerError);
                 this.logger.debug('Not an ICA router (no CCIP_READ_ISM or bytecodeHash).', address);
                 return false;
             }
@@ -758242,7 +758265,7 @@ class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_2_
         const res = await (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_9__/* .concurrentMap */ .q1)(this.concurrency, domainIds, async (domainId) => {
             const chainName = this.multiProvider.tryGetChainName(domainId.toNumber());
             if (!chainName) {
-                this.logger.warn(`Unknown domain ID ${domainId}, skipping domain configuration`);
+                this.logger.warn(`Unknown domain ID ${domainId.toString()}, skipping domain configuration`);
                 return;
             }
             const moduleAddress = this.messageContext
@@ -758271,7 +758294,8 @@ class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_2_
                 ism.threshold(),
             ]);
         }
-        catch {
+        catch (error) {
+            (0,_utils_contract_js__WEBPACK_IMPORTED_MODULE_7__/* .throwIfNotMissingSelector */ .KT)(error);
             // If we fail to access AmountRoutingIsm properties, this is likely a legacy InterchainAccountIsm
             this.logger.debug('Error accessing AmountRoutingIsm properties, treating as legacy InterchainAccountIsm.', address);
             // return a basic ICA routing config for legacy contracts
@@ -758279,7 +758303,7 @@ class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_2_
                 type: _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.INTERCHAIN_ACCOUNT_ROUTING,
                 isms: {},
                 address,
-                owner: ethers__WEBPACK_IMPORTED_MODULE_7__.ethers.constants.AddressZero,
+                owner: ethers__WEBPACK_IMPORTED_MODULE_8__.ethers.constants.AddressZero,
             };
         }
         const [lowerDerived, upperDerived] = await Promise.all([
@@ -758297,7 +758321,7 @@ class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_2_
     async deriveAggregationConfig(address) {
         const ism = _hyperlane_xyz_core__WEBPACK_IMPORTED_MODULE_0__/* .StaticAggregationIsm__factory */ .UMv.connect(address, this.provider);
         this.assertModuleType(await ism.moduleType(), _types_js__WEBPACK_IMPORTED_MODULE_1__/* .ModuleType */ .nR.AGGREGATION);
-        const [modules, threshold] = await ism.modulesAndThreshold(ethers__WEBPACK_IMPORTED_MODULE_7__.ethers.constants.AddressZero);
+        const [modules, threshold] = await ism.modulesAndThreshold(ethers__WEBPACK_IMPORTED_MODULE_8__.ethers.constants.AddressZero);
         const ismConfigs = await (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_9__/* .concurrentMap */ .q1)(this.concurrency, modules, async (module) => {
             const derived = await this.deriveIsmConfigFromAddress(module);
             return this.preserveUnredeployableIsm(module, derived);
@@ -758328,7 +758352,7 @@ class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_2_
                     ? _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.STORAGE_MERKLE_ROOT_MULTISIG
                     : _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.STORAGE_MESSAGE_ID_MULTISIG;
         }
-        const [validators, threshold] = await ism.validatorsAndThreshold(ethers__WEBPACK_IMPORTED_MODULE_7__.ethers.constants.AddressZero);
+        const [validators, threshold] = await ism.validatorsAndThreshold(ethers__WEBPACK_IMPORTED_MODULE_8__.ethers.constants.AddressZero);
         return {
             address,
             type: ismType,
@@ -758349,22 +758373,31 @@ class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_2_
                 type: _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.TRUSTED_RELAYER,
             };
         }
-        catch {
+        catch (error) {
+            (0,_utils_contract_js__WEBPACK_IMPORTED_MODULE_7__/* .throwIfNotMissingSelector */ .KT)(error);
             this.logger.debug('Error accessing "trustedRelayer" property, implying this is not a Trusted Relayer ISM.', address);
         }
         // if it has paused() property --> PAUSABLE
         const pausableIsm = _hyperlane_xyz_core__WEBPACK_IMPORTED_MODULE_0__/* .PausableIsm__factory */ .fiP.connect(address, this.provider);
-        try {
-            const paused = await pausableIsm.paused();
-            const owner = await pausableIsm.owner();
+        const [pausedResult, ownerResult] = await Promise.allSettled([
+            pausableIsm.paused(),
+            pausableIsm.owner(),
+        ]);
+        const unexpectedError = [pausedResult, ownerResult].find((result) => result.status === 'rejected' &&
+            !(0,_utils_contract_js__WEBPACK_IMPORTED_MODULE_7__/* .isMissingSelectorCallException */ .pJ)(result.reason));
+        if (unexpectedError?.status === 'rejected') {
+            throw unexpectedError.reason;
+        }
+        if (pausedResult.status === 'fulfilled' &&
+            ownerResult.status === 'fulfilled') {
             return {
                 address,
-                owner,
+                owner: ownerResult.value,
                 type: _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.PAUSABLE,
-                paused,
+                paused: pausedResult.value,
             };
         }
-        catch {
+        else {
             this.logger.debug('Error accessing "paused" property, implying this is not a Pausable ISM.', address);
         }
         // if it has ccipOrigin property --> CCIP
@@ -758381,7 +758414,8 @@ class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_2_
                 originChain,
             };
         }
-        catch {
+        catch (error) {
+            (0,_utils_contract_js__WEBPACK_IMPORTED_MODULE_7__/* .throwIfNotMissingSelector */ .KT)(error);
             this.logger.debug('Error accessing "ccipOrigin" property, implying this is not a CCIP ISM.', address);
         }
         // if it has VERIFIED_MASK_INDEX, it's AbstractMessageIdAuthorizedIsm which means OPStackIsm
@@ -758395,7 +758429,8 @@ class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_2_
                 nativeBridge: '', // no way to extract native bridge from the ism
             };
         }
-        catch {
+        catch (error) {
+            (0,_utils_contract_js__WEBPACK_IMPORTED_MODULE_7__/* .throwIfNotMissingSelector */ .KT)(error);
             this.logger.debug('Error accessing "VERIFIED_MASK_INDEX" property, implying this is not an OP Stack ISM.', address);
         }
         // Detect RateLimitedIsm by probing for its unique recipient() selector.
@@ -758415,7 +758450,8 @@ class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_2_
                 owner,
             };
         }
-        catch {
+        catch (error) {
+            (0,_utils_contract_js__WEBPACK_IMPORTED_MODULE_7__/* .throwIfNotMissingSelector */ .KT)(error);
             this.logger.debug('Error accessing "recipient" property, implying this is not a Rate Limited ISM.', address);
         }
         // no specific properties, must be Test ISM
@@ -760737,6 +760773,9 @@ const RelayerAgentConfigSchema = AgentConfigSchema.extend({
 const ScraperAgentConfigSchema = AgentConfigSchema.extend({
     db: zod__WEBPACK_IMPORTED_MODULE_0__/* .string */ .Yj().min(1).describe('Database connection string'),
     chainsToScrape: CommaSeparatedChainList.describe('Comma separated list of chain names to scrape'),
+    ccrRouters: zod__WEBPACK_IMPORTED_MODULE_0__/* .record */ .g1(zod__WEBPACK_IMPORTED_MODULE_0__/* .record */ .g1(zod__WEBPACK_IMPORTED_MODULE_0__/* .string */ .Yj()))
+        .optional()
+        .describe('Per-domain CCR router → underlying ERC20 token mapping. Domain ID → { router_address → token_address }. Auto-populated from registry.'),
 });
 const ValidatorAgentConfigSchema = AgentConfigSchema.extend({
     db: zod__WEBPACK_IMPORTED_MODULE_0__/* .string */ .Yj()
@@ -763386,6 +763425,21 @@ const DEFAULT_MAX_RETRIES = 1;
 const DEFAULT_BASE_RETRY_DELAY_MS = 250; // 0.25 seconds
 const DEFAULT_STAGGER_DELAY_MS = 1000; // 1 seconds
 const DEFAULT_PHASE2_WAIT_MULTIPLIER = 20;
+function getErrorMessage(error) {
+    return error instanceof Error ? error.message : undefined;
+}
+function errorChainHasMessage(error, message) {
+    let current = error;
+    while (current instanceof Error) {
+        if (getErrorMessage(current) === message)
+            return true;
+        current = current.cause;
+    }
+    return false;
+}
+function getMostDiagnosticUnhandledError(errors) {
+    return (errors.find((error) => errorChainHasMessage(error, 'Invalid response from provider')) ?? errors[0]);
+}
 class BlockchainError extends Error {
     isRecoverable = false;
     constructor(message, options) {
@@ -763782,7 +763836,9 @@ class HyperlaneSmartProvider extends lib.providers.BaseProvider {
             }, 'Unhandled error case in combined provider error handler');
             return class extends Error {
                 constructor() {
-                    super(fallbackMsg);
+                    super(fallbackMsg, {
+                        cause: getMostDiagnosticUnhandledError(errors),
+                    });
                 }
             };
         }
@@ -764247,11 +764303,13 @@ async function estimateTransactionFeeSolanaWeb3({ provider, transaction, }) {
     (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_8__/* .assert */ .v)(!value.err, `Solana gas estimation failed: ${JSON.stringify(value)}`);
     const gasUnits = BigInt(value.unitsConsumed || 0);
     const recentFees = await connection.getRecentPrioritizationFees();
-    const gasPrice = BigInt(recentFees[0].prioritizationFee);
+    // prioritizationFee is in micro-lamports per compute unit; divide by 1e6 to get lamports
+    const microLamportsPerCu = BigInt(recentFees[0]?.prioritizationFee ?? 0);
+    const fee = (gasUnits * microLamportsPerCu) / 1000000n;
     return {
         gasUnits,
-        gasPrice,
-        fee: gasUnits * gasPrice,
+        gasPrice: microLamportsPerCu,
+        fee,
     };
 }
 // This is based on a reverse-engineered version of the
@@ -803168,8 +803226,8 @@ class EvmWarpModule extends _core_AbstractHyperlaneModule_js__WEBPACK_IMPORTED_M
     async upgradeWarpRouteImplementationTx(actualConfig, expectedConfig) {
         const updateTransactions = [];
         (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_15__/* .assert */ .v)(expectedConfig.type !== _config_js__WEBPACK_IMPORTED_MODULE_30__/* .TokenType */ .ks.unknown, 'Cannot upgrade warp route with unknown token type');
-        // This should be impossible since we try catch the call to `PACKAGE_VERSION`
-        // in `EvmWarpRouteReader.fetchPackageVersion`
+        // Older contracts without PACKAGE_VERSION fall back to a legacy version in
+        // EvmWarpRouteReader.fetchPackageVersion.
         (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_15__/* .assert */ .v)(actualConfig.contractVersion, 'Actual contract version is undefined');
         // Only upgrade if the user specifies a version
         if (!expectedConfig.contractVersion) {
@@ -803369,6 +803427,8 @@ var types = __nccwpck_require__(52116);
 var EvmIsmReader = __nccwpck_require__(60715);
 // EXTERNAL MODULE: ../sdk/dist/router/EvmRouterReader.js
 var EvmRouterReader = __nccwpck_require__(26623);
+// EXTERNAL MODULE: ../sdk/dist/utils/contract.js
+var contract = __nccwpck_require__(76709);
 // EXTERNAL MODULE: ../sdk/dist/deploy/proxy.js
 var proxy = __nccwpck_require__(83697);
 // EXTERNAL MODULE: ../sdk/dist/token/config.js
@@ -803397,6 +803457,7 @@ var xerc20 = __nccwpck_require__(32892);
 
 
 
+
 const REBALANCING_CONTRACT_VERSION = '8.0.0';
 const TOKEN_FEE_CONTRACT_VERSION = '10.0.0';
 // version that introduced the fractional scale interface
@@ -803589,7 +803650,8 @@ class EvmWarpRouteReader extends EvmRouterReader/* EvmRouterReader */.V {
                         break;
                     }
                 }
-                catch {
+                catch (error) {
+                    (0,contract/* throwIfNotMissingSelector */.KT)(error);
                     // Not a PredicateRouterWrapper — continue
                 }
             }
@@ -803623,6 +803685,7 @@ class EvmWarpRouteReader extends EvmRouterReader/* EvmRouterReader */.V {
         const [packageVersion, tokenFee] = await Promise.all([
             this.fetchPackageVersion(routerAddress),
             TokenRouter.feeRecipient().catch((error) => {
+                (0,contract/* throwIfNotMissingSelector */.KT)(error);
                 this.logger.debug(`Failed to read feeRecipient for token at address "${routerAddress}" on chain "${this.chain}", defaulting to AddressZero`, error);
                 return lib.constants.AddressZero;
             }),
@@ -803638,6 +803701,7 @@ class EvmWarpRouteReader extends EvmRouterReader/* EvmRouterReader */.V {
         }
         const routingDestinations = destinations ??
             (await TokenRouter.domains().catch((error) => {
+                (0,contract/* throwIfNotMissingSelector */.KT)(error);
                 this.logger.debug(`Failed to derive token router domains for routing fee config on "${this.chain}"`, error);
                 return undefined;
             }));
@@ -803808,6 +803872,7 @@ class EvmWarpRouteReader extends EvmRouterReader/* EvmRouterReader */.V {
                             return token_config/* TokenType */.ks.XERC20;
                         }
                         catch (error) {
+                            (0,contract/* throwIfNotMissingSelector */.KT)(error);
                             this.logger.debug(`Warp route token at address "${warpRouteAddress}" on chain "${this.chain}" is not a ${token_config/* TokenType */.ks.XERC20}`, error);
                         }
                         try {
@@ -803841,6 +803906,7 @@ class EvmWarpRouteReader extends EvmRouterReader/* EvmRouterReader */.V {
                             return everclearTokenType;
                         }
                         catch (error) {
+                            (0,contract/* throwIfNotMissingSelector */.KT)(error);
                             this.logger.debug(`Warp route token at address "${warpRouteAddress}" on chain "${this.chain}" is not a ${token_config/* TokenType */.ks.collateralEverclear}`, error);
                         }
                         try {
@@ -803849,12 +803915,14 @@ class EvmWarpRouteReader extends EvmRouterReader/* EvmRouterReader */.V {
                             return token_config/* TokenType */.ks.crossCollateral;
                         }
                         catch (error) {
+                            (0,contract/* throwIfNotMissingSelector */.KT)(error);
                             this.logger.debug(`Warp route token at address "${warpRouteAddress}" on chain "${this.chain}" is not a ${token_config/* TokenType */.ks.crossCollateral}`, error);
                         }
                     }
                     return tokenType;
                 }
-                catch {
+                catch (error) {
+                    (0,contract/* throwIfNotMissingSelector */.KT)(error);
                     continue;
                 }
             }
@@ -803922,13 +803990,21 @@ class EvmWarpRouteReader extends EvmRouterReader/* EvmRouterReader */.V {
             'function bufferCap(address) external view returns (uint112)',
         ];
         const xERC20 = new lib.Contract(xERC20Address, rateLimitsABI, this.provider);
+        let extraBridgesLimits;
         try {
-            const extraBridgesLimits = await (0,xerc20/* getExtraLockBoxConfigs */.g5)({
+            extraBridgesLimits = await (0,xerc20/* getExtraLockBoxConfigs */.g5)({
                 chain: this.chain,
                 multiProvider: this.multiProvider,
                 xERC20Address,
                 logger: this.logger,
             });
+        }
+        catch (error) {
+            if (!(0,contract/* isMissingSelectorCallException */.pJ)(error))
+                throw error;
+            this.logger.warn(`Skipping extra xERC20 lockbox configs after missing-selector error for token at ${xERC20Address} on chain ${this.chain}`, error);
+        }
+        try {
             // TODO: fix this such that it fetches from WL's values too
             return {
                 xERC20: {
@@ -803937,13 +804013,17 @@ class EvmWarpRouteReader extends EvmRouterReader/* EvmRouterReader */.V {
                         rateLimitPerSecond: (await xERC20.rateLimitPerSecond(warpRouteAddress)).toString(),
                         bufferCap: (await xERC20.bufferCap(warpRouteAddress)).toString(),
                     },
-                    extraBridges: extraBridgesLimits.length > 0 ? extraBridgesLimits : undefined,
+                    extraBridges: extraBridgesLimits && extraBridgesLimits.length > 0
+                        ? extraBridgesLimits
+                        : undefined,
                 },
             };
         }
         catch (error) {
+            if ((0,contract/* isMissingSelectorCallException */.pJ)(error))
+                return {};
             this.logger.error(`Error fetching xERC20 limits for token at ${xERC20Address} on chain ${this.chain}`, error);
-            return {};
+            throw error;
         }
     }
     /**
@@ -804366,7 +804446,7 @@ class EvmWarpRouteReader extends EvmRouterReader/* EvmRouterReader */.V {
             return await contractWithVersion.PACKAGE_VERSION();
         }
         catch (err) {
-            if (err.cause?.code && err.cause?.code === 'CALL_EXCEPTION') {
+            if ((0,contract/* isMissingSelectorCallException */.pJ)(err)) {
                 // PACKAGE_VERSION was introduced in @hyperlane-xyz/core@5.4.0
                 // See https://github.com/hyperlane-xyz/hyperlane-monorepo/releases/tag/%40hyperlane-xyz%2Fcore%405.4.0
                 // The real version of a contract without this function is below 5.4.0
@@ -804374,7 +804454,7 @@ class EvmWarpRouteReader extends EvmRouterReader/* EvmRouterReader */.V {
             }
             else {
                 this.logger.error(`Error when fetching package version ${err}`);
-                return '0.0.0';
+                throw err;
             }
         }
     }
@@ -806868,14 +806948,17 @@ class EvmHypSyntheticAdapter extends EvmTokenAdapter {
             return await this.contract.PACKAGE_VERSION();
         }
         catch (err) {
-            // PACKAGE_VERSION was introduced in v5.4.0
+            if ((0,contract/* isMissingSelectorCallException */.pJ)(err)) {
+                // PACKAGE_VERSION was introduced in v5.4.0
+                return '5.3.9';
+            }
             this.logger.error(`Error when fetching package version ${err}`);
-            return '5.3.9';
+            throw err;
         }
     }
     async quoteTransferRemoteGas({ destination, recipient, amount, }) {
         const contractVersion = await this.getContractPackageVersion();
-        const hasQuoteTransferRemote = (0,contract/* isValidContractVersion */.j)(contractVersion, TOKEN_FEE_CONTRACT_VERSION);
+        const hasQuoteTransferRemote = (0,contract/* isValidContractVersion */.jh)(contractVersion, TOKEN_FEE_CONTRACT_VERSION);
         // Version does not support quoteTransferRemote defaulting to quoteGasPayment
         if (!hasQuoteTransferRemote) {
             const gasPayment = await this.contract.quoteGasPayment(destination);
@@ -807148,7 +807231,8 @@ class EvmHypCollateralFiatAdapter extends EvmHypCollateralAdapter {
             const limit = await fiatToken.minterAllowance(this.addresses.token);
             return limit.toBigInt();
         }
-        catch {
+        catch (error) {
+            (0,contract/* throwIfNotMissingSelector */.KT)(error);
             return UIN256_MAX_VALUE;
         }
     }
@@ -817198,6 +817282,8 @@ function viemLogFromGetEventLogsResponse(log) {
     };
 }
 //# sourceMappingURL=utils.js.map
+// EXTERNAL MODULE: ../sdk/dist/utils/contract.js
+var contract = __nccwpck_require__(76709);
 // EXTERNAL MODULE: ../sdk/dist/token/types.js
 var types = __nccwpck_require__(38466);
 // EXTERNAL MODULE: ../sdk/dist/token/xerc20-abi.js
@@ -817213,6 +817299,7 @@ var xerc20_abi = __nccwpck_require__(48798);
 
 
 
+
 async function getExtraLockBoxConfigs({ xERC20Address, chain, multiProvider, logger = logging/* rootLogger */.Jk, }) {
     const explorer = multiProvider.tryGetEvmExplorerMetadata(chain);
     if (!explorer) {
@@ -817271,7 +817358,8 @@ async function getLockboxesFromLogs(logs, provider, chain, logger) {
             await maybeXERC20Lockbox.callStatic.XERC20();
             return log;
         }
-        catch {
+        catch (error) {
+            (0,contract/* throwIfNotMissingSelector */.KT)(error);
             logger.debug(`Contract at address ${log.args.bridge} on chain ${chain} is not a XERC20Lockbox contract.`);
             return undefined;
         }
@@ -817599,22 +817687,82 @@ class MultiGeneric {
 /***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __nccwpck_require__) => {
 
 /* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
-/* harmony export */   j: () => (/* binding */ isValidContractVersion),
-/* harmony export */   u: () => (/* binding */ contractHasString)
+/* harmony export */   KT: () => (/* binding */ throwIfNotMissingSelector),
+/* harmony export */   jh: () => (/* binding */ isValidContractVersion),
+/* harmony export */   pJ: () => (/* binding */ isMissingSelectorCallException),
+/* harmony export */   uu: () => (/* binding */ contractHasString)
 /* harmony export */ });
 /* harmony import */ var compare_versions__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(95416);
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(93142);
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(76378);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(73689);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(93142);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(76378);
 
 
 function isValidContractVersion(currentVersion, targetVersion) {
     return (0,compare_versions__WEBPACK_IMPORTED_MODULE_0__.compareVersions)(currentVersion, targetVersion) >= 0;
 }
+function isRecord(value) {
+    return typeof value === 'object' && !(0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_1__/* .isNullish */ .u)(value);
+}
+function getErrorMessage(error) {
+    return error instanceof Error
+        ? error.message
+        : isRecord(error) && typeof error.message === 'string'
+            ? error.message
+            : undefined;
+}
+function isEmptyProviderResponse(error) {
+    let current = error;
+    while (isRecord(current)) {
+        // Assumes the originating provider call was an eth_call probe. The
+        // HyperlaneJsonRpcProvider also emits this message for empty getBalance,
+        // getBlock, and getBlockNumber responses.
+        if (getErrorMessage(current) === 'Invalid response from provider') {
+            return true;
+        }
+        current = current.cause;
+    }
+    return false;
+}
+function findCallException(error) {
+    let current = error;
+    while (isRecord(current)) {
+        if (current.code === 'CALL_EXCEPTION')
+            return current;
+        current = current.cause;
+    }
+    return undefined;
+}
+function isMissingSelectorCallException(error) {
+    if (!isRecord(error))
+        return false;
+    if (isEmptyProviderResponse(error))
+        return true;
+    const callException = findCallException(error);
+    if (!callException)
+        return false;
+    const nestedError = isRecord(callException.error)
+        ? callException.error
+        : undefined;
+    const data = typeof callException.data === 'string'
+        ? callException.data
+        : nestedError?.data;
+    if (data === '0x')
+        return true;
+    // Some ethers/provider combinations only expose empty return data in the
+    // formatted message.
+    return (typeof callException.message === 'string' &&
+        callException.message.includes('data="0x"'));
+}
+function throwIfNotMissingSelector(error) {
+    if (!isMissingSelectorCallException(error))
+        throw error;
+}
 async function contractHasString(provider, address, searchFor) {
     const code = await provider.getCode(address);
-    const hexString = (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_1__/* .strip0x */ .LL)(Buffer.from(searchFor).toString('hex'));
+    const hexString = (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_2__/* .strip0x */ .LL)(Buffer.from(searchFor).toString('hex'));
     // largest stack operation is PUSH32 https://www.evm.codes/?fork=osaka#7f
-    const chunks = (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_2__/* .chunk */ .iv)(hexString, 32 * 2);
+    const chunks = (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .chunk */ .iv)(hexString, 32 * 2);
     for (const chunk of chunks) {
         if (!code.includes(chunk)) {
             return false;
@@ -819271,7 +819419,11 @@ class WarpCore {
             interchainFee: igpQuote,
             tokenFeeQuote,
             attestation,
-            amount: originTokenAmount.amount,
+            // Only pass amount for predicate flows — it feeds the attested msg_value into
+            // eth_estimateGas. For non-predicate flows, let getLocalTransferFee use its
+            // minimal-amount fallback so simulation doesn't fail on large balances or
+            // placeholder senders (e.g. 0x...dead) that have no ETH.
+            amount: attestation ? originTokenAmount.amount : undefined,
         });
         return {
             interchainQuote: igpQuote,
@@ -819304,7 +819456,7 @@ class WarpCore {
             interchainFee: interchainQuote,
             tokenFeeQuote,
             attestation,
-            amount: originTokenAmount.amount,
+            amount: attestation ? originTokenAmount.amount : undefined,
             destinationToken: resolvedDestinationToken,
         });
         return {
@@ -819320,14 +819472,28 @@ class WarpCore {
     async getMaxTransferAmount({ balance, destination, recipient, sender, senderPubKey, feeEstimate, destinationToken, }) {
         const originToken = balance.token;
         if (!feeEstimate) {
-            feeEstimate = await this.estimateTransferRemoteFees({
+            // Get IGP and token fee quotes using the full balance so amount-dependent fees
+            // (e.g. percentage-based token fees) are correctly computed and subtracted.
+            const { igpQuote: interchainQuote, tokenFeeQuote } = await this.getInterchainTransferFee({
                 originTokenAmount: balance,
                 destination,
                 recipient,
                 sender,
+                destinationToken,
+            });
+            // Estimate local gas with no amount so getLocalTransferFee uses its minimal-amount
+            // fallback — avoids eth_estimateGas failures on native token routes where simulating
+            // the full balance leaves nothing to cover gas.
+            const localQuote = await this.getLocalTransferFeeAmount({
+                originToken,
+                destination,
+                sender,
                 senderPubKey,
+                interchainFee: interchainQuote,
+                tokenFeeQuote,
                 destinationToken,
             });
+            feeEstimate = { interchainQuote, localQuote, tokenFeeQuote };
         }
         const { localQuote, interchainQuote, tokenFeeQuote } = feeEstimate;
         let maxAmount = balance;
@@ -905272,13 +905438,14 @@ async function createServiceLogger(options) {
 /* harmony export */   hw: () => (/* binding */ formatMessage),
 /* harmony export */   vY: () => (/* binding */ parseMessage)
 /* harmony export */ });
-/* unused harmony exports extractRefundAddressFromMetadata, hasValidRefundAddress */
+/* unused harmony exports extractRefundAddressFromMetadata, hasValidRefundAddress, syntheticCcrSwapMessageId */
 /* harmony import */ var ethers__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(61934);
 /* harmony import */ var _addresses_js__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(93142);
 /* harmony import */ var _strings_js__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(18508);
 
 
 
+
 /**
  * JS Implementation of solidity/contracts/libs/Message.sol#formatMessage
  * @returns Hex string of the packed message
@@ -905389,6 +905556,32 @@ function hasValidRefundAddress(metadata) {
     return (refundAddress !== null &&
         refundAddress.toLowerCase() !== ethers.constants.AddressZero);
 }
+/**
+ * Compute the synthetic message ID the scraper stores for a same-chain CCR swap.
+ *
+ * Format: `0x00000000 || keccak256("SameChainCCR" || txHash32 || logIndex8)[0..28]`
+ *
+ * The 4-byte zero prefix makes synthetic IDs immediately distinguishable from
+ * real Hyperlane message IDs (which are uniform keccak256 outputs).
+ *
+ * @param txHash  32-byte transaction hash (0x-prefixed hex string)
+ * @param logIndex  log index of the ReceivedTransferRemote event
+ */
+function syntheticCcrSwapMessageId(txHash, logIndex) {
+    assert(ethers.utils.isHexString(txHash, 32), `txHash must be a 32-byte hex string, got: ${txHash}`);
+    assert((typeof logIndex === 'bigint' && logIndex >= 0n) ||
+        (typeof logIndex === 'number' &&
+            Number.isInteger(logIndex) &&
+            logIndex >= 0), `logIndex must be a non-negative integer, got: ${logIndex}`);
+    const logIndexHex = ethers.utils.hexZeroPad(ethers.BigNumber.from(logIndex).toHexString(), 8);
+    const hash = ethers.utils.keccak256(ethers.utils.concat([
+        ethers.utils.toUtf8Bytes('SameChainCCR'),
+        txHash,
+        logIndexHex,
+    ]));
+    // 4 zero bytes || first 28 bytes of hash
+    return ensure0x('00'.repeat(4) + hash.slice(2, 58));
+}
 //# sourceMappingURL=messages.js.map
 
 /***/ }),
@@ -907799,7 +907992,7 @@ module.exports = /*#__PURE__*/JSON.parse('[{"type":"function","name":"proveL2Lea
 /***/ 99468:
 /***/ ((module) => {
 
-module.exports = {"rE":"35.0.0"};
+module.exports = {"rE":"35.0.1"};
 
 /***/ })
 

package/bundle/worker2.js

@@ -388,8 +388,8 @@ function __wasm_bindgen_func_elem_7844(arg0, arg1, arg2) {
     wasm.__wasm_bindgen_func_elem_7844(arg0, arg1, addHeapObject(arg2));
 }
 
-function __wasm_bindgen_func_elem_6796(arg0, arg1, arg2, arg3) {
-    wasm.__wasm_bindgen_func_elem_6796(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
+function __wasm_bindgen_func_elem_6792(arg0, arg1, arg2, arg3) {
+    wasm.__wasm_bindgen_func_elem_6792(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
 }
 
 const __wbindgen_enum_RequestCredentials = ["omit", "same-origin", "include"];
@@ -13677,7 +13677,7 @@ function __wbg_get_imports(memory) {
                 const a = state0.a;
                 state0.a = 0;
                 try {
-                    return __wasm_bindgen_func_elem_6796(a, state0.b, arg0, arg1);
+                    return __wasm_bindgen_func_elem_6792(a, state0.b, arg0, arg1);
                 } finally {
                     state0.a = a;
                 }
@@ -13950,11 +13950,6 @@ function __wbg_get_imports(memory) {
         const ret = Atomics.waitAsync(getObject(arg0), arg1 >>> 0, arg2);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_cast_07555e2579ff3863 = function(arg0, arg1) {
-        // Cast intrinsic for `Closure(Closure { dtor_idx: 418, function: Function { arguments: [NamedExternref("MessageEvent")], shim_idx: 419, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-        const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_7843, __wasm_bindgen_func_elem_7844);
-        return addHeapObject(ret);
-    };
     imports.wbg.__wbindgen_cast_2241b6af4c4b2941 = function(arg0, arg1) {
         // Cast intrinsic for `Ref(String) -> Externref`.
         const ret = getStringFromWasm0(arg0, arg1);
@@ -13965,16 +13960,16 @@ function __wbg_get_imports(memory) {
         const ret = (BigInt.asUintN(64, arg0) | (arg1 << BigInt(64)));
         return addHeapObject(ret);
     };
+    imports.wbg.__wbindgen_cast_3e8b1a28e9899889 = function(arg0, arg1) {
+        // Cast intrinsic for `Closure(Closure { dtor_idx: 416, function: Function { arguments: [NamedExternref("MessageEvent")], shim_idx: 417, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+        const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_7843, __wasm_bindgen_func_elem_7844);
+        return addHeapObject(ret);
+    };
     imports.wbg.__wbindgen_cast_4625c577ab2ec9ee = function(arg0) {
         // Cast intrinsic for `U64 -> Externref`.
         const ret = BigInt.asUintN(64, arg0);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_cast_72bd42f236eeae61 = function(arg0, arg1) {
-        // Cast intrinsic for `Closure(Closure { dtor_idx: 418, function: Function { arguments: [Externref], shim_idx: 419, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-        const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_7843, __wasm_bindgen_func_elem_7844);
-        return addHeapObject(ret);
-    };
     imports.wbg.__wbindgen_cast_9ae0607507abb057 = function(arg0) {
         // Cast intrinsic for `I64 -> Externref`.
         const ret = arg0;
@@ -13995,6 +13990,11 @@ function __wbg_get_imports(memory) {
         const ret = (BigInt.asUintN(64, arg0) | (BigInt.asUintN(64, arg1) << BigInt(64)));
         return addHeapObject(ret);
     };
+    imports.wbg.__wbindgen_cast_f45fc07d50d9127c = function(arg0, arg1) {
+        // Cast intrinsic for `Closure(Closure { dtor_idx: 416, function: Function { arguments: [Externref], shim_idx: 417, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+        const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_7843, __wasm_bindgen_func_elem_7844);
+        return addHeapObject(ret);
+    };
     imports.wbg.__wbindgen_link_b9f45ffe079ef2c1 = function(arg0) {
         const val = `onmessage = function (ev) {
             let [ia, index, value] = ev.data;

package/bundle/worker3.js

@@ -388,8 +388,8 @@ function __wasm_bindgen_func_elem_7844(arg0, arg1, arg2) {
     wasm.__wasm_bindgen_func_elem_7844(arg0, arg1, addHeapObject(arg2));
 }
 
-function __wasm_bindgen_func_elem_6792(arg0, arg1, arg2, arg3) {
-    wasm.__wasm_bindgen_func_elem_6792(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
+function __wasm_bindgen_func_elem_6796(arg0, arg1, arg2, arg3) {
+    wasm.__wasm_bindgen_func_elem_6796(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
 }
 
 const __wbindgen_enum_RequestCredentials = ["omit", "same-origin", "include"];
@@ -13677,7 +13677,7 @@ function __wbg_get_imports(memory) {
                 const a = state0.a;
                 state0.a = 0;
                 try {
-                    return __wasm_bindgen_func_elem_6792(a, state0.b, arg0, arg1);
+                    return __wasm_bindgen_func_elem_6796(a, state0.b, arg0, arg1);
                 } finally {
                     state0.a = a;
                 }
@@ -13950,6 +13950,11 @@ function __wbg_get_imports(memory) {
         const ret = Atomics.waitAsync(getObject(arg0), arg1 >>> 0, arg2);
         return addHeapObject(ret);
     };
+    imports.wbg.__wbindgen_cast_07555e2579ff3863 = function(arg0, arg1) {
+        // Cast intrinsic for `Closure(Closure { dtor_idx: 418, function: Function { arguments: [NamedExternref("MessageEvent")], shim_idx: 419, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+        const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_7843, __wasm_bindgen_func_elem_7844);
+        return addHeapObject(ret);
+    };
     imports.wbg.__wbindgen_cast_2241b6af4c4b2941 = function(arg0, arg1) {
         // Cast intrinsic for `Ref(String) -> Externref`.
         const ret = getStringFromWasm0(arg0, arg1);
@@ -13960,16 +13965,16 @@ function __wbg_get_imports(memory) {
         const ret = (BigInt.asUintN(64, arg0) | (arg1 << BigInt(64)));
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_cast_3e8b1a28e9899889 = function(arg0, arg1) {
-        // Cast intrinsic for `Closure(Closure { dtor_idx: 416, function: Function { arguments: [NamedExternref("MessageEvent")], shim_idx: 417, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-        const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_7843, __wasm_bindgen_func_elem_7844);
-        return addHeapObject(ret);
-    };
     imports.wbg.__wbindgen_cast_4625c577ab2ec9ee = function(arg0) {
         // Cast intrinsic for `U64 -> Externref`.
         const ret = BigInt.asUintN(64, arg0);
         return addHeapObject(ret);
     };
+    imports.wbg.__wbindgen_cast_72bd42f236eeae61 = function(arg0, arg1) {
+        // Cast intrinsic for `Closure(Closure { dtor_idx: 418, function: Function { arguments: [Externref], shim_idx: 419, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+        const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_7843, __wasm_bindgen_func_elem_7844);
+        return addHeapObject(ret);
+    };
     imports.wbg.__wbindgen_cast_9ae0607507abb057 = function(arg0) {
         // Cast intrinsic for `I64 -> Externref`.
         const ret = arg0;
@@ -13990,11 +13995,6 @@ function __wbg_get_imports(memory) {
         const ret = (BigInt.asUintN(64, arg0) | (BigInt.asUintN(64, arg1) << BigInt(64)));
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_cast_f45fc07d50d9127c = function(arg0, arg1) {
-        // Cast intrinsic for `Closure(Closure { dtor_idx: 416, function: Function { arguments: [Externref], shim_idx: 417, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-        const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_7843, __wasm_bindgen_func_elem_7844);
-        return addHeapObject(ret);
-    };
     imports.wbg.__wbindgen_link_b9f45ffe079ef2c1 = function(arg0) {
         const val = `onmessage = function (ev) {
             let [ia, index, value] = ev.data;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperlane-xyz/cli",
-  "version": "35.0.0",
+  "version": "35.0.1",
   "description": "A command-line utility for common Hyperlane operations",
   "keywords": [
     "CLI",
@@ -74,21 +74,21 @@
     "zod": "^3.21.2",
     "zod-validation-error": "^3.3.0",
     "zx": "^8.1.4",
-    "@hyperlane-xyz/aleo-sdk": "35.0.0",
+    "@hyperlane-xyz/aleo-sdk": "35.0.1",
+    "@hyperlane-xyz/deploy-sdk": "6.0.4",
+    "@hyperlane-xyz/cosmos-sdk": "35.0.1",
     "@hyperlane-xyz/core": "11.3.1",
-    "@hyperlane-xyz/deploy-sdk": "6.0.3",
-    "@hyperlane-xyz/http-registry-server": "35.0.0",
-    "@hyperlane-xyz/cosmos-sdk": "35.0.0",
-    "@hyperlane-xyz/provider-sdk": "6.0.3",
-    "@hyperlane-xyz/rebalancer": "27.3.3",
-    "@hyperlane-xyz/radix-sdk": "35.0.0",
-    "@hyperlane-xyz/relayer": "1.1.31",
-    "@hyperlane-xyz/sdk": "35.0.0",
-    "@hyperlane-xyz/sealevel-sdk": "35.0.0",
-    "@hyperlane-xyz/starknet-sdk": "28.0.8",
-    "@hyperlane-xyz/tron-sdk": "23.0.8",
-    "@hyperlane-xyz/tsconfig": "^35.0.0",
-    "@hyperlane-xyz/utils": "35.0.0"
+    "@hyperlane-xyz/http-registry-server": "35.0.1",
+    "@hyperlane-xyz/provider-sdk": "6.0.4",
+    "@hyperlane-xyz/rebalancer": "27.3.4",
+    "@hyperlane-xyz/radix-sdk": "35.0.1",
+    "@hyperlane-xyz/relayer": "1.1.32",
+    "@hyperlane-xyz/sdk": "35.0.1",
+    "@hyperlane-xyz/starknet-sdk": "28.0.9",
+    "@hyperlane-xyz/tron-sdk": "23.0.9",
+    "@hyperlane-xyz/sealevel-sdk": "35.0.1",
+    "@hyperlane-xyz/utils": "35.0.1",
+    "@hyperlane-xyz/tsconfig": "^35.0.1"
   },
   "engines": {
     "node": ">=16"