feat: misc infra tweaks (#7168)

Author: paulbalaji

typescript/infra/scripts/agent-utils.ts

@@ -173,6 +173,13 @@ export function withWrite<T>(args: Argv<T>) {
     .default('write', false);
 }
 
+export function withAppend<T>(args: Argv<T>) {
+  return args
+    .describe('append', 'Write only new keys to file (preserves existing keys)')
+    .boolean('append')
+    .default('append', false);
+}
+
 export function withChains<T>(args: Argv<T>, chainOptions?: ChainName[]) {
   return (
     args

typescript/infra/scripts/funding/calculate-relayer-daily-burn.ts

@@ -27,8 +27,8 @@ import {
   portForwardPrometheusServer,
 } from '../../src/infrastructure/monitoring/prometheus.js';
 import { fetchLatestGCPSecret } from '../../src/utils/gcloud.js';
-import { writeAndFormatJsonAtPath } from '../../src/utils/utils.js';
-import { withSkipReview } from '../agent-utils.js';
+import { writeJsonWithAppendMode } from '../../src/utils/utils.js';
+import { withAppend, withSkipReview } from '../agent-utils.js';
 
 const tokenPrices: ChainMap<string> = rawTokenPrices;
 const currentDailyRelayerBurn: ChainMap<number> = rawDailyRelayerBurn;
@@ -44,8 +44,9 @@ const MIN_BURN_INCREASE_FACTOR = 0.05; // burn should be at least 5% higher than
 const LOW_PROPOSED_BURN_FACTOR = 0.5; // proposed burn should be at least 50% lower than current to initiate user review
 
 async function main() {
-  const { skipReview } = await withSkipReview(yargs(process.argv.slice(2)))
-    .argv;
+  const { skipReview, append } = await withAppend(
+    withSkipReview(yargs(process.argv.slice(2))),
+  ).argv;
 
   validateTokenPrices();
 
@@ -61,7 +62,7 @@ async function main() {
 
   burnData = sortThresholds(burnData);
 
-  writeBurnDataToFile(burnData);
+  writeBurnDataToFile(burnData, append);
 }
 
 function validateTokenPrices() {
@@ -326,10 +327,10 @@ async function getSealevelDomainIds(): Promise<ChainMap<string>> {
   return sealevelDomainIds;
 }
 
-function writeBurnDataToFile(burnData: ChainMap<number>) {
+function writeBurnDataToFile(burnData: ChainMap<number>, append: boolean) {
   try {
     rootLogger.info('Writing daily burn data to file..');
-    writeAndFormatJsonAtPath(DAILY_BURN_PATH, burnData);
+    writeJsonWithAppendMode(DAILY_BURN_PATH, burnData, append);
     rootLogger.info('Daily burn data written to file.');
   } catch (err) {
     rootLogger.error('Error writing daily burn data to file:', err);

typescript/infra/scripts/helloworld/kathy.ts

@@ -407,7 +407,11 @@ async function sendMessage(
 
   const sendAndConfirmMsg = async () => {
     const originProtocol = app.metadata(origin).protocol;
-    const sender = keys[origin].addressForProtocol(originProtocol);
+    const bech32Prefix = app.metadata(origin).bech32Prefix;
+    const sender = keys[origin].addressForProtocol(
+      originProtocol,
+      bech32Prefix,
+    );
     if (!sender) {
       throw new Error(
         `No sender address found for chain ${origin} and protocol ${originProtocol}`,

typescript/infra/scripts/keys/get-key-addresses.ts

@@ -1,18 +1,61 @@
+import prompts from 'prompts';
+
+import { ProtocolType } from '../../../utils/dist/types.js';
+import { getChain } from '../../config/registry.js';
 import { getAllCloudAgentKeys } from '../../src/agents/key-utils.js';
 import { getArgs, withContext, withProtocol } from '../agent-utils.js';
 import { getConfigsBasedOnArgs } from '../core-utils.js';
 
+function getKeyArgs() {
+  return withProtocol(withContext(getArgs()))
+    .alias('p', 'protocol')
+    .option('bech32Prefix', {
+      type: 'string',
+      description: 'The bech32 prefix for the Cosmos address',
+    })
+    .alias('b', 'bech32Prefix');
+}
+
 async function main() {
-  const argv = await withProtocol(withContext(getArgs())).argv;
+  const argv = await getKeyArgs().argv;
+  const { agentConfig, envConfig } = await getConfigsBasedOnArgs(argv);
 
-  const { agentConfig } = await getConfigsBasedOnArgs(argv);
+  if (argv.protocol === 'cosmos' || argv.protocol === 'cosmosnative') {
+    if (!argv.bech32Prefix) {
+      const bech32PrefixMap = envConfig.supportedChainNames.reduce<
+        Record<string, string>
+      >((acc, chainName) => {
+        const chain = getChain(chainName);
+        if (
+          chain &&
+          (chain.protocol === ProtocolType.Cosmos ||
+            chain.protocol === ProtocolType.CosmosNative) &&
+          chain.bech32Prefix
+        ) {
+          acc[chainName] = chain.bech32Prefix;
+        }
+        return acc;
+      }, {});
+
+      const response = await prompts({
+        type: 'select',
+        name: 'bech32Prefix',
+        message: 'Select the bech32 prefix for Cosmos address:',
+        choices: Object.entries(bech32PrefixMap).map(([chainName, prefix]) => ({
+          title: chainName,
+          value: prefix,
+        })),
+      });
+      argv.bech32Prefix = response.bech32Prefix;
+    }
+  }
 
   const keys = getAllCloudAgentKeys(agentConfig);
   const keyInfoPromises = keys.map(async (key) => {
     let address = undefined;
     try {
       await key.fetch();
-      address = key.addressForProtocol(argv.protocol);
+      address = key.addressForProtocol(argv.protocol, argv.bech32Prefix);
     } catch (e) {
       // Swallow error
       console.error('Error getting address', { key: key.identifier, e });

typescript/infra/scripts/print-gas-prices.ts

@@ -1,5 +1,6 @@
 import { Provider } from '@ethersproject/providers';
 import { ethers } from 'ethers';
+import path from 'path';
 
 import {
   ChainMap,
@@ -22,12 +23,15 @@ import {
   getSafeNumericValue,
   updatePriceIfNeeded,
 } from '../src/config/gas-oracle.js';
-import { writeAndFormatJsonAtPath } from '../src/utils/utils.js';
+import { getInfraPath, writeJsonWithAppendMode } from '../src/utils/utils.js';
 
-import { getArgs, withWrite } from './agent-utils.js';
+import { getArgs, withAppend, withWrite } from './agent-utils.js';
 
 const gasPricesFilePath = (environment: DeployEnvironment) => {
-  return `config/environments/${environment}/gasPrices.json`;
+  return path.join(
+    getInfraPath(),
+    `config/environments/${environment}/gasPrices.json`,
+  );
 };
 
 // Helper function to extract numeric amount from GasPriceConfig
@@ -45,7 +49,8 @@ const createDefaultGasPrice = (
 });
 
 async function main() {
-  const { environment, write } = await withWrite(getArgs()).argv;
+  const { environment, write, append } = await withAppend(withWrite(getArgs()))
+    .argv;
   const { registry, supportedChainNames, gasPrices } =
     environment === 'mainnet3'
       ? {
@@ -94,10 +99,9 @@ async function main() {
     ),
   );
 
-  if (write) {
+  if (write || append) {
     const outFile = gasPricesFilePath(environment);
-    console.log(`Writing gas prices to ${outFile}`);
-    writeAndFormatJsonAtPath(outFile, prices);
+    await writeJsonWithAppendMode(outFile, prices, append);
   } else {
     console.log(JSON.stringify(prices, null, 2));
   }

typescript/infra/scripts/print-token-prices.ts

@@ -1,4 +1,5 @@
 import chalk from 'chalk';
+import path from 'path';
 
 import { ChainMap, ChainMetadata } from '@hyperlane-xyz/sdk';
 import { objMap, pick } from '@hyperlane-xyz/utils';
@@ -16,9 +17,9 @@ import {
   getSafeNumericValue,
   shouldUpdatePrice,
 } from '../src/config/gas-oracle.js';
-import { writeAndFormatJsonAtPath } from '../src/utils/utils.js';
+import { getInfraPath, writeJsonWithAppendMode } from '../src/utils/utils.js';
 
-import { getArgs, withWrite } from './agent-utils.js';
+import { getArgs, withAppend, withWrite } from './agent-utils.js';
 
 const CURRENCY = 'usd';
 
@@ -29,7 +30,10 @@ const DEFAULT_PRICE = {
 };
 
 const tokenPricesFilePath = (environment: DeployEnvironment) => {
-  return `config/environments/${environment}/tokenPrices.json`;
+  return path.join(
+    getInfraPath(),
+    `config/environments/${environment}/tokenPrices.json`,
+  );
 };
 
 // Helper function to get new price with proper fallback logic
@@ -50,7 +54,8 @@ const getNewTokenPrice = (
 };
 
 async function main() {
-  const { environment, write } = await withWrite(getArgs()).argv;
+  const { environment, write, append } = await withAppend(withWrite(getArgs()))
+    .argv;
 
   const { registry, supportedChainNames } =
     environment === 'mainnet3'
@@ -103,10 +108,9 @@ async function main() {
       : prevPrice.toString();
   });
 
-  if (write) {
+  if (write || append) {
     const outFile = tokenPricesFilePath(environment);
-    console.log(`Writing token prices to ${outFile}`);
-    writeAndFormatJsonAtPath(outFile, prices);
+    await writeJsonWithAppendMode(outFile, prices, append);
   } else {
     console.log(JSON.stringify(prices, null, 2));
   }

typescript/infra/src/agents/gcp.ts

@@ -144,7 +144,10 @@ export class AgentGCPKey extends CloudAgentKey {
     return this.remoteKey.address;
   }
 
-  addressForProtocol(protocol: ProtocolType): string | undefined {
+  addressForProtocol(
+    protocol: ProtocolType,
+    bech32Prefix?: string,
+  ): string | undefined {
     this.requireFetched();
     this.logger.debug(`Getting address for protocol: ${protocol}`);
 
@@ -167,9 +170,10 @@ export class AgentGCPKey extends CloudAgentKey {
         const encodedPubkey = encodeSecp256k1Pubkey(
           new Uint8Array(Buffer.from(strip0x(compressedPubkey), 'hex')),
         );
-        // TODO support other prefixes?
-        // https://cosmosdrops.io/en/tools/bech32-converter is useful for converting to other prefixes.
-        return pubkeyToAddress(encodedPubkey, 'celestia');
+        if (!bech32Prefix) {
+          throw new Error('Bech32 prefix is required for Cosmos address');
+        }
+        return pubkeyToAddress(encodedPubkey, bech32Prefix);
       }
       default:
         this.logger.debug(`Unsupported protocol: ${protocol}`);

typescript/infra/src/agents/keys.ts

@@ -23,7 +23,10 @@ export abstract class BaseAgentKey {
 
   // By default, only Ethereum keys are supported. Subclasses may override
   // this to support other protocols.
-  addressForProtocol(protocol: ProtocolType): string | undefined {
+  addressForProtocol(
+    protocol: ProtocolType,
+    _bech32Prefix?: string,
+  ): string | undefined {
     if (protocol === ProtocolType.Ethereum) {
       return this.address;
     }

typescript/infra/src/utils/utils.ts

@@ -173,6 +173,25 @@ export async function writeAndFormatJsonAtPath(filepath: string, obj: any) {
   await formatFileWithPrettier(filepath);
 }
 
+/**
+ * Write JSON to file, optionally preserving existing values for keys.
+ * If appendMode is true, keeps values from existingData for existing keys, adds new keys from newData.
+ */
+export async function writeJsonWithAppendMode(
+  filepath: string,
+  newData: Record<string, any>,
+  appendMode: boolean,
+) {
+  let data = newData;
+  if (appendMode && fs.existsSync(filepath)) {
+    const existing = readJSONAtPath(filepath);
+    data = Object.fromEntries(
+      Object.keys(newData).map((key) => [key, existing[key] ?? newData[key]]),
+    );
+  }
+  await writeAndFormatJsonAtPath(filepath, data);
+}
+
 /**
  * Gets the monorepo root directory
  */