Deploy Jan 25 (#1665)

rust/helm/hyperlane-agent/templates/relayer-external-secret.yaml

@@ -21,9 +21,9 @@ spec:
         labels:
           {{- include "agent-common.labels" . | nindent 10 }}
       data:
-        {{- range .Values.hyperlane.chains }}
-        {{- if eq .signer.keyConfig.type "hexKey" }}
-        HYP_BASE_CHAINS_{{ .name | upper }}_KEY: {{ printf "'{{ .%s_signer_key | toString }}'" .name }}
+        {{- range .Values.hyperlane.relayerChains }}
+        {{- if eq .signer.type "hexKey" }}
+        HYP_BASE_CHAINS_{{ .name | upper }}_SIGNER_KEY: {{ printf "'{{ .%s_signer_key | toString }}'" .name }}
         {{- end }}
         {{- end }}
         {{- if .Values.hyperlane.relayer.aws }}
@@ -34,8 +34,8 @@ spec:
         HYP_RELAYER_GASPAYMENTENFORCEMENTPOLICY_COINGECKOAPIKEY: {{ print "'{{ .coingecko_api_key | toString }}'" }}
         {{- end }}
   data:
-  {{- range .Values.hyperlane.chains }}
-  {{- if eq .signer.keyConfig.type "hexKey" }}
+  {{- range .Values.hyperlane.relayerChains }}
+  {{- if eq .signer.type "hexKey" }}
   - secretKey: {{ printf "%s_signer_key" .name }}
     remoteRef:
       key: {{ printf "%s-%s-key-%s-relayer" $.Values.hyperlane.context $.Values.hyperlane.runEnv $.Values.hyperlane.relayer.config.originChainName }}

rust/helm/hyperlane-agent/templates/relayer-statefulset.yaml

@@ -56,8 +56,8 @@ spec:
             name: {{ include "agent-common.fullname" . }}-relayer-secret
         env:
 {{- include "agent-common.config-env-vars" (dict "config" .Values.hyperlane.relayer.config "agent_name" "relayer") | indent 10 }}
-          {{- range .Values.hyperlane.chains }}
-{{- include "agent-common.config-env-vars" (dict "config" .keyConfig "agent_name" "base" "key_name_prefix" (printf "CHAINS_%s_SIGNER_" (.name | upper))) | indent 10 }}
+          {{- range .Values.hyperlane.relayerChains }}
+{{- include "agent-common.config-env-vars" (dict "config" .signer "agent_name" "base" "key_name_prefix" (printf "CHAINS_%s_SIGNER_" (.name | upper))) | indent 10 }}
           {{- end }}
           {{- if .Values.hyperlane.tracing.uri }}
           - name: HYP_BASE_TRACING_JAEGER_NAME

typescript/infra/config/environments/mainnet2/agent.ts

@@ -17,7 +17,7 @@ export const hyperlane: AgentConfig<MainnetChains> = {
   context: Contexts.Hyperlane,
   docker: {
     repo: 'gcr.io/abacus-labs-dev/hyperlane-agent',
-    tag: 'sha-82951fb',
+    tag: 'sha-c163fce',
   },
   aws: {
     region: 'us-east-1',
@@ -63,6 +63,12 @@ export const hyperlane: AgentConfig<MainnetChains> = {
   },
   relayer: {
     default: {
+      blacklist: [
+        {
+          sourceDomain: '137',
+          destinationAddress: '0xBC3cFeca7Df5A45d61BC60E7898E63670e1654aE',
+        },
+      ],
       gasPaymentEnforcementPolicy: {
         type: GasPaymentEnforcementPolicyType.None,
       },

typescript/infra/config/environments/testnet3/agent.ts

@@ -26,7 +26,7 @@ export const hyperlane: AgentConfig<TestnetChains> = {
   context: Contexts.Hyperlane,
   docker: {
     repo: 'gcr.io/abacus-labs-dev/hyperlane-agent',
-    tag: 'sha-82951fb',
+    tag: 'sha-c163fce',
   },
   aws: {
     region: 'us-east-1',
@@ -66,7 +66,9 @@ export const hyperlane: AgentConfig<TestnetChains> = {
   },
   relayer: {
     default: {
-      // blacklist: releaseCandidateHelloworldMatchingList,
+      blacklist: [
+        { destinationAddress: '0xBC3cFeca7Df5A45d61BC60E7898E63670e1654aE' },
+      ],
       gasPaymentEnforcementPolicy: {
         type: GasPaymentEnforcementPolicyType.None,
       },

typescript/infra/src/agents/index.ts

@@ -71,12 +71,16 @@ async function helmValuesForChain<Chain extends ChainName>(
       chains: agentConfig.environmentChainNames.map((envChainName) => ({
         name: envChainName,
         disabled: !agentConfig.contextChainNames.includes(envChainName),
-        signer: signers[envChainName],
         txsubmission: {
           type: chainAgentConfig.transactionSubmissionType(envChainName),
         },
         connection: baseConnectionConfig,
       })),
+      // Only the relayer has the signers on the chains config object
+      relayerChains: agentConfig.environmentChainNames.map((envChainName) => ({
+        name: envChainName,
+        signer: signers[envChainName],
+      })),
       validator: {
         enabled: chainAgentConfig.validatorEnabled,
         configs: await chainAgentConfig.validatorConfigs(),