fix: feedback from coderabbit

Author: jaybuidl

contracts/scripts/changeGovernor.ts

@@ -1,6 +1,7 @@
 import { task } from "hardhat/config";
 import { prompt, print } from "gluegun";
 import { Cores, getContracts } from "./utils/contracts";
+import { isAddress } from "viem";
 
 const { bold } = print.colors;
 
@@ -9,6 +10,9 @@ task("change-governor", "Changes the governor for all the contracts")
   .addOptionalParam("coreType", "The type of core to use between base, neo, university (default: base)", Cores.BASE)
   .setAction(async (taskArgs, hre) => {
     const newGovernor = taskArgs.newGovernor;
+    if (!isAddress(newGovernor)) {
+      throw new Error("Invalid governor address provided");
+    }
     print.highlight(`💣 Changing governor to ${bold(newGovernor)}`);
 
     const { confirm } = await prompt.ask({

contracts/scripts/getDisputeTemplate.ts

@@ -4,15 +4,22 @@ import { IDisputeTemplateRegistry } from "../typechain-types";
 
 task("get-dispute-template", "Gets a dispute template by ID")
   .addPositionalParam("templateId", "The ID of the template to query")
-  .setAction(async function ({ templateId }: { templateId: string }, hre: HardhatRuntimeEnvironment) {
+  .setAction(async ({ templateId }: { templateId: string }, hre: HardhatRuntimeEnvironment) => {
     const { ethers } = hre;
 
     // Get the contract instance
     const disputeTemplateRegistry = await ethers.getContract<IDisputeTemplateRegistry>("DisputeTemplateRegistry");
 
     // Query the events
-    const filter = disputeTemplateRegistry.filters.DisputeTemplate(BigInt(templateId));
-    const events = await disputeTemplateRegistry.queryFilter(filter);
+    let events;
+    try {
+      const filter = disputeTemplateRegistry.filters.DisputeTemplate(BigInt(templateId));
+      events = await disputeTemplateRegistry.queryFilter(filter);
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      console.error(`Failed to query events for template ID ${templateId}:`, errorMessage);
+      return;
+    }
 
     if (events.length === 0) {
       console.log(`No template found with ID ${templateId}`);

contracts/scripts/populateCourts.ts

@@ -237,33 +237,37 @@ task("populate:courts", "Populates the courts and their parameters")
         }
       } else {
         console.log("Court %d not found, creating it with", court.id, court);
-        if (coreType === Cores.UNIVERSITY) {
-          await (core as KlerosCoreUniversity).createCourt
-            .populateTransaction(
-              court.parent,
-              court.hiddenVotes,
-              court.minStake,
-              court.alpha,
-              court.feeForJuror,
-              court.jurorsForCourtJump,
-              [court.timesPerPeriod[0], court.timesPerPeriod[1], court.timesPerPeriod[2], court.timesPerPeriod[3]],
-              [DISPUTE_KIT_CLASSIC]
-            )
-            .then(execute);
-        } else {
-          await (core as KlerosCore).createCourt
-            .populateTransaction(
-              court.parent,
-              court.hiddenVotes,
-              court.minStake,
-              court.alpha,
-              court.feeForJuror,
-              court.jurorsForCourtJump,
-              [court.timesPerPeriod[0], court.timesPerPeriod[1], court.timesPerPeriod[2], court.timesPerPeriod[3]],
-              ethers.toBeHex(5), // Not accessible on-chain, but has always been set to the same value so far.
-              [DISPUTE_KIT_CLASSIC]
-            )
-            .then(execute);
+        try {
+          if (coreType === Cores.UNIVERSITY) {
+            await (core as KlerosCoreUniversity).createCourt
+              .populateTransaction(
+                court.parent,
+                court.hiddenVotes,
+                court.minStake,
+                court.alpha,
+                court.feeForJuror,
+                court.jurorsForCourtJump,
+                [court.timesPerPeriod[0], court.timesPerPeriod[1], court.timesPerPeriod[2], court.timesPerPeriod[3]],
+                [DISPUTE_KIT_CLASSIC]
+              )
+              .then(execute);
+          } else {
+            await (core as KlerosCore).createCourt
+              .populateTransaction(
+                court.parent,
+                court.hiddenVotes,
+                court.minStake,
+                court.alpha,
+                court.feeForJuror,
+                court.jurorsForCourtJump,
+                [court.timesPerPeriod[0], court.timesPerPeriod[1], court.timesPerPeriod[2], court.timesPerPeriod[3]],
+                ethers.toBeHex(5), // Not accessible on-chain, but has always been set to the same value so far.
+                [DISPUTE_KIT_CLASSIC]
+              )
+              .then(execute);
+          }
+        } catch (error) {
+          console.error(`Failed to create court ${court.id}: ${error}`);
         }
       }
 

contracts/scripts/utils/execution.ts

@@ -50,6 +50,7 @@ export function writeTransactionBatch({ name, outputPath = "tx-batch.json" }: {
   try {
     const templateObject = template({ name, transactions });
     fs.writeFileSync(outputPath, JSON.stringify(templateObject, null, 2));
+    transactions.length = 0;
     console.log(`Transaction batch written to ${outputPath}`);
     console.log(`The batch can be submitted to the Safe app at: ${transactionBuilderUrl}`);
   } catch (error) {

contracts/scripts/utils/tx-builder.ts

@@ -1,11 +1,12 @@
-// Transaction batch example: https://github.com/safe-global/safe-wallet-monorepo/blob/8bbf3b82edc347b70a038629cd9afd45eb1ed38a/apps/web/cypress/fixtures/test-working-batch.json
+import { arbitrum } from "viem/chains";
 
 const governor = "0x66e8DE9B42308c6Ca913D1EE041d6F6fD037A57e";
 const deployer = "0xf1C7c037891525E360C59f708739Ac09A7670c59";
 
+// Transaction batch example: https://github.com/safe-global/safe-wallet-monorepo/blob/8bbf3b82edc347b70a038629cd9afd45eb1ed38a/apps/web/cypress/fixtures/test-working-batch.json
 export const template = ({ name, transactions }: { name: string; transactions: BuilderTransaction[] }) => ({
   version: "1.0",
-  chainId: "42161", // Arbitrum One
+  chainId: arbitrum.id.toString(),
   createdAt: Date.now(),
   meta: {
     name,