From 2130cf348ac6af9cc3dc5600946b4ad85293a2e1 Mon Sep 17 00:00:00 2001 From: Trevor Porter Date: Fri, 11 Nov 2022 18:03:56 +0000 Subject: [PATCH] Deploy kathy and key funder (#1271) * Deploy kathy and key funder * Fix --- typescript/infra/config/environments/mainnet/funding.ts | 2 +- typescript/infra/config/environments/mainnet/helloworld.ts | 6 +++--- typescript/infra/config/environments/testnet2/funding.ts | 2 +- typescript/infra/config/environments/testnet2/helloworld.ts | 4 ++-- .../infra/helm/helloworld-kathy/templates/_helpers.tpl | 4 ++++ typescript/infra/helm/key-funder/templates/cron-job.yaml | 4 ---- typescript/infra/src/config/helloworld.ts | 2 +- typescript/infra/src/funding/deploy-key-funder.ts | 2 -- typescript/infra/src/helloworld/kathy.ts | 1 + 9 files changed, 13 insertions(+), 14 deletions(-) diff --git a/typescript/infra/config/environments/mainnet/funding.ts b/typescript/infra/config/environments/mainnet/funding.ts index 0b443508b..5fd14a4f1 100644 --- a/typescript/infra/config/environments/mainnet/funding.ts +++ b/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, diff --git a/typescript/infra/config/environments/mainnet/helloworld.ts b/typescript/infra/config/environments/mainnet/helloworld.ts index c280ddc95..eef0abfd5 100644 --- a/typescript/infra/config/environments/mainnet/helloworld.ts +++ b/typescript/infra/config/environments/mainnet/helloworld.ts @@ -12,7 +12,7 @@ export const abacus: HelloWorldConfig = { 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 = { 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 = { kathy: { docker: { repo: 'gcr.io/abacus-labs-dev/hyperlane-monorepo', - tag: 'sha-7956ff0', + tag: 'sha-937fd14', }, chainsToSkip: [], runEnv: environment, diff --git a/typescript/infra/config/environments/testnet2/funding.ts b/typescript/infra/config/environments/testnet2/funding.ts index 0b443508b..5fd14a4f1 100644 --- a/typescript/infra/config/environments/testnet2/funding.ts +++ b/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, diff --git a/typescript/infra/config/environments/testnet2/helloworld.ts b/typescript/infra/config/environments/testnet2/helloworld.ts index 1dc8443f5..c36d60f1c 100644 --- a/typescript/infra/config/environments/testnet2/helloworld.ts +++ b/typescript/infra/config/environments/testnet2/helloworld.ts @@ -12,7 +12,7 @@ export const abacus: HelloWorldConfig = { 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 = { kathy: { docker: { repo: 'gcr.io/abacus-labs-dev/hyperlane-monorepo', - tag: 'sha-7956ff0', + tag: 'sha-937fd14', }, chainsToSkip: [], runEnv: environment, diff --git a/typescript/infra/helm/helloworld-kathy/templates/_helpers.tpl b/typescript/infra/helm/helloworld-kathy/templates/_helpers.tpl index a50e390db..e47e94d2a 100644 --- a/typescript/infra/helm/helloworld-kathy/templates/_helpers.tpl +++ b/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: diff --git a/typescript/infra/helm/key-funder/templates/cron-job.yaml b/typescript/infra/helm/key-funder/templates/cron-job.yaml index 757e6e407..dddcfc18a 100644 --- a/typescript/infra/helm/key-funder/templates/cron-job.yaml +++ b/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 diff --git a/typescript/infra/src/config/helloworld.ts b/typescript/infra/src/config/helloworld.ts index 438c2cf9a..005b73395 100644 --- a/typescript/infra/src/config/helloworld.ts +++ b/typescript/infra/src/config/helloworld.ts @@ -31,7 +31,7 @@ export interface HelloWorldKathyConfig { // 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 { diff --git a/typescript/infra/src/funding/deploy-key-funder.ts b/typescript/infra/src/funding/deploy-key-funder.ts index c8da2c0db..7f95985f8 100644 --- a/typescript/infra/src/funding/deploy-key-funder.ts +++ b/typescript/infra/src/funding/deploy-key-funder.ts @@ -50,8 +50,6 @@ function getKeyFunderHelmValues( chains: agentConfig.contextChainNames, contextFundingFrom: keyFunderConfig.contextFundingFrom, contextsAndRolesToFund: keyFunderConfig.contextsAndRolesToFund, - cyclesBetweenEthereumMessages: - keyFunderConfig.cyclesBetweenEthereumMessages, connectionType: keyFunderConfig.connectionType, }, image: { diff --git a/typescript/infra/src/helloworld/kathy.ts b/typescript/infra/src/helloworld/kathy.ts index 91946bc44..d85a1ebf8 100644 --- a/typescript/infra/src/helloworld/kathy.ts +++ b/typescript/infra/src/helloworld/kathy.ts @@ -76,6 +76,7 @@ function getHelloworldKathyHelmValues( cycleOnce, fullCycleTime, connectionType: kathyConfig.connectionType, + cyclesBetweenEthereumMessages: kathyConfig.cyclesBetweenEthereumMessages, }, image: { repository: kathyConfig.docker.repo,