From 5b6a1aa0bdec2670a997df62ee5b6bd5c52a5f71 Mon Sep 17 00:00:00 2001 From: Ian Suvak Date: Wed, 13 Nov 2024 16:02:43 -0500 Subject: [PATCH 1/8] sed --- .github/ISSUE_TEMPLATE/feature_spec.md | 2 +- .github/workflows/e2e.yml | 4 +-- .github/workflows/release_awm_relayer.yml | 4 +-- .github/workflows/test.yml | 2 +- CONTRIBUTING.md | 6 ++-- README.md | 2 +- database/database.go | 2 +- database/database_test.go | 2 +- database/json_file_storage_test.go | 2 +- database/mocks/mock_database.go | 2 +- database/relayer_id.go | 4 +-- go.mod | 2 +- messages/message_handler.go | 2 +- messages/mocks/mock_message_handler.go | 4 +-- .../off-chain-registry/message_handler.go | 6 ++-- .../message_handler_test.go | 6 ++-- messages/teleporter/message_handler.go | 10 +++---- messages/teleporter/message_handler_test.go | 6 ++-- peers/app_request_network.go | 2 +- peers/config.go | 2 +- peers/info_client.go | 4 +-- peers/mocks/mock_app_request_network.go | 2 +- peers/utils/utils.go | 2 +- .../validators/canonical_validator_client.go | 4 +-- proto/buf.yaml | 2 +- proto/decider/decider.proto | 2 +- relayer/.goreleaser.yml | 26 ++++++++-------- relayer/Dockerfile | 4 +-- relayer/README.md | 28 ++++++++--------- relayer/api/relay_message.go | 6 ++-- relayer/application_relayer.go | 14 ++++----- relayer/checkpoint/checkpoint.go | 4 +-- relayer/checkpoint/checkpoint_test.go | 6 ++-- relayer/config/config.go | 12 ++++---- relayer/config/config_test.go | 6 ++-- relayer/config/destination_blockchain.go | 4 +-- relayer/config/flags.go | 8 ++--- relayer/config/source_blockchain.go | 4 +-- relayer/config/test_utils.go | 2 +- relayer/config/viper.go | 2 +- relayer/config/viper_test.go | 2 +- relayer/listener.go | 6 ++-- relayer/main/main.go | 30 +++++++++---------- relayer/message_coordinator.go | 6 ++-- relayer/network_utils.go | 6 ++-- scripts/build_local_image.sh | 4 +-- scripts/build_relayer.sh | 4 +-- scripts/constants.sh | 10 +++---- signature-aggregator/.goreleaser.yml | 2 +- signature-aggregator/README.md | 4 +-- signature-aggregator/aggregator/aggregator.go | 8 ++--- .../aggregator/aggregator_test.go | 6 ++-- signature-aggregator/api/api.go | 8 ++--- signature-aggregator/config/config.go | 4 +-- signature-aggregator/main/main.go | 12 ++++---- tests/allowed_addresses.go | 6 ++-- tests/basic_relay.go | 6 ++-- tests/batch_relay.go | 2 +- tests/cmd/decider/main.go | 4 +-- tests/e2e_test.go | 4 +-- tests/etna_upgrade.go | 2 +- tests/manual_message.go | 6 ++-- tests/relay_message_api.go | 4 +-- tests/shared_db.go | 2 +- tests/signature_aggregator_api.go | 6 ++-- tests/utils/utils.go | 20 ++++++------- tests/warp_api.go | 2 +- types/types.go | 2 +- vms/contract_message.go | 4 +-- vms/destination_client.go | 4 +-- vms/evm/contract_message.go | 2 +- vms/evm/contract_message_test.go | 4 +-- vms/evm/destination_client.go | 6 ++-- vms/evm/destination_client_test.go | 8 ++--- vms/evm/signer/signer.go | 2 +- vms/evm/signer/tx_signer.go | 2 +- vms/evm/signer/tx_signer_test.go | 4 +-- vms/evm/subscriber_test.go | 6 ++-- vms/subscriber.go | 4 +-- 79 files changed, 219 insertions(+), 219 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/feature_spec.md b/.github/ISSUE_TEMPLATE/feature_spec.md index f270ff03..c7662ee8 100644 --- a/.github/ISSUE_TEMPLATE/feature_spec.md +++ b/.github/ISSUE_TEMPLATE/feature_spec.md @@ -1,6 +1,6 @@ --- name: Feature specification -about: Discussion on design and implementation of new features for awm-relayer. +about: Discussion on design and implementation of new features for icm-relayer. title: '' labels: enhancement assignees: '' diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 5b77e647..c96059ed 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - name: Checkout awm-relayer repository + - name: Checkout icm-relayer repository uses: actions/checkout@v4 with: submodules: recursive @@ -44,7 +44,7 @@ jobs: - name: Build Subnet-EVM Plugin Binary run: ./scripts/build.sh /tmp/e2e-test/avalanchego/plugins/srEXiWaHuhNyGwPUi444Tu47ZEDwxTWrbQiuD7FmgSAQ6X7Dy - - name: Checkout awm-relayer repository + - name: Checkout icm-relayer repository uses: actions/checkout@v4 with: submodules: recursive diff --git a/.github/workflows/release_awm_relayer.yml b/.github/workflows/release_awm_relayer.yml index 45345eb7..11bc9c06 100644 --- a/.github/workflows/release_awm_relayer.yml +++ b/.github/workflows/release_awm_relayer.yml @@ -1,12 +1,12 @@ # Copyright (C) 2024, Ava Labs, Inc. All rights reserved. # See the file LICENSE for licensing terms. -name: Release awm-relayer +name: Release icm-relayer on: push: tags: - - "awm-relayer/*" + - "icm-relayer/*" jobs: release: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a7de23a1..8c5f4a25 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - name: Checkout awm-relayer repository + - name: Checkout icm-relayer repository uses: actions/checkout@v4 with: submodules: recursive diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c0a5341b..39cb7324 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -12,12 +12,12 @@ To start developing on AWM Relayer, you'll need Golang v1.22.8. ### Making an Issue -- Check that the issue you're filing doesn't already exist by searching under [issues](https://github.com/ava-labs/awm-relayer/issues). -- If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/ava-labs/awm-relayer/issues/new/choose). Be sure to include a *title and clear description* with as much relevant information as possible. +- Check that the issue you're filing doesn't already exist by searching under [issues](https://github.com/ava-labs/icm-relayer/issues). +- If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/ava-labs/icm-relayer/issues/new/choose). Be sure to include a *title and clear description* with as much relevant information as possible. ## Features -- If you want to start a discussion about the development of a new feature or the modification of an existing one, start a thread under GitHub [discussions](https://github.com/ava-labs/awm-relayer/discussions/categories/ideas). +- If you want to start a discussion about the development of a new feature or the modification of an existing one, start a thread under GitHub [discussions](https://github.com/ava-labs/icm-relayer/discussions/categories/ideas). - Post a thread about your idea and why it should be added to AWM Relayer. - Don't start working on a pull request until you've received positive feedback from the maintainers. diff --git a/README.md b/README.md index 79e0708f..39b3c191 100644 --- a/README.md +++ b/README.md @@ -68,5 +68,5 @@ Or, for the relayer: ```bash $ goreleaser release --single-target --clean --snapshot --config relayer/.goreleaser.yml ... -$ docker run -v $(pwd)/sample-relayer-config.json:/config.json avaplatform/awm-relayer:v1.0.4-test12-amd64 --config-file /config.json +$ docker run -v $(pwd)/sample-relayer-config.json:/config.json avaplatform/icm-relayer:v1.0.4-test12-amd64 --config-file /config.json ``` diff --git a/database/database.go b/database/database.go index 9af053ab..c3fc0715 100644 --- a/database/database.go +++ b/database/database.go @@ -7,7 +7,7 @@ package database import ( "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/awm-relayer/relayer/config" + "github.com/ava-labs/icm-relayer/relayer/config" "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" "go.uber.org/zap" diff --git a/database/database_test.go b/database/database_test.go index d645603f..40a2e8cd 100644 --- a/database/database_test.go +++ b/database/database_test.go @@ -6,7 +6,7 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/set" - "github.com/ava-labs/awm-relayer/relayer/config" + "github.com/ava-labs/icm-relayer/relayer/config" "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" "github.com/stretchr/testify/require" diff --git a/database/json_file_storage_test.go b/database/json_file_storage_test.go index 6f7a1303..12a9c07f 100644 --- a/database/json_file_storage_test.go +++ b/database/json_file_storage_test.go @@ -126,7 +126,7 @@ func TestConcurrentWriteReadMultipleChains(t *testing.T) { func setupJsonStorage(t *testing.T, relayerIDs []RelayerID) *JSONFileStorage { logger := logging.NewLogger( - "awm-relayer-test", + "icm-relayer-test", logging.NewWrappedCore( logging.Info, os.Stdout, diff --git a/database/mocks/mock_database.go b/database/mocks/mock_database.go index 285d673d..cddca722 100644 --- a/database/mocks/mock_database.go +++ b/database/mocks/mock_database.go @@ -12,7 +12,7 @@ package mocks import ( reflect "reflect" - database "github.com/ava-labs/awm-relayer/database" + database "github.com/ava-labs/icm-relayer/database" common "github.com/ethereum/go-ethereum/common" gomock "go.uber.org/mock/gomock" ) diff --git a/database/relayer_id.go b/database/relayer_id.go index 2b8fee17..733a75dd 100644 --- a/database/relayer_id.go +++ b/database/relayer_id.go @@ -7,8 +7,8 @@ import ( "strings" "github.com/ava-labs/avalanchego/ids" - "github.com/ava-labs/awm-relayer/relayer/config" - "github.com/ava-labs/awm-relayer/utils" + "github.com/ava-labs/icm-relayer/relayer/config" + "github.com/ava-labs/icm-relayer/utils" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" ) diff --git a/go.mod b/go.mod index 8f071630..1740ff52 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/ava-labs/awm-relayer +module github.com/ava-labs/icm-relayer go 1.22.8 diff --git a/messages/message_handler.go b/messages/message_handler.go index 8a7419bc..8ebdbe80 100644 --- a/messages/message_handler.go +++ b/messages/message_handler.go @@ -8,7 +8,7 @@ package messages import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/awm-relayer/vms" + "github.com/ava-labs/icm-relayer/vms" "github.com/ethereum/go-ethereum/common" ) diff --git a/messages/mocks/mock_message_handler.go b/messages/mocks/mock_message_handler.go index 4af23303..5321f14b 100644 --- a/messages/mocks/mock_message_handler.go +++ b/messages/mocks/mock_message_handler.go @@ -14,8 +14,8 @@ import ( ids "github.com/ava-labs/avalanchego/ids" warp "github.com/ava-labs/avalanchego/vms/platformvm/warp" - messages "github.com/ava-labs/awm-relayer/messages" - vms "github.com/ava-labs/awm-relayer/vms" + messages "github.com/ava-labs/icm-relayer/messages" + vms "github.com/ava-labs/icm-relayer/vms" common "github.com/ethereum/go-ethereum/common" gomock "go.uber.org/mock/gomock" ) diff --git a/messages/off-chain-registry/message_handler.go b/messages/off-chain-registry/message_handler.go index 090c1a23..15532c15 100644 --- a/messages/off-chain-registry/message_handler.go +++ b/messages/off-chain-registry/message_handler.go @@ -12,9 +12,9 @@ import ( "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/vms/platformvm/warp" warpPayload "github.com/ava-labs/avalanchego/vms/platformvm/warp/payload" - "github.com/ava-labs/awm-relayer/messages" - "github.com/ava-labs/awm-relayer/relayer/config" - "github.com/ava-labs/awm-relayer/vms" + "github.com/ava-labs/icm-relayer/messages" + "github.com/ava-labs/icm-relayer/relayer/config" + "github.com/ava-labs/icm-relayer/vms" "github.com/ava-labs/subnet-evm/accounts/abi/bind" "github.com/ava-labs/subnet-evm/ethclient" teleporterregistry "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/registry/TeleporterRegistry" diff --git a/messages/off-chain-registry/message_handler_test.go b/messages/off-chain-registry/message_handler_test.go index 258df47c..4b1cd12d 100644 --- a/messages/off-chain-registry/message_handler_test.go +++ b/messages/off-chain-registry/message_handler_test.go @@ -12,9 +12,9 @@ import ( "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/vms/platformvm/warp" "github.com/ava-labs/avalanchego/vms/platformvm/warp/payload" - "github.com/ava-labs/awm-relayer/relayer/config" - mock_evm "github.com/ava-labs/awm-relayer/vms/evm/mocks" - mock_vms "github.com/ava-labs/awm-relayer/vms/mocks" + "github.com/ava-labs/icm-relayer/relayer/config" + mock_evm "github.com/ava-labs/icm-relayer/vms/evm/mocks" + mock_vms "github.com/ava-labs/icm-relayer/vms/mocks" teleporterregistry "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/registry/TeleporterRegistry" "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" diff --git a/messages/teleporter/message_handler.go b/messages/teleporter/message_handler.go index 0335d6f6..2654386c 100644 --- a/messages/teleporter/message_handler.go +++ b/messages/teleporter/message_handler.go @@ -13,11 +13,11 @@ import ( "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/vms/platformvm/warp" warpPayload "github.com/ava-labs/avalanchego/vms/platformvm/warp/payload" - "github.com/ava-labs/awm-relayer/messages" - pbDecider "github.com/ava-labs/awm-relayer/proto/pb/decider" - "github.com/ava-labs/awm-relayer/relayer/config" - "github.com/ava-labs/awm-relayer/utils" - "github.com/ava-labs/awm-relayer/vms" + "github.com/ava-labs/icm-relayer/messages" + pbDecider "github.com/ava-labs/icm-relayer/proto/pb/decider" + "github.com/ava-labs/icm-relayer/relayer/config" + "github.com/ava-labs/icm-relayer/utils" + "github.com/ava-labs/icm-relayer/vms" "github.com/ava-labs/subnet-evm/accounts/abi/bind" "github.com/ava-labs/subnet-evm/core/types" "github.com/ava-labs/subnet-evm/ethclient" diff --git a/messages/teleporter/message_handler_test.go b/messages/teleporter/message_handler_test.go index d25be01e..723bb93e 100644 --- a/messages/teleporter/message_handler_test.go +++ b/messages/teleporter/message_handler_test.go @@ -11,9 +11,9 @@ import ( "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/vms/platformvm/warp" warpPayload "github.com/ava-labs/avalanchego/vms/platformvm/warp/payload" - "github.com/ava-labs/awm-relayer/relayer/config" - mock_evm "github.com/ava-labs/awm-relayer/vms/evm/mocks" - mock_vms "github.com/ava-labs/awm-relayer/vms/mocks" + "github.com/ava-labs/icm-relayer/relayer/config" + mock_evm "github.com/ava-labs/icm-relayer/vms/evm/mocks" + mock_vms "github.com/ava-labs/icm-relayer/vms/mocks" "github.com/ava-labs/subnet-evm/accounts/abi/bind" "github.com/ava-labs/subnet-evm/interfaces" teleportermessenger "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/TeleporterMessenger" diff --git a/peers/app_request_network.go b/peers/app_request_network.go index f5673214..16e6dd9d 100644 --- a/peers/app_request_network.go +++ b/peers/app_request_network.go @@ -22,7 +22,7 @@ import ( "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/utils/set" "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/awm-relayer/peers/validators" + "github.com/ava-labs/icm-relayer/peers/validators" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" ) diff --git a/peers/config.go b/peers/config.go index 4749d18a..400377d8 100644 --- a/peers/config.go +++ b/peers/config.go @@ -3,7 +3,7 @@ package peers -import "github.com/ava-labs/awm-relayer/config" +import "github.com/ava-labs/icm-relayer/config" // Config defines a common interface necessary for standing up an AppRequestNetwork. type Config interface { diff --git a/peers/info_client.go b/peers/info_client.go index bf6ea091..8e33373a 100644 --- a/peers/info_client.go +++ b/peers/info_client.go @@ -11,8 +11,8 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/rpc" "github.com/ava-labs/avalanchego/vms/platformvm/signer" - "github.com/ava-labs/awm-relayer/config" - "github.com/ava-labs/awm-relayer/peers/utils" + "github.com/ava-labs/icm-relayer/config" + "github.com/ava-labs/icm-relayer/peers/utils" ) // InfoAPI is a wrapper around the info.Client, diff --git a/peers/mocks/mock_app_request_network.go b/peers/mocks/mock_app_request_network.go index db7cedd6..bed51645 100644 --- a/peers/mocks/mock_app_request_network.go +++ b/peers/mocks/mock_app_request_network.go @@ -16,7 +16,7 @@ import ( message "github.com/ava-labs/avalanchego/message" subnets "github.com/ava-labs/avalanchego/subnets" set "github.com/ava-labs/avalanchego/utils/set" - peers "github.com/ava-labs/awm-relayer/peers" + peers "github.com/ava-labs/icm-relayer/peers" gomock "go.uber.org/mock/gomock" ) diff --git a/peers/utils/utils.go b/peers/utils/utils.go index e8636210..e97c1d55 100644 --- a/peers/utils/utils.go +++ b/peers/utils/utils.go @@ -5,7 +5,7 @@ package utils import ( "github.com/ava-labs/avalanchego/utils/rpc" - "github.com/ava-labs/awm-relayer/config" + "github.com/ava-labs/icm-relayer/config" ) // InitializeOptions initializes the rpc options for an API diff --git a/peers/validators/canonical_validator_client.go b/peers/validators/canonical_validator_client.go index 4d51e1c3..fc30eb4c 100644 --- a/peers/validators/canonical_validator_client.go +++ b/peers/validators/canonical_validator_client.go @@ -12,8 +12,8 @@ import ( "github.com/ava-labs/avalanchego/utils/rpc" "github.com/ava-labs/avalanchego/vms/platformvm" avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/awm-relayer/config" - "github.com/ava-labs/awm-relayer/peers/utils" + "github.com/ava-labs/icm-relayer/config" + "github.com/ava-labs/icm-relayer/peers/utils" "go.uber.org/zap" ) diff --git a/proto/buf.yaml b/proto/buf.yaml index b8901085..a9f92393 100644 --- a/proto/buf.yaml +++ b/proto/buf.yaml @@ -1,5 +1,5 @@ version: v1 -name: buf.build/ava-labs/awm-relayer +name: buf.build/ava-labs/icm-relayer breaking: use: - FILE diff --git a/proto/decider/decider.proto b/proto/decider/decider.proto index 3ba61efa..e2cc8b1d 100644 --- a/proto/decider/decider.proto +++ b/proto/decider/decider.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package decider; -option go_package = "github.com/ava-labs/awm-relayer/proto/pb/decider"; +option go_package = "github.com/ava-labs/icm-relayer/proto/pb/decider"; service DeciderService { rpc ShouldSendMessage(ShouldSendMessageRequest) returns (ShouldSendMessageResponse); diff --git a/relayer/.goreleaser.yml b/relayer/.goreleaser.yml index d86ab79f..e6b3ce8e 100644 --- a/relayer/.goreleaser.yml +++ b/relayer/.goreleaser.yml @@ -1,11 +1,11 @@ # ref. https://goreleaser.com/customization/build/ -project_name: awm-relayer +project_name: icm-relayer monorepo: - tag_prefix: awm-relayer/ + tag_prefix: icm-relayer/ builds: - - id: awm-relayer + - id: icm-relayer main: ./relayer/main/main.go - binary: awm-relayer + binary: icm-relayer flags: - -v # windows is ignored by default, as the `goos` field by default only @@ -33,14 +33,14 @@ builds: goarch: amd64 dockers: - image_templates: - - 'avaplatform/awm-relayer:{{ .Tag }}-amd64' + - 'avaplatform/icm-relayer:{{ .Tag }}-amd64' use: buildx build_flag_templates: - "--pull" - "--platform=linux/amd64" dockerfile: "relayer/Dockerfile" - image_templates: - - 'avaplatform/awm-relayer:{{ .Tag }}-arm64' + - 'avaplatform/icm-relayer:{{ .Tag }}-arm64' use: buildx build_flag_templates: - "--pull" @@ -48,14 +48,14 @@ dockers: dockerfile: "relayer/Dockerfile" goarch: arm64 docker_manifests: - - name_template: 'avaplatform/awm-relayer:{{ .Tag }}' + - name_template: 'avaplatform/icm-relayer:{{ .Tag }}' image_templates: - - 'avaplatform/awm-relayer:{{ .Tag }}-amd64' - - 'avaplatform/awm-relayer:{{ .Tag }}-arm64' - - name_template: 'avaplatform/awm-relayer:latest' + - 'avaplatform/icm-relayer:{{ .Tag }}-amd64' + - 'avaplatform/icm-relayer:{{ .Tag }}-arm64' + - name_template: 'avaplatform/icm-relayer:latest' image_templates: - - 'avaplatform/awm-relayer:{{ .Tag }}-amd64' - - 'avaplatform/awm-relayer:{{ .Tag }}-arm64' + - 'avaplatform/icm-relayer:{{ .Tag }}-amd64' + - 'avaplatform/icm-relayer:{{ .Tag }}-arm64' # If tag is an rc, do not push the latest tag skip_push: auto release: @@ -63,6 +63,6 @@ release: # Default is extracted from the origin remote URL or empty if its private hosted. github: owner: ava-labs - name: awm-relayer + name: icm-relayer # If tag indicates rc, will mark it as prerelease prerelease: auto diff --git a/relayer/Dockerfile b/relayer/Dockerfile index fdaf71b2..20962973 100644 --- a/relayer/Dockerfile +++ b/relayer/Dockerfile @@ -1,7 +1,7 @@ FROM debian:12-slim RUN apt update && apt --yes install ca-certificates -COPY awm-relayer /usr/bin/awm-relayer +COPY icm-relayer /usr/bin/icm-relayer EXPOSE 8080 USER 1001 CMD ["start"] -ENTRYPOINT [ "/usr/bin/awm-relayer" ] +ENTRYPOINT [ "/usr/bin/icm-relayer" ] diff --git a/relayer/README.md b/relayer/README.md index a6eff0a0..fe5acbbf 100644 --- a/relayer/README.md +++ b/relayer/README.md @@ -12,35 +12,35 @@ To get started easily, we provide a Dev Container specification, that can be use ### Download Prebuilt Binaries -Prebuilt binaries are available for download from the [releases page](https://github.com/ava-labs/awm-relayer/releases). +Prebuilt binaries are available for download from the [releases page](https://github.com/ava-labs/icm-relayer/releases). The following commands demonstrate how to download and install the v0.2.13 release of the relayer on MacOS. The exact commands will vary by platform. ```bash # Download the release tarball and checksums -curl -w '%{http_code}' -sL -o ~/Downloads/awm-relayer_0.2.13_darwin_arm64.tar.gz https://github.com/ava-labs/awm-relayer/releases/download/v0.2.13/awm-relayer_0.2.13_darwin_arm64.tar.gz -curl -w '%{http_code}' -sL -o ~/Downloads/awm-relayer_0.2.13_checksums.txt https://github.com/ava-labs/awm-relayer/releases/download/v0.2.13/awm-relayer_0.2.13_checksums.txt +curl -w '%{http_code}' -sL -o ~/Downloads/icm-relayer_0.2.13_darwin_arm64.tar.gz https://github.com/ava-labs/icm-relayer/releases/download/v0.2.13/icm-relayer_0.2.13_darwin_arm64.tar.gz +curl -w '%{http_code}' -sL -o ~/Downloads/icm-relayer_0.2.13_checksums.txt https://github.com/ava-labs/icm-relayer/releases/download/v0.2.13/icm-relayer_0.2.13_checksums.txt # (Optional) Verify the checksums cd ~/Downloads # Confirm that the following two commands output the same checksum -grep "awm-relayer_0.2.13_darwin_arm64.tar.gz" "awm-relayer_0.2.13_checksums.txt" 2>/dev/null -shasum -a 256 "awm-relayer_0.2.13_darwin_arm64.tar.gz" 2>/dev/null +grep "icm-relayer_0.2.13_darwin_arm64.tar.gz" "icm-relayer_0.2.13_checksums.txt" 2>/dev/null +shasum -a 256 "icm-relayer_0.2.13_darwin_arm64.tar.gz" 2>/dev/null # Extract the tarball and install the relayer binary -tar -xzf awm-relayer_0.2.13_darwin_arm64.tar.gz -sudo install awm-relayer /usr/local/bin +tar -xzf icm-relayer_0.2.13_darwin_arm64.tar.gz +sudo install icm-relayer /usr/local/bin ``` _Note:_ If downloading the binaries through a browser on MacOS, the browser may mark the binary as quarantined since it has not been verified through the App Store. To remove the quarantine, run the following command: ```bash -xattr -d com.apple.quarantine /usr/local/bin/awm-relayer +xattr -d com.apple.quarantine /usr/local/bin/icm-relayer ``` ### Download Docker Image -The published Docker image can be pulled from `avaplatform/awm-relayer:latest` on dockerhub. +The published Docker image can be pulled from `avaplatform/icm-relayer:latest` on dockerhub. ### Build from Source @@ -92,9 +92,9 @@ The Fuji and Mainnet [public API nodes](https://docs.avax.network/tooling/rpc-pr The relayer binary accepts the following command line options. Other configuration options are not supported via the command line and must be provided via the configuration JSON file or environment variable. ```bash -awm-relayer --config-file path-to-config Specifies the relayer config file and begin relaying messages. -awm-relayer --version Display awm-relayer version and exit. -awm-relayer --help Display awm-relayer usage and exit. +icm-relayer --config-file path-to-config Specifies the relayer config file and begin relaying messages. +icm-relayer --version Display icm-relayer version and exit. +icm-relayer --help Display icm-relayer usage and exit. ``` ### Initialize the repository @@ -169,7 +169,7 @@ The relayer is configured via a JSON file, the path to which is passed in via th `"storage-location": string` -- The path to the directory in which the relayer will store its state. Defaults to `./awm-relayer-storage`. +- The path to the directory in which the relayer will store its state. Defaults to `./icm-relayer-storage`. `"redis-url": string` @@ -435,7 +435,7 @@ go generate ./... ### Generate Protobuf Files -[buf](github.com/bufbuild/buf/) is used to generate protobuf definitions for communication with the [Decider service](https://github.com/ava-labs/awm-relayer/blob/main/proto/decider/decider.proto). If you change any of the protobuf definitions you will have to regenerate the `.go` files. To generate these files, run the following command at the root of the project: +[buf](github.com/bufbuild/buf/) is used to generate protobuf definitions for communication with the [Decider service](https://github.com/ava-labs/icm-relayer/blob/main/proto/decider/decider.proto). If you change any of the protobuf definitions you will have to regenerate the `.go` files. To generate these files, run the following command at the root of the project: ```bash ./scripts/protobuf_codegen.sh diff --git a/relayer/api/relay_message.go b/relayer/api/relay_message.go index 8b0d479a..f04c1bfc 100644 --- a/relayer/api/relay_message.go +++ b/relayer/api/relay_message.go @@ -6,9 +6,9 @@ import ( "net/http" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/awm-relayer/relayer" - "github.com/ava-labs/awm-relayer/types" - "github.com/ava-labs/awm-relayer/utils" + "github.com/ava-labs/icm-relayer/relayer" + "github.com/ava-labs/icm-relayer/types" + "github.com/ava-labs/icm-relayer/utils" "github.com/ethereum/go-ethereum/common" "go.uber.org/zap" ) diff --git a/relayer/application_relayer.go b/relayer/application_relayer.go index c1c93910..838632f0 100644 --- a/relayer/application_relayer.go +++ b/relayer/application_relayer.go @@ -12,13 +12,13 @@ import ( "github.com/ava-labs/avalanchego/utils/constants" "github.com/ava-labs/avalanchego/utils/logging" avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/awm-relayer/database" - "github.com/ava-labs/awm-relayer/messages" - "github.com/ava-labs/awm-relayer/peers" - "github.com/ava-labs/awm-relayer/relayer/config" - "github.com/ava-labs/awm-relayer/signature-aggregator/aggregator" - "github.com/ava-labs/awm-relayer/utils" - "github.com/ava-labs/awm-relayer/vms" + "github.com/ava-labs/icm-relayer/database" + "github.com/ava-labs/icm-relayer/messages" + "github.com/ava-labs/icm-relayer/peers" + "github.com/ava-labs/icm-relayer/relayer/config" + "github.com/ava-labs/icm-relayer/signature-aggregator/aggregator" + "github.com/ava-labs/icm-relayer/utils" + "github.com/ava-labs/icm-relayer/vms" "github.com/ava-labs/subnet-evm/rpc" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" diff --git a/relayer/checkpoint/checkpoint.go b/relayer/checkpoint/checkpoint.go index 6df59338..e4c9b3be 100644 --- a/relayer/checkpoint/checkpoint.go +++ b/relayer/checkpoint/checkpoint.go @@ -9,8 +9,8 @@ import ( "sync" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/awm-relayer/database" - "github.com/ava-labs/awm-relayer/utils" + "github.com/ava-labs/icm-relayer/database" + "github.com/ava-labs/icm-relayer/utils" "go.uber.org/zap" ) diff --git a/relayer/checkpoint/checkpoint_test.go b/relayer/checkpoint/checkpoint_test.go index 155616a9..f3b354e8 100644 --- a/relayer/checkpoint/checkpoint_test.go +++ b/relayer/checkpoint/checkpoint_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/awm-relayer/database" - mock_database "github.com/ava-labs/awm-relayer/database/mocks" - "github.com/ava-labs/awm-relayer/utils" + "github.com/ava-labs/icm-relayer/database" + mock_database "github.com/ava-labs/icm-relayer/database/mocks" + "github.com/ava-labs/icm-relayer/utils" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" "github.com/stretchr/testify/require" diff --git a/relayer/config/config.go b/relayer/config/config.go index 3f643dd2..87923edc 100644 --- a/relayer/config/config.go +++ b/relayer/config/config.go @@ -10,8 +10,8 @@ import ( "net/url" "time" - basecfg "github.com/ava-labs/awm-relayer/config" - "github.com/ava-labs/awm-relayer/peers" + basecfg "github.com/ava-labs/icm-relayer/config" + "github.com/ava-labs/icm-relayer/peers" "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/constants" @@ -33,7 +33,7 @@ const ( ) const ( - defaultStorageLocation = "./.awm-relayer-storage" + defaultStorageLocation = "./.icm-relayer-storage" defaultProcessMissedBlocks = true defaultAPIPort = uint16(8080) defaultMetricsPort = uint16(9090) @@ -45,9 +45,9 @@ var defaultLogLevel = logging.Info.String() const usageText = ` Usage: -awm-relayer --config-file path-to-config Specifies the relayer config file and begin relaying messages. -awm-relayer --version Display awm-relayer version and exit. -awm-relayer --help Display awm-relayer usage and exit. +icm-relayer --config-file path-to-config Specifies the relayer config file and begin relaying messages. +icm-relayer --version Display icm-relayer version and exit. +icm-relayer --help Display icm-relayer usage and exit. ` var errFailedToGetWarpQuorum = errors.New("failed to get warp quorum") diff --git a/relayer/config/config_test.go b/relayer/config/config_test.go index 06f54248..d4800d96 100644 --- a/relayer/config/config_test.go +++ b/relayer/config/config_test.go @@ -12,9 +12,9 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/set" - basecfg "github.com/ava-labs/awm-relayer/config" - "github.com/ava-labs/awm-relayer/utils" - mock_ethclient "github.com/ava-labs/awm-relayer/vms/evm/mocks" + basecfg "github.com/ava-labs/icm-relayer/config" + "github.com/ava-labs/icm-relayer/utils" + mock_ethclient "github.com/ava-labs/icm-relayer/vms/evm/mocks" "github.com/ava-labs/subnet-evm/params" "github.com/ava-labs/subnet-evm/precompile/contracts/warp" "github.com/stretchr/testify/require" diff --git a/relayer/config/destination_blockchain.go b/relayer/config/destination_blockchain.go index 2e0c9eb1..a17064a9 100644 --- a/relayer/config/destination_blockchain.go +++ b/relayer/config/destination_blockchain.go @@ -6,8 +6,8 @@ import ( "fmt" "github.com/ava-labs/avalanchego/ids" - basecfg "github.com/ava-labs/awm-relayer/config" - "github.com/ava-labs/awm-relayer/utils" + basecfg "github.com/ava-labs/icm-relayer/config" + "github.com/ava-labs/icm-relayer/utils" "github.com/ethereum/go-ethereum/crypto" ) diff --git a/relayer/config/flags.go b/relayer/config/flags.go index 09f5aeb1..16a647f3 100644 --- a/relayer/config/flags.go +++ b/relayer/config/flags.go @@ -6,9 +6,9 @@ package config import "github.com/spf13/pflag" func BuildFlagSet() *pflag.FlagSet { - fs := pflag.NewFlagSet("awm-relayer", pflag.ContinueOnError) - fs.String(ConfigFileKey, "", "Specifies the relayer config file") - fs.BoolP(VersionKey, "", false, "Display awm-relayer version") - fs.BoolP(HelpKey, "", false, "Display awm-relayer usage") + fs := pflag.NewFlagSet("icm-relayer", pflag.ContinueOnError) + fs.String(ConfigFileKey, "", "Specifies the icm-relayer config file") + fs.BoolP(VersionKey, "", false, "Display icm-relayer version") + fs.BoolP(HelpKey, "", false, "Display icm-relayer usage") return fs } diff --git a/relayer/config/source_blockchain.go b/relayer/config/source_blockchain.go index 22d42319..ef637751 100644 --- a/relayer/config/source_blockchain.go +++ b/relayer/config/source_blockchain.go @@ -5,8 +5,8 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/set" - basecfg "github.com/ava-labs/awm-relayer/config" - "github.com/ava-labs/awm-relayer/utils" + basecfg "github.com/ava-labs/icm-relayer/config" + "github.com/ava-labs/icm-relayer/utils" "github.com/ethereum/go-ethereum/common" ) diff --git a/relayer/config/test_utils.go b/relayer/config/test_utils.go index db9955dd..3608f51e 100644 --- a/relayer/config/test_utils.go +++ b/relayer/config/test_utils.go @@ -5,7 +5,7 @@ package config import ( "fmt" - basecfg "github.com/ava-labs/awm-relayer/config" + basecfg "github.com/ava-labs/icm-relayer/config" ) var ( diff --git a/relayer/config/viper.go b/relayer/config/viper.go index 4e0e279b..fe28cd0a 100644 --- a/relayer/config/viper.go +++ b/relayer/config/viper.go @@ -8,7 +8,7 @@ import ( "os" "strings" - "github.com/ava-labs/awm-relayer/utils" + "github.com/ava-labs/icm-relayer/utils" "github.com/spf13/pflag" "github.com/spf13/viper" ) diff --git a/relayer/config/viper_test.go b/relayer/config/viper_test.go index ae45067d..31d3bf16 100644 --- a/relayer/config/viper_test.go +++ b/relayer/config/viper_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - basecfg "github.com/ava-labs/awm-relayer/config" + basecfg "github.com/ava-labs/icm-relayer/config" "github.com/spf13/viper" "github.com/stretchr/testify/require" diff --git a/relayer/listener.go b/relayer/listener.go index 379af75f..5b9132db 100644 --- a/relayer/listener.go +++ b/relayer/listener.go @@ -11,9 +11,9 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/awm-relayer/relayer/config" - "github.com/ava-labs/awm-relayer/utils" - "github.com/ava-labs/awm-relayer/vms" + "github.com/ava-labs/icm-relayer/relayer/config" + "github.com/ava-labs/icm-relayer/utils" + "github.com/ava-labs/icm-relayer/vms" "github.com/ava-labs/subnet-evm/ethclient" "go.uber.org/atomic" "go.uber.org/zap" diff --git a/relayer/main/main.go b/relayer/main/main.go index da4a3d41..7c34b057 100644 --- a/relayer/main/main.go +++ b/relayer/main/main.go @@ -18,19 +18,19 @@ import ( "github.com/ava-labs/avalanchego/utils/constants" "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/utils/set" - "github.com/ava-labs/awm-relayer/database" - "github.com/ava-labs/awm-relayer/messages" - offchainregistry "github.com/ava-labs/awm-relayer/messages/off-chain-registry" - "github.com/ava-labs/awm-relayer/messages/teleporter" - "github.com/ava-labs/awm-relayer/peers" - "github.com/ava-labs/awm-relayer/relayer" - "github.com/ava-labs/awm-relayer/relayer/api" - "github.com/ava-labs/awm-relayer/relayer/checkpoint" - "github.com/ava-labs/awm-relayer/relayer/config" - "github.com/ava-labs/awm-relayer/signature-aggregator/aggregator" - sigAggMetrics "github.com/ava-labs/awm-relayer/signature-aggregator/metrics" - "github.com/ava-labs/awm-relayer/utils" - "github.com/ava-labs/awm-relayer/vms" + "github.com/ava-labs/icm-relayer/database" + "github.com/ava-labs/icm-relayer/messages" + offchainregistry "github.com/ava-labs/icm-relayer/messages/off-chain-registry" + "github.com/ava-labs/icm-relayer/messages/teleporter" + "github.com/ava-labs/icm-relayer/peers" + "github.com/ava-labs/icm-relayer/relayer" + "github.com/ava-labs/icm-relayer/relayer/api" + "github.com/ava-labs/icm-relayer/relayer/checkpoint" + "github.com/ava-labs/icm-relayer/relayer/config" + "github.com/ava-labs/icm-relayer/signature-aggregator/aggregator" + sigAggMetrics "github.com/ava-labs/icm-relayer/signature-aggregator/metrics" + "github.com/ava-labs/icm-relayer/utils" + "github.com/ava-labs/icm-relayer/vms" "github.com/ava-labs/subnet-evm/ethclient" "github.com/ethereum/go-ethereum/common" "github.com/prometheus/client_golang/prometheus" @@ -90,7 +90,7 @@ func main() { } logger := logging.NewLogger( - "awm-relayer", + "icm-relayer", logging.NewWrappedCore( logLevel, os.Stdout, @@ -98,7 +98,7 @@ func main() { ), ) - logger.Info("Initializing awm-relayer") + logger.Info("Initializing icm-relayer") overwrittenLog := "" if cfg.HasOverwrittenOptions() { overwrittenLog = fmt.Sprintf(" Some options were overwritten: %s", strings.Join(cfg.GetOverwrittenOptions(), ", ")) diff --git a/relayer/message_coordinator.go b/relayer/message_coordinator.go index acf7317d..6e704e98 100644 --- a/relayer/message_coordinator.go +++ b/relayer/message_coordinator.go @@ -11,9 +11,9 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/awm-relayer/database" - "github.com/ava-labs/awm-relayer/messages" - relayerTypes "github.com/ava-labs/awm-relayer/types" + "github.com/ava-labs/icm-relayer/database" + "github.com/ava-labs/icm-relayer/messages" + relayerTypes "github.com/ava-labs/icm-relayer/types" "github.com/ava-labs/subnet-evm/core/types" "github.com/ava-labs/subnet-evm/ethclient" "github.com/ava-labs/subnet-evm/interfaces" diff --git a/relayer/network_utils.go b/relayer/network_utils.go index fc1e925a..1567f031 100644 --- a/relayer/network_utils.go +++ b/relayer/network_utils.go @@ -10,9 +10,9 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/constants" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/awm-relayer/peers" - "github.com/ava-labs/awm-relayer/relayer/config" - "github.com/ava-labs/awm-relayer/utils" + "github.com/ava-labs/icm-relayer/peers" + "github.com/ava-labs/icm-relayer/relayer/config" + "github.com/ava-labs/icm-relayer/utils" "go.uber.org/zap" ) diff --git a/scripts/build_local_image.sh b/scripts/build_local_image.sh index ca98e39a..f9571cf7 100755 --- a/scripts/build_local_image.sh +++ b/scripts/build_local_image.sh @@ -20,7 +20,7 @@ full_commit_hash="$(git --git-dir="$RELAYER_PATH/.git" rev-parse HEAD)" commit_hash="${full_commit_hash::8}" ./scripts/build.sh -cp $RELAYER_PATH/build/awm-relayer $RELAYER_PATH/awm-relayer +cp $RELAYER_PATH/build/icm-relayer $RELAYER_PATH/icm-relayer echo "Building Docker Image with tags: $relayer_dockerhub_repo:$commit_hash , $relayer_dockerhub_repo:$current_branch" docker build -t "$relayer_dockerhub_repo:$commit_hash" \ @@ -28,4 +28,4 @@ docker build -t "$relayer_dockerhub_repo:$commit_hash" \ "$RELAYER_PATH" -f "$RELAYER_PATH/Dockerfile" \ --build-arg GO_VERSION=$GO_VERSION -rm $RELAYER_PATH/awm-relayer \ No newline at end of file +rm $RELAYER_PATH/icm-relayer \ No newline at end of file diff --git a/scripts/build_relayer.sh b/scripts/build_relayer.sh index e57f283b..1ea81bb9 100755 --- a/scripts/build_relayer.sh +++ b/scripts/build_relayer.sh @@ -39,7 +39,7 @@ source "$BASE_PATH"/scripts/constants.sh go_version_minimum=$GO_VERSION if version_lt "$(go_version)" "$go_version_minimum"; then - echo "awm-relayer requires Go >= $go_version_minimum, Go $(go_version) found." >&2 + echo "icm-relayer requires Go >= $go_version_minimum, Go $(go_version) found." >&2 exit 1 fi @@ -48,7 +48,7 @@ if [[ $# -eq 1 ]]; then elif [[ $# -eq 0 ]]; then binary_path=$relayer_path else - echo "Invalid arguments to build awm-relayer. Requires zero (default location) or one argument to specify binary location." + echo "Invalid arguments to build icm-relayer. Requires zero (default location) or one argument to specify binary location." exit 1 fi diff --git a/scripts/constants.sh b/scripts/constants.sh index 752f2d18..e0be0bc3 100755 --- a/scripts/constants.sh +++ b/scripts/constants.sh @@ -21,7 +21,7 @@ SIGNATURE_AGGREGATOR_PATH=$( ) # Where binaries go -relayer_path="$BASE_PATH/build/awm-relayer" +relayer_path="$BASE_PATH/build/icm-relayer" signature_aggregator_path="$BASE_PATH/build/signature-aggregator" # Set the PATHS @@ -30,10 +30,10 @@ GOPATH="$(go env GOPATH)" TELEPORTER_PATH="$BASE_PATH"/tests/contracts/lib/teleporter source $TELEPORTER_PATH/scripts/constants.sh -# Avalabs docker hub repo is avaplatform/awm-relayer. -# Here we default to the local image (awm-relayer) as to avoid unintentional pushes -# You should probably set it - export DOCKER_REPO='avaplatform/awm-relayer' -relayer_dockerhub_repo=${DOCKER_REPO:-"awm-relayer"} +# Avalabs docker hub repo is avaplatform/icm-relayer. +# Here we default to the local image (icm-relayer) as to avoid unintentional pushes +# You should probably set it - export DOCKER_REPO='avaplatform/icm-relayer' +relayer_dockerhub_repo=${DOCKER_REPO:-"icm-relayer"} # Current branch current_branch=$(git symbolic-ref -q --short HEAD || git describe --tags --exact-match || true) diff --git a/signature-aggregator/.goreleaser.yml b/signature-aggregator/.goreleaser.yml index 85afc2c9..ae45d1f9 100644 --- a/signature-aggregator/.goreleaser.yml +++ b/signature-aggregator/.goreleaser.yml @@ -63,6 +63,6 @@ release: # Default is extracted from the origin remote URL or empty if its private hosted. github: owner: ava-labs - name: awm-relayer + name: icm-relayer # If tag indicates rc, will mark it as prerelease prerelease: auto diff --git a/signature-aggregator/README.md b/signature-aggregator/README.md index 8970b29b..d94088b1 100644 --- a/signature-aggregator/README.md +++ b/signature-aggregator/README.md @@ -1,7 +1,7 @@ # Signature Aggregator This directory contains a lightweight stand-alone API for requesting signatures for a Warp message from Subnet validators. -It is also used by `awm-relayer` for gathering signatures when configured to use AppRequest instead of the Warp signature RPC client. +It is also used by `icm-relayer` for gathering signatures when configured to use AppRequest instead of the Warp signature RPC client. ## Building @@ -10,7 +10,7 @@ To build the application run `scripts/build_signature_aggregator.sh` which will ## Running To run the binary you must supply a config file via `./signature-aggregator --config-file` -Currently required configurations are a small subset of the [`awm-relayer` configuration](https://github.com/ava-labs/awm-relayer?tab=readme-ov-file#configuration). +Currently required configurations are a small subset of the [`icm-relayer` configuration](https://github.com/ava-labs/icm-relayer?tab=readme-ov-file#configuration). Namely: - `LogLevel`: string diff --git a/signature-aggregator/aggregator/aggregator.go b/signature-aggregator/aggregator/aggregator.go index 7d2b9b01..5f6f3da3 100644 --- a/signature-aggregator/aggregator/aggregator.go +++ b/signature-aggregator/aggregator/aggregator.go @@ -25,11 +25,11 @@ import ( "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/utils/set" avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/awm-relayer/peers" - "github.com/ava-labs/awm-relayer/signature-aggregator/aggregator/cache" - "github.com/ava-labs/awm-relayer/signature-aggregator/metrics" - "github.com/ava-labs/awm-relayer/utils" corethMsg "github.com/ava-labs/coreth/plugin/evm/message" + "github.com/ava-labs/icm-relayer/peers" + "github.com/ava-labs/icm-relayer/signature-aggregator/aggregator/cache" + "github.com/ava-labs/icm-relayer/signature-aggregator/metrics" + "github.com/ava-labs/icm-relayer/utils" msg "github.com/ava-labs/subnet-evm/plugin/evm/message" "go.uber.org/zap" "google.golang.org/protobuf/proto" diff --git a/signature-aggregator/aggregator/aggregator_test.go b/signature-aggregator/aggregator/aggregator_test.go index 03273145..41e3ad7d 100644 --- a/signature-aggregator/aggregator/aggregator_test.go +++ b/signature-aggregator/aggregator/aggregator_test.go @@ -18,9 +18,9 @@ import ( "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/utils/set" "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/awm-relayer/peers" - "github.com/ava-labs/awm-relayer/peers/mocks" - "github.com/ava-labs/awm-relayer/signature-aggregator/metrics" + "github.com/ava-labs/icm-relayer/peers" + "github.com/ava-labs/icm-relayer/peers/mocks" + "github.com/ava-labs/icm-relayer/signature-aggregator/metrics" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/signature-aggregator/api/api.go b/signature-aggregator/api/api.go index 939afc99..e0da4ca6 100644 --- a/signature-aggregator/api/api.go +++ b/signature-aggregator/api/api.go @@ -12,10 +12,10 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/awm-relayer/signature-aggregator/aggregator" - "github.com/ava-labs/awm-relayer/signature-aggregator/metrics" - "github.com/ava-labs/awm-relayer/types" - "github.com/ava-labs/awm-relayer/utils" + "github.com/ava-labs/icm-relayer/signature-aggregator/aggregator" + "github.com/ava-labs/icm-relayer/signature-aggregator/metrics" + "github.com/ava-labs/icm-relayer/types" + "github.com/ava-labs/icm-relayer/utils" "go.uber.org/zap" ) diff --git a/signature-aggregator/config/config.go b/signature-aggregator/config/config.go index ec6d570e..09b46ed4 100644 --- a/signature-aggregator/config/config.go +++ b/signature-aggregator/config/config.go @@ -8,8 +8,8 @@ import ( "time" "github.com/ava-labs/avalanchego/utils/logging" - basecfg "github.com/ava-labs/awm-relayer/config" - "github.com/ava-labs/awm-relayer/peers" + basecfg "github.com/ava-labs/icm-relayer/config" + "github.com/ava-labs/icm-relayer/peers" ) const ( diff --git a/signature-aggregator/main/main.go b/signature-aggregator/main/main.go index 829f8600..3194ac93 100644 --- a/signature-aggregator/main/main.go +++ b/signature-aggregator/main/main.go @@ -13,12 +13,12 @@ import ( "github.com/ava-labs/avalanchego/message" "github.com/ava-labs/avalanchego/utils/constants" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/awm-relayer/peers" - "github.com/ava-labs/awm-relayer/signature-aggregator/aggregator" - "github.com/ava-labs/awm-relayer/signature-aggregator/api" - "github.com/ava-labs/awm-relayer/signature-aggregator/config" - "github.com/ava-labs/awm-relayer/signature-aggregator/healthcheck" - "github.com/ava-labs/awm-relayer/signature-aggregator/metrics" + "github.com/ava-labs/icm-relayer/peers" + "github.com/ava-labs/icm-relayer/signature-aggregator/aggregator" + "github.com/ava-labs/icm-relayer/signature-aggregator/api" + "github.com/ava-labs/icm-relayer/signature-aggregator/config" + "github.com/ava-labs/icm-relayer/signature-aggregator/healthcheck" + "github.com/ava-labs/icm-relayer/signature-aggregator/metrics" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" ) diff --git a/tests/allowed_addresses.go b/tests/allowed_addresses.go index f662878c..4f7f8bba 100644 --- a/tests/allowed_addresses.go +++ b/tests/allowed_addresses.go @@ -8,9 +8,9 @@ import ( "time" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/awm-relayer/database" - "github.com/ava-labs/awm-relayer/relayer/config" - testUtils "github.com/ava-labs/awm-relayer/tests/utils" + "github.com/ava-labs/icm-relayer/database" + "github.com/ava-labs/icm-relayer/relayer/config" + testUtils "github.com/ava-labs/icm-relayer/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" "github.com/ava-labs/teleporter/tests/interfaces" "github.com/ava-labs/teleporter/tests/utils" diff --git a/tests/basic_relay.go b/tests/basic_relay.go index ed3aa2f2..6f4a903f 100644 --- a/tests/basic_relay.go +++ b/tests/basic_relay.go @@ -9,8 +9,8 @@ import ( "time" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/awm-relayer/database" - testUtils "github.com/ava-labs/awm-relayer/tests/utils" + "github.com/ava-labs/icm-relayer/database" + testUtils "github.com/ava-labs/icm-relayer/tests/utils" "github.com/ava-labs/subnet-evm/core/types" "github.com/ava-labs/teleporter/tests/interfaces" "github.com/ava-labs/teleporter/tests/utils" @@ -107,7 +107,7 @@ func BasicRelay(network interfaces.LocalNetwork) { // log.Info("Test Relaying Already Delivered Message") logger := logging.NewLogger( - "awm-relayer", + "icm-relayer", logging.NewWrappedCore( logging.Info, os.Stdout, diff --git a/tests/batch_relay.go b/tests/batch_relay.go index b1960a5c..068f0695 100644 --- a/tests/batch_relay.go +++ b/tests/batch_relay.go @@ -8,7 +8,7 @@ import ( "time" "github.com/ava-labs/avalanchego/utils/set" - testUtils "github.com/ava-labs/awm-relayer/tests/utils" + testUtils "github.com/ava-labs/icm-relayer/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" "github.com/ava-labs/subnet-evm/core/types" "github.com/ava-labs/teleporter/tests/interfaces" diff --git a/tests/cmd/decider/main.go b/tests/cmd/decider/main.go index d1486571..723ecd15 100644 --- a/tests/cmd/decider/main.go +++ b/tests/cmd/decider/main.go @@ -1,4 +1,4 @@ -// a CLI command to serve as a gRPC provider of awm-relayer/proto/decider +// a CLI command to serve as a gRPC provider of icm-relayer/proto/decider package main @@ -9,7 +9,7 @@ import ( "log" "net" - pb "github.com/ava-labs/awm-relayer/proto/pb/decider" + pb "github.com/ava-labs/icm-relayer/proto/pb/decider" "google.golang.org/grpc" ) diff --git a/tests/e2e_test.go b/tests/e2e_test.go index 2210d66a..fadfe5ba 100644 --- a/tests/e2e_test.go +++ b/tests/e2e_test.go @@ -15,8 +15,8 @@ import ( "testing" "time" - testUtils "github.com/ava-labs/awm-relayer/tests/utils" - "github.com/ava-labs/awm-relayer/utils" + testUtils "github.com/ava-labs/icm-relayer/tests/utils" + "github.com/ava-labs/icm-relayer/utils" "github.com/ava-labs/teleporter/tests/local" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/log" diff --git a/tests/etna_upgrade.go b/tests/etna_upgrade.go index 02ab768c..54d5e933 100644 --- a/tests/etna_upgrade.go +++ b/tests/etna_upgrade.go @@ -7,7 +7,7 @@ import ( "context" "time" - testUtils "github.com/ava-labs/awm-relayer/tests/utils" + testUtils "github.com/ava-labs/icm-relayer/tests/utils" "github.com/ava-labs/teleporter/tests/interfaces" "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/crypto" diff --git a/tests/manual_message.go b/tests/manual_message.go index b254ad99..c30ee902 100644 --- a/tests/manual_message.go +++ b/tests/manual_message.go @@ -12,9 +12,9 @@ import ( "net/http" "time" - offchainregistry "github.com/ava-labs/awm-relayer/messages/off-chain-registry" - "github.com/ava-labs/awm-relayer/relayer/api" - testUtils "github.com/ava-labs/awm-relayer/tests/utils" + offchainregistry "github.com/ava-labs/icm-relayer/messages/off-chain-registry" + "github.com/ava-labs/icm-relayer/relayer/api" + testUtils "github.com/ava-labs/icm-relayer/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" "github.com/ava-labs/teleporter/tests/interfaces" teleporterTestUtils "github.com/ava-labs/teleporter/tests/utils" diff --git a/tests/relay_message_api.go b/tests/relay_message_api.go index 2c18ed81..dc38d48d 100644 --- a/tests/relay_message_api.go +++ b/tests/relay_message_api.go @@ -14,8 +14,8 @@ import ( "github.com/ava-labs/avalanchego/ids" avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/awm-relayer/relayer/api" - testUtils "github.com/ava-labs/awm-relayer/tests/utils" + "github.com/ava-labs/icm-relayer/relayer/api" + testUtils "github.com/ava-labs/icm-relayer/tests/utils" "github.com/ava-labs/subnet-evm/core/types" subnetEvmInterfaces "github.com/ava-labs/subnet-evm/interfaces" "github.com/ava-labs/subnet-evm/precompile/contracts/warp" diff --git a/tests/shared_db.go b/tests/shared_db.go index 0114dd18..6124419f 100644 --- a/tests/shared_db.go +++ b/tests/shared_db.go @@ -4,7 +4,7 @@ import ( "context" "sync" - testUtils "github.com/ava-labs/awm-relayer/tests/utils" + testUtils "github.com/ava-labs/icm-relayer/tests/utils" "github.com/ava-labs/teleporter/tests/interfaces" "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/crypto" diff --git a/tests/signature_aggregator_api.go b/tests/signature_aggregator_api.go index 2e26855e..e94bd5e3 100644 --- a/tests/signature_aggregator_api.go +++ b/tests/signature_aggregator_api.go @@ -17,9 +17,9 @@ import ( "time" avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/awm-relayer/signature-aggregator/api" - "github.com/ava-labs/awm-relayer/signature-aggregator/metrics" - testUtils "github.com/ava-labs/awm-relayer/tests/utils" + "github.com/ava-labs/icm-relayer/signature-aggregator/api" + "github.com/ava-labs/icm-relayer/signature-aggregator/metrics" + testUtils "github.com/ava-labs/icm-relayer/tests/utils" "github.com/ava-labs/teleporter/tests/interfaces" "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/log" diff --git a/tests/utils/utils.go b/tests/utils/utils.go index 70974a4b..31ecb832 100644 --- a/tests/utils/utils.go +++ b/tests/utils/utils.go @@ -19,12 +19,12 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/awm-relayer/config" - offchainregistry "github.com/ava-labs/awm-relayer/messages/off-chain-registry" - relayercfg "github.com/ava-labs/awm-relayer/relayer/config" - signatureaggregatorcfg "github.com/ava-labs/awm-relayer/signature-aggregator/config" - batchcrosschainmessenger "github.com/ava-labs/awm-relayer/tests/abi-bindings/go/BatchCrossChainMessenger" - relayerUtils "github.com/ava-labs/awm-relayer/utils" + "github.com/ava-labs/icm-relayer/config" + offchainregistry "github.com/ava-labs/icm-relayer/messages/off-chain-registry" + relayercfg "github.com/ava-labs/icm-relayer/relayer/config" + signatureaggregatorcfg "github.com/ava-labs/icm-relayer/signature-aggregator/config" + batchcrosschainmessenger "github.com/ava-labs/icm-relayer/tests/abi-bindings/go/BatchCrossChainMessenger" + relayerUtils "github.com/ava-labs/icm-relayer/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" "github.com/ava-labs/subnet-evm/core/types" teleportermessenger "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/TeleporterMessenger" @@ -38,7 +38,7 @@ import ( ) // Write the test database to /tmp since the data is not needed after the test -var StorageLocation = fmt.Sprintf("%s/.awm-relayer-storage", os.TempDir()) +var StorageLocation = fmt.Sprintf("%s/.icm-relayer-storage", os.TempDir()) const ( DefaultRelayerCfgFname = "relayer-config.json" @@ -59,14 +59,14 @@ func RunRelayerExecutable( relayerConfig relayercfg.Config, ) (context.CancelFunc, chan struct{}) { relayerCtx, relayerCancel := context.WithCancel(ctx) - relayerCmd := exec.CommandContext(relayerCtx, "./build/awm-relayer", "--config-file", relayerConfigPath) + relayerCmd := exec.CommandContext(relayerCtx, "./build/icm-relayer", "--config-file", relayerConfigPath) healthCheckURL := fmt.Sprintf("http://localhost:%d/health", relayerConfig.APIPort) readyChan := runExecutable( relayerCmd, relayerCtx, - "awm-relayer", + "icm-relayer", healthCheckURL, ) return func() { @@ -376,7 +376,7 @@ func WriteRelayerConfig(relayerConfig relayercfg.Config, fname string) string { Expect(err).Should(BeNil()) relayerConfigPath := f.Name() - log.Info("Created awm-relayer config", "configPath", relayerConfigPath, "config", string(data)) + log.Info("Created icm-relayer config", "configPath", relayerConfigPath, "config", string(data)) return relayerConfigPath } diff --git a/tests/warp_api.go b/tests/warp_api.go index 9a374fc2..531e1a55 100644 --- a/tests/warp_api.go +++ b/tests/warp_api.go @@ -13,7 +13,7 @@ import ( "strings" "time" - testUtils "github.com/ava-labs/awm-relayer/tests/utils" + testUtils "github.com/ava-labs/icm-relayer/tests/utils" "github.com/ava-labs/teleporter/tests/interfaces" "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/crypto" diff --git a/types/types.go b/types/types.go index b71a6805..b50e50c4 100644 --- a/types/types.go +++ b/types/types.go @@ -8,7 +8,7 @@ import ( "errors" avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/awm-relayer/utils" + "github.com/ava-labs/icm-relayer/utils" "github.com/ava-labs/subnet-evm/core/types" "github.com/ava-labs/subnet-evm/ethclient" "github.com/ava-labs/subnet-evm/interfaces" diff --git a/vms/contract_message.go b/vms/contract_message.go index a78d6a3a..900cec27 100644 --- a/vms/contract_message.go +++ b/vms/contract_message.go @@ -6,8 +6,8 @@ package vms import ( "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/awm-relayer/relayer/config" - "github.com/ava-labs/awm-relayer/vms/evm" + "github.com/ava-labs/icm-relayer/relayer/config" + "github.com/ava-labs/icm-relayer/vms/evm" ) type ContractMessage interface { diff --git a/vms/destination_client.go b/vms/destination_client.go index fd1cf021..63b6bb49 100644 --- a/vms/destination_client.go +++ b/vms/destination_client.go @@ -11,8 +11,8 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/awm-relayer/relayer/config" - "github.com/ava-labs/awm-relayer/vms/evm" + "github.com/ava-labs/icm-relayer/relayer/config" + "github.com/ava-labs/icm-relayer/vms/evm" "github.com/ethereum/go-ethereum/common" "go.uber.org/zap" ) diff --git a/vms/evm/contract_message.go b/vms/evm/contract_message.go index 1da24b26..d49187ab 100644 --- a/vms/evm/contract_message.go +++ b/vms/evm/contract_message.go @@ -8,7 +8,7 @@ import ( "github.com/ava-labs/avalanchego/utils/logging" avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/awm-relayer/relayer/config" + "github.com/ava-labs/icm-relayer/relayer/config" "github.com/ava-labs/subnet-evm/precompile/contracts/warp" "go.uber.org/zap" ) diff --git a/vms/evm/contract_message_test.go b/vms/evm/contract_message_test.go index 9820f83f..3b46b32b 100644 --- a/vms/evm/contract_message_test.go +++ b/vms/evm/contract_message_test.go @@ -13,7 +13,7 @@ import ( "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/vms/platformvm/warp" warpPayload "github.com/ava-labs/avalanchego/vms/platformvm/warp/payload" - "github.com/ava-labs/awm-relayer/relayer/config" + "github.com/ava-labs/icm-relayer/relayer/config" "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" ) @@ -43,7 +43,7 @@ func createUnsignedMessage() *warp.UnsignedMessage { func TestUnpack(t *testing.T) { logger := logging.NewLogger( - "awm-relayer", + "icm-relayer", logging.NewWrappedCore( logging.Error, os.NewFile(uintptr(syscall.Stdout), "/dev/null"), // write all test logs to /dev/null diff --git a/vms/evm/destination_client.go b/vms/evm/destination_client.go index e7f7c124..64246977 100644 --- a/vms/evm/destination_client.go +++ b/vms/evm/destination_client.go @@ -13,9 +13,9 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/logging" avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/awm-relayer/relayer/config" - "github.com/ava-labs/awm-relayer/utils" - "github.com/ava-labs/awm-relayer/vms/evm/signer" + "github.com/ava-labs/icm-relayer/relayer/config" + "github.com/ava-labs/icm-relayer/utils" + "github.com/ava-labs/icm-relayer/vms/evm/signer" "github.com/ava-labs/subnet-evm/core/types" "github.com/ava-labs/subnet-evm/ethclient" "github.com/ava-labs/subnet-evm/precompile/contracts/warp" diff --git a/vms/evm/destination_client_test.go b/vms/evm/destination_client_test.go index b1c067dc..96396e93 100644 --- a/vms/evm/destination_client_test.go +++ b/vms/evm/destination_client_test.go @@ -11,10 +11,10 @@ import ( "github.com/ava-labs/avalanchego/utils/logging" avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" - basecfg "github.com/ava-labs/awm-relayer/config" - "github.com/ava-labs/awm-relayer/relayer/config" - mock_ethclient "github.com/ava-labs/awm-relayer/vms/evm/mocks" - "github.com/ava-labs/awm-relayer/vms/evm/signer" + basecfg "github.com/ava-labs/icm-relayer/config" + "github.com/ava-labs/icm-relayer/relayer/config" + mock_ethclient "github.com/ava-labs/icm-relayer/vms/evm/mocks" + "github.com/ava-labs/icm-relayer/vms/evm/signer" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" ) diff --git a/vms/evm/signer/signer.go b/vms/evm/signer/signer.go index cd1a5a14..c9d2ba12 100644 --- a/vms/evm/signer/signer.go +++ b/vms/evm/signer/signer.go @@ -6,7 +6,7 @@ package signer import ( "math/big" - "github.com/ava-labs/awm-relayer/relayer/config" + "github.com/ava-labs/icm-relayer/relayer/config" "github.com/ava-labs/subnet-evm/core/types" "github.com/ethereum/go-ethereum/common" ) diff --git a/vms/evm/signer/tx_signer.go b/vms/evm/signer/tx_signer.go index a4ebcc40..7d4d1fef 100644 --- a/vms/evm/signer/tx_signer.go +++ b/vms/evm/signer/tx_signer.go @@ -9,7 +9,7 @@ import ( "math/big" "runtime" - "github.com/ava-labs/awm-relayer/utils" + "github.com/ava-labs/icm-relayer/utils" "github.com/ava-labs/subnet-evm/core/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" diff --git a/vms/evm/signer/tx_signer_test.go b/vms/evm/signer/tx_signer_test.go index cba0c03d..9f170b8a 100644 --- a/vms/evm/signer/tx_signer_test.go +++ b/vms/evm/signer/tx_signer_test.go @@ -8,8 +8,8 @@ import ( "math/big" "testing" - "github.com/ava-labs/awm-relayer/relayer/config" - "github.com/ava-labs/awm-relayer/utils" + "github.com/ava-labs/icm-relayer/relayer/config" + "github.com/ava-labs/icm-relayer/utils" "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" ) diff --git a/vms/evm/subscriber_test.go b/vms/evm/subscriber_test.go index 7a72b776..fdf78ae4 100644 --- a/vms/evm/subscriber_test.go +++ b/vms/evm/subscriber_test.go @@ -9,9 +9,9 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/logging" - basecfg "github.com/ava-labs/awm-relayer/config" - "github.com/ava-labs/awm-relayer/relayer/config" - mock_ethclient "github.com/ava-labs/awm-relayer/vms/evm/mocks" + basecfg "github.com/ava-labs/icm-relayer/config" + "github.com/ava-labs/icm-relayer/relayer/config" + mock_ethclient "github.com/ava-labs/icm-relayer/vms/evm/mocks" "github.com/ava-labs/subnet-evm/core/types" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/vms/subscriber.go b/vms/subscriber.go index 91f90e60..108af152 100644 --- a/vms/subscriber.go +++ b/vms/subscriber.go @@ -8,8 +8,8 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/awm-relayer/relayer/config" - "github.com/ava-labs/awm-relayer/vms/evm" + "github.com/ava-labs/icm-relayer/relayer/config" + "github.com/ava-labs/icm-relayer/vms/evm" "github.com/ava-labs/subnet-evm/core/types" "github.com/ava-labs/subnet-evm/ethclient" ) From 7b7d652faf8cfb5926ee24b4a534cb19a05da8c8 Mon Sep 17 00:00:00 2001 From: Ian Suvak Date: Thu, 14 Nov 2024 09:38:03 -0500 Subject: [PATCH 2/8] more renames --- CONTRIBUTING.md | 6 +++--- README.md | 2 +- relayer/README.md | 8 ++++---- relayer/main/main.go | 2 +- scripts/abi_bindings.sh | 16 ++++++++-------- scripts/build_relayer.sh | 4 ++-- scripts/build_signature_aggregator.sh | 2 +- scripts/e2e_test.sh | 2 +- scripts/test.sh | 2 +- tests/e2e_test.go | 2 +- utils/utils.go | 2 +- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 39cb7324..c198e9f3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,14 +1,14 @@ -# How to Contribute to AWM Relayer +# How to Contribute to ICM Relayer ## Setup -To start developing on AWM Relayer, you'll need Golang v1.22.8. +To start developing on ICM Relayer, you'll need Golang v1.22.8. ## Issues ### Security -- Do not open up a GitHub issue if it relates to a security vulnerability in AWM Relayer, and instead refer to our [security policy](./SECURITY.md). +- Do not open up a GitHub issue if it relates to a security vulnerability in ICM Relayer, and instead refer to our [security policy](./SECURITY.md). ### Making an Issue diff --git a/README.md b/README.md index 39b3c191..e288a328 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This repository contains off-chain services that help support Avalanche Intercha Currently implemented applications are -1. [AWM Relayer](relayer/README.md) +1. [ICM Relayer](relayer/README.md) - Full-service cross-chain message delivery application that is configurable to listen to specific source and destination chain pairs and relay messages according to its configured rules. 2. [Signature Aggregator](signature-aggregator/README.md) - Lightweight API that requests and aggregates signatures from validators for any ICM message, and returns a valid signed message that the user can then self-deliver to the intended destination chain. diff --git a/relayer/README.md b/relayer/README.md index fe5acbbf..97793f7b 100644 --- a/relayer/README.md +++ b/relayer/README.md @@ -1,8 +1,8 @@ -# AWM Relayer +# ICM Relayer Reference relayer implementation for cross-chain Avalanche Warp Message delivery. -AWM Relayer listens for Warp message events on a set of source blockchains, and constructs transactions to relay the Warp message to the intended destination blockchain. The relayer does so by querying the source blockchain validator nodes for their BLS signatures on the Warp message, combining the individual BLS signatures into a single aggregate BLS signature, and packaging the aggregate BLS signature into a transaction according to the destination blockchain VM Warp message verification rules. +ICM Relayer listens for Warp message events on a set of source blockchains, and constructs transactions to relay the Warp message to the intended destination blockchain. The relayer does so by querying the source blockchain validator nodes for their BLS signatures on the Warp message, combining the individual BLS signatures into a single aggregate BLS signature, and packaging the aggregate BLS signature into a transaction according to the destination blockchain VM Warp message verification rules. ## Installation @@ -59,7 +59,7 @@ See the [Building](#building) section for instructions on how to build the relay ### API Requirements -- AWM Relayer requires access to Avalanche API nodes for the P-Chain as well as any connected Subnets. The API nodes must have the following methods enabled: +- ICM Relayer requires access to Avalanche API nodes for the P-Chain as well as any connected Subnets. The API nodes must have the following methods enabled: - Each Subnet API node must have enabled: - eth API (RPC and WS) - The P-Chain API node must have enabled: @@ -77,7 +77,7 @@ The Fuji and Mainnet [public API nodes](https://docs.avax.network/tooling/rpc-pr ### Peer-to-Peer Connections -- By default, the AWM relayer implementation gathers BLS signatures from the validators of the source Subnet via peer-to-peer `AppRequest` messages. Validator nodes need to be configured to accept incoming peer connections. Otherwise, the relayer will fail to gather Warp message signatures. For example, networking rules may need to be adjusted to allow traffic on the default AvalancheGo P2P port (9651), or the public IP may need to be manually set in the [node configuration](https://docs.avax.network/nodes/configure/avalanchego-config-flags#public-ip). +- By default, the ICM relayer implementation gathers BLS signatures from the validators of the source Subnet via peer-to-peer `AppRequest` messages. Validator nodes need to be configured to accept incoming peer connections. Otherwise, the relayer will fail to gather Warp message signatures. For example, networking rules may need to be adjusted to allow traffic on the default AvalancheGo P2P port (9651), or the public IP may need to be manually set in the [node configuration](https://docs.avax.network/nodes/configure/avalanchego-config-flags#public-ip). - If configured to use the Warp API (see `warp-api-endpoint` in [Configuration](#configuration)) then aggregate signatures are fetched via a single RPC request, rather than `AppRequests` to individual validators. Note that the Warp API is disabled on the public API. ### Private Key Management diff --git a/relayer/main/main.go b/relayer/main/main.go index 7c34b057..9ffb0dcc 100644 --- a/relayer/main/main.go +++ b/relayer/main/main.go @@ -139,7 +139,7 @@ func main() { } var trackedSubnets set.Set[ids.ID] // trackedSubnets is no longer strictly required but keeping it here for now - // to keep full parity with existing AWM relayer for now + // to keep full parity with existing ICM relayer for now // TODO: remove this from here once trackedSubnets are no longer referenced // by ping messages in avalanchego for _, sourceBlockchain := range cfg.SourceBlockchains { diff --git a/scripts/abi_bindings.sh b/scripts/abi_bindings.sh index 2e91d3e1..75fde5d6 100755 --- a/scripts/abi_bindings.sh +++ b/scripts/abi_bindings.sh @@ -4,13 +4,13 @@ set -e -AWM_RELAYER_PATH=$( +ICM_RELAYER_PATH=$( cd "$(dirname "${BASH_SOURCE[0]}")" cd .. && pwd ) -source $AWM_RELAYER_PATH/scripts/constants.sh -source $AWM_RELAYER_PATH/scripts/versions.sh +source $ICM_RELAYER_PATH/scripts/constants.sh +source $ICM_RELAYER_PATH/scripts/versions.sh source $TELEPORTER_PATH/scripts/utils.sh setARCH @@ -49,7 +49,7 @@ go install github.com/ava-labs/subnet-evm/cmd/abigen@${SUBNET_EVM_VERSION} # Force recompile of all contracts to prevent against using previous # compilations that did not generate new ABI files. echo "Building Contracts" -cd $AWM_RELAYER_PATH/tests/contracts +cd $ICM_RELAYER_PATH/tests/contracts forge build --force --extra-output-files abi bin contract_names=($CONTRACT_LIST) @@ -59,23 +59,23 @@ if [[ -z "${CONTRACT_LIST}" ]]; then contract_names=($DEFAULT_CONTRACT_LIST) fi -cd $AWM_RELAYER_PATH/tests/contracts/src +cd $ICM_RELAYER_PATH/tests/contracts/src for contract_name in "${contract_names[@]}" do path=$(find . -name $contract_name.sol) dir=$(dirname $path) - abi_file=$AWM_RELAYER_PATH/tests/contracts/out/$contract_name.sol/$contract_name.abi.json + abi_file=$ICM_RELAYER_PATH/tests/contracts/out/$contract_name.sol/$contract_name.abi.json if ! [ -f $abi_file ]; then echo "Error: Contract $contract_name abi file not found" exit 1 fi echo "Generating Go bindings for $contract_name..." - gen_path=$AWM_RELAYER_PATH/tests/abi-bindings/go/$dir/$contract_name + gen_path=$ICM_RELAYER_PATH/tests/abi-bindings/go/$dir/$contract_name mkdir -p $gen_path $GOPATH/bin/abigen --abi $abi_file \ --pkg $(convertToLower $contract_name) \ - --bin $AWM_RELAYER_PATH/tests/contracts/out/$contract_name.sol/$contract_name.bin \ + --bin $ICM_RELAYER_PATH/tests/contracts/out/$contract_name.sol/$contract_name.bin \ --type $contract_name \ --out $gen_path/$contract_name.go echo "Done generating Go bindings for $contract_name." diff --git a/scripts/build_relayer.sh b/scripts/build_relayer.sh index 1ea81bb9..447ba1fb 100755 --- a/scripts/build_relayer.sh +++ b/scripts/build_relayer.sh @@ -53,7 +53,7 @@ else fi cd $RELAYER_PATH -# Build AWM Relayer, which is run as a standalone process +# Build ICM Relayer, which is run as a standalone process last_git_tag=$(git describe --tags --abbrev=0 2>/dev/null) || last_git_tag="v0.0.0-dev" -echo "Building AWM Relayer Version: $last_git_tag at $binary_path" +echo "Building ICM Relayer Version: $last_git_tag at $binary_path" go build -ldflags "-X 'main.version=$last_git_tag'" -o "$binary_path" "main/"*.go diff --git a/scripts/build_signature_aggregator.sh b/scripts/build_signature_aggregator.sh index 8e698e8f..57d3daa8 100755 --- a/scripts/build_signature_aggregator.sh +++ b/scripts/build_signature_aggregator.sh @@ -52,7 +52,7 @@ else fi cd $SIGNATURE_AGGREGATOR_PATH -# Build AWM Relayer, which is run as a standalone process +# Build ICM Relayer, which is run as a standalone process last_git_tag=$(git describe --tags --abbrev=0 2>/dev/null) || last_git_tag="v0.0.0-dev" echo "Building Signature Aggregator Version: $last_git_tag at $binary_path" go build -ldflags "-X 'main.version=$last_git_tag'" -o "$binary_path" "main/"*.go diff --git a/scripts/e2e_test.sh b/scripts/e2e_test.sh index 028d2547..c7a6288e 100755 --- a/scripts/e2e_test.sh +++ b/scripts/e2e_test.sh @@ -22,7 +22,7 @@ done if [ "$HELP" = true ]; then echo "Usage: ./scripts/e2e_test.sh [OPTIONS]" - echo "Run E2E tests for AWM Relayer." + echo "Run E2E tests for ICM Relayer." echo "" echo "Options:" echo " -l, --local Run the test locally. Requires --subnet-evm and --data-dir" diff --git a/scripts/test.sh b/scripts/test.sh index 7204adca..aa18a1bb 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -18,7 +18,7 @@ done if [ "$HELP" = true ]; then echo "Usage: ./scripts/test.sh [OPTIONS]" - echo "Run unit tests for AWM Relayer." + echo "Run unit tests for ICM Relayer." echo "" echo "Options:" echo " -v, --verbose Run the test with verbose output" diff --git a/tests/e2e_test.go b/tests/e2e_test.go index fadfe5ba..d10f2733 100644 --- a/tests/e2e_test.go +++ b/tests/e2e_test.go @@ -153,7 +153,7 @@ func cleanup() { var _ = ginkgo.AfterSuite(cleanup) -var _ = ginkgo.Describe("[AWM Relayer Integration Tests", func() { +var _ = ginkgo.Describe("[ICM Relayer Integration Tests", func() { ginkgo.It("Manually Provided Message", func() { ManualMessage(localNetworkInstance) }) diff --git a/utils/utils.go b/utils/utils.go index 7aa51fbc..7dd36f38 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -31,7 +31,7 @@ const ( ) // -// AWM Utils +// ICM Utils // // CheckStakeWeightExceedsThreshold returns true if the accumulated signature weight is at From 985d2143dd209df566f3a77f00c790fefb14fde6 Mon Sep 17 00:00:00 2001 From: Ian Suvak Date: Thu, 14 Nov 2024 15:17:23 -0500 Subject: [PATCH 3/8] rename module to icm-offchain-services --- CONTRIBUTING.md | 6 ++--- database/database.go | 2 +- database/database_test.go | 2 +- database/mocks/mock_database.go | 2 +- database/relayer_id.go | 4 +-- go.mod | 2 +- messages/message_handler.go | 2 +- messages/mocks/mock_message_handler.go | 4 +-- .../off-chain-registry/message_handler.go | 6 ++--- .../message_handler_test.go | 6 ++--- messages/teleporter/message_handler.go | 10 +++---- messages/teleporter/message_handler_test.go | 6 ++--- peers/app_request_network.go | 2 +- peers/config.go | 2 +- peers/info_client.go | 4 +-- peers/mocks/mock_app_request_network.go | 2 +- peers/utils/utils.go | 2 +- .../validators/canonical_validator_client.go | 4 +-- proto/decider/decider.proto | 2 +- proto/pb/decider/decider.pb.go | 9 ++++--- relayer/README.md | 8 +++--- relayer/api/relay_message.go | 6 ++--- relayer/application_relayer.go | 14 +++++----- relayer/checkpoint/checkpoint.go | 4 +-- relayer/checkpoint/checkpoint_test.go | 6 ++--- relayer/config/config.go | 4 +-- relayer/config/config_test.go | 6 ++--- relayer/config/destination_blockchain.go | 4 +-- relayer/config/source_blockchain.go | 4 +-- relayer/config/test_utils.go | 2 +- relayer/config/viper.go | 2 +- relayer/config/viper_test.go | 2 +- relayer/listener.go | 6 ++--- relayer/main/main.go | 26 +++++++++---------- relayer/message_coordinator.go | 6 ++--- relayer/network_utils.go | 6 ++--- signature-aggregator/README.md | 2 +- signature-aggregator/aggregator/aggregator.go | 8 +++--- .../aggregator/aggregator_test.go | 6 ++--- signature-aggregator/api/api.go | 8 +++--- signature-aggregator/config/config.go | 4 +-- signature-aggregator/main/main.go | 12 ++++----- tests/allowed_addresses.go | 6 ++--- tests/basic_relay.go | 4 +-- tests/batch_relay.go | 2 +- tests/cmd/decider/main.go | 2 +- tests/e2e_test.go | 4 +-- tests/etna_upgrade.go | 2 +- tests/manual_message.go | 6 ++--- tests/relay_message_api.go | 4 +-- tests/shared_db.go | 2 +- tests/signature_aggregator_api.go | 6 ++--- tests/utils/utils.go | 12 ++++----- tests/warp_api.go | 2 +- types/types.go | 2 +- vms/contract_message.go | 4 +-- vms/destination_client.go | 4 +-- vms/evm/contract_message.go | 2 +- vms/evm/contract_message_test.go | 2 +- vms/evm/destination_client.go | 6 ++--- vms/evm/destination_client_test.go | 8 +++--- vms/evm/signer/signer.go | 2 +- vms/evm/signer/tx_signer.go | 2 +- vms/evm/signer/tx_signer_test.go | 4 +-- vms/evm/subscriber_test.go | 6 ++--- vms/subscriber.go | 4 +-- 66 files changed, 162 insertions(+), 161 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c198e9f3..8326a9a5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -12,12 +12,12 @@ To start developing on ICM Relayer, you'll need Golang v1.22.8. ### Making an Issue -- Check that the issue you're filing doesn't already exist by searching under [issues](https://github.com/ava-labs/icm-relayer/issues). -- If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/ava-labs/icm-relayer/issues/new/choose). Be sure to include a *title and clear description* with as much relevant information as possible. +- Check that the issue you're filing doesn't already exist by searching under [issues](https://github.com/ava-labs/icm-offchain-services/issues). +- If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/ava-labs/icm-offchain-services/issues/new/choose). Be sure to include a *title and clear description* with as much relevant information as possible. ## Features -- If you want to start a discussion about the development of a new feature or the modification of an existing one, start a thread under GitHub [discussions](https://github.com/ava-labs/icm-relayer/discussions/categories/ideas). +- If you want to start a discussion about the development of a new feature or the modification of an existing one, start a thread under GitHub [discussions](https://github.com/ava-labs/icm-offchain-services/discussions/categories/ideas). - Post a thread about your idea and why it should be added to AWM Relayer. - Don't start working on a pull request until you've received positive feedback from the maintainers. diff --git a/database/database.go b/database/database.go index c3fc0715..0537ec52 100644 --- a/database/database.go +++ b/database/database.go @@ -7,7 +7,7 @@ package database import ( "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/icm-relayer/relayer/config" + "github.com/ava-labs/icm-offchain-services/relayer/config" "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" "go.uber.org/zap" diff --git a/database/database_test.go b/database/database_test.go index 40a2e8cd..093ac1c2 100644 --- a/database/database_test.go +++ b/database/database_test.go @@ -6,7 +6,7 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/set" - "github.com/ava-labs/icm-relayer/relayer/config" + "github.com/ava-labs/icm-offchain-services/relayer/config" "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" "github.com/stretchr/testify/require" diff --git a/database/mocks/mock_database.go b/database/mocks/mock_database.go index cddca722..5f7bb431 100644 --- a/database/mocks/mock_database.go +++ b/database/mocks/mock_database.go @@ -12,7 +12,7 @@ package mocks import ( reflect "reflect" - database "github.com/ava-labs/icm-relayer/database" + database "github.com/ava-labs/icm-offchain-services/database" common "github.com/ethereum/go-ethereum/common" gomock "go.uber.org/mock/gomock" ) diff --git a/database/relayer_id.go b/database/relayer_id.go index 733a75dd..46f135d0 100644 --- a/database/relayer_id.go +++ b/database/relayer_id.go @@ -7,8 +7,8 @@ import ( "strings" "github.com/ava-labs/avalanchego/ids" - "github.com/ava-labs/icm-relayer/relayer/config" - "github.com/ava-labs/icm-relayer/utils" + "github.com/ava-labs/icm-offchain-services/relayer/config" + "github.com/ava-labs/icm-offchain-services/utils" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" ) diff --git a/go.mod b/go.mod index 1740ff52..2e0438d5 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/ava-labs/icm-relayer +module github.com/ava-labs/icm-offchain-services go 1.22.8 diff --git a/messages/message_handler.go b/messages/message_handler.go index 8ebdbe80..b17f107c 100644 --- a/messages/message_handler.go +++ b/messages/message_handler.go @@ -8,7 +8,7 @@ package messages import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/icm-relayer/vms" + "github.com/ava-labs/icm-offchain-services/vms" "github.com/ethereum/go-ethereum/common" ) diff --git a/messages/mocks/mock_message_handler.go b/messages/mocks/mock_message_handler.go index 5321f14b..3925a419 100644 --- a/messages/mocks/mock_message_handler.go +++ b/messages/mocks/mock_message_handler.go @@ -14,8 +14,8 @@ import ( ids "github.com/ava-labs/avalanchego/ids" warp "github.com/ava-labs/avalanchego/vms/platformvm/warp" - messages "github.com/ava-labs/icm-relayer/messages" - vms "github.com/ava-labs/icm-relayer/vms" + messages "github.com/ava-labs/icm-offchain-services/messages" + vms "github.com/ava-labs/icm-offchain-services/vms" common "github.com/ethereum/go-ethereum/common" gomock "go.uber.org/mock/gomock" ) diff --git a/messages/off-chain-registry/message_handler.go b/messages/off-chain-registry/message_handler.go index 15532c15..b8916b92 100644 --- a/messages/off-chain-registry/message_handler.go +++ b/messages/off-chain-registry/message_handler.go @@ -12,9 +12,9 @@ import ( "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/vms/platformvm/warp" warpPayload "github.com/ava-labs/avalanchego/vms/platformvm/warp/payload" - "github.com/ava-labs/icm-relayer/messages" - "github.com/ava-labs/icm-relayer/relayer/config" - "github.com/ava-labs/icm-relayer/vms" + "github.com/ava-labs/icm-offchain-services/messages" + "github.com/ava-labs/icm-offchain-services/relayer/config" + "github.com/ava-labs/icm-offchain-services/vms" "github.com/ava-labs/subnet-evm/accounts/abi/bind" "github.com/ava-labs/subnet-evm/ethclient" teleporterregistry "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/registry/TeleporterRegistry" diff --git a/messages/off-chain-registry/message_handler_test.go b/messages/off-chain-registry/message_handler_test.go index 4b1cd12d..ebd528e1 100644 --- a/messages/off-chain-registry/message_handler_test.go +++ b/messages/off-chain-registry/message_handler_test.go @@ -12,9 +12,9 @@ import ( "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/vms/platformvm/warp" "github.com/ava-labs/avalanchego/vms/platformvm/warp/payload" - "github.com/ava-labs/icm-relayer/relayer/config" - mock_evm "github.com/ava-labs/icm-relayer/vms/evm/mocks" - mock_vms "github.com/ava-labs/icm-relayer/vms/mocks" + "github.com/ava-labs/icm-offchain-services/relayer/config" + mock_evm "github.com/ava-labs/icm-offchain-services/vms/evm/mocks" + mock_vms "github.com/ava-labs/icm-offchain-services/vms/mocks" teleporterregistry "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/registry/TeleporterRegistry" "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" diff --git a/messages/teleporter/message_handler.go b/messages/teleporter/message_handler.go index 2654386c..7a41223b 100644 --- a/messages/teleporter/message_handler.go +++ b/messages/teleporter/message_handler.go @@ -13,11 +13,11 @@ import ( "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/vms/platformvm/warp" warpPayload "github.com/ava-labs/avalanchego/vms/platformvm/warp/payload" - "github.com/ava-labs/icm-relayer/messages" - pbDecider "github.com/ava-labs/icm-relayer/proto/pb/decider" - "github.com/ava-labs/icm-relayer/relayer/config" - "github.com/ava-labs/icm-relayer/utils" - "github.com/ava-labs/icm-relayer/vms" + "github.com/ava-labs/icm-offchain-services/messages" + pbDecider "github.com/ava-labs/icm-offchain-services/proto/pb/decider" + "github.com/ava-labs/icm-offchain-services/relayer/config" + "github.com/ava-labs/icm-offchain-services/utils" + "github.com/ava-labs/icm-offchain-services/vms" "github.com/ava-labs/subnet-evm/accounts/abi/bind" "github.com/ava-labs/subnet-evm/core/types" "github.com/ava-labs/subnet-evm/ethclient" diff --git a/messages/teleporter/message_handler_test.go b/messages/teleporter/message_handler_test.go index 723bb93e..b0e87bf1 100644 --- a/messages/teleporter/message_handler_test.go +++ b/messages/teleporter/message_handler_test.go @@ -11,9 +11,9 @@ import ( "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/vms/platformvm/warp" warpPayload "github.com/ava-labs/avalanchego/vms/platformvm/warp/payload" - "github.com/ava-labs/icm-relayer/relayer/config" - mock_evm "github.com/ava-labs/icm-relayer/vms/evm/mocks" - mock_vms "github.com/ava-labs/icm-relayer/vms/mocks" + "github.com/ava-labs/icm-offchain-services/relayer/config" + mock_evm "github.com/ava-labs/icm-offchain-services/vms/evm/mocks" + mock_vms "github.com/ava-labs/icm-offchain-services/vms/mocks" "github.com/ava-labs/subnet-evm/accounts/abi/bind" "github.com/ava-labs/subnet-evm/interfaces" teleportermessenger "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/TeleporterMessenger" diff --git a/peers/app_request_network.go b/peers/app_request_network.go index 16e6dd9d..b2ee769d 100644 --- a/peers/app_request_network.go +++ b/peers/app_request_network.go @@ -22,7 +22,7 @@ import ( "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/utils/set" "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/icm-relayer/peers/validators" + "github.com/ava-labs/icm-offchain-services/peers/validators" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" ) diff --git a/peers/config.go b/peers/config.go index 400377d8..ac31c205 100644 --- a/peers/config.go +++ b/peers/config.go @@ -3,7 +3,7 @@ package peers -import "github.com/ava-labs/icm-relayer/config" +import "github.com/ava-labs/icm-offchain-services/config" // Config defines a common interface necessary for standing up an AppRequestNetwork. type Config interface { diff --git a/peers/info_client.go b/peers/info_client.go index 8e33373a..f3c2782d 100644 --- a/peers/info_client.go +++ b/peers/info_client.go @@ -11,8 +11,8 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/rpc" "github.com/ava-labs/avalanchego/vms/platformvm/signer" - "github.com/ava-labs/icm-relayer/config" - "github.com/ava-labs/icm-relayer/peers/utils" + "github.com/ava-labs/icm-offchain-services/config" + "github.com/ava-labs/icm-offchain-services/peers/utils" ) // InfoAPI is a wrapper around the info.Client, diff --git a/peers/mocks/mock_app_request_network.go b/peers/mocks/mock_app_request_network.go index bed51645..06eb71cb 100644 --- a/peers/mocks/mock_app_request_network.go +++ b/peers/mocks/mock_app_request_network.go @@ -16,7 +16,7 @@ import ( message "github.com/ava-labs/avalanchego/message" subnets "github.com/ava-labs/avalanchego/subnets" set "github.com/ava-labs/avalanchego/utils/set" - peers "github.com/ava-labs/icm-relayer/peers" + peers "github.com/ava-labs/icm-offchain-services/peers" gomock "go.uber.org/mock/gomock" ) diff --git a/peers/utils/utils.go b/peers/utils/utils.go index e97c1d55..b3643e06 100644 --- a/peers/utils/utils.go +++ b/peers/utils/utils.go @@ -5,7 +5,7 @@ package utils import ( "github.com/ava-labs/avalanchego/utils/rpc" - "github.com/ava-labs/icm-relayer/config" + "github.com/ava-labs/icm-offchain-services/config" ) // InitializeOptions initializes the rpc options for an API diff --git a/peers/validators/canonical_validator_client.go b/peers/validators/canonical_validator_client.go index fc30eb4c..42aca44a 100644 --- a/peers/validators/canonical_validator_client.go +++ b/peers/validators/canonical_validator_client.go @@ -12,8 +12,8 @@ import ( "github.com/ava-labs/avalanchego/utils/rpc" "github.com/ava-labs/avalanchego/vms/platformvm" avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/icm-relayer/config" - "github.com/ava-labs/icm-relayer/peers/utils" + "github.com/ava-labs/icm-offchain-services/config" + "github.com/ava-labs/icm-offchain-services/peers/utils" "go.uber.org/zap" ) diff --git a/proto/decider/decider.proto b/proto/decider/decider.proto index e2cc8b1d..6e101c2b 100644 --- a/proto/decider/decider.proto +++ b/proto/decider/decider.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package decider; -option go_package = "github.com/ava-labs/icm-relayer/proto/pb/decider"; +option go_package = "github.com/ava-labs/icm-offchain-services/proto/pb/decider"; service DeciderService { rpc ShouldSendMessage(ShouldSendMessageRequest) returns (ShouldSendMessageResponse); diff --git a/proto/pb/decider/decider.pb.go b/proto/pb/decider/decider.pb.go index c9523bb9..9a394fc2 100644 --- a/proto/pb/decider/decider.pb.go +++ b/proto/pb/decider/decider.pb.go @@ -170,11 +170,12 @@ var file_decider_decider_proto_rawDesc = []byte{ 0x53, 0x68, 0x6f, 0x75, 0x6c, 0x64, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x64, 0x65, 0x63, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x53, 0x68, 0x6f, 0x75, 0x6c, 0x64, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x65, 0x73, - 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x32, 0x5a, 0x30, + 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x3c, 0x5a, 0x3a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x76, 0x61, 0x2d, 0x6c, - 0x61, 0x62, 0x73, 0x2f, 0x61, 0x77, 0x6d, 0x2d, 0x72, 0x65, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x2f, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x2f, 0x64, 0x65, 0x63, 0x69, 0x64, 0x65, 0x72, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x61, 0x62, 0x73, 0x2f, 0x69, 0x63, 0x6d, 0x2d, 0x6f, 0x66, 0x66, 0x63, 0x68, 0x61, 0x69, 0x6e, + 0x2d, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, + 0x70, 0x62, 0x2f, 0x64, 0x65, 0x63, 0x69, 0x64, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( diff --git a/relayer/README.md b/relayer/README.md index 97793f7b..0e2d1a8e 100644 --- a/relayer/README.md +++ b/relayer/README.md @@ -12,14 +12,14 @@ To get started easily, we provide a Dev Container specification, that can be use ### Download Prebuilt Binaries -Prebuilt binaries are available for download from the [releases page](https://github.com/ava-labs/icm-relayer/releases). +Prebuilt binaries are available for download from the [releases page](https://github.com/ava-labs/icm-offchain-services/releases). The following commands demonstrate how to download and install the v0.2.13 release of the relayer on MacOS. The exact commands will vary by platform. ```bash # Download the release tarball and checksums -curl -w '%{http_code}' -sL -o ~/Downloads/icm-relayer_0.2.13_darwin_arm64.tar.gz https://github.com/ava-labs/icm-relayer/releases/download/v0.2.13/icm-relayer_0.2.13_darwin_arm64.tar.gz -curl -w '%{http_code}' -sL -o ~/Downloads/icm-relayer_0.2.13_checksums.txt https://github.com/ava-labs/icm-relayer/releases/download/v0.2.13/icm-relayer_0.2.13_checksums.txt +curl -w '%{http_code}' -sL -o ~/Downloads/icm-relayer_0.2.13_darwin_arm64.tar.gz https://github.com/ava-labs/icm-offchain-services/releases/download/v0.2.13/icm-relayer_0.2.13_darwin_arm64.tar.gz +curl -w '%{http_code}' -sL -o ~/Downloads/icm-relayer_0.2.13_checksums.txt https://github.com/ava-labs/icm-offchain-services/releases/download/v0.2.13/icm-relayer_0.2.13_checksums.txt # (Optional) Verify the checksums cd ~/Downloads @@ -435,7 +435,7 @@ go generate ./... ### Generate Protobuf Files -[buf](github.com/bufbuild/buf/) is used to generate protobuf definitions for communication with the [Decider service](https://github.com/ava-labs/icm-relayer/blob/main/proto/decider/decider.proto). If you change any of the protobuf definitions you will have to regenerate the `.go` files. To generate these files, run the following command at the root of the project: +[buf](github.com/bufbuild/buf/) is used to generate protobuf definitions for communication with the [Decider service](https://github.com/ava-labs/icm-offchain-services/blob/main/proto/decider/decider.proto). If you change any of the protobuf definitions you will have to regenerate the `.go` files. To generate these files, run the following command at the root of the project: ```bash ./scripts/protobuf_codegen.sh diff --git a/relayer/api/relay_message.go b/relayer/api/relay_message.go index f04c1bfc..72d6321b 100644 --- a/relayer/api/relay_message.go +++ b/relayer/api/relay_message.go @@ -6,9 +6,9 @@ import ( "net/http" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/icm-relayer/relayer" - "github.com/ava-labs/icm-relayer/types" - "github.com/ava-labs/icm-relayer/utils" + "github.com/ava-labs/icm-offchain-services/relayer" + "github.com/ava-labs/icm-offchain-services/types" + "github.com/ava-labs/icm-offchain-services/utils" "github.com/ethereum/go-ethereum/common" "go.uber.org/zap" ) diff --git a/relayer/application_relayer.go b/relayer/application_relayer.go index 838632f0..7841ac72 100644 --- a/relayer/application_relayer.go +++ b/relayer/application_relayer.go @@ -12,13 +12,13 @@ import ( "github.com/ava-labs/avalanchego/utils/constants" "github.com/ava-labs/avalanchego/utils/logging" avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/icm-relayer/database" - "github.com/ava-labs/icm-relayer/messages" - "github.com/ava-labs/icm-relayer/peers" - "github.com/ava-labs/icm-relayer/relayer/config" - "github.com/ava-labs/icm-relayer/signature-aggregator/aggregator" - "github.com/ava-labs/icm-relayer/utils" - "github.com/ava-labs/icm-relayer/vms" + "github.com/ava-labs/icm-offchain-services/database" + "github.com/ava-labs/icm-offchain-services/messages" + "github.com/ava-labs/icm-offchain-services/peers" + "github.com/ava-labs/icm-offchain-services/relayer/config" + "github.com/ava-labs/icm-offchain-services/signature-aggregator/aggregator" + "github.com/ava-labs/icm-offchain-services/utils" + "github.com/ava-labs/icm-offchain-services/vms" "github.com/ava-labs/subnet-evm/rpc" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" diff --git a/relayer/checkpoint/checkpoint.go b/relayer/checkpoint/checkpoint.go index e4c9b3be..1b522a71 100644 --- a/relayer/checkpoint/checkpoint.go +++ b/relayer/checkpoint/checkpoint.go @@ -9,8 +9,8 @@ import ( "sync" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/icm-relayer/database" - "github.com/ava-labs/icm-relayer/utils" + "github.com/ava-labs/icm-offchain-services/database" + "github.com/ava-labs/icm-offchain-services/utils" "go.uber.org/zap" ) diff --git a/relayer/checkpoint/checkpoint_test.go b/relayer/checkpoint/checkpoint_test.go index f3b354e8..47e6c22c 100644 --- a/relayer/checkpoint/checkpoint_test.go +++ b/relayer/checkpoint/checkpoint_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/icm-relayer/database" - mock_database "github.com/ava-labs/icm-relayer/database/mocks" - "github.com/ava-labs/icm-relayer/utils" + "github.com/ava-labs/icm-offchain-services/database" + mock_database "github.com/ava-labs/icm-offchain-services/database/mocks" + "github.com/ava-labs/icm-offchain-services/utils" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" "github.com/stretchr/testify/require" diff --git a/relayer/config/config.go b/relayer/config/config.go index 87923edc..9da0ba8e 100644 --- a/relayer/config/config.go +++ b/relayer/config/config.go @@ -10,8 +10,8 @@ import ( "net/url" "time" - basecfg "github.com/ava-labs/icm-relayer/config" - "github.com/ava-labs/icm-relayer/peers" + basecfg "github.com/ava-labs/icm-offchain-services/config" + "github.com/ava-labs/icm-offchain-services/peers" "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/constants" diff --git a/relayer/config/config_test.go b/relayer/config/config_test.go index d4800d96..a6de753e 100644 --- a/relayer/config/config_test.go +++ b/relayer/config/config_test.go @@ -12,9 +12,9 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/set" - basecfg "github.com/ava-labs/icm-relayer/config" - "github.com/ava-labs/icm-relayer/utils" - mock_ethclient "github.com/ava-labs/icm-relayer/vms/evm/mocks" + basecfg "github.com/ava-labs/icm-offchain-services/config" + "github.com/ava-labs/icm-offchain-services/utils" + mock_ethclient "github.com/ava-labs/icm-offchain-services/vms/evm/mocks" "github.com/ava-labs/subnet-evm/params" "github.com/ava-labs/subnet-evm/precompile/contracts/warp" "github.com/stretchr/testify/require" diff --git a/relayer/config/destination_blockchain.go b/relayer/config/destination_blockchain.go index a17064a9..049ecaeb 100644 --- a/relayer/config/destination_blockchain.go +++ b/relayer/config/destination_blockchain.go @@ -6,8 +6,8 @@ import ( "fmt" "github.com/ava-labs/avalanchego/ids" - basecfg "github.com/ava-labs/icm-relayer/config" - "github.com/ava-labs/icm-relayer/utils" + basecfg "github.com/ava-labs/icm-offchain-services/config" + "github.com/ava-labs/icm-offchain-services/utils" "github.com/ethereum/go-ethereum/crypto" ) diff --git a/relayer/config/source_blockchain.go b/relayer/config/source_blockchain.go index ef637751..8162ce46 100644 --- a/relayer/config/source_blockchain.go +++ b/relayer/config/source_blockchain.go @@ -5,8 +5,8 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/set" - basecfg "github.com/ava-labs/icm-relayer/config" - "github.com/ava-labs/icm-relayer/utils" + basecfg "github.com/ava-labs/icm-offchain-services/config" + "github.com/ava-labs/icm-offchain-services/utils" "github.com/ethereum/go-ethereum/common" ) diff --git a/relayer/config/test_utils.go b/relayer/config/test_utils.go index 3608f51e..6683e6af 100644 --- a/relayer/config/test_utils.go +++ b/relayer/config/test_utils.go @@ -5,7 +5,7 @@ package config import ( "fmt" - basecfg "github.com/ava-labs/icm-relayer/config" + basecfg "github.com/ava-labs/icm-offchain-services/config" ) var ( diff --git a/relayer/config/viper.go b/relayer/config/viper.go index fe28cd0a..c8edf2c5 100644 --- a/relayer/config/viper.go +++ b/relayer/config/viper.go @@ -8,7 +8,7 @@ import ( "os" "strings" - "github.com/ava-labs/icm-relayer/utils" + "github.com/ava-labs/icm-offchain-services/utils" "github.com/spf13/pflag" "github.com/spf13/viper" ) diff --git a/relayer/config/viper_test.go b/relayer/config/viper_test.go index 31d3bf16..69b11ba6 100644 --- a/relayer/config/viper_test.go +++ b/relayer/config/viper_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - basecfg "github.com/ava-labs/icm-relayer/config" + basecfg "github.com/ava-labs/icm-offchain-services/config" "github.com/spf13/viper" "github.com/stretchr/testify/require" diff --git a/relayer/listener.go b/relayer/listener.go index 5b9132db..d04d4e9c 100644 --- a/relayer/listener.go +++ b/relayer/listener.go @@ -11,9 +11,9 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/icm-relayer/relayer/config" - "github.com/ava-labs/icm-relayer/utils" - "github.com/ava-labs/icm-relayer/vms" + "github.com/ava-labs/icm-offchain-services/relayer/config" + "github.com/ava-labs/icm-offchain-services/utils" + "github.com/ava-labs/icm-offchain-services/vms" "github.com/ava-labs/subnet-evm/ethclient" "go.uber.org/atomic" "go.uber.org/zap" diff --git a/relayer/main/main.go b/relayer/main/main.go index 9ffb0dcc..0c7da0ec 100644 --- a/relayer/main/main.go +++ b/relayer/main/main.go @@ -18,19 +18,19 @@ import ( "github.com/ava-labs/avalanchego/utils/constants" "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/utils/set" - "github.com/ava-labs/icm-relayer/database" - "github.com/ava-labs/icm-relayer/messages" - offchainregistry "github.com/ava-labs/icm-relayer/messages/off-chain-registry" - "github.com/ava-labs/icm-relayer/messages/teleporter" - "github.com/ava-labs/icm-relayer/peers" - "github.com/ava-labs/icm-relayer/relayer" - "github.com/ava-labs/icm-relayer/relayer/api" - "github.com/ava-labs/icm-relayer/relayer/checkpoint" - "github.com/ava-labs/icm-relayer/relayer/config" - "github.com/ava-labs/icm-relayer/signature-aggregator/aggregator" - sigAggMetrics "github.com/ava-labs/icm-relayer/signature-aggregator/metrics" - "github.com/ava-labs/icm-relayer/utils" - "github.com/ava-labs/icm-relayer/vms" + "github.com/ava-labs/icm-offchain-services/database" + "github.com/ava-labs/icm-offchain-services/messages" + offchainregistry "github.com/ava-labs/icm-offchain-services/messages/off-chain-registry" + "github.com/ava-labs/icm-offchain-services/messages/teleporter" + "github.com/ava-labs/icm-offchain-services/peers" + "github.com/ava-labs/icm-offchain-services/relayer" + "github.com/ava-labs/icm-offchain-services/relayer/api" + "github.com/ava-labs/icm-offchain-services/relayer/checkpoint" + "github.com/ava-labs/icm-offchain-services/relayer/config" + "github.com/ava-labs/icm-offchain-services/signature-aggregator/aggregator" + sigAggMetrics "github.com/ava-labs/icm-offchain-services/signature-aggregator/metrics" + "github.com/ava-labs/icm-offchain-services/utils" + "github.com/ava-labs/icm-offchain-services/vms" "github.com/ava-labs/subnet-evm/ethclient" "github.com/ethereum/go-ethereum/common" "github.com/prometheus/client_golang/prometheus" diff --git a/relayer/message_coordinator.go b/relayer/message_coordinator.go index 6e704e98..5cf32d22 100644 --- a/relayer/message_coordinator.go +++ b/relayer/message_coordinator.go @@ -11,9 +11,9 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/icm-relayer/database" - "github.com/ava-labs/icm-relayer/messages" - relayerTypes "github.com/ava-labs/icm-relayer/types" + "github.com/ava-labs/icm-offchain-services/database" + "github.com/ava-labs/icm-offchain-services/messages" + relayerTypes "github.com/ava-labs/icm-offchain-services/types" "github.com/ava-labs/subnet-evm/core/types" "github.com/ava-labs/subnet-evm/ethclient" "github.com/ava-labs/subnet-evm/interfaces" diff --git a/relayer/network_utils.go b/relayer/network_utils.go index 1567f031..442643d8 100644 --- a/relayer/network_utils.go +++ b/relayer/network_utils.go @@ -10,9 +10,9 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/constants" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/icm-relayer/peers" - "github.com/ava-labs/icm-relayer/relayer/config" - "github.com/ava-labs/icm-relayer/utils" + "github.com/ava-labs/icm-offchain-services/peers" + "github.com/ava-labs/icm-offchain-services/relayer/config" + "github.com/ava-labs/icm-offchain-services/utils" "go.uber.org/zap" ) diff --git a/signature-aggregator/README.md b/signature-aggregator/README.md index d94088b1..55344407 100644 --- a/signature-aggregator/README.md +++ b/signature-aggregator/README.md @@ -10,7 +10,7 @@ To build the application run `scripts/build_signature_aggregator.sh` which will ## Running To run the binary you must supply a config file via `./signature-aggregator --config-file` -Currently required configurations are a small subset of the [`icm-relayer` configuration](https://github.com/ava-labs/icm-relayer?tab=readme-ov-file#configuration). +Currently required configurations are a small subset of the [`icm-relayer` configuration](https://github.com/ava-labs/icm-offchain-services?tab=readme-ov-file#configuration). Namely: - `LogLevel`: string diff --git a/signature-aggregator/aggregator/aggregator.go b/signature-aggregator/aggregator/aggregator.go index 5f6f3da3..1e02ed01 100644 --- a/signature-aggregator/aggregator/aggregator.go +++ b/signature-aggregator/aggregator/aggregator.go @@ -26,10 +26,10 @@ import ( "github.com/ava-labs/avalanchego/utils/set" avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" corethMsg "github.com/ava-labs/coreth/plugin/evm/message" - "github.com/ava-labs/icm-relayer/peers" - "github.com/ava-labs/icm-relayer/signature-aggregator/aggregator/cache" - "github.com/ava-labs/icm-relayer/signature-aggregator/metrics" - "github.com/ava-labs/icm-relayer/utils" + "github.com/ava-labs/icm-offchain-services/peers" + "github.com/ava-labs/icm-offchain-services/signature-aggregator/aggregator/cache" + "github.com/ava-labs/icm-offchain-services/signature-aggregator/metrics" + "github.com/ava-labs/icm-offchain-services/utils" msg "github.com/ava-labs/subnet-evm/plugin/evm/message" "go.uber.org/zap" "google.golang.org/protobuf/proto" diff --git a/signature-aggregator/aggregator/aggregator_test.go b/signature-aggregator/aggregator/aggregator_test.go index 41e3ad7d..de68a37f 100644 --- a/signature-aggregator/aggregator/aggregator_test.go +++ b/signature-aggregator/aggregator/aggregator_test.go @@ -18,9 +18,9 @@ import ( "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/utils/set" "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/icm-relayer/peers" - "github.com/ava-labs/icm-relayer/peers/mocks" - "github.com/ava-labs/icm-relayer/signature-aggregator/metrics" + "github.com/ava-labs/icm-offchain-services/peers" + "github.com/ava-labs/icm-offchain-services/peers/mocks" + "github.com/ava-labs/icm-offchain-services/signature-aggregator/metrics" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/signature-aggregator/api/api.go b/signature-aggregator/api/api.go index e0da4ca6..615b8d8b 100644 --- a/signature-aggregator/api/api.go +++ b/signature-aggregator/api/api.go @@ -12,10 +12,10 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/icm-relayer/signature-aggregator/aggregator" - "github.com/ava-labs/icm-relayer/signature-aggregator/metrics" - "github.com/ava-labs/icm-relayer/types" - "github.com/ava-labs/icm-relayer/utils" + "github.com/ava-labs/icm-offchain-services/signature-aggregator/aggregator" + "github.com/ava-labs/icm-offchain-services/signature-aggregator/metrics" + "github.com/ava-labs/icm-offchain-services/types" + "github.com/ava-labs/icm-offchain-services/utils" "go.uber.org/zap" ) diff --git a/signature-aggregator/config/config.go b/signature-aggregator/config/config.go index 09b46ed4..d76a521c 100644 --- a/signature-aggregator/config/config.go +++ b/signature-aggregator/config/config.go @@ -8,8 +8,8 @@ import ( "time" "github.com/ava-labs/avalanchego/utils/logging" - basecfg "github.com/ava-labs/icm-relayer/config" - "github.com/ava-labs/icm-relayer/peers" + basecfg "github.com/ava-labs/icm-offchain-services/config" + "github.com/ava-labs/icm-offchain-services/peers" ) const ( diff --git a/signature-aggregator/main/main.go b/signature-aggregator/main/main.go index 3194ac93..140beac7 100644 --- a/signature-aggregator/main/main.go +++ b/signature-aggregator/main/main.go @@ -13,12 +13,12 @@ import ( "github.com/ava-labs/avalanchego/message" "github.com/ava-labs/avalanchego/utils/constants" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/icm-relayer/peers" - "github.com/ava-labs/icm-relayer/signature-aggregator/aggregator" - "github.com/ava-labs/icm-relayer/signature-aggregator/api" - "github.com/ava-labs/icm-relayer/signature-aggregator/config" - "github.com/ava-labs/icm-relayer/signature-aggregator/healthcheck" - "github.com/ava-labs/icm-relayer/signature-aggregator/metrics" + "github.com/ava-labs/icm-offchain-services/peers" + "github.com/ava-labs/icm-offchain-services/signature-aggregator/aggregator" + "github.com/ava-labs/icm-offchain-services/signature-aggregator/api" + "github.com/ava-labs/icm-offchain-services/signature-aggregator/config" + "github.com/ava-labs/icm-offchain-services/signature-aggregator/healthcheck" + "github.com/ava-labs/icm-offchain-services/signature-aggregator/metrics" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" ) diff --git a/tests/allowed_addresses.go b/tests/allowed_addresses.go index 4f7f8bba..61f72915 100644 --- a/tests/allowed_addresses.go +++ b/tests/allowed_addresses.go @@ -8,9 +8,9 @@ import ( "time" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/icm-relayer/database" - "github.com/ava-labs/icm-relayer/relayer/config" - testUtils "github.com/ava-labs/icm-relayer/tests/utils" + "github.com/ava-labs/icm-offchain-services/database" + "github.com/ava-labs/icm-offchain-services/relayer/config" + testUtils "github.com/ava-labs/icm-offchain-services/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" "github.com/ava-labs/teleporter/tests/interfaces" "github.com/ava-labs/teleporter/tests/utils" diff --git a/tests/basic_relay.go b/tests/basic_relay.go index 6f4a903f..df60ada3 100644 --- a/tests/basic_relay.go +++ b/tests/basic_relay.go @@ -9,8 +9,8 @@ import ( "time" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/icm-relayer/database" - testUtils "github.com/ava-labs/icm-relayer/tests/utils" + "github.com/ava-labs/icm-offchain-services/database" + testUtils "github.com/ava-labs/icm-offchain-services/tests/utils" "github.com/ava-labs/subnet-evm/core/types" "github.com/ava-labs/teleporter/tests/interfaces" "github.com/ava-labs/teleporter/tests/utils" diff --git a/tests/batch_relay.go b/tests/batch_relay.go index 068f0695..a1dbb408 100644 --- a/tests/batch_relay.go +++ b/tests/batch_relay.go @@ -8,7 +8,7 @@ import ( "time" "github.com/ava-labs/avalanchego/utils/set" - testUtils "github.com/ava-labs/icm-relayer/tests/utils" + testUtils "github.com/ava-labs/icm-offchain-services/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" "github.com/ava-labs/subnet-evm/core/types" "github.com/ava-labs/teleporter/tests/interfaces" diff --git a/tests/cmd/decider/main.go b/tests/cmd/decider/main.go index 723ecd15..85e07035 100644 --- a/tests/cmd/decider/main.go +++ b/tests/cmd/decider/main.go @@ -9,7 +9,7 @@ import ( "log" "net" - pb "github.com/ava-labs/icm-relayer/proto/pb/decider" + pb "github.com/ava-labs/icm-offchain-services/proto/pb/decider" "google.golang.org/grpc" ) diff --git a/tests/e2e_test.go b/tests/e2e_test.go index d10f2733..d5988ff3 100644 --- a/tests/e2e_test.go +++ b/tests/e2e_test.go @@ -15,8 +15,8 @@ import ( "testing" "time" - testUtils "github.com/ava-labs/icm-relayer/tests/utils" - "github.com/ava-labs/icm-relayer/utils" + testUtils "github.com/ava-labs/icm-offchain-services/tests/utils" + "github.com/ava-labs/icm-offchain-services/utils" "github.com/ava-labs/teleporter/tests/local" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/log" diff --git a/tests/etna_upgrade.go b/tests/etna_upgrade.go index 54d5e933..9697a9d3 100644 --- a/tests/etna_upgrade.go +++ b/tests/etna_upgrade.go @@ -7,7 +7,7 @@ import ( "context" "time" - testUtils "github.com/ava-labs/icm-relayer/tests/utils" + testUtils "github.com/ava-labs/icm-offchain-services/tests/utils" "github.com/ava-labs/teleporter/tests/interfaces" "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/crypto" diff --git a/tests/manual_message.go b/tests/manual_message.go index c30ee902..d4b2d7e4 100644 --- a/tests/manual_message.go +++ b/tests/manual_message.go @@ -12,9 +12,9 @@ import ( "net/http" "time" - offchainregistry "github.com/ava-labs/icm-relayer/messages/off-chain-registry" - "github.com/ava-labs/icm-relayer/relayer/api" - testUtils "github.com/ava-labs/icm-relayer/tests/utils" + offchainregistry "github.com/ava-labs/icm-offchain-services/messages/off-chain-registry" + "github.com/ava-labs/icm-offchain-services/relayer/api" + testUtils "github.com/ava-labs/icm-offchain-services/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" "github.com/ava-labs/teleporter/tests/interfaces" teleporterTestUtils "github.com/ava-labs/teleporter/tests/utils" diff --git a/tests/relay_message_api.go b/tests/relay_message_api.go index dc38d48d..0e09e703 100644 --- a/tests/relay_message_api.go +++ b/tests/relay_message_api.go @@ -14,8 +14,8 @@ import ( "github.com/ava-labs/avalanchego/ids" avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/icm-relayer/relayer/api" - testUtils "github.com/ava-labs/icm-relayer/tests/utils" + "github.com/ava-labs/icm-offchain-services/relayer/api" + testUtils "github.com/ava-labs/icm-offchain-services/tests/utils" "github.com/ava-labs/subnet-evm/core/types" subnetEvmInterfaces "github.com/ava-labs/subnet-evm/interfaces" "github.com/ava-labs/subnet-evm/precompile/contracts/warp" diff --git a/tests/shared_db.go b/tests/shared_db.go index 6124419f..805120cd 100644 --- a/tests/shared_db.go +++ b/tests/shared_db.go @@ -4,7 +4,7 @@ import ( "context" "sync" - testUtils "github.com/ava-labs/icm-relayer/tests/utils" + testUtils "github.com/ava-labs/icm-offchain-services/tests/utils" "github.com/ava-labs/teleporter/tests/interfaces" "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/crypto" diff --git a/tests/signature_aggregator_api.go b/tests/signature_aggregator_api.go index e94bd5e3..68970682 100644 --- a/tests/signature_aggregator_api.go +++ b/tests/signature_aggregator_api.go @@ -17,9 +17,9 @@ import ( "time" avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/icm-relayer/signature-aggregator/api" - "github.com/ava-labs/icm-relayer/signature-aggregator/metrics" - testUtils "github.com/ava-labs/icm-relayer/tests/utils" + "github.com/ava-labs/icm-offchain-services/signature-aggregator/api" + "github.com/ava-labs/icm-offchain-services/signature-aggregator/metrics" + testUtils "github.com/ava-labs/icm-offchain-services/tests/utils" "github.com/ava-labs/teleporter/tests/interfaces" "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/log" diff --git a/tests/utils/utils.go b/tests/utils/utils.go index 31ecb832..1178a188 100644 --- a/tests/utils/utils.go +++ b/tests/utils/utils.go @@ -19,12 +19,12 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/icm-relayer/config" - offchainregistry "github.com/ava-labs/icm-relayer/messages/off-chain-registry" - relayercfg "github.com/ava-labs/icm-relayer/relayer/config" - signatureaggregatorcfg "github.com/ava-labs/icm-relayer/signature-aggregator/config" - batchcrosschainmessenger "github.com/ava-labs/icm-relayer/tests/abi-bindings/go/BatchCrossChainMessenger" - relayerUtils "github.com/ava-labs/icm-relayer/utils" + "github.com/ava-labs/icm-offchain-services/config" + offchainregistry "github.com/ava-labs/icm-offchain-services/messages/off-chain-registry" + relayercfg "github.com/ava-labs/icm-offchain-services/relayer/config" + signatureaggregatorcfg "github.com/ava-labs/icm-offchain-services/signature-aggregator/config" + batchcrosschainmessenger "github.com/ava-labs/icm-offchain-services/tests/abi-bindings/go/BatchCrossChainMessenger" + relayerUtils "github.com/ava-labs/icm-offchain-services/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" "github.com/ava-labs/subnet-evm/core/types" teleportermessenger "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/TeleporterMessenger" diff --git a/tests/warp_api.go b/tests/warp_api.go index 531e1a55..efece8d9 100644 --- a/tests/warp_api.go +++ b/tests/warp_api.go @@ -13,7 +13,7 @@ import ( "strings" "time" - testUtils "github.com/ava-labs/icm-relayer/tests/utils" + testUtils "github.com/ava-labs/icm-offchain-services/tests/utils" "github.com/ava-labs/teleporter/tests/interfaces" "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/crypto" diff --git a/types/types.go b/types/types.go index b50e50c4..a717eeda 100644 --- a/types/types.go +++ b/types/types.go @@ -8,7 +8,7 @@ import ( "errors" avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/icm-relayer/utils" + "github.com/ava-labs/icm-offchain-services/utils" "github.com/ava-labs/subnet-evm/core/types" "github.com/ava-labs/subnet-evm/ethclient" "github.com/ava-labs/subnet-evm/interfaces" diff --git a/vms/contract_message.go b/vms/contract_message.go index 900cec27..1ef6b275 100644 --- a/vms/contract_message.go +++ b/vms/contract_message.go @@ -6,8 +6,8 @@ package vms import ( "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/icm-relayer/relayer/config" - "github.com/ava-labs/icm-relayer/vms/evm" + "github.com/ava-labs/icm-offchain-services/relayer/config" + "github.com/ava-labs/icm-offchain-services/vms/evm" ) type ContractMessage interface { diff --git a/vms/destination_client.go b/vms/destination_client.go index 63b6bb49..932633dc 100644 --- a/vms/destination_client.go +++ b/vms/destination_client.go @@ -11,8 +11,8 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/icm-relayer/relayer/config" - "github.com/ava-labs/icm-relayer/vms/evm" + "github.com/ava-labs/icm-offchain-services/relayer/config" + "github.com/ava-labs/icm-offchain-services/vms/evm" "github.com/ethereum/go-ethereum/common" "go.uber.org/zap" ) diff --git a/vms/evm/contract_message.go b/vms/evm/contract_message.go index d49187ab..a76161a8 100644 --- a/vms/evm/contract_message.go +++ b/vms/evm/contract_message.go @@ -8,7 +8,7 @@ import ( "github.com/ava-labs/avalanchego/utils/logging" avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/icm-relayer/relayer/config" + "github.com/ava-labs/icm-offchain-services/relayer/config" "github.com/ava-labs/subnet-evm/precompile/contracts/warp" "go.uber.org/zap" ) diff --git a/vms/evm/contract_message_test.go b/vms/evm/contract_message_test.go index 3b46b32b..42c6886f 100644 --- a/vms/evm/contract_message_test.go +++ b/vms/evm/contract_message_test.go @@ -13,7 +13,7 @@ import ( "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/vms/platformvm/warp" warpPayload "github.com/ava-labs/avalanchego/vms/platformvm/warp/payload" - "github.com/ava-labs/icm-relayer/relayer/config" + "github.com/ava-labs/icm-offchain-services/relayer/config" "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" ) diff --git a/vms/evm/destination_client.go b/vms/evm/destination_client.go index 64246977..c1809880 100644 --- a/vms/evm/destination_client.go +++ b/vms/evm/destination_client.go @@ -13,9 +13,9 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/logging" avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/icm-relayer/relayer/config" - "github.com/ava-labs/icm-relayer/utils" - "github.com/ava-labs/icm-relayer/vms/evm/signer" + "github.com/ava-labs/icm-offchain-services/relayer/config" + "github.com/ava-labs/icm-offchain-services/utils" + "github.com/ava-labs/icm-offchain-services/vms/evm/signer" "github.com/ava-labs/subnet-evm/core/types" "github.com/ava-labs/subnet-evm/ethclient" "github.com/ava-labs/subnet-evm/precompile/contracts/warp" diff --git a/vms/evm/destination_client_test.go b/vms/evm/destination_client_test.go index 96396e93..1feb50e7 100644 --- a/vms/evm/destination_client_test.go +++ b/vms/evm/destination_client_test.go @@ -11,10 +11,10 @@ import ( "github.com/ava-labs/avalanchego/utils/logging" avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" - basecfg "github.com/ava-labs/icm-relayer/config" - "github.com/ava-labs/icm-relayer/relayer/config" - mock_ethclient "github.com/ava-labs/icm-relayer/vms/evm/mocks" - "github.com/ava-labs/icm-relayer/vms/evm/signer" + basecfg "github.com/ava-labs/icm-offchain-services/config" + "github.com/ava-labs/icm-offchain-services/relayer/config" + mock_ethclient "github.com/ava-labs/icm-offchain-services/vms/evm/mocks" + "github.com/ava-labs/icm-offchain-services/vms/evm/signer" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" ) diff --git a/vms/evm/signer/signer.go b/vms/evm/signer/signer.go index c9d2ba12..fc96ab90 100644 --- a/vms/evm/signer/signer.go +++ b/vms/evm/signer/signer.go @@ -6,7 +6,7 @@ package signer import ( "math/big" - "github.com/ava-labs/icm-relayer/relayer/config" + "github.com/ava-labs/icm-offchain-services/relayer/config" "github.com/ava-labs/subnet-evm/core/types" "github.com/ethereum/go-ethereum/common" ) diff --git a/vms/evm/signer/tx_signer.go b/vms/evm/signer/tx_signer.go index 7d4d1fef..360fb290 100644 --- a/vms/evm/signer/tx_signer.go +++ b/vms/evm/signer/tx_signer.go @@ -9,7 +9,7 @@ import ( "math/big" "runtime" - "github.com/ava-labs/icm-relayer/utils" + "github.com/ava-labs/icm-offchain-services/utils" "github.com/ava-labs/subnet-evm/core/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" diff --git a/vms/evm/signer/tx_signer_test.go b/vms/evm/signer/tx_signer_test.go index 9f170b8a..b3e93c9d 100644 --- a/vms/evm/signer/tx_signer_test.go +++ b/vms/evm/signer/tx_signer_test.go @@ -8,8 +8,8 @@ import ( "math/big" "testing" - "github.com/ava-labs/icm-relayer/relayer/config" - "github.com/ava-labs/icm-relayer/utils" + "github.com/ava-labs/icm-offchain-services/relayer/config" + "github.com/ava-labs/icm-offchain-services/utils" "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" ) diff --git a/vms/evm/subscriber_test.go b/vms/evm/subscriber_test.go index fdf78ae4..15a7c1d3 100644 --- a/vms/evm/subscriber_test.go +++ b/vms/evm/subscriber_test.go @@ -9,9 +9,9 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/logging" - basecfg "github.com/ava-labs/icm-relayer/config" - "github.com/ava-labs/icm-relayer/relayer/config" - mock_ethclient "github.com/ava-labs/icm-relayer/vms/evm/mocks" + basecfg "github.com/ava-labs/icm-offchain-services/config" + "github.com/ava-labs/icm-offchain-services/relayer/config" + mock_ethclient "github.com/ava-labs/icm-offchain-services/vms/evm/mocks" "github.com/ava-labs/subnet-evm/core/types" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/vms/subscriber.go b/vms/subscriber.go index 108af152..0168ac6b 100644 --- a/vms/subscriber.go +++ b/vms/subscriber.go @@ -8,8 +8,8 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/icm-relayer/relayer/config" - "github.com/ava-labs/icm-relayer/vms/evm" + "github.com/ava-labs/icm-offchain-services/relayer/config" + "github.com/ava-labs/icm-offchain-services/vms/evm" "github.com/ava-labs/subnet-evm/core/types" "github.com/ava-labs/subnet-evm/ethclient" ) From 97b6cd59942807e898083900d040c452ae9c755a Mon Sep 17 00:00:00 2001 From: Ian Suvak Date: Thu, 14 Nov 2024 15:19:34 -0500 Subject: [PATCH 4/8] rename release_awm_relayer.yml --- .../{release_awm_relayer.yml => release_icm_relayer.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{release_awm_relayer.yml => release_icm_relayer.yml} (100%) diff --git a/.github/workflows/release_awm_relayer.yml b/.github/workflows/release_icm_relayer.yml similarity index 100% rename from .github/workflows/release_awm_relayer.yml rename to .github/workflows/release_icm_relayer.yml From 86bf907bcd1139a9a276f04b4eca48b736af39a3 Mon Sep 17 00:00:00 2001 From: Ian Suvak Date: Thu, 14 Nov 2024 15:25:35 -0500 Subject: [PATCH 5/8] remaining renames --- .devcontainer/devcontainer.json | 10 ++++------ CONTRIBUTING.md | 10 +++++----- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 2d24aab0..82ccb7dd 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,15 +1,13 @@ // For format details, see https://aka.ms/devcontainer.json. { - "name": "AWM Relayer DevContainer", - + "name": "ICM Off-chain Services DevContainer", "image": "golang:latest", - "runArgs": ["--network=host"], - + "runArgs": [ + "--network=host" + ], "remoteUser": "root", - "remoteEnv": { "PATH": "${containerEnv:PATH}:${containerWorkspaceFolder}/build" }, - "postCreateCommand": "scripts/build.sh" } \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8326a9a5..975d88d6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,14 +1,14 @@ -# How to Contribute to ICM Relayer +# How to Contribute to ICM Off-chain Services ## Setup -To start developing on ICM Relayer, you'll need Golang v1.22.8. +To start developing on ICM Off-chain services, you'll need Golang v1.22.8. ## Issues ### Security -- Do not open up a GitHub issue if it relates to a security vulnerability in ICM Relayer, and instead refer to our [security policy](./SECURITY.md). +- Do not open up a GitHub issue if it relates to a security vulnerability in ICM Off-chain services, and instead refer to our [security policy](./SECURITY.md). ### Making an Issue @@ -18,7 +18,7 @@ To start developing on ICM Relayer, you'll need Golang v1.22.8. ## Features - If you want to start a discussion about the development of a new feature or the modification of an existing one, start a thread under GitHub [discussions](https://github.com/ava-labs/icm-offchain-services/discussions/categories/ideas). -- Post a thread about your idea and why it should be added to AWM Relayer. +- Post a thread about your idea and why it should be added to ICM Offchain Services. - Don't start working on a pull request until you've received positive feedback from the maintainers. ## Pull Request Guidelines @@ -47,4 +47,4 @@ To start developing on ICM Relayer, you'll need Golang v1.22.8. ### Do you have questions about the source code? -- Ask any question about AWM Relayer under GitHub [discussions](https://github.com/ava-labs/teleporter/discussions/categories/q-a). +- Ask any question about ICM Off-chain Services under GitHub [discussions](https://github.com/ava-labs/icm-offchain-services/discussions/categories/q-a). From 47be968effd82b6caccc909e1bc2bf1eec37fdfa Mon Sep 17 00:00:00 2001 From: Ian Suvak Date: Sun, 17 Nov 2024 09:51:44 -0500 Subject: [PATCH 6/8] more renames --- .github/ISSUE_TEMPLATE/feature_spec.md | 2 +- scripts/e2e_test.sh | 2 +- scripts/test.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/feature_spec.md b/.github/ISSUE_TEMPLATE/feature_spec.md index c7662ee8..e32f5b2f 100644 --- a/.github/ISSUE_TEMPLATE/feature_spec.md +++ b/.github/ISSUE_TEMPLATE/feature_spec.md @@ -1,6 +1,6 @@ --- name: Feature specification -about: Discussion on design and implementation of new features for icm-relayer. +about: Discussion on design and implementation of new features for icm-offchain-services. title: '' labels: enhancement assignees: '' diff --git a/scripts/e2e_test.sh b/scripts/e2e_test.sh index c7a6288e..936c391c 100755 --- a/scripts/e2e_test.sh +++ b/scripts/e2e_test.sh @@ -22,7 +22,7 @@ done if [ "$HELP" = true ]; then echo "Usage: ./scripts/e2e_test.sh [OPTIONS]" - echo "Run E2E tests for ICM Relayer." + echo "Run E2E tests for ICM Off-chain Services." echo "" echo "Options:" echo " -l, --local Run the test locally. Requires --subnet-evm and --data-dir" diff --git a/scripts/test.sh b/scripts/test.sh index aa18a1bb..28dfc377 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -18,7 +18,7 @@ done if [ "$HELP" = true ]; then echo "Usage: ./scripts/test.sh [OPTIONS]" - echo "Run unit tests for ICM Relayer." + echo "Run unit tests for ICM Off-chain Services." echo "" echo "Options:" echo " -v, --verbose Run the test with verbose output" From 410a0b96b012aa6302daa7491c35ce147c875bb4 Mon Sep 17 00:00:00 2001 From: Ian Suvak Date: Fri, 22 Nov 2024 15:05:15 -0500 Subject: [PATCH 7/8] Rename to icm-services --- .devcontainer/devcontainer.json | 2 +- .github/ISSUE_TEMPLATE/feature_spec.md | 2 +- CONTRIBUTING.md | 16 ++++++------ README.md | 2 +- database/database.go | 2 +- database/database_test.go | 2 +- database/mocks/mock_database.go | 2 +- database/relayer_id.go | 4 +-- go.mod | 2 +- messages/message_handler.go | 2 +- messages/mocks/mock_message_handler.go | 4 +-- .../off-chain-registry/message_handler.go | 6 ++--- .../message_handler_test.go | 6 ++--- messages/teleporter/message_handler.go | 10 +++---- messages/teleporter/message_handler_test.go | 6 ++--- peers/app_request_network.go | 2 +- peers/config.go | 2 +- peers/info_client.go | 4 +-- peers/mocks/mock_app_request_network.go | 2 +- peers/utils/utils.go | 2 +- .../validators/canonical_validator_client.go | 4 +-- proto/decider/decider.proto | 2 +- relayer/README.md | 8 +++--- relayer/api/relay_message.go | 6 ++--- relayer/application_relayer.go | 14 +++++----- relayer/checkpoint/checkpoint.go | 4 +-- relayer/checkpoint/checkpoint_test.go | 6 ++--- relayer/config/config.go | 4 +-- relayer/config/config_test.go | 6 ++--- relayer/config/destination_blockchain.go | 4 +-- relayer/config/source_blockchain.go | 4 +-- relayer/config/test_utils.go | 2 +- relayer/config/viper.go | 2 +- relayer/config/viper_test.go | 2 +- relayer/listener.go | 6 ++--- relayer/main/main.go | 26 +++++++++---------- relayer/message_coordinator.go | 6 ++--- relayer/network_utils.go | 6 ++--- scripts/e2e_test.sh | 2 +- scripts/test.sh | 2 +- signature-aggregator/README.md | 2 +- signature-aggregator/aggregator/aggregator.go | 8 +++--- .../aggregator/aggregator_test.go | 6 ++--- signature-aggregator/api/api.go | 8 +++--- signature-aggregator/config/config.go | 4 +-- signature-aggregator/main/main.go | 12 ++++----- tests/allowed_addresses.go | 6 ++--- tests/basic_relay.go | 4 +-- tests/batch_relay.go | 2 +- tests/cmd/decider/main.go | 2 +- tests/e2e_test.go | 6 ++--- tests/etna_upgrade.go | 2 +- tests/manual_message.go | 6 ++--- tests/relay_message_api.go | 4 +-- tests/shared_db.go | 2 +- tests/signature_aggregator_api.go | 6 ++--- tests/utils/utils.go | 12 ++++----- tests/warp_api.go | 2 +- types/types.go | 2 +- vms/contract_message.go | 4 +-- vms/destination_client.go | 4 +-- vms/evm/contract_message.go | 2 +- vms/evm/contract_message_test.go | 2 +- vms/evm/destination_client.go | 6 ++--- vms/evm/destination_client_test.go | 8 +++--- vms/evm/signer/signer.go | 2 +- vms/evm/signer/tx_signer.go | 2 +- vms/evm/signer/tx_signer_test.go | 4 +-- vms/evm/subscriber_test.go | 6 ++--- vms/subscriber.go | 4 +-- 70 files changed, 168 insertions(+), 168 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 82ccb7dd..f99acac5 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ // For format details, see https://aka.ms/devcontainer.json. { - "name": "ICM Off-chain Services DevContainer", + "name": "ICM Services DevContainer", "image": "golang:latest", "runArgs": [ "--network=host" diff --git a/.github/ISSUE_TEMPLATE/feature_spec.md b/.github/ISSUE_TEMPLATE/feature_spec.md index e32f5b2f..7a7808ce 100644 --- a/.github/ISSUE_TEMPLATE/feature_spec.md +++ b/.github/ISSUE_TEMPLATE/feature_spec.md @@ -1,6 +1,6 @@ --- name: Feature specification -about: Discussion on design and implementation of new features for icm-offchain-services. +about: Discussion on design and implementation of new features for icm-services. title: '' labels: enhancement assignees: '' diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 975d88d6..d1dcaae7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,24 +1,24 @@ -# How to Contribute to ICM Off-chain Services +# How to Contribute to ICM Services ## Setup -To start developing on ICM Off-chain services, you'll need Golang v1.22.8. +To start developing on ICM Services, you'll need Golang v1.22.8. ## Issues ### Security -- Do not open up a GitHub issue if it relates to a security vulnerability in ICM Off-chain services, and instead refer to our [security policy](./SECURITY.md). +- Do not open up a GitHub issue if it relates to a security vulnerability in ICM Services, and instead refer to our [security policy](./SECURITY.md). ### Making an Issue -- Check that the issue you're filing doesn't already exist by searching under [issues](https://github.com/ava-labs/icm-offchain-services/issues). -- If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/ava-labs/icm-offchain-services/issues/new/choose). Be sure to include a *title and clear description* with as much relevant information as possible. +- Check that the issue you're filing doesn't already exist by searching under [issues](https://github.com/ava-labs/icm-services/issues). +- If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/ava-labs/icm-services/issues/new/choose). Be sure to include a *title and clear description* with as much relevant information as possible. ## Features -- If you want to start a discussion about the development of a new feature or the modification of an existing one, start a thread under GitHub [discussions](https://github.com/ava-labs/icm-offchain-services/discussions/categories/ideas). -- Post a thread about your idea and why it should be added to ICM Offchain Services. +- If you want to start a discussion about the development of a new feature or the modification of an existing one, start a thread under GitHub [discussions](https://github.com/ava-labs/icm-services/discussions/categories/ideas). +- Post a thread about your idea and why it should be added to ICM Services. - Don't start working on a pull request until you've received positive feedback from the maintainers. ## Pull Request Guidelines @@ -47,4 +47,4 @@ To start developing on ICM Off-chain services, you'll need Golang v1.22.8. ### Do you have questions about the source code? -- Ask any question about ICM Off-chain Services under GitHub [discussions](https://github.com/ava-labs/icm-offchain-services/discussions/categories/q-a). +- Ask any question about ICM Services under GitHub [discussions](https://github.com/ava-labs/icm-services/discussions/categories/q-a). diff --git a/README.md b/README.md index e288a328..2655fd7a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Avalanche ICM Off-chain Services +# Avalanche ICM Services This repository contains off-chain services that help support Avalanche Interchain Messaging (ICM). diff --git a/database/database.go b/database/database.go index 0537ec52..2725537e 100644 --- a/database/database.go +++ b/database/database.go @@ -7,7 +7,7 @@ package database import ( "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/icm-offchain-services/relayer/config" + "github.com/ava-labs/icm-services/relayer/config" "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" "go.uber.org/zap" diff --git a/database/database_test.go b/database/database_test.go index 093ac1c2..8e114b69 100644 --- a/database/database_test.go +++ b/database/database_test.go @@ -6,7 +6,7 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/set" - "github.com/ava-labs/icm-offchain-services/relayer/config" + "github.com/ava-labs/icm-services/relayer/config" "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" "github.com/stretchr/testify/require" diff --git a/database/mocks/mock_database.go b/database/mocks/mock_database.go index 5f7bb431..a59f4a2e 100644 --- a/database/mocks/mock_database.go +++ b/database/mocks/mock_database.go @@ -12,7 +12,7 @@ package mocks import ( reflect "reflect" - database "github.com/ava-labs/icm-offchain-services/database" + database "github.com/ava-labs/icm-services/database" common "github.com/ethereum/go-ethereum/common" gomock "go.uber.org/mock/gomock" ) diff --git a/database/relayer_id.go b/database/relayer_id.go index 46f135d0..37fb66b5 100644 --- a/database/relayer_id.go +++ b/database/relayer_id.go @@ -7,8 +7,8 @@ import ( "strings" "github.com/ava-labs/avalanchego/ids" - "github.com/ava-labs/icm-offchain-services/relayer/config" - "github.com/ava-labs/icm-offchain-services/utils" + "github.com/ava-labs/icm-services/relayer/config" + "github.com/ava-labs/icm-services/utils" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" ) diff --git a/go.mod b/go.mod index 6919665e..b4efd017 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/ava-labs/icm-offchain-services +module github.com/ava-labs/icm-services go 1.22.8 diff --git a/messages/message_handler.go b/messages/message_handler.go index b17f107c..c60cfa94 100644 --- a/messages/message_handler.go +++ b/messages/message_handler.go @@ -8,7 +8,7 @@ package messages import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/icm-offchain-services/vms" + "github.com/ava-labs/icm-services/vms" "github.com/ethereum/go-ethereum/common" ) diff --git a/messages/mocks/mock_message_handler.go b/messages/mocks/mock_message_handler.go index 3925a419..689c0250 100644 --- a/messages/mocks/mock_message_handler.go +++ b/messages/mocks/mock_message_handler.go @@ -14,8 +14,8 @@ import ( ids "github.com/ava-labs/avalanchego/ids" warp "github.com/ava-labs/avalanchego/vms/platformvm/warp" - messages "github.com/ava-labs/icm-offchain-services/messages" - vms "github.com/ava-labs/icm-offchain-services/vms" + messages "github.com/ava-labs/icm-services/messages" + vms "github.com/ava-labs/icm-services/vms" common "github.com/ethereum/go-ethereum/common" gomock "go.uber.org/mock/gomock" ) diff --git a/messages/off-chain-registry/message_handler.go b/messages/off-chain-registry/message_handler.go index b8916b92..a3d0338b 100644 --- a/messages/off-chain-registry/message_handler.go +++ b/messages/off-chain-registry/message_handler.go @@ -12,9 +12,9 @@ import ( "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/vms/platformvm/warp" warpPayload "github.com/ava-labs/avalanchego/vms/platformvm/warp/payload" - "github.com/ava-labs/icm-offchain-services/messages" - "github.com/ava-labs/icm-offchain-services/relayer/config" - "github.com/ava-labs/icm-offchain-services/vms" + "github.com/ava-labs/icm-services/messages" + "github.com/ava-labs/icm-services/relayer/config" + "github.com/ava-labs/icm-services/vms" "github.com/ava-labs/subnet-evm/accounts/abi/bind" "github.com/ava-labs/subnet-evm/ethclient" teleporterregistry "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/registry/TeleporterRegistry" diff --git a/messages/off-chain-registry/message_handler_test.go b/messages/off-chain-registry/message_handler_test.go index ebd528e1..e2d7f698 100644 --- a/messages/off-chain-registry/message_handler_test.go +++ b/messages/off-chain-registry/message_handler_test.go @@ -12,9 +12,9 @@ import ( "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/vms/platformvm/warp" "github.com/ava-labs/avalanchego/vms/platformvm/warp/payload" - "github.com/ava-labs/icm-offchain-services/relayer/config" - mock_evm "github.com/ava-labs/icm-offchain-services/vms/evm/mocks" - mock_vms "github.com/ava-labs/icm-offchain-services/vms/mocks" + "github.com/ava-labs/icm-services/relayer/config" + mock_evm "github.com/ava-labs/icm-services/vms/evm/mocks" + mock_vms "github.com/ava-labs/icm-services/vms/mocks" teleporterregistry "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/registry/TeleporterRegistry" "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" diff --git a/messages/teleporter/message_handler.go b/messages/teleporter/message_handler.go index 7a41223b..036b53a2 100644 --- a/messages/teleporter/message_handler.go +++ b/messages/teleporter/message_handler.go @@ -13,11 +13,11 @@ import ( "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/vms/platformvm/warp" warpPayload "github.com/ava-labs/avalanchego/vms/platformvm/warp/payload" - "github.com/ava-labs/icm-offchain-services/messages" - pbDecider "github.com/ava-labs/icm-offchain-services/proto/pb/decider" - "github.com/ava-labs/icm-offchain-services/relayer/config" - "github.com/ava-labs/icm-offchain-services/utils" - "github.com/ava-labs/icm-offchain-services/vms" + "github.com/ava-labs/icm-services/messages" + pbDecider "github.com/ava-labs/icm-services/proto/pb/decider" + "github.com/ava-labs/icm-services/relayer/config" + "github.com/ava-labs/icm-services/utils" + "github.com/ava-labs/icm-services/vms" "github.com/ava-labs/subnet-evm/accounts/abi/bind" "github.com/ava-labs/subnet-evm/core/types" "github.com/ava-labs/subnet-evm/ethclient" diff --git a/messages/teleporter/message_handler_test.go b/messages/teleporter/message_handler_test.go index b0e87bf1..79ad30cd 100644 --- a/messages/teleporter/message_handler_test.go +++ b/messages/teleporter/message_handler_test.go @@ -11,9 +11,9 @@ import ( "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/vms/platformvm/warp" warpPayload "github.com/ava-labs/avalanchego/vms/platformvm/warp/payload" - "github.com/ava-labs/icm-offchain-services/relayer/config" - mock_evm "github.com/ava-labs/icm-offchain-services/vms/evm/mocks" - mock_vms "github.com/ava-labs/icm-offchain-services/vms/mocks" + "github.com/ava-labs/icm-services/relayer/config" + mock_evm "github.com/ava-labs/icm-services/vms/evm/mocks" + mock_vms "github.com/ava-labs/icm-services/vms/mocks" "github.com/ava-labs/subnet-evm/accounts/abi/bind" "github.com/ava-labs/subnet-evm/interfaces" teleportermessenger "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/TeleporterMessenger" diff --git a/peers/app_request_network.go b/peers/app_request_network.go index 84c14473..77cb6047 100644 --- a/peers/app_request_network.go +++ b/peers/app_request_network.go @@ -22,7 +22,7 @@ import ( "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/utils/set" "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/icm-offchain-services/peers/validators" + "github.com/ava-labs/icm-services/peers/validators" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" ) diff --git a/peers/config.go b/peers/config.go index ac31c205..f997b3fa 100644 --- a/peers/config.go +++ b/peers/config.go @@ -3,7 +3,7 @@ package peers -import "github.com/ava-labs/icm-offchain-services/config" +import "github.com/ava-labs/icm-services/config" // Config defines a common interface necessary for standing up an AppRequestNetwork. type Config interface { diff --git a/peers/info_client.go b/peers/info_client.go index 1ae20170..c5be6fd9 100644 --- a/peers/info_client.go +++ b/peers/info_client.go @@ -11,8 +11,8 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/rpc" "github.com/ava-labs/avalanchego/vms/platformvm/signer" - "github.com/ava-labs/icm-offchain-services/config" - "github.com/ava-labs/icm-offchain-services/peers/utils" + "github.com/ava-labs/icm-services/config" + "github.com/ava-labs/icm-services/peers/utils" ) // InfoAPI is a wrapper around the info.Client, diff --git a/peers/mocks/mock_app_request_network.go b/peers/mocks/mock_app_request_network.go index 06eb71cb..34e0d777 100644 --- a/peers/mocks/mock_app_request_network.go +++ b/peers/mocks/mock_app_request_network.go @@ -16,7 +16,7 @@ import ( message "github.com/ava-labs/avalanchego/message" subnets "github.com/ava-labs/avalanchego/subnets" set "github.com/ava-labs/avalanchego/utils/set" - peers "github.com/ava-labs/icm-offchain-services/peers" + peers "github.com/ava-labs/icm-services/peers" gomock "go.uber.org/mock/gomock" ) diff --git a/peers/utils/utils.go b/peers/utils/utils.go index b3643e06..405761dd 100644 --- a/peers/utils/utils.go +++ b/peers/utils/utils.go @@ -5,7 +5,7 @@ package utils import ( "github.com/ava-labs/avalanchego/utils/rpc" - "github.com/ava-labs/icm-offchain-services/config" + "github.com/ava-labs/icm-services/config" ) // InitializeOptions initializes the rpc options for an API diff --git a/peers/validators/canonical_validator_client.go b/peers/validators/canonical_validator_client.go index f6a4b11b..671cad9a 100644 --- a/peers/validators/canonical_validator_client.go +++ b/peers/validators/canonical_validator_client.go @@ -12,8 +12,8 @@ import ( "github.com/ava-labs/avalanchego/utils/rpc" "github.com/ava-labs/avalanchego/vms/platformvm" avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/icm-offchain-services/config" - "github.com/ava-labs/icm-offchain-services/peers/utils" + "github.com/ava-labs/icm-services/config" + "github.com/ava-labs/icm-services/peers/utils" "go.uber.org/zap" ) diff --git a/proto/decider/decider.proto b/proto/decider/decider.proto index 6e101c2b..0a7b5c8b 100644 --- a/proto/decider/decider.proto +++ b/proto/decider/decider.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package decider; -option go_package = "github.com/ava-labs/icm-offchain-services/proto/pb/decider"; +option go_package = "github.com/ava-labs/icm-services/proto/pb/decider"; service DeciderService { rpc ShouldSendMessage(ShouldSendMessageRequest) returns (ShouldSendMessageResponse); diff --git a/relayer/README.md b/relayer/README.md index 0e2d1a8e..8f5ef1ef 100644 --- a/relayer/README.md +++ b/relayer/README.md @@ -12,14 +12,14 @@ To get started easily, we provide a Dev Container specification, that can be use ### Download Prebuilt Binaries -Prebuilt binaries are available for download from the [releases page](https://github.com/ava-labs/icm-offchain-services/releases). +Prebuilt binaries are available for download from the [releases page](https://github.com/ava-labs/icm-services/releases). The following commands demonstrate how to download and install the v0.2.13 release of the relayer on MacOS. The exact commands will vary by platform. ```bash # Download the release tarball and checksums -curl -w '%{http_code}' -sL -o ~/Downloads/icm-relayer_0.2.13_darwin_arm64.tar.gz https://github.com/ava-labs/icm-offchain-services/releases/download/v0.2.13/icm-relayer_0.2.13_darwin_arm64.tar.gz -curl -w '%{http_code}' -sL -o ~/Downloads/icm-relayer_0.2.13_checksums.txt https://github.com/ava-labs/icm-offchain-services/releases/download/v0.2.13/icm-relayer_0.2.13_checksums.txt +curl -w '%{http_code}' -sL -o ~/Downloads/icm-relayer_0.2.13_darwin_arm64.tar.gz https://github.com/ava-labs/icm-services/releases/download/v0.2.13/icm-relayer_0.2.13_darwin_arm64.tar.gz +curl -w '%{http_code}' -sL -o ~/Downloads/icm-relayer_0.2.13_checksums.txt https://github.com/ava-labs/icm-services/releases/download/v0.2.13/icm-relayer_0.2.13_checksums.txt # (Optional) Verify the checksums cd ~/Downloads @@ -435,7 +435,7 @@ go generate ./... ### Generate Protobuf Files -[buf](github.com/bufbuild/buf/) is used to generate protobuf definitions for communication with the [Decider service](https://github.com/ava-labs/icm-offchain-services/blob/main/proto/decider/decider.proto). If you change any of the protobuf definitions you will have to regenerate the `.go` files. To generate these files, run the following command at the root of the project: +[buf](github.com/bufbuild/buf/) is used to generate protobuf definitions for communication with the [Decider service](https://github.com/ava-labs/icm-services/blob/main/proto/decider/decider.proto). If you change any of the protobuf definitions you will have to regenerate the `.go` files. To generate these files, run the following command at the root of the project: ```bash ./scripts/protobuf_codegen.sh diff --git a/relayer/api/relay_message.go b/relayer/api/relay_message.go index 72d6321b..ffecaa75 100644 --- a/relayer/api/relay_message.go +++ b/relayer/api/relay_message.go @@ -6,9 +6,9 @@ import ( "net/http" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/icm-offchain-services/relayer" - "github.com/ava-labs/icm-offchain-services/types" - "github.com/ava-labs/icm-offchain-services/utils" + "github.com/ava-labs/icm-services/relayer" + "github.com/ava-labs/icm-services/types" + "github.com/ava-labs/icm-services/utils" "github.com/ethereum/go-ethereum/common" "go.uber.org/zap" ) diff --git a/relayer/application_relayer.go b/relayer/application_relayer.go index 7841ac72..c80a1359 100644 --- a/relayer/application_relayer.go +++ b/relayer/application_relayer.go @@ -12,13 +12,13 @@ import ( "github.com/ava-labs/avalanchego/utils/constants" "github.com/ava-labs/avalanchego/utils/logging" avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/icm-offchain-services/database" - "github.com/ava-labs/icm-offchain-services/messages" - "github.com/ava-labs/icm-offchain-services/peers" - "github.com/ava-labs/icm-offchain-services/relayer/config" - "github.com/ava-labs/icm-offchain-services/signature-aggregator/aggregator" - "github.com/ava-labs/icm-offchain-services/utils" - "github.com/ava-labs/icm-offchain-services/vms" + "github.com/ava-labs/icm-services/database" + "github.com/ava-labs/icm-services/messages" + "github.com/ava-labs/icm-services/peers" + "github.com/ava-labs/icm-services/relayer/config" + "github.com/ava-labs/icm-services/signature-aggregator/aggregator" + "github.com/ava-labs/icm-services/utils" + "github.com/ava-labs/icm-services/vms" "github.com/ava-labs/subnet-evm/rpc" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" diff --git a/relayer/checkpoint/checkpoint.go b/relayer/checkpoint/checkpoint.go index 1b522a71..8bf872a0 100644 --- a/relayer/checkpoint/checkpoint.go +++ b/relayer/checkpoint/checkpoint.go @@ -9,8 +9,8 @@ import ( "sync" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/icm-offchain-services/database" - "github.com/ava-labs/icm-offchain-services/utils" + "github.com/ava-labs/icm-services/database" + "github.com/ava-labs/icm-services/utils" "go.uber.org/zap" ) diff --git a/relayer/checkpoint/checkpoint_test.go b/relayer/checkpoint/checkpoint_test.go index 47e6c22c..b31b3243 100644 --- a/relayer/checkpoint/checkpoint_test.go +++ b/relayer/checkpoint/checkpoint_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/icm-offchain-services/database" - mock_database "github.com/ava-labs/icm-offchain-services/database/mocks" - "github.com/ava-labs/icm-offchain-services/utils" + "github.com/ava-labs/icm-services/database" + mock_database "github.com/ava-labs/icm-services/database/mocks" + "github.com/ava-labs/icm-services/utils" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" "github.com/stretchr/testify/require" diff --git a/relayer/config/config.go b/relayer/config/config.go index 9da0ba8e..9de79a8e 100644 --- a/relayer/config/config.go +++ b/relayer/config/config.go @@ -10,8 +10,8 @@ import ( "net/url" "time" - basecfg "github.com/ava-labs/icm-offchain-services/config" - "github.com/ava-labs/icm-offchain-services/peers" + basecfg "github.com/ava-labs/icm-services/config" + "github.com/ava-labs/icm-services/peers" "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/constants" diff --git a/relayer/config/config_test.go b/relayer/config/config_test.go index a6de753e..e6c700fc 100644 --- a/relayer/config/config_test.go +++ b/relayer/config/config_test.go @@ -12,9 +12,9 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/set" - basecfg "github.com/ava-labs/icm-offchain-services/config" - "github.com/ava-labs/icm-offchain-services/utils" - mock_ethclient "github.com/ava-labs/icm-offchain-services/vms/evm/mocks" + basecfg "github.com/ava-labs/icm-services/config" + "github.com/ava-labs/icm-services/utils" + mock_ethclient "github.com/ava-labs/icm-services/vms/evm/mocks" "github.com/ava-labs/subnet-evm/params" "github.com/ava-labs/subnet-evm/precompile/contracts/warp" "github.com/stretchr/testify/require" diff --git a/relayer/config/destination_blockchain.go b/relayer/config/destination_blockchain.go index 049ecaeb..7c710771 100644 --- a/relayer/config/destination_blockchain.go +++ b/relayer/config/destination_blockchain.go @@ -6,8 +6,8 @@ import ( "fmt" "github.com/ava-labs/avalanchego/ids" - basecfg "github.com/ava-labs/icm-offchain-services/config" - "github.com/ava-labs/icm-offchain-services/utils" + basecfg "github.com/ava-labs/icm-services/config" + "github.com/ava-labs/icm-services/utils" "github.com/ethereum/go-ethereum/crypto" ) diff --git a/relayer/config/source_blockchain.go b/relayer/config/source_blockchain.go index 8162ce46..6a73f7b8 100644 --- a/relayer/config/source_blockchain.go +++ b/relayer/config/source_blockchain.go @@ -5,8 +5,8 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/set" - basecfg "github.com/ava-labs/icm-offchain-services/config" - "github.com/ava-labs/icm-offchain-services/utils" + basecfg "github.com/ava-labs/icm-services/config" + "github.com/ava-labs/icm-services/utils" "github.com/ethereum/go-ethereum/common" ) diff --git a/relayer/config/test_utils.go b/relayer/config/test_utils.go index 6683e6af..edb97f2b 100644 --- a/relayer/config/test_utils.go +++ b/relayer/config/test_utils.go @@ -5,7 +5,7 @@ package config import ( "fmt" - basecfg "github.com/ava-labs/icm-offchain-services/config" + basecfg "github.com/ava-labs/icm-services/config" ) var ( diff --git a/relayer/config/viper.go b/relayer/config/viper.go index c8edf2c5..1f0b6279 100644 --- a/relayer/config/viper.go +++ b/relayer/config/viper.go @@ -8,7 +8,7 @@ import ( "os" "strings" - "github.com/ava-labs/icm-offchain-services/utils" + "github.com/ava-labs/icm-services/utils" "github.com/spf13/pflag" "github.com/spf13/viper" ) diff --git a/relayer/config/viper_test.go b/relayer/config/viper_test.go index 69b11ba6..ec7f289e 100644 --- a/relayer/config/viper_test.go +++ b/relayer/config/viper_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - basecfg "github.com/ava-labs/icm-offchain-services/config" + basecfg "github.com/ava-labs/icm-services/config" "github.com/spf13/viper" "github.com/stretchr/testify/require" diff --git a/relayer/listener.go b/relayer/listener.go index d04d4e9c..e13d3f8e 100644 --- a/relayer/listener.go +++ b/relayer/listener.go @@ -11,9 +11,9 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/icm-offchain-services/relayer/config" - "github.com/ava-labs/icm-offchain-services/utils" - "github.com/ava-labs/icm-offchain-services/vms" + "github.com/ava-labs/icm-services/relayer/config" + "github.com/ava-labs/icm-services/utils" + "github.com/ava-labs/icm-services/vms" "github.com/ava-labs/subnet-evm/ethclient" "go.uber.org/atomic" "go.uber.org/zap" diff --git a/relayer/main/main.go b/relayer/main/main.go index c0174528..6a4f278f 100644 --- a/relayer/main/main.go +++ b/relayer/main/main.go @@ -18,19 +18,19 @@ import ( "github.com/ava-labs/avalanchego/utils/constants" "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/utils/set" - "github.com/ava-labs/icm-offchain-services/database" - "github.com/ava-labs/icm-offchain-services/messages" - offchainregistry "github.com/ava-labs/icm-offchain-services/messages/off-chain-registry" - "github.com/ava-labs/icm-offchain-services/messages/teleporter" - "github.com/ava-labs/icm-offchain-services/peers" - "github.com/ava-labs/icm-offchain-services/relayer" - "github.com/ava-labs/icm-offchain-services/relayer/api" - "github.com/ava-labs/icm-offchain-services/relayer/checkpoint" - "github.com/ava-labs/icm-offchain-services/relayer/config" - "github.com/ava-labs/icm-offchain-services/signature-aggregator/aggregator" - sigAggMetrics "github.com/ava-labs/icm-offchain-services/signature-aggregator/metrics" - "github.com/ava-labs/icm-offchain-services/utils" - "github.com/ava-labs/icm-offchain-services/vms" + "github.com/ava-labs/icm-services/database" + "github.com/ava-labs/icm-services/messages" + offchainregistry "github.com/ava-labs/icm-services/messages/off-chain-registry" + "github.com/ava-labs/icm-services/messages/teleporter" + "github.com/ava-labs/icm-services/peers" + "github.com/ava-labs/icm-services/relayer" + "github.com/ava-labs/icm-services/relayer/api" + "github.com/ava-labs/icm-services/relayer/checkpoint" + "github.com/ava-labs/icm-services/relayer/config" + "github.com/ava-labs/icm-services/signature-aggregator/aggregator" + sigAggMetrics "github.com/ava-labs/icm-services/signature-aggregator/metrics" + "github.com/ava-labs/icm-services/utils" + "github.com/ava-labs/icm-services/vms" "github.com/ava-labs/subnet-evm/ethclient" "github.com/ethereum/go-ethereum/common" "github.com/prometheus/client_golang/prometheus" diff --git a/relayer/message_coordinator.go b/relayer/message_coordinator.go index 5cf32d22..94807669 100644 --- a/relayer/message_coordinator.go +++ b/relayer/message_coordinator.go @@ -11,9 +11,9 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/icm-offchain-services/database" - "github.com/ava-labs/icm-offchain-services/messages" - relayerTypes "github.com/ava-labs/icm-offchain-services/types" + "github.com/ava-labs/icm-services/database" + "github.com/ava-labs/icm-services/messages" + relayerTypes "github.com/ava-labs/icm-services/types" "github.com/ava-labs/subnet-evm/core/types" "github.com/ava-labs/subnet-evm/ethclient" "github.com/ava-labs/subnet-evm/interfaces" diff --git a/relayer/network_utils.go b/relayer/network_utils.go index 442643d8..5876a4f1 100644 --- a/relayer/network_utils.go +++ b/relayer/network_utils.go @@ -10,9 +10,9 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/constants" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/icm-offchain-services/peers" - "github.com/ava-labs/icm-offchain-services/relayer/config" - "github.com/ava-labs/icm-offchain-services/utils" + "github.com/ava-labs/icm-services/peers" + "github.com/ava-labs/icm-services/relayer/config" + "github.com/ava-labs/icm-services/utils" "go.uber.org/zap" ) diff --git a/scripts/e2e_test.sh b/scripts/e2e_test.sh index 936c391c..94503a7e 100755 --- a/scripts/e2e_test.sh +++ b/scripts/e2e_test.sh @@ -22,7 +22,7 @@ done if [ "$HELP" = true ]; then echo "Usage: ./scripts/e2e_test.sh [OPTIONS]" - echo "Run E2E tests for ICM Off-chain Services." + echo "Run E2E tests for ICM Services." echo "" echo "Options:" echo " -l, --local Run the test locally. Requires --subnet-evm and --data-dir" diff --git a/scripts/test.sh b/scripts/test.sh index 28dfc377..34e5e9f8 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -18,7 +18,7 @@ done if [ "$HELP" = true ]; then echo "Usage: ./scripts/test.sh [OPTIONS]" - echo "Run unit tests for ICM Off-chain Services." + echo "Run unit tests for ICM Services." echo "" echo "Options:" echo " -v, --verbose Run the test with verbose output" diff --git a/signature-aggregator/README.md b/signature-aggregator/README.md index 55344407..50087791 100644 --- a/signature-aggregator/README.md +++ b/signature-aggregator/README.md @@ -10,7 +10,7 @@ To build the application run `scripts/build_signature_aggregator.sh` which will ## Running To run the binary you must supply a config file via `./signature-aggregator --config-file` -Currently required configurations are a small subset of the [`icm-relayer` configuration](https://github.com/ava-labs/icm-offchain-services?tab=readme-ov-file#configuration). +Currently required configurations are a small subset of the [`icm-relayer` configuration](https://github.com/ava-labs/icm-services?tab=readme-ov-file#configuration). Namely: - `LogLevel`: string diff --git a/signature-aggregator/aggregator/aggregator.go b/signature-aggregator/aggregator/aggregator.go index 1e02ed01..7aad394b 100644 --- a/signature-aggregator/aggregator/aggregator.go +++ b/signature-aggregator/aggregator/aggregator.go @@ -26,10 +26,10 @@ import ( "github.com/ava-labs/avalanchego/utils/set" avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" corethMsg "github.com/ava-labs/coreth/plugin/evm/message" - "github.com/ava-labs/icm-offchain-services/peers" - "github.com/ava-labs/icm-offchain-services/signature-aggregator/aggregator/cache" - "github.com/ava-labs/icm-offchain-services/signature-aggregator/metrics" - "github.com/ava-labs/icm-offchain-services/utils" + "github.com/ava-labs/icm-services/peers" + "github.com/ava-labs/icm-services/signature-aggregator/aggregator/cache" + "github.com/ava-labs/icm-services/signature-aggregator/metrics" + "github.com/ava-labs/icm-services/utils" msg "github.com/ava-labs/subnet-evm/plugin/evm/message" "go.uber.org/zap" "google.golang.org/protobuf/proto" diff --git a/signature-aggregator/aggregator/aggregator_test.go b/signature-aggregator/aggregator/aggregator_test.go index 94a2428b..c3fe9713 100644 --- a/signature-aggregator/aggregator/aggregator_test.go +++ b/signature-aggregator/aggregator/aggregator_test.go @@ -18,9 +18,9 @@ import ( "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/utils/set" "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/icm-offchain-services/peers" - "github.com/ava-labs/icm-offchain-services/peers/mocks" - "github.com/ava-labs/icm-offchain-services/signature-aggregator/metrics" + "github.com/ava-labs/icm-services/peers" + "github.com/ava-labs/icm-services/peers/mocks" + "github.com/ava-labs/icm-services/signature-aggregator/metrics" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/signature-aggregator/api/api.go b/signature-aggregator/api/api.go index 615b8d8b..ea782817 100644 --- a/signature-aggregator/api/api.go +++ b/signature-aggregator/api/api.go @@ -12,10 +12,10 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/icm-offchain-services/signature-aggregator/aggregator" - "github.com/ava-labs/icm-offchain-services/signature-aggregator/metrics" - "github.com/ava-labs/icm-offchain-services/types" - "github.com/ava-labs/icm-offchain-services/utils" + "github.com/ava-labs/icm-services/signature-aggregator/aggregator" + "github.com/ava-labs/icm-services/signature-aggregator/metrics" + "github.com/ava-labs/icm-services/types" + "github.com/ava-labs/icm-services/utils" "go.uber.org/zap" ) diff --git a/signature-aggregator/config/config.go b/signature-aggregator/config/config.go index d76a521c..9dd8525a 100644 --- a/signature-aggregator/config/config.go +++ b/signature-aggregator/config/config.go @@ -8,8 +8,8 @@ import ( "time" "github.com/ava-labs/avalanchego/utils/logging" - basecfg "github.com/ava-labs/icm-offchain-services/config" - "github.com/ava-labs/icm-offchain-services/peers" + basecfg "github.com/ava-labs/icm-services/config" + "github.com/ava-labs/icm-services/peers" ) const ( diff --git a/signature-aggregator/main/main.go b/signature-aggregator/main/main.go index 140beac7..7849fd89 100644 --- a/signature-aggregator/main/main.go +++ b/signature-aggregator/main/main.go @@ -13,12 +13,12 @@ import ( "github.com/ava-labs/avalanchego/message" "github.com/ava-labs/avalanchego/utils/constants" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/icm-offchain-services/peers" - "github.com/ava-labs/icm-offchain-services/signature-aggregator/aggregator" - "github.com/ava-labs/icm-offchain-services/signature-aggregator/api" - "github.com/ava-labs/icm-offchain-services/signature-aggregator/config" - "github.com/ava-labs/icm-offchain-services/signature-aggregator/healthcheck" - "github.com/ava-labs/icm-offchain-services/signature-aggregator/metrics" + "github.com/ava-labs/icm-services/peers" + "github.com/ava-labs/icm-services/signature-aggregator/aggregator" + "github.com/ava-labs/icm-services/signature-aggregator/api" + "github.com/ava-labs/icm-services/signature-aggregator/config" + "github.com/ava-labs/icm-services/signature-aggregator/healthcheck" + "github.com/ava-labs/icm-services/signature-aggregator/metrics" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" ) diff --git a/tests/allowed_addresses.go b/tests/allowed_addresses.go index 61f72915..9f52cee4 100644 --- a/tests/allowed_addresses.go +++ b/tests/allowed_addresses.go @@ -8,9 +8,9 @@ import ( "time" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/icm-offchain-services/database" - "github.com/ava-labs/icm-offchain-services/relayer/config" - testUtils "github.com/ava-labs/icm-offchain-services/tests/utils" + "github.com/ava-labs/icm-services/database" + "github.com/ava-labs/icm-services/relayer/config" + testUtils "github.com/ava-labs/icm-services/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" "github.com/ava-labs/teleporter/tests/interfaces" "github.com/ava-labs/teleporter/tests/utils" diff --git a/tests/basic_relay.go b/tests/basic_relay.go index df60ada3..8c860010 100644 --- a/tests/basic_relay.go +++ b/tests/basic_relay.go @@ -9,8 +9,8 @@ import ( "time" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/icm-offchain-services/database" - testUtils "github.com/ava-labs/icm-offchain-services/tests/utils" + "github.com/ava-labs/icm-services/database" + testUtils "github.com/ava-labs/icm-services/tests/utils" "github.com/ava-labs/subnet-evm/core/types" "github.com/ava-labs/teleporter/tests/interfaces" "github.com/ava-labs/teleporter/tests/utils" diff --git a/tests/batch_relay.go b/tests/batch_relay.go index a1dbb408..ea489be3 100644 --- a/tests/batch_relay.go +++ b/tests/batch_relay.go @@ -8,7 +8,7 @@ import ( "time" "github.com/ava-labs/avalanchego/utils/set" - testUtils "github.com/ava-labs/icm-offchain-services/tests/utils" + testUtils "github.com/ava-labs/icm-services/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" "github.com/ava-labs/subnet-evm/core/types" "github.com/ava-labs/teleporter/tests/interfaces" diff --git a/tests/cmd/decider/main.go b/tests/cmd/decider/main.go index 85e07035..dd56d79c 100644 --- a/tests/cmd/decider/main.go +++ b/tests/cmd/decider/main.go @@ -9,7 +9,7 @@ import ( "log" "net" - pb "github.com/ava-labs/icm-offchain-services/proto/pb/decider" + pb "github.com/ava-labs/icm-services/proto/pb/decider" "google.golang.org/grpc" ) diff --git a/tests/e2e_test.go b/tests/e2e_test.go index d5988ff3..fda24022 100644 --- a/tests/e2e_test.go +++ b/tests/e2e_test.go @@ -15,8 +15,8 @@ import ( "testing" "time" - testUtils "github.com/ava-labs/icm-offchain-services/tests/utils" - "github.com/ava-labs/icm-offchain-services/utils" + testUtils "github.com/ava-labs/icm-services/tests/utils" + "github.com/ava-labs/icm-services/utils" "github.com/ava-labs/teleporter/tests/local" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/log" @@ -59,7 +59,7 @@ var _ = ginkgo.BeforeSuite(func() { var ctx context.Context ctx, cancelFn = context.WithCancel(context.Background()) - log.Info("Building all ICM off-chain service executables") + log.Info("Building all ICM service executables") testUtils.BuildAllExecutables(ctx) // Generate the Teleporter deployment values diff --git a/tests/etna_upgrade.go b/tests/etna_upgrade.go index 9697a9d3..997da3a5 100644 --- a/tests/etna_upgrade.go +++ b/tests/etna_upgrade.go @@ -7,7 +7,7 @@ import ( "context" "time" - testUtils "github.com/ava-labs/icm-offchain-services/tests/utils" + testUtils "github.com/ava-labs/icm-services/tests/utils" "github.com/ava-labs/teleporter/tests/interfaces" "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/crypto" diff --git a/tests/manual_message.go b/tests/manual_message.go index d4b2d7e4..9d0eb6a9 100644 --- a/tests/manual_message.go +++ b/tests/manual_message.go @@ -12,9 +12,9 @@ import ( "net/http" "time" - offchainregistry "github.com/ava-labs/icm-offchain-services/messages/off-chain-registry" - "github.com/ava-labs/icm-offchain-services/relayer/api" - testUtils "github.com/ava-labs/icm-offchain-services/tests/utils" + offchainregistry "github.com/ava-labs/icm-services/messages/off-chain-registry" + "github.com/ava-labs/icm-services/relayer/api" + testUtils "github.com/ava-labs/icm-services/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" "github.com/ava-labs/teleporter/tests/interfaces" teleporterTestUtils "github.com/ava-labs/teleporter/tests/utils" diff --git a/tests/relay_message_api.go b/tests/relay_message_api.go index 0e09e703..58af68b8 100644 --- a/tests/relay_message_api.go +++ b/tests/relay_message_api.go @@ -14,8 +14,8 @@ import ( "github.com/ava-labs/avalanchego/ids" avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/icm-offchain-services/relayer/api" - testUtils "github.com/ava-labs/icm-offchain-services/tests/utils" + "github.com/ava-labs/icm-services/relayer/api" + testUtils "github.com/ava-labs/icm-services/tests/utils" "github.com/ava-labs/subnet-evm/core/types" subnetEvmInterfaces "github.com/ava-labs/subnet-evm/interfaces" "github.com/ava-labs/subnet-evm/precompile/contracts/warp" diff --git a/tests/shared_db.go b/tests/shared_db.go index 805120cd..b6715472 100644 --- a/tests/shared_db.go +++ b/tests/shared_db.go @@ -4,7 +4,7 @@ import ( "context" "sync" - testUtils "github.com/ava-labs/icm-offchain-services/tests/utils" + testUtils "github.com/ava-labs/icm-services/tests/utils" "github.com/ava-labs/teleporter/tests/interfaces" "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/crypto" diff --git a/tests/signature_aggregator_api.go b/tests/signature_aggregator_api.go index 68970682..08d8ef30 100644 --- a/tests/signature_aggregator_api.go +++ b/tests/signature_aggregator_api.go @@ -17,9 +17,9 @@ import ( "time" avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/icm-offchain-services/signature-aggregator/api" - "github.com/ava-labs/icm-offchain-services/signature-aggregator/metrics" - testUtils "github.com/ava-labs/icm-offchain-services/tests/utils" + "github.com/ava-labs/icm-services/signature-aggregator/api" + "github.com/ava-labs/icm-services/signature-aggregator/metrics" + testUtils "github.com/ava-labs/icm-services/tests/utils" "github.com/ava-labs/teleporter/tests/interfaces" "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/log" diff --git a/tests/utils/utils.go b/tests/utils/utils.go index 1178a188..e77ddfaf 100644 --- a/tests/utils/utils.go +++ b/tests/utils/utils.go @@ -19,12 +19,12 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/icm-offchain-services/config" - offchainregistry "github.com/ava-labs/icm-offchain-services/messages/off-chain-registry" - relayercfg "github.com/ava-labs/icm-offchain-services/relayer/config" - signatureaggregatorcfg "github.com/ava-labs/icm-offchain-services/signature-aggregator/config" - batchcrosschainmessenger "github.com/ava-labs/icm-offchain-services/tests/abi-bindings/go/BatchCrossChainMessenger" - relayerUtils "github.com/ava-labs/icm-offchain-services/utils" + "github.com/ava-labs/icm-services/config" + offchainregistry "github.com/ava-labs/icm-services/messages/off-chain-registry" + relayercfg "github.com/ava-labs/icm-services/relayer/config" + signatureaggregatorcfg "github.com/ava-labs/icm-services/signature-aggregator/config" + batchcrosschainmessenger "github.com/ava-labs/icm-services/tests/abi-bindings/go/BatchCrossChainMessenger" + relayerUtils "github.com/ava-labs/icm-services/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" "github.com/ava-labs/subnet-evm/core/types" teleportermessenger "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/TeleporterMessenger" diff --git a/tests/warp_api.go b/tests/warp_api.go index efece8d9..5a1a0563 100644 --- a/tests/warp_api.go +++ b/tests/warp_api.go @@ -13,7 +13,7 @@ import ( "strings" "time" - testUtils "github.com/ava-labs/icm-offchain-services/tests/utils" + testUtils "github.com/ava-labs/icm-services/tests/utils" "github.com/ava-labs/teleporter/tests/interfaces" "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/crypto" diff --git a/types/types.go b/types/types.go index a717eeda..cbb00b35 100644 --- a/types/types.go +++ b/types/types.go @@ -8,7 +8,7 @@ import ( "errors" avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/icm-offchain-services/utils" + "github.com/ava-labs/icm-services/utils" "github.com/ava-labs/subnet-evm/core/types" "github.com/ava-labs/subnet-evm/ethclient" "github.com/ava-labs/subnet-evm/interfaces" diff --git a/vms/contract_message.go b/vms/contract_message.go index 1ef6b275..3a4b2022 100644 --- a/vms/contract_message.go +++ b/vms/contract_message.go @@ -6,8 +6,8 @@ package vms import ( "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/icm-offchain-services/relayer/config" - "github.com/ava-labs/icm-offchain-services/vms/evm" + "github.com/ava-labs/icm-services/relayer/config" + "github.com/ava-labs/icm-services/vms/evm" ) type ContractMessage interface { diff --git a/vms/destination_client.go b/vms/destination_client.go index 932633dc..81103b01 100644 --- a/vms/destination_client.go +++ b/vms/destination_client.go @@ -11,8 +11,8 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/icm-offchain-services/relayer/config" - "github.com/ava-labs/icm-offchain-services/vms/evm" + "github.com/ava-labs/icm-services/relayer/config" + "github.com/ava-labs/icm-services/vms/evm" "github.com/ethereum/go-ethereum/common" "go.uber.org/zap" ) diff --git a/vms/evm/contract_message.go b/vms/evm/contract_message.go index a76161a8..c0b90631 100644 --- a/vms/evm/contract_message.go +++ b/vms/evm/contract_message.go @@ -8,7 +8,7 @@ import ( "github.com/ava-labs/avalanchego/utils/logging" avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/icm-offchain-services/relayer/config" + "github.com/ava-labs/icm-services/relayer/config" "github.com/ava-labs/subnet-evm/precompile/contracts/warp" "go.uber.org/zap" ) diff --git a/vms/evm/contract_message_test.go b/vms/evm/contract_message_test.go index 42c6886f..eab323ae 100644 --- a/vms/evm/contract_message_test.go +++ b/vms/evm/contract_message_test.go @@ -13,7 +13,7 @@ import ( "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/vms/platformvm/warp" warpPayload "github.com/ava-labs/avalanchego/vms/platformvm/warp/payload" - "github.com/ava-labs/icm-offchain-services/relayer/config" + "github.com/ava-labs/icm-services/relayer/config" "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" ) diff --git a/vms/evm/destination_client.go b/vms/evm/destination_client.go index c1809880..9c1579b8 100644 --- a/vms/evm/destination_client.go +++ b/vms/evm/destination_client.go @@ -13,9 +13,9 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/logging" avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" - "github.com/ava-labs/icm-offchain-services/relayer/config" - "github.com/ava-labs/icm-offchain-services/utils" - "github.com/ava-labs/icm-offchain-services/vms/evm/signer" + "github.com/ava-labs/icm-services/relayer/config" + "github.com/ava-labs/icm-services/utils" + "github.com/ava-labs/icm-services/vms/evm/signer" "github.com/ava-labs/subnet-evm/core/types" "github.com/ava-labs/subnet-evm/ethclient" "github.com/ava-labs/subnet-evm/precompile/contracts/warp" diff --git a/vms/evm/destination_client_test.go b/vms/evm/destination_client_test.go index 1feb50e7..36b82b9d 100644 --- a/vms/evm/destination_client_test.go +++ b/vms/evm/destination_client_test.go @@ -11,10 +11,10 @@ import ( "github.com/ava-labs/avalanchego/utils/logging" avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" - basecfg "github.com/ava-labs/icm-offchain-services/config" - "github.com/ava-labs/icm-offchain-services/relayer/config" - mock_ethclient "github.com/ava-labs/icm-offchain-services/vms/evm/mocks" - "github.com/ava-labs/icm-offchain-services/vms/evm/signer" + basecfg "github.com/ava-labs/icm-services/config" + "github.com/ava-labs/icm-services/relayer/config" + mock_ethclient "github.com/ava-labs/icm-services/vms/evm/mocks" + "github.com/ava-labs/icm-services/vms/evm/signer" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" ) diff --git a/vms/evm/signer/signer.go b/vms/evm/signer/signer.go index fc96ab90..dc74bd75 100644 --- a/vms/evm/signer/signer.go +++ b/vms/evm/signer/signer.go @@ -6,7 +6,7 @@ package signer import ( "math/big" - "github.com/ava-labs/icm-offchain-services/relayer/config" + "github.com/ava-labs/icm-services/relayer/config" "github.com/ava-labs/subnet-evm/core/types" "github.com/ethereum/go-ethereum/common" ) diff --git a/vms/evm/signer/tx_signer.go b/vms/evm/signer/tx_signer.go index 360fb290..73a04bb6 100644 --- a/vms/evm/signer/tx_signer.go +++ b/vms/evm/signer/tx_signer.go @@ -9,7 +9,7 @@ import ( "math/big" "runtime" - "github.com/ava-labs/icm-offchain-services/utils" + "github.com/ava-labs/icm-services/utils" "github.com/ava-labs/subnet-evm/core/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" diff --git a/vms/evm/signer/tx_signer_test.go b/vms/evm/signer/tx_signer_test.go index b3e93c9d..aac4ddc7 100644 --- a/vms/evm/signer/tx_signer_test.go +++ b/vms/evm/signer/tx_signer_test.go @@ -8,8 +8,8 @@ import ( "math/big" "testing" - "github.com/ava-labs/icm-offchain-services/relayer/config" - "github.com/ava-labs/icm-offchain-services/utils" + "github.com/ava-labs/icm-services/relayer/config" + "github.com/ava-labs/icm-services/utils" "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" ) diff --git a/vms/evm/subscriber_test.go b/vms/evm/subscriber_test.go index 15a7c1d3..9691956b 100644 --- a/vms/evm/subscriber_test.go +++ b/vms/evm/subscriber_test.go @@ -9,9 +9,9 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/logging" - basecfg "github.com/ava-labs/icm-offchain-services/config" - "github.com/ava-labs/icm-offchain-services/relayer/config" - mock_ethclient "github.com/ava-labs/icm-offchain-services/vms/evm/mocks" + basecfg "github.com/ava-labs/icm-services/config" + "github.com/ava-labs/icm-services/relayer/config" + mock_ethclient "github.com/ava-labs/icm-services/vms/evm/mocks" "github.com/ava-labs/subnet-evm/core/types" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/vms/subscriber.go b/vms/subscriber.go index 0168ac6b..7a4db649 100644 --- a/vms/subscriber.go +++ b/vms/subscriber.go @@ -8,8 +8,8 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/logging" - "github.com/ava-labs/icm-offchain-services/relayer/config" - "github.com/ava-labs/icm-offchain-services/vms/evm" + "github.com/ava-labs/icm-services/relayer/config" + "github.com/ava-labs/icm-services/vms/evm" "github.com/ava-labs/subnet-evm/core/types" "github.com/ava-labs/subnet-evm/ethclient" ) From d8d4134c1a194cd0959cc6d71076d9d42ca735e8 Mon Sep 17 00:00:00 2001 From: Ian Suvak Date: Fri, 22 Nov 2024 15:46:11 -0500 Subject: [PATCH 8/8] update proto --- proto/pb/decider/decider.pb.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/proto/pb/decider/decider.pb.go b/proto/pb/decider/decider.pb.go index cb818b61..5fc13034 100644 --- a/proto/pb/decider/decider.pb.go +++ b/proto/pb/decider/decider.pb.go @@ -170,12 +170,11 @@ var file_decider_decider_proto_rawDesc = []byte{ 0x53, 0x68, 0x6f, 0x75, 0x6c, 0x64, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x64, 0x65, 0x63, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x53, 0x68, 0x6f, 0x75, 0x6c, 0x64, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x65, 0x73, - 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x3c, 0x5a, 0x3a, + 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x33, 0x5a, 0x31, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x76, 0x61, 0x2d, 0x6c, - 0x61, 0x62, 0x73, 0x2f, 0x69, 0x63, 0x6d, 0x2d, 0x6f, 0x66, 0x66, 0x63, 0x68, 0x61, 0x69, 0x6e, - 0x2d, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, - 0x70, 0x62, 0x2f, 0x64, 0x65, 0x63, 0x69, 0x64, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x61, 0x62, 0x73, 0x2f, 0x69, 0x63, 0x6d, 0x2d, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, + 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x2f, 0x64, 0x65, 0x63, 0x69, 0x64, 0x65, + 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var (