Deployment improvement (#152)

Some modifications to the deployment scripts for easier runnablity and readablity. (Unfortuantley, verifiying the bridge contract is still not possible.)
RealityETH · Jan 4, 2024 · d6275f5 · d6275f5
1 parent a299831
commit d6275f5
Show file tree

Hide file tree

Showing 8 changed files with 10,052 additions and 14,769 deletions.
diff --git a/hardhat.config.js b/hardhat.config.js
@@ -22,6 +22,7 @@ module.exports = {
         paths: [
             '@openzeppelin/contracts/token/ERC20/presets/ERC20PresetFixedSupply.sol',
             '@RealityETH/zkevm-contracts/contracts/mocks/ERC20PermitMock.sol',
+            '@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol',
             '@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol',
             '@RealityETH/zkevm-contracts/contracts/deployment/PolygonZkEVMDeployer.sol',
             '@RealityETH/zkevm-contracts/contracts/PolygonZkEVMGlobalExitRootL2.sol',

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/deployment/1_deployforkableToken.js b/src/deployment/1_deployforkableToken.js
@@ -16,33 +16,39 @@ async function main() {
     const attemptsDeployProxy = 5;
     // Load provider
     let currentProvider = ethers.provider;
-    if (deployParameters.multiplierGas || deployParameters.maxFeePerGas) {
-        if (process.env.HARDHAT_NETWORK !== 'hardhat') {
-            currentProvider = new ethers.providers.JsonRpcProvider(`https://${process.env.HARDHAT_NETWORK}.infura.io/v3/${process.env.INFURA_PROJECT_ID}`);
-            if (deployParameters.maxPriorityFeePerGas && deployParameters.maxFeePerGas) {
-                console.log(`Hardcoded gas used: MaxPriority${deployParameters.maxPriorityFeePerGas} gwei, MaxFee${deployParameters.maxFeePerGas} gwei`);
-                const FEE_DATA = {
-                    maxFeePerGas: ethers.utils.parseUnits(deployParameters.maxFeePerGas, 'gwei'),
-                    maxPriorityFeePerGas: ethers.utils.parseUnits(deployParameters.maxPriorityFeePerGas, 'gwei'),
-                };
-                currentProvider.getFeeData = async () => FEE_DATA;
-            } else {
-                console.log('Multiplier gas used: ', deployParameters.multiplierGas);
-                async function overrideFeeData() {
-                    const feedata = await ethers.provider.getFeeData();
-                    return {
-                        maxFeePerGas: feedata.maxFeePerGas.mul(deployParameters.multiplierGas).div(1000),
-                        maxPriorityFeePerGas: feedata.maxPriorityFeePerGas.mul(deployParameters.multiplierGas).div(1000),
+    if (process.env.HARDHAT_NETWORK === 'localhost') {
+        currentProvider = new ethers.providers.JsonRpcProvider('https://127.0.0.1:8454');
+    } else {
+        if (deployParameters.multiplierGas || deployParameters.maxFeePerGas) {
+            if (process.env.HARDHAT_NETWORK !== 'hardhat') {
+                currentProvider = new ethers.providers.JsonRpcProvider(`https://${process.env.HARDHAT_NETWORK}.infura.io/v3/${process.env.INFURA_PROJECT_ID}`);
+                if (deployParameters.maxPriorityFeePerGas && deployParameters.maxFeePerGas) {
+                    console.log(`Hardcoded gas used: MaxPriority${deployParameters.maxPriorityFeePerGas} gwei, MaxFee${deployParameters.maxFeePerGas} gwei`);
+                    const FEE_DATA = {
+                        maxFeePerGas: ethers.utils.parseUnits(deployParameters.maxFeePerGas, 'gwei'),
+                        maxPriorityFeePerGas: ethers.utils.parseUnits(deployParameters.maxPriorityFeePerGas, 'gwei'),
                     };
+                    currentProvider.getFeeData = async () => FEE_DATA;
+                } else {
+                    console.log('Multiplier gas used: ', deployParameters.multiplierGas);
+                    async function overrideFeeData() {
+                        const feedata = await ethers.provider.getFeeData();
+                        return {
+                            maxFeePerGas: feedata.maxFeePerGas.mul(deployParameters.multiplierGas).div(1000),
+                            maxPriorityFeePerGas: feedata.maxPriorityFeePerGas.mul(deployParameters.multiplierGas).div(1000),
+                        };
+                    }
+                    currentProvider.getFeeData = overrideFeeData;
                 }
-                currentProvider.getFeeData = overrideFeeData;
             }
         }
     }
     // Load deployer
     let deployer;
     if (deployParameters.deployerPvtKey) {
         deployer = new ethers.Wallet(deployParameters.deployerPvtKey, currentProvider);
+    } else if (process.env.HARDHAT_NETWORK === 'localhost') {
+        [deployer] = (await ethers.getSigners());
     } else if (process.env.MNEMONIC) {
         deployer = ethers.Wallet.fromMnemonic(process.env.MNEMONIC, 'm/44\'/60\'/0\'/0/0').connect(currentProvider);
     } else {

diff --git a/src/deployment/2_creategenesis.js b/src/deployment/2_creategenesis.js
@@ -123,7 +123,7 @@ async function main() {
      * deploy proxy
      * Do not initialize directlythe proxy since we want to deploy the same code on L2 and this will alter the bytecode deployed of the proxy
      */
-    const transparentProxyFactory = await ethers.getContractFactory('TransparentUpgradeableProxy', deployer);
+    const transparentProxyFactory = await ethers.getContractFactory('@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol:TransparentUpgradeableProxy', deployer);
     const initializeEmptyDataProxy = '0x';
     const deployTransactionProxy = (transparentProxyFactory.getDeployTransaction(
         bridgeImplementationAddress,
@@ -155,7 +155,7 @@ async function main() {
     /*
      *Deployment Global exit root manager
      */
-    const PolygonZkEVMGlobalExitRootL2Factory = await ethers.getContractFactory('PolygonZkEVMGlobalExitRootL2', deployer);
+    const PolygonZkEVMGlobalExitRootL2Factory = await ethers.getContractFactory('@RealityETH/zkevm-contracts/contracts/PolygonZkEVMGlobalExitRootL2.sol:PolygonZkEVMGlobalExitRootL2', deployer);
     let polygonZkEVMGlobalExitRootL2;
     for (let i = 0; i < attemptsDeployProxy; i++) {
         try {
@@ -180,7 +180,7 @@ async function main() {
     expect(await upgrades.erc1967.getAdminAddress(polygonZkEVMGlobalExitRootL2.address)).to.be.equal(proxyAdminAddress);
     expect(await upgrades.erc1967.getAdminAddress(proxyBridgeAddress)).to.be.equal(proxyAdminAddress);
 
-    const timelockContractFactory = await ethers.getContractFactory('PolygonZkEVMTimelock', deployer);
+    const timelockContractFactory = await ethers.getContractFactory('@RealityETH/zkevm-contracts/contracts/PolygonZkEVMTimelock.sol:PolygonZkEVMTimelock', deployer);
     const timelockContract = await timelockContractFactory.deploy(
         minDelayTimelock,
         [timelockAddress],