fix:remove agentStartBlock and use mailbox.deployedBlock() instead

.changeset/tall-shirts-accept.md

@@ -0,0 +1,7 @@
+---
+'@hyperlane-xyz/infra': patch
+'@hyperlane-xyz/cli': patch
+'@hyperlane-xyz/sdk': patch
+---
+
+Removing agentStartBlocks and using mailbox.deployedBlock() instead

typescript/cli/src/deploy/core.ts

@@ -8,9 +8,9 @@ import {
   DeployedIsm,
   GasOracleContractType,
   HookType,
-  HyperlaneAddresses,
   HyperlaneAddressesMap,
   HyperlaneContractsMap,
+  HyperlaneCore,
   HyperlaneCoreDeployer,
   HyperlaneDeploymentArtifacts,
   HyperlaneIsmFactory,
@@ -21,7 +21,6 @@ import {
   MultiProvider,
   MultisigConfig,
   RoutingIsmConfig,
-  agentStartBlocks,
   buildAgentConfig,
   buildAggregationIsmConfigs,
   defaultMultisigConfigs,
@@ -472,33 +471,21 @@ async function writeAgentConfig(
   chains: ChainName[],
   multiProvider: MultiProvider,
 ) {
-  // TODO: share with rust/config/*
-  const startBlocks: ChainMap<number> = { ...agentStartBlocks };
-
+  const startBlocks: ChainMap<number> = {};
   for (const chain of chains) {
-    if (startBlocks[chain]) continue;
-    startBlocks[chain] = await multiProvider
-      .getProvider(chain)
-      .getBlockNumber();
+    const core = HyperlaneCore.fromAddressesMap(artifacts, multiProvider);
+    const mailbox = core.getContracts(chain).mailbox;
+    startBlocks[chain] = (await mailbox.deployedBlock()).toNumber();
   }
-
-  const mergedAddressesMap: HyperlaneAddressesMap<any> = objMerge(
+  const mergedAddressesMap = objMerge(
     sdkContractAddressesMap,
     artifacts,
-  );
-  const filteredAddressesMap = objFilter(
-    mergedAddressesMap,
-    (chain, v): v is HyperlaneAddresses<any> =>
-      chains.includes(chain) &&
-      !!v.mailbox &&
-      !!v.interchainGasPaymaster &&
-      !!v.validatorAnnounce,
   ) as ChainMap<HyperlaneDeploymentArtifacts>;
 
   const agentConfig = buildAgentConfig(
-    Object.keys(filteredAddressesMap),
+    Object.keys(mergedAddressesMap),
     multiProvider,
-    filteredAddressesMap,
+    mergedAddressesMap,
     startBlocks,
   );
   writeJson(filePath, agentConfig);

typescript/infra/src/deployment/deploy.ts

@@ -2,6 +2,7 @@ import {
   ChainMap,
   ChainName,
   HyperlaneAddresses,
+  HyperlaneCore,
   HyperlaneDeployer,
   HyperlaneDeploymentArtifacts,
   MultiProvider,
@@ -126,14 +127,19 @@ export async function writeAgentConfig(
   } catch (e) {
     console.error('Failed to load cached addresses');
   }
-  // Write agent config indexing from the deployed or latest block numbers.
-  // For non-net-new deployments, these changes will need to be
-  // reverted manually.
-  const startBlocks = await promiseObjAll(
-    objMap(addresses, (chain, _) =>
-      multiProvider.getProvider(chain).getBlockNumber(),
-    ),
+
+  const core = HyperlaneCore.fromAddressesMap(addresses, multiProvider);
+  // Write agent config indexing from the deployed Mailbox which stores the block number at deployment
+  const startBlocksBigNumber = await promiseObjAll(
+    objMap(addresses, (chain, _) => {
+      const mailbox = core.getContracts(chain).mailbox;
+      return mailbox.deployedBlock();
+    }),
+  );
+  const startBlocks = objMap(startBlocksBigNumber, (_, blockNumber) =>
+    blockNumber.toNumber(),
   );
+
   const agentConfig = buildAgentConfig(
     multiProvider.getKnownChainNames(),
     multiProvider,

typescript/sdk/src/index.ts

@@ -6,7 +6,6 @@ export {
   BaseSealevelAdapter,
   MultiProtocolApp,
 } from './app/MultiProtocolApp';
-export { agentStartBlocks } from './consts/agentStartBlocks';
 export {
   chainIdToMetadata,
   chainMetadata,