Deploy kathy and key funder (#1271)

* Deploy kathy and key funder

* Fix

typescript/infra/config/environments/mainnet/funding.ts

@@ -8,7 +8,7 @@ import { environment } from './chains';
 export const keyFunderConfig: KeyFunderConfig = {
   docker: {
     repo: 'gcr.io/abacus-labs-dev/hyperlane-monorepo',
-    tag: 'sha-7956ff0',
+    tag: 'sha-937fd14',
   },
   cronSchedule: '45 * * * *', // Every hour at the 45 minute mark
   namespace: environment,

typescript/infra/config/environments/mainnet/helloworld.ts

@@ -12,7 +12,7 @@ export const abacus: HelloWorldConfig<MainnetChains> = {
   kathy: {
     docker: {
       repo: 'gcr.io/abacus-labs-dev/hyperlane-monorepo',
-      tag: 'sha-7956ff0',
+      tag: 'sha-937fd14',
     },
     chainsToSkip: [],
     runEnv: environment,
@@ -24,7 +24,7 @@ export const abacus: HelloWorldConfig<MainnetChains> = {
     messageSendTimeout: 1000 * 60 * 8, // 8 min
     messageReceiptTimeout: 1000 * 60 * 20, // 20 min
     connectionType: ConnectionType.Http,
-    cycleBetweenEthereumMessages: 3, // Skip 3 cycles of Ethereum, i.e. send/receive Ethereum messages once a day.
+    cyclesBetweenEthereumMessages: 3, // Skip 3 cycles of Ethereum, i.e. send/receive Ethereum messages once a day.
   },
 };
 
@@ -33,7 +33,7 @@ export const releaseCandidate: HelloWorldConfig<MainnetChains> = {
   kathy: {
     docker: {
       repo: 'gcr.io/abacus-labs-dev/hyperlane-monorepo',
-      tag: 'sha-7956ff0',
+      tag: 'sha-937fd14',
     },
     chainsToSkip: [],
     runEnv: environment,

typescript/infra/config/environments/testnet2/funding.ts

@@ -8,7 +8,7 @@ import { environment } from './chains';
 export const keyFunderConfig: KeyFunderConfig = {
   docker: {
     repo: 'gcr.io/abacus-labs-dev/hyperlane-monorepo',
-    tag: 'sha-7956ff0',
+    tag: 'sha-937fd14',
   },
   cronSchedule: '45 * * * *', // Every hour at the 45 minute mark
   namespace: environment,

typescript/infra/config/environments/testnet2/helloworld.ts

@@ -12,7 +12,7 @@ export const abacus: HelloWorldConfig<TestnetChains> = {
   kathy: {
     docker: {
       repo: 'gcr.io/abacus-labs-dev/hyperlane-monorepo',
-      tag: 'sha-7956ff0',
+      tag: 'sha-937fd14',
     },
     chainsToSkip: [],
     runEnv: environment,
@@ -32,7 +32,7 @@ export const releaseCandidate: HelloWorldConfig<TestnetChains> = {
   kathy: {
     docker: {
       repo: 'gcr.io/abacus-labs-dev/hyperlane-monorepo',
-      tag: 'sha-7956ff0',
+      tag: 'sha-937fd14',
     },
     chainsToSkip: [],
     runEnv: environment,

typescript/infra/helm/helloworld-kathy/templates/_helpers.tpl

@@ -94,6 +94,10 @@ The helloworld-kathy container
 {{- if .Values.abacus.connectionType }}
   - --connection-type
   - {{ .Values.abacus.connectionType }}
+{{- end }}
+{{- if .Values.abacus.cyclesBetweenEthereumMessages }}
+  - --cycles-between-ethereum-messages
+  - "{{ .Values.abacus.cyclesBetweenEthereumMessages }}"
 {{- end }}
   envFrom:
   - secretRef:

typescript/infra/helm/key-funder/templates/cron-job.yaml

@@ -33,10 +33,6 @@ spec:
 {{- if .Values.abacus.connectionType }}
             - --connection-type
             - {{ .Values.abacus.connectionType }}
-{{- end }}
-{{- if .Values.abacus.cyclesBetweenEthereumMessages }}
-            - --cycles-between-ethereum-messages
-            - {{ .Values.abacus.cyclesBetweenEthereumMessages }}
 {{- end }}
             env:
             - name: PROMETHEUS_PUSH_GATEWAY

typescript/infra/src/config/helloworld.ts

@@ -31,7 +31,7 @@ export interface HelloWorldKathyConfig<Chain extends ChainName> {
   // Whether to use a single HTTP provider or a quorum of HTTP providers
   connectionType: ConnectionType.Http | ConnectionType.HttpQuorum;
   // How many cycles to skip between a cycles that send messages to/from Ethereum. Defaults to 0.
-  cycleBetweenEthereumMessages?: number;
+  cyclesBetweenEthereumMessages?: number;
 }
 
 export interface HelloWorldConfig<Chain extends ChainName> {

typescript/infra/src/funding/deploy-key-funder.ts

@@ -50,8 +50,6 @@ function getKeyFunderHelmValues<Chain extends ChainName>(
       chains: agentConfig.contextChainNames,
       contextFundingFrom: keyFunderConfig.contextFundingFrom,
       contextsAndRolesToFund: keyFunderConfig.contextsAndRolesToFund,
-      cyclesBetweenEthereumMessages:
-        keyFunderConfig.cyclesBetweenEthereumMessages,
       connectionType: keyFunderConfig.connectionType,
     },
     image: {

typescript/infra/src/helloworld/kathy.ts

@@ -76,6 +76,7 @@ function getHelloworldKathyHelmValues<Chain extends ChainName>(
       cycleOnce,
       fullCycleTime,
       connectionType: kathyConfig.connectionType,
+      cyclesBetweenEthereumMessages: kathyConfig.cyclesBetweenEthereumMessages,
     },
     image: {
       repository: kathyConfig.docker.repo,