Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: zksync-ethers v5 dependency #702

Merged
merged 2 commits into from
Aug 15, 2024
Merged

fix: zksync-ethers v5 dependency #702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9a3e25
fix: zksync-ethers v5 dependency
benceharomi Aug 14, 2024
fa1fd41
fix: broken import paths
benceharomi Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gas-bound-caller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"fast-glob": "^3.3.2",
"hardhat": "^2.18.3",
"preprocess": "^3.2.0",
"zksync-ethers": "https://github.com/zksync-sdk/zksync-ethers#ethers-v5-feat/bridgehub"
"zksync-ethers": "^5.9.0"
},
"devDependencies": {
"@matterlabs/hardhat-zksync-chai-matchers": "^0.1.4",
Expand All @@ -39,7 +39,7 @@
"ts-node": "^10.1.0",
"typechain": "^4.0.0",
"typescript": "^4.6.4",
"zksync-ethers": "https://github.com/zksync-sdk/zksync-ethers#ethers-v5-feat/bridgehub"
"zksync-ethers": "^5.9.0"
},
"mocha": {
"timeout": 240000,
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"ts-node": "^10.1.0",
"typechain": "^4.0.0",
"typescript": "^4.6.4",
"zksync-ethers": "https://github.com/zksync-sdk/zksync-ethers#ethers-v5-feat/bridgehub"
"zksync-ethers": "^5.9.0"
},
"scripts": {
"build": "hardhat compile",
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/src.ts/deploy-test-process.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import * as ethers from "ethers";
import type { BigNumberish, Wallet } from "ethers";
import { Interface } from "ethers/lib/utils";
import * as zkethers from "zksync-ethers";
import { ETH_ADDRESS_IN_CONTRACTS } from "zksync-ethers/build/src/utils";
import { ETH_ADDRESS_IN_CONTRACTS } from "zksync-ethers/build/utils";
import * as fs from "fs";

import type { FacetCut } from "./diamondCut";
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/test/unit_tests/l2-upgrade.test.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { BigNumberish } from "ethers";
import { Wallet } from "ethers";
import * as ethers from "ethers";
import * as hardhat from "hardhat";
import { hashBytecode } from "zksync-ethers/build/src/utils";
import { hashBytecode } from "zksync-ethers/build/utils";

import type { AdminFacet, ExecutorFacet, GettersFacet, StateTransitionManager } from "../../typechain";
import {
Expand Down
4 changes: 2 additions & 2 deletions l1-contracts/test/unit_tests/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import * as hardhat from "hardhat";
import type { BigNumberish, BytesLike } from "ethers";
import { BigNumber, ethers } from "ethers";
import type { Address } from "zksync-ethers/build/src/types";
import { REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_LIMIT } from "zksync-ethers/build/src/utils";
import type { Address } from "zksync-ethers/build/types";
import { REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_LIMIT } from "zksync-ethers/build/utils";

import type { IBridgehub } from "../../typechain/IBridgehub";
import type { IL1ERC20Bridge } from "../../typechain/IL1ERC20Bridge";
Expand Down
4 changes: 2 additions & 2 deletions system-contracts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"fast-glob": "^3.3.2",
"hardhat": "=2.22.2",
"preprocess": "^3.2.0",
"zksync-ethers": "https://github.com/zksync-sdk/zksync-ethers#ethers-v5-feat/bridgehub"
"zksync-ethers": "^5.9.0"
},
"devDependencies": {
"@matterlabs/hardhat-zksync-chai-matchers": "^0.1.4",
Expand All @@ -38,7 +38,7 @@
"ts-node": "^10.1.0",
"typechain": "^4.0.0",
"typescript": "^4.6.4",
"zksync-ethers": "https://github.com/zksync-sdk/zksync-ethers#ethers-v5-feat/bridgehub"
"zksync-ethers": "^5.9.0"
},
"mocha": {
"timeout": 240000,
Expand Down
2 changes: 1 addition & 1 deletion system-contracts/scripts/verify-on-explorer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { SYSTEM_CONTRACTS } from "./constants";
import { query } from "./utils";
import { Command } from "commander";
import * as fs from "fs";
import { sleep } from "zksync-ethers/build/src/utils";
import { sleep } from "zksync-ethers/build/utils";

const VERIFICATION_URL = hre.network?.config?.verifyURL;

Expand Down
2 changes: 1 addition & 1 deletion system-contracts/test/BootloaderUtilities.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { expect } from "chai";
import { ethers } from "hardhat";
import type { Wallet } from "zksync-ethers";
import * as zksync from "zksync-ethers";
import { serialize } from "zksync-ethers/build/src/utils";
import { serialize } from "zksync-ethers/build/utils";
import type { BootloaderUtilities } from "../typechain";
import { BootloaderUtilitiesFactory } from "../typechain";
import { TEST_BOOTLOADER_UTILITIES_ADDRESS } from "./shared/constants";
Expand Down
2 changes: 1 addition & 1 deletion system-contracts/test/Create2Factory.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ethers } from "hardhat";
import type { Wallet } from "zksync-ethers";
import type { Create2Factory } from "../typechain";
import { deployContract, getWallets, loadArtifact } from "./shared/utils";
import { create2Address, getDeployedContracts, hashBytecode } from "zksync-ethers/build/src/utils";
import { create2Address, getDeployedContracts, hashBytecode } from "zksync-ethers/build/utils";

describe("Create2Factory tests", function () {
let wallet: Wallet;
Expand Down
7 changes: 4 additions & 3 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7654,9 +7654,10 @@ zksync-ethers@^5.0.0:
dependencies:
ethers "~5.7.0"

"zksync-ethers@https://github.com/zksync-sdk/zksync-ethers#ethers-v5-feat/bridgehub":
version "5.1.0"
resolved "https://github.com/zksync-sdk/zksync-ethers#28ccbe7d67b170c202b17475e06a82002e6e3acc"
zksync-ethers@^5.9.0:
version "5.9.2"
resolved "https://registry.yarnpkg.com/zksync-ethers/-/zksync-ethers-5.9.2.tgz#1c5f34cb25ac0b040fd1a6118f2ba1c2c3bda090"
integrity sha512-Y2Mx6ovvxO6UdC2dePLguVzvNToOY8iLWeq5ne+jgGSJxAi/f4He/NF6FNsf6x1aWX0o8dy4Df8RcOQXAkj5qw==
dependencies:
ethers "~5.7.0"

Expand Down
Loading