fix: hyperchain upgrade fix2 (don't merge)

l1-contracts/scripts/hyperchain-upgrade-2.ts

@@ -24,6 +24,7 @@ async function main() {
     .option("--nonce <nonce>")
     .option("--owner-address <owner-address>")
     .option("--create2-salt <create2-salt>")
+    .option("--print-file-path <print-file-path>")
     .option("--diamond-upgrade-init <version>")
     .option("--only-verifier")
     .action(async (cmd) => {
@@ -53,7 +54,7 @@ async function main() {
         verbose: true,
       });
 
-      await upgradeToHyperchains2(deployer, gasPrice);
+      await upgradeToHyperchains2(deployer, gasPrice, cmd.printFilePath);
     });
 
   await program.parseAsync(process.argv);

l1-contracts/scripts/hyperchain-upgrade-3.ts

@@ -24,6 +24,7 @@ async function main() {
     .option("--nonce <nonce>")
     .option("--owner-address <owner-address>")
     .option("--create2-salt <create2-salt>")
+    .option("--print-file-path <print-file-path>")
     .option("--diamond-upgrade-init <version>")
     .option("--only-verifier")
     .action(async (cmd) => {
@@ -53,7 +54,7 @@ async function main() {
         verbose: true,
       });
 
-      await upgradeToHyperchains3(deployer);
+      await upgradeToHyperchains3(deployer, cmd.printFilePath);
     });
 
   await program.parseAsync(process.argv);

l1-contracts/src.ts/deploy.ts

@@ -1,6 +1,7 @@
 import * as hardhat from "hardhat";
 import "@nomiclabs/hardhat-ethers";
 
+import * as fs from "fs";
 import type { BigNumberish, providers, Signer, Wallet } from "ethers";
 import { ethers } from "ethers";
 import { hexlify, Interface } from "ethers/lib/utils";
@@ -45,6 +46,14 @@ export interface DeployerConfig {
   defaultAccountBytecodeHash?: string;
 }
 
+export interface Operation {
+  calls: { target: string; value: BigNumberish; data: string }[];
+  predecessor: string;
+  salt: string;
+}
+
+export type OperationOrString = Operation | string;
+
 export class Deployer {
   public addresses: DeployedAddresses;
   public deployWallet: Wallet;
@@ -446,13 +455,21 @@ export class Deployer {
   }
 
   /// this should be only use for local testing
-  public async executeUpgrade(targetAddress: string, value: BigNumberish, callData: string) {
+  public async executeUpgrade(targetAddress: string, value: BigNumberish, callData: string, printFileName?: string) {
     const governance = IGovernanceFactory.connect(this.addresses.Governance, this.deployWallet);
     const operation = {
       calls: [{ target: targetAddress, value: value, data: callData }],
       predecessor: ethers.constants.HashZero,
       salt: ethers.utils.hexlify(ethers.utils.randomBytes(32)),
     };
+    if (printFileName) {
+      console.log("Operation: ", operation);
+      const transactions = JSON.parse(fs.readFileSync(`${printFileName}/transactions.json`).toString());
+      transactions.furtherOperations = transactions.furtherOperations || [];
+      transactions.furtherOperations.push(operation);
+      fs.writeFileSync(printFileName, JSON.stringify(transactions, null, 2));
+      return;
+    }
     const scheduleTx = await governance.scheduleTransparent(operation, 0);
     await scheduleTx.wait();
     if (this.verbose) {