From 730d5dd931d56270142012065513585abbdf8ece Mon Sep 17 00:00:00 2001
From: Mo Hussan <22501692+Mo-Hussain@users.noreply.github.com>
Date: Thu, 20 Feb 2025 19:15:57 +0000
Subject: [PATCH] address comments

---
 .../infra/scripts/xerc20/xerc20vs-add-bridge.ts   |  7 ++++++-
 .../infra/scripts/xerc20/xerc20vs-set-limits.ts   |  5 ++++-
 typescript/infra/src/xerc20/utils.ts              | 15 +++++----------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/typescript/infra/scripts/xerc20/xerc20vs-add-bridge.ts b/typescript/infra/scripts/xerc20/xerc20vs-add-bridge.ts
index d3e94da685..9ff0293e11 100644
--- a/typescript/infra/scripts/xerc20/xerc20vs-add-bridge.ts
+++ b/typescript/infra/scripts/xerc20/xerc20vs-add-bridge.ts
@@ -49,7 +49,12 @@ async function main() {
         envMultiProvider,
         dryRun,
       });
-    } catch {
+    } catch (e) {
+      rootLogger.error(
+        chalk.red(
+          `Error occurred while adding bridge to chain ${bridgeConfig.chain}: ${e}`,
+        ),
+      );
       erroredChains.push(bridgeConfig.chain);
     }
   }
diff --git a/typescript/infra/scripts/xerc20/xerc20vs-set-limits.ts b/typescript/infra/scripts/xerc20/xerc20vs-set-limits.ts
index 387ab9b983..a5f3eedabc 100644
--- a/typescript/infra/scripts/xerc20/xerc20vs-set-limits.ts
+++ b/typescript/infra/scripts/xerc20/xerc20vs-set-limits.ts
@@ -48,7 +48,10 @@ async function main() {
         envMultiProvider,
         dryRun,
       });
-    } catch {
+    } catch (e) {
+      rootLogger.error(
+        `Error occurred while setting limits for chain ${bridgeConfig.chain}: ${e}`,
+      );
       erroredChains.push(bridgeConfig.chain);
     }
   }
diff --git a/typescript/infra/src/xerc20/utils.ts b/typescript/infra/src/xerc20/utils.ts
index b23b6badf1..e29ce7c313 100644
--- a/typescript/infra/src/xerc20/utils.ts
+++ b/typescript/infra/src/xerc20/utils.ts
@@ -63,7 +63,6 @@ export async function addBridgeToChain({
     bridgeAddress,
     bufferCap,
     rateLimitPerSecond,
-    owner: expectedOwner,
     decimals,
   } = bridgeConfig;
 
@@ -126,7 +125,6 @@ export async function addBridgeToChain({
       await sendTransactions(
         envMultiProvider,
         chain,
-        expectedOwner,
         [tx],
         xERC20Address,
         bridgeAddress,
@@ -161,7 +159,6 @@ export async function updateChainLimits({
 }) {
   const {
     bridgeAddress,
-    owner,
     bufferCap,
     rateLimitPerSecond,
     decimals,
@@ -209,7 +206,6 @@ export async function updateChainLimits({
     await sendTransactions(
       envMultiProvider,
       chain,
-      owner,
       txsToSend,
       xERC20Address,
       bridgeAddress,
@@ -290,21 +286,21 @@ async function checkOwnerIsSafe(
   proposer: Address,
   chain: string,
   multiProvider: MultiProvider,
-  safeAddress: Address,
+  owner: Address,
   bridgeAddress: Address,
 ): Promise<boolean> {
   // check if safe service is available
   await getSafeTxService(chain, multiProvider, bridgeAddress);
 
   try {
-    await getSafe(chain, multiProvider, safeAddress);
-    rootLogger.info(
-      chalk.gray(`[${chain}][${bridgeAddress}] Safe found: ${safeAddress}`),
+    await getSafe(chain, multiProvider, owner);
+    rootLogger.debug(
+      chalk.gray(`[${chain}][${bridgeAddress}] Safe found: ${owner}`),
     );
     return true;
   } catch {
     rootLogger.info(
-      chalk.gray(`[${chain}][${bridgeAddress}] Safe not found: ${safeAddress}`),
+      chalk.gray(`[${chain}][${bridgeAddress}] Safe not found: ${owner}`),
     );
     return false;
   }
@@ -446,7 +442,6 @@ function getTxCallData(transactions: PopulatedTransaction[]): CallData[] {
 async function sendTransactions(
   multiProvider: MultiProvider,
   chain: string,
-  expectedOwner: Address,
   transactions: PopulatedTransaction[],
   xERC20Address: Address,
   bridgeAddress: Address,