Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 6 additions & 26 deletions .github/workflows/monorepo-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,14 @@ on:
- '**'
pull_request:
paths:
# For now, because this image is only used to use `infra`, we just build for infra or .registryrc changes
- 'typescript/infra/**'
- '.registryrc'
# Only build on PRs that change the Docker build itself
- 'Dockerfile'
- 'docker-entrypoint.sh'
- '.dockerignore'
- '.github/workflows/monorepo-docker.yml'
- 'solidity/.foundryrc'
- 'typescript/ccip-server/**'
# Dependency changes that could affect the Docker build
- 'pnpm-lock.yaml'
- '**/package.json'
- '.registryrc'
- 'solidity/.foundryrc'
workflow_dispatch:
Comment thread
coderabbitai[bot] marked this conversation as resolved.
inputs:
include_arm64:
Expand Down Expand Up @@ -49,20 +45,12 @@ jobs:
permissions:
contents: read
id-token: write
pull-requests: write

# uses check-env to determine if secrets.GCLOUD_SERVICE_KEY is defined
needs: [check-env]
if: needs.check-env.outputs.gcloud-service-key == 'true'

steps:
- name: Generate GitHub App Token
id: generate-token
uses: actions/create-github-app-token@v2
with:
app-id: ${{ secrets.HYPER_GONK_APP_ID }}
private-key: ${{ secrets.HYPER_GONK_PRIVATE_KEY }}

- uses: actions/checkout@v6
with:
ref: ${{ github.event.pull_request.head.sha || github.sha }}
Expand All @@ -73,6 +61,7 @@ jobs:
run: |
echo "TAG_DATE=$(date +'%Y%m%d-%H%M%S')" >> $GITHUB_OUTPUT
echo "TAG_SHA=$(echo '${{ github.event.pull_request.head.sha || github.sha }}' | cut -b 1-7)" >> $GITHUB_OUTPUT

- name: Docker meta
id: meta
uses: docker/metadata-action@v5
Expand All @@ -85,8 +74,10 @@ jobs:
type=ref,event=branch
type=ref,event=pr
type=raw,value=${{ steps.taggen.outputs.TAG_SHA }}-${{ steps.taggen.outputs.TAG_DATE }}

- name: Set up Depot CLI
uses: depot/setup-action@v1

