Merge pull request #35 from VenusProtocol/feat/VEN-2681

[VEN-2681][VEN-2682]: XVS token and Bridge deployments on zksync sepolia

.env.example

@@ -17,4 +17,5 @@ DEPLOYER_PRIVATE_KEY=
 #ARCHIVE_NODE_opbnbtestnet=https://opbnb-testnet.nodereal.io/v1/<YOUR_KEY_HERE>
 #ARCHIVE_NODE_opbnbmainnet=https://opbnb-mainnet.nodereal.io/v1/<YOUR_KEY_HERE>
 #ARCHIVE_NODE_arbitrumsepolia="https://sepolia-rollup.arbitrum.io/rpc"
-#ARCHIVE_NODE_arbitrumone="https://open-platform.nodereal.io/<YOUR_KEY_HERE>/arbitrum-nitro/"
+#ARCHIVE_NODE_arbitrumone="https://open-platform.nodereal.io/<YOUR_KEY_HERE>/arbitrum-nitro/"
+#ARCHIVE_NODE_zksyncsepolia=https://zksync-sepolia.g.alchemy.com/v2/<YOUR_KEY_HERE>

.eslint-tsconfig

@@ -7,6 +7,7 @@
     "scenario",
     "deploy",
     "docgen-templates",
-    "commitlint.config.js"
+    "commitlint.config.js",
+    "hardhat.config.zksync.ts"
   ]
 }

.eslintignore

@@ -1,6 +1,8 @@
 node_modules
 artifacts
+artifacts-zk
 cache
+cache-zk
 coverage
 dist
 typechain

.github/workflows/ci.yaml

@@ -118,6 +118,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; 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

.gitignore

@@ -7,7 +7,9 @@ typechain-types
 
 # Hardhat files
 cache
+cache-zk
 artifacts
+artifacts-zk
 
 # yarn
 .yarn/*

.prettierignore

@@ -1,6 +1,8 @@
 node_modules
 artifacts
+artifacts-zk
 cache
+cache-zk
 coverage*
 gasReporterOutput.json
 dist

deploy/001-xvs-bridge-local.ts

@@ -74,6 +74,10 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const resilientOracle = await ethers.getContract("ResilientOracle");
   const XVS = await ethers.getContract("XVS");
 
+  const defaultProxyAdmin = await hre.artifacts.readArtifact(
+    "hardhat-deploy/solc_0.8/openzeppelin/proxy/transparent/ProxyAdmin.sol:ProxyAdmin",
+  );
+
   const XVSProxyOFTSrc = await deploy("XVSProxyOFTSrc", {
     from: deployer,
     contract: "XVSProxyOFTSrc",
@@ -88,11 +92,15 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     contract: "XVSBridgeAdmin",
     proxy: {
       owner: normalTimelock.address,
-      proxyContract: "OpenZeppelinTransparentProxy",
+      proxyContract: "OptimizedTransparentUpgradeableProxy",
       execute: {
         methodName: "initialize",
         args: [accessControlManager.address],
       },
+      viaAdminContract: {
+        name: "DefaultProxyAdmin",
+        artifact: defaultProxyAdmin,
+      },
       upgradeIndex: 0,
     },
     log: true,

deploy/002-xvs-bridge-remote.ts

@@ -86,6 +86,9 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { deploy } = deployments;
   const { deployer } = await getNamedAccounts();
   const preconfiguredAddresses = await getPreConfiguredAddresses(hre.network.name);
+  const defaultProxyAdmin = await hre.artifacts.readArtifact(
+    "hardhat-deploy/solc_0.8/openzeppelin/proxy/transparent/ProxyAdmin.sol:ProxyAdmin",
+  );
 
   const proxyOwnerAddress = await toAddress(preconfiguredAddresses.NormalTimelock, hre);
   const accessControlManager = await ethers.getContract("AccessControlManager");
@@ -97,14 +100,16 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     args: [accessControlManager.address],
     autoMine: true,
     log: true,
+    skipIfAlreadyDeployed: true,
   });
 
   const XVSProxyOFTDest = await deploy("XVSProxyOFTDest", {
     from: deployer,
     contract: "XVSProxyOFTDest",
-    args: [XVS.address, 8, preconfiguredAddresses.LzEndpoint, resilientOracle.address],
+    args: [XVS.address, 8, preconfiguredAddresses.LzEndpoint, resilientOracle],
     autoMine: true,
     log: true,
+    skipIfAlreadyDeployed: true,
   });
 
   const XVSBridgeAdmin = await deploy("XVSBridgeAdmin", {
@@ -113,15 +118,20 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     contract: "XVSBridgeAdmin",
     proxy: {
       owner: proxyOwnerAddress,
-      proxyContract: "OpenZeppelinTransparentProxy",
+      proxyContract: "OptimizedTransparentUpgradeableProxy",
       execute: {
         methodName: "initialize",
         args: [accessControlManager.address],
       },
+      viaAdminContract: {
+        name: "DefaultProxyAdmin",
+        artifact: defaultProxyAdmin,
+      },
       upgradeIndex: 0,
     },
     log: true,
     autoMine: true,
+    skipIfAlreadyDeployed: true,
   });
 
   const bridge = await ethers.getContract<XVSProxyOFTDest>("XVSProxyOFTDest");