Merge pull request #227 from holographxyz/feature/HOLO-1363-deploy-v2…

…-for-develop-env

Feature/holo 1363 deploy v2 for develop env

deploy/01_sources.ts

@@ -48,6 +48,7 @@ import {
   StrictECDSA,
   txParams,
   getDeployer,
+  askQuestion,
 } from '../scripts/utils/helpers';
 import { MultisigAwareTx } from '../scripts/utils/multisig-aware-tx';
 import { reservedNamespaceHashes } from '../scripts/utils/reserved-namespaces';
@@ -67,11 +68,21 @@ const func: DeployFunction = async function (hre1: HardhatRuntimeEnvironment) {
   let { hre, hre2 } = await hreSplit(hre1, global.__companionNetwork);
   const deployer = await getDeployer(hre);
   const deployerAddress = await deployer.signer.getAddress();
+  const web3 = new Web3();
+  const salt = hre.deploymentSalt;
+
   console.log('Deployer address:', deployerAddress);
+  console.log(`Deploying to network: ${hre1.network!.name}`);
+  console.log(`The deployment salt is: ${BigNumber.from(salt).toString()}`);
+  console.log(`We are in dry run mode? ${process.env.DRY_RUN === 'true'}`);
 
-  const web3 = new Web3();
+  const answer = await askQuestion(`Continue? (y/n)\n`);
+  if (answer !== 'y') {
+    console.log(`Exiting...`);
+    process.exit();
+  }
 
-  const salt = hre.deploymentSalt;
+  console.log(`Continuing...`);
 
   const futureHolographAddress = await genesisDeriveFutureAddress(
     hre,

deploy/22_hToken.ts

@@ -24,6 +24,7 @@ import {
 import { MultisigAwareTx } from '../scripts/utils/multisig-aware-tx';
 import { HolographERC20Event, ConfigureEvents, AllEventsEnabled } from '../scripts/utils/events';
 import { NetworkType, Network, networks } from '@holographxyz/networks';
+import { Environment, getEnvironment } from '@holographxyz/environment';
 
 interface HTokenData {
   primaryNetwork: Network;
@@ -185,10 +186,21 @@ const func: DeployFunction = async function (hre1: HardhatRuntimeEnvironment) {
     const hTokenHash = '0x' + web3.utils.asciiToHex('hToken').substring(2).padStart(64, '0');
     const chainId = '0x' + data.primaryNetwork.holographId.toString(16).padStart(8, '0');
 
-    // NOTE: At the moment the hToken contract's address is reliant on the deployerAddress which prevents multiple approved deployers from deploying the same address. This is a temporary solution until the hToken contract is upgraded to allow any deployerAddress to be used.
+    // NOTICE: At the moment the hToken contract's address is reliant on the deployerAddress which prevents multiple approved deployers from deploying the same address. This is a temporary solution until the hToken contract is upgraded to allow any deployerAddress to be used.
+    // NOTE: Use hardcoded version of deployerAddress from Ledger hardware only for testnet and mainnet envs
+    // If environment is develop use the signers deployerAddress
+    let erc20DeployerAddress = '0xBB566182f35B9E5Ae04dB02a5450CC156d2f89c1'; // Ledger deployerAddress
+    const environment: Environment = getEnvironment();
+    console.log(`Environment: ${environment}`);
+
+    if (environment == Environment.develop) {
+      hre.deployments.log(`Using deployerAddress from signer ${deployerAddress}`);
+      erc20DeployerAddress = deployerAddress;
+    }
+
     let { erc20Config, erc20ConfigHash, erc20ConfigHashBytes } = await generateErc20Config(
       data.primaryNetwork,
-      '0xBB566182f35B9E5Ae04dB02a5450CC156d2f89c1', // TODO: Upgrade the hToken contract so that any deployerAddress can be used
+      erc20DeployerAddress, // TODO: Upgrade the hToken contract so that any deployerAddress can be used
       'hTokenProxy',
       'Holographed ' + data.tokenSymbol,
       'h' + data.tokenSymbol,
@@ -203,10 +215,7 @@ const func: DeployFunction = async function (hre1: HardhatRuntimeEnvironment) {
           registry.address,
           generateInitCode(
             ['address', 'uint16'],
-            [
-              '0xBB566182f35B9E5Ae04dB02a5450CC156d2f89c1' /* TODO: Upgrade the hToken contract so that any deployerAddress can be used */,
-              0,
-            ]
+            [erc20DeployerAddress /* TODO: Upgrade the hToken contract so that any deployerAddress can be used */, 0]
           ),
         ]
       ),

deployments/develop/arbitrumTestnetSepolia/.chainId

@@ -0,0 +1 @@
+421614