From 35e49fd55417856a1038866ecef97cad5ce3057f Mon Sep 17 00:00:00 2001
From: Yorke Rhodes <yorke@hyperlane.xyz>
Date: Sun, 12 May 2024 09:59:24 -0400
Subject: [PATCH] Fix infra build

---
 typescript/infra/scripts/announce-validators.ts             | 6 +++---
 .../infra/scripts/list-validator-checkpoint-indices.ts      | 4 ++--
 typescript/infra/scripts/verify-validators.ts               | 4 ++--
 typescript/sdk/src/index.ts                                 | 2 ++
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/typescript/infra/scripts/announce-validators.ts b/typescript/infra/scripts/announce-validators.ts
index 05250bad83..8ce328e048 100644
--- a/typescript/infra/scripts/announce-validators.ts
+++ b/typescript/infra/scripts/announce-validators.ts
@@ -6,7 +6,7 @@ import * as path from 'path';
 import { ChainName } from '@hyperlane-xyz/sdk';
 
 import { getChains } from '../config/registry.js';
-import { S3Validator } from '../src/agents/aws/validator.js';
+import { InfraS3Validator } from '../src/agents/aws/validator.js';
 import { CheckpointSyncerType } from '../src/config/agent/validator.js';
 import { isEthereumProtocolChain } from '../src/utils/utils.js';
 
@@ -47,7 +47,7 @@ async function main() {
     chains.push(chain!);
 
     if (location.startsWith('s3://')) {
-      const validator = await S3Validator.fromStorageLocation(location);
+      const validator = await InfraS3Validator.fromStorageLocation(location);
       announcements.push({
         storageLocation: validator.storageLocation(),
         announcement: await validator.getAnnouncement(),
@@ -87,7 +87,7 @@ async function main() {
             ) {
               const contracts = core.getContracts(validatorChain);
               const localDomain = multiProvider.getDomainId(validatorChain);
-              const validator = new S3Validator(
+              const validator = new InfraS3Validator(
                 validatorBaseConfig.address,
                 localDomain,
                 contracts.mailbox.address,
diff --git a/typescript/infra/scripts/list-validator-checkpoint-indices.ts b/typescript/infra/scripts/list-validator-checkpoint-indices.ts
index ca539be797..f3cfc6c1cc 100644
--- a/typescript/infra/scripts/list-validator-checkpoint-indices.ts
+++ b/typescript/infra/scripts/list-validator-checkpoint-indices.ts
@@ -1,6 +1,6 @@
 import { concurrentMap } from '@hyperlane-xyz/utils';
 
-import { S3Validator } from '../src/agents/aws/validator.js';
+import { InfraS3Validator } from '../src/agents/aws/validator.js';
 
 import { getArgs, getValidatorsByChain } from './agent-utils.js';
 import { getEnvironmentConfig, getHyperlaneCore } from './core-utils.js';
@@ -26,7 +26,7 @@ async function main() {
       let identifier = validator;
       if (storageLocations.length == 1 && storageLocations[0].length == 1) {
         try {
-          const s3Validator = await S3Validator.fromStorageLocation(
+          const s3Validator = await InfraS3Validator.fromStorageLocation(
             storageLocations[0][0],
           );
           identifier = storageLocations[0][0];
diff --git a/typescript/infra/scripts/verify-validators.ts b/typescript/infra/scripts/verify-validators.ts
index 755d568a97..420cdaa15e 100644
--- a/typescript/infra/scripts/verify-validators.ts
+++ b/typescript/infra/scripts/verify-validators.ts
@@ -1,6 +1,6 @@
 import { objMap, promiseObjAll } from '@hyperlane-xyz/utils';
 
-import { S3Validator } from '../src/agents/aws/validator.js';
+import { InfraS3Validator } from '../src/agents/aws/validator.js';
 
 import { getArgs, getValidatorsByChain } from './agent-utils.js';
 import { getEnvironmentConfig, getHyperlaneCore } from './core-utils.js';
@@ -21,7 +21,7 @@ async function main() {
           if (storageLocations[i].length != 1) {
             throw new Error('Only support single announcement');
           }
-          return S3Validator.fromStorageLocation(storageLocations[i][0]);
+          return InfraS3Validator.fromStorageLocation(storageLocations[i][0]);
         }),
       );
       const controlValidator = validators[0];
diff --git a/typescript/sdk/src/index.ts b/typescript/sdk/src/index.ts
index 27c936509c..1efef0f4d0 100644
--- a/typescript/sdk/src/index.ts
+++ b/typescript/sdk/src/index.ts
@@ -478,6 +478,8 @@ export {
   TokenRouterConfigSchema as tokenRouterConfigSchema,
 } from './token/schemas.js';
 export { TokenRouterConfig, WarpRouteDeployConfig } from './token/types.js';
+export { S3Validator } from './aws/validator.js';
+export { S3Wrapper, S3Receipt } from './aws/s3.js';
 
 // prettier-ignore
 // @ts-ignore