feat: remove zksync contracts dependecy, update hardhat-zksync-solc v…

…ersion and add hardhat-zksync-ethers as dependency
matter-labs · Sep 25, 2024 · a7beaa9 · a7beaa9
1 parent 2bf528f
commit a7beaa9
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 71 deletions.
diff --git a/examples/basic-example/package.json b/examples/basic-example/package.json
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@matterlabs/hardhat-zksync-deploy": "workspace:^",
-    "@matterlabs/hardhat-zksync-solc": "^1.2.2",
+    "@matterlabs/hardhat-zksync-solc": "^1.2.5",
     "chalk": "^4.1.2",
     "hardhat": "^2.14.0",
     "ethers": "~5.7.2",

diff --git a/examples/deploy-example/package.json b/examples/deploy-example/package.json
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@matterlabs/hardhat-zksync-deploy": "workspace:^",
-    "@matterlabs/hardhat-zksync-solc": "^1.2.2",
+    "@matterlabs/hardhat-zksync-solc": "^1.2.5",
     "chalk": "^4.1.2",
     "hardhat": "^2.14.0",
     "ethers": "~5.7.2",

diff --git a/examples/upgradable-example-l1/package.json b/examples/upgradable-example-l1/package.json
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@matterlabs/hardhat-zksync-deploy": "workspace:^",
-    "@matterlabs/hardhat-zksync-solc": "^1.2.0",
+    "@matterlabs/hardhat-zksync-solc": "^1.2.5",
     "@matterlabs/hardhat-zksync-upgradable": "workspace:^",
     "@matterlabs/hardhat-zksync-ethers": "workspace:^",
     "@openzeppelin/contracts-upgradeable": "^4.9.2",

diff --git a/examples/upgradable-example/package.json b/examples/upgradable-example/package.json
@@ -32,7 +32,7 @@
   "dependencies": {
     "@matterlabs/hardhat-zksync-deploy": "workspace:^",
     "@matterlabs/hardhat-zksync-ethers": "workspace:^",
-    "@matterlabs/hardhat-zksync-solc": "^1.2.2",
+    "@matterlabs/hardhat-zksync-solc": "^1.2.5",
     "@matterlabs/hardhat-zksync-upgradable": "workspace:^",
     "@openzeppelin/contracts-upgradeable": "^4.9.2",
     "zksync": "^0.13.1",

diff --git a/examples/zksync-ethers-example/package.json b/examples/zksync-ethers-example/package.json
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@matterlabs/hardhat-zksync-deploy": "workspace:^",
-    "@matterlabs/hardhat-zksync-solc": "^1.2.1",
+    "@matterlabs/hardhat-zksync-solc": "^1.2.5",
     "@matterlabs/hardhat-zksync-ethers": "workspace:^",
     "chalk": "^4.1.2",
     "hardhat": "^2.14.0",

diff --git a/packages/hardhat-zksync-deploy/package.json b/packages/hardhat-zksync-deploy/package.json
@@ -33,7 +33,7 @@
     "README.md"
   ],
   "dependencies": {
-    "@matterlabs/hardhat-zksync-solc": "^1.2.2",
+    "@matterlabs/hardhat-zksync-solc": "^1.2.5",
     "chalk": "^4.1.2",
     "ts-morph": "^22.0.0",
     "chai": "^4.3.4",

diff --git a/packages/hardhat-zksync-ethers/package.json b/packages/hardhat-zksync-ethers/package.json
@@ -37,7 +37,7 @@
     "chalk": "^4.1.2",
     "hardhat": "^2.14.0",
     "chai": "^4.3.4",
-    "@matterlabs/hardhat-zksync-solc": "^1.2.1",
+    "@matterlabs/hardhat-zksync-solc": "^1.2.5",
     "@matterlabs/hardhat-zksync-deploy": "workspace:^",
     "@nomiclabs/hardhat-ethers": "^2.2.3"
   },

diff --git a/packages/hardhat-zksync-upgradable/package.json b/packages/hardhat-zksync-upgradable/package.json
@@ -35,7 +35,7 @@
   "dependencies": {
     "@matterlabs/hardhat-zksync-deploy": "workspace:^",
     "@matterlabs/hardhat-zksync-ethers": "workspace:^",
-    "@matterlabs/hardhat-zksync-solc": "^1.2.2",
+    "@matterlabs/hardhat-zksync-solc": "^1.2.5",
     "@openzeppelin/upgrades-core": "~1.29.0",
     "@openzeppelin/hardhat-upgrades": "^1.28.0",
     "@openzeppelin/contracts-hardhat-zksync-upgradable": "npm:@openzeppelin/contracts@^4.9.2",

diff --git a/packages/hardhat-zksync/package.json b/packages/hardhat-zksync/package.json
@@ -53,28 +53,30 @@
     "c8": "^9.1.0"
   },
   "dependencies": {
+    "hardhat": "^2.14.0",
     "@matterlabs/hardhat-zksync-deploy": "workspace:^",
-    "@matterlabs/hardhat-zksync-solc": "^1.2.2",
+    "@matterlabs/hardhat-zksync-solc": "^1.2.5",
     "@matterlabs/hardhat-zksync-verify": "^1.6.0",
     "@matterlabs/hardhat-zksync-upgradable": "workspace:^",
     "@matterlabs/hardhat-zksync-node": "^1.1.1",
-    "@matterlabs/zksync-contracts": "^0.6.1",
-    "@openzeppelin/contracts-upgradeable": "^4.9.2",
-    "@openzeppelin/contracts": "^4.9.2",
+    "@matterlabs/hardhat-zksync-ethers": "workspace:^",
     "@nomicfoundation/hardhat-verify": "^2.0.8",
     "@openzeppelin/upgrades-core": "^1.27.0",
-    "chai": "^4.3.7",
     "@nomiclabs/hardhat-ethers": "^2.2.1",
-    "hardhat": "^2.14.0",
     "ethers": "~5.7.2",
     "zksync-ethers": "^5.8.0",
+    "chai": "^4.3.7",
     "sinon-chai": "^3.7.0",
     "sinon": "^18.0.0"
   },
   "peerDependencies": {
     "@matterlabs/hardhat-zksync-deploy": "workspace:^",
-    "@matterlabs/hardhat-zksync-solc": "^1.2.2",
-    "@matterlabs/hardhat-zksync-upgradable": "workspace:^"
+    "@matterlabs/hardhat-zksync-solc": "^1.2.5",
+    "@matterlabs/hardhat-zksync-verify": "^1.6.0",
+    "@matterlabs/hardhat-zksync-upgradable": "workspace:^",
+    "@matterlabs/hardhat-zksync-node": "^1.1.1",
+    "@matterlabs/hardhat-zksync-ethers": "workspace:^"
+
   },
   "prettier": {
     "tabWidth": 4,

diff --git a/packages/hardhat-zksync/src/index.ts b/packages/hardhat-zksync/src/index.ts
@@ -5,6 +5,7 @@ import '@matterlabs/hardhat-zksync-solc';
 import '@matterlabs/hardhat-zksync-deploy';
 import '@matterlabs/hardhat-zksync-verify';
 import '@matterlabs/hardhat-zksync-upgradable';
+import '@matterlabs/hardhat-zksync-ethers';
 
 import {
     TASK_DEPLOY_ZKSYNC_BEACON,

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml