Merge pull request #88 from VenusProtocol/develop

New release
VenusProtocol · Sep 10, 2024 · 44326f6 · 44326f6
2 parents 5e3b44c + 7458b7a
commit 44326f6
Show file tree

Hide file tree

Showing 38 changed files with 3,955 additions and 86 deletions.
diff --git a/.env.example b/.env.example
@@ -16,6 +16,8 @@ ARCHIVE_NODE_ethereum=https://eth-mainnet.nodereal.io/v1/<YOUR_KEY_HERE>
 #ARCHIVE_NODE_opbnbmainnet=https://opbnb-mainnet.nodereal.io/v1/<YOUR_KEY_HERE>
 #ARCHIVE_NODE_arbitrumone="https://open-platform.nodereal.io/<YOUR_KEY_HERE>/arbitrum-nitro/"
 #ARCHIVE_NODE_arbitrumsepolia="https://sepolia-rollup.arbitrum.io/rpc"
+#ARCHIVE_NODE_zksyncsepolia=https://zksync-sepolia.g.alchemy.com/v2/<YOUR_KEY_HERE>
+#ARCHIVE_NODE_zksyncmainnet=https://open-platform.nodereal.io/<YOUR_KEY_HERE>/zksync
 
 ETHERSCAN_API_KEY=
 REPORT_GAS=
diff --git a/.eslintignore b/.eslintignore
@@ -4,8 +4,10 @@
 **/.coverage_cache
 **/.coverage_contracts
 **/artifacts
+**/artifacts-zk
 **/build
 **/cache
+**/cache-zk
 **/coverage
 **/dist
 **/node_modules

diff --git a/.eslinttsconfigrc b/.eslinttsconfigrc
@@ -9,6 +9,7 @@
     "jest.config.js",
     "saddle.config.js",
     "docgen-templates",
-    "commitlint.config.js"
+    "commitlint.config.js",
+    "./hardhat.config.zksync.ts"
   ]
 }
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,6 +31,26 @@ jobs:
       - name: Lint solidity and ts files
         run: yarn lint
 
+  check-deployment:
+    name: Check hardhat deployments work on hardhat
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v2
+        with:
+          node-version: 18
+          cache: "yarn"
+
+      - name: Install dependencies
+        run: yarn
+
+      - name: Check hardhat deploy
+        run: yarn hardhat deploy
+
   test:
     runs-on: "ubuntu-latest"
     steps:
@@ -105,6 +125,10 @@ jobs:
             EXPORT=true yarn hardhat export --network ${NETWORK} --export ./deployments/${NETWORK}.json
             jq -M '{name, chainId, addresses: .contracts | map_values(.address)}' ./deployments/${NETWORK}.json > ./deployments/${NETWORK}_addresses.json
           done
+          for NETWORK in zksyncsepolia zksyncmainnet; do
+            EXPORT=true yarn hardhat export --network ${NETWORK} --export ./deployments/${NETWORK}.json --config hardhat.config.zksync.ts
+            jq -M '{name, chainId, addresses: .contracts | map_values(.address)}' ./deployments/${NETWORK}.json > ./deployments/${NETWORK}_addresses.json
+          done
           yarn prettier
 
       - uses: stefanzweifel/git-auto-commit-action@v5

diff --git a/.gitignore b/.gitignore
@@ -6,8 +6,10 @@
 !.yarn/sdks
 !.yarn/versions
 **/artifacts
+**/artifacts-zk
 **/build
 **/cache
+**/cache-zk
 **/coverage
 **/.coverage_artifacts
 **/.coverage_cache

diff --git a/.prettierignore b/.prettierignore
@@ -4,8 +4,10 @@
 **/.coverage_cache
 **/.coverage_contracts
 **/artifacts
+**/artifacts-zk
 **/build
 **/cache
