Skip to content

feat: enhance route validation for Linea, Zircuit, and zkSync adapters #526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
0xHarbs merged 1 commit into from
Feb 19, 2026
Merged

feat: enhance route validation for Linea, Zircuit, and zkSync adapters #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions packages/adapters/rebalance/src/adapters/linea/linea.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import {
lineaMessageServiceAbi,
lineaTokenBridgeAbi,
} from './constants';
import { LineaSDK, OnChainMessageStatus } from '@consensys/linea-sdk';
import { LineaSDK } from '@consensys/linea-sdk';

const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';

Expand Down Expand Up @@ -71,6 +71,10 @@ export class LineaNativeBridgeAdapter implements BridgeAdapter {
): Promise<MemoizedTransactionRequest[]> {
try {
const isL1ToL2 = route.origin === ETHEREUM_CHAIN_ID && route.destination === LINEA_CHAIN_ID;
const isL2ToL1 = route.origin === LINEA_CHAIN_ID && route.destination === ETHEREUM_CHAIN_ID;
if (!isL1ToL2 && !isL2ToL1) {
throw new Error(`Unsupported Linea route: ${route.origin}->${route.destination}`);
}
const isETH = route.asset.toLowerCase() === ZERO_ADDRESS;
const transactions: MemoizedTransactionRequest[] = [];

Expand Down Expand Up @@ -205,6 +209,10 @@ export class LineaNativeBridgeAdapter implements BridgeAdapter {
): Promise<boolean> {
try {
const isL1ToL2 = route.origin === ETHEREUM_CHAIN_ID && route.destination === LINEA_CHAIN_ID;
const isL2ToL1 = route.origin === LINEA_CHAIN_ID && route.destination === ETHEREUM_CHAIN_ID;
if (!isL1ToL2 && !isL2ToL1) {
throw new Error(`Unsupported Linea route: ${route.origin}->${route.destination}`);
}

if (isL1ToL2) {
// L1→L2: Auto-claimed by Linea postman service
Expand Down Expand Up @@ -261,7 +269,11 @@ export class LineaNativeBridgeAdapter implements BridgeAdapter {
originTransaction: TransactionReceipt,
): Promise<MemoizedTransactionRequest | void> {
try {
const isL1ToL2 = route.origin === ETHEREUM_CHAIN_ID && route.destination === LINEA_CHAIN_ID;
const isL2ToL1 = route.origin === LINEA_CHAIN_ID && route.destination === ETHEREUM_CHAIN_ID;
if (!isL1ToL2 && !isL2ToL1) {
throw new Error(`Unsupported Linea route: ${route.origin}->${route.destination}`);
}

if (isL2ToL1) {
const l1Client = await this.getClient(ETHEREUM_CHAIN_ID);
Expand Down Expand Up @@ -374,9 +386,7 @@ export class LineaNativeBridgeAdapter implements BridgeAdapter {
}
}

private async getMessageProof(
originTransaction: TransactionReceipt,
): Promise<
private async getMessageProof(originTransaction: TransactionReceipt): Promise<
| {
proof: `0x${string}`[];
messageNumber: bigint;
Expand Down Expand Up @@ -450,10 +460,7 @@ export class LineaNativeBridgeAdapter implements BridgeAdapter {
// which commercial providers like Alchemy reject due to block range limits.
// Use configured L1 providers first, then fall back to public RPCs.
const l1Providers = this.chains[ETHEREUM_CHAIN_ID.toString()]?.providers ?? [];
const l1RpcCandidates = [
...l1Providers,
...LINEA_SDK_FALLBACK_L1_RPCS,
];
const l1RpcCandidates = [...l1Providers, ...LINEA_SDK_FALLBACK_L1_RPCS];

for (const l1RpcUrl of l1RpcCandidates) {
try {
Expand Down
95 changes: 62 additions & 33 deletions packages/adapters/rebalance/src/adapters/zircuit/zircuit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import {
ZIRCUIT_L2_STANDARD_BRIDGE,
ZIRCUIT_OPTIMISM_PORTAL,
ZIRCUIT_L2_OUTPUT_ORACLE,
ZIRCUIT_L2_TO_L1_MESSAGE_PASSER,
ETHEREUM_CHAIN_ID,
ZIRCUIT_CHAIN_ID,
CHALLENGE_PERIOD_SECONDS,
Expand All @@ -31,7 +30,6 @@ import {
zircuitOptimismPortalAbi,
zircuitL2OutputOracleAbi,
zircuitL2ToL1MessagePasserAbi,
L2_ETH_TOKEN,
ZERO_ADDRESS,
} from './constants';

Expand All @@ -51,6 +49,12 @@ interface OutputRootProof {
latestBlockhash: `0x${string}`;
}

interface ZircuitProofResult {
l2OutputIndex: bigint;
outputRootProof: OutputRootProof;
withdrawalProof: `0x${string}`[];
}

export class ZircuitNativeBridgeAdapter implements BridgeAdapter {
constructor(
protected readonly chains: Record<string, ChainConfiguration>,
Expand Down Expand Up @@ -82,6 +86,10 @@ export class ZircuitNativeBridgeAdapter implements BridgeAdapter {
): Promise<MemoizedTransactionRequest[]> {
try {
const isL1ToL2 = route.origin === ETHEREUM_CHAIN_ID && route.destination === ZIRCUIT_CHAIN_ID;
const isL2ToL1 = route.origin === ZIRCUIT_CHAIN_ID && route.destination === ETHEREUM_CHAIN_ID;
if (!isL1ToL2 && !isL2ToL1) {
throw new Error(`Unsupported Zircuit route: ${route.origin}->${route.destination}`);
}
const isETH = route.asset.toLowerCase() === ZERO_ADDRESS;
const transactions: MemoizedTransactionRequest[] = [];

Expand Down Expand Up @@ -128,7 +136,13 @@ export class ZircuitNativeBridgeAdapter implements BridgeAdapter {
}

// Resolve the L2 token address via tickerHash mapping
const l2Token = getDestinationAssetAddress(route.asset, route.origin, route.destination, this.chains, this.logger);
const l2Token = getDestinationAssetAddress(
route.asset,
route.origin,
route.destination,
this.chains,
this.logger,
);
if (!l2Token) {
throw new Error(`No L2 token mapping found for ${route.asset} on chain ${route.destination}`);
}
Expand Down Expand Up @@ -195,7 +209,13 @@ export class ZircuitNativeBridgeAdapter implements BridgeAdapter {
}

// Resolve the L1 token address via tickerHash mapping
const l1Token = getDestinationAssetAddress(route.asset, route.origin, route.destination, this.chains, this.logger);
const l1Token = getDestinationAssetAddress(
route.asset,
route.origin,
route.destination,
this.chains,
this.logger,
);
if (!l1Token) {
throw new Error(`No L1 token mapping found for ${route.asset} on chain ${route.destination}`);
}
Expand Down Expand Up @@ -235,6 +255,10 @@ export class ZircuitNativeBridgeAdapter implements BridgeAdapter {
): Promise<boolean> {
try {
const isL1ToL2 = route.origin === ETHEREUM_CHAIN_ID && route.destination === ZIRCUIT_CHAIN_ID;
const isL2ToL1 = route.origin === ZIRCUIT_CHAIN_ID && route.destination === ETHEREUM_CHAIN_ID;
if (!isL1ToL2 && !isL2ToL1) {
throw new Error(`Unsupported Zircuit route: ${route.origin}->${route.destination}`);
}

if (isL1ToL2) {
// L1→L2: Auto-relayed by the sequencer
Expand Down Expand Up @@ -279,11 +303,7 @@ export class ZircuitNativeBridgeAdapter implements BridgeAdapter {
args: [withdrawalHash],
});

const [outputRoot, timestamp, l2OutputIndex] = provenWithdrawal as [
`0x${string}`,
bigint,
bigint,
];
const [, timestamp] = provenWithdrawal as [`0x${string}`, bigint, bigint];

if (timestamp > 0) {
// Withdrawal is proven, check if challenge period has passed
Expand Down Expand Up @@ -339,7 +359,11 @@ export class ZircuitNativeBridgeAdapter implements BridgeAdapter {
originTransaction: TransactionReceipt,
): Promise<MemoizedTransactionRequest | void> {
try {
const isL1ToL2 = route.origin === ETHEREUM_CHAIN_ID && route.destination === ZIRCUIT_CHAIN_ID;
const isL2ToL1 = route.origin === ZIRCUIT_CHAIN_ID && route.destination === ETHEREUM_CHAIN_ID;
if (!isL1ToL2 && !isL2ToL1) {
throw new Error(`Unsupported Zircuit route: ${route.origin}->${route.destination}`);
}

if (isL2ToL1) {
const l1Client = await this.getClient(ETHEREUM_CHAIN_ID);
Expand Down Expand Up @@ -378,11 +402,7 @@ export class ZircuitNativeBridgeAdapter implements BridgeAdapter {
args: [withdrawalHash],
});

const [outputRoot, timestamp, l2OutputIndex] = provenWithdrawal as [
`0x${string}`,
bigint,
bigint,
];
const [, timestamp] = provenWithdrawal as [`0x${string}`, bigint, bigint];

if (timestamp > 0) {
// Withdrawal is proven, check if we can finalize
Expand Down Expand Up @@ -459,6 +479,10 @@ export class ZircuitNativeBridgeAdapter implements BridgeAdapter {

async isCallbackComplete(route: RebalanceRoute, originTransaction: TransactionReceipt): Promise<boolean> {
const isL1ToL2 = route.origin === ETHEREUM_CHAIN_ID && route.destination === ZIRCUIT_CHAIN_ID;
const isL2ToL1 = route.origin === ZIRCUIT_CHAIN_ID && route.destination === ETHEREUM_CHAIN_ID;
if (!isL1ToL2 && !isL2ToL1) {
throw new Error(`Unsupported Zircuit route: ${route.origin}->${route.destination}`);
}
if (isL1ToL2) {
return true;
}
Expand Down Expand Up @@ -546,10 +570,14 @@ export class ZircuitNativeBridgeAdapter implements BridgeAdapter {

private hashWithdrawal(tx: WithdrawalTransaction): `0x${string}` {
return keccak256(
encodeAbiParameters(
parseAbiParameters('uint256, address, address, uint256, uint256, bytes'),
[tx.nonce, tx.sender, tx.target, tx.value, tx.gasLimit, tx.data],
),
encodeAbiParameters(parseAbiParameters('uint256, address, address, uint256, uint256, bytes'), [
tx.nonce,
tx.sender,
tx.target,
tx.value,
tx.gasLimit,
tx.data,
]),
);
}

Expand All @@ -564,21 +592,22 @@ export class ZircuitNativeBridgeAdapter implements BridgeAdapter {
l2Client: PublicClient,
l1Client: PublicClient,
originTransaction: TransactionReceipt,
): Promise<
| {
l2OutputIndex: bigint;
outputRootProof: OutputRootProof;
withdrawalProof: `0x${string}`[];
}
| undefined
> {
): Promise<ZircuitProofResult | undefined> {
try {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const result = await buildProveZircuitWithdrawal(l2Client as any, {
const buildProof = buildProveZircuitWithdrawal as unknown as (
l2Client: PublicClient,
params: {
receipt: TransactionReceipt;
l1Client: PublicClient;
l2OutputOracleAddress: `0x${string}`;
},
) => Promise<ZircuitProofResult>;

const result = await buildProof(l2Client, {
receipt: originTransaction,
l1Client: l1Client as any,
l1Client,
l2OutputOracleAddress: ZIRCUIT_L2_OUTPUT_ORACLE as `0x${string}`,
} as any);
});

this.logger.info('Zircuit proof built successfully', {
txHash: originTransaction.transactionHash,
Expand All @@ -591,9 +620,9 @@ export class ZircuitNativeBridgeAdapter implements BridgeAdapter {
});

return {
l2OutputIndex: result.l2OutputIndex as bigint,
outputRootProof: result.outputRootProof as OutputRootProof,
withdrawalProof: result.withdrawalProof as `0x${string}`[],
l2OutputIndex: result.l2OutputIndex,
outputRootProof: result.outputRootProof,
withdrawalProof: result.withdrawalProof,
};
} catch (error) {
this.logger.warn('Failed to build Zircuit withdrawal proof', {
Expand Down
4 changes: 1 addition & 3 deletions packages/adapters/rebalance/src/adapters/zksync/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ export const zkSyncL2BridgeAbi = parseAbi([
'event WithdrawalInitiated(address indexed l2Sender, address indexed l1Receiver, address indexed l2Token, uint256 amount)',
]);

export const zkSyncL2EthTokenAbi = parseAbi([
'function withdraw(address _l1Receiver) payable',
]);
export const zkSyncL2EthTokenAbi = parseAbi(['function withdraw(address _l1Receiver) payable']);

export const zkSyncDiamondProxyAbi = parseAbi([
'function getTotalBatchesExecuted() view returns (uint256)',
Expand Down
Loading
Loading