From 0cdd79c4c6196322ca9eabed27c2dc7955d256a5 Mon Sep 17 00:00:00 2001
From: arthcp <arth.c.patel@gmail.com>
Date: Fri, 23 Feb 2024 17:00:35 +0530
Subject: [PATCH] feat: fix and clean trip scripts

---
 scripts/admin/tripCommon.ts |  8 +++++---
 scripts/admin/tripGlobal.ts | 30 ++++++++++--------------------
 scripts/admin/untripPath.ts | 19 ++++---------------
 3 files changed, 19 insertions(+), 38 deletions(-)

diff --git a/scripts/admin/tripCommon.ts b/scripts/admin/tripCommon.ts
index 786b4e7c..6ebcbf43 100644
--- a/scripts/admin/tripCommon.ts
+++ b/scripts/admin/tripCommon.ts
@@ -68,9 +68,11 @@ else
 export const sendTx = process.env.npm_config_sendtx == "true";
 export const trip = process.env.npm_config_trip == "true";
 export const untrip = process.env.npm_config_untrip == "true";
-export const integrationType = process.env.npm_config_integration
-  ? process.env.npm_config_integration.toUpperCase()
-  : IntegrationTypes.fast;
+export const integrationType = (
+  process.env.npm_config_integration
+    ? process.env.npm_config_integration.toUpperCase()
+    : IntegrationTypes.fast
+) as IntegrationTypes;
 export let filterChains = process.env.npm_config_chains
   ? process.env.npm_config_chains.split(",").map((c) => Number(c))
   : activeChainSlugs.map((c) => Number(c));
diff --git a/scripts/admin/tripGlobal.ts b/scripts/admin/tripGlobal.ts
index a9ecb072..90ce1764 100644
--- a/scripts/admin/tripGlobal.ts
+++ b/scripts/admin/tripGlobal.ts
@@ -1,10 +1,4 @@
-import {
-  IntegrationTypes,
-  ChainSlug,
-  DeploymentMode,
-  isTestnet,
-  isMainnet,
-} from "../../src";
+import { IntegrationTypes, ChainSlug } from "../../src";
 import { mode, overrides } from "../deploy/config";
 import { arrayify, defaultAbiCoder, keccak256 } from "ethers/lib/utils";
 import {
@@ -17,7 +11,6 @@ import {
   TRIP_NATIVE_SIG_IDENTIFIER,
 } from "../common";
 import { ROLES } from "@socket.tech/dl-core";
-import dotenv from "dotenv";
 import {
   sendTx,
   integrationType,
@@ -29,7 +22,7 @@ import {
   deploymentMode,
   formatMsg,
 } from "./tripCommon";
-import { BigNumberish, Contract } from "ethers";
+import { Contract } from "ethers";
 
 /**
  * Usable flags
@@ -67,9 +60,7 @@ const main = async () => {
 
   if (
     integrationType &&
-    !Object.values(IntegrationTypes).includes(
-      integrationType as IntegrationTypes
-    )
+    !Object.values(IntegrationTypes).includes(integrationType)
   ) {
     throw new Error(
       "Invalid integration type. Can be FAST, NATIVE_BRIDGE or OPTIMISTIC"
@@ -89,14 +80,13 @@ const main = async () => {
       continue;
     }
     console.log("\nChecking chain: ", chain);
-    let siblingChain = siblingChains[0];
 
-    const switchboard = getSwitchboardInstance(
-      chain,
-      siblingChain,
-      integrationType as IntegrationTypes,
-      mode
-    );
+    const switchboard = siblingChains
+      .map((siblingChain) =>
+        getSwitchboardInstance(chain, siblingChain, integrationType, mode)
+      )
+      .find((siblingChain) => !!siblingChain);
+
     if (switchboard === undefined) {
       console.log("Switchboard address not found for ", chain, "continuing...");
       continue;
@@ -140,7 +130,7 @@ const main = async () => {
     });
 
     if (sendTx) {
-      sendTxn(chain, nonce, signature, switchboard, trip, untrip);
+      await sendTxn(chain, nonce, signature, switchboard, trip, untrip);
     }
   }
   printSummary(summary);
diff --git a/scripts/admin/untripPath.ts b/scripts/admin/untripPath.ts
index 00f7a149..ecc338f8 100644
--- a/scripts/admin/untripPath.ts
+++ b/scripts/admin/untripPath.ts
@@ -1,20 +1,9 @@
 import { Contract, Wallet, utils } from "ethers";
-import {
-  IntegrationTypes,
-  ChainSlug,
-  DeploymentMode,
-  isTestnet,
-  isMainnet,
-} from "../../src";
+import { IntegrationTypes, ChainSlug } from "../../src";
 import { mode, overrides } from "../deploy/config";
 import { arrayify, defaultAbiCoder, keccak256 } from "ethers/lib/utils";
 import { UN_TRIP_PATH_SIG_IDENTIFIER, checkRole, getSiblings } from "../common";
-import {
-  getAllAddresses,
-  DeploymentAddresses,
-  ROLES,
-} from "@socket.tech/dl-core";
-import dotenv from "dotenv";
+import { ROLES } from "@socket.tech/dl-core";
 import { getSwitchboardInstance } from "../common";
 import {
   sendTx,
@@ -81,7 +70,7 @@ const main = async () => {
       const switchboard = getSwitchboardInstance(
         chain,
         siblingChain,
-        integrationType as IntegrationTypes,
+        integrationType,
         mode
       );
       if (switchboard === undefined) {
@@ -134,7 +123,7 @@ const main = async () => {
       });
 
       if (sendTx) {
-        sendTxn(chain, siblingChain, nonce, signature, switchboard);
+        await sendTxn(chain, siblingChain, nonce, signature, switchboard);
       }
     }
   }