@rabby-wallet/rabby-swap 0.0.89-alpha.1 → 0.0.89-alpha.2

package/dist/calldata/uni/universalRouter/commands.js

@@ -21,8 +21,11 @@ export const walkCommands = (commands, inputs, swap, ctx, profile) => {
             walkV4(inputs[i], swap, ctx, profile.version);
             continue;
         }
+        // 2.1.2 retains the full-precision fee command introduced in 2.1.1.
+        // https://github.com/Uniswap/universal-router/blob/2.1.2/contracts/libraries/Commands.sol
         if ((command === CommandType.PAY_PORTION_FULL_PRECISION &&
-            profile.version !== UniversalRouterVersion.V2_1_1) ||
+            profile.version !== UniversalRouterVersion.V2_1_1 &&
+            profile.version !== UniversalRouterVersion.V2_1_2) ||
             (command === CommandType.BALANCE_CHECK_ERC20 &&
                 profile.commandMask === 0x1f))
             throw unsupported();

package/dist/calldata/uni/universalRouter/profiles.js

@@ -1,27 +1,36 @@
 import { UNIVERSAL_ROUTER_ADDRESS, UniversalRouterVersion, } from "@uniswap/universal-router-sdk";
 import { isSameAddress } from "../../../utils";
 export const getRouterProfile = (chainId, router) => {
-    // Match the current backend's x-universal-router-version configuration.
-    const requestedVersion = chainId === 4663 || chainId === 5042
-        ? UniversalRouterVersion.V2_1_1
-        : UniversalRouterVersion.V2_0;
-    let expectedRouter;
-    try {
-        expectedRouter = UNIVERSAL_ROUTER_ADDRESS(requestedVersion, chainId);
+    // Resolve the actual deployment instead of assuming the quote's API version.
+    // 2.1.2 keeps the 2.1.1 calldata layout; its addresses are supplied by the SDK.
+    // https://developers.uniswap.org/docs/changelog/active-notifications/sunset-of-universal-router-2-0-and-2-1-1
+    const versions = [
+        UniversalRouterVersion.V2_1_2,
+        // Retain the deployments accepted before the 2.1.2 API migration.
+        chainId === 4663 || chainId === 5042
+            ? UniversalRouterVersion.V2_1_1
+            : UniversalRouterVersion.V2_0,
+    ];
+    for (const version of versions) {
+        let expectedRouter;
+        try {
+            expectedRouter = UNIVERSAL_ROUTER_ADDRESS(version, chainId);
+        }
+        catch (_a) {
+            // This version is not deployed on the chain; never guess its layout.
+            continue;
+        }
+        if (!isSameAddress(router, expectedRouter))
+            continue;
+        // The SDK's zkSync 2.0 address aliases the deployed 1.2 Router. Its verified
+        // Commands.sol uses a 5-bit mask and has no V4 swap command.
+        if (chainId === 324 && version === UniversalRouterVersion.V2_0) {
+            return { version: UniversalRouterVersion.V1_2, commandMask: 0x1f };
+        }
+        return {
+            version,
+            commandMask: version === UniversalRouterVersion.V2_0 ? 0x3f : 0x7f,
+        };
     }
-    catch (_a) {
-        // Unsupported chains and addresses must not fall back to a guessed layout.
-    }
-    if (!expectedRouter || !isSameAddress(router, expectedRouter)) {
-        throw new Error(`Unknown Universal Router version for chain ${chainId}, router ${router}; expected the current quote deployment (${requestedVersion})`);
-    }
-    // The SDK's zkSync 2.0 address aliases the deployed 1.2 Router. Its verified
-    // Commands.sol uses a 5-bit mask and has no V4 swap command.
-    if (chainId === 324) {
-        return { version: UniversalRouterVersion.V1_2, commandMask: 0x1f };
-    }
-    return {
-        version: requestedVersion,
-        commandMask: requestedVersion === UniversalRouterVersion.V2_0 ? 0x3f : 0x7f,
-    };
+    throw new Error(`Unknown Universal Router version for chain ${chainId}, router ${router}; supported quote deployments (${versions.join(", ")})`);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rabby-wallet/rabby-swap",
-  "version": "0.0.89-alpha.1",
+  "version": "0.0.89-alpha.2",
   "description": "",
   "main": "dist/index.js",
   "scripts": {