chore(sc): zksync-web3 removed

matter-labs · May 16, 2024 · 2adbdd0 · 2adbdd0
1 parent 564756f
commit 2adbdd0
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 12 deletions.
diff --git a/system-contracts/scripts/calculate-hashes.ts b/system-contracts/scripts/calculate-hashes.ts
@@ -3,7 +3,7 @@ import * as fs from "fs";
 import _ from "lodash";
 import os from "os";
 import { join } from "path";
-import { hashBytecode } from "zksync-web3/build/src/utils";
+import { hashBytecode } from "zksync-ethers/build/utils";
 
 type ContractDetails = {
   contractName: string;

diff --git a/system-contracts/scripts/deploy-preimages.ts b/system-contracts/scripts/deploy-preimages.ts
@@ -8,9 +8,9 @@ import { ethers } from "ethers";
 import { formatUnits, parseUnits } from "ethers/lib/utils";
 import * as fs from "fs";
 import * as path from "path";
-import type { types } from "zksync-web3";
-import { Provider, Wallet } from "zksync-web3";
-import { hashBytecode } from "zksync-web3/build/src/utils";
+import type { types } from "zksync-ethers";
+import { Provider, Wallet } from "zksync-ethers";
+import { hashBytecode } from "zksync-ethers/build/utils";
 import { Language, SYSTEM_CONTRACTS } from "./constants";
 import type { Dependency, DeployedDependency } from "./utils";
 import { checkMarkers, filterPublishedFactoryDeps, getBytecodes, publishFactoryDeps, readYulBytecode } from "./utils";

diff --git a/system-contracts/scripts/utils.ts b/system-contracts/scripts/utils.ts
@@ -8,7 +8,7 @@ import type { BigNumberish, BytesLike } from "ethers";
 import { BigNumber, ethers } from "ethers";
 import * as fs from "fs";
 import * as fsPr from "fs/promises";
-import { hashBytecode } from "zksync-web3/build/src/utils";
+import { hashBytecode } from "zksync-ethers/build/utils";
 import type { YulContractDescription, ZasmContractDescription } from "./constants";
 import { Language, SYSTEM_CONTRACTS } from "./constants";
 import { getCompilersDir } from "hardhat/internal/util/global-dir";

diff --git a/system-contracts/test/CodeOracle.spec.ts b/system-contracts/test/CodeOracle.spec.ts
@@ -1,4 +1,4 @@
-import { hashBytecode } from "zksync-web3/build/src/utils";
+import { hashBytecode } from "zksync-ethers/build/utils";
 import type { CodeOracleTest } from "../typechain";
 import { REAL_CODE_ORACLE_CONTRACT_ADDRESS } from "./shared/constants";
 import { publishBytecode, setCode, getCode, deployContract } from "./shared/utils";

diff --git a/system-contracts/test/DefaultAccount.spec.ts b/system-contracts/test/DefaultAccount.spec.ts
@@ -2,7 +2,7 @@ import { expect } from "chai";
 import { ethers, network } from "hardhat";
 import type { Wallet } from "zksync-ethers";
 import * as zksync from "zksync-ethers";
-import { serialize } from "zksync-web3/build/src/utils";
+import { serialize } from "zksync-ethers/build/utils";
 import type { DefaultAccount, DelegateCaller, MockContract } from "../typechain";
 import { DefaultAccountFactory } from "../typechain";
 import { TEST_BOOTLOADER_FORMAL_ADDRESS } from "./shared/constants";

diff --git a/system-contracts/test/EventWriter.spec.ts b/system-contracts/test/EventWriter.spec.ts
@@ -2,10 +2,11 @@ import { expect } from "chai";
 import { ethers } from "hardhat";
 import type { Wallet } from "zksync-ethers";
 import { Contract } from "zksync-ethers";
-import type { TransactionResponse } from "zksync-web3/build/src/types";
+
 import { ONE_BYTES32_HEX, REAL_EVENT_WRITER_CONTRACT_ADDRESS } from "./shared/constants";
 import { EXTRA_ABI_CALLER_ADDRESS, encodeExtraAbiCallerCalldata } from "./shared/extraAbiCaller";
 import { getCode, getWallets, loadYulBytecode, loadZasmBytecode, setCode } from "./shared/utils";
+import type { TransactionResponse } from "zksync-ethers/build/types";
 
 describe("EventWriter tests", function () {
   let wallet: Wallet;

diff --git a/system-contracts/test/L1Messenger.spec.ts b/system-contracts/test/L1Messenger.spec.ts
@@ -4,8 +4,8 @@ import { L1MessengerFactory } from "../typechain";
 import { prepareEnvironment, setResult } from "./shared/mocks";
 import type { StateDiff } from "./shared/utils";
 import { compressStateDiffs, deployContractOnAddress, encodeStateDiffs, getCode, getWallets } from "./shared/utils";
-import { utils } from "zksync-web3";
-import type { Wallet } from "zksync-web3";
+import { utils } from "zksync-ethers";
+import type { Wallet } from "zksync-ethers";
 import {
   TEST_KNOWN_CODE_STORAGE_CONTRACT_ADDRESS,
   TEST_L1_MESSENGER_SYSTEM_CONTRACT_ADDRESS,

diff --git a/system-contracts/test/L2BaseToken.spec.ts b/system-contracts/test/L2BaseToken.spec.ts
@@ -1,6 +1,6 @@
 import { expect } from "chai";
 import { ethers, network } from "hardhat";
-import type { Wallet } from "zksync-web3";
+import type { Wallet } from "zksync-ethers";
 import type { L2BaseToken } from "../typechain";
 import { L2BaseTokenFactory } from "../typechain";
 import { deployContractOnAddress, getWallets, loadArtifact, provider } from "./shared/utils";

diff --git a/system-contracts/test/PubdataChunkPublisher.spec.ts b/system-contracts/test/PubdataChunkPublisher.spec.ts
@@ -1,6 +1,6 @@
 import { expect } from "chai";
 import { ethers, network } from "hardhat";
-import type { Wallet } from "zksync-web3";
+import type { Wallet } from "zksync-ethers";
 import type { PubdataChunkPublisher } from "../typechain";
 import { PubdataChunkPublisherFactory } from "../typechain";
 import { TEST_L1_MESSENGER_SYSTEM_CONTRACT_ADDRESS, TEST_PUBDATA_CHUNK_PUBLISHER_ADDRESS } from "./shared/constants";