From 2c65484f2a00a6d72eb1984e01b9f4e10a55c552 Mon Sep 17 00:00:00 2001 From: Yorke Rhodes Date: Sat, 14 Oct 2023 15:00:08 -0400 Subject: [PATCH] Address pr comments --- typescript/infra/config/aggregationIsm.ts | 4 - .../config/environments/testnet4/agent.ts | 73 +------------------ .../templates/external-secret.yaml | 10 --- 3 files changed, 1 insertion(+), 86 deletions(-) diff --git a/typescript/infra/config/aggregationIsm.ts b/typescript/infra/config/aggregationIsm.ts index 618d60f512..6393806caa 100644 --- a/typescript/infra/config/aggregationIsm.ts +++ b/typescript/infra/config/aggregationIsm.ts @@ -1,7 +1,3 @@ -// Aggregation (1/2) -// | | -// | | -// v v import { AggregationIsmConfig, ChainName, diff --git a/typescript/infra/config/environments/testnet4/agent.ts b/typescript/infra/config/environments/testnet4/agent.ts index 197e3fff66..f821dc985e 100644 --- a/typescript/infra/config/environments/testnet4/agent.ts +++ b/typescript/infra/config/environments/testnet4/agent.ts @@ -2,10 +2,7 @@ import { GasPaymentEnforcementPolicyType, RpcConsensusType, chainMetadata, - getDomainId, - hyperlaneEnvironments, } from '@hyperlane-xyz/sdk'; -import { objMap } from '@hyperlane-xyz/utils'; import { RootAgentConfig, @@ -24,20 +21,6 @@ const releaseCandidateHelloworldMatchingList = routerMatchingList( helloWorld[Contexts.ReleaseCandidate].addresses, ); -const interchainQueryRouters = objMap( - hyperlaneEnvironments.testnet, - (_, addresses) => { - return { - // @ts-ignore moonbasealpha has no interchain query router - router: addresses.interchainQueryRouter, - }; - }, -); - -const interchainQueriesMatchingList = routerMatchingList( - interchainQueryRouters, -); - const repo = 'gcr.io/abacus-labs-dev/hyperlane-agent'; const contextBase = { @@ -51,35 +34,6 @@ const contextBase = { } as const; const gasPaymentEnforcement: GasPaymentEnforcementConfig[] = [ - { - type: GasPaymentEnforcementPolicyType.None, - // To continue relaying interchain query callbacks, we whitelist - // all messages between interchain query routers. - // This whitelist will become more strict with - // https://github.com/hyperlane-xyz/hyperlane-monorepo/issues/1605 - matchingList: [ - ...interchainQueriesMatchingList, - { - originDomain: [getDomainId(chainMetadata.solanadevnet)], - senderAddress: [ - // hyperlane context helloworld router on solanadevnet - 'CXQX54kdkU5GqdRJjCmHpwHfEMgFb5SeBmMWntP2Ds7J', - ], - destinationDomain: '*', - recipientAddress: '*', - }, - { - originDomain: [getDomainId(chainMetadata.bsctestnet)], - senderAddress: [ - // testnet ZBC warp route on bsctestnet, which pays - // an IGP that isn't indexed by the relayer at the moment - '0x31b5234A896FbC4b3e2F7237592D054716762131', - ], - destinationDomain: '*', - recipientAddress: '*', - }, - ], - }, // Default policy is OnChainFeeQuoting { type: GasPaymentEnforcementPolicyType.OnChainFeeQuoting, @@ -114,11 +68,6 @@ const hyperlane: RootAgentConfig = { repo, tag: 'ed7569d-20230725-171222', }, - chainDockerOverrides: { - // [chainMetadata.solanadevnet.name]: { - // tag: '79bad9d-20230706-190752', - // }, - }, chains: validatorChainConfig(Contexts.Hyperlane), }, scraper: { @@ -141,27 +90,7 @@ const releaseCandidate: RootAgentConfig = { tag: '892cc5d-20230908-162614', }, whitelist: [...releaseCandidateHelloworldMatchingList], - gasPaymentEnforcement: [ - // Don't require gas payments from solanadevnet - // { - // type: GasPaymentEnforcementPolicyType.None, - // matchingList: [ - // { - // originDomain: [getDomainId(chainMetadata.solanadevnet)], - // senderAddress: '*', - // destinationDomain: '*', - // recipientAddress: '*', - // }, - // { - // originDomain: '*', - // senderAddress: '*', - // destinationDomain: [getDomainId(chainMetadata.solanadevnet)], - // recipientAddress: '*', - // }, - // ], - // }, - ...gasPaymentEnforcement, - ], + gasPaymentEnforcement, transactionGasLimit: 750000, // Skipping arbitrum because the gas price estimates are inclusive of L1 // fees which leads to wildly off predictions. diff --git a/typescript/infra/helm/helloworld-kathy/templates/external-secret.yaml b/typescript/infra/helm/helloworld-kathy/templates/external-secret.yaml index 65f58fe5b8..dff0d47979 100644 --- a/typescript/infra/helm/helloworld-kathy/templates/external-secret.yaml +++ b/typescript/infra/helm/helloworld-kathy/templates/external-secret.yaml @@ -31,13 +31,8 @@ spec: * The templating of external-secrets will use the data section below to know how * to replace the correct value in the created secret. */}} -<<<<<<< HEAD - {{- range .Values.hyperlane.chains }} - {{- if or (eq $.Values.hyperlane.connectionType "quorum") (eq $.Values.hyperlane.connectionType "fallback") }} -======= {{- range .Values.hyperlane.chains.relayer }} {{- if or (eq $.Values.hyperlane.connectionType "httpQuorum") (eq $.Values.hyperlane.connectionType "httpFallback") }} ->>>>>>> main GCP_SECRET_OVERRIDE_{{ $.Values.hyperlane.runEnv | upper }}_RPC_ENDPOINTS_{{ . | upper }}: {{ printf "'{{ .%s_rpcs | toString }}'" . }} {{- else }} GCP_SECRET_OVERRIDE_{{ $.Values.hyperlane.runEnv | upper }}_RPC_ENDPOINT_{{ . | upper }}: {{ printf "'{{ .%s_rpc | toString }}'" . }} @@ -55,13 +50,8 @@ spec: * For each network, load the secret in GCP secret manager with the form: environment-rpc-endpoint-network, * and associate it with the secret key networkname_rpc. */}} -<<<<<<< HEAD - {{- range .Values.hyperlane.chains }} - {{- if or (eq $.Values.hyperlane.connectionType "quorum") (eq $.Values.hyperlane.connectionType "fallback") }} -======= {{- range .Values.hyperlane.chains.relayer }} {{- if or (eq $.Values.hyperlane.connectionType "httpQuorum") (eq $.Values.hyperlane.connectionType "httpFallback") }} ->>>>>>> main - secretKey: {{ printf "%s_rpcs" . }} remoteRef: key: {{ printf "%s-rpc-endpoints-%s" $.Values.hyperlane.runEnv . }}