+**/cache-zk
 **/coverage
 **/dist
 **/node_modules

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,41 @@
+## [2.3.0-dev.5](https://github.com/VenusProtocol/governance-contracts/compare/v2.3.0-dev.4...v2.3.0-dev.5) (2024-08-28)
+
+
+### Features
+
+* add ACM deployments on Zksync ([86c5b65](https://github.com/VenusProtocol/governance-contracts/commit/86c5b650ced89ebe7e914f12c40378ccb19d550a))
+* updating deployment files ([0169d08](https://github.com/VenusProtocol/governance-contracts/commit/0169d08e0a3bef449e00b1d3edc1c39fd6835013))
+
+
+### Bug Fixes
+
+* url ([3725109](https://github.com/VenusProtocol/governance-contracts/commit/3725109397c90bad956ff9b80dc3ad45cb28a222))
+
+## [2.3.0-dev.4](https://github.com/VenusProtocol/governance-contracts/compare/v2.3.0-dev.3...v2.3.0-dev.4) (2024-08-08)
+
+
+### Bug Fixes
+
+* update execute signature used in assigning access controls ([16875e6](https://github.com/VenusProtocol/governance-contracts/commit/16875e61647a0ed6765632c4181e1dce2bedf99c))
+
+## [2.3.0-dev.3](https://github.com/VenusProtocol/governance-contracts/compare/v2.3.0-dev.2...v2.3.0-dev.3) (2024-08-08)
+
+## [2.3.0-dev.2](https://github.com/VenusProtocol/governance-contracts/compare/v2.3.0-dev.1...v2.3.0-dev.2) (2024-08-02)
+
+
+### Bug Fixes
+
+* add id to configuration script to avoid duplicate execution ([5001d32](https://github.com/VenusProtocol/governance-contracts/commit/5001d3202b7845d4910255dbcf204aed99a2e920))
+
+## [2.3.0-dev.1](https://github.com/VenusProtocol/governance-contracts/compare/v2.2.0...v2.3.0-dev.1) (2024-08-01)
+
+
+### Features
+
+* add config for zksync ([9cb4c7c](https://github.com/VenusProtocol/governance-contracts/commit/9cb4c7cfdadd26bc6360a442c085b41391af3b21))
+* add configurations and deploy ACM on zksync sepolia ([7926c59](https://github.com/VenusProtocol/governance-contracts/commit/7926c59905fb6045caecf49bbe452feec484a3f4))
+* updating deployment files ([0549339](https://github.com/VenusProtocol/governance-contracts/commit/05493390059b7352a0b734c892436c767965206d))
+
 ## [2.2.0](https://github.com/VenusProtocol/governance-contracts/compare/v2.1.0...v2.2.0) (2024-07-18)
 
 

diff --git a/contracts/test/TestTimelockV8.sol b/contracts/test/TestTimelockV8.sol
@@ -6,7 +6,7 @@ contract TestTimelockV8 is TimelockV8 {
     constructor(address admin_, uint256 delay_) public TimelockV8(admin_, delay_) {}
 
     function GRACE_PERIOD() public view override returns (uint256) {
-        return 1;
+        return 1 hours;
     }
 
     function MINIMUM_DELAY() public view override returns (uint256) {

diff --git a/deploy/000-lz-mocks.ts b/deploy/000-lz-mocks.ts
@@ -0,0 +1,22 @@
+import { DeployFunction } from "hardhat-deploy/types";
+import { HardhatRuntimeEnvironment } from "hardhat/types";
+
+import { onlyHardhat } from "../helpers/deploy/deploymentUtils";
+
+const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
+  const { deployments, getNamedAccounts } = hre;
+  const { deploy } = deployments;
+  const { deployer } = await getNamedAccounts();
+  await deploy("LZEndpointMock", {
+    from: deployer,
+    args: [10102],
+    log: true,
+    autoMine: true,
+  });
+};
+
+func.tags = ["mocks"];
+
+func.skip = onlyHardhat();
+
+export default func;
diff --git a/deploy/003-omnichain-source.ts b/deploy/003-omnichain-source.ts
@@ -3,14 +3,15 @@ import { ethers } from "hardhat";
 import { DeployFunction } from "hardhat-deploy/types";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 
-import { LZ_ENDPOINTS, SUPPORTED_NETWORKS } from "../helpers/deploy/constants";
+import { SUPPORTED_NETWORKS } from "../helpers/deploy/constants";
 import {
   OmnichainProposalSenderCriticalMethods,
   OmnichainProposalSenderFasttrackMethods,
   OmnichainProposalSenderGuardianMethods,
   OmnichainProposalSenderNormalMethods,
   config,
 } from "../helpers/deploy/deploymentConfig";
+import { getLzEndpoint } from "../helpers/deploy/deploymentUtils";
 import { getArgTypesFromSignature } from "../helpers/utils";
 
 const BNB_MAINNET_GUARDIAN = "0x1C2CAc6ec528c20800B2fe734820D87b581eAA6B";
@@ -76,7 +77,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 
   const OmnichainProposalSender = await deploy("OmnichainProposalSender", {
     from: deployer,
-    args: [LZ_ENDPOINTS[hre.network.name as keyof typeof LZ_ENDPOINTS], acmAddress],
+    args: [await getLzEndpoint(hre.network.name as SUPPORTED_NETWORKS), acmAddress],
     log: true,
     autoMine: true,
   });
@@ -131,4 +132,6 @@ func.tags = ["OmnichainProposalSender"];
 
 func.skip = async (hre: HardhatRuntimeEnvironment) =>
   !(hre.network.name === "bsctestnet" || hre.network.name === "bscmainnet") && hre.network.name !== "hardhat";
+
+func.dependencies = ["mocks"];
 export default func;
diff --git a/deploy/004-omnichain-executor-remote.ts b/deploy/004-omnichain-executor-remote.ts
@@ -1,8 +1,8 @@
 import { DeployFunction } from "hardhat-deploy/types";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 
-import { LZ_ENDPOINTS, SUPPORTED_NETWORKS } from "../helpers/deploy/constants";
-import { getSourceChainId, guardian } from "../helpers/deploy/deploymentUtils";
+import { SUPPORTED_NETWORKS } from "../helpers/deploy/constants";
+import { getLzEndpoint, getSourceChainId, guardian } from "../helpers/deploy/deploymentUtils";
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { deployments, getNamedAccounts } = hre;
@@ -13,7 +13,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 
   await deploy("OmnichainGovernanceExecutor", {
     from: deployer,
-    args: [LZ_ENDPOINTS[networkName], await guardian(networkName), await getSourceChainId(networkName)],
+    args: [await getLzEndpoint(networkName), await guardian(networkName), await getSourceChainId(networkName)],
     log: true,
     autoMine: true,
   });
@@ -22,4 +22,5 @@ func.tags = ["OmnichainGovernanceExecutor", "Remote"];
 
 func.skip = async (hre: HardhatRuntimeEnvironment) =>
   hre.network.name === "bsctestnet" || hre.network.name === "bscmainnet";
+func.dependencies = ["mocks"];
 export default func;
diff --git a/deploy/005-remote-timelock.ts b/deploy/005-remote-timelock.ts
@@ -67,23 +67,23 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 
   const omnichainGovernanceExecutorAddress = (await ethers.getContract("OmnichainGovernanceExecutor")).address;
 
-  await deploy("NormalTimelock", {
+  await deploy(live ? "NormalTimelock" : "NormalTimelockRemote", {
     contract: live ? "TimelockV8" : "TestTimelockV8",
     from: deployer,
     args: [omnichainGovernanceExecutorAddress, delayConfig[networkName].normal],
     log: true,
     autoMine: true,
   });
 
-  await deploy("FastTrackTimelock", {
+  await deploy(live ? "FastTrackTimelock" : "FastTrackTimelockRemote", {
     contract: live ? "TimelockV8" : "TestTimelockV8",
     from: deployer,
     args: [omnichainGovernanceExecutorAddress, delayConfig[networkName].fast],
     log: true,
     autoMine: true,
   });
 
-  await deploy("CriticalTimelock", {
+  await deploy(live ? "CriticalTimelock" : "CriticalTimelockRemote", {
     contract: live ? "TimelockV8" : "TestTimelockV8",
     from: deployer,
     args: [omnichainGovernanceExecutorAddress, delayConfig[networkName].critical],

diff --git a/deploy/006-omnichain-executorOwner-remote.ts b/deploy/006-omnichain-executorOwner-remote.ts
@@ -204,6 +204,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   );
 };
 func.tags = ["OmnichainExecutorOwner", "Remote"];
+func.id = "configure_remote_executor";
 
 func.skip = async (hre: HardhatRuntimeEnvironment) =>
   hre.network.name === "bsctestnet" || hre.network.name === "bscmainnet";

diff --git a/deployments/arbitrumone/.migrations.json b/deployments/arbitrumone/.migrations.json
@@ -0,0 +1,3 @@
+{
+  "configure_remote_executor": true
+}
diff --git a/deployments/arbitrumsepolia/.migrations.json b/deployments/arbitrumsepolia/.migrations.json
@@ -0,0 +1,3 @@
+{
+  "configure_remote_executor": true
+}
diff --git a/deployments/ethereum/.migrations.json b/deployments/ethereum/.migrations.json
@@ -0,0 +1,3 @@
+{
+  "configure_remote_executor": true
+}
diff --git a/deployments/opbnbmainnet/.migrations.json b/deployments/opbnbmainnet/.migrations.json
@@ -0,0 +1,3 @@
+{
+  "configure_remote_executor": true
+}
diff --git a/deployments/opbnbtestnet/.migrations.json b/deployments/opbnbtestnet/.migrations.json
@@ -0,0 +1,3 @@
+{
+  "configure_remote_executor": true
+}
diff --git a/deployments/sepolia/.migrations.json b/deployments/sepolia/.migrations.json
@@ -0,0 +1,3 @@
+{
+  "configure_remote_executor": true
+}