Merge branch 'main' into db/add-rpc-zks_getproof

Author: dutterbutter

.github/release-please/manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "0.0.15"
+  ".": "0.0.16"
 }

.github/workflows/ci-scheduled-e2e.yaml

@@ -36,7 +36,7 @@ jobs:
           version: v1.5.1
 
       - name: Run ZKsync OS (L1-L2)
-        uses: dutterbutter/zksync-server-action@1e0262a81dbbadbb535c6acc13cb23e9f2495812
+        uses: matter-labs/zksync-server-action@6632ab9a6bd841c7849e8d62a4984734e018d89f # v0.1.1
         with:
           version: v0.18.1
           protocol_version: v30.2

.github/workflows/ci-test.yaml

@@ -64,11 +64,11 @@ jobs:
           version: v1.5.1
 
       - name: Run ZKsync OS (L1-L2)
-        uses: dutterbutter/zksync-server-action@1e0262a81dbbadbb535c6acc13cb23e9f2495812
+        uses: matter-labs/zksync-server-action@6632ab9a6bd841c7849e8d62a4984734e018d89f # v0.1.1
         with:
           version: v0.18.1
           protocol_version: v30.2
-
+ 
       - name: Compile test contracts
         working-directory: tests/contracts
         run: |
@@ -193,7 +193,7 @@ jobs:
           version: v1.5.1
 
       - name: Run ZKsync OS (L1-L2)
-        uses: dutterbutter/zksync-server-action@1e0262a81dbbadbb535c6acc13cb23e9f2495812
+        uses: matter-labs/zksync-server-action@6632ab9a6bd841c7849e8d62a4984734e018d89f # v0.1.1
         with:
           version: v0.18.1
           protocol_version: v30.2

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [0.0.16](https://github.com/matter-labs/zksync-js/compare/v0.0.15...v0.0.16) (2026-04-01)
+
+
+### Features
+
+* add verifyBundle and getInteropRoot interop functions ([#85](https://github.com/matter-labs/zksync-js/issues/85)) ([f6d1628](https://github.com/matter-labs/zksync-js/commit/f6d1628f448f98b003dbb70eda93f5a2a93de876))
+
+
+### Bug Fixes
+
+* address issue with ETH deposits on CBT chain ([#87](https://github.com/matter-labs/zksync-js/issues/87)) ([51a8ccb](https://github.com/matter-labs/zksync-js/commit/51a8ccb1c4ea50919eb6fba8bc60f2fd848c4a6e))
+
 ## [0.0.15](https://github.com/matter-labs/zksync-js/compare/v0.0.14...v0.0.15) (2026-03-27)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matterlabs/zksync-js",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
   "devDependencies": {

src/adapters/__tests__/deposits/eth-nonbase.test.ts

@@ -174,6 +174,7 @@ describeForAdapters('adapters/deposits/routeEthNonBase', (kind, factory) => {
       expect((tx.from as string).toLowerCase()).toBe(ctx.sender.toLowerCase());
       expect(BigInt(tx.value ?? 0n)).toBe(amount);
       expect(BigInt(info.mintValue)).toBe(mintValue);
+      expect(BigInt(info.l2Value)).toBe(0n);
       expect(BigInt(info.secondBridgeValue)).toBe(amount);
       expect(bridgeArgs.token).toBe(ETH_ADDRESS.toLowerCase());
       expect(bridgeArgs.amount).toBe(amount);
@@ -188,6 +189,7 @@ describeForAdapters('adapters/deposits/routeEthNonBase', (kind, factory) => {
       expect((tx.account as string).toLowerCase()).toBe(ctx.sender.toLowerCase());
       expect(BigInt(tx.value ?? 0n)).toBe(amount);
       expect(BigInt(req.mintValue ?? 0n)).toBe(mintValue);
+      expect(BigInt(req.l2Value ?? 0n)).toBe(0n);
       expect(BigInt(req.secondBridgeValue ?? 0n)).toBe(amount);
     }
   });
@@ -231,11 +233,19 @@ describeForAdapters('adapters/deposits/routeEthNonBase', (kind, factory) => {
 
     const bridge = res.steps.at(-1)!;
     if (kind === 'ethers') {
+      const tx = bridge.tx as any;
+      expect(BigInt(tx.value ?? 0n)).toBe(amount);
       const info = decodeTwoBridgeOuter((bridge.tx as any).data);
       expect(BigInt(info.l2GasLimit)).toBe(expectedL2GasLimit);
+      expect(BigInt(info.l2Value)).toBe(0n);
+      expect(BigInt(info.secondBridgeValue)).toBe(amount);
     } else {
+      const tx = bridge.tx as any;
+      expect(BigInt(tx.value ?? 0n)).toBe(amount);
       const req = ((bridge.tx as any).args?.[0] ?? {}) as any;
       expect(BigInt(req.l2GasLimit ?? 0n)).toBe(expectedL2GasLimit);
+      expect(BigInt(req.l2Value ?? 0n)).toBe(0n);
+      expect(BigInt(req.secondBridgeValue ?? 0n)).toBe(amount);
     }
   });
 

src/adapters/ethers/resources/deposits/routes/eth-nonbase.ts

@@ -223,14 +223,18 @@ export function routeEthNonBase(): DepositRouteStrategy {
       const requestStruct = {
         chainId: ctx.chainIdL2,
         mintValue,
-        l2Value: p.amount,
+        l2Value: 0n,
         l2GasLimit: l2GasParams.gasLimit,
         l2GasPerPubdataByteLimit: ctx.gasPerPubdata,
         refundRecipient: ctx.refundRecipient,
         secondBridgeAddress: ctx.l1AssetRouter,
         secondBridgeValue: p.amount,
         secondBridgeCalldata,
       } as const;
+      // For ETH deposits on custom-base-token chains:
+      // - outer Bridgehub msg.value must equal secondBridgeValue
+      // - inner asset-router / NTV path requires l2Value to stay zero
+      const bridgehubValue = p.amount;
 
       const bridgehub = await ctx.contracts.bridgehub();
       const data = bridgehub.interface.encodeFunctionData('requestL2TransactionTwoBridges', [
@@ -240,7 +244,7 @@ export function routeEthNonBase(): DepositRouteStrategy {
       const l1TxCandidate: TransactionRequest = {
         to: ctx.bridgehub,
         data,
-        value: p.amount, // base ≠ ETH ⇒ msg.value == secondBridgeValue
+        value: bridgehubValue,
         from: ctx.sender,
         ...ctx.gasOverrides,
       };

src/adapters/viem/resources/deposits/routes/eth-nonbase.ts

@@ -258,14 +258,18 @@ export function routeEthNonBase(): DepositRouteStrategy {
       const requestStruct = {
         chainId: ctx.chainIdL2,
         mintValue,
-        l2Value: p.amount,
+        l2Value: 0n,
         l2GasLimit: l2Gas.gasLimit,
         l2GasPerPubdataByteLimit: ctx.gasPerPubdata,
         refundRecipient: ctx.refundRecipient,
         secondBridgeAddress: ctx.l1AssetRouter,
         secondBridgeValue: p.amount,
         secondBridgeCalldata,
       } as const;
+      // For ETH deposits on custom-base-token chains:
+      // - outer Bridgehub msg.value must equal secondBridgeValue
+      // - inner asset-router / NTV path requires l2Value to stay zero
+      const bridgehubValue = p.amount;
 
       let bridgeTx: ViemPlanWriteRequest;
       let calldata: `0x${string}`;
@@ -276,7 +280,7 @@ export function routeEthNonBase(): DepositRouteStrategy {
           abi: IBridgehubABI,
           functionName: 'requestL2TransactionTwoBridges',
           args: [requestStruct],
-          value: p.amount, // base ≠ ETH ⇒ msg.value == secondBridgeValue
+          value: bridgehubValue,
           account: ctx.client.account,
         } as const;
 
@@ -295,7 +299,7 @@ export function routeEthNonBase(): DepositRouteStrategy {
               abi: IBridgehubABI,
               functionName: 'requestL2TransactionTwoBridges',
               args: [requestStruct],
-              value: p.amount,
+              value: bridgehubValue,
               account: ctx.client.account,
             }),
           {
@@ -317,7 +321,7 @@ export function routeEthNonBase(): DepositRouteStrategy {
       const l1TxCandidate: TransactionRequest = {
         to: ctx.bridgehub,
         data: calldata,
-        value: p.amount,
+        value: bridgehubValue,
         from: ctx.sender,
         ...ctx.gasOverrides,
       };