Problem: zksync-web3.js does not support custom gas token

sdk/zksync-web3.js/abi/IL1Bridge.json

@@ -161,6 +161,11 @@
           "internalType": "address",
           "name": "_refundRecipient",
           "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "_l1Amount",
+          "type": "uint256"
         }
       ],
       "name": "deposit",
@@ -171,7 +176,7 @@
           "type": "bytes32"
         }
       ],
-      "stateMutability": "payable",
+      "stateMutability": "nonpayable",
       "type": "function"
     },
     {

sdk/zksync-web3.js/abi/IZkSync.json

@@ -1784,31 +1784,48 @@
     },
     {
       "inputs": [
-        {
-          "internalType": "address",
-          "name": "_contractL2",
-          "type": "address"
-        },
         {
           "internalType": "uint256",
-          "name": "_l2Value",
+          "name": "_l1Value",
           "type": "uint256"
         },
+        {
+          "components": [
+            {
+              "internalType": "address",
+              "name": "l2Contract",
+              "type": "address"
+            },
+            {
+              "internalType": "uint256",
+              "name": "l2Value",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "gasAmount",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "l2GasLimit",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "l2GasPerPubdataByteLimit",
+              "type": "uint256"
+            }
+          ],
+          "internalType": "struct L2TransactionValue",
+          "name": "_txValue",
+          "type": "tuple"
+        },
         {
           "internalType": "bytes",
           "name": "_calldata",
           "type": "bytes"
         },
-        {
-          "internalType": "uint256",
-          "name": "_l2GasLimit",
-          "type": "uint256"
-        },
-        {
-          "internalType": "uint256",
-          "name": "_l2GasPerPubdataByteLimit",
-          "type": "uint256"
-        },
         {
           "internalType": "bytes[]",
           "name": "_factoryDeps",
@@ -1828,7 +1845,7 @@
           "type": "bytes32"
         }
       ],
-      "stateMutability": "payable",
+      "stateMutability": "nonpayable",
       "type": "function"
     },
     {

sdk/zksync-web3.js/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "zksync-web3",
-  "version": "0.15.2",
+  "name": "@xycro/zksync-web3",
+  "version": "0.15.2-test.1",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
   "files": [

sdk/zksync-web3.js/src/adapters.ts

@@ -1,5 +1,5 @@
 import { BigNumber, BigNumberish, BytesLike, ethers } from 'ethers';
-import { IERC20MetadataFactory, IL1BridgeFactory, IL2BridgeFactory, IZkSyncFactory } from '../typechain';
+import { IERC20MetadataFactory, IL1Bridge, IL1BridgeFactory, IL2BridgeFactory, IZkSyncFactory } from '../typechain';
 import { Provider } from './provider';
 import {
     Address,
@@ -54,9 +54,10 @@ export function AdapterL1<TBase extends Constructor<TxSender>>(Base: TBase) {
 
         async getL1BridgeContracts() {
             const addresses = await this._providerL2().getDefaultBridgeAddresses();
+            // TODO: wethL1 is not returned at the moment 
             return {
                 erc20: IL1BridgeFactory.connect(addresses.erc20L1, this._signerL1()),
-                weth: IL1BridgeFactory.connect(addresses.wethL1, this._signerL1())
+                weth: IL1BridgeFactory.connect(addresses.erc20L1, this._signerL1()),
             };
         }
 
@@ -177,7 +178,7 @@ export function AdapterL1<TBase extends Constructor<TxSender>>(Base: TBase) {
 
                 return this.requestExecute(depositTx);
             } else {
-                const bridgeContracts = await this.getL1BridgeContracts();
+                const bridgeContracts = await this.getL1BridgeContracts();                
                 if (transaction.approveERC20) {
                     const l2WethToken = await bridgeContracts.weth.l2TokenAddress(transaction.token);
                     // If the token is Wrapped Ether, use its bridge.
@@ -246,6 +247,7 @@ export function AdapterL1<TBase extends Constructor<TxSender>>(Base: TBase) {
             overrides?: ethers.PayableOverrides;
         }): Promise<any> {
             const bridgeContracts = await this.getL1BridgeContracts();
+
             if (transaction.bridgeAddress != null) {
                 bridgeContracts.erc20 = bridgeContracts.erc20.attach(transaction.bridgeAddress);
             }
@@ -299,9 +301,8 @@ export function AdapterL1<TBase extends Constructor<TxSender>>(Base: TBase) {
             );
 
             if (token == ETH_ADDRESS) {
-                overrides.value ??= baseCost.add(operatorTip).add(amount);
-
                 return {
+                    l1Value: baseCost.add(operatorTip).add(amount),
                     contractAddress: to,
                     calldata: '0x',
                     l2Value: amount,
@@ -312,17 +313,18 @@ export function AdapterL1<TBase extends Constructor<TxSender>>(Base: TBase) {
                 };
             } else {
                 let refundRecipient = tx.refundRecipient ?? ethers.constants.AddressZero;
-                const args: [Address, Address, BigNumberish, BigNumberish, BigNumberish, Address] = [
+                const cost = baseCost.add(operatorTip);
+                const args: [Address, Address, BigNumberish, BigNumberish, BigNumberish, Address, BigNumberish] = [
                     to,
                     token,
                     amount,
                     tx.l2GasLimit,
                     tx.gasPerPubdataByte,
-                    refundRecipient
+                    refundRecipient,
+                    cost
                 ];
 
-                overrides.value ??= baseCost.add(operatorTip);
-                await checkBaseCost(baseCost, overrides.value);
+                await checkBaseCost(baseCost, cost);
 
                 const l2WethToken = await bridgeContracts.weth.l2TokenAddress(tx.token);
                 const bridge =
@@ -600,6 +602,7 @@ export function AdapterL1<TBase extends Constructor<TxSender>>(Base: TBase) {
         }
 
         async requestExecute(transaction: {
+            l1Value: BigNumberish;
             contractAddress: Address;
             calldata: BytesLike;
             l2GasLimit?: BigNumberish;
@@ -615,6 +618,7 @@ export function AdapterL1<TBase extends Constructor<TxSender>>(Base: TBase) {
         }
 
         async estimateGasRequestExecute(transaction: {
+            l1Value?: BigNumberish;
             contractAddress: Address;
             calldata: BytesLike;
             l2GasLimit?: BigNumberish;
@@ -635,6 +639,7 @@ export function AdapterL1<TBase extends Constructor<TxSender>>(Base: TBase) {
         }
 
         async getRequestExecuteTx(transaction: {
+            l1Value?: BigNumberish;
             contractAddress: Address;
             calldata: BytesLike;
             l2GasLimit?: BigNumberish;
@@ -648,6 +653,7 @@ export function AdapterL1<TBase extends Constructor<TxSender>>(Base: TBase) {
             const zksyncContract = await this.getMainContract();
 
             const { ...tx } = transaction;
+            tx.l1Value ??= BigNumber.from(0);
             tx.l2Value ??= BigNumber.from(0);
             tx.operatorTip ??= BigNumber.from(0);
             tx.factoryDeps ??= [];
@@ -658,6 +664,7 @@ export function AdapterL1<TBase extends Constructor<TxSender>>(Base: TBase) {
 
             const {
                 contractAddress,
+                l1Value,
                 l2Value,
                 calldata,
                 l2GasLimit,
@@ -677,16 +684,18 @@ export function AdapterL1<TBase extends Constructor<TxSender>>(Base: TBase) {
                 gasLimit: l2GasLimit
             });
 
-            overrides.value ??= baseCost.add(operatorTip).add(l2Value);
-
-            await checkBaseCost(baseCost, overrides.value);
+            await checkBaseCost(baseCost, l1Value);
 
             return await zksyncContract.populateTransaction.requestL2Transaction(
-                contractAddress,
-                l2Value,
+                l1Value,
+                {
+                    l2Contract: contractAddress,
+                    l2Value,
+                    gasAmount: baseCost.add(operatorTip),
+                    l2GasLimit,
+                    l2GasPerPubdataByteLimit: REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_LIMIT
+                },
                 calldata,
-                l2GasLimit,
-                REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_LIMIT,
                 factoryDeps,
                 refundRecipient,
                 overrides

sdk/zksync-web3.js/tests/main.test.ts

@@ -0,0 +1,63 @@
+import { ethers } from 'ethers';
+
+import { Wallet, Provider, utils } from "../build/src";
+
+const MNEMONIC="fine music test violin matrix prize squirrel panther purchase material script deal"
+const DERIVE_PATH = "m/44'/60'/0'/0/1";
+
+const WETH_ADDRESS = "0x8D4F22C9f1F22Ea745C7a828391Ef0E8D1692D4a";
+
+const printBalance = async (wallet: Wallet,tag: string) => {
+    const wethBalance = await wallet.getBalanceL1(WETH_ADDRESS);
+    console.log(`[${tag}]WETH balance L1: `, ethers.utils.formatEther(wethBalance));
+
+    let balance = await wallet.getBalance();
+    console.log(`[${tag}]ETH balance L2: `, ethers.utils.formatEther(balance));
+}
+
+const test = async () => {
+
+    let zkWallet = Wallet.fromMnemonic(MNEMONIC, DERIVE_PATH);
+    zkWallet = zkWallet.connect(new Provider("http://10.202.3.175:3050"));
+    zkWallet = zkWallet.connectToL1(new ethers.providers.JsonRpcProvider("https://eth-sepolia.public.blastapi.io"));
+
+    const fee = await zkWallet.getFullRequiredDepositFee({
+        token: utils.ETH_ADDRESS,
+        to: zkWallet.address,
+    })
+
+    console.log(fee);
+
+    await printBalance(zkWallet, "before deposit")
+
+    const tx = await zkWallet.deposit({
+        token: utils.ETH_ADDRESS,
+        amount: ethers.utils.parseEther("10"),
+        overrides: {
+            gasLimit: 1000000,
+        }
+    });
+    await tx.waitFinalize();
+
+    await printBalance(zkWallet, "after deposit")
+
+
+    const withdrawTx = await zkWallet.withdraw({
+        token: utils.ETH_ADDRESS,
+        amount: ethers.utils.parseEther("10"),
+        overrides: {
+            gasLimit: 1000000,
+        }
+    })
+    const receipt = await withdrawTx.waitFinalize();
+
+    const finalizeWithdrawTx = await zkWallet.finalizeWithdrawal(receipt.transactionHash)
+
+    await finalizeWithdrawTx.wait();
+
+    await printBalance(zkWallet, "after withdraw")
+}
+
+test();
+
+