chore: zksync-ethers 5.8.0-beta.5

core/tests/revert-test/package.json

@@ -29,7 +29,6 @@
     "mocha-steps": "^1.3.0",
     "node-fetch": "^2.6.1",
     "ts-node": "^10.1.0",
-    "typescript": "^4.3.5",
-    "zksync-web3": "^0.15.5"
+    "typescript": "^4.3.5"
   }
 }

core/tests/revert-test/tests/revert-and-restart-en.test.ts

@@ -3,10 +3,9 @@
 // NOTE:
 // main_contract.getTotalBatchesCommitted actually checks the number of batches committed.
 // main_contract.getTotalBatchesExecuted actually checks the number of batches executed.
-// TODO: Migrate from zksync-web3 to zksync-ethers.
 import * as utils from 'zk/build/utils';
 import { Tester } from './tester';
-import * as zkweb3 from 'zksync-ethers';
+import * as zksync from 'zksync-ethers';
 import { BigNumber, ethers } from 'ethers';
 import { expect, assert } from 'chai';
 import fs from 'fs';
@@ -249,14 +248,14 @@ describe('Block reverting test', function () {
 
         const main_contract = await mainNode.tester.syncWallet.getMainContract();
         const baseTokenAddress = await mainNode.tester.syncWallet.getBaseToken();
-        const isETHBasedChain = baseTokenAddress == zkweb3.utils.ETH_ADDRESS_IN_CONTRACTS;
-        const alice: zkweb3.Wallet = extNode.tester.emptyWallet();
+        const isETHBasedChain = baseTokenAddress == zksync.utils.ETH_ADDRESS_IN_CONTRACTS;
+        const alice: zksync.Wallet = extNode.tester.emptyWallet();
 
         console.log(
             'Finalize an L1 transaction to ensure at least 1 executed L1 batch and that all transactions are processed'
         );
-        const h: zkweb3.types.PriorityOpResponse = await extNode.tester.syncWallet.deposit({
-            token: isETHBasedChain ? zkweb3.utils.LEGACY_ETH_ADDRESS : baseTokenAddress,
+        const h: zksync.types.PriorityOpResponse = await extNode.tester.syncWallet.deposit({
+            token: isETHBasedChain ? zksync.utils.LEGACY_ETH_ADDRESS : baseTokenAddress,
             amount: depositAmount,
             to: alice.address,
             approveBaseERC20: true,
@@ -274,7 +273,7 @@ describe('Block reverting test', function () {
         // it gets updated with some batch logs only at the start of the next batch.
         const initialL1BatchNumber = (await main_contract.getTotalBatchesCommitted()).toNumber();
         const firstDepositHandle = await extNode.tester.syncWallet.deposit({
-            token: isETHBasedChain ? zkweb3.utils.LEGACY_ETH_ADDRESS : baseTokenAddress,
+            token: isETHBasedChain ? zksync.utils.LEGACY_ETH_ADDRESS : baseTokenAddress,
             amount: depositAmount,
             to: alice.address,
             approveBaseERC20: true,
@@ -287,7 +286,7 @@ describe('Block reverting test', function () {
         }
 
         const secondDepositHandle = await extNode.tester.syncWallet.deposit({
-            token: isETHBasedChain ? zkweb3.utils.LEGACY_ETH_ADDRESS : baseTokenAddress,
+            token: isETHBasedChain ? zksync.utils.LEGACY_ETH_ADDRESS : baseTokenAddress,
             amount: depositAmount,
             to: alice.address,
             approveBaseERC20: true,
@@ -358,7 +357,7 @@ describe('Block reverting test', function () {
 
         console.log('Execute an L1 transaction');
         const depositHandle = await extNode.tester.syncWallet.deposit({
-            token: isETHBasedChain ? zkweb3.utils.LEGACY_ETH_ADDRESS : baseTokenAddress,
+            token: isETHBasedChain ? zksync.utils.LEGACY_ETH_ADDRESS : baseTokenAddress,
             amount: depositAmount,
             to: alice.address,
             approveBaseERC20: true,
@@ -406,10 +405,10 @@ describe('Block reverting test', function () {
 });
 
 // Transfers amount from sender to a random wallet in an L2 transaction.
-async function checkedRandomTransfer(sender: zkweb3.Wallet, amount: BigNumber) {
+async function checkedRandomTransfer(sender: zksync.Wallet, amount: BigNumber) {
     const senderBalanceBefore = await sender.getBalance();
-    const receiver = zkweb3.Wallet.createRandom().connect(sender.provider);
-    const transferHandle = await sender.sendTransaction({ to: receiver.address, value: amount });
+    const receiver = zksync.Wallet.createRandom().connect(sender.provider);
+    const transferHandle = await sender.sendTransaction({ to: receiver.address, value: amount, type: 0 });
 
     // ethers doesn't work well with block reversions, so we poll for the receipt manually.
     let txReceipt = null;

core/tests/revert-test/tests/revert-and-restart.test.ts

@@ -1,6 +1,6 @@
 import * as utils from 'zk/build/utils';
 import { Tester } from './tester';
-import * as zkweb3 from 'zksync-ethers';
+import * as zksync from 'zksync-ethers';
 import { BigNumber, Contract, ethers } from 'ethers';
 import { expect } from 'chai';
 import fs from 'fs';
@@ -55,7 +55,7 @@ const depositAmount = ethers.utils.parseEther('0.001');
 
 describe('Block reverting test', function () {
     let tester: Tester;
-    let alice: zkweb3.Wallet;
+    let alice: zksync.Wallet;
     let mainContract: Contract;
     let blocksCommittedBeforeRevert: number;
     let logs: fs.WriteStream;
@@ -110,7 +110,7 @@ describe('Block reverting test', function () {
         // it gets updated with some batch logs only at the start of the next batch.
         const initialL1BatchNumber = await tester.web3Provider.getL1BatchNumber();
         const firstDepositHandle = await tester.syncWallet.deposit({
-            token: tester.isETHBasedChain ? zkweb3.utils.LEGACY_ETH_ADDRESS : tester.baseTokenAddress,
+            token: tester.isETHBasedChain ? zksync.utils.LEGACY_ETH_ADDRESS : tester.baseTokenAddress,
             amount: depositAmount,
             to: alice.address,
             approveBaseERC20: true,
@@ -121,7 +121,7 @@ describe('Block reverting test', function () {
             await utils.sleep(1);
         }
         const secondDepositHandle = await tester.syncWallet.deposit({
-            token: tester.isETHBasedChain ? zkweb3.utils.LEGACY_ETH_ADDRESS : tester.baseTokenAddress,
+            token: tester.isETHBasedChain ? zksync.utils.LEGACY_ETH_ADDRESS : tester.baseTokenAddress,
             amount: depositAmount,
             to: alice.address,
             approveBaseERC20: true,
@@ -194,7 +194,7 @@ describe('Block reverting test', function () {
 
         // Execute a transaction
         const depositHandle = await tester.syncWallet.deposit({
-            token: tester.isETHBasedChain ? zkweb3.utils.LEGACY_ETH_ADDRESS : tester.baseTokenAddress,
+            token: tester.isETHBasedChain ? zksync.utils.LEGACY_ETH_ADDRESS : tester.baseTokenAddress,
             amount: depositAmount,
             to: alice.address,
             approveBaseERC20: true,
@@ -244,12 +244,13 @@ describe('Block reverting test', function () {
     });
 });
 
-async function checkedRandomTransfer(sender: zkweb3.Wallet, amount: BigNumber) {
+async function checkedRandomTransfer(sender: zksync.Wallet, amount: BigNumber) {
     const senderBalanceBefore = await sender.getBalance();
-    const receiver = zkweb3.Wallet.createRandom().connect(sender.provider);
+    const receiver = zksync.Wallet.createRandom().connect(sender.provider);
     const transferHandle = await sender.sendTransaction({
         to: receiver.address,
-        value: amount
+        value: amount,
+        type: 0
     });
 
     // ethers doesn't work well with block reversions, so we poll for the receipt manually.

core/tests/revert-test/tests/tester.ts

@@ -1,18 +1,18 @@
 import { expect } from 'chai';
 import * as ethers from 'ethers';
-import * as zkweb3 from 'zksync-ethers';
+import * as zksync from 'zksync-ethers';
 import * as fs from 'fs';
 import * as path from 'path';
 
 const BASE_ERC20_TO_MINT = ethers.utils.parseEther('100');
 
 export class Tester {
-    public runningFee: Map<zkweb3.types.Address, ethers.BigNumber>;
+    public runningFee: Map<zksync.types.Address, ethers.BigNumber>;
     constructor(
         public ethProvider: ethers.providers.Provider,
         public ethWallet: ethers.Wallet,
-        public syncWallet: zkweb3.Wallet,
-        public web3Provider: zkweb3.Provider,
+        public syncWallet: zksync.Wallet,
+        public web3Provider: zksync.Provider,
         public hyperchainAdmin: ethers.Wallet, // We need to add validator to ValidatorTimelock with admin rights
         public isETHBasedChain: boolean,
         public baseTokenAddress: string
@@ -35,9 +35,9 @@ export class Tester {
             ethTestConfig.mnemonic as string,
             "m/44'/60'/0'/0/1"
         ).connect(ethProvider);
-        const web3Provider = new zkweb3.Provider(l2_rpc_addr);
+        const web3Provider = new zksync.Provider(l2_rpc_addr);
         web3Provider.pollingInterval = 100; // It's OK to keep it low even on stage.
-        const syncWallet = new zkweb3.Wallet(ethWallet.privateKey, web3Provider, ethProvider);
+        const syncWallet = new zksync.Wallet(ethWallet.privateKey, web3Provider, ethProvider);
 
 
         // Since some tx may be pending on stage, we don't want to get stuck because of it.
@@ -60,7 +60,7 @@ export class Tester {
         }
 
         const baseTokenAddress = process.env.CONTRACTS_BASE_TOKEN_ADDR!;
-        const isETHBasedChain = baseTokenAddress == zkweb3.utils.ETH_ADDRESS_IN_CONTRACTS;
+        const isETHBasedChain = baseTokenAddress == zksync.utils.ETH_ADDRESS_IN_CONTRACTS;
 
         return new Tester(ethProvider, ethWallet, syncWallet, web3Provider, hyperchainAdmin, isETHBasedChain, baseTokenAddress);
     }
@@ -70,7 +70,7 @@ export class Tester {
     /// L2 RPC is active, but we need the L2 RPC to get the base token address.
     async fundSyncWallet() {
         const baseTokenAddress = await this.syncWallet.provider.getBaseTokenContractAddress();
-        if (!(baseTokenAddress === zkweb3.utils.ETH_ADDRESS_IN_CONTRACTS)) {
+        if (!(baseTokenAddress === zksync.utils.ETH_ADDRESS_IN_CONTRACTS)) {
             const l1Erc20ABI = ['function mint(address to, uint256 amount)'];
             const l1Erc20Contract = new ethers.Contract(baseTokenAddress, l1Erc20ABI, this.ethWallet);
             await (await l1Erc20Contract.mint(this.ethWallet.address, BASE_ERC20_TO_MINT)).wait();
@@ -79,10 +79,10 @@ export class Tester {
 
     async fundedWallet(
         ethAmount: ethers.BigNumberish,
-        l1Token: zkweb3.types.Address,
+        l1Token: zksync.types.Address,
         tokenAmount: ethers.BigNumberish
     ) {
-        const newWallet = zkweb3.Wallet.createRandom().connect(this.web3Provider).connectToL1(this.ethProvider);
+        const newWallet = zksync.Wallet.createRandom().connect(this.web3Provider).connectToL1(this.ethProvider);
 
         let ethBalance = await this.syncWallet.getBalanceL1();
         expect(ethBalance.gt(ethAmount), 'Insufficient eth balance to create funded wallet').to.be.true;
@@ -111,6 +111,6 @@ export class Tester {
     }
 
     emptyWallet() {
-        return zkweb3.Wallet.createRandom().connect(this.web3Provider).connectToL1(this.ethProvider);
+        return zksync.Wallet.createRandom().connect(this.web3Provider).connectToL1(this.ethProvider);
     }
 }

core/tests/snapshot-recovery-test/package.json

@@ -27,7 +27,6 @@
     "node-fetch": "^2.6.1",
     "protobufjs": "^7.2.5",
     "ts-node": "^10.1.0",
-    "typescript": "^4.3.5",
-    "zksync-web3": "^0.15.5"
+    "typescript": "^4.3.5"
   }
 }

core/tests/snapshot-recovery-test/tests/snapshot-recovery.test.ts

@@ -2,7 +2,6 @@ import { expect } from 'chai';
 import fetch, { FetchError } from 'node-fetch';
 import * as protobuf from 'protobufjs';
 import * as zlib from 'zlib';
-import * as zkweb3 from 'zksync-web3';
 import fs, { FileHandle } from 'node:fs/promises';
 import { ChildProcess, spawn, exec } from 'node:child_process';
 import path from 'node:path';
@@ -111,26 +110,26 @@ describe('snapshot recovery', () => {
     };
 
     let snapshotMetadata: GetSnapshotResponse;
-    let mainNode: zkweb3.Provider;
-    let externalNode: zkweb3.Provider;
+    let mainNode: zksync.Provider;
+    let externalNode: zksync.Provider;
     let externalNodeLogs: FileHandle;
     let externalNodeProcess: ChildProcess;
 
-    let fundedWallet: zkweb3.Wallet;
+    let fundedWallet: zksync.Wallet;
 
     before('prepare environment', async () => {
         expect(process.env.ZKSYNC_ENV, '`ZKSYNC_ENV` should not be set to allow running both server and EN components')
             .to.be.undefined;
-        mainNode = new zkweb3.Provider('http://127.0.0.1:3050');
-        externalNode = new zkweb3.Provider('http://127.0.0.1:3060');
+        mainNode = new zksync.Provider('http://127.0.0.1:3050');
+        externalNode = new zksync.Provider('http://127.0.0.1:3060');
         await killExternalNode();
     });
 
     before('create test wallet', async () => {
         const testConfigPath = path.join(process.env.ZKSYNC_HOME!, `etc/test_config/constant/eth.json`);
         const ethTestConfig = JSON.parse(await fs.readFile(testConfigPath, { encoding: 'utf-8' }));
         const mnemonic = ethTestConfig.test_mnemonic as string;
-        fundedWallet = zkweb3.Wallet.fromMnemonic(mnemonic, "m/44'/60'/0'/0/0").connect(mainNode);
+        fundedWallet = zksync.Wallet.fromMnemonic(mnemonic, "m/44'/60'/0'/0/0").connect(mainNode);
     });
 
     after(async () => {
@@ -151,7 +150,7 @@ describe('snapshot recovery', () => {
         return output as GetSnapshotResponse;
     }
 
-    async function getAllTokens(provider: zkweb3.Provider, atBlock?: number) {
+    async function getAllTokens(provider: zksync.Provider, atBlock?: number) {
         const output = await provider.send('en_syncTokens', atBlock ? [atBlock] : []);
         return output as TokenInfo[];
     }

core/tests/ts-integration/package.json

@@ -30,7 +30,7 @@
     "ts-jest": "^29.0.1",
     "ts-node": "^10.1.0",
     "typescript": "^4.3.5",
-    "zksync-ethers": "https://github.com/zksync-sdk/zksync-ethers#sb-old-sdk",
+    "zksync-ethers": "5.8.0-beta.5",
     "elliptic": "^6.5.5"
   }
 }

core/tests/ts-integration/src/env.ts

@@ -4,7 +4,7 @@ import * as ethers from 'ethers';
 import * as zksync from 'zksync-ethers';
 import { TestEnvironment } from './types';
 import { Reporter } from './reporter';
-import { L2_BASE_TOKEN_ADDRESS } from 'zksync-ethers/build/src/utils';
+import { L2_BASE_TOKEN_ADDRESS } from 'zksync-ethers/build/utils';
 
 /**
  * Attempts to connect to server.

core/tests/ts-integration/src/retry-provider.ts

@@ -1,7 +1,7 @@
 import * as zksync from 'zksync-ethers';
 import * as ethers from 'ethers';
 import { Reporter } from './reporter';
-import { TransactionResponse } from 'zksync-web3/src/types';
+import { TransactionResponse } from 'zksync-ethers/build/types';
 
 /**
  * RetryProvider retries every RPC request if it detects a timeout-related issue on the server side.

core/tests/ts-integration/tests/api/contract-verification.test.ts

@@ -4,7 +4,7 @@ import * as ethers from 'ethers';
 import fetch from 'node-fetch';
 import fs from 'fs';
 import { deployContract, getContractSource, getTestContract } from '../../src/helpers';
-import { sleep } from 'zksync-ethers/build/src/utils';
+import { sleep } from 'zksync-ethers/build/utils';
 
 // Regular expression to match ISO dates.
 const DATE_REGEX = /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d{6})?/;

core/tests/ts-integration/tests/api/debug.test.ts

@@ -7,7 +7,7 @@ import { Token } from '../../src/types';
 
 import * as zksync from 'zksync-ethers';
 import { ethers } from 'ethers';
-import { BOOTLOADER_FORMAL_ADDRESS } from 'zksync-ethers/build/src/utils';
+import { BOOTLOADER_FORMAL_ADDRESS } from 'zksync-ethers/build/utils';
 import fs from 'fs';
 
 describe('Debug methods', () => {

core/tests/ts-integration/tests/api/web3.test.ts

@@ -9,7 +9,8 @@ import { serialize } from '@ethersproject/transactions';
 import { deployContract, getTestContract, waitForNewL1Batch, anyTransaction } from '../../src/helpers';
 import { shouldOnlyTakeFee } from '../../src/modifiers/balance-checker';
 import fetch, { RequestInit } from 'node-fetch';
-import { EIP712_TX_TYPE, PRIORITY_OPERATION_L2_TX_TYPE } from 'zksync-ethers/build/src/utils';
+import { EIP712_TX_TYPE, PRIORITY_OPERATION_L2_TX_TYPE } from 'zksync-ethers/build/utils';
+
 // Regular expression to match variable-length hex number.
 const HEX_VALUE_REGEX = /^0x[\da-fA-F]*$/;
 const DATE_REGEX = /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d{6})?/;
@@ -174,6 +175,7 @@ describe('web3 API compatibility tests', () => {
             return;
         }
 
+        const EIP1559_TX_TYPE = 2;
         const amount = 1;
         const erc20ABI = ['function transfer(address to, uint256 amount)'];
         const erc20contract = new ethers.Contract(l2Token, erc20ABI, alice);
@@ -196,7 +198,7 @@ describe('web3 API compatibility tests', () => {
         expect(tx1.l1BatchNumber).toEqual(expect.anything()); // Can be anything except `null` or `undefined`.
         expect(tx1.l1BatchTxIndex).toEqual(expect.anything()); // Can be anything except `null` or `undefined`.
         expect(tx1.chainId).toEqual(+process.env.CHAIN_ETH_ZKSYNC_NETWORK_ID!);
-        expect(tx1.type).toEqual(0);
+        expect(tx1.type).toEqual(EIP1559_TX_TYPE);
 
         expect(receipt.l1BatchNumber).toEqual(expect.anything()); // Can be anything except `null` or `undefined`.
         expect(receipt.l1BatchTxIndex).toEqual(expect.anything()); // Can be anything except `null` or `undefined`.
@@ -210,7 +212,7 @@ describe('web3 API compatibility tests', () => {
             expect(txInBlock.l1BatchNumber).toEqual(expect.anything()); // Can be anything except `null` or `undefined`.
             expect(txInBlock.l1BatchTxIndex).toEqual(expect.anything()); // Can be anything except `null` or `undefined`.
             expect(txInBlock.chainId).toEqual(+process.env.CHAIN_ETH_ZKSYNC_NETWORK_ID!);
-            expect([0, EIP712_TX_TYPE, PRIORITY_OPERATION_L2_TX_TYPE]).toContain(txInBlock.type);
+            expect([0, EIP712_TX_TYPE, PRIORITY_OPERATION_L2_TX_TYPE, EIP1559_TX_TYPE]).toContain(txInBlock.type);
         });
     });
 
@@ -607,7 +609,7 @@ describe('web3 API compatibility tests', () => {
         const from = new MockMetamask(alice);
         const to = alice.address;
         const web3Provider = new zksync.Web3Provider(from);
-        const signer = web3Provider.getSigner();
+        const signer = zksync.Signer.from(web3Provider.getSigner(), alice.provider);
 
         // Check to ensure that tx was correctly processed.
         const feeCheck = await shouldOnlyTakeFee(alice);

core/tests/ts-integration/tests/contracts.test.ts

@@ -425,7 +425,7 @@ async function invalidBytecodeTestTransaction(
         maxFeePerGas: gasPrice,
 
         customData: {
-            gasPerPubdataByte: zksync.utils.DEFAULT_GAS_PER_PUBDATA_LIMIT,
+            gasPerPubdata: zksync.utils.DEFAULT_GAS_PER_PUBDATA_LIMIT,
             factoryDeps,
             customSignature: new Uint8Array(17)
         }