@rabby-wallet/rabby-swap 0.0.88-alpha.4 → 0.0.89-alpha.0

package/dist/calldata/magpie/dexAggregator.js

@@ -11,7 +11,7 @@ export const decodeDexAggregator = (data) => ({
 // LibRouter.getData(): byte 274 holds the fee count, followed by three
 // arrays of compact descriptors (asset, receiver, amount), 3 bytes per entry.
 // transferFees() transfers these separately from the swap's amountIn.
-// Only fees paid in the input asset belong in its total debit.
+// Only input-asset fees fit the single-asset payment checked against the quote.
 // https://sourcify.dev/server/v2/contract/42161/0x20F6ee51340aDEed01A59B0e65cB3703f3dc860c?fields=sources
 // https://docs.fly.trade/developers/api-reference/evm-swap-integration-guide#step-1-get-a-quote
 export const decodeDexAggregatorInputFee = (data) => {
@@ -25,6 +25,8 @@ export const decodeDexAggregatorInputFee = (data) => {
         const amount = data.compact(amountOffset, amountOffset + 1);
         if (inputAsset.eq(asset))
             total = total.plus(amount);
+        else if (new BigNumber(amount).gt(0))
+            throw new Error("Non-input-asset Magpie fees are not supported");
     }
     return total.toFixed(0);
 };

package/dist/calldata/magpie/index.js

@@ -1,11 +1,11 @@
-import { utils } from "ethers";
+import { Interface } from "@ethersproject/abi";
 import BigNumber from "bignumber.js";
 import { getNativeTokenAddress } from "../chain";
 import { isSameAddress, NULL_ADDRESS } from "../../utils";
 import { MagpieABI } from "./abi";
 import { decodeDexAggregator, decodeDexAggregatorInputFee, } from "./dexAggregator";
 import { PackedReader } from "./packed";
-const magpieInterface = new utils.Interface(MagpieABI);
+const magpieInterface = new Interface(MagpieABI);
 const dexAggregatorSelector = magpieInterface.getSighash("swapWithBackendSignature");
 // Keep parsing details private and tied to the decoded result's lifetime.
 const decodedPayloads = new WeakMap();
@@ -15,7 +15,7 @@ const readPayload = (tx) => {
         throw new Error(`Unsupported Magpie calldata selector: ${selector}`);
     }
     const transaction = magpieInterface.parseTransaction({ data: tx.data });
-    const payloadLength = utils.arrayify(transaction.args[0]).length;
+    const payloadLength = (transaction.args[0].length - 2) / 2;
     return new PackedReader(tx.data, payloadLength);
 };
 export const decodeInputFee = (tx, decoded) => {

package/dist/calldata/uni/index.js

@@ -1,4 +1,4 @@
-import { utils } from "ethers";
+import { Interface } from "@ethersproject/abi";
 import BigNumber from "bignumber.js";
 import { getNativeTokenAddress } from "../chain";
 import { UniABI } from "./abi";
@@ -6,7 +6,7 @@ import { chainToken, finishSwap } from "./shared";
 import { walkCommands } from "./universalRouter/commands";
 import { getRouterProfile } from "./universalRouter/profiles";
 import { normalizeUniAssets } from "./assets";
-const uniInterface = new utils.Interface(UniABI);
+const uniInterface = new Interface(UniABI);
 export const decodeCalldata = (tx, options = {}) => {
     var _a;
     const native = getNativeTokenAddress(tx.chainId, options.nativeTokenAddress);

package/dist/calldata/uni/shared.js

@@ -128,9 +128,10 @@ export const setOutput = (swap, ctx, token, recipient, minimum, exactAmount = fa
             .toFixed();
         return;
     }
-    // A trailing sweep of the original input is a refund. It must not replace
-    // an already identified payout in a different asset.
-    if (isInputRefund(swap, ctx, output))
+    // Only input returned to the user is a refund; third-party transfers must
+    // remain visible to the final payout checks.
+    if (isInputRefund(swap, ctx, output) &&
+        isSameAddress(resolveRecipient(recipient, ctx), ctx.sender))
         return;
     recordPayout(swap, ctx, output, recipient, amount);
 };

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

@@ -8,8 +8,11 @@ export const walkCommands = (commands, inputs, swap, ctx, profile) => {
     if (hex.length / 2 !== inputs.length)
         throw new Error("Commands and inputs lengths differ");
     for (let i = 0; i < inputs.length; i++) {
-        // Strip execution flags before passing the command to the SDK parser.
-        const command = parseInt(hex.slice(i * 2, i * 2 + 2), 16) & profile.commandMask;
+        const commandByte = parseInt(hex.slice(i * 2, i * 2 + 2), 16);
+        const command = commandByte & profile.commandMask;
+        // Optional sub-plans do not guarantee their decoded minimum output.
+        if (command === CommandType.EXECUTE_SUB_PLAN && (commandByte & 0x80) !== 0)
+            throw new Error("Sub-plans with allow-revert are not supported");
         const unsupported = () => new Error(`Unsupported command 0x${command.toString(16)} for the current exact-input quote flow (Router ${profile.version})`);
         if (command === CommandType.V4_SWAP) {
             if (profile.version === UniversalRouterVersion.V1_2) {

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

@@ -1,19 +1,19 @@
 import { CommandParser, CommandType } from "@uniswap/universal-router-sdk";
-import { utils } from "ethers";
+import { defaultAbiCoder } from "@ethersproject/abi";
 const planTypes = ["bytes", "bytes[]"];
 export const readPlan = (input) => {
-    const [commands, inputs] = utils.defaultAbiCoder.decode(planTypes, input);
+    const [commands, inputs] = defaultAbiCoder.decode(planTypes, input);
     return { commands: commands, inputs: inputs };
 };
 export const paramValues = (params) => Object.fromEntries(params.map(({ name, value }) => [name, value]));
 // The SDK selects version-specific parameter schemas and V3 path parsers.
 export const decodeCommand = (command, input, version) => {
-    const calldata = CommandParser.INTERFACE.encodeFunctionData("execute(bytes,bytes[])", [utils.hexlify(command), [input]]);
+    const calldata = CommandParser.INTERFACE.encodeFunctionData("execute(bytes,bytes[])", [`0x${command.toString(16).padStart(2, "0")}`, [input]]);
     return CommandParser.parseCalldata(calldata, version).commands[0];
 };
 export const decodeV4Action = (action, input, version) => {
-    const plan = utils.defaultAbiCoder.encode(planTypes, [
-        utils.hexlify(action),
+    const plan = defaultAbiCoder.encode(planTypes, [
+        `0x${action.toString(16).padStart(2, "0")}`,
         [input],
     ]);
     const decoded = decodeCommand(CommandType.V4_SWAP, plan, version).params[0];

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

@@ -1,18 +1,24 @@
-import { Token, V2_FACTORY_ADDRESSES } from "@uniswap/sdk-core";
-import { computePairAddress } from "@uniswap/v2-sdk";
+import { isAddress, soliditySha3Raw, toChecksumAddress } from "web3-utils";
+import { UNI_V2_FACTORY_ADDRESSES, UNI_V2_PAIR_INIT_CODE_HASH, } from "../../../consts";
 // A mixed route can pay directly into the next V2 pair instead of the Router.
 // Use the official chain-specific factory and CREATE2 derivation; never guess a
 // mainnet factory when deployment metadata is missing.
 // https://github.com/Uniswap/sdks/blob/main/sdks/universal-router-sdk/src/entities/actions/uniswap.ts
 // https://github.com/Uniswap/sdks/blob/main/sdks/v2-sdk/src/entities/pair.ts
 export const getV2InputPair = (chainId, path) => {
-    const factoryAddress = V2_FACTORY_ADDRESSES[chainId];
+    const factoryAddress = UNI_V2_FACTORY_ADDRESSES[chainId];
     if (!factoryAddress)
         return undefined;
-    return computePairAddress({
-        factoryAddress,
-        // Only chain and addresses participate in CREATE2; decimals are unused.
-        tokenA: new Token(chainId, path[0], 0),
-        tokenB: new Token(chainId, path[1], 0),
-    });
+    if (!isAddress(path[0]) || !isAddress(path[1])) {
+        throw new Error("Invalid V2 token address");
+    }
+    const [token0, token1] = path
+        .slice(0, 2)
+        .map((token) => token.toLowerCase())
+        .sort();
+    if (token0 === token1)
+        throw new Error("V2 pair requires two distinct tokens");
+    const salt = soliditySha3Raw({ type: "address", value: token0 }, { type: "address", value: token1 });
+    const hash = soliditySha3Raw({ type: "bytes1", value: "0xff" }, { type: "address", value: factoryAddress }, { type: "bytes32", value: salt }, { type: "bytes32", value: UNI_V2_PAIR_INIT_CODE_HASH });
+    return toChecksumAddress(`0x${hash.slice(-40)}`);
 };

package/dist/consts.d.ts

@@ -1,3 +1,5 @@
+export declare const UNI_V2_FACTORY_ADDRESSES: Record<number, string>;
+export declare const UNI_V2_PAIR_INIT_CODE_HASH = "0x96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f";
 /** Arc ERC-20 USDC (6 decimals); dual view of native gas USDC (18 decimals). */
 export declare const ARC_ERC20_USDC = "0x3600000000000000000000000000000000000000";
 export declare enum DEX_ENUM {

package/dist/consts.js

@@ -1,3 +1,32 @@
+// Uniswap sdk-core 7.19.4 / v2-sdk 4.21.5 deployment constants.
+export const UNI_V2_FACTORY_ADDRESSES = {
+    "1": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f",
+    "5": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f",
+    "10": "0x0c3c1c532F1e39EdF36BE9Fe0bE1410313E074Bf",
+    "56": "0x8909Dc15e40173Ff4699343b6eB8132c65e18eC6",
+    "130": "0x1f98400000000000000000000000000000000002",
+    "137": "0x9e5A52f57b3038F1B8EeE45F28b3C1967e22799C",
+    "143": "0x182a927119d56008d921126764bf884221b10f59",
+    "196": "0xdf38f24fe153761634be942f9d859f3dba857e95",
+    "480": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f",
+    "1301": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f",
+    "1868": "0x97febbc2adbd5644ba22736e962564b23f5828ce",
+    "4217": "0xf9ec577a4e45b5278bb7cf60fcbc20c3acaef68f",
+    "4326": "0xbf56488c857a881ae7e3bed27cf99c10a7ab7e50",
+    "4663": "0x8bceaa40b9acdfaedf85adf4ff01f5ad6517937f",
+    "5042": "0x89e5db8b5aa49aa85ac63f691524311aeb649eba",
+    "8453": "0x8909dc15e40173ff4699343b6eb8132c65e18ec6",
+    "10143": "0x733e88f248b742db6c14c0b1713af5ad7fdd59d0",
+    "42161": "0xf1D7CC64Fb4452F05c498126312eBE29f30Fbcf9",
+    "42220": "0x79a530c8e2fA8748B7B40dd3629C0520c2cCf03f",
+    "43114": "0x9e5A52f57b3038F1B8EeE45F28b3C1967e22799C",
+    "57073": "0xfe57a6ba1951f69ae2ed4abe23e0f095df500c04",
+    "59144": "0x114A43DF6C5f54EBB8A9d70Cd1951D3dD68004c7",
+    "81457": "0x5C346464d33F90bABaf70dB6388507CC889C1070",
+    "84532": "0x7Ae58f10f7849cA6F5fB71b7f45CB416c9204b1e",
+    "11155111": "0xF62c03E08ada871A0bEb309762E260a7a6a880E6",
+};
+export const UNI_V2_PAIR_INIT_CODE_HASH = "0x96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f";
 /** Arc ERC-20 USDC (6 decimals); dual view of native gas USDC (18 decimals). */
 export const ARC_ERC20_USDC = "0x3600000000000000000000000000000000000000";
 export var DEX_ENUM;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rabby-wallet/rabby-swap",
-  "version": "0.0.88-alpha.4",
+  "version": "0.0.89-alpha.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -19,13 +19,11 @@
   },
   "dependencies": {
     "@ethersproject/abi": "^5.7.0",
-    "@uniswap/sdk-core": "7.19.4",
     "@uniswap/universal-router-sdk": "5.14.0",
-    "@uniswap/v2-sdk": "4.21.5",
     "axios": "^0.27.2",
     "bignumber.js": "^9.1.1",
-    "ethers": "5.8.0",
-    "web3-eth-abi": "^1.8.1"
+    "web3-eth-abi": "^1.8.1",
+    "web3-utils": "1.8.1"
   },
   "devDependencies": {
     "@debank/common": "^0.3.60",