- name: Login to GCR
uses: docker/login-action@v3
with:
Expand Down Expand Up @@ -148,14 +139,3 @@ jobs:
${REGISTRY}/hyperlane-monorepo:${TAG_SHA_DATE}
\`\`\`
EOF

- name: Comment image tags on PR
if: github.event_name == 'pull_request' && always()
uses: ./.github/actions/docker-image-comment
with:
comment_tag: monorepo-docker-image
image_name: Monorepo Docker Image
image_tags: gcr.io/abacus-labs-dev/hyperlane-monorepo:${{ steps.taggen.outputs.TAG_SHA }}-${{ steps.taggen.outputs.TAG_DATE }}
pr_number: ${{ github.event.pull_request.number }}
github_token: ${{ steps.generate-token.outputs.token }}
job_status: ${{ job.status }}
11 changes: 4 additions & 7 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions typescript/infra/config/docker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ interface AgentDockerTags {

interface BaseDockerTags extends AgentDockerTags {
keyFunder: string;
kathy: string;
}

interface MainnetDockerTags extends BaseDockerTags {
Expand All @@ -46,8 +45,7 @@ export const mainnetDockerTags: MainnetDockerTags = {
validatorRC: 'a52b9e6-20260122-173915',
scraper: '80f3635-20260123-103819',
// monorepo services
kathy: '74d999b-20260108-145131',
checkWarpDeploy: '74d999b-20260108-145131',
checkWarpDeploy: 'main',
// standalone services
keyFunder: 'b29a170-20260128-174848',
warpMonitor: '6b6fd0b-20260123-121413',
Expand All @@ -61,8 +59,6 @@ export const testnetDockerTags: BaseDockerTags = {
validator: 'eeadda5-20260129-131050',
validatorRC: 'eeadda5-20260129-131050',
scraper: 'eeadda5-20260129-131050',
// monorepo services
kathy: '74d999b-20260108-145131',
// standalone services
keyFunder: 'b29a170-20260128-174848',
};
7 changes: 0 additions & 7 deletions typescript/infra/config/environments/helloworld.ts

This file was deleted.

17 changes: 1 addition & 16 deletions typescript/infra/config/environments/mainnet3/agent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ import { getDomainId, getWarpAddresses } from '../../registry.js';

import { environment, ethereumChainNames } from './chains.js';
import { blacklistedMessageIds } from './customBlacklist.js';
import { helloWorld } from './helloworld.js';
import aaveSenderAddresses from './misc-artifacts/aave-sender-addresses.json' with { type: 'json' };
import everclearSenderAddresses from './misc-artifacts/everclear-sender-addresses.json' with { type: 'json' };
import merklyErc20Addresses from './misc-artifacts/merkly-erc20-addresses.json' with { type: 'json' };
Expand All @@ -55,10 +54,6 @@ import {
import { validatorChainConfig } from './validators.js';
import { WarpRouteIds } from './warp/warpIds.js';

// const releaseCandidateHelloworldMatchingList = routerMatchingList(
// helloWorld[Contexts.ReleaseCandidate].addresses,
// );

// The chains here must be consistent with the environment's supportedChainNames, which is
// checked / enforced at runtime & in the CI pipeline.
//
Expand Down Expand Up @@ -697,7 +692,6 @@ const stagingStHyperMatchingList = chainMapMatchingList({
});

// Gets metric app contexts, including:
// - helloworld
// - all warp routes defined in WarpRouteIds, using addresses from the registry
// - misc important applications not defined in the registry, e.g. merkly
const metricAppContextsGetter = (): MetricAppContext[] => {
Expand Down Expand Up @@ -725,12 +719,6 @@ const metricAppContextsGetter = (): MetricAppContext[] => {

return [
...warpContexts,
{
name: 'helloworld',
matchingList: routerMatchingList(
helloWorld[Contexts.Hyperlane].addresses,
),
},
{
name: 'merkly_erc20',
matchingList: routerMatchingList(merklyErc20Addresses),
Expand Down Expand Up @@ -940,17 +928,14 @@ const releaseCandidate: RootAgentConfig = {
...contextBase,
context: Contexts.ReleaseCandidate,
contextChainNames: hyperlaneContextAgentChainNames,
rolesWithKeys: [Role.Relayer, Role.Kathy, Role.Validator],
rolesWithKeys: [Role.Relayer, Role.Validator],
relayer: {
rpcConsensusType: RpcConsensusType.Fallback,
docker: {
repo: DockerImageRepos.AGENT,
tag: mainnetDockerTags.relayerRC,
},
blacklist,
// We're temporarily (ab)using the RC relayer as a way to increase
// message throughput.
// whitelist: releaseCandidateHelloworldMatchingList,
gasPaymentEnforcement,
metricAppContextsGetter,
ismCacheConfigs,
Expand Down
52 changes: 2 additions & 50 deletions typescript/infra/config/environments/mainnet3/funding.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,60 +48,12 @@ export const keyFunderConfig: KeyFunderConfig<
'http://prometheus-prometheus-pushgateway.monitoring.svc.cluster.local:9091',
contextFundingFrom: Contexts.Hyperlane,
contextsAndRolesToFund: {
[Contexts.Hyperlane]: [Role.Relayer, Role.Kathy, Role.Rebalancer],
[Contexts.ReleaseCandidate]: [Role.Relayer, Role.Kathy],
[Contexts.Hyperlane]: [Role.Relayer, Role.Rebalancer],
[Contexts.ReleaseCandidate]: [Role.Relayer],
},
chainsToSkip: ['zeronetwork'],
// desired balance config, must be set for each chain
desiredBalancePerChain: desiredRelayerBalancePerChain,
// if not set, keyfunder defaults to 0
desiredKathyBalancePerChain: {
ancient8: '0',
arbitrum: '0.1',
avalanche: '6',
base: '0.05',
blast: '0',
bob: '0',
bsc: '0.35',
celo: '150',
cyber: '0',
degenchain: '0',
endurance: '0',
ethereum: '0.4',
fraxtal: '0',
fusemainnet: '0',
gnosis: '100',
linea: '0',
lisk: '0',
lukso: '0',
mantapacific: '0',
mantle: '0',
merlin: '0',
metis: '0',
mode: '0',
moonbeam: '250',
optimism: '0.1',
polygon: '85',
polygonzkevm: '0.05',
redstone: '0',
scroll: '0.05',
sei: '0',
taiko: '0',
tangle: '0',
viction: '0.05',
worldchain: '0',
xai: '0',
xlayer: '0',
zetachain: '0',
zircuit: '0',
zoramainnet: '0',
// ignore non-evm chains
eclipsemainnet: '0',
neutron: '0',
solanamainnet: '0',
soon: '0',
sonicsvm: '0',
},
// desired rebalancer balance config
desiredRebalancerBalancePerChain,
// if not set, keyfunder defaults to using desired balance * 0.2 as the threshold
Expand Down
54 changes: 0 additions & 54 deletions typescript/infra/config/environments/mainnet3/helloworld.ts

This file was deleted.

This file was deleted.

Loading
Loading