Merge pull request #551 from ava-labs/rename

Rename away from warp

.devcontainer/devcontainer.json

@@ -1,15 +1,13 @@
 // For format details, see https://aka.ms/devcontainer.json.
 {
-	"name": "AWM Relayer DevContainer",
-
+	"name": "ICM Services DevContainer",
 	"image": "golang:latest",
-	"runArgs": ["--network=host"],
-
+	"runArgs": [
+		"--network=host"
+	],
 	"remoteUser": "root",
-
 	"remoteEnv": {
 		"PATH": "${containerEnv:PATH}:${containerWorkspaceFolder}/build"
 	},
-
 	"postCreateCommand": "scripts/build.sh"
 }

.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-services.
 title: ''
 labels: enhancement
 assignees: ''

.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

.github/workflows/release_awm_relayer.yml → .github/workflows/release_icm_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:

.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

CONTRIBUTING.md

@@ -1,24 +1,24 @@
-# How to Contribute to AWM Relayer
+# How to Contribute to ICM Services
 
 ## Setup
 
-To start developing on AWM Relayer, 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 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 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/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-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/awm-relayer/discussions/categories/ideas).
-- Post a thread about your idea and why it should be added to AWM Relayer.
+- 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 AWM 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 Services under GitHub [discussions](https://github.com/ava-labs/icm-services/discussions/categories/q-a).

README.md

@@ -1,10 +1,10 @@
-# Avalanche ICM Off-chain Services
+# Avalanche ICM Services
 
 This repository contains off-chain services that help support Avalanche Interchain Messaging (ICM).
 
 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.
@@ -66,5 +66,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
 ```

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-services/relayer/config"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/pkg/errors"
 	"go.uber.org/zap"

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-services/relayer/config"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"

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,

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-services/relayer/config"
+	"github.com/ava-labs/icm-services/utils"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 )

go.mod

@@ -1,4 +1,4 @@
-module github.com/ava-labs/awm-relayer
+module github.com/ava-labs/icm-services
 
 go 1.22.8
 
@@ -34,6 +34,7 @@ require (
 	github.com/DataDog/zstd v1.5.2 // indirect
 	github.com/NYTimes/gziphandler v1.1.1 // indirect
 	github.com/VictoriaMetrics/fastcache v1.12.1 // indirect
+	github.com/ava-labs/awm-relayer v1.4.1-0.20241122193929-3dae643932ee // indirect
 	github.com/aws/aws-sdk-go-v2/credentials v1.17.46 // indirect
 	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.20 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.24 // indirect

go.sum

@@ -62,6 +62,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPd
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/ava-labs/avalanchego v1.12.0-initial-poc.9.0.20241122192639-7c3ad181c928 h1:th+K+wWgAYL/NsrFJyO+/sThLRdEDE0+I4vgbPLoWQQ=
 github.com/ava-labs/avalanchego v1.12.0-initial-poc.9.0.20241122192639-7c3ad181c928/go.mod h1:yhD5dpZyStIVbxQ550EDi5w5SL7DQ/xGE6TIxosb7U0=
+github.com/ava-labs/awm-relayer v1.4.1-0.20241122193929-3dae643932ee h1:Op1rpuqFo28RnurIfQRCgMmjpRzCcXmbRoCC0I3+NOo=
+github.com/ava-labs/awm-relayer v1.4.1-0.20241122193929-3dae643932ee/go.mod h1:2/GCie3ccW/rVJfOJmJyiGDjtZILWujpB/r/KcVV8/s=
 github.com/ava-labs/coreth v0.13.9-rc.1 h1:qIICpC/OZGYUP37QnLgIqqwGmxnLwLpZaUlqJNI85vU=
 github.com/ava-labs/coreth v0.13.9-rc.1/go.mod h1:7aMsRIo/3GBE44qWZMjnfqdqfcfZ5yShTTm2LObLaYo=
 github.com/ava-labs/subnet-evm v0.6.12 h1:jL3FmjdFcNfS0qwbehwN6DkAg9y7zexB1riiGBxRsM0=

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-services/vms"
 	"github.com/ethereum/go-ethereum/common"
 )
 

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-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"

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-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"

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-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"

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-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"

peers/app_request_network.go

@@ -27,8 +27,8 @@ import (
 	"github.com/ava-labs/avalanchego/utils/set"
 	"github.com/ava-labs/avalanchego/vms/platformvm"
 	"github.com/ava-labs/avalanchego/vms/platformvm/warp"
-	"github.com/ava-labs/awm-relayer/peers/utils"
-	"github.com/ava-labs/awm-relayer/peers/validators"
+	"github.com/ava-labs/icm-services/peers/utils"
+	"github.com/ava-labs/icm-services/peers/validators"
 	"github.com/prometheus/client_golang/prometheus"
 	"go.uber.org/zap"
 )

peers/config.go

@@ -3,7 +3,7 @@
 
 package peers
 
-import "github.com/ava-labs/awm-relayer/config"
+import "github.com/ava-labs/icm-services/config"
 
 // Config defines a common interface necessary for standing up an AppRequestNetwork.
 type Config interface {

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-services/config"
+	"github.com/ava-labs/icm-services/peers/utils"
 )
 
 // InfoAPI is a wrapper around the info.Client,

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-services/config"
 )
 
 // InitializeOptions initializes the rpc options for an API

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-services/config"
+	"github.com/ava-labs/icm-services/peers/utils"
 	"go.uber.org/zap"
 
 	pchainapi "github.com/ava-labs/avalanchego/vms/platformvm/api"

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

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-services/proto/pb/decider";
 
 service DeciderService {
   rpc ShouldSendMessage(ShouldSendMessageRequest) returns (ShouldSendMessageResponse);