Refactor deployment-addresses.ts

Author: acenolaza

scripts/src/deployment-addresses.ts

@@ -3,27 +3,48 @@ import { join, parse as parsePath } from 'node:path';
 
 import type { AddressLike } from 'ethers';
 
-export interface DeploymentAddressEntry {
+export interface Deployment {
+  deploymentName: string; // The full deterministic name from the artifact file
   address: AddressLike;
   constructorArgs?: any[];
   constructorArgTypes?: string[];
 }
 
-export interface ChainDeploymentAddresses {
-  [chainId: string]: DeploymentAddressEntry;
+export interface DeploymentsByChain {
+  [chainId: string]: Deployment[];
 }
 
-export interface AllDeploymentAddresses {
-  [deploymentName: string]: ChainDeploymentAddresses;
+export interface AllDeploymentsByContract {
+  [contractName: string]: DeploymentsByChain;
+}
+
+// Helper to extract contract name from a deployment name
+function extractContractName(deploymentName: string): string {
+  if (!deploymentName) return '';
+
+  const lastUnderscoreIndex = deploymentName.lastIndexOf('_');
+  if (lastUnderscoreIndex < 0 || lastUnderscoreIndex === deploymentName.length - 1) {
+    return deploymentName;
+  }
+
+  const potentialSuffix = deploymentName.slice(lastUnderscoreIndex + 1);
+  if (potentialSuffix.length === 8 && /^[\dA-Fa-f]+$/.test(potentialSuffix)) {
+    return deploymentName.slice(0, lastUnderscoreIndex);
+  }
+
+  return deploymentName;
 }
 
 /**
  * Reads deployment artifacts from the `deployments` directory (specific to data-feed-proxy-combinators)
- * and aggregates contract addresses, constructor arguments, and types by deployment name and chain ID.
+ * and aggregates contract addresses, constructor arguments, and types by contract name, then by chain ID,
+ * with an array of deployment instances.
  * @returns A stringified JSON object of deployment addresses.
  */
 export function getDeploymentAddresses(): string {
-  const allAddresses: AllDeploymentAddresses = {};
+  const allDeployments: AllDeploymentsByContract = {};
+  // Assumes this script is in data-feed-proxy-combinators/scripts/src/
+  // and the deployments directory is at data-feed-proxy-combinators/deployments/
   const deploymentsRoot = join(__dirname, '..', '..', 'deployments');
 
   if (!fs.existsSync(deploymentsRoot)) {
@@ -48,17 +69,26 @@ export function getDeploymentAddresses(): string {
 
     for (const deploymentFile of deploymentFiles) {
       const deploymentName = parsePath(deploymentFile).name;
+      const contractName = extractContractName(deploymentName);
+
       const artifact = JSON.parse(fs.readFileSync(join(networkPath, deploymentFile), 'utf8'));
-      const constructorEntry = artifact.abi.find((item: any) => item.type === 'constructor');
-      const constructorArgTypes = constructorEntry?.inputs?.map((input: any) => input.type) || [];
+      const constructorEntry = artifact.abi?.find(
+        (item: { type: string; inputs?: unknown[] }) => item.type === 'constructor'
+      );
+      const constructorArgTypes = constructorEntry?.inputs?.map((input: { type: string }) => input.type) ?? [];
 
-      if (!allAddresses[deploymentName]) allAddresses[deploymentName] = {};
-      allAddresses[deploymentName][chainId] = {
+      const instanceDetail: Deployment = {
+        deploymentName,
         address: artifact.address,
         constructorArgs: artifact.args || [],
         constructorArgTypes,
       };
+
+      allDeployments[contractName] = {
+        ...allDeployments[contractName],
+        [chainId]: [...(allDeployments[contractName]?.[chainId] ?? []), instanceDetail],
+      };
     }
   }
-  return `${JSON.stringify(allAddresses, null, 2)}\n`;
+  return `${JSON.stringify(allDeployments, null, 2)}\n`;
 }