Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename away from warp #551

Merged
merged 11 commits into from
Nov 27, 2024
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -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"
}
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_spec.md
Original file line number Diff line number Diff line change
@@ -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: ''
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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).
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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
```
2 changes: 1 addition & 1 deletion database/database.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion database/database_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion database/json_file_storage_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion database/mocks/mock_database.go

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

4 changes: 2 additions & 2 deletions database/relayer_id.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/ava-labs/awm-relayer
module github.com/ava-labs/icm-services
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed

Check failure

Code scanning / Snyk Open Source

High severity - Dual license: GPL-3.0, LGPL-3.0 vulnerability in github.com/ava-labs/coreth/plugin/evm/message Error

This file introduces a vulnerable github.com/ava-labs/coreth/plugin/evm/message package with a high severity vulnerability.

Check failure

Code scanning / Snyk Open Source

High severity - Dual license: GPL-3.0, LGPL-3.0 vulnerability in github.com/ava-labs/subnet-evm/accounts Error

This file introduces a vulnerable github.com/ava-labs/subnet-evm/accounts package with a high severity vulnerability.

Check failure

Code scanning / Snyk Open Source

High severity - Dual license: GPL-3.0, LGPL-3.0 vulnerability in github.com/ethereum/go-ethereum/common Error

This file introduces a vulnerable github.com/ethereum/go-ethereum/common package with a high severity vulnerability.

Check warning

Code scanning / Snyk Open Source

Medium severity - MPL-2.0 license vulnerability in github.com/hashicorp/go-bexpr Warning

This file introduces a vulnerable github.com/hashicorp/go-bexpr package with a medium severity vulnerability.

Check warning

Code scanning / Snyk Open Source

Medium severity - MPL-2.0 license vulnerability in github.com/hashicorp/golang-lru/v2 Warning

This file introduces a vulnerable github.com/hashicorp/golang-lru/v2 package with a medium severity vulnerability.

Check warning

Code scanning / Snyk Open Source

Medium severity - MPL-2.0 license vulnerability in github.com/hashicorp/hcl Warning

This file introduces a vulnerable github.com/hashicorp/hcl package with a medium severity vulnerability.

Check warning

Code scanning / Snyk Open Source

Medium severity - MPL-2.0 license vulnerability in github.com/status-im/keycard-go/derivationpath Warning

This file introduces a vulnerable github.com/status-im/keycard-go/derivationpath package with a medium severity vulnerability.

go 1.22.8

Expand Down
2 changes: 1 addition & 1 deletion messages/message_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions messages/mocks/mock_message_handler.go

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

6 changes: 3 additions & 3 deletions messages/off-chain-registry/message_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions messages/off-chain-registry/message_handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 5 additions & 5 deletions messages/teleporter/message_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions messages/teleporter/message_handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion peers/app_request_network.go
Original file line number Diff line number Diff line change
Expand Up @@ -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-services/peers/validators"
"github.com/prometheus/client_golang/prometheus"
"go.uber.org/zap"
)
Expand Down
2 changes: 1 addition & 1 deletion peers/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions peers/info_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion peers/mocks/mock_app_request_network.go

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

2 changes: 1 addition & 1 deletion peers/utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions peers/validators/canonical_validator_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion proto/buf.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version: v1
name: buf.build/ava-labs/awm-relayer
name: buf.build/ava-labs/icm-relayer
breaking:
use:
- FILE
Expand Down
2 changes: 1 addition & 1 deletion proto/decider/decider.proto
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
9 changes: 5 additions & 4 deletions proto/pb/decider/decider.pb.go

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

Loading