feat: redeploy IL with updated zksolc & new comptroller implementation

VenusProtocol · Sep 6, 2024 · 8ef42d6 · 8ef42d6
1 parent a3591f2
commit 8ef42d6
Show file tree

Hide file tree

Showing 20 changed files with 1,929 additions and 1,302 deletions.
diff --git a/deployments/zksyncmainnet/ComptrollerBeacon.json b/deployments/zksyncmainnet/ComptrollerBeacon.json
diff --git a/deployments/zksyncmainnet/ComptrollerImpl.json b/deployments/zksyncmainnet/ComptrollerImpl.json
diff --git a/deployments/zksyncmainnet/Comptroller_Core.json b/deployments/zksyncmainnet/Comptroller_Core.json
diff --git a/deployments/zksyncmainnet/JumpRateModelV2_base0bps_slope425bps_jump8000bps_kink8000bps.json b/deployments/zksyncmainnet/JumpRateModelV2_base0bps_slope425bps_jump8000bps_kink8000bps.json
diff --git a/deployments/zksyncmainnet/JumpRateModelV2_base0bps_slope875bps_jump8000bps_kink8000bps.json b/deployments/zksyncmainnet/JumpRateModelV2_base0bps_slope875bps_jump8000bps_kink8000bps.json
diff --git a/deployments/zksyncmainnet/JumpRateModelV2_base0bps_slope900bps_jump20000bps_kink4500bps.json b/deployments/zksyncmainnet/JumpRateModelV2_base0bps_slope900bps_jump20000bps_kink4500bps.json
diff --git a/...ments/zksyncmainnet/JumpRateModelV2_base200bps_slope2000bps_jump30000bps_kink4500bps.json b/...ments/zksyncmainnet/JumpRateModelV2_base200bps_slope2000bps_jump30000bps_kink4500bps.json
diff --git a/deployments/zksyncmainnet/PoolLens.json b/deployments/zksyncmainnet/PoolLens.json
diff --git a/deployments/zksyncmainnet/PoolRegistry.json b/deployments/zksyncmainnet/PoolRegistry.json
diff --git a/deployments/zksyncmainnet/PoolRegistry_Implementation.json b/deployments/zksyncmainnet/PoolRegistry_Implementation.json
diff --git a/deployments/zksyncmainnet/PoolRegistry_Proxy.json b/deployments/zksyncmainnet/PoolRegistry_Proxy.json
diff --git a/deployments/zksyncmainnet/VTokenBeacon.json b/deployments/zksyncmainnet/VTokenBeacon.json
diff --git a/deployments/zksyncmainnet/VTokenImpl.json b/deployments/zksyncmainnet/VTokenImpl.json
diff --git a/deployments/zksyncmainnet/VToken_vUSDC.e_Core.json b/deployments/zksyncmainnet/VToken_vUSDC.e_Core.json
diff --git a/deployments/zksyncmainnet/VToken_vUSDT_Core.json b/deployments/zksyncmainnet/VToken_vUSDT_Core.json
diff --git a/deployments/zksyncmainnet/VToken_vWBTC_Core.json b/deployments/zksyncmainnet/VToken_vWBTC_Core.json
diff --git a/deployments/zksyncmainnet/VToken_vWETH_Core.json b/deployments/zksyncmainnet/VToken_vWETH_Core.json
diff --git a/deployments/zksyncmainnet/VToken_vZK_Core.json b/deployments/zksyncmainnet/VToken_vZK_Core.json
diff --git a/deployments/zksyncmainnet/solcInputs/6cc413ed5bf9593899dec1514c1a16cf.json b/deployments/zksyncmainnet/solcInputs/6cc413ed5bf9593899dec1514c1a16cf.json
diff --git a/hardhat.config.zksync.ts b/hardhat.config.zksync.ts
@@ -9,6 +9,8 @@ import * as dotenv from "dotenv";
 import "hardhat-dependency-compiler";
 import "hardhat-deploy";
 import "hardhat-gas-reporter";
+import { TASK_COMPILE_SOLIDITY_GET_SOURCE_PATHS } from "hardhat/builtin-tasks/task-names";
+import { subtask } from "hardhat/config";
 import { HardhatUserConfig, extendConfig, task } from "hardhat/config";
 import { HardhatConfig } from "hardhat/types";
 import "solidity-docgen";
@@ -39,7 +41,7 @@ task("accounts", "Prints the list of accounts", async (taskArgs, hre) => {
 const config: HardhatUserConfig = {
   defaultNetwork: "hardhat",
   zksolc: {
-    version: "1.5.0",
+    version: "1.5.3",
   },
   solidity: {
     compilers: [
@@ -150,4 +152,15 @@ const config: HardhatUserConfig = {
   },
 };
 
+// Added a subtask to exclude some solidity files from compilation due to limitation in zksync compiler, https://docs.zksync.io/zk-stack/components/compiler/toolchain/solidity#limitations
+subtask(TASK_COMPILE_SOLIDITY_GET_SOURCE_PATHS).setAction(async (_, __, runSuper) => {
+  const paths = await runSuper();
+  // List the files to exclude that are not being deployed on zkSync
+  const filesToExclude = ["WrappedNative"];
+
+  return paths.filter(p => {
+    return !filesToExclude.some(file => p.includes(file));
+  });
+});
+
 export default config;