try fix

Author: zkzoomer

core/tests/ts-integration/src/context-owner.ts

@@ -562,27 +562,33 @@ export class TestContextOwner {
         }
 
         // Deposit base token on the second chain if it has a custom base token (needed for L2 gas)
-        if (secondChainBaseTokenAddress && !secondChainEthIsBaseToken) {
-            const baseTokenDepositHandle = this.secondChainMainSyncWallet!.deposit({
-                token: secondChainBaseTokenAddress,
-                amount: l2erc20DepositAmount,
-                approveERC20: true,
-                approveBaseERC20: true,
-                approveBaseOverrides: {
-                    nonce: nonce,
-                    gasPrice
-                },
-                overrides: {
-                    nonce: nonce + 1,
-                    gasPrice
-                }
-            }).then((tx) => {
-                this.reporter.debug(`Sent base token deposit on second chain. Hash: ${tx.hash}, nonce: ${tx.nonce}`);
-                return tx.wait();
-            });
+        if (secondChainBaseTokenAddress && !secondChainEthIsBaseToken && ethIsBaseToken) {
+            const baseTokenToChain1DepositHandle = this.mainSyncWallet
+                .deposit({
+                    token: secondChainBaseTokenAddress,
+                    amount: l2erc20DepositAmount,
+                    approveERC20: true,
+                    approveBaseERC20: true,
+                    approveBaseOverrides: {
+                        nonce: nonce,
+                        gasPrice
+                    },
+                    overrides: {
+                        nonce: nonce + 1,
+                        gasPrice
+                    }
+                })
+                .then((tx) => {
+                    this.reporter.debug(
+                        `Sent second chain base token deposit to first chain. Hash: ${tx.hash}, nonce: ${tx.nonce}`
+                    );
+                    return tx.wait();
+                });
             nonce = nonce + 2;
-            this.reporter.debug(`Nonce changed by 2 for base token deposit on second chain, new nonce: ${nonce}`);
-            await baseTokenDepositHandle;
+            this.reporter.debug(
+                `Nonce changed by 3 for second chain base token deposit to first chain, new nonce: ${nonce}`
+            );
+            await baseTokenToChain1DepositHandle;
         }
 
         // Define values for handling ERC20 transfers/deposits.
@@ -660,6 +666,26 @@ export class TestContextOwner {
         );
 
         nonce += erc20Transfers.length;
+
+        // Send second chain's base token on L1 to test wallets (for interop deposits)
+        let secondChainBaseTokenL1Transfers: Promise<any>[] = [];
+        if (
+            secondChainBaseTokenAddress &&
+            secondChainBaseTokenAddress !== baseTokenAddress &&
+            !secondChainEthIsBaseToken
+        ) {
+            secondChainBaseTokenL1Transfers = await sendTransfers(
+                secondChainBaseTokenAddress,
+                this.mainEthersWallet,
+                wallets,
+                ERC20_PER_ACCOUNT,
+                nonce,
+                gasPrice,
+                this.reporter
+            );
+            nonce += secondChainBaseTokenL1Transfers.length;
+        }
+
         // Send ERC20 base token on L1.
         const baseErc20Transfers = await sendTransfers(
             baseTokenAddress,
@@ -674,6 +700,7 @@ export class TestContextOwner {
         l1TxPromises.push(erc20DepositPromise);
         l1TxPromises.push(...ethTransfers);
         l1TxPromises.push(...erc20Transfers);
+        l1TxPromises.push(...secondChainBaseTokenL1Transfers);
         l1TxPromises.push(...baseErc20Transfers);
 
         this.reporter.debug(`Sent ${l1TxPromises.length} initial transactions on L1`);
@@ -727,6 +754,36 @@ export class TestContextOwner {
             undefined,
             this.reporter
         );
+
+        // Distribute second chain's base token on chain 1 for interop tests
+        if (this.env.l2ChainIdSecondChain) {
+            const bridgehubContract = await this.mainSyncWallet.getBridgehubContract();
+            const secondChainBaseTokenL1Address = await bridgehubContract.baseToken(this.env.l2ChainIdSecondChain);
+            const firstChainBaseTokenL1Address = await bridgehubContract.baseToken(this.env.l2ChainId);
+
+            // Only distribute if second chain has custom base token AND first chain is ETH-based
+            if (
+                secondChainBaseTokenL1Address !== zksync.utils.ETH_ADDRESS_IN_CONTRACTS &&
+                firstChainBaseTokenL1Address === zksync.utils.ETH_ADDRESS_IN_CONTRACTS
+            ) {
+                const secondChainBaseTokenL2Address =
+                    await this.mainSyncWallet.l2TokenAddress(secondChainBaseTokenL1Address);
+                if (secondChainBaseTokenL2Address !== ethers.ZeroAddress) {
+                    const secondChainBaseTokenTransfers = await sendTransfers(
+                        secondChainBaseTokenL2Address,
+                        this.mainSyncWallet,
+                        wallets,
+                        ERC20_PER_ACCOUNT,
+                        l2startNonce,
+                        undefined,
+                        this.reporter
+                    );
+                    l2startNonce += secondChainBaseTokenTransfers.length;
+                    l2TxPromises.push(...secondChainBaseTokenTransfers);
+                }
+            }
+        }
+
         l2TxPromises.push(...l2TxPromisesSecondChain, ...erc20Promises);
         await Promise.all(l2TxPromises);