@rabby-wallet/rabby-bridge 0.0.4-beta.0 → 0.0.4-beta.2

package/dist/data.d.ts

@@ -221,6 +221,10 @@ export declare const BRIDGE_SPENDER_WHITELIST_DATA: {
         readonly BLAST: "0x2d509190ed0172ba588407d4c2df918f955cc6e1";
     };
 };
+export declare const BRIDGE_ALT_CONTRACTS_DATA: {
+    readonly across: readonly ["0x10d8b8daa26d307489803e10477de69c0492b610", "0x5a148a9260c1f670429361c34d40b477280f01a9"];
+    readonly relay: readonly ["0x8754bc615047de01228a7527b712806a71a8dc9a", "0xccc88a9d1b4ed6b0eaba998850414b24f1c315be", "0xf6e54bbf91e564fcf0df3ed9f2dd82913e9232c3"];
+};
 export declare const BRIDGE_ROUTER_WHITELIST_DATA: {
     readonly lifi: {
         readonly [EXTRA_CHAINS.XDC]: "0x055d4612ec74ad799c6cb4df72c0ab8dbdbcbafa";

package/dist/data.js

@@ -217,6 +217,8 @@ export const BRIDGE_SPENDER_WHITELIST_DATA = {
         [EXTRA_CHAINS.HYPER]: '0x337685fdab40d39bd02028545a4ffa7d287cc3e2',
         [EXTRA_CHAINS.MONAD]: '0x337685fdab40d39bd02028545a4ffa7d287cc3e2',
     },
+    // across 逐链 SpokePool/直连合约(depositV3 路由的 approve 目标与 tx.to)。
+    // swap+bridge 路由会切到全局 SpokePoolPeriphery,额外合法地址见 BRIDGE_ALT_CONTRACTS_DATA。
     across: {
         [CHAINS_ENUM.ETH]: '0x5c7bcd6e7de5423a257d81b442095a1a6ced35c5',
         [CHAINS_ENUM.OP]: '0x6f26bf09b1c792e3228e5467807a900a503c0281',
@@ -241,6 +243,22 @@ export const BRIDGE_SPENDER_WHITELIST_DATA = {
         [EXTRA_CHAINS.PLASMA]: '0x50039faefebef707cfd94d6d462fe6d10b39207a',
     },
 };
+// 部分聚合器除逐链合约外,API 还可能路由到全局合约(同时作为 approve 目标与 tx.to)。
+// 这些地址对该聚合器所有链均合法,校验时与逐链白名单并列接受。对应 DeBankCore 的 *_alt_contracts。
+export const BRIDGE_ALT_CONTRACTS_DATA = {
+    across: [
+        // SpokePoolPeriphery(swap+bridge 入口),多数链同址
+        '0x10d8b8daa26d307489803e10477de69c0492b610',
+        // SpokePoolPeriphery(zkSync 系: era / lens)
+        '0x5a148a9260c1f670429361c34d40b477280f01a9',
+    ],
+    relay: [
+        // ApprovalProxy v3 全局地址,按 EVM fork 类型区分,与逐链 Depository 同时在用
+        '0x8754bc615047de01228a7527b712806a71a8dc9a', // london
+        '0xccc88a9d1b4ed6b0eaba998850414b24f1c315be', // cancun
+        '0xf6e54bbf91e564fcf0df3ed9f2dd82913e9232c3', // zero / zkevm
+    ],
+};
 export const BRIDGE_ROUTER_WHITELIST_DATA = {
     lifi: {
         [CHAINS_ENUM.ETH]: '0x1231deb6f5749ef6ce6943a275a1d3e7486f4eae',
@@ -401,6 +419,8 @@ export const BRIDGE_ROUTER_WHITELIST_DATA = {
         [EXTRA_CHAINS.HYPER]: '0x337685fdab40d39bd02028545a4ffa7d287cc3e2',
         [EXTRA_CHAINS.MONAD]: '0x337685fdab40d39bd02028545a4ffa7d287cc3e2',
     },
+    // across 逐链 SpokePool/直连合约(depositV3 路由的 approve 目标与 tx.to)。
+    // swap+bridge 路由会切到全局 SpokePoolPeriphery,额外合法地址见 BRIDGE_ALT_CONTRACTS_DATA。
     across: {
         [CHAINS_ENUM.ETH]: '0x5c7bcd6e7de5423a257d81b442095a1a6ced35c5',
         [CHAINS_ENUM.OP]: '0x6f26bf09b1c792e3228e5467807a900a503c0281',

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export { BRIDGE_AGGREGATORS, BRIDGE_ENUM } from './consts.js';
 export type { BridgeAggregatorId } from './consts.js';
-export { ALL_SUPPORTED_BRIDGE_CHAINS, BRIDGE_ROUTER_WHITELIST, BRIDGE_SPENDER_WHITELIST, BRIDGE_SUPPORT_CHAINS, CHAINS_ENUM, getBridgeRouter, getBridgeSpender, isSupportedBridgeAggregator, isSupportedBridgeChain, } from './list.js';
+export { ALL_SUPPORTED_BRIDGE_CHAINS, BRIDGE_ROUTER_WHITELIST, BRIDGE_SPENDER_WHITELIST, BRIDGE_SUPPORT_CHAINS, CHAINS_ENUM, getBridgeAltContracts, getBridgeRouter, getBridgeSpender, isSupportedBridgeAggregator, isSupportedBridgeChain, } from './list.js';
 export { InvalidBridgeContractError, buildBridgeQuoteTx, buildTx, getQuote, getQuoteList, getQuoteListWithTx, validateBridgeQuote, validateBridgeTx, } from './quote.js';
 export type { BridgeApi, BridgeBuildTxParams, BridgeQuote, BridgeQuoteListItem, BridgeQuoteListParams, BridgeTx, } from './quote.js';

package/dist/index.js

@@ -1,3 +1,3 @@
 export { BRIDGE_AGGREGATORS, BRIDGE_ENUM } from './consts.js';
-export { ALL_SUPPORTED_BRIDGE_CHAINS, BRIDGE_ROUTER_WHITELIST, BRIDGE_SPENDER_WHITELIST, BRIDGE_SUPPORT_CHAINS, CHAINS_ENUM, getBridgeRouter, getBridgeSpender, isSupportedBridgeAggregator, isSupportedBridgeChain, } from './list.js';
+export { ALL_SUPPORTED_BRIDGE_CHAINS, BRIDGE_ROUTER_WHITELIST, BRIDGE_SPENDER_WHITELIST, BRIDGE_SUPPORT_CHAINS, CHAINS_ENUM, getBridgeAltContracts, getBridgeRouter, getBridgeSpender, isSupportedBridgeAggregator, isSupportedBridgeChain, } from './list.js';
 export { InvalidBridgeContractError, buildBridgeQuoteTx, buildTx, getQuote, getQuoteList, getQuoteListWithTx, validateBridgeQuote, validateBridgeTx, } from './quote.js';

package/dist/list.d.ts

@@ -11,3 +11,4 @@ export declare const isSupportedBridgeAggregator: (aggregatorId: string) => aggr
 export declare const isSupportedBridgeChain: (aggregatorId: BridgeAggregatorId, chainId: string) => boolean;
 export declare const getBridgeSpender: (aggregatorId: BridgeAggregatorId, chainId: string) => string | undefined;
 export declare const getBridgeRouter: (aggregatorId: BridgeAggregatorId, chainId: string) => string | undefined;
+export declare const getBridgeAltContracts: (aggregatorId: BridgeAggregatorId) => string[];

package/dist/list.js

@@ -1,6 +1,6 @@
 import { CHAINS_ENUM, normalizeChainEnum } from './chains.js';
 import { BRIDGE_AGGREGATORS } from './consts.js';
-import { BRIDGE_SUPPORT_CHAINS_DATA, BRIDGE_ROUTER_WHITELIST_DATA, BRIDGE_SPENDER_WHITELIST_DATA, } from './data.js';
+import { BRIDGE_SUPPORT_CHAINS_DATA, BRIDGE_ROUTER_WHITELIST_DATA, BRIDGE_SPENDER_WHITELIST_DATA, BRIDGE_ALT_CONTRACTS_DATA, } from './data.js';
 export { CHAINS_ENUM };
 export const BRIDGE_SPENDER_WHITELIST = BRIDGE_SPENDER_WHITELIST_DATA;
 export const BRIDGE_ROUTER_WHITELIST = BRIDGE_ROUTER_WHITELIST_DATA;
@@ -40,3 +40,9 @@ export const getBridgeRouter = (aggregatorId, chainId) => {
     }
     return BRIDGE_ROUTER_WHITELIST[aggregatorId]?.[chainEnum];
 };
+// 该聚合器的全局合法合约(periphery 等),对其所有链均有效,与逐链白名单并列接受。
+export const getBridgeAltContracts = (aggregatorId) => {
+    return [
+        ...(BRIDGE_ALT_CONTRACTS_DATA[aggregatorId] || []),
+    ];
+};

package/dist/quote.js

@@ -1,5 +1,5 @@
 import { BRIDGE_ENUM } from './consts.js';
-import { getBridgeRouter, getBridgeSpender, isSupportedBridgeAggregator, isSupportedBridgeChain, } from './list.js';
+import { getBridgeAltContracts, getBridgeRouter, getBridgeSpender, isSupportedBridgeAggregator, isSupportedBridgeChain, } from './list.js';
 export class InvalidBridgeContractError extends Error {
     constructor(kind, aggregatorId, chainId, expected, received, bridgeId) {
         super(`Invalid bridge ${kind} for ${aggregatorId} on ${chainId}: expected ${expected}, got ${received}`);
@@ -48,7 +48,11 @@ export const validateBridgeQuote = (aggregatorId, fromChainId, quote) => {
     if (!expectedSpender || !receivedSpender) {
         return true;
     }
-    if (!isSameAddress(expectedSpender, receivedSpender)) {
+    const allowedSpenders = [
+        expectedSpender,
+        ...getBridgeAltContracts(aggregatorId),
+    ];
+    if (!allowedSpenders.some((addr) => isSameAddress(addr, receivedSpender))) {
         throw new InvalidBridgeContractError('spender', aggregatorId, fromChainId, expectedSpender, receivedSpender, quote.bridge_id);
     }
     return true;
@@ -61,7 +65,11 @@ export const validateBridgeTx = (aggregatorId, fromChainId, bridgeId, tx) => {
     if (!expectedRouter) {
         return true;
     }
-    if (!isSameAddress(expectedRouter, tx.to)) {
+    const allowedRouters = [
+        expectedRouter,
+        ...getBridgeAltContracts(aggregatorId),
+    ];
+    if (!allowedRouters.some((addr) => isSameAddress(addr, tx.to))) {
         throw new InvalidBridgeContractError('router', aggregatorId, fromChainId, expectedRouter, tx.to, bridgeId);
     }
     return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rabby-wallet/rabby-bridge",
-  "version": "0.0.4-beta.0",
+  "version": "0.0.4-beta.02",
   "description": "Bridge quote helpers and contract allowlists for Rabby",
   "type": "module",
   "main": "./dist/index.js",