Merge pull request #211 from VenusProtocol/fix-release

fix: cd issues with zksync config
VenusProtocol · Aug 5, 2024 · 1b6cf12 · 1b6cf12
2 parents 2b2cb3f + 02f6170
commit 1b6cf12
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 12 deletions.
diff --git a/.eslinttsconfigrc b/.eslinttsconfigrc
@@ -1,4 +1,12 @@
 {
   "extends": "./tsconfig.json",
-  "include": ["typechain-types", "deploy", "test", "tasks", "docgen-templates", "commitlint.config.js"]
+  "include": [
+    "typechain-types",
+    "deploy",
+    "test",
+    "tasks",
+    "docgen-templates",
+    "commitlint.config.js",
+    "./hardhat.config.zksync.ts"
+  ]
 }
diff --git a/deploy/11-deploy-sfrxeth-oracle.ts b/deploy/11-deploy-sfrxeth-oracle.ts
@@ -5,12 +5,17 @@ import { HardhatRuntimeEnvironment } from "hardhat/types";
 
 import { ADDRESSES } from "../helpers/deploymentConfig";
 
-const func: DeployFunction = async ({ getNamedAccounts, deployments, network }: HardhatRuntimeEnvironment) => {
+const func: DeployFunction = async ({
+  getNamedAccounts,
+  deployments,
+  network,
+  artifacts,
+}: HardhatRuntimeEnvironment) => {
   const { deploy } = deployments;
   const { deployer } = await getNamedAccounts();
 
   const proxyOwnerAddress = network.live ? ADDRESSES[network.name].timelock : deployer;
-  const defaultProxyAdmin = await hre.artifacts.readArtifact(
+  const defaultProxyAdmin = await artifacts.readArtifact(
     "hardhat-deploy/solc_0.8/openzeppelin/proxy/transparent/ProxyAdmin.sol:ProxyAdmin",
   );
   const { sfrxETH, SfrxEthFraxOracle, acm } = ADDRESSES[network.name];

diff --git a/deploy/5-deploy-bnb-lst-oracles.ts b/deploy/5-deploy-bnb-lst-oracles.ts
@@ -4,7 +4,12 @@ import { HardhatRuntimeEnvironment } from "hardhat/types";
 
 import { ADDRESSES, assets } from "../helpers/deploymentConfig";
 
-const func: DeployFunction = async ({ getNamedAccounts, deployments, network }: HardhatRuntimeEnvironment) => {
+const func: DeployFunction = async ({
+  getNamedAccounts,
+  deployments,
+  network,
+  artifacts,
+}: HardhatRuntimeEnvironment) => {
   const { deploy } = deployments;
   const { deployer } = await getNamedAccounts();
 
@@ -14,7 +19,7 @@ const func: DeployFunction = async ({ getNamedAccounts, deployments, network }:
   const { ankrBNB, stkBNB, BNBx, BNBxStakeManager, slisBNBStakeManager, stkBNBStakePool, slisBNB, wBETH } =
     ADDRESSES[network.name];
   const ETH = assets[network.name].find(asset => asset.token === "ETH");
-  const defaultProxyAdmin = await hre.artifacts.readArtifact(
+  const defaultProxyAdmin = await artifacts.readArtifact(
     "hardhat-deploy/solc_0.8/openzeppelin/proxy/transparent/ProxyAdmin.sol:ProxyAdmin",
   );
   await deploy("BNBxOracle", {

diff --git a/deploy/6-deploy-wstETH-oracle.ts b/deploy/6-deploy-wstETH-oracle.ts
@@ -4,7 +4,12 @@ import { HardhatRuntimeEnvironment } from "hardhat/types";
 
 import { ADDRESSES, addr0000, assets } from "../helpers/deploymentConfig";
 
-const func: DeployFunction = async ({ getNamedAccounts, deployments, network }: HardhatRuntimeEnvironment) => {
+const func: DeployFunction = async ({
+  getNamedAccounts,
+  deployments,
+  network,
+  artifacts,
+}: HardhatRuntimeEnvironment) => {
   const { deploy } = deployments;
   const { deployer } = await getNamedAccounts();
 
@@ -16,7 +21,7 @@ const func: DeployFunction = async ({ getNamedAccounts, deployments, network }:
   const WETHAsset = assets[network.name].find(asset => asset.token === "WETH");
   const WETHAddress = WETHAsset?.address ?? addr0000;
 
-  const defaultProxyAdmin = await hre.artifacts.readArtifact(
+  const defaultProxyAdmin = await artifacts.readArtifact(
     "hardhat-deploy/solc_0.8/openzeppelin/proxy/transparent/ProxyAdmin.sol:ProxyAdmin",
   );
 

diff --git a/deploy/7-deploy-pendle-oracle.ts b/deploy/7-deploy-pendle-oracle.ts
@@ -4,14 +4,19 @@ import { HardhatRuntimeEnvironment } from "hardhat/types";
 
 import { ADDRESSES } from "../helpers/deploymentConfig";
 
-const func: DeployFunction = async ({ getNamedAccounts, deployments, network }: HardhatRuntimeEnvironment) => {
+const func: DeployFunction = async ({
+  getNamedAccounts,
+  deployments,
+  network,
+  artifacts,
+}: HardhatRuntimeEnvironment) => {
   const { deploy } = deployments;
   const { deployer } = await getNamedAccounts();
 
   const oracle = await ethers.getContract("ResilientOracle");
   const proxyOwnerAddress = network.live ? ADDRESSES[network.name].timelock : deployer;
 
-  const defaultProxyAdmin = await hre.artifacts.readArtifact(
+  const defaultProxyAdmin = await artifacts.readArtifact(
     "hardhat-deploy/solc_0.8/openzeppelin/proxy/transparent/ProxyAdmin.sol:ProxyAdmin",
   );
 

diff --git a/deploy/8-deploy-weETH-oracle.ts b/deploy/8-deploy-weETH-oracle.ts
@@ -4,14 +4,19 @@ import { HardhatRuntimeEnvironment } from "hardhat/types";
 
 import { ADDRESSES } from "../helpers/deploymentConfig";
 
-const func: DeployFunction = async ({ getNamedAccounts, deployments, network }: HardhatRuntimeEnvironment) => {
+const func: DeployFunction = async ({
+  getNamedAccounts,
+  deployments,
+  network,
+  artifacts,
+}: HardhatRuntimeEnvironment) => {
   const { deploy } = deployments;
   const { deployer } = await getNamedAccounts();
 
   const resilientOracle = await ethers.getContract("ResilientOracle");
   const chainlinkOracle = await ethers.getContract("ChainlinkOracle");
   const proxyOwnerAddress = network.live ? ADDRESSES[network.name].timelock : deployer;
-  const defaultProxyAdmin = await hre.artifacts.readArtifact(
+  const defaultProxyAdmin = await artifacts.readArtifact(
     "hardhat-deploy/solc_0.8/openzeppelin/proxy/transparent/ProxyAdmin.sol:ProxyAdmin",
   );
   let { EtherFiLiquidityPool } = ADDRESSES[network.name];

diff --git a/package.json b/package.json
@@ -69,6 +69,7 @@
     "@typechain/ethers-v5": "^10.1.0",
     "@typechain/hardhat": "^6.1.0",
     "@types/chai": "^4.3.1",
+    "@types/debug": "^4.1.12",
     "@types/mocha": "^9.1.1",
     "@types/node": "^17.0.42",
     "@types/sinon-chai": "^3.2.9",

diff --git a/tsconfig.json b/tsconfig.json
@@ -22,6 +22,6 @@
     }
   },
   "exclude": ["node_modules"],
-  "files": ["./hardhat.config.ts", "./hardhat.config.zksync.ts"],
+  "files": ["./hardhat.config.ts"],
   "include": ["deploy"]
 }
diff --git a/yarn.lock b/yarn.lock
@@ -3217,6 +3217,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/debug@npm:^4.1.12":
+  version: 4.1.12
+  resolution: "@types/debug@npm:4.1.12"
+  dependencies:
+    "@types/ms": "*"
+  checksum: 47876a852de8240bfdaf7481357af2b88cb660d30c72e73789abf00c499d6bc7cd5e52f41c915d1b9cd8ec9fef5b05688d7b7aef17f7f272c2d04679508d1053
+  languageName: node
+  linkType: hard
+
 "@types/events@npm:*":
   version: 3.0.3
   resolution: "@types/events@npm:3.0.3"
@@ -3294,6 +3303,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/ms@npm:*":
+  version: 0.7.34
+  resolution: "@types/ms@npm:0.7.34"
+  checksum: f38d36e7b6edecd9badc9cf50474159e9da5fa6965a75186cceaf883278611b9df6669dc3a3cc122b7938d317b68a9e3d573d316fcb35d1be47ec9e468c6bd8a
+  languageName: node
+  linkType: hard
+
 "@types/node@npm:*":
   version: 22.0.2
   resolution: "@types/node@npm:22.0.2"
@@ -3608,6 +3624,7 @@ __metadata:
     "@typechain/ethers-v5": ^10.1.0
     "@typechain/hardhat": ^6.1.0
     "@types/chai": ^4.3.1
+    "@types/debug": ^4.1.12
     "@types/mocha": ^9.1.1
     "@types/node": ^17.0.42
     "@types/sinon-chai": ^3.2.9