retryAsync inside getSafeAndService

typescript/infra/src/tx/govern-transaction-reader.ts

@@ -486,8 +486,10 @@ export class GovernTransactionReader {
       return undefined;
     }
 
-    const { safeSdk } = await retryAsync(() =>
+    const { safeSdk } = await getSafeAndService(
-      getSafeAndService(chain, this.multiProvider, safe),
+      chain,
+      this.multiProvider,
+      safe,
     );
 
     this.multiSendCallOnlyAddressCache[chain] =

typescript/infra/src/utils/safe.ts

@@ -14,7 +14,7 @@ import {
   getSafe,
   getSafeService,
 } from '@hyperlane-xyz/sdk';
-import { Address, CallData, eqAddress } from '@hyperlane-xyz/utils';
+import { Address, CallData, eqAddress, retryAsync } from '@hyperlane-xyz/utils';
 
 import safeSigners from '../../config/environments/mainnet3/safe/safeSigners.json' assert { type: 'json' };
 import { AnnotatedCallData } from '../govern/HyperlaneAppGovernor.js';
@@ -24,10 +24,10 @@ export async function getSafeAndService(
   multiProvider: MultiProvider,
   safeAddress: Address,
 ) {
-  const safeSdk: Safe.default = await getSafe(
+  const safeSdk: Safe.default = await retryAsync(
-    chain,
+    () => getSafe(chain, multiProvider, safeAddress),
-    multiProvider,
+    5,
-    safeAddress,
+    1000,
   );
   const safeService: SafeApiKit.default = getSafeService(chain, multiProvider);
   return { safeSdk, safeService };