Latest changes for L1 mainnet deploy

shirren · shirren · commit b9a174c2cd7d · 2024-11-13T16:58:00.000+11:00
diff --git a/scripts/contract.ts b/scripts/contract.ts
@@ -62,9 +62,9 @@ export async function deployContract(
   constructorArgs: Array<string | undefined>): Promise<Contract> {
   const contractFactory: ContractFactory = await newContractFactory(walletsOptions.getWallet(), contractName);
   const contract: Contract = await contractFactory.connect(walletsOptions.getWallet()).deploy(...constructorArgs, {
-    gasLimit: 30000000,
-    maxFeePerGas: 10000000000,
-    maxPriorityFeePerGas: 10000000000,
+    gasLimit: 100000,
+    maxFeePerGas: 30000000000,
+    maxPriorityFeePerGas: 1000000000,
   });
   console.log(`[${env.network}] Deployed ${contractName} to ${contract.address}`);
   return contract;
diff --git a/scripts/deployment_artefacts/l1mainnet_deploy/step0.json b/scripts/deployment_artefacts/l1mainnet_deploy/step0.json
@@ -0,0 +1,5 @@
+{
+ "multiCallAdminPubKey": "0x0E2D55943f4EF07c336C12A85d083c20FF189182",
+ "multiCallDeploy": "0x9129211efEcAf4A1cD76104f5A4082220a783078",
+ "submitterAddress": "0xa45a81EA5AE3ad978C176A6E54e41Df1cff4DF3a"
+}
diff --git a/scripts/deployment_artefacts/l1mainnet_deploy/step1.json b/scripts/deployment_artefacts/l1mainnet_deploy/step1.json
@@ -0,0 +1,5 @@
+{
+ "factoryAdminPubKey": "0x0E2D55943f4EF07c336C12A85d083c20FF189182",
+ "multiCallDeploy": "0x9129211efEcAf4A1cD76104f5A4082220a783078",
+ "factory": "0x8Fa5088dF65855E0DaF87FA6591659893b24871d"
+}
diff --git a/scripts/deployment_artefacts/l1mainnet_deploy/step2.json b/scripts/deployment_artefacts/l1mainnet_deploy/step2.json
@@ -0,0 +1,5 @@
+{
+ "walletImplLocatorAdmin": "0x0E2D55943f4EF07c336C12A85d083c20FF189182",
+ "walletImplChangerAdmin": "0x0E2D55943f4EF07c336C12A85d083c20FF189182",
+ "latestWalletImplLocator": "0xDB4b8F9D2C0C731A345a405b6335b3750d197b6C"
+}
diff --git a/scripts/deployment_artefacts/l1mainnet_deploy/step3.json b/scripts/deployment_artefacts/l1mainnet_deploy/step3.json
@@ -0,0 +1,4 @@
+{
+ "walletImplLocatorAddress": "0xDB4b8F9D2C0C731A345a405b6335b3750d197b6C",
+ "startupWalletImpl": "0x8FD900677aabcbB368e0a27566cCd0C7435F1926"
+}
diff --git a/scripts/deployment_artefacts/l1mainnet_deploy/step4.json b/scripts/deployment_artefacts/l1mainnet_deploy/step4.json
@@ -0,0 +1,5 @@
+{
+ "factoryAddress": "0x8Fa5088dF65855E0DaF87FA6591659893b24871d",
+ "startupWalletImplAddress": "0x8FD900677aabcbB368e0a27566cCd0C7435F1926",
+ "mainModuleDynamicAuth": "0xC2d54E4D795469f8616612CC343af078A892F36F"
+}
diff --git a/scripts/deployment_artefacts/l1mainnet_deploy/step5.json b/scripts/deployment_artefacts/l1mainnet_deploy/step5.json
@@ -0,0 +1,6 @@
+{
+ "signerRootAdminPubKey": "0x0E2D55943f4EF07c336C12A85d083c20FF189182",
+ "signerAdminPubKey": "0x3aF5DE2846aB3195BCD7b8880483E63D21261c49",
+ "signerAddress": "0x71639470D21D69456D6e98e7Cc877ABA671ab7fA",
+ "immutableSigner": "0xcff469E561D9dCe5B1185CD2AC1Fa961F8fbDe61"
+}
diff --git a/scripts/deployment_artefacts/l1mainnet_deploy/step6.json b/scripts/deployment_artefacts/l1mainnet_deploy/step6.json
@@ -0,0 +1,5 @@
+{
+ "mainModuleDynamicAuth": "0xC2d54E4D795469f8616612CC343af078A892F36F",
+ "walletImplLocatorContractAddress": "0xDB4b8F9D2C0C731A345a405b6335b3750d197b6C",
+ "signerAddress": "0x71639470D21D69456D6e98e7Cc877ABA671ab7fA"
+}
diff --git a/scripts/step1.ts b/scripts/step1.ts
@@ -17,7 +17,7 @@ async function step1(): Promise<EnvironmentInfo> {
   const env = loadEnvironmentInfo(hre.network.name);
   const { network } = env;
   const factoryAdminPubKey = process.env.FACTORY_ADMIN_PUB_KEY;
-  const multiCallDeployAddress = 'CHANGE_ME';
+  const multiCallDeployAddress = '0x9129211efEcAf4A1cD76104f5A4082220a783078';
 
   console.log(`[${network}] Starting deployment...`);
   console.log(`[${network}] factoryAdminPubKey ${factoryAdminPubKey}`);
diff --git a/scripts/step3.ts b/scripts/step3.ts
@@ -11,7 +11,7 @@ import { waitForInput } from './helper-functions';
 async function step3(): Promise<EnvironmentInfo> {
   const env = loadEnvironmentInfo(hre.network.name);
   const { network } = env;
-  const walletImplLocatorAddress = '0x889b5e1B25351AB543bf6D81bFD0777EA02EC879';
+  const walletImplLocatorAddress = '0xDB4b8F9D2C0C731A345a405b6335b3750d197b6C';
 
   console.log(`[${network}] Starting deployment...`);
   console.log(`[${network}] WalletImplLocator address ${walletImplLocatorAddress}`);
diff --git a/scripts/step6.ts b/scripts/step6.ts
@@ -11,8 +11,8 @@ import { newWalletOptions, WalletOptions } from './wallet-options';
 async function step6(): Promise<EnvironmentInfo> {
   const env = loadEnvironmentInfo(hre.network.name);
   const { network, signerAddress, } = env;
-  const mainModuleDynamicAuthAddress = '0x9e9Ee944fEB02F4D05B02950ca118027D2Db3cF2';
-  const walletImplLocatorContractAddress = '0x889b5e1B25351AB543bf6D81bFD0777EA02EC879';
+  const mainModuleDynamicAuthAddress = '0xC2d54E4D795469f8616612CC343af078A892F36F';
+  const walletImplLocatorContractAddress = '0xDB4b8F9D2C0C731A345a405b6335b3750d197b6C';
 
   console.log(`[${network}] Starting deployment...`);
   console.log(`[${network}] mainModuleDynamicAuth address ${mainModuleDynamicAuthAddress}`);
@@ -34,9 +34,9 @@ async function step6(): Promise<EnvironmentInfo> {
   const tx = await walletImplLocator
     .connect(wallets.getWallet())
     .changeWalletImplementation(mainModuleDynamicAuthAddress, {
-      gasLimit: 10000000,
-      maxFeePerGas: 10000000000,
-      maxPriorityFeePerGas: 10000000000,
+      gasLimit: 1_000_000,
+      maxFeePerGas: 30000000000,
+      maxPriorityFeePerGas: 1000000000,
     });
   await tx.wait();
   console.log(`[${network}] Wallet Impl Locator implementation changed to: ${mainModuleDynamicAuthAddress}`);
diff --git a/scripts/wallet-options.ts b/scripts/wallet-options.ts
@@ -19,7 +19,7 @@ export class WalletOptions {
   constructor(env: EnvironmentInfo, coldWallet: Signer, walletImplLocatorImplChanger: Signer) {
     console.log(`[${env.network}] Using ledger for operations...`);
     this.useLedger = true;
-    const accountIndex0 = 0;
+    const accountIndex0 = 10;
     const derivationPath0 = `m/44'/60'/${accountIndex0.toString()}'/0/0`;
     this.ledger = new LedgerSigner(hardhat.provider, derivationPath0);
 

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 + "walletImplLocatorAddress": "0xDB4b8F9D2C0C731A345a405b6335b3750d197b6C",
 + "startupWalletImpl": "0x8FD900677aabcbB368e0a27566cCd0C7435F1926"
 +}