@hyperlane-xyz/cli 31.1.0 → 31.2.0

package/bundle/index.js

@@ -694435,7 +694435,7 @@ __webpack_async_result__();
 /* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
 /* harmony export */   x: () => (/* binding */ VERSION)
 /* harmony export */ });
-const VERSION = '31.1.0';
+const VERSION = '31.2.0';
 //# sourceMappingURL=version.js.map
 
 /***/ }),
@@ -815780,12 +815780,13 @@ async function contractHasString(provider, address, searchFor) {
 
 /* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
 /* harmony export */   EM: () => (/* binding */ normalizeScale),
+/* harmony export */   TI: () => (/* binding */ messageAmountFromLocal),
 /* harmony export */   gm: () => (/* binding */ scalesEqual),
 /* harmony export */   k: () => (/* binding */ verifyScale)
 /* harmony export */ });
-/* unused harmony export DEFAULT_SCALE */
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(73938);
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(21387);
+/* unused harmony exports DEFAULT_SCALE, localAmountFromMessage, minLocalAmountForMessage, alignLocalAmountToMessage */
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(21387);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(73938);
 
 const DEFAULT_SCALE = {
     numerator: 1n,
@@ -815805,6 +815806,48 @@ function normalizeScale(scale) {
         denominator: BigInt(scale.denominator),
     };
 }
+function assertValidScale(scale) {
+    (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_0__/* .assert */ .v)(scale.numerator > 0n && scale.denominator > 0n, `Scale must be positive, got ${scale.numerator}/${scale.denominator}`);
+}
+function ceilDiv(numerator, denominator) {
+    assert(denominator > 0n, 'Denominator must be positive');
+    assert(numerator >= 0n, 'Numerator must be non-negative');
+    if (numerator === 0n)
+        return 0n;
+    return (numerator + denominator - 1n) / denominator;
+}
+function messageAmountFromLocal(localAmount, scale) {
+    (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_0__/* .assert */ .v)(localAmount >= 0n, 'Local amount must be non-negative');
+    const normalized = normalizeScale(scale);
+    assertValidScale(normalized);
+    return (localAmount * normalized.numerator) / normalized.denominator;
+}
+function localAmountFromMessage(messageAmount, scale) {
+    assert(messageAmount >= 0n, 'Message amount must be non-negative');
+    const normalized = normalizeScale(scale);
+    assertValidScale(normalized);
+    return (messageAmount * normalized.denominator) / normalized.numerator;
+}
+function minLocalAmountForMessage(messageAmount, scale) {
+    assert(messageAmount >= 0n, 'Message amount must be non-negative');
+    const normalized = normalizeScale(scale);
+    assertValidScale(normalized);
+    return ceilDiv(messageAmount * normalized.denominator, normalized.numerator);
+}
+function alignLocalAmountToMessage(localAmount, scale) {
+    assert(localAmount >= 0n, 'Local amount must be non-negative');
+    const messageAmount = messageAmountFromLocal(localAmount, scale);
+    if (messageAmount === 0n) {
+        return {
+            localAmount: 0n,
+            messageAmount: 0n,
+        };
+    }
+    return {
+        localAmount: minLocalAmountForMessage(messageAmount, scale),
+        messageAmount,
+    };
+}
 /**
  * Compares two scale values for equality without precision loss.
  * Accepts any scale variant (number, {number,number}, {bigint,bigint}, undefined).
@@ -815835,8 +815878,8 @@ function verifyScale(configMap) {
     const chainDecimalConfigPairs = configMap instanceof Map
         ? Object.fromEntries(configMap.entries())
         : configMap;
-    const entries = Object.entries((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_0__/* .objMap */ .Yp)(chainDecimalConfigPairs, (chain, config) => {
-        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_1__/* .assert */ .v)(config.decimals != null, `Decimals must be defined for token config on chain ${chain}`);
+    const entries = Object.entries((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_1__/* .objMap */ .Yp)(chainDecimalConfigPairs, (chain, config) => {
+        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_0__/* .assert */ .v)(config.decimals != null, `Decimals must be defined for token config on chain ${chain}`);
         return { decimals: config.decimals, scale: config.scale };
     }));
     if (entries.length <= 1)
@@ -816575,6 +816618,7 @@ __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependen
 /* harmony import */ var _quoted_calls_builder_js__WEBPACK_IMPORTED_MODULE_15__ = __nccwpck_require__(33257);
 /* harmony import */ var _quoted_calls_codec_js__WEBPACK_IMPORTED_MODULE_16__ = __nccwpck_require__(14372);
 /* harmony import */ var _quoted_calls_types_js__WEBPACK_IMPORTED_MODULE_17__ = __nccwpck_require__(35835);
+/* harmony import */ var _utils_decimals_js__WEBPACK_IMPORTED_MODULE_19__ = __nccwpck_require__(27043);
 /* harmony import */ var _types_js__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(95778);
 var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([_token_Token_js__WEBPACK_IMPORTED_MODULE_3__]);
 _token_Token_js__WEBPACK_IMPORTED_MODULE_3__ = (__webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__)[0];
@@ -816593,6 +816637,7 @@ _token_Token_js__WEBPACK_IMPORTED_MODULE_3__ = (__webpack_async_dependencies__.t
 
 
 
+
 class WarpCore {
     multiProvider;
     tokens;
@@ -817366,22 +817411,24 @@ class WarpCore {
             return true;
         }
         const destinationBalance = await this.getTokenCollateral(resolvedDestinationToken);
-        const destinationBalanceInOriginDecimals = (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_18__/* .convertDecimalsToIntegerString */ .In)(resolvedDestinationToken.decimals, originToken.decimals, destinationBalance.toString());
-        // check for scaling factor
-        if (originToken.scale &&
-            resolvedDestinationToken.scale &&
-            originToken.scale !== resolvedDestinationToken.scale) {
-            const precisionFactor = 100_000;
-            const scaledAmount = (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_18__/* .convertToScaledAmount */ .lx)({
-                fromScale: originToken.scale,
-                toScale: resolvedDestinationToken.scale,
-                amount,
-                precisionFactor,
-            });
-            return (BigInt(destinationBalanceInOriginDecimals) * BigInt(precisionFactor) >=
-                scaledAmount);
-        }
-        const isSufficient = BigInt(destinationBalanceInOriginDecimals) >= amount;
+        // Legacy fallback: when both scales are undefined but decimals differ,
+        // we can't use message-space comparison because messageAmountFromLocal
+        // with identity scale would compare raw local units across different
+        // decimal spaces. Fall back to decimal conversion instead.
+        // Well-configured routes should have scale set — verifyScale() catches
+        // this at deploy time. Misconfigured routes that reach the message-space
+        // path below may produce incorrect results.
+        if (originToken.decimals !== resolvedDestinationToken.decimals &&
+            originToken.scale === undefined &&
+            resolvedDestinationToken.scale === undefined) {
+            const destinationBalanceInOriginDecimals = BigInt((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_18__/* .convertDecimalsToIntegerString */ .In)(resolvedDestinationToken.decimals, originToken.decimals, destinationBalance.toString()));
+            const isSufficient = destinationBalanceInOriginDecimals >= amount;
+            this.logger.debug(`${originTokenAmount.token.symbol} to ${destination} has ${isSufficient ? 'sufficient' : 'INSUFFICIENT'} collateral`);
+            return isSufficient;
+        }
+        const requiredMessageAmount = (0,_utils_decimals_js__WEBPACK_IMPORTED_MODULE_19__/* .messageAmountFromLocal */ .TI)(amount, originToken.scale);
+        const availableMessageAmount = (0,_utils_decimals_js__WEBPACK_IMPORTED_MODULE_19__/* .messageAmountFromLocal */ .TI)(destinationBalance, resolvedDestinationToken.scale);
+        const isSufficient = availableMessageAmount >= requiredMessageAmount;
         this.logger.debug(`${originTokenAmount.token.symbol} to ${destination} has ${isSufficient ? 'sufficient' : 'INSUFFICIENT'} collateral`);
         return isSufficient;
     }
@@ -817721,11 +817768,14 @@ var customZodTypes = __nccwpck_require__(47690);
 var TokenConnection = __nccwpck_require__(29842);
 // EXTERNAL MODULE: ../sdk/dist/token/TokenStandard.js
 var TokenStandard = __nccwpck_require__(4879);
+// EXTERNAL MODULE: ../sdk/dist/token/types.js
+var token_types = __nccwpck_require__(38466);
 ;// CONCATENATED MODULE: ../sdk/dist/token/ITokenMetadata.js
 
 
 
 
+
 const TokenConfigSchema = types/* object */.Ik({
     chainName: customZodTypes/* ZChainName */.Vm.describe('The name of the chain, must correspond to a chain in the multiProvider chainMetadata'),
     standard: types/* nativeEnum */.fc(TokenStandard/* TokenStandard */.ph)
@@ -817753,7 +817803,7 @@ const TokenConfigSchema = types/* object */.Ik({
     coinGeckoId: types/* string */.Yj()
         .optional()
         .describe('The CoinGecko id of the token, used for price lookups'),
-    scale: customZodTypes/* ZUint */.xg.lt(256).optional().describe('The scaling factor of the token'),
+    scale: token_types/* TokenMetadataSchema */.ox.shape.scale.describe('The scaling factor of the token'),
     warpRouteId: types/* string */.Yj()
         .min(1)
         .optional()
@@ -903348,10 +903398,9 @@ function hexToRadixCustomPrefix(hex, module, prefix, length = 32) {
 /* harmony export */   Zp: () => (/* binding */ addBufferToGasLimit),
 /* harmony export */   fq: () => (/* binding */ toWei),
 /* harmony export */   kX: () => (/* binding */ fromWei),
-/* harmony export */   kl: () => (/* binding */ convertDecimals),
-/* harmony export */   lx: () => (/* binding */ convertToScaledAmount)
+/* harmony export */   kl: () => (/* binding */ convertDecimals)
 /* harmony export */ });
-/* unused harmony exports fromWeiRounded, tryParseAmount, eqAmountApproximate */
+/* unused harmony exports fromWeiRounded, tryParseAmount, eqAmountApproximate, convertToScaledAmount */
 /* harmony import */ var _ethersproject_units__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(48312);
 /* harmony import */ var bignumber_js__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(62033);
 
@@ -907154,7 +907203,7 @@ module.exports = /*#__PURE__*/JSON.parse('{"_format":"hh-sol-artifact-1","contra
 /***/ 99468:
 /***/ ((module) => {
 
-module.exports = {"rE":"31.1.0"};
+module.exports = {"rE":"31.2.0"};
 
 /***/ })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperlane-xyz/cli",
-  "version": "31.1.0",
+  "version": "31.2.0",
   "description": "A command-line utility for common Hyperlane operations",
   "keywords": [
     "CLI",
@@ -72,21 +72,21 @@
     "zod": "^3.21.2",
     "zod-validation-error": "^3.3.0",
     "zx": "^8.1.4",
+    "@hyperlane-xyz/aleo-sdk": "31.2.0",
+    "@hyperlane-xyz/cosmos-sdk": "31.2.0",
+    "@hyperlane-xyz/deploy-sdk": "4.3.3",
+    "@hyperlane-xyz/http-registry-server": "31.2.0",
     "@hyperlane-xyz/core": "11.3.1",
-    "@hyperlane-xyz/aleo-sdk": "31.1.0",
-    "@hyperlane-xyz/cosmos-sdk": "31.1.0",
-    "@hyperlane-xyz/deploy-sdk": "4.3.2",
-    "@hyperlane-xyz/http-registry-server": "31.1.0",
-    "@hyperlane-xyz/radix-sdk": "31.1.0",
-    "@hyperlane-xyz/rebalancer": "27.2.7",
-    "@hyperlane-xyz/sdk": "31.1.0",
-    "@hyperlane-xyz/sealevel-sdk": "31.1.0",
-    "@hyperlane-xyz/tron-sdk": "22.1.12",
-    "@hyperlane-xyz/provider-sdk": "4.3.2",
-    "@hyperlane-xyz/utils": "31.1.0",
-    "@hyperlane-xyz/tsconfig": "^31.1.0",
-    "@hyperlane-xyz/relayer": "1.1.20",
-    "@hyperlane-xyz/starknet-sdk": "27.2.8"
+    "@hyperlane-xyz/provider-sdk": "4.3.3",
+    "@hyperlane-xyz/radix-sdk": "31.2.0",
+    "@hyperlane-xyz/rebalancer": "27.2.8",
+    "@hyperlane-xyz/sdk": "31.2.0",
+    "@hyperlane-xyz/relayer": "1.1.21",
+    "@hyperlane-xyz/sealevel-sdk": "31.2.0",
+    "@hyperlane-xyz/starknet-sdk": "27.2.9",
+    "@hyperlane-xyz/tron-sdk": "22.1.13",
+    "@hyperlane-xyz/utils": "31.2.0",
+    "@hyperlane-xyz/tsconfig": "^31.2.0"
   },
   "engines": {
     "node": ">=16"