diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e26440442..7ddcf6184 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,19 +3,20 @@ name: "Release" on: push: tags: - - '*' # Run release on any tag. Will be marked as draft by default anyway. + - 'v*.*.*' # stable + - 'v*.*.rc*' # release candidate jobs: goreleaser: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v5 with: go-version: 1.19 @@ -25,10 +26,9 @@ jobs: echo "$(go env GOPATH)/bin" >> $GITHUB_PATH shell: bash - - run: echo https://github.com/icon-project/ibc-relay/blob/${GITHUB_REF#refs/tags/}/CHANGELOG.md#${GITHUB_REF#refs/tags/} > ../release_notes.md + - run: echo https://github.com/icon-project/ibc-relay/blob/${GITHUB_REF#refs/tags/}/CHANGELOG.md#${GITHUB_REF#refs/tags/} > ../release_notes.md - - name: setup release environment - run: |- - echo 'GITHUB_TOKEN=${{secrets.GITHUB_TOKEN}}' > .release-env - name: release publish + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: make release diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 94b36d795..a16e6ebdc 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -1,36 +1,55 @@ -project_name: ibc-relay +project_name: relayer +env: + - CGO_ENABLED=1 builds: - id: darwin-amd64 main: ./main.go binary: rly + hooks: + pre: + - wget https://github.com/CosmWasm/wasmvm/releases/download/{{ .Env.LIBWASM_VERSION }}/libwasmvmstatic_darwin.a -O /lib/libwasmvmstatic_darwin.a goos: - darwin goarch: - amd64 env: - CC=o64-clang - - CXX=o64-clang++ + - CGO_LDFLAGS=-L/lib flags: - -mod=readonly + - -trimpath ldflags: - - -s -w -X github.com/cosmos/relayer/v2/cmd.Version={{ .Tag }} + - -s -w -X github.com/icon-project/relayer/v2/cmd.Version={{ .Tag }} + - -linkmode=external + tags: + - static_wasm - id: darwin-arm64 main: ./main.go binary: rly + hooks: + pre: + - wget https://github.com/CosmWasm/wasmvm/releases/download/{{ .Env.LIBWASM_VERSION }}/libwasmvmstatic_darwin.a -O /lib/libwasmvmstatic_darwin.a goos: - darwin goarch: - arm64 env: - CC=oa64-clang - - CXX=oa64-clang++ + - CGO_LDFLAGS=-L/lib flags: - -mod=readonly + - -trimpath ldflags: - - -s -w -X github.com/cosmos/relayer/v2/cmd.Version={{ .Tag }} + - -s -w -X github.com/icon-project/relayer/v2/cmd.Version={{ .Tag }} + - -linkmode=external + tags: + - static_wasm - id: linux-amd64 main: ./main.go binary: rly + hooks: + pre: + - wget https://github.com/CosmWasm/wasmvm/releases/download/{{ .Env.LIBWASM_VERSION }}/libwasmvm_muslc.x86_64.a -O /usr/lib/x86_64-linux-gnu/libwasmvm_muslc.a goos: - linux goarch: @@ -40,22 +59,36 @@ builds: - CXX=x86_64-linux-gnu-g++ flags: - -mod=readonly + - -trimpath ldflags: - - -s -w -X github.com/cosmos/relayer/v2/cmd.Version={{ .Tag }} + - -s -w -X github.com/icon-project/relayer/v2/cmd.Version={{ .Tag }} + - -linkmode=external + - -extldflags '-Wl,-z,muldefs -lm' + tags: + - muslc + - netgo - id: linux-arm64 main: ./main.go binary: rly + hooks: + pre: + - wget https://github.com/CosmWasm/wasmvm/releases/download/{{ .Env.LIBWASM_VERSION }}/libwasmvm_muslc.aarch64.a -O /usr/lib/aarch64-linux-gnu/libwasmvm_muslc.a goos: - linux goarch: - arm64 env: - CC=aarch64-linux-gnu-gcc - - CXX=aarch64-linux-gnu-g++ flags: - -mod=readonly + - -trimpath ldflags: - - -s -w -X github.com/cosmos/relayer/v2/cmd.Version={{ .Tag }} + - -s -w -X github.com/icon-project/relayer/v2/cmd.Version={{ .Tag }} + - -linkmode=external + - -extldflags "-static" + tags: + - muslc + - netgo archives: - id: golang-cross @@ -74,4 +107,4 @@ checksum: release: prerelease: auto - draft: true + draft: false \ No newline at end of file diff --git a/Makefile b/Makefile index 82a80780f..e4f65d7b4 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,7 @@ AKASH_VERSION := v0.16.3 OSMOSIS_VERSION := v8.0.0 WASMD_VERSION := v0.25.0 DOCKER := $(shell which docker) +LIBWASM_VERSION ?= v2.0.1 GOPATH := $(shell go env GOPATH) GOBIN := $(GOPATH)/bin @@ -16,9 +17,9 @@ all: lint install # Build / Install ############################################################################### -ldflags = -X github.com/cosmos/relayer/v2/cmd.Version=$(VERSION) \ - -X github.com/cosmos/relayer/v2/cmd.Commit=$(COMMIT) \ - -X github.com/cosmos/relayer/v2/cmd.Dirty=$(DIRTY) +ldflags = -X github.com/icon-project/relayer/v2/cmd.Version=$(VERSION) \ + -X github.com/icon-project/relayer/v2/cmd.Commit=$(COMMIT) \ + -X github.com/icon-project/relayer/v2/cmd.Dirty=$(DIRTY) ldflags += $(LDFLAGS) ldflags := $(strip $(ldflags)) @@ -115,7 +116,7 @@ build-gaia: .PHONY: two-chains test test-integration interchaintest install build lint coverage clean -PACKAGE_NAME := github.com/cosmos/relayer +PACKAGE_NAME := github.com/icon-project/relayer/v2 GOLANG_CROSS_VERSION ?= v1.19.4 SYSROOT_DIR ?= sysroots @@ -133,7 +134,8 @@ sysroot-unpack: release-dry-run: @docker run \ --rm \ - -e CGO_ENABLED=1 \ + --env GITHUB_TOKEN \ + --env LIBWASM_VERSION=$(LIBWASM_VERSION) \ -v /var/run/docker.sock:/var/run/docker.sock \ -v `pwd`:/go/src/$(PACKAGE_NAME) \ -v `pwd`/sysroot:/sysroot \ @@ -143,14 +145,10 @@ release-dry-run: .PHONY: release release: - @if [ ! -f ".release-env" ]; then \ - echo "\033[91m.release-env is required for release\033[0m";\ - exit 1;\ - fi docker run \ --rm \ - -e CGO_ENABLED=1 \ - --env-file .release-env \ + --env GITHUB_TOKEN \ + --env LIBWASM_VERSION=$(LIBWASM_VERSION) \ -v /var/run/docker.sock:/var/run/docker.sock \ -v `pwd`:/go/src/$(PACKAGE_NAME) \ -v `pwd`/sysroot:/sysroot \ diff --git a/README.md b/README.md index baa46bd1d..49172e0f2 100644 --- a/README.md +++ b/README.md @@ -4,26 +4,28 @@ ![banner](./docs/images/comp.gif) [![Project Status: Initial Release](https://img.shields.io/badge/repo%20status-active-green.svg?style=flat-square)](https://www.repostatus.org/#active) -![GitHub Workflow Status](https://github.com/icon-project/ibc-relay/actions/workflows/build.yml/badge.svg) +![GitHub Workflow Status](https://github.com/icon-project/relayer/v2/actions/workflows/build.yml/badge.svg) [![GoDoc](https://img.shields.io/badge/godoc-reference-blue?style=flat-square&logo=go)](https://godoc.org/github.com/cosmos/relayer) -[![Go Report Card](https://goreportcard.com/badge/github.com/icon-project/ibc-relay)](https://goreportcard.com/report/github.com/icon-project/ibc-relay) -[![License: Apache-2.0](https://img.shields.io/github/license/icon-project/ibc-relay.svg?style=flat-square)](https://github.com/icon-project/ibc-relay/blob/main/LICENSE) -[![Lines Of Code](https://img.shields.io/tokei/lines/github/icon-project/ibc-relay?style=flat-square)](https://github.com/icon-project/ibc-relay) -[![Version](https://img.shields.io/github/tag/icon-project/ibc-relay.svg?style=flat-square)](https://github.com/icon-project/ibc-relay/latest) +[![Go Report Card](https://goreportcard.com/badge/github.com/icon-project/relayer/v2)](https://goreportcard.com/report/github.com/icon-project/relayer/v2) +[![License: Apache-2.0](https://img.shields.io/github/license/icon-project/ibc-relay.svg?style=flat-square)](https://github.com/icon-project/relayer/v2/blob/main/LICENSE) +[![Lines Of Code](https://img.shields.io/tokei/lines/github/icon-project/ibc-relay?style=flat-square)](https://github.com/icon-project/relayer/v2) +[![Version](https://img.shields.io/github/tag/icon-project/ibc-relay.svg?style=flat-square)](https://github.com/icon-project/relayer/v2/latest) [![codecov](https://codecov.io/gh/icon-project/ibc-relay/branch/main/graph/badge.svg?token=3OSG4KPSPZ)](https://codecov.io/gh/icon-project/ibc-relay) + --- -This repo is a fork of cosmos [relayer](https://github.com/cosmos/relayer). The goal of this project is to relay packets between ICON and Wasm chains by following the IBC Specs. +This repo is a fork of cosmos [relayer](https://github.com/cosmos/relayer). The goal of this project is to relay packets between ICON and Wasm chains by following the IBC Specs. + 1. [What is ICON-IBC Integration](https://github.com/icon-project/IBC-Integration) 2. [Deviations from Cosmos Relayer](./docs/deviations_from_ibc.md) ---- +--- -In IBC, blockchains do not directly pass messages to each other over the network. This is where `relayer` comes in. +In IBC, blockchains do not directly pass messages to each other over the network. This is where `relayer` comes in. A relayer process monitors for updates on opens paths between sets of [IBC](https://ibcprotocol.org/) enabled chains. -The relayer submits these updates in the form of specific message types to the counterparty chain. Clients are then used to +The relayer submits these updates in the form of specific message types to the counterparty chain. Clients are then used to track and verify the consensus state. In addition to relaying packets, this relayer can open paths across chains, thus creating clients, connections and channels. @@ -31,6 +33,7 @@ In addition to relaying packets, this relayer can open paths across chains, thus Additional information on how IBC works can be found [here](https://ibc.cosmos.network/). --- + ## Note If you want to run the relay server yourself, check [here](./docs/mainnet_relaying_icon.md) @@ -38,11 +41,14 @@ If you want to run the relay server yourself, check [here](./docs/mainnet_relayi --- ## Demo + - The easiest way would be to follow the guide in [this repo](https://github.com/izyak/icon-ibc/tree/master) to setup relay for icon ibc integration. It has all the relevant scripts setup, and you can start the relay using a single command. - There is E2E tests demo for icon ibc integration [here](https://github.com/icon-project/IBC-Integration/blob/main/docs/e2e_test_setup.md) + --- ## Table Of Contents + - [Basic Usage - Relaying Across Chains](#basic-usage---relaying-packets-across-chains) - [Create Path Across Chains](./docs/create-path-across-chain.md) - [Advanced Usage](./docs/advanced_usage.md) @@ -54,6 +60,7 @@ If you want to run the relay server yourself, check [here](./docs/mainnet_relayi - [Running Relayer Locally](https://github.com/izyak/icon-ibc/blob/master/README.md) --- + ## Basic Usage - Relaying Packets Across Chains > The `-h` (help) flag tailing any `rly` command will be your best friend. USE THIS IN YOUR RELAYING JOURNEY. @@ -62,19 +69,20 @@ If you want to run the relay server yourself, check [here](./docs/mainnet_relayi 1. **Clone, checkout and install the latest release ([releases page](https://github.com/cosmos/relayer/releases)).** - *[Go](https://go.dev/doc/install) needs to be installed and a proper Go environment needs to be configured* + _[Go](https://go.dev/doc/install) needs to be installed and a proper Go environment needs to be configured_ - ```shell - $ git clone https://github.com/cosmos/relayer.git - $ cd relayer - $ make install - ``` + ```shell + $ git clone https://github.com/cosmos/relayer.git + $ cd relayer + $ make install + ``` 2. **Initialize the relayer's configuration directory/file.** - + ```shell $ rly config init ``` + **Default config file location:** `~/.relayer/config/config.yaml` By default, transactions will be relayed with a memo of `rly(VERSION)` e.g. `rly(v2.3.0)`. @@ -85,8 +93,8 @@ If you want to run the relay server yourself, check [here](./docs/mainnet_relayi $ rly config init --memo "My custom memo" ``` - Custom memos will have `rly(VERSION)` appended. For example, a memo of `My custom memo` running on relayer version `v2.3.0` would result in a transaction memo of `My custom memo | rly(v2.3.0)`. - + Custom memos will have `rly(VERSION)` appended. For example, a memo of `My custom memo` running on relayer version `v2.3.0` would result in a transaction memo of `My custom memo | rly(v2.3.0)`. + The `--memo` flag is also available for other `rly` commands also that involve sending transactions such as `rly tx link` and `rly start`. It can be passed there to override the `config.yaml` value if desired. To omit the memo entirely, including the default value of `rly(VERSION)`, use `-` for the memo. @@ -95,67 +103,70 @@ If you want to run the relay server yourself, check [here](./docs/mainnet_relayi
In out example, we will configure the relayer to operate between ICON and Archway.
- + To add the chain config files manually, example config files have been included [here](./examples/demo/configs/chains/) Modify the config file as per your requirements and run the following command: + ```shell $ rly chains add icon --file _path_to_/examples/demo/configs/chains/ibc-icon.json $ rly chains add archway --file _path_to_/examples/demo/configs/chains/ibc-archway.json ``` - + 4. **Import OR create new keys for the relayer to use when signing and relaying transactions.** - + - For Cosmos chains: - >`key-name` is an identifier of your choosing. + > `key-name` is an identifier of your choosing. + + If you need to generate a new private key you can use the `add` subcommand. + + ```shell + $ rly keys add archway [key-name] + ``` - If you need to generate a new private key you can use the `add` subcommand. + If you already have a private key and want to restore it from your mnemonic you can use the `restore` subcommand. - ```shell - $ rly keys add archway [key-name] - ``` - - If you already have a private key and want to restore it from your mnemonic you can use the `restore` subcommand. + ```shell + $ rly keys restore archway [key-name] "mnemonic words here" + ``` - ```shell - $ rly keys restore archway [key-name] "mnemonic words here" - ``` - For Icon chain - To generate a new wallet for icon, you can use `add` subcommmand with password flag. If you do not supply `--password` flag, the default password is `x` - ```shell - $ rly keys add icon [key-name] --password "password" - ``` - + To generate a new wallet for icon, you can use `add` subcommmand with password flag. If you do not supply `--password` flag, the default password is `x` + ```shell + $ rly keys add icon [key-name] --password "password" + ``` 5. **Edit the relayer's `key` values in the config file to match the `key-name`'s chosen above.** - - *For Archway* - >This step is necessary if you chose a `key-name` other than "default" - - Example: - - ```yaml - - type: wasm - value: - key: YOUR-KEY-NAME-HERE - chain-id: localnet - rpc-addr: http://localhost:26657 - ``` - - *For Icon* - - ```yaml - - type: icon - value: - keystore: YOUR-KEY-NAME-HERE - password: YOUR-KEY-PASSWORD-HERE - chain-id: ibc-icon - ``` + - _For Archway_ + + > This step is necessary if you chose a `key-name` other than "default" + + Example: + + ```yaml + - type: wasm + value: + key: YOUR-KEY-NAME-HERE + chain-id: localnet + rpc-addr: http://localhost:26657 + ``` + + - _For Icon_ + + ```yaml + - type: icon + value: + keystore: YOUR-KEY-NAME-HERE + password: YOUR-KEY-PASSWORD-HERE + chain-id: ibc-icon + ``` 6. **Ensure the keys associated with the configured chains are funded.** - >Your configured addresses will need to contain some of the respective native tokens for paying relayer fees. - + > Your configured addresses will need to contain some of the respective native tokens for paying relayer fees. +
- You can query the balance of each configured key by running: + You can query the balance of each configured key by running: ```shell $ rly q balance icon [key-name] @@ -164,90 +175,102 @@ If you want to run the relay server yourself, check [here](./docs/mainnet_relayi 7. **Configure path meta-data in config file.**
- We have the chain meta-data configured, now we need path meta-data. For more info on `path` terminology visit [here](docs/troubleshooting.md). - >NOTE: Thinking of chains in the config as "source" and "destination" can be confusing. Be aware that most path are bi-directional. + We have the chain meta-data configured, now we need path meta-data. For more info on `path` terminology visit [here](docs/troubleshooting.md). + + > NOTE: Thinking of chains in the config as "source" and "destination" can be confusing. Be aware that most path are bi-directional. To add the chain config files manually, example config files have been included [here](./examples/demo/configs/paths/icon-archway.json) . Modify this file as per your requirements and run the following command.
```shell - $ rly paths add [chain-id-1] [chain-id-2] [path-name] --file _path_to/ibc-relay/examples/demo/configs/paths/icon-archway.json + $ rly paths add [chain-id-1] [chain-id-2] [path-name] --file _path_to/ibc-relay/examples/demo/configs/paths/icon-archway.json ``` + 8. **Client Creation and Handshaking [Optional]**
If you want to create your own client, channels and connection to relay between chains, run the following command:
To create clients between chains + > Ensure that [btp-height] is a valid bto block height. This height will be used to create client for icon's counterparty chain . + ```shell rly tx clients [path-name] --client-tp "10000000m" --btp-block-height [btp-height] ``` To create connection + ```shell rly tx conn [path-name] ``` To create channels + ```sh rly tx chan [path-name] --src-port=[src-port] --dst-port=[dst-port] ``` - This step can entirely be skipped if connection and channel exists between 2 chains you want to relay. Ensure that client-id and connection-id are provided in the paths for this. + This step can entirely be skipped if connection and channel exists between 2 chains you want to relay. Ensure that client-id and connection-id are provided in the paths for this. 9. #### **Configure the channel filter [Optional]** - - By default, the relayer will relay packets over all channels on a given connection. + + By default, the relayer will relay packets over all channels on a given connection.
- Each path has a `src-channel-filter` which you can utilize to specify which channels you would like to relay on. + Each path has a `src-channel-filter` which you can utilize to specify which channels you would like to relay on.
- The `rule` can be one of three values: + The `rule` can be one of three values: + - `allowlist` which tells the relayer to relay on _ONLY_ the channels in `channel-list` - `denylist` which tells the relayer to relay on all channels _BESIDES_ the channels in `channel-list` - - empty value, which is the default setting, and tells the relayer to relay on all channels -
- - Since we are only worried about the canonical channel between the Cosmos Hub and Osmosis our filter settings would look like the following. + - empty value, which is the default setting, and tells the relayer to relay on all channels +
+ + Since we are only worried about the canonical channel between the Cosmos Hub and Osmosis our filter settings would look like the following.
Example: + ```yaml icon-archway: - src: - chain-id: ibc-icon - client-id: 07-tendermint-0 - connection-id: connection-0 - dst: - chain-id: localnet - client-id: iconclient-0 - connection-id: connection-0 - src-channel-filter: - rule: allowlist - channel-list: [] + src: + chain-id: ibc-icon + client-id: 07-tendermint-0 + connection-id: connection-0 + dst: + chain-id: localnet + client-id: iconclient-0 + connection-id: connection-0 + src-channel-filter: + rule: allowlist + channel-list: [] ``` - - >Because two channels between chains are tightly coupled, there is no need to specify the dst channels. - >If you only know the "dst" channel-ID you can query the "src" channel-ID by running: `rly q channel | jq '.channel.counterparty.channel_id'` + + > Because two channels between chains are tightly coupled, there is no need to specify the dst channels. + > If you only know the "dst" channel-ID you can query the "src" channel-ID by running: `rly q channel | jq '.channel.counterparty.channel_id'` 10. **Finally, we start the relayer on the desired path.** - The relayer will periodically update the clients and listen for IBC messages to relay. + The relayer will periodically update the clients and listen for IBC messages to relay. - ```shell - $ rly paths list - $ rly start [path] - # Optionally you can omit the `path` argument to start all configured paths - $ rly start - ``` - - >When running multiple instances of `rly start`, you will need to use the `--debug-addr` flag and provide an address:port. You can also pass an empty string `''` to turn off this feature or pass `localhost:0` to randomly select a port. + ```shell + $ rly paths list + $ rly start [path] + # Optionally you can omit the `path` argument to start all configured paths + $ rly start + ``` + + > When running multiple instances of `rly start`, you will need to use the `--debug-addr` flag and provide an address:port. You can also pass an empty string `''` to turn off this feature or pass `localhost:0` to randomly select a port. + + *** - --- [[TROUBLESHOOTING](docs/troubleshooting.md)] + --- ## Build Docker Image of Relayer + To build the docker image of the relayer, use the following command: + ```sh docker build -t . ``` diff --git a/cmd/appstate.go b/cmd/appstate.go index 7f26557f3..f1a1fc9b4 100644 --- a/cmd/appstate.go +++ b/cmd/appstate.go @@ -9,8 +9,8 @@ import ( "os" "path" - "github.com/cosmos/relayer/v2/relayer" "github.com/gofrs/flock" + "github.com/icon-project/relayer/v2/relayer" "github.com/spf13/viper" "go.uber.org/zap" "gopkg.in/yaml.v3" @@ -212,7 +212,7 @@ func (a *appState) performConfigLockingOperation(ctx context.Context, operation cfgPath := a.configPath() // Overwrite the config file. - if err := os.WriteFile(cfgPath, out, 0600); err != nil { + if err := os.WriteFile(cfgPath, out, 0o600); err != nil { return fmt.Errorf("failed to write config file at %s: %w", cfgPath, err) } @@ -220,7 +220,6 @@ func (a *appState) performConfigLockingOperation(ctx context.Context, operation } func (a *appState) GetConfigProviderNameFromChainId(chainId string) (string, error) { - chains := a.config.Chains for k, v := range chains { if v.ChainID() == chainId { diff --git a/cmd/chains.go b/cmd/chains.go index 53404cabe..57eed2637 100644 --- a/cmd/chains.go +++ b/cmd/chains.go @@ -11,9 +11,9 @@ import ( "path/filepath" "strings" - "github.com/cosmos/relayer/v2/cregistry" - "github.com/cosmos/relayer/v2/relayer" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/cregistry" + "github.com/icon-project/relayer/v2/relayer" + "github.com/icon-project/relayer/v2/relayer/provider" "github.com/spf13/cobra" "go.uber.org/zap" "gopkg.in/yaml.v3" @@ -334,7 +334,7 @@ func chainsAddDirCmd(a *appState) *cobra.Command { Args: withUsage(cobra.ExactArgs(1)), Short: `Add chain configuration data in bulk from a directory. Example dir: 'configs/demo/chains'`, Long: `Add chain configuration data in bulk from a directory housing individual chain config files. This is useful for spinning up testnets. - + See 'configs/demo/chains' for an example of individual chain config files.`, Example: strings.TrimSpace(fmt.Sprintf(` $ %s chains add-dir configs/demo/chains diff --git a/cmd/chains_test.go b/cmd/chains_test.go index 0a1b69566..537e6c3a4 100644 --- a/cmd/chains_test.go +++ b/cmd/chains_test.go @@ -7,9 +7,9 @@ import ( "regexp" "testing" - "github.com/cosmos/relayer/v2/cmd" - "github.com/cosmos/relayer/v2/internal/relayertest" - "github.com/cosmos/relayer/v2/relayer/chains/cosmos" + "github.com/icon-project/relayer/v2/cmd" + "github.com/icon-project/relayer/v2/internal/relayertest" + "github.com/icon-project/relayer/v2/relayer/chains/cosmos" "github.com/stretchr/testify/require" ) diff --git a/cmd/config.go b/cmd/config.go index 50c17c0f8..688d4fcbc 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -29,12 +29,12 @@ import ( "strings" "time" - "github.com/cosmos/relayer/v2/relayer" - "github.com/cosmos/relayer/v2/relayer/chains/cosmos" - "github.com/cosmos/relayer/v2/relayer/chains/icon" - "github.com/cosmos/relayer/v2/relayer/chains/penumbra" - wasm "github.com/cosmos/relayer/v2/relayer/chains/wasm" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer" + "github.com/icon-project/relayer/v2/relayer/chains/cosmos" + "github.com/icon-project/relayer/v2/relayer/chains/icon" + "github.com/icon-project/relayer/v2/relayer/chains/penumbra" + wasm "github.com/icon-project/relayer/v2/relayer/chains/wasm" + "github.com/icon-project/relayer/v2/relayer/provider" "github.com/spf13/cobra" "go.uber.org/zap" "gopkg.in/yaml.v3" diff --git a/cmd/flags.go b/cmd/flags.go index 1f8396899..67faf75ff 100644 --- a/cmd/flags.go +++ b/cmd/flags.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/cosmos/relayer/v2/relayer" + "github.com/icon-project/relayer/v2/relayer" "github.com/spf13/cobra" "github.com/spf13/viper" diff --git a/cmd/keys.go b/cmd/keys.go index 3f7380141..7544cb1ee 100644 --- a/cmd/keys.go +++ b/cmd/keys.go @@ -24,7 +24,7 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/hd" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/relayer/v2/relayer/chains/cosmos" + "github.com/icon-project/relayer/v2/relayer/chains/cosmos" "github.com/spf13/cobra" "go.uber.org/zap" ) diff --git a/cmd/keys_test.go b/cmd/keys_test.go index df51f8924..f82f7bf4f 100644 --- a/cmd/keys_test.go +++ b/cmd/keys_test.go @@ -8,9 +8,9 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" "github.com/cosmos/cosmos-sdk/crypto/keyring" - "github.com/cosmos/relayer/v2/cmd" - "github.com/cosmos/relayer/v2/internal/relayertest" - "github.com/cosmos/relayer/v2/relayer/chains/cosmos" + "github.com/icon-project/relayer/v2/cmd" + "github.com/icon-project/relayer/v2/internal/relayertest" + "github.com/icon-project/relayer/v2/relayer/chains/cosmos" "github.com/stretchr/testify/require" ) diff --git a/cmd/paths.go b/cmd/paths.go index 640414fa5..a75eb01be 100644 --- a/cmd/paths.go +++ b/cmd/paths.go @@ -8,9 +8,9 @@ import ( "path" "strings" - "github.com/cosmos/relayer/v2/relayer" - "github.com/cosmos/relayer/v2/relayer/processor" "github.com/google/go-github/v43/github" + "github.com/icon-project/relayer/v2/relayer" + "github.com/icon-project/relayer/v2/relayer/processor" "github.com/spf13/cobra" "gopkg.in/yaml.v3" ) @@ -21,7 +21,7 @@ func pathsCmd(a *appState) *cobra.Command { Aliases: []string{"pth"}, Short: "Manage path configurations", Long: ` -A path represents the "full path" or "link" for communication between two chains. +A path represents the "full path" or "link" for communication between two chains. This includes the client, connection, and channel ids from both the source and destination chains as well as the strategy to use when relaying`, } @@ -219,7 +219,7 @@ func pathsAddDirCmd(a *appState) *cobra.Command { Args: withUsage(cobra.ExactArgs(1)), Short: `Add path configuration data in bulk from a directory. Example dir: 'configs/demo/paths'`, Long: `Add path configuration data in bulk from a directory housing individual path config files. This is useful for spinning up testnets. - + See 'examples/demo/configs/paths' for an example of individual path config files.`, Example: strings.TrimSpace(fmt.Sprintf(` $ %s config add-paths examples/demo/configs/paths`, appName)), diff --git a/cmd/query.go b/cmd/query.go index 5540fb916..572a10f96 100644 --- a/cmd/query.go +++ b/cmd/query.go @@ -10,8 +10,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/types/query" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/cosmos/relayer/v2/relayer" - "github.com/cosmos/relayer/v2/relayer/chains/cosmos" + "github.com/icon-project/relayer/v2/relayer" + "github.com/icon-project/relayer/v2/relayer/chains/cosmos" "github.com/spf13/cobra" ) @@ -497,7 +497,7 @@ $ %s query client-connections ibc-0 ibczeroclient --height 1205`, appName, appName, )), RunE: func(cmd *cobra.Command, args []string) error { - //TODO - Add pagination + // TODO - Add pagination chain, ok := a.config.Chains[args[0]] if !ok { @@ -698,7 +698,8 @@ func printChannelWithExtendedInfo( cmd *cobra.Command, chain *relayer.Chain, channel *chantypes.IdentifiedChannel, - extendedInfo *chanExtendedInfo) { + extendedInfo *chanExtendedInfo, +) { s, err := chain.ChainProvider.Sprint(channel) if err != nil { fmt.Fprintf(cmd.ErrOrStderr(), "Failed to marshal channel: %v\n", err) diff --git a/cmd/start.go b/cmd/start.go index c2cdf9406..1ec5ceadf 100644 --- a/cmd/start.go +++ b/cmd/start.go @@ -23,10 +23,10 @@ import ( "net" "strings" - "github.com/cosmos/relayer/v2/internal/relaydebug" - "github.com/cosmos/relayer/v2/relayer" - "github.com/cosmos/relayer/v2/relayer/chains/cosmos" - "github.com/cosmos/relayer/v2/relayer/processor" + "github.com/icon-project/relayer/v2/internal/relaydebug" + "github.com/icon-project/relayer/v2/relayer" + "github.com/icon-project/relayer/v2/relayer/chains/cosmos" + "github.com/icon-project/relayer/v2/relayer/processor" "github.com/spf13/cobra" "go.uber.org/zap" ) diff --git a/cmd/tx.go b/cmd/tx.go index 49fdf09e9..8ab7353cb 100644 --- a/cmd/tx.go +++ b/cmd/tx.go @@ -11,10 +11,10 @@ import ( "github.com/avast/retry-go/v4" sdk "github.com/cosmos/cosmos-sdk/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/cosmos/relayer/v2/relayer" - "github.com/cosmos/relayer/v2/relayer/common" - "github.com/cosmos/relayer/v2/relayer/processor" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer" + "github.com/icon-project/relayer/v2/relayer/common" + "github.com/icon-project/relayer/v2/relayer/processor" + "github.com/icon-project/relayer/v2/relayer/provider" "github.com/spf13/cobra" "go.uber.org/zap" ) @@ -305,7 +305,6 @@ func updateClientCmd(a *appState) *cobra.Command { num, err := strconv.ParseInt(s, 10, 64) if err != nil { return fmt.Errorf("error converting string to int64: %w", err) - } heights = append(heights, num) } @@ -487,7 +486,6 @@ $ %s tx conn demo-path --timeout 5s`, // if err := a.UpdateConfigsIfContainIcon(cmd, c[src], c[dst]); err != nil { // return err // } - } return nil @@ -519,7 +517,6 @@ $ %s tx chan demo-path --timeout 5s --max-retries 10`, appName, appName, )), RunE: func(cmd *cobra.Command, args []string) error { - pathName := args[0] c, src, dst, err := a.config.ChainsFromPath(pathName) @@ -1152,7 +1149,6 @@ $ %s register-counterparty channel-1 transfer cosmos1skjwj5whet0lpe65qaq4rpq03hj $ %s reg-cpt channel-1 cosmos1skjwj5whet0lpe65qaq4rpq03hjxlwd9nf39lk juno1g0ny488ws4064mjjxk4keenwfjrthn503ngjxd`, appName, appName)), RunE: func(cmd *cobra.Command, args []string) error { - chain, ok := a.config.Chains[args[0]] if !ok { return errChainNotFound(args[0]) @@ -1187,7 +1183,6 @@ $ %s claim-fees archway icon cx6f86ed848f9f0d03ba1220811d95d864c72da88c archway- $ %s claim-fees icon archway archway1f68v03g2646z7wk9h9sy5uxhztajcrdgwvdrsftyp4448h067v0shn6l5w 0x1.icon`, appName, appName)), RunE: func(cmd *cobra.Command, args []string) error { - src, ok := a.config.Chains[args[0]] if !ok { return errChainNotFound(args[0]) diff --git a/cregistry/chain_info.go b/cregistry/chain_info.go index 6d2d8dea3..3231a3fac 100644 --- a/cregistry/chain_info.go +++ b/cregistry/chain_info.go @@ -11,7 +11,7 @@ import ( "net/url" "time" - "github.com/cosmos/relayer/v2/relayer/chains/cosmos" + "github.com/icon-project/relayer/v2/relayer/chains/cosmos" "github.com/spf13/viper" "go.uber.org/zap" "golang.org/x/sync/errgroup" @@ -229,7 +229,6 @@ func (c ChainInfo) GetAssetList(ctx context.Context) (AssetList, error) { return AssetList{}, err } return assetList, nil - } // GetChainConfig returns a CosmosProviderConfig composed from the details found in the cosmos chain registry for diff --git a/docs/mainnet_relaying_icon.md b/docs/mainnet_relaying_icon.md index 5711e98b2..167b47db3 100644 --- a/docs/mainnet_relaying_icon.md +++ b/docs/mainnet_relaying_icon.md @@ -1,6 +1,7 @@ # Mainnet Relaying Guide Get libwasmvm library + ```sh wget https://github.com/CosmWasm/wasmvm/releases/download/v1.5.0/libwasmvm.x86_64.so sudo mv libwasmvm.x86_64.so /usr/lib @@ -8,116 +9,121 @@ sudo mv libwasmvm.x86_64.so /usr/lib Now, let's get started with the relay portion. -1. Get the version of latest binary of the relay from the github assets from this [repo](https://github.com/icon-project/ibc-relay) +1. Get the version of latest binary of the relay from the github assets from this [repo](https://github.com/icon-project/relayer/v2) 2. Then, download the relay binary from the assets of this release on your machine. + ```sh export CURR_VERSION=1.1.1 -wget https://github.com/icon-project/ibc-relay/releases/download/v${CURR_VERSION}/ibc-relay_${CURR_VERSION}_linux_amd64.tar.gz +wget https://github.com/icon-project/relayer/v2/releases/download/v${CURR_VERSION}/ibc-relay_${CURR_VERSION}_linux_amd64.tar.gz tar -xvzf ibc-relay_${CURR_VERSION}_linux_amd64.tar.gz cd ibc-relay_${CURR_VERSION}_linux_amd64 sudo mv rly /usr/local/bin ``` + 3. Copy this config file. You might need to change the key directory and key as per your requirements. Check steps to setup keys in the main README file. + ```yaml global: - api-listen-addr: :5183 - timeout: 10s - memo: "" - light-cache-size: 20 + api-listen-addr: :5183 + timeout: 10s + memo: "" + light-cache-size: 20 chains: - archway: - type: wasm - value: - key-directory: /home/ubuntu/.relayer/keys/archway-1 - key: relayWallet - chain-id: archway-1 - rpc-addr: https://rpc.mainnet.archway.io:443 - account-prefix: archway - keyring-backend: test - gas-adjustment: 1.5 - gas-prices: 900000000000aarch - min-gas-amount: 1000000 - debug: true - timeout: 20s - block-timeout: "" - output-format: json - sign-mode: direct - extra-codecs: [] - coin-type: 0 - broadcast-mode: batch - ibc-handler-address: archway1rujqm6c555jv4zaa6q0x0fcc7mk4ca4zgyg9gt3xhzzw0933g63qk4v0zl - first-retry-block-after: 0 - start-height: 0 - block-interval: 4000 - icon: - type: icon - value: - key-directory: /home/ubuntu/.relayer/keys - chain-id: mainnet - rpc-addr: https://ctz.solidwallet.io/api/v3/ - timeout: 30s - keystore: relayWallet - password: SkLb3PX8GiHOsMy84L73pZYXA - icon-network-id: 1 - btp-network-id: 1 - btp-network-type-id: 1 - start-height: 0 - ibc-handler-address: cx622bbab73698f37dbef53955fd3decffeb0b0c16 - first-retry-block-after: 0 - block-interval: 2000 - neutron: - type: wasm - value: - key-directory: /home/ubuntu/.relayer/keys/neutron-1 - key: relayWallet - chain-id: neutron-1 - rpc-addr: https://rpc-kralum.neutron-1.neutron.org:443 - account-prefix: neutron - keyring-backend: test - gas-adjustment: 1.5 - gas-prices: 0.5untrn - min-gas-amount: 1000000 - debug: true - timeout: 20s - block-timeout: "" - output-format: json - sign-mode: direct - extra-codecs: [] - coin-type: 0 - broadcast-mode: batch - ibc-handler-address: neutron1fsxayjp6djfk00v9m79fuuku885a4c6kz7sj9wn0yw0wv4luntmq00rty5 - first-retry-block-after: 0 - start-height: 0 - block-interval: 2000 + archway: + type: wasm + value: + key-directory: /home/ubuntu/.relayer/keys/archway-1 + key: relayWallet + chain-id: archway-1 + rpc-addr: https://rpc.mainnet.archway.io:443 + account-prefix: archway + keyring-backend: test + gas-adjustment: 1.5 + gas-prices: 900000000000aarch + min-gas-amount: 1000000 + debug: true + timeout: 20s + block-timeout: "" + output-format: json + sign-mode: direct + extra-codecs: [] + coin-type: 0 + broadcast-mode: batch + ibc-handler-address: archway1rujqm6c555jv4zaa6q0x0fcc7mk4ca4zgyg9gt3xhzzw0933g63qk4v0zl + first-retry-block-after: 0 + start-height: 0 + block-interval: 4000 + icon: + type: icon + value: + key-directory: /home/ubuntu/.relayer/keys + chain-id: mainnet + rpc-addr: https://ctz.solidwallet.io/api/v3/ + timeout: 30s + keystore: relayWallet + password: SkLb3PX8GiHOsMy84L73pZYXA + icon-network-id: 1 + btp-network-id: 1 + btp-network-type-id: 1 + start-height: 0 + ibc-handler-address: cx622bbab73698f37dbef53955fd3decffeb0b0c16 + first-retry-block-after: 0 + block-interval: 2000 + neutron: + type: wasm + value: + key-directory: /home/ubuntu/.relayer/keys/neutron-1 + key: relayWallet + chain-id: neutron-1 + rpc-addr: https://rpc-kralum.neutron-1.neutron.org:443 + account-prefix: neutron + keyring-backend: test + gas-adjustment: 1.5 + gas-prices: 0.5untrn + min-gas-amount: 1000000 + debug: true + timeout: 20s + block-timeout: "" + output-format: json + sign-mode: direct + extra-codecs: [] + coin-type: 0 + broadcast-mode: batch + ibc-handler-address: neutron1fsxayjp6djfk00v9m79fuuku885a4c6kz7sj9wn0yw0wv4luntmq00rty5 + first-retry-block-after: 0 + start-height: 0 + block-interval: 2000 paths: - icon-archway: - src: - chain-id: mainnet - client-id: 07-tendermint-0 - connection-id: connection-0 - dst: - chain-id: archway-1 - client-id: iconclient-0 - connection-id: connection-0 - src-channel-filter: - rule: "" - channel-list: [] - icon-neutron: - src: - chain-id: mainnet - client-id: 07-tendermint-2 - connection-id: connection-2 - dst: - chain-id: neutron-1 - client-id: iconclient-1 - connection-id: connection-0 - src-channel-filter: - rule: "" - channel-list: [] + icon-archway: + src: + chain-id: mainnet + client-id: 07-tendermint-0 + connection-id: connection-0 + dst: + chain-id: archway-1 + client-id: iconclient-0 + connection-id: connection-0 + src-channel-filter: + rule: "" + channel-list: [] + icon-neutron: + src: + chain-id: mainnet + client-id: 07-tendermint-2 + connection-id: connection-2 + dst: + chain-id: neutron-1 + client-id: iconclient-1 + connection-id: connection-0 + src-channel-filter: + rule: "" + channel-list: [] ``` + 4. Start the relay with the following command. + ```sh rly start icon-archway # start icon-archway relay rly start icon-neutron # start icon-neutron relay rly start # start both relay -``` \ No newline at end of file +``` diff --git a/go.mod b/go.mod index dca754196..0197757a5 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/cosmos/relayer/v2 +module github.com/icon-project/relayer/v2 go 1.19 diff --git a/interchaintest/client_threshold_test.go b/interchaintest/client_threshold_test.go index 8b608ca68..9a250430b 100644 --- a/interchaintest/client_threshold_test.go +++ b/interchaintest/client_threshold_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - relayerinterchaintest "github.com/cosmos/relayer/v2/interchaintest" + relayerinterchaintest "github.com/icon-project/relayer/v2/interchaintest" interchaintest "github.com/strangelove-ventures/interchaintest/v7" "github.com/strangelove-ventures/interchaintest/v7/ibc" interchaintestrelayer "github.com/strangelove-ventures/interchaintest/v7/relayer" diff --git a/interchaintest/fee_middleware_test.go b/interchaintest/fee_middleware_test.go index 71d65d616..e5a0289de 100644 --- a/interchaintest/fee_middleware_test.go +++ b/interchaintest/fee_middleware_test.go @@ -6,7 +6,7 @@ import ( "testing" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" - relayertest "github.com/cosmos/relayer/v2/interchaintest" + relayertest "github.com/icon-project/relayer/v2/interchaintest" interchaintest "github.com/strangelove-ventures/interchaintest/v7" "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" ibc "github.com/strangelove-ventures/interchaintest/v7/ibc" @@ -29,7 +29,8 @@ func TestScenarioFeeMiddleware(t *testing.T) { // Get both chains cf := interchaintest.NewBuiltinChainFactory(zaptest.NewLogger(t), []*interchaintest.ChainSpec{ {Name: "juno", ChainName: "chaina", Version: "v13.0.0", NumValidators: &nv, NumFullNodes: &nf, ChainConfig: ibc.ChainConfig{ChainID: "chaina", GasPrices: "0.0ujuno"}}, - {Name: "juno", ChainName: "chainb", Version: "v13.0.0", NumValidators: &nv, NumFullNodes: &nf, ChainConfig: ibc.ChainConfig{ChainID: "chainb", GasPrices: "0.0ujuno"}}}, + {Name: "juno", ChainName: "chainb", Version: "v13.0.0", NumValidators: &nv, NumFullNodes: &nf, ChainConfig: ibc.ChainConfig{ChainID: "chainb", GasPrices: "0.0ujuno"}}, + }, ) chains, err := cf.Chains(t.Name()) diff --git a/interchaintest/go.mod b/interchaintest/go.mod index 45f2853c9..030675349 100644 --- a/interchaintest/go.mod +++ b/interchaintest/go.mod @@ -1,4 +1,4 @@ -module github.com/cosmos/relayer/v2/interchaintest +module github.com/icon-project/relayer/v2/interchaintest go 1.20 @@ -7,7 +7,7 @@ require ( github.com/cometbft/cometbft v0.37.0 github.com/cosmos/cosmos-sdk v0.47.1 github.com/cosmos/ibc-go/v7 v7.0.0 - github.com/cosmos/relayer/v2 v2.0.0 + github.com/icon-project/relayer/v2 v2.0.0 github.com/docker/docker v20.10.24+incompatible github.com/icza/dyno v0.0.0-20220812133438-f0b6f8a18845 github.com/moby/moby v20.10.22+incompatible @@ -248,7 +248,7 @@ replace ( github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d github.com/ChainSafe/go-schnorrkel/1 => github.com/ChainSafe/go-schnorrkel v1.0.0 // For this nested module, you always want to replace the parent reference with the current worktree. - github.com/cosmos/relayer/v2 => ../ + github.com/icon-project/relayer/v2 => ../ github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 diff --git a/interchaintest/ibc_test.go b/interchaintest/ibc_test.go index 6ee722104..26f4f2d67 100644 --- a/interchaintest/ibc_test.go +++ b/interchaintest/ibc_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - relayerinterchaintest "github.com/cosmos/relayer/v2/interchaintest" - "github.com/cosmos/relayer/v2/relayer" + relayerinterchaintest "github.com/icon-project/relayer/v2/interchaintest" + "github.com/icon-project/relayer/v2/relayer" interchaintest "github.com/strangelove-ventures/interchaintest/v7" "github.com/strangelove-ventures/interchaintest/v7/conformance" "github.com/strangelove-ventures/interchaintest/v7/ibc" diff --git a/interchaintest/ica_channel_close_test.go b/interchaintest/ica_channel_close_test.go index b21a41c32..674a2fa69 100644 --- a/interchaintest/ica_channel_close_test.go +++ b/interchaintest/ica_channel_close_test.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keyring" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - relayerinterchaintest "github.com/cosmos/relayer/v2/interchaintest" + relayerinterchaintest "github.com/icon-project/relayer/v2/interchaintest" interchaintest "github.com/strangelove-ventures/interchaintest/v7" "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v7/ibc" diff --git a/interchaintest/interchain_accounts_test.go b/interchaintest/interchain_accounts_test.go index 0185b2bc2..ced32ea49 100644 --- a/interchaintest/interchain_accounts_test.go +++ b/interchaintest/interchain_accounts_test.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keyring" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - relayerinterchaintest "github.com/cosmos/relayer/v2/interchaintest" + relayerinterchaintest "github.com/icon-project/relayer/v2/interchaintest" interchaintest "github.com/strangelove-ventures/interchaintest/v7" "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v7/ibc" diff --git a/interchaintest/misbehaviour_test.go b/interchaintest/misbehaviour_test.go index 6d10003e9..bb9d48d6d 100644 --- a/interchaintest/misbehaviour_test.go +++ b/interchaintest/misbehaviour_test.go @@ -25,7 +25,7 @@ import ( ibctesting "github.com/cosmos/ibc-go/v7/testing" ibcmocks "github.com/cosmos/ibc-go/v7/testing/mock" "github.com/cosmos/ibc-go/v7/testing/simapp" - relayertest "github.com/cosmos/relayer/v2/interchaintest" + relayertest "github.com/icon-project/relayer/v2/interchaintest" "github.com/strangelove-ventures/interchaintest/v7" "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v7/ibc" @@ -46,7 +46,8 @@ func TestScenarioMisbehaviourDetection(t *testing.T) { numFullNodes := 0 cf := interchaintest.NewBuiltinChainFactory(zaptest.NewLogger(t), []*interchaintest.ChainSpec{ {Name: "gaia", Version: "v9.0.0-rc1", NumValidators: &numVals, NumFullNodes: &numFullNodes, ChainConfig: ibc.ChainConfig{ChainID: "chain-a", GasPrices: "0.0uatom"}}, - {Name: "gaia", Version: "v9.0.0-rc1", NumValidators: &numVals, NumFullNodes: &numFullNodes, ChainConfig: ibc.ChainConfig{ChainID: "chain-b", GasPrices: "0.0uatom"}}}, + {Name: "gaia", Version: "v9.0.0-rc1", NumValidators: &numVals, NumFullNodes: &numFullNodes, ChainConfig: ibc.ChainConfig{ChainID: "chain-b", GasPrices: "0.0uatom"}}, + }, ) chains, err := cf.Chains(t.Name()) diff --git a/interchaintest/multi_channel_test.go b/interchaintest/multi_channel_test.go index 6904f5751..64319a6ce 100644 --- a/interchaintest/multi_channel_test.go +++ b/interchaintest/multi_channel_test.go @@ -5,7 +5,7 @@ import ( "testing" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" - relayerinterchaintest "github.com/cosmos/relayer/v2/interchaintest" + relayerinterchaintest "github.com/icon-project/relayer/v2/interchaintest" interchaintest "github.com/strangelove-ventures/interchaintest/v7" "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v7/ibc" @@ -184,5 +184,4 @@ func TestMultipleChannelsOneConnection(t *testing.T) { require.NoError(t, err) require.Equal(t, int64(0), balance) } - } diff --git a/interchaintest/path_filter_test.go b/interchaintest/path_filter_test.go index 7889587d2..f5363a8bc 100644 --- a/interchaintest/path_filter_test.go +++ b/interchaintest/path_filter_test.go @@ -6,9 +6,9 @@ import ( "testing" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" - relayerinterchaintest "github.com/cosmos/relayer/v2/interchaintest" - "github.com/cosmos/relayer/v2/relayer" - "github.com/cosmos/relayer/v2/relayer/processor" + relayerinterchaintest "github.com/icon-project/relayer/v2/interchaintest" + "github.com/icon-project/relayer/v2/relayer" + "github.com/icon-project/relayer/v2/relayer/processor" interchaintest "github.com/strangelove-ventures/interchaintest/v7" "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v7/ibc" diff --git a/interchaintest/relay_many_test.go b/interchaintest/relay_many_test.go index 65859f487..0013b7108 100644 --- a/interchaintest/relay_many_test.go +++ b/interchaintest/relay_many_test.go @@ -5,7 +5,7 @@ import ( "testing" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" - relayerinterchaintest "github.com/cosmos/relayer/v2/interchaintest" + relayerinterchaintest "github.com/icon-project/relayer/v2/interchaintest" "github.com/strangelove-ventures/interchaintest/v7" "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v7/ibc" diff --git a/interchaintest/relayer.go b/interchaintest/relayer.go index 1283ac9a8..3878ef02c 100644 --- a/interchaintest/relayer.go +++ b/interchaintest/relayer.go @@ -9,11 +9,11 @@ import ( "testing" "github.com/cosmos/cosmos-sdk/crypto/keyring" - "github.com/cosmos/relayer/v2/cmd" - "github.com/cosmos/relayer/v2/internal/relayertest" - "github.com/cosmos/relayer/v2/relayer" - "github.com/cosmos/relayer/v2/relayer/chains/cosmos" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/cmd" + "github.com/icon-project/relayer/v2/internal/relayertest" + "github.com/icon-project/relayer/v2/relayer" + "github.com/icon-project/relayer/v2/relayer/chains/cosmos" + "github.com/icon-project/relayer/v2/relayer/provider" interchaintestcosmos "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v7/ibc" "github.com/strangelove-ventures/interchaintest/v7/relayer/rly" diff --git a/interchaintest/relayer_override_test.go b/interchaintest/relayer_override_test.go index 2885c21ff..56e97547a 100644 --- a/interchaintest/relayer_override_test.go +++ b/interchaintest/relayer_override_test.go @@ -5,8 +5,8 @@ import ( "encoding/json" "testing" - "github.com/cosmos/relayer/v2/cmd" - relayerinterchaintest "github.com/cosmos/relayer/v2/interchaintest" + "github.com/icon-project/relayer/v2/cmd" + relayerinterchaintest "github.com/icon-project/relayer/v2/interchaintest" interchaintest "github.com/strangelove-ventures/interchaintest/v7" "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v7/ibc" diff --git a/interchaintest/stride/setup_test.go b/interchaintest/stride/setup_test.go index b77529252..3b57c9d7e 100644 --- a/interchaintest/stride/setup_test.go +++ b/interchaintest/stride/setup_test.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/cosmos/cosmos-sdk/types/module/testutil" - rlystride "github.com/cosmos/relayer/v2/relayer/chains/cosmos/stride" + rlystride "github.com/icon-project/relayer/v2/relayer/chains/cosmos/stride" "github.com/icza/dyno" "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v7/ibc" diff --git a/interchaintest/stride/stride_icq_test.go b/interchaintest/stride/stride_icq_test.go index 00a42c609..a5f4bad81 100644 --- a/interchaintest/stride/stride_icq_test.go +++ b/interchaintest/stride/stride_icq_test.go @@ -8,8 +8,8 @@ import ( "github.com/cosmos/cosmos-sdk/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - relayerinterchaintest "github.com/cosmos/relayer/v2/interchaintest" - rlystride "github.com/cosmos/relayer/v2/relayer/chains/cosmos/stride" + relayerinterchaintest "github.com/icon-project/relayer/v2/interchaintest" + rlystride "github.com/icon-project/relayer/v2/relayer/chains/cosmos/stride" interchaintest "github.com/strangelove-ventures/interchaintest/v7" "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v7/ibc" @@ -63,7 +63,8 @@ func TestScenarioStrideICAandICQ(t *testing.T) { GasAdjustment: 1.1, ModifyGenesis: ModifyGenesisStride(), EncodingConfig: StrideEncoding(), - }}, + }, + }, { Name: "gaia", ChainName: "gaia", diff --git a/interchaintest/tendermint_v0.37_boundary_test.go b/interchaintest/tendermint_v0.37_boundary_test.go index c7972c1ac..dc14711c5 100644 --- a/interchaintest/tendermint_v0.37_boundary_test.go +++ b/interchaintest/tendermint_v0.37_boundary_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - relayerinterchaintest "github.com/cosmos/relayer/v2/interchaintest" + relayerinterchaintest "github.com/icon-project/relayer/v2/interchaintest" interchaintest "github.com/strangelove-ventures/interchaintest/v7" "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v7/conformance" diff --git a/internal/relayertest/system.go b/internal/relayertest/system.go index 6b917b653..6fbe33aa3 100644 --- a/internal/relayertest/system.go +++ b/internal/relayertest/system.go @@ -11,7 +11,7 @@ import ( "path/filepath" "testing" - "github.com/cosmos/relayer/v2/cmd" + "github.com/icon-project/relayer/v2/cmd" "github.com/stretchr/testify/require" "go.uber.org/zap" "go.uber.org/zap/zaptest" diff --git a/main.go b/main.go index 2dd1b6e4d..68121b873 100644 --- a/main.go +++ b/main.go @@ -1,6 +1,6 @@ package main -import "github.com/cosmos/relayer/v2/cmd" +import "github.com/icon-project/relayer/v2/cmd" func main() { cmd.Execute() diff --git a/proto/buf.gen.penumbra.yaml b/proto/buf.gen.penumbra.yaml index 781eea262..e2d385389 100644 --- a/proto/buf.gen.penumbra.yaml +++ b/proto/buf.gen.penumbra.yaml @@ -2,7 +2,7 @@ version: v1 managed: enabled: true go_package_prefix: - default: github.com/cosmos/relayer/v2/relayer/chains + default: github.com/icon-project/relayer/v2/relayer/chains except: - buf.build/cosmos/ibc - github.com/cometbft/cometbft diff --git a/proto/cosmos/crypto/sr25519/keys.proto b/proto/cosmos/crypto/sr25519/keys.proto index eed481375..69103ca18 100644 --- a/proto/cosmos/crypto/sr25519/keys.proto +++ b/proto/cosmos/crypto/sr25519/keys.proto @@ -6,7 +6,7 @@ package cosmos.crypto.sr25519; import "gogoproto/gogo.proto"; // Originally github.com/cosmos/cosmos-sdk/crypto/keys/sr25519 -option go_package = "github.com/cosmos/relayer/v2/relayer/chains/cosmos/keys/sr25519"; +option go_package = "github.com/icon-project/relayer/v2/relayer/chains/cosmos/keys/sr25519"; option (gogoproto.messagename_all) = true; option (gogoproto.goproto_stringer_all) = false; diff --git a/proto/ethermint/crypto/v1/ethsecp256k1/keys.proto b/proto/ethermint/crypto/v1/ethsecp256k1/keys.proto index 4a43257bd..26e3266fe 100644 --- a/proto/ethermint/crypto/v1/ethsecp256k1/keys.proto +++ b/proto/ethermint/crypto/v1/ethsecp256k1/keys.proto @@ -6,7 +6,7 @@ package ethermint.crypto.v1.ethsecp256k1; import "gogoproto/gogo.proto"; // Originally github.com/evmos/ethermint/crypto/ethsecp256k1 -option go_package = "github.com/cosmos/relayer/v2/relayer/codecs/ethermint"; +option go_package = "github.com/icon-project/relayer/v2/relayer/codecs/ethermint"; // PubKey defines a type alias for an ecdsa.PublicKey that implements // Comet's PubKey interface. It represents the 33-byte compressed public diff --git a/proto/ethermint/types/v1/account.proto b/proto/ethermint/types/v1/account.proto index a977dfe2f..62a733607 100644 --- a/proto/ethermint/types/v1/account.proto +++ b/proto/ethermint/types/v1/account.proto @@ -6,7 +6,7 @@ import "cosmos/auth/v1beta1/auth.proto"; import "gogoproto/gogo.proto"; // Originally github.com/evmos/ethermint/types -option go_package = "github.com/cosmos/relayer/v2/relayer/codecs/ethermint"; +option go_package = "github.com/icon-project/relayer/v2/relayer/codecs/ethermint"; // EthAccount implements the authtypes.AccountI interface and embeds an // authtypes.BaseAccount type. It is compatible with the auth AccountKeeper. diff --git a/proto/ethermint/types/v1/dynamic_fee.proto b/proto/ethermint/types/v1/dynamic_fee.proto index b7e9c411e..2519be927 100644 --- a/proto/ethermint/types/v1/dynamic_fee.proto +++ b/proto/ethermint/types/v1/dynamic_fee.proto @@ -4,7 +4,7 @@ package ethermint.types.v1; import "gogoproto/gogo.proto"; // Originally github.com/evmos/ethermint/types -option go_package = "github.com/cosmos/relayer/v2/relayer/ethermint"; +option go_package = "github.com/icon-project/relayer/v2/relayer/ethermint"; // ExtensionOptionDynamicFeeTx is an extension option that specifies the // maxPrioPrice for cosmos tx diff --git a/proto/injective/crypto/v1beta1/ethsecp256k1/keys.proto b/proto/injective/crypto/v1beta1/ethsecp256k1/keys.proto index fb44391b2..e2bb55d9f 100644 --- a/proto/injective/crypto/v1beta1/ethsecp256k1/keys.proto +++ b/proto/injective/crypto/v1beta1/ethsecp256k1/keys.proto @@ -7,7 +7,7 @@ import "gogoproto/gogo.proto"; // Originally // github.com/InjectiveLabs/injective-core/injective-chain/crypto/ethsecp256k1 -option go_package = "github.com/cosmos/relayer/v2/relayer/codecs/injective"; +option go_package = "github.com/icon-project/relayer/v2/relayer/codecs/injective"; // PubKey defines a type alias for an ecdsa.PublicKey that implements // Comet's PubKey interface. It represents the 33-byte compressed public diff --git a/proto/injective/types/v1beta1/account.proto b/proto/injective/types/v1beta1/account.proto index fe4da2b43..0731d1c53 100644 --- a/proto/injective/types/v1beta1/account.proto +++ b/proto/injective/types/v1beta1/account.proto @@ -6,7 +6,7 @@ import "cosmos/auth/v1beta1/auth.proto"; import "gogoproto/gogo.proto"; // Originally github.com/InjectiveLabs/injective-core/injective-chain/types -option go_package = "github.com/cosmos/relayer/v2/relayer/codecs/injective"; +option go_package = "github.com/icon-project/relayer/v2/relayer/codecs/injective"; // EthAccount implements the authtypes.AccountI interface and embeds an // authtypes.BaseAccount type. It is compatible with the auth AccountKeeper. diff --git a/relayer/chain.go b/relayer/chain.go index d7948786a..f17b39a19 100644 --- a/relayer/chain.go +++ b/relayer/chain.go @@ -10,7 +10,7 @@ import ( "github.com/avast/retry-go/v4" "github.com/cosmos/cosmos-sdk/crypto/hd" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" ) diff --git a/relayer/chains/cosmos/codec.go b/relayer/chains/cosmos/codec.go index bfeb42425..ba90888cb 100644 --- a/relayer/chains/cosmos/codec.go +++ b/relayer/chains/cosmos/codec.go @@ -25,10 +25,10 @@ import ( "github.com/cosmos/ibc-go/v7/modules/apps/transfer" ibc "github.com/cosmos/ibc-go/v7/modules/core" - cosmosmodule "github.com/cosmos/relayer/v2/relayer/chains/cosmos/module" - "github.com/cosmos/relayer/v2/relayer/chains/cosmos/stride" - ethermintcodecs "github.com/cosmos/relayer/v2/relayer/codecs/ethermint" - injectivecodecs "github.com/cosmos/relayer/v2/relayer/codecs/injective" + cosmosmodule "github.com/icon-project/relayer/v2/relayer/chains/cosmos/module" + "github.com/icon-project/relayer/v2/relayer/chains/cosmos/stride" + ethermintcodecs "github.com/icon-project/relayer/v2/relayer/codecs/ethermint" + injectivecodecs "github.com/icon-project/relayer/v2/relayer/codecs/injective" ) var ModuleBasics = []module.AppModuleBasic{ diff --git a/relayer/chains/cosmos/cosmos_chain_processor.go b/relayer/chains/cosmos/cosmos_chain_processor.go index f02f4d243..aa100f90a 100644 --- a/relayer/chains/cosmos/cosmos_chain_processor.go +++ b/relayer/chains/cosmos/cosmos_chain_processor.go @@ -12,8 +12,8 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/cosmos/relayer/v2/relayer/processor" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/processor" + "github.com/icon-project/relayer/v2/relayer/provider" ctypes "github.com/cometbft/cometbft/rpc/core/types" "go.uber.org/zap" diff --git a/relayer/chains/cosmos/event_parser.go b/relayer/chains/cosmos/event_parser.go index 45902b0bf..a4ece9775 100644 --- a/relayer/chains/cosmos/event_parser.go +++ b/relayer/chains/cosmos/event_parser.go @@ -13,8 +13,8 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/cosmos/relayer/v2/relayer/processor" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/processor" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) diff --git a/relayer/chains/cosmos/event_parser_test.go b/relayer/chains/cosmos/event_parser_test.go index 69039e69d..63793a1da 100644 --- a/relayer/chains/cosmos/event_parser_test.go +++ b/relayer/chains/cosmos/event_parser_test.go @@ -8,8 +8,8 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/cosmos/relayer/v2/relayer/provider" "github.com/google/go-cmp/cmp" + "github.com/icon-project/relayer/v2/relayer/provider" "github.com/stretchr/testify/require" "go.uber.org/zap" ) diff --git a/relayer/chains/cosmos/grpc_query.go b/relayer/chains/cosmos/grpc_query.go index dec0c84a8..38586ca6b 100644 --- a/relayer/chains/cosmos/grpc_query.go +++ b/relayer/chains/cosmos/grpc_query.go @@ -10,7 +10,7 @@ import ( abci "github.com/cometbft/cometbft/abci/types" gogogrpc "github.com/cosmos/gogoproto/grpc" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/provider" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/encoding" diff --git a/relayer/chains/cosmos/keys.go b/relayer/chains/cosmos/keys.go index 6cd4a60bf..dc98b4dea 100644 --- a/relayer/chains/cosmos/keys.go +++ b/relayer/chains/cosmos/keys.go @@ -9,10 +9,10 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keyring" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/go-bip39" - "github.com/cosmos/relayer/v2/relayer/chains/cosmos/keys/sr25519" - "github.com/cosmos/relayer/v2/relayer/codecs/ethermint" - "github.com/cosmos/relayer/v2/relayer/codecs/injective" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/chains/cosmos/keys/sr25519" + "github.com/icon-project/relayer/v2/relayer/codecs/ethermint" + "github.com/icon-project/relayer/v2/relayer/codecs/injective" + "github.com/icon-project/relayer/v2/relayer/provider" ) const ethereumCoinType = uint32(60) @@ -182,7 +182,6 @@ func (cc *CosmosProvider) KeyExists(name string) bool { } return k.Name == name - } // ExportPrivKeyArmor returns a private key in ASCII armored format. diff --git a/relayer/chains/cosmos/keys_test.go b/relayer/chains/cosmos/keys_test.go index 987931041..97656000f 100644 --- a/relayer/chains/cosmos/keys_test.go +++ b/relayer/chains/cosmos/keys_test.go @@ -4,8 +4,8 @@ import ( "path/filepath" "testing" - "github.com/cosmos/relayer/v2/relayer/chains/cosmos" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/chains/cosmos" + "github.com/icon-project/relayer/v2/relayer/provider" "github.com/stretchr/testify/require" "go.uber.org/zap" ) diff --git a/relayer/chains/cosmos/log.go b/relayer/chains/cosmos/log.go index 75e43a982..0793a0609 100644 --- a/relayer/chains/cosmos/log.go +++ b/relayer/chains/cosmos/log.go @@ -8,7 +8,7 @@ import ( typestx "github.com/cosmos/cosmos-sdk/types/tx" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) diff --git a/relayer/chains/cosmos/message_handlers.go b/relayer/chains/cosmos/message_handlers.go index 1e6a811c0..c7c8b20ca 100644 --- a/relayer/chains/cosmos/message_handlers.go +++ b/relayer/chains/cosmos/message_handlers.go @@ -6,8 +6,8 @@ import ( conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/cosmos/relayer/v2/relayer/processor" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/processor" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) @@ -185,7 +185,6 @@ func (ccp *CosmosChainProcessor) logChannelMessage(message string, ci provider.C func (ccp *CosmosChainProcessor) logChannelOpenMessage(message string, ci provider.ChannelInfo) { fields := []zap.Field{ - zap.String("channel_id", ci.ChannelID), zap.String("connection_id", ci.ConnID), zap.String("port_id", ci.PortID), diff --git a/relayer/chains/cosmos/message_handlers_test.go b/relayer/chains/cosmos/message_handlers_test.go index 10ebc9771..5f83f9379 100644 --- a/relayer/chains/cosmos/message_handlers_test.go +++ b/relayer/chains/cosmos/message_handlers_test.go @@ -5,8 +5,8 @@ import ( conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/cosmos/relayer/v2/relayer/processor" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/processor" + "github.com/icon-project/relayer/v2/relayer/provider" "github.com/stretchr/testify/require" "go.uber.org/zap" ) diff --git a/relayer/chains/cosmos/msg.go b/relayer/chains/cosmos/msg.go index f685768ac..dddde2221 100644 --- a/relayer/chains/cosmos/msg.go +++ b/relayer/chains/cosmos/msg.go @@ -4,11 +4,10 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/gogoproto/proto" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap/zapcore" ) - type CosmosMessage struct { Msg sdk.Msg } diff --git a/relayer/chains/cosmos/provider.go b/relayer/chains/cosmos/provider.go index 37d528a90..6eaa829d8 100644 --- a/relayer/chains/cosmos/provider.go +++ b/relayer/chains/cosmos/provider.go @@ -19,9 +19,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/gogoproto/proto" commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" - "github.com/cosmos/relayer/v2/relayer/codecs/ethermint" - "github.com/cosmos/relayer/v2/relayer/processor" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/codecs/ethermint" + "github.com/icon-project/relayer/v2/relayer/processor" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" "golang.org/x/mod/semver" ) diff --git a/relayer/chains/cosmos/query.go b/relayer/chains/cosmos/query.go index 5e03ed3c6..cdf7aaff2 100644 --- a/relayer/chains/cosmos/query.go +++ b/relayer/chains/cosmos/query.go @@ -31,7 +31,7 @@ import ( "github.com/cosmos/ibc-go/v7/modules/core/exported" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" "golang.org/x/sync/errgroup" ) @@ -227,7 +227,6 @@ func (cc *CosmosProvider) queryConsumerUnbondingPeriod(ctx context.Context) (tim params := proposal.QueryParamsRequest{Subspace: "ccvconsumer", Key: "UnbondingPeriod"} resICS, err := queryClient.Params(ctx, ¶ms) - if err != nil { return 0, fmt.Errorf("failed to make ccvconsumer params request: %w", err) } @@ -1173,5 +1172,4 @@ func (cc *CosmosProvider) QueryConsensusStateABCI(ctx context.Context, clientID func (ap *CosmosProvider) QueryClientPrevConsensusStateHeight(ctx context.Context, chainHeight int64, clientId string, clientHeight int64) (exported.Height, error) { panic("QueryClientPrevConsensusStateHeight not implemented") - } diff --git a/relayer/chains/cosmos/relayer_packets.go b/relayer/chains/cosmos/relayer_packets.go index 168b6be9a..c281e09ec 100644 --- a/relayer/chains/cosmos/relayer_packets.go +++ b/relayer/chains/cosmos/relayer_packets.go @@ -5,7 +5,7 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/provider" ) var ( @@ -146,9 +146,11 @@ type relayMsgPacketAck struct { func (rp relayMsgPacketAck) Data() []byte { return rp.packetData } + func (rp relayMsgPacketAck) Seq() uint64 { return rp.seq } + func (rp relayMsgPacketAck) Timeout() clienttypes.Height { return rp.timeout } diff --git a/relayer/chains/cosmos/tx.go b/relayer/chains/cosmos/tx.go index 146592c9b..f6725ad40 100644 --- a/relayer/chains/cosmos/tx.go +++ b/relayer/chains/cosmos/tx.go @@ -37,8 +37,8 @@ import ( host "github.com/cosmos/ibc-go/v7/modules/core/24-host" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" - strideicqtypes "github.com/cosmos/relayer/v2/relayer/chains/cosmos/stride" - "github.com/cosmos/relayer/v2/relayer/provider" + strideicqtypes "github.com/icon-project/relayer/v2/relayer/chains/cosmos/stride" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" @@ -486,9 +486,11 @@ func (cc *CosmosProvider) MsgUpgradeClient(srcClientId string, consRes *clientty if acc, err = cc.Address(); err != nil { return nil, err } - return NewCosmosMessage(&clienttypes.MsgUpgradeClient{ClientId: srcClientId, ClientState: clientRes.ClientState, + return NewCosmosMessage(&clienttypes.MsgUpgradeClient{ + ClientId: srcClientId, ClientState: clientRes.ClientState, ConsensusState: consRes.ConsensusState, ProofUpgradeClient: consRes.GetProof(), - ProofUpgradeConsensusState: consRes.ConsensusState.Value, Signer: acc}), nil + ProofUpgradeConsensusState: consRes.ConsensusState.Value, Signer: acc, + }), nil } // MsgTransfer creates a new transfer message diff --git a/relayer/chains/icon/client.go b/relayer/chains/icon/client.go index 034865743..41cb0368d 100644 --- a/relayer/chains/icon/client.go +++ b/relayer/chains/icon/client.go @@ -16,7 +16,7 @@ import ( "sync" "time" - "github.com/cosmos/relayer/v2/relayer/chains/icon/types" + "github.com/icon-project/relayer/v2/relayer/chains/icon/types" "go.uber.org/zap" "github.com/gorilla/websocket" @@ -30,8 +30,8 @@ import ( ) const ( - DefaultSendTransactionRetryInterval = 3 * time.Second //3sec - DefaultGetTransactionResultPollingInterval = 500 * time.Millisecond //1.5sec + DefaultSendTransactionRetryInterval = 3 * time.Second // 3sec + DefaultGetTransactionResultPollingInterval = 500 * time.Millisecond // 1.5sec ) type Wallet interface { @@ -255,6 +255,7 @@ func (c *Client) GetBTPNetworkInfo(p *types.BTPNetworkInfoParam) (*types.BTPNetw } return result, nil } + func (c *Client) GetNetworkTypeInfo(height int64, networkId int64) (*types.BTPNetworkTypeInfo, error) { nti := &types.BTPNetworkTypeInfo{} param := &types.BTPQueryParam{ @@ -404,7 +405,8 @@ func (c *Client) wsRequest(conn *websocket.Conn, reqPtr interface{}) error { if wsResp.Code != 0 { return wsRequestError{ fmt.Errorf("invalid WSResponse code:%d, message:%s", wsResp.Code, wsResp.Message), - wsResp} + wsResp, + } } return nil } @@ -454,7 +456,6 @@ func (c *Client) wsReadJSONLoop(ctx context.Context, conn *websocket.Conn, respP return err } } - } } @@ -623,7 +624,7 @@ func (c *Client) EstimateStep(param *types.TransactionParamForEstimate) (*types. } func NewClient(uri string, l *zap.Logger) *Client { - //TODO options {MaxRetrySendTx, MaxRetryGetResult, MaxIdleConnsPerHost, Debug, Dump} + // TODO options {MaxRetrySendTx, MaxRetryGetResult, MaxIdleConnsPerHost, Debug, Dump} tr := &http.Transport{MaxIdleConnsPerHost: 1000} cl := &http.Client{Transport: tr} apiClient := client.NewJsonRpcClient(cl, uri) diff --git a/relayer/chains/icon/client_test.go b/relayer/chains/icon/client_test.go index fe925683a..6c90d91c4 100644 --- a/relayer/chains/icon/client_test.go +++ b/relayer/chains/icon/client_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "github.com/cosmos/relayer/v2/relayer/chains/icon/types" "github.com/icon-project/IBC-Integration/libraries/go/common/icon" "github.com/icon-project/goloop/common/codec" "github.com/icon-project/goloop/common/wallet" "github.com/icon-project/goloop/module" + "github.com/icon-project/relayer/v2/relayer/chains/icon/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/zap" @@ -24,7 +24,6 @@ func NewTestClient() *Client { } func GetLisbonIconProvider(network_id int, contractAddress string) *IconProvider { - pcfg := IconProviderConfig{ Keystore: "godWallet", KeyDirectory: "../../../env", @@ -46,7 +45,6 @@ func GetLisbonIconProvider(network_id int, contractAddress string) *IconProvider } func getTestWallet() (module.Wallet, error) { - keyStore_file := "../../../env/ibc-icon/godWallet.json" kpass := "gochain" @@ -84,7 +82,6 @@ func TestSendMessageToMempool(t *testing.T) { } func TestTransaction(t *testing.T) { - c := NewTestClient() rpcWallet, err := getTestWallet() @@ -130,11 +127,9 @@ func TestTransaction(t *testing.T) { assert.Equal(t, types.HexInt("0x1"), finalOp.Status) t.Log(finalOp) - } func TestCallFunction(t *testing.T) { - c := NewTestClient() w, err := getTestWallet() @@ -151,7 +146,6 @@ func TestCallFunction(t *testing.T) { Method: "name", }, }, &op) - if err != nil { t.Fatal((err)) return @@ -160,11 +154,9 @@ func TestCallFunction(t *testing.T) { assert.Equal(t, types.HexBytes("Handler"), op) t.Log(op) - } func TestGetTransaction(t *testing.T) { - c := NewTestClient() hashString := "0xa9d333b24d990aeb418582c1467a4e6fd86a1bf9fb57e8fa95a77cb632a52301" op, err := c.GetTransactionResult(&types.TransactionHashParam{Hash: types.HexBytes(hashString)}) @@ -184,5 +176,4 @@ func TestGetTransaction(t *testing.T) { } t.Log("Data:", p) - } diff --git a/relayer/chains/icon/codec.go b/relayer/chains/icon/codec.go index 27ed82544..7175f063e 100644 --- a/relayer/chains/icon/codec.go +++ b/relayer/chains/icon/codec.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/std" "github.com/cosmos/cosmos-sdk/types/module" ibc "github.com/cosmos/ibc-go/v7/modules/core" - icon_module "github.com/cosmos/relayer/v2/relayer/chains/icon/module" + icon_module "github.com/icon-project/relayer/v2/relayer/chains/icon/module" ) var ModuleBasics = []module.AppModuleBasic{ diff --git a/relayer/chains/icon/cryptoutils/merkle_proof.go b/relayer/chains/icon/cryptoutils/merkle_proof.go index 7424dce8b..50beff564 100644 --- a/relayer/chains/icon/cryptoutils/merkle_proof.go +++ b/relayer/chains/icon/cryptoutils/merkle_proof.go @@ -4,9 +4,9 @@ import ( "bytes" "math/bits" - "github.com/cosmos/relayer/v2/relayer/chains/icon/types" - "github.com/cosmos/relayer/v2/relayer/common" "github.com/icon-project/IBC-Integration/libraries/go/common/icon" + "github.com/icon-project/relayer/v2/relayer/chains/icon/types" + "github.com/icon-project/relayer/v2/relayer/common" ) const hashLen = 32 @@ -35,7 +35,6 @@ type MerkleHashTree struct { } func NewMerkleHashTree(byteList [][]byte) *MerkleHashTree { - var hashList HashedList for _, b := range byteList { hashList = append(hashList, common.Sha3keccak256(b)) @@ -156,7 +155,6 @@ func CalculateRootFromProof(value []byte, proof []*icon.MerkleNode) []byte { copy(hashBuf[hashLen:], node.Value) } else { continue - } } AppendHash(computedHash[:0], hashBuf) diff --git a/relayer/chains/icon/cryptoutils/merkle_test.go b/relayer/chains/icon/cryptoutils/merkle_test.go index 3a6470c98..07364b302 100644 --- a/relayer/chains/icon/cryptoutils/merkle_test.go +++ b/relayer/chains/icon/cryptoutils/merkle_test.go @@ -4,9 +4,9 @@ import ( "encoding/hex" "testing" - "github.com/cosmos/relayer/v2/relayer/chains/icon/types" - "github.com/cosmos/relayer/v2/relayer/common" "github.com/icon-project/IBC-Integration/libraries/go/common/icon" + "github.com/icon-project/relayer/v2/relayer/chains/icon/types" + "github.com/icon-project/relayer/v2/relayer/common" "github.com/stretchr/testify/assert" ) @@ -29,9 +29,8 @@ func TestMerkleRoot(t *testing.T) { } func TestMerkleProof(t *testing.T) { - assert := assert.New(t) - var h = func(b byte) []byte { + h := func(b byte) []byte { return common.Sha3keccak256([]byte{b}) } testCase := []struct { @@ -131,7 +130,6 @@ func TestMerkleProofMisMatch(t *testing.T) { } assert.False(t, VerifyMerkleProof(root, failcase, proof)) - } func TestCalculateRootFromMerkleNode(t *testing.T) { diff --git a/relayer/chains/icon/event_parser.go b/relayer/chains/icon/event_parser.go index 05642f887..b8faffbd5 100644 --- a/relayer/chains/icon/event_parser.go +++ b/relayer/chains/icon/event_parser.go @@ -5,9 +5,9 @@ import ( "github.com/cosmos/gogoproto/proto" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - "github.com/cosmos/relayer/v2/relayer/chains/icon/types" - "github.com/cosmos/relayer/v2/relayer/provider" "github.com/icon-project/IBC-Integration/libraries/go/common/icon" + "github.com/icon-project/relayer/v2/relayer/chains/icon/types" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" ) @@ -32,7 +32,6 @@ func (pi *packetInfo) parseAttrs(log *zap.Logger, event types.EventLog) { packetData := event.Indexed[1] var packet icon.Packet if err := proto.Unmarshal(packetData, &packet); err != nil { - log.Error("failed to unmarshal packet") // TODO: review return if parseAttrs add panic } @@ -53,13 +52,11 @@ func (pi *packetInfo) parseAttrs(log *zap.Logger, event types.EventLog) { if bytes.Equal(eventName, MustConvertEventNameToBytes(EventTypeWriteAcknowledgement)) { pi.Ack = event.Data[0] } - } type channelInfo provider.ChannelInfo func (ch *channelInfo) parseAttrs(log *zap.Logger, event types.EventLog) { - ch.PortID = string(event.Indexed[1]) ch.ChannelID = string(event.Indexed[2]) diff --git a/relayer/chains/icon/event_parser_test.go b/relayer/chains/icon/event_parser_test.go index bdb4e31a2..f55861ebd 100644 --- a/relayer/chains/icon/event_parser_test.go +++ b/relayer/chains/icon/event_parser_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/cosmos/gogoproto/proto" - "github.com/cosmos/relayer/v2/relayer/chains/icon/types" "github.com/icon-project/IBC-Integration/libraries/go/common/icon" + "github.com/icon-project/relayer/v2/relayer/chains/icon/types" "github.com/stretchr/testify/assert" "go.uber.org/zap" ) @@ -44,7 +44,6 @@ func TestEventMap(t *testing.T) { eventName = EventTypeCreateClient assert.Equal(t, IconCosmosEventMap[eventName], "create_client") - } func TestConnectionOpenInitByte(t *testing.T) { @@ -173,7 +172,6 @@ func TestConnectionOpenInit(t *testing.T) { // } func TestChannelHandshakeDataParsing(t *testing.T) { - data := []string{ "080110021a060a046d6f636b220c636f6e6e656374696f6e2d322a0769637332302d31", } diff --git a/relayer/chains/icon/events.go b/relayer/chains/icon/events.go index ecff9e8d7..48d59b7a5 100644 --- a/relayer/chains/icon/events.go +++ b/relayer/chains/icon/events.go @@ -7,8 +7,8 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/cosmos/relayer/v2/relayer/chains/icon/types" - "github.com/cosmos/relayer/v2/relayer/common" + "github.com/icon-project/relayer/v2/relayer/chains/icon/types" + "github.com/icon-project/relayer/v2/relayer/common" ) // Events @@ -95,7 +95,6 @@ func ToEventLogBytes(evt types.EventLogStr) types.EventLog { Indexed: indexed, Data: data, } - } var BtpHeaderRequiredEvents map[string]struct{} = map[string]struct{}{ @@ -130,7 +129,7 @@ var MonitorEvents []string = []string{ EventTypeChannelCloseInit, EventTypeChannelCloseConfirm, - //no BTP block produced + // no BTP block produced EventTypeRecvPacket, EventTypeAcknowledgePacket, EventTypeUpdateClient, @@ -141,7 +140,6 @@ var MonitorEvents []string = []string{ } func GetMonitorEventFilters(address string) []*types.EventFilter { - filters := []*types.EventFilter{} if address == "" { return filters diff --git a/relayer/chains/icon/fees.go b/relayer/chains/icon/fees.go index 37f54ede8..faba69d90 100644 --- a/relayer/chains/icon/fees.go +++ b/relayer/chains/icon/fees.go @@ -1,8 +1,8 @@ package icon import ( - "github.com/cosmos/relayer/v2/relayer/chains/icon/types" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/chains/icon/types" + "github.com/icon-project/relayer/v2/relayer/provider" ) type MsgClaimFees struct { @@ -11,7 +11,6 @@ type MsgClaimFees struct { } func (icp *IconProvider) MsgClaimFees(dstChainID, dstAddress string) (provider.RelayerMessage, error) { - params := MsgClaimFees{ Nid: dstChainID, Address: types.NewHexBytes([]byte(dstAddress)), diff --git a/relayer/chains/icon/icon_chain_processor.go b/relayer/chains/icon/icon_chain_processor.go index a650c2296..265ca274b 100644 --- a/relayer/chains/icon/icon_chain_processor.go +++ b/relayer/chains/icon/icon_chain_processor.go @@ -15,13 +15,13 @@ import ( conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/cosmos/relayer/v2/relayer/chains/icon/types" - rlycommon "github.com/cosmos/relayer/v2/relayer/common" - "github.com/cosmos/relayer/v2/relayer/processor" - "github.com/cosmos/relayer/v2/relayer/provider" "github.com/gorilla/websocket" "github.com/icon-project/goloop/common" "github.com/icon-project/goloop/common/codec" + "github.com/icon-project/relayer/v2/relayer/chains/icon/types" + rlycommon "github.com/icon-project/relayer/v2/relayer/common" + "github.com/icon-project/relayer/v2/relayer/processor" + "github.com/icon-project/relayer/v2/relayer/provider" "github.com/pkg/errors" ) @@ -94,7 +94,6 @@ func NewIconChainProcessor(log *zap.Logger, provider *IconProvider, metrics *pro type latestClientState map[string]provider.ClientState func (l latestClientState) update(ctx context.Context, clientInfo clientInfo, icp *IconChainProcessor) { - existingClientInfo, ok := l[clientInfo.clientID] if ok { if clientInfo.consensusHeight.LT(existingClientInfo.ConsensusHeight) { @@ -254,7 +253,6 @@ func (icp *IconChainProcessor) GetLatestHeight() uint64 { } func (icp *IconChainProcessor) monitoring(ctx context.Context, persistence *queryCyclePersistence) error { - errCh := make(chan error) // error channel reconnectCh := make(chan struct{}, 1) // reconnect channel btpBlockNotifCh := make(chan *types.BlockNotification, 10) // block notification channel @@ -340,7 +338,6 @@ loop: reconnect() icp.log.Warn("Error occured during monitor block", zap.Error(err)) } - }(ctxMonitorBlock, cancelMonitorBlock) case br := <-btpBlockRespCh: for ; br != nil; processedheight++ { @@ -449,7 +446,6 @@ loop: go icp.handleBTPBlockRequest(request, requestCh) } - } // filter nil _brs, brs := brs, brs[:0] @@ -554,7 +550,8 @@ func (icp *IconChainProcessor) verifyBlock(ctx context.Context, ibcHeader provid } func (icp *IconChainProcessor) handleBTPBlockRequest( - request *btpBlockRequest, requestCh chan *btpBlockRequest) { + request *btpBlockRequest, requestCh chan *btpBlockRequest, +) { defer func() { time.Sleep(500 * time.Millisecond) requestCh <- request @@ -662,8 +659,8 @@ func (icp *IconChainProcessor) handleBTPBlockRequest( func (icp *IconChainProcessor) handlePathProcessorUpdate(ctx context.Context, latestHeader provider.IBCHeader, messageCache processor.IBCMessagesCache, - ibcHeaderCache processor.IBCHeaderCache) error { - + ibcHeaderCache processor.IBCHeaderCache, +) error { chainID := icp.chainProvider.ChainId() latestHeight, _ := icp.chainProvider.QueryLatestHeight(ctx) @@ -697,7 +694,6 @@ func (icp *IconChainProcessor) handlePathProcessorUpdate(ctx context.Context, }) } return nil - } // clientState will return the most recent client state if client messages diff --git a/relayer/chains/icon/keys.go b/relayer/chains/icon/keys.go index 878422c61..8e3470246 100644 --- a/relayer/chains/icon/keys.go +++ b/relayer/chains/icon/keys.go @@ -8,10 +8,10 @@ import ( "path" "strings" - "github.com/cosmos/relayer/v2/relayer/provider" glcrypto "github.com/icon-project/goloop/common/crypto" "github.com/icon-project/goloop/common/wallet" "github.com/icon-project/goloop/module" + "github.com/icon-project/relayer/v2/relayer/provider" ) func (cp *IconProvider) CreateKeystore(path string) error { @@ -141,14 +141,14 @@ func (cp *IconProvider) saveWallet(name string, ks []byte) error { dirPath := path.Join(cp.PCfg.KeyDirectory, cp.ChainId()) _, err := os.Stat(dirPath) if os.IsNotExist(err) { - err := os.MkdirAll(dirPath, 0755) + err := os.MkdirAll(dirPath, 0o755) if err != nil { panic(err) } } else if err != nil { return err } - if err := os.WriteFile(fmt.Sprintf("%s/%s.json", dirPath, name), ks, 0600); err != nil { + if err := os.WriteFile(fmt.Sprintf("%s/%s.json", dirPath, name), ks, 0o600); err != nil { log.Panicf("Fail to write keystore err=%+v", err) return err } @@ -160,7 +160,6 @@ type OnlyAddr struct { } func getAddrFromKeystore(keystorePath string) (string, error) { - ksFile, err := os.ReadFile(keystorePath) if err != nil { return "", err @@ -172,5 +171,4 @@ func getAddrFromKeystore(keystorePath string) (string, error) { return "", err } return a.Address, nil - } diff --git a/relayer/chains/icon/message_handler.go b/relayer/chains/icon/message_handler.go index eae218d9c..c7b0d245a 100644 --- a/relayer/chains/icon/message_handler.go +++ b/relayer/chains/icon/message_handler.go @@ -6,8 +6,8 @@ import ( conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/cosmos/relayer/v2/relayer/processor" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/processor" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) @@ -54,7 +54,6 @@ func (icp *IconChainProcessor) handlePacketMessage(eventType string, pi provider c.PacketFlow.Retain(k, eventType, pi) icp.logPacketMessage(eventType, pi) - } func (icp *IconChainProcessor) handleChannelMessage(eventType string, ci provider.ChannelInfo, ibcMessagesCache processor.IBCMessagesCache) { @@ -96,7 +95,6 @@ func (icp *IconChainProcessor) handleChannelMessage(eventType string, ci provide ibcMessagesCache.ChannelHandshake.Retain(channelKey, eventType, ci) icp.logChannelMessage(eventType, ci) - } func (icp *IconChainProcessor) handleConnectionMessage(eventType string, ci provider.ConnectionInfo, ibcMessagesCache processor.IBCMessagesCache) { @@ -125,14 +123,12 @@ func (icp *IconChainProcessor) handleConnectionMessage(eventType string, ci prov ibcMessagesCache.ConnectionHandshake.Retain(connectionKey, eventType, ci) icp.logConnectionMessage(eventType, ci) - } func (icp *IconChainProcessor) handleClientMessage(ctx context.Context, eventType string, ci clientInfo) { // TODO: icp.latestClientState.update(ctx, ci, icp) icp.logObservedIBCMessage(eventType, zap.String("client_id", ci.clientID)) - } func (ccp *IconChainProcessor) logObservedIBCMessage(m string, fields ...zap.Field) { diff --git a/relayer/chains/icon/msg.go b/relayer/chains/icon/msg.go index 27015d352..fc4129d3d 100644 --- a/relayer/chains/icon/msg.go +++ b/relayer/chains/icon/msg.go @@ -3,7 +3,7 @@ package icon import ( "encoding/json" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/provider" ) const defaultStepLimit = 13610920010 @@ -22,7 +22,6 @@ func (im *IconMessage) MsgBytes() ([]byte, error) { } func (icp *IconProvider) NewIconMessage(msg interface{}, method string) provider.RelayerMessage { - im := &IconMessage{ Params: msg, Method: method, diff --git a/relayer/chains/icon/provider.go b/relayer/chains/icon/provider.go index b98583a0d..97b679da2 100644 --- a/relayer/chains/icon/provider.go +++ b/relayer/chains/icon/provider.go @@ -8,12 +8,12 @@ import ( "time" "github.com/cosmos/gogoproto/proto" - "github.com/cosmos/relayer/v2/relayer/chains/icon/types" - "github.com/cosmos/relayer/v2/relayer/common" - "github.com/cosmos/relayer/v2/relayer/processor" - "github.com/cosmos/relayer/v2/relayer/provider" "github.com/icon-project/IBC-Integration/libraries/go/common/icon" "github.com/icon-project/goloop/module" + "github.com/icon-project/relayer/v2/relayer/chains/icon/types" + "github.com/icon-project/relayer/v2/relayer/common" + "github.com/icon-project/relayer/v2/relayer/processor" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" @@ -96,7 +96,6 @@ func (pp *IconProviderConfig) GetFirstRetryBlockAfter() uint64 { // NewProvider should provide a new Icon provider func (pp *IconProviderConfig) NewProvider(log *zap.Logger, homepath string, debug bool, chainName string) (provider.ChainProvider, error) { - pp.ChainName = chainName if err := pp.Validate(); err != nil { @@ -189,8 +188,7 @@ func (h IconIBCHeader) ShouldUpdateForProofContextChange() bool { return false } -//ChainProvider Methods - +// ChainProvider Methods func (icp *IconProvider) Init(ctx context.Context) error { // if _, err := os.Stat(icp.PCfg.Keystore); err != nil { // return err @@ -217,7 +215,6 @@ func (icp *IconProvider) NewClientState( allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour bool, ) (ibcexported.ClientState, error) { - if !dstUpdateHeader.IsCompleteBlock() { return nil, fmt.Errorf("Not complete block at height:%d", dstUpdateHeader.Height()) } @@ -238,7 +235,6 @@ func (icp *IconProvider) NewClientState( NetworkId: uint64(icp.PCfg.BTPNetworkID), NetworkTypeId: uint64(icp.PCfg.BTPNetworkTypeID), }, nil - } func (icp *IconProvider) ConnectionHandshakeProof(ctx context.Context, msgOpenInit provider.ConnectionInfo, height uint64) (provider.ConnectionProof, error) { @@ -258,11 +254,9 @@ func (icp *IconProvider) ConnectionHandshakeProof(ctx context.Context, msgOpenIn ConnectionStateProof: connStateProof, ProofHeight: proofHeight.(clienttypes.Height), }, nil - } func (icp *IconProvider) ConnectionProof(ctx context.Context, msgOpenAck provider.ConnectionInfo, height uint64) (provider.ConnectionProof, error) { - connState, err := icp.QueryConnection(ctx, int64(msgOpenAck.Height), msgOpenAck.ConnID) if err != nil { return provider.ConnectionProof{}, err @@ -274,7 +268,6 @@ func (icp *IconProvider) ConnectionProof(ctx context.Context, msgOpenAck provide } func (icp *IconProvider) ChannelProof(ctx context.Context, msg provider.ChannelInfo, height uint64) (provider.ChannelProof, error) { - channelResult, err := icp.QueryChannel(ctx, int64(msg.Height), msg.ChannelID, msg.PortID) if err != nil { return provider.ChannelProof{}, nil @@ -317,7 +310,6 @@ func (icp *IconProvider) PacketCommitment(ctx context.Context, msgTransfer provi packetCommitmentResponse, err := icp.QueryPacketCommitment( ctx, int64(msgTransfer.Height), msgTransfer.SourceChannel, msgTransfer.SourcePort, msgTransfer.Sequence, ) - if err != nil { return provider.PacketProof{}, err } @@ -336,12 +328,10 @@ func (icp *IconProvider) PacketAcknowledgement(ctx context.Context, msgRecvPacke Proof: packetAckResponse.Proof, ProofHeight: packetAckResponse.ProofHeight, }, nil - } func (icp *IconProvider) PacketReceipt(ctx context.Context, msgTransfer provider.PacketInfo, height uint64) (provider.PacketProof, error) { packetReceiptResponse, err := icp.QueryPacketReceipt(ctx, int64(msgTransfer.Height), msgTransfer.DestChannel, msgTransfer.DestPort, msgTransfer.Sequence) - if err != nil { return provider.PacketProof{}, err } @@ -349,7 +339,6 @@ func (icp *IconProvider) PacketReceipt(ctx context.Context, msgTransfer provider Proof: packetReceiptResponse.Proof, ProofHeight: packetReceiptResponse.ProofHeight, }, nil - } func (icp *IconProvider) NextSeqRecv(ctx context.Context, msgTransfer provider.PacketInfo, height uint64) (provider.PacketProof, error) { @@ -361,7 +350,6 @@ func (icp *IconProvider) NextSeqRecv(ctx context.Context, msgTransfer provider.P Proof: nextSeqRecvResponse.Proof, ProofHeight: nextSeqRecvResponse.ProofHeight, }, nil - } func (icp *IconProvider) MsgTransfer(dstAddr string, amount sdk.Coin, info provider.PacketInfo) (provider.RelayerMessage, error) { @@ -519,7 +507,6 @@ func (icp *IconProvider) GetBTPProof(height int64) ([][]byte, error) { return nil, err } return valSigs.Signatures, nil - } func (icp *IconProvider) GetProofContextByHeight(height int64) ([][]byte, error) { diff --git a/relayer/chains/icon/provider_helper.go b/relayer/chains/icon/provider_helper.go index 0648e6879..42ec36126 100644 --- a/relayer/chains/icon/provider_helper.go +++ b/relayer/chains/icon/provider_helper.go @@ -7,9 +7,9 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" - "github.com/cosmos/relayer/v2/relayer/common" "github.com/icon-project/IBC-Integration/libraries/go/common/icon" itm "github.com/icon-project/IBC-Integration/libraries/go/common/tendermint" + "github.com/icon-project/relayer/v2/relayer/common" ) // Implement when a new chain is added to ICON IBC Contract diff --git a/relayer/chains/icon/provider_test.go b/relayer/chains/icon/provider_test.go index c52e7e83a..b763e4ee4 100644 --- a/relayer/chains/icon/provider_test.go +++ b/relayer/chains/icon/provider_test.go @@ -10,10 +10,10 @@ import ( conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" "github.com/cosmos/ibc-go/v7/modules/core/exported" - "github.com/cosmos/relayer/v2/relayer/chains/icon/types" - "github.com/cosmos/relayer/v2/relayer/common" "github.com/icon-project/IBC-Integration/libraries/go/common/icon" icn "github.com/icon-project/IBC-Integration/libraries/go/common/icon" + "github.com/icon-project/relayer/v2/relayer/chains/icon/types" + "github.com/icon-project/relayer/v2/relayer/common" "github.com/stretchr/testify/assert" "go.uber.org/zap" @@ -31,7 +31,6 @@ func TestAddr(t *testing.T) { } func TestConnectionDecode(t *testing.T) { - input := types.HexBytes("0a0f30372d74656e6465726d696e742d3012230a0131120d4f524445525f4f524445524544120f4f524445525f554e4f524445524544180322200a0f30372d74656e6465726d696e742d30120d636f6e6e656374696f6e2d3533") var conn conntypes.ConnectionEnd _, err := HexBytesToProtoUnmarshal(input, &conn) @@ -44,7 +43,6 @@ func TestConnectionDecode(t *testing.T) { } func GetMockIconProvider(network_id int, contractAddress string) *IconProvider { - absPath, _ := filepath.Abs("../../../env/godWallet.json") pcfg := IconProviderConfig{ @@ -64,11 +62,9 @@ func GetMockIconProvider(network_id int, contractAddress string) *IconProvider { iconProvider, _ := p.(*IconProvider) return iconProvider - } func TestNetworkSectionHashCheck(t *testing.T) { - prevNetworkSectionHash, _ := hex.DecodeString("b791b4b069c561ca31093f825f083f6cc3c8e5ad5135625becd2ff77a8ccfa1e") messageRoot, _ := hex.DecodeString("84d8e19eb09626e4a94212d3a9db54bc16a75dfd791858c0fab3032b944f657a") nextProofContextHash, _ := hex.DecodeString("d090304264eeee3c3562152f2dc355601b0b423a948824fd0a012c11c3fc2fb4") @@ -109,7 +105,7 @@ func TestMsgOpenTryProof(t *testing.T) { assert.NoError(t, err) assert.True(t, approved, "failed to verify client state") - //checking consensus state + // checking consensus state var cs exported.ClientState err = codec.Marshaler.UnpackAny(msgOpenTry.ClientState, &cs) assert.NoError(t, err) diff --git a/relayer/chains/icon/query.go b/relayer/chains/icon/query.go index 1804ac8ce..9a15a6759 100644 --- a/relayer/chains/icon/query.go +++ b/relayer/chains/icon/query.go @@ -17,21 +17,21 @@ import ( "github.com/pkg/errors" "go.uber.org/zap" - //this import should be letter converted to icon types + // this import should be letter converted to icon types - "github.com/cosmos/relayer/v2/relayer/chains/icon/cryptoutils" - "github.com/cosmos/relayer/v2/relayer/chains/icon/types" - "github.com/cosmos/relayer/v2/relayer/common" - "github.com/cosmos/relayer/v2/relayer/provider" "github.com/icon-project/IBC-Integration/libraries/go/common/icon" itm "github.com/icon-project/IBC-Integration/libraries/go/common/tendermint" + "github.com/icon-project/relayer/v2/relayer/chains/icon/cryptoutils" + "github.com/icon-project/relayer/v2/relayer/chains/icon/types" + "github.com/icon-project/relayer/v2/relayer/common" + "github.com/icon-project/relayer/v2/relayer/provider" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" committypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" - //change this to icon types after original repo merge + // change this to icon types after original repo merge ) // ***************** methods marked with legacy should be updated only when relayer is runned through legacy method ***************** @@ -51,7 +51,6 @@ func callParamsWithHeight(height types.HexInt) CallParamOption { } func (icp *IconProvider) prepareCallParams(methodName string, param map[string]interface{}, options ...CallParamOption) *types.CallParam { - callData := &types.CallData{ Method: methodName, Params: param, @@ -69,7 +68,6 @@ func (icp *IconProvider) prepareCallParams(methodName string, param map[string]i } return callParam - } func (icp *IconProvider) BlockTime(ctx context.Context, height int64) (time.Time, error) { @@ -111,7 +109,6 @@ func (icp *IconProvider) QueryLatestHeight(ctx context.Context) (int64, error) { // legacy func (icp *IconProvider) QueryIBCHeader(ctx context.Context, h int64) (provider.IBCHeader, error) { - validators, err := icp.GetProofContextByHeight(h) if err != nil { return nil, err @@ -165,7 +162,6 @@ func (icp *IconProvider) QueryUnbondingPeriod(context.Context) (time.Duration, e // ics 02 - client func (icp *IconProvider) QueryClientState(ctx context.Context, height int64, clientid string) (ibcexported.ClientState, error) { - clientStateRes, err := icp.QueryClientStateResponse(ctx, height, clientid) if err != nil { return nil, err @@ -177,7 +173,6 @@ func (icp *IconProvider) QueryClientState(ctx context.Context, height int64, cli } return clientStateExported, nil - } func (icp *IconProvider) QueryClientStateWithoutProof(ctx context.Context, height int64, clientid string) (ibcexported.ClientState, error) { @@ -185,7 +180,7 @@ func (icp *IconProvider) QueryClientStateWithoutProof(ctx context.Context, heigh "clientId": clientid, }, callParamsWithHeight(types.NewHexInt(height))) - //similar should be implemented + // similar should be implemented var clientStateB types.HexBytes err := icp.client.Call(callParams, &clientStateB) if err != nil { @@ -210,16 +205,14 @@ func (icp *IconProvider) QueryClientStateWithoutProof(ctx context.Context, heigh } return clientStateExported, nil - } func (icp *IconProvider) QueryClientStateResponse(ctx context.Context, height int64, srcClientId string) (*clienttypes.QueryClientStateResponse, error) { - callParams := icp.prepareCallParams(MethodGetClientState, map[string]interface{}{ "clientId": srcClientId, }, callParamsWithHeight(types.NewHexInt(height))) - //similar should be implemented + // similar should be implemented var clientStateB types.HexBytes err := icp.client.Call(callParams, &clientStateB) if err != nil { @@ -246,7 +239,6 @@ func (icp *IconProvider) QueryClientStateResponse(ctx context.Context, height in } func (icp *IconProvider) QueryClientConsensusState(ctx context.Context, chainHeight int64, clientid string, clientHeight ibcexported.Height) (*clienttypes.QueryConsensusStateResponse, error) { - h, ok := clientHeight.(clienttypes.Height) if !ok { return nil, fmt.Errorf("clientHeight type mismatched ") @@ -307,7 +299,6 @@ func (icp *IconProvider) QueryConsensusState(ctx context.Context, height int64) // query all the clients of the chain func (icp *IconProvider) QueryClients(ctx context.Context) (clienttypes.IdentifiedClientStates, error) { seq, err := icp.getNextSequence(ctx, MethodGetNextClientSequence) - if err != nil { return nil, err } @@ -323,7 +314,7 @@ func (icp *IconProvider) QueryClients(ctx context.Context) (clienttypes.Identifi "clientId": clientIdentifier, }) - //similar should be implemented + // similar should be implemented var clientStateB types.HexBytes err := icp.client.Call(callParams, &clientStateB) if err != nil { @@ -345,7 +336,6 @@ func (icp *IconProvider) QueryClients(ctx context.Context) (clienttypes.Identifi // query connection to the ibc host based on the connection-id func (icp *IconProvider) QueryConnection(ctx context.Context, height int64, connectionid string) (*conntypes.QueryConnectionResponse, error) { - callParam := icp.prepareCallParams(MethodGetConnection, map[string]interface{}{ "connectionId": connectionid, }, callParamsWithHeight(types.NewHexInt(height))) @@ -376,7 +366,6 @@ func (icp *IconProvider) QueryConnection(ctx context.Context, height int64, conn } return conntypes.NewQueryConnectionResponse(conn, proof, clienttypes.NewHeight(0, uint64(height))), nil - } var emptyConnRes = conntypes.NewQueryConnectionResponse( @@ -397,7 +386,6 @@ var emptyConnRes = conntypes.NewQueryConnectionResponse( // ics 03 - connection func (icp *IconProvider) QueryConnections(ctx context.Context) (conns []*conntypes.IdentifiedConnection, err error) { - nextSeq, err := icp.getNextSequence(ctx, MethodGetNextConnectionSequence) if err != nil { return nil, err @@ -441,7 +429,6 @@ func (icp *IconProvider) QueryConnections(ctx context.Context) (conns []*conntyp } func (icp *IconProvider) getNextSequence(ctx context.Context, methodName string) (uint64, error) { - var seq types.HexInt switch methodName { case MethodGetNextClientSequence: @@ -478,10 +465,11 @@ func (icp *IconProvider) getAllPorts(ctx context.Context) ([]string, error) { func (icp *IconProvider) QueryConnectionsUsingClient(ctx context.Context, height int64, clientid string) (*conntypes.QueryConnectionsResponse, error) { panic(fmt.Sprintf("%s%s", icp.ChainName(), NOT_IMPLEMENTED)) } + func (icp *IconProvider) GenerateConnHandshakeProof(ctx context.Context, height int64, clientId, connId string) (ibcexported.ClientState, []byte, []byte, []byte, - ibcexported.Height, error) { - + ibcexported.Height, error, +) { // clientProof clientResponse, err := icp.QueryClientStateResponse(ctx, height, clientId) if err != nil { @@ -512,7 +500,6 @@ func (icp *IconProvider) GenerateConnHandshakeProof(ctx context.Context, height // ics 04 - channel func (icp *IconProvider) QueryChannel(ctx context.Context, height int64, channelid, portid string) (chanRes *chantypes.QueryChannelResponse, err error) { - callParam := icp.prepareCallParams(MethodGetChannel, map[string]interface{}{ "channelId": channelid, "portId": portid, @@ -588,7 +575,6 @@ func (icp *IconProvider) QueryConnectionChannels(ctx context.Context, height int } } return identifiedChannels, nil - } func (icp *IconProvider) QueryChannels(ctx context.Context) ([]*chantypes.IdentifiedChannel, error) { @@ -807,7 +793,6 @@ func (icp *IconProvider) QueryIconProof(ctx context.Context, height int64, keyHa merkleProofs := icon.MerkleProofs{} messages, err := icp.GetBtpMessage(height) - if err != nil { return nil, err } @@ -858,5 +843,4 @@ func (icp *IconProvider) HexStringToProtoUnmarshal(encoded string, v proto.Messa return nil, err } return inputBytes, nil - } diff --git a/relayer/chains/icon/tx.go b/relayer/chains/icon/tx.go index 6a7f11776..a2861010f 100644 --- a/relayer/chains/icon/tx.go +++ b/relayer/chains/icon/tx.go @@ -18,9 +18,9 @@ import ( // tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" itm "github.com/icon-project/IBC-Integration/libraries/go/common/tendermint" - "github.com/cosmos/relayer/v2/relayer/chains/icon/types" - "github.com/cosmos/relayer/v2/relayer/provider" "github.com/icon-project/IBC-Integration/libraries/go/common/icon" + "github.com/icon-project/relayer/v2/relayer/chains/icon/types" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" ) @@ -34,7 +34,6 @@ var ( ) func (icp *IconProvider) MsgCreateClient(clientState ibcexported.ClientState, consensusState ibcexported.ConsensusState) (provider.RelayerMessage, error) { - clientStateBytes, err := proto.Marshal(clientState) if err != nil { return nil, err @@ -59,7 +58,6 @@ func (icp *IconProvider) MsgCreateClient(clientState ibcexported.ClientState, co // Upgrade Client Not Implemented implemented func (icp *IconProvider) MsgUpgradeClient(srcClientId string, consRes *clienttypes.QueryConsensusStateResponse, clientRes *clienttypes.QueryClientStateResponse) (provider.RelayerMessage, error) { - clU := &types.MsgUpdateClient{ ClientId: srcClientId, ClientMessage: types.HexBytes(""), @@ -109,7 +107,6 @@ func (icp *IconProvider) MsgRecvPacket(msgTransfer provider.PacketInfo, proof pr } func (icp *IconProvider) MsgAcknowledgement(msgRecvPacket provider.PacketInfo, proofAcked provider.PacketProof) (provider.RelayerMessage, error) { - pktEncode, err := getIconPacketEncodedBytes(msgRecvPacket) if err != nil { return nil, err @@ -164,7 +161,6 @@ func (icp *IconProvider) MsgTimeout(msgTransfer provider.PacketInfo, proofUnrece } func (ip *IconProvider) MsgTimeoutRequest(msgTransfer provider.PacketInfo, proof provider.PacketProof) (provider.RelayerMessage, error) { - pktEncode, err := getIconPacketEncodedBytes(msgTransfer) if err != nil { return nil, err @@ -185,7 +181,6 @@ func (ip *IconProvider) MsgTimeoutRequest(msgTransfer provider.PacketInfo, proof Msg: timeoutMsg, } return ip.NewIconMessage(msg, MethodRequestTimeout), nil - } func (icp *IconProvider) MsgTimeoutOnClose(msgTransfer provider.PacketInfo, proofUnreceived provider.PacketProof) (provider.RelayerMessage, error) { @@ -275,7 +270,6 @@ func (icp *IconProvider) MsgConnectionOpenTry(msgOpenInit provider.ConnectionInf } func (icp *IconProvider) MsgConnectionOpenAck(msgOpenTry provider.ConnectionInfo, proof provider.ConnectionProof) (provider.RelayerMessage, error) { - // proof from chainB should return clientState of chainB tracking chainA iconClientState, err := icp.MustReturnIconClientState(proof.ClientState) if err != nil { @@ -489,7 +483,6 @@ func (icp *IconProvider) MsgChannelCloseConfirm(msgCloseInit provider.ChannelInf } func (icp *IconProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, trustedHeight clienttypes.Height, trustedHeader provider.IBCHeader) (ibcexported.ClientMessage, error) { - latestIconHeader, ok := latestHeader.(IconIBCHeader) if !ok { return nil, fmt.Errorf("Unsupported IBC Header type. Expected: IconIBCHeader,actual: %T", latestHeader) @@ -543,11 +536,9 @@ func (icp *IconProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, } return signedHeader, nil - } func (icp *IconProvider) MsgUpdateClient(clientID string, counterpartyHeader ibcexported.ClientMessage) (provider.RelayerMessage, error) { - cs := counterpartyHeader.(*itm.TmHeader) clientMsg, err := proto.Marshal(cs) if err != nil { @@ -565,7 +556,6 @@ func (icp *IconProvider) MsgUpdateClient(clientID string, counterpartyHeader ibc } func (icp *IconProvider) SendMessage(ctx context.Context, msg provider.RelayerMessage, memo string) (*provider.RelayerTxResponse, bool, error) { - var ( rlyResp *provider.RelayerTxResponse callbackErr error @@ -607,7 +597,6 @@ func (icp *IconProvider) SendMessage(ctx context.Context, msg provider.RelayerMe } func (icp *IconProvider) parseConfirmedEventLogStr(event types.EventLogStr) provider.RelayerEvent { - eventName := event.Indexed[0] switch eventName { @@ -742,7 +731,6 @@ func (icp *IconProvider) SendCustomMessage(ctx context.Context, contract string, } return rlyResp, true, callbackErr - } func (icp *IconProvider) SendCustomMessageToMempool( @@ -772,7 +760,8 @@ func (icp *IconProvider) SendIconTransaction( contract types.Address, msg provider.RelayerMessage, asyncCtx context.Context, - asyncCallback func(*provider.RelayerTxResponse, error)) error { + asyncCallback func(*provider.RelayerTxResponse, error), +) error { m := msg.(*IconMessage) wallet, err := icp.Wallet() if err != nil { diff --git a/relayer/chains/icon/types/types.go b/relayer/chains/icon/types/types.go index 9c801a0b0..17b4caf23 100644 --- a/relayer/chains/icon/types/types.go +++ b/relayer/chains/icon/types/types.go @@ -29,8 +29,8 @@ import ( "github.com/icon-project/goloop/common" "github.com/icon-project/goloop/common/codec" - relayer_common "github.com/cosmos/relayer/v2/relayer/common" "github.com/icon-project/goloop/server/jsonrpc" + relayer_common "github.com/icon-project/relayer/v2/relayer/common" ) const ( @@ -389,6 +389,7 @@ func (hs HexBytes) Value() ([]byte, error) { } return hex.DecodeString(string(hs[2:])) } + func NewHexBytes(b []byte) HexBytes { return HexBytes("0x" + hex.EncodeToString(b)) } @@ -492,28 +493,28 @@ func NewAddress(b []byte) Address { } type Block struct { - //BlockHash HexBytes `json:"block_hash" validate:"required,t_hash"` - //Version HexInt `json:"version" validate:"required,t_int"` + // BlockHash HexBytes `json:"block_hash" validate:"required,t_hash"` + // Version HexInt `json:"version" validate:"required,t_int"` Height int64 `json:"height" validate:"required,t_int"` Timestamp int64 `json:"time_stamp" validate:"required,t_int"` - //Proposer HexBytes `json:"peer_id" validate:"optional,t_addr_eoa"` - //PrevID HexBytes `json:"prev_block_hash" validate:"required,t_hash"` - //NormalTransactionsHash HexBytes `json:"merkle_tree_root_hash" validate:"required,t_hash"` + // Proposer HexBytes `json:"peer_id" validate:"optional,t_addr_eoa"` + // PrevID HexBytes `json:"prev_block_hash" validate:"required,t_hash"` + // NormalTransactionsHash HexBytes `json:"merkle_tree_root_hash" validate:"required,t_hash"` NormalTransactions []struct { TxHash HexBytes `json:"txHash"` - //Version HexInt `json:"version"` + // Version HexInt `json:"version"` From Address `json:"from"` To Address `json:"to"` - //Value HexInt `json:"value,omitempty" ` - //StepLimit HexInt `json:"stepLimit"` - //TimeStamp HexInt `json:"timestamp"` - //NID HexInt `json:"nid,omitempty"` - //Nonce HexInt `json:"nonce,omitempty"` - //Signature HexBytes `json:"signature"` + // Value HexInt `json:"value,omitempty" ` + // StepLimit HexInt `json:"stepLimit"` + // TimeStamp HexInt `json:"timestamp"` + // NID HexInt `json:"nid,omitempty"` + // Nonce HexInt `json:"nonce,omitempty"` + // Signature HexBytes `json:"signature"` DataType string `json:"dataType,omitempty"` Data json.RawMessage `json:"data,omitempty"` } `json:"confirmed_transaction_list"` - //Signature HexBytes `json:"signature" validate:"optional,t_hash"` + // Signature HexBytes `json:"signature" validate:"optional,t_hash"` } type WsReadCallback func(*websocket.Conn, interface{}) error @@ -605,7 +606,6 @@ type NetworkSection struct { func NewNetworkSection( header *BTPBlockHeader, ) *NetworkSection { - return &NetworkSection{ Nid: int64(header.NetworkID), UpdateNumber: uint64(header.UpdateNumber), // @@ -618,6 +618,7 @@ func NewNetworkSection( func (h *NetworkSection) Hash() []byte { return relayer_common.Sha3keccak256(h.Encode()) } + func (h *NetworkSection) Encode() []byte { return codec.RLP.MustMarshalToBytes(h) } diff --git a/relayer/chains/icon/utils.go b/relayer/chains/icon/utils.go index 4afa9e369..1252eef6e 100644 --- a/relayer/chains/icon/utils.go +++ b/relayer/chains/icon/utils.go @@ -8,10 +8,10 @@ import ( "net/url" "strings" - "github.com/cosmos/relayer/v2/relayer/chains/icon/cryptoutils" - "github.com/cosmos/relayer/v2/relayer/chains/icon/types" - "github.com/cosmos/relayer/v2/relayer/common" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/chains/icon/cryptoutils" + "github.com/icon-project/relayer/v2/relayer/chains/icon/types" + "github.com/icon-project/relayer/v2/relayer/common" + "github.com/icon-project/relayer/v2/relayer/provider" "github.com/cosmos/gogoproto/proto" @@ -23,9 +23,7 @@ import ( "github.com/icon-project/goloop/common/trie/ompt" ) -var ( - ethAddressLen = 20 -) +var ethAddressLen = 20 func MptProve(key types.HexInt, proofs [][]byte, hash []byte) ([]byte, error) { db := db.NewMapDB() @@ -42,7 +40,6 @@ func MptProve(key types.HexInt, proofs [][]byte, hash []byte) ([]byte, error) { trie, err1 := mpt.Prove(indexKey, proofs) if err1 != nil { return nil, err1 - } return trie, nil } @@ -72,10 +69,8 @@ func HexBytesToProtoUnmarshal(encoded types.HexBytes, v proto.Message) ([]byte, if err := proto.Unmarshal(inputBytes, v); err != nil { return nil, err - } return inputBytes, nil - } func isHexString(s string) bool { @@ -133,7 +128,6 @@ func getIconPacketEncodedBytes(pkt provider.PacketInfo) ([]byte, error) { } return proto.Marshal(&iconPkt) - } func GetNetworkSectionRoot(header *types.BTPBlockHeader) []byte { @@ -142,7 +136,6 @@ func GetNetworkSectionRoot(header *types.BTPBlockHeader) []byte { } func VerifyBtpProof(decision *types.NetworkTypeSectionDecision, proof [][]byte, listValidators [][]byte) (bool, error) { - requiredVotes := (2 * len(listValidators)) / 3 if requiredVotes < 1 { requiredVotes = 1 @@ -181,7 +174,6 @@ func VerifyBtpProof(decision *types.NetworkTypeSectionDecision, proof [][]byte, } return false, nil - } func newEthAddressFromPubKey(pubKey []byte) ([]byte, error) { @@ -224,5 +216,4 @@ func isValidIconContractAddress(addr string) bool { } _, err := hex.DecodeString(addr[2:]) return err == nil - } diff --git a/relayer/chains/mock/message_handlers.go b/relayer/chains/mock/message_handlers.go index 263f50d71..1d3a8e8fc 100644 --- a/relayer/chains/mock/message_handlers.go +++ b/relayer/chains/mock/message_handlers.go @@ -4,8 +4,8 @@ import ( "fmt" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/cosmos/relayer/v2/relayer/processor" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/processor" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" ) diff --git a/relayer/chains/mock/mock_chain_processor.go b/relayer/chains/mock/mock_chain_processor.go index e76b1bf82..c1239520d 100644 --- a/relayer/chains/mock/mock_chain_processor.go +++ b/relayer/chains/mock/mock_chain_processor.go @@ -5,9 +5,9 @@ import ( "time" "github.com/cosmos/cosmos-sdk/crypto/hd" - "github.com/cosmos/relayer/v2/relayer/chains/cosmos" - "github.com/cosmos/relayer/v2/relayer/processor" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/chains/cosmos" + "github.com/icon-project/relayer/v2/relayer/processor" + "github.com/icon-project/relayer/v2/relayer/provider" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "go.uber.org/zap" diff --git a/relayer/chains/mock/mock_chain_processor_test.go b/relayer/chains/mock/mock_chain_processor_test.go index 718826917..aada22b69 100644 --- a/relayer/chains/mock/mock_chain_processor_test.go +++ b/relayer/chains/mock/mock_chain_processor_test.go @@ -9,9 +9,9 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/cosmos/relayer/v2/relayer" - "github.com/cosmos/relayer/v2/relayer/chains/mock" - "github.com/cosmos/relayer/v2/relayer/processor" + "github.com/icon-project/relayer/v2/relayer" + "github.com/icon-project/relayer/v2/relayer/chains/mock" + "github.com/icon-project/relayer/v2/relayer/processor" "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/require" "go.uber.org/zap" diff --git a/relayer/chains/penumbra/codec.go b/relayer/chains/penumbra/codec.go index 5f6911696..8e2eaf180 100644 --- a/relayer/chains/penumbra/codec.go +++ b/relayer/chains/penumbra/codec.go @@ -24,10 +24,10 @@ import ( "github.com/cosmos/ibc-go/v7/modules/apps/transfer" ibc "github.com/cosmos/ibc-go/v7/modules/core" - cosmosmodule "github.com/cosmos/relayer/v2/relayer/chains/cosmos/module" - "github.com/cosmos/relayer/v2/relayer/chains/cosmos/stride" - ethermintcodecs "github.com/cosmos/relayer/v2/relayer/codecs/ethermint" - injectivecodecs "github.com/cosmos/relayer/v2/relayer/codecs/injective" + cosmosmodule "github.com/icon-project/relayer/v2/relayer/chains/cosmos/module" + "github.com/icon-project/relayer/v2/relayer/chains/cosmos/stride" + ethermintcodecs "github.com/icon-project/relayer/v2/relayer/codecs/ethermint" + injectivecodecs "github.com/icon-project/relayer/v2/relayer/codecs/injective" ) var moduleBasics = []module.AppModuleBasic{ diff --git a/relayer/chains/penumbra/core/chain/v1alpha1/chain.pb.go b/relayer/chains/penumbra/core/chain/v1alpha1/chain.pb.go index 1a6f00258..e21c3e733 100644 --- a/relayer/chains/penumbra/core/chain/v1alpha1/chain.pb.go +++ b/relayer/chains/penumbra/core/chain/v1alpha1/chain.pb.go @@ -6,9 +6,9 @@ package chainv1alpha1 import ( fmt "fmt" proto "github.com/cosmos/gogoproto/proto" - v1alpha1 "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/crypto/v1alpha1" - v1alpha11 "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/dex/v1alpha1" - v1alpha12 "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/stake/v1alpha1" + v1alpha1 "github.com/icon-project/relayer/v2/relayer/chains/penumbra/core/crypto/v1alpha1" + v1alpha11 "github.com/icon-project/relayer/v2/relayer/chains/penumbra/core/dex/v1alpha1" + v1alpha12 "github.com/icon-project/relayer/v2/relayer/chains/penumbra/core/stake/v1alpha1" io "io" math "math" math_bits "math/bits" diff --git a/relayer/chains/penumbra/core/dex/v1alpha1/dex.pb.go b/relayer/chains/penumbra/core/dex/v1alpha1/dex.pb.go index 0fa502019..826859af1 100644 --- a/relayer/chains/penumbra/core/dex/v1alpha1/dex.pb.go +++ b/relayer/chains/penumbra/core/dex/v1alpha1/dex.pb.go @@ -6,7 +6,7 @@ package dexv1alpha1 import ( fmt "fmt" proto "github.com/cosmos/gogoproto/proto" - v1alpha1 "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/crypto/v1alpha1" + v1alpha1 "github.com/icon-project/relayer/v2/relayer/chains/penumbra/core/crypto/v1alpha1" io "io" math "math" math_bits "math/bits" diff --git a/relayer/chains/penumbra/core/governance/v1alpha1/governance.pb.go b/relayer/chains/penumbra/core/governance/v1alpha1/governance.pb.go index 51a916c78..201250b4d 100644 --- a/relayer/chains/penumbra/core/governance/v1alpha1/governance.pb.go +++ b/relayer/chains/penumbra/core/governance/v1alpha1/governance.pb.go @@ -7,8 +7,8 @@ import ( fmt "fmt" types "github.com/cosmos/cosmos-sdk/codec/types" proto "github.com/cosmos/gogoproto/proto" - v1alpha11 "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/chain/v1alpha1" - v1alpha1 "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/crypto/v1alpha1" + v1alpha11 "github.com/icon-project/relayer/v2/relayer/chains/penumbra/core/chain/v1alpha1" + v1alpha1 "github.com/icon-project/relayer/v2/relayer/chains/penumbra/core/crypto/v1alpha1" io "io" math "math" math_bits "math/bits" diff --git a/relayer/chains/penumbra/core/ibc/v1alpha1/ibc.pb.go b/relayer/chains/penumbra/core/ibc/v1alpha1/ibc.pb.go index 9f95c7e73..28f31f218 100644 --- a/relayer/chains/penumbra/core/ibc/v1alpha1/ibc.pb.go +++ b/relayer/chains/penumbra/core/ibc/v1alpha1/ibc.pb.go @@ -8,7 +8,7 @@ import ( types "github.com/cosmos/cosmos-sdk/codec/types" proto "github.com/cosmos/gogoproto/proto" types1 "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - v1alpha1 "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/crypto/v1alpha1" + v1alpha1 "github.com/icon-project/relayer/v2/relayer/chains/penumbra/core/crypto/v1alpha1" io "io" math "math" math_bits "math/bits" diff --git a/relayer/chains/penumbra/core/stake/v1alpha1/stake.pb.go b/relayer/chains/penumbra/core/stake/v1alpha1/stake.pb.go index 2228a0a81..aa39999cd 100644 --- a/relayer/chains/penumbra/core/stake/v1alpha1/stake.pb.go +++ b/relayer/chains/penumbra/core/stake/v1alpha1/stake.pb.go @@ -6,7 +6,7 @@ package stakev1alpha1 import ( fmt "fmt" proto "github.com/cosmos/gogoproto/proto" - v1alpha1 "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/crypto/v1alpha1" + v1alpha1 "github.com/icon-project/relayer/v2/relayer/chains/penumbra/core/crypto/v1alpha1" io "io" math "math" math_bits "math/bits" diff --git a/relayer/chains/penumbra/core/transaction/v1alpha1/transaction.pb.go b/relayer/chains/penumbra/core/transaction/v1alpha1/transaction.pb.go index 027751ff9..76147e300 100644 --- a/relayer/chains/penumbra/core/transaction/v1alpha1/transaction.pb.go +++ b/relayer/chains/penumbra/core/transaction/v1alpha1/transaction.pb.go @@ -6,11 +6,11 @@ package transactionv1alpha1 import ( fmt "fmt" proto "github.com/cosmos/gogoproto/proto" - v1alpha1 "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/crypto/v1alpha1" - v1alpha11 "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/dex/v1alpha1" - v1alpha14 "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/governance/v1alpha1" - v1alpha13 "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/ibc/v1alpha1" - v1alpha12 "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/stake/v1alpha1" + v1alpha1 "github.com/icon-project/relayer/v2/relayer/chains/penumbra/core/crypto/v1alpha1" + v1alpha11 "github.com/icon-project/relayer/v2/relayer/chains/penumbra/core/dex/v1alpha1" + v1alpha14 "github.com/icon-project/relayer/v2/relayer/chains/penumbra/core/governance/v1alpha1" + v1alpha13 "github.com/icon-project/relayer/v2/relayer/chains/penumbra/core/ibc/v1alpha1" + v1alpha12 "github.com/icon-project/relayer/v2/relayer/chains/penumbra/core/stake/v1alpha1" io "io" math "math" math_bits "math/bits" diff --git a/relayer/chains/penumbra/core/transparent_proofs/v1alpha1/transparent_proofs.pb.go b/relayer/chains/penumbra/core/transparent_proofs/v1alpha1/transparent_proofs.pb.go index 61dc0d957..aaf7fbe49 100644 --- a/relayer/chains/penumbra/core/transparent_proofs/v1alpha1/transparent_proofs.pb.go +++ b/relayer/chains/penumbra/core/transparent_proofs/v1alpha1/transparent_proofs.pb.go @@ -6,8 +6,8 @@ package transparent_proofsv1alpha1 import ( fmt "fmt" proto "github.com/cosmos/gogoproto/proto" - v1alpha11 "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/crypto/v1alpha1" - v1alpha1 "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/dex/v1alpha1" + v1alpha11 "github.com/icon-project/relayer/v2/relayer/chains/penumbra/core/crypto/v1alpha1" + v1alpha1 "github.com/icon-project/relayer/v2/relayer/chains/penumbra/core/dex/v1alpha1" io "io" math "math" math_bits "math/bits" diff --git a/relayer/chains/penumbra/custody/v1alpha1/custody.pb.go b/relayer/chains/penumbra/custody/v1alpha1/custody.pb.go index d30aa8c26..bc3e86991 100644 --- a/relayer/chains/penumbra/custody/v1alpha1/custody.pb.go +++ b/relayer/chains/penumbra/custody/v1alpha1/custody.pb.go @@ -8,8 +8,8 @@ import ( fmt "fmt" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" - v1alpha11 "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/crypto/v1alpha1" - v1alpha1 "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/transaction/v1alpha1" + v1alpha11 "github.com/icon-project/relayer/v2/relayer/chains/penumbra/core/crypto/v1alpha1" + v1alpha1 "github.com/icon-project/relayer/v2/relayer/chains/penumbra/core/transaction/v1alpha1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/relayer/chains/penumbra/event_parser.go b/relayer/chains/penumbra/event_parser.go index 319a8157b..bf64466e9 100644 --- a/relayer/chains/penumbra/event_parser.go +++ b/relayer/chains/penumbra/event_parser.go @@ -13,8 +13,8 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/cosmos/relayer/v2/relayer/processor" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/processor" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) diff --git a/relayer/chains/penumbra/grpc_query.go b/relayer/chains/penumbra/grpc_query.go index 70c375c81..cb26fdfd8 100644 --- a/relayer/chains/penumbra/grpc_query.go +++ b/relayer/chains/penumbra/grpc_query.go @@ -10,7 +10,7 @@ import ( abci "github.com/cometbft/cometbft/abci/types" gogogrpc "github.com/cosmos/gogoproto/grpc" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/provider" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/encoding" diff --git a/relayer/chains/penumbra/keys.go b/relayer/chains/penumbra/keys.go index d08efe96d..4f3d37c4a 100644 --- a/relayer/chains/penumbra/keys.go +++ b/relayer/chains/penumbra/keys.go @@ -9,9 +9,9 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keyring" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/go-bip39" - "github.com/cosmos/relayer/v2/relayer/codecs/ethermint" - "github.com/cosmos/relayer/v2/relayer/codecs/injective" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/codecs/ethermint" + "github.com/icon-project/relayer/v2/relayer/codecs/injective" + "github.com/icon-project/relayer/v2/relayer/provider" ) const ethereumCoinType = uint32(60) @@ -172,7 +172,6 @@ func (cc *PenumbraProvider) KeyExists(name string) bool { } return k.Name == name - } // ExportPrivKeyArmor returns a private key in ASCII armored format. diff --git a/relayer/chains/penumbra/log.go b/relayer/chains/penumbra/log.go index 3c4661cc5..5ff53134e 100644 --- a/relayer/chains/penumbra/log.go +++ b/relayer/chains/penumbra/log.go @@ -8,7 +8,7 @@ import ( typestx "github.com/cosmos/cosmos-sdk/types/tx" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) diff --git a/relayer/chains/penumbra/message_handlers.go b/relayer/chains/penumbra/message_handlers.go index 69f3b3538..9b0f1c6af 100644 --- a/relayer/chains/penumbra/message_handlers.go +++ b/relayer/chains/penumbra/message_handlers.go @@ -3,8 +3,8 @@ package penumbra import ( conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/cosmos/relayer/v2/relayer/processor" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/processor" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) diff --git a/relayer/chains/penumbra/msg.go b/relayer/chains/penumbra/msg.go index 689a3267d..6762e3471 100644 --- a/relayer/chains/penumbra/msg.go +++ b/relayer/chains/penumbra/msg.go @@ -6,9 +6,9 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/cosmos/relayer/v2/relayer/chains/cosmos" - "github.com/cosmos/relayer/v2/relayer/provider" "github.com/gogo/protobuf/proto" + "github.com/icon-project/relayer/v2/relayer/chains/cosmos" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap/zapcore" ) diff --git a/relayer/chains/penumbra/penumbra_chain_processor.go b/relayer/chains/penumbra/penumbra_chain_processor.go index e348ceff3..d611eb758 100644 --- a/relayer/chains/penumbra/penumbra_chain_processor.go +++ b/relayer/chains/penumbra/penumbra_chain_processor.go @@ -12,8 +12,8 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/cosmos/relayer/v2/relayer/processor" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/processor" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" "golang.org/x/sync/errgroup" @@ -288,7 +288,6 @@ type ResultBlockResults struct { func (pcp *PenumbraChainProcessor) queryCycle(ctx context.Context, persistence *queryCyclePersistence) error { var err error persistence.latestHeight, err = pcp.latestHeightWithRetry(ctx) - // don't want to cause CosmosChainProcessor to quit here, can retry again next cycle. if err != nil { pcp.log.Error( diff --git a/relayer/chains/penumbra/provider.go b/relayer/chains/penumbra/provider.go index 0546c8473..dbeff5a95 100644 --- a/relayer/chains/penumbra/provider.go +++ b/relayer/chains/penumbra/provider.go @@ -22,8 +22,8 @@ import ( commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" - "github.com/cosmos/relayer/v2/relayer/codecs/ethermint" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/codecs/ethermint" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" "golang.org/x/mod/semver" ) diff --git a/relayer/chains/penumbra/query.go b/relayer/chains/penumbra/query.go index e20a64889..9dd38e01f 100644 --- a/relayer/chains/penumbra/query.go +++ b/relayer/chains/penumbra/query.go @@ -28,7 +28,7 @@ import ( "github.com/cosmos/ibc-go/v7/modules/core/exported" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" "golang.org/x/sync/errgroup" ) @@ -532,7 +532,6 @@ func (cc *PenumbraProvider) GenerateConnHandshakeProof(ctx context.Context, heig func (cc *PenumbraProvider) QueryChannel(ctx context.Context, height int64, channelid, portid string) (chanRes *chantypes.QueryChannelResponse, err error) { res, err := cc.queryChannelABCI(ctx, height, portid, channelid) if err != nil && strings.Contains(err.Error(), "not found") { - return &chantypes.QueryChannelResponse{ Channel: &chantypes.Channel{ State: chantypes.UNINITIALIZED, @@ -981,7 +980,7 @@ func (cc *PenumbraProvider) QueryStatus(ctx context.Context) (*coretypes.ResultS } func (cc *PenumbraProvider) QueryICQWithProof(ctx context.Context, msgType string, request []byte, height uint64) (provider.ICQProof, error) { - //TODO implement me + // TODO implement me panic("implement me") } diff --git a/relayer/chains/penumbra/relayer_packets.go b/relayer/chains/penumbra/relayer_packets.go index 7e5057037..1395a1101 100644 --- a/relayer/chains/penumbra/relayer_packets.go +++ b/relayer/chains/penumbra/relayer_packets.go @@ -6,7 +6,7 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/provider" ) var ( @@ -175,9 +175,11 @@ type relayMsgPacketAck struct { func (rp relayMsgPacketAck) Data() []byte { return rp.packetData } + func (rp relayMsgPacketAck) Seq() uint64 { return rp.seq } + func (rp relayMsgPacketAck) Timeout() clienttypes.Height { return rp.timeout } diff --git a/relayer/chains/penumbra/tx.go b/relayer/chains/penumbra/tx.go index 5f0e01f8c..8b5cb85fd 100644 --- a/relayer/chains/penumbra/tx.go +++ b/relayer/chains/penumbra/tx.go @@ -33,11 +33,11 @@ import ( ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" ics23 "github.com/cosmos/ics23/go" - "github.com/cosmos/relayer/v2/relayer/chains/cosmos" - penumbracrypto "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/crypto/v1alpha1" - penumbraibctypes "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/ibc/v1alpha1" - penumbratypes "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/transaction/v1alpha1" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/chains/cosmos" + penumbracrypto "github.com/icon-project/relayer/v2/relayer/chains/penumbra/core/crypto/v1alpha1" + penumbraibctypes "github.com/icon-project/relayer/v2/relayer/chains/penumbra/core/ibc/v1alpha1" + penumbratypes "github.com/icon-project/relayer/v2/relayer/chains/penumbra/core/transaction/v1alpha1" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" @@ -302,11 +302,9 @@ func parseEventsFromABCIResponse(resp abci.ResponseDeliverTx) []provider.Relayer }) } return events - } func (cc *PenumbraProvider) sendMessagesInner(ctx context.Context, msgs []provider.RelayerMessage, _memo string) (*coretypes.ResultBroadcastTx, error) { - // TODO: fee estimation, fee payments // NOTE: we do not actually need to sign this tx currently, since there // are no fees required on the testnet. future versions of penumbra @@ -896,9 +894,11 @@ func (cc *PenumbraProvider) MsgUpgradeClient(srcClientId string, consRes *client if acc, err = cc.Address(); err != nil { return nil, err } - return cosmos.NewCosmosMessage(&clienttypes.MsgUpgradeClient{ClientId: srcClientId, ClientState: clientRes.ClientState, + return cosmos.NewCosmosMessage(&clienttypes.MsgUpgradeClient{ + ClientId: srcClientId, ClientState: clientRes.ClientState, ConsensusState: consRes.ConsensusState, ProofUpgradeClient: consRes.GetProof(), - ProofUpgradeConsensusState: consRes.ConsensusState.Value, Signer: acc}), nil + ProofUpgradeConsensusState: consRes.ConsensusState.Value, Signer: acc, + }), nil } func (cc *PenumbraProvider) MsgSubmitMisbehaviour(clientID string, misbehaviour ibcexported.ClientMessage) (provider.RelayerMessage, error) { @@ -1701,13 +1701,17 @@ func (cc *PenumbraProvider) AcknowledgementFromSequence(ctx context.Context, dst } func rcvPacketQuery(channelID string, seq int) []string { - return []string{fmt.Sprintf("%s.packet_src_channel='%s'", spTag, channelID), - fmt.Sprintf("%s.packet_sequence='%d'", spTag, seq)} + return []string{ + fmt.Sprintf("%s.packet_src_channel='%s'", spTag, channelID), + fmt.Sprintf("%s.packet_sequence='%d'", spTag, seq), + } } func ackPacketQuery(channelID string, seq int) []string { - return []string{fmt.Sprintf("%s.packet_dst_channel='%s'", waTag, channelID), - fmt.Sprintf("%s.packet_sequence='%d'", waTag, seq)} + return []string{ + fmt.Sprintf("%s.packet_dst_channel='%s'", waTag, channelID), + fmt.Sprintf("%s.packet_sequence='%d'", waTag, seq), + } } // acknowledgementsFromResultTx looks through the events in a *ctypes.ResultTx and returns @@ -1724,7 +1728,6 @@ EventLoop: } for attributeKey, attributeValue := range event.Attributes { - switch attributeKey { case srcChanTag: if attributeValue != srcChanId { @@ -2231,7 +2234,7 @@ func (cc *PenumbraProvider) mkTxResult(resTx *coretypes.ResultTx) (*sdk.TxRespon } func (cc *PenumbraProvider) MsgSubmitQueryResponse(chainID string, queryID provider.ClientICQQueryID, proof provider.ICQProof) (provider.RelayerMessage, error) { - //TODO implement me + // TODO implement me panic("implement me") } @@ -2243,10 +2246,11 @@ func (cc *PenumbraProvider) SendMessagesToMempool(ctx context.Context, msgs []pr // MsgRegisterCounterpartyPayee creates an sdk.Msg to broadcast the counterparty address func (cc *PenumbraProvider) MsgRegisterCounterpartyPayee(portID, channelID, relayerAddr, counterpartyPayee string) (provider.RelayerMessage, error) { - //TODO implement me + // TODO implement me panic("implement me") } + func (cc *PenumbraProvider) MsgTimeoutRequest(msgTransfer provider.PacketInfo, proof provider.PacketProof) (provider.RelayerMessage, error) { - //TODO implement me + // TODO implement me panic("implement me") } diff --git a/relayer/chains/penumbra/view/v1alpha1/view.pb.go b/relayer/chains/penumbra/view/v1alpha1/view.pb.go index 217129d5f..3a3880a22 100644 --- a/relayer/chains/penumbra/view/v1alpha1/view.pb.go +++ b/relayer/chains/penumbra/view/v1alpha1/view.pb.go @@ -8,11 +8,11 @@ import ( fmt "fmt" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" - v1alpha13 "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/chain/v1alpha1" - v1alpha11 "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/crypto/v1alpha1" - v1alpha14 "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/dex/v1alpha1" - v1alpha12 "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/ibc/v1alpha1" - v1alpha1 "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/transaction/v1alpha1" + v1alpha13 "github.com/icon-project/relayer/v2/relayer/chains/penumbra/core/chain/v1alpha1" + v1alpha11 "github.com/icon-project/relayer/v2/relayer/chains/penumbra/core/crypto/v1alpha1" + v1alpha14 "github.com/icon-project/relayer/v2/relayer/chains/penumbra/core/dex/v1alpha1" + v1alpha12 "github.com/icon-project/relayer/v2/relayer/chains/penumbra/core/ibc/v1alpha1" + v1alpha1 "github.com/icon-project/relayer/v2/relayer/chains/penumbra/core/transaction/v1alpha1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/relayer/chains/wasm/codec.go b/relayer/chains/wasm/codec.go index 6f288eb4f..ae72a29f8 100644 --- a/relayer/chains/wasm/codec.go +++ b/relayer/chains/wasm/codec.go @@ -10,9 +10,9 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth" "github.com/cosmos/cosmos-sdk/x/auth/tx" ibc "github.com/cosmos/ibc-go/v7/modules/core" - icon_module "github.com/cosmos/relayer/v2/relayer/chains/icon/module" - wasm_module "github.com/cosmos/relayer/v2/relayer/chains/wasm/module" - "github.com/cosmos/relayer/v2/relayer/codecs/injective" + icon_module "github.com/icon-project/relayer/v2/relayer/chains/icon/module" + wasm_module "github.com/icon-project/relayer/v2/relayer/chains/wasm/module" + "github.com/icon-project/relayer/v2/relayer/codecs/injective" ) var ModuleBasics = []module.AppModuleBasic{ diff --git a/relayer/chains/wasm/event_parser.go b/relayer/chains/wasm/event_parser.go index bfdf3313b..d7551fa4b 100644 --- a/relayer/chains/wasm/event_parser.go +++ b/relayer/chains/wasm/event_parser.go @@ -14,8 +14,8 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/cosmos/relayer/v2/relayer/processor" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/processor" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) @@ -82,7 +82,6 @@ func ibcMessagesFromEvents( evt = parseBase64Event(log, event) } else { evt = sdk.StringifyEvent(event) - } m := parseIBCMessageFromEvent(log, evt, chainID, height, contractAddress) if m == nil || m.info == nil { @@ -101,7 +100,6 @@ func parseIBCMessageFromEvent( height uint64, contractAddress string, ) *ibcMessage { - if len(event.Attributes) == 0 { return nil } diff --git a/relayer/chains/wasm/fees.go b/relayer/chains/wasm/fees.go index a876b1b67..88c211a0f 100644 --- a/relayer/chains/wasm/fees.go +++ b/relayer/chains/wasm/fees.go @@ -3,7 +3,7 @@ package wasm import ( "encoding/json" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/provider" ) type ClaimFeesMsg struct { diff --git a/relayer/chains/wasm/grpc_query.go b/relayer/chains/wasm/grpc_query.go index b81ac2b69..72f0a8bd2 100644 --- a/relayer/chains/wasm/grpc_query.go +++ b/relayer/chains/wasm/grpc_query.go @@ -10,7 +10,7 @@ import ( abci "github.com/cometbft/cometbft/abci/types" gogogrpc "github.com/cosmos/gogoproto/grpc" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/provider" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/encoding" diff --git a/relayer/chains/wasm/helper_debug_msg.go b/relayer/chains/wasm/helper_debug_msg.go index 5ab3f0b8d..7236a0804 100644 --- a/relayer/chains/wasm/helper_debug_msg.go +++ b/relayer/chains/wasm/helper_debug_msg.go @@ -7,8 +7,8 @@ import ( "os" "path/filepath" - "github.com/cosmos/relayer/v2/relayer/chains/icon/types" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/chains/icon/types" + "github.com/icon-project/relayer/v2/relayer/provider" ) var WasmDebugMessagePath = filepath.Join(os.Getenv("HOME"), ".relayer", "debug_wasm_msg_data.json") @@ -23,16 +23,14 @@ func jsonDumpDataFile(filename string, bufs interface{}) { } // Write JSON data to file - err = ioutil.WriteFile(filename, jsonData, 0644) + err = ioutil.WriteFile(filename, jsonData, 0o644) if err != nil { fmt.Println("Error writing JSON to file:", err) os.Exit(1) } - } func readExistingData(filename string, opPointer interface{}) error { - // Check if the JSON file exists if _, err := os.Stat(filename); !os.IsNotExist(err) { // Read existing JSON data from file diff --git a/relayer/chains/wasm/keys.go b/relayer/chains/wasm/keys.go index c7b8e2991..6ee581e28 100644 --- a/relayer/chains/wasm/keys.go +++ b/relayer/chains/wasm/keys.go @@ -9,9 +9,9 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keyring" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/go-bip39" - "github.com/cosmos/relayer/v2/relayer/codecs/ethermint" - "github.com/cosmos/relayer/v2/relayer/codecs/injective" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/codecs/ethermint" + "github.com/icon-project/relayer/v2/relayer/codecs/injective" + "github.com/icon-project/relayer/v2/relayer/provider" ) const ethereumCoinType = uint32(60) diff --git a/relayer/chains/wasm/message_handler.go b/relayer/chains/wasm/message_handler.go index 64f0638aa..022f07061 100644 --- a/relayer/chains/wasm/message_handler.go +++ b/relayer/chains/wasm/message_handler.go @@ -6,8 +6,8 @@ import ( conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/cosmos/relayer/v2/relayer/processor" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/processor" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) diff --git a/relayer/chains/wasm/msg.go b/relayer/chains/wasm/msg.go index eb9ae8c5c..823c108eb 100644 --- a/relayer/chains/wasm/msg.go +++ b/relayer/chains/wasm/msg.go @@ -7,8 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/gogoproto/proto" - "github.com/cosmos/relayer/v2/relayer/chains/wasm/types" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/chains/wasm/types" + "github.com/icon-project/relayer/v2/relayer/provider" ) type WasmContractMessage struct { @@ -39,7 +39,6 @@ func (ap *WasmProvider) NewWasmContractMessage(method string, m codec.ProtoMarsh // ap.log.Debug("Wasm Constructed message ", zap.String("MethodName", method), zap.Any("Message", types.NewHexBytes(protoMsg))) msgParam, err := types.GenerateTxnParams(method, types.NewHexBytes(protoMsg)) - if err != nil { return nil, err } diff --git a/relayer/chains/wasm/provider.go b/relayer/chains/wasm/provider.go index 0fae2a4bd..c16fec414 100644 --- a/relayer/chains/wasm/provider.go +++ b/relayer/chains/wasm/provider.go @@ -28,9 +28,9 @@ import ( "github.com/cosmos/gogoproto/proto" commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" - "github.com/cosmos/relayer/v2/relayer/codecs/ethermint" - "github.com/cosmos/relayer/v2/relayer/processor" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/codecs/ethermint" + "github.com/icon-project/relayer/v2/relayer/processor" + "github.com/icon-project/relayer/v2/relayer/provider" rpcclient "github.com/cometbft/cometbft/rpc/client" rpchttp "github.com/cometbft/cometbft/rpc/client/http" @@ -371,7 +371,6 @@ func (ap *WasmProvider) Init(ctx context.Context) error { if addr != nil { clientCtx = clientCtx. WithFromAddress(addr) - } ap.QueryClient = wasmtypes.NewQueryClient(clientCtx) diff --git a/relayer/chains/wasm/provider_test.go b/relayer/chains/wasm/provider_test.go index 58bd1f74a..1e22140fa 100644 --- a/relayer/chains/wasm/provider_test.go +++ b/relayer/chains/wasm/provider_test.go @@ -18,8 +18,8 @@ import ( // tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" - "github.com/cosmos/relayer/v2/relayer/chains/icon" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/chains/icon" + "github.com/icon-project/relayer/v2/relayer/provider" "github.com/stretchr/testify/assert" "go.uber.org/zap" "go.uber.org/zap/zaptest" @@ -35,9 +35,8 @@ func (err mockAccountSequenceMismatchError) Error() string { } func GetProvider(ctx context.Context, handlerAddr string, local bool) (provider.ChainProvider, error) { - absPath, _ := filepath.Abs("../../../env/archway/keys") - var config = WasmProviderConfig{ + config := WasmProviderConfig{ KeyDirectory: absPath, Key: "testWallet", ChainName: "archway", @@ -69,7 +68,6 @@ func GetProvider(ctx context.Context, handlerAddr string, local bool) (provider. return nil, err } return p, err - } func TestGetAddress(t *testing.T) { @@ -101,6 +99,7 @@ func (hs HexBytes) Value() ([]byte, error) { } return hex.DecodeString(string(hs[2:])) } + func NewHexBytes(b []byte) HexBytes { return HexBytes(hex.EncodeToString(b)) } @@ -360,7 +359,6 @@ func (m *SendPacket) MsgBytes() ([]byte, error) { // } func TestSerializeAny(t *testing.T) { - d := clienttypes.Height{ RevisionNumber: 0, RevisionHeight: 20000, @@ -377,11 +375,9 @@ func TestSerializeAny(t *testing.T) { assert.NoError(t, err) expected, _ := hex.DecodeString("7b22636c69656e745f7374617465223a7b224074797065223a222f6962632e636f72652e636c69656e742e76312e486569676874222c227265766973696f6e5f6e756d626572223a2230222c227265766973696f6e5f686569676874223a223230303030227d2c22636f6e73656e7375735f7374617465223a7b224074797065223a222f6962632e636f72652e636c69656e742e76312e486569676874222c227265766973696f6e5f6e756d626572223a2230222c227265766973696f6e5f686569676874223a223230303030227d2c227369676e6572223a22616362646566227d") assert.Equal(t, actual, expected) - } func GetIconProvider(network_id int) *icon.IconProvider { - pcfg := icon.IconProviderConfig{ Keystore: "godWallet", KeyDirectory: "../../../env", @@ -524,7 +520,6 @@ func GetIconProvider(network_id int) *icon.IconProvider { // } func TestProtoMarshal(t *testing.T) { - codec := MakeCodec(ModuleBasics, []string{}) height := clienttypes.Height{ RevisionHeight: 32318, @@ -534,7 +529,6 @@ func TestProtoMarshal(t *testing.T) { b, err := codec.Marshaler.Marshal(&height) assert.NoError(t, err) assert.Equal(t, b, expected) - } func TestDecodeProto(t *testing.T) { @@ -545,7 +539,6 @@ func TestDecodeProto(t *testing.T) { codec := MakeCodec(ModuleBasics, []string{}) err := codec.Marshaler.Unmarshal(by, &cl) assert.NoError(t, err) - } // goloop rpc sendtx call \ @@ -787,18 +780,15 @@ func TestDecodeProto(t *testing.T) { // } func TestGenRoot(t *testing.T) { - rootB, _ := hex.DecodeString("99306EBA529FB6416B0984146B97C9C76386F226E9541A47197FA7ADA530EDA3") root := commitmenttypes.MerkleRoot{Hash: rootB} rootMarshalled, _ := proto.Marshal(&root) fmt.Printf("proto marshalled root %x \n", rootMarshalled) - } func TestStringToHex(t *testing.T) { - // type YY struct { // Req []byte // } @@ -821,7 +811,6 @@ func TestStringToHex(t *testing.T) { } fmt.Printf("%x \n", byteArray) - } func TestProtoUnmarshal(t *testing.T) { diff --git a/relayer/chains/wasm/query.go b/relayer/chains/wasm/query.go index 546ab61a6..3a9133933 100644 --- a/relayer/chains/wasm/query.go +++ b/relayer/chains/wasm/query.go @@ -32,9 +32,9 @@ import ( "github.com/cosmos/ibc-go/v7/modules/core/exported" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" - "github.com/cosmos/relayer/v2/relayer/chains/wasm/types" - "github.com/cosmos/relayer/v2/relayer/common" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/chains/wasm/types" + "github.com/icon-project/relayer/v2/relayer/common" + "github.com/icon-project/relayer/v2/relayer/provider" ) const ( @@ -62,8 +62,8 @@ func (ap *WasmProvider) QueryTx(ctx context.Context, hashHex string) (*provider. Data: string(resp.TxResult.Data), Events: events, }, nil - } + func (ap *WasmProvider) QueryTxs(ctx context.Context, page, limit int, events []string) ([]*provider.RelayerTxResponse, error) { if len(events) == 0 { return nil, errors.New("must declare at least one event to search") @@ -96,7 +96,6 @@ func (ap *WasmProvider) QueryTxs(ctx context.Context, page, limit int, events [] }) } return txResps, nil - } // parseEventsFromResponseDeliverTx parses the events from a ResponseDeliverTx and builds a slice @@ -119,7 +118,6 @@ func parseEventsFromResponseDeliverTx(resp abci.ResponseDeliverTx) []provider.Re } func (ap *WasmProvider) QueryLatestHeight(ctx context.Context) (int64, error) { - stat, err := ap.RPCClient.Status(ctx) if err != nil { return -1, err @@ -158,6 +156,7 @@ func (ap *WasmProvider) QueryLightBlock(ctx context.Context, h int64) (provider. func (ap *WasmProvider) QuerySendPacket(ctx context.Context, srcChanID, srcPortID string, sequence uint64) (provider.PacketInfo, error) { return provider.PacketInfo{}, fmt.Errorf("Not implemented for Wasm") } + func (ap *WasmProvider) QueryRecvPacket(ctx context.Context, dstChanID, dstPortID string, sequence uint64) (provider.PacketInfo, error) { return provider.PacketInfo{}, fmt.Errorf("Not implemented for Wasm") } @@ -229,7 +228,6 @@ func (ap *WasmProvider) QueryClientState(ctx context.Context, height int64, clie // TODO: Check revision number func (ap *WasmProvider) QueryClientStateResponse(ctx context.Context, height int64, srcClientId string) (*clienttypes.QueryClientStateResponse, error) { - clS, err := ap.QueryClientStateContract(ctx, srcClientId) if err != nil { return nil, err @@ -316,7 +314,6 @@ func (ap *WasmProvider) QueryChannelContractNoRetry(ctx context.Context, portId, } func (ap *WasmProvider) QueryClientConsensusState(ctx context.Context, chainHeight int64, clientid string, clientHeight ibcexported.Height) (*clienttypes.QueryConsensusStateResponse, error) { - consensusStateParam, err := types.NewConsensusStateByHeight(clientid, uint64(clientHeight.GetRevisionHeight())).Bytes() if err != nil { return nil, err @@ -394,7 +391,6 @@ func (ap *WasmProvider) QueryUpgradedConsState(ctx context.Context, height int64 } func (ap *WasmProvider) QueryConsensusState(ctx context.Context, height int64) (ibcexported.ConsensusState, int64, error) { - commit, err := ap.RPCClient.Commit(ctx, &height) if err != nil { return &tmclient.ConsensusState{}, 0, err @@ -479,7 +475,6 @@ func (ap *WasmProvider) getNextSequence(ctx context.Context, methodName string) } func (ap *WasmProvider) QueryClients(ctx context.Context) (clienttypes.IdentifiedClientStates, error) { - seq, err := ap.getNextSequence(ctx, MethodGetNextClientSequence) if err != nil { return nil, err @@ -572,11 +567,9 @@ func (ap *WasmProvider) QueryWasmProof(ctx context.Context, storageKey []byte, h } return proofBytes, nil - } func (ap *WasmProvider) QueryConnections(ctx context.Context) (conns []*conntypes.IdentifiedConnection, err error) { - seq, err := ap.getNextSequence(ctx, MethodGetNextConnectionSequence) if err != nil { return nil, err @@ -616,8 +609,8 @@ func (ap *WasmProvider) QueryConnectionsUsingClient(ctx context.Context, height func (ap *WasmProvider) GenerateConnHandshakeProof(ctx context.Context, height int64, clientId, connId string) (clientState ibcexported.ClientState, clientStateProof []byte, consensusProof []byte, connectionProof []byte, - connectionProofHeight ibcexported.Height, err error) { - + connectionProofHeight ibcexported.Height, err error, +) { clientResponse, err := ap.QueryClientStateResponse(ctx, height, clientId) if err != nil { return nil, nil, nil, nil, clienttypes.Height{}, err @@ -633,7 +626,6 @@ func (ap *WasmProvider) GenerateConnHandshakeProof(ctx context.Context, height i proofConnBytes, err := ap.QueryWasmProof(ctx, connStorageKey, height) if err != nil { return nil, nil, nil, nil, nil, err - } consStorageKey := getStorageKeyFromPath(common.GetConsensusStateCommitmentKey(clientId, big.NewInt(0), big.NewInt(height))) @@ -787,7 +779,6 @@ func (ap *WasmProvider) QueryPacketCommitment(ctx context.Context, height int64, } storageKey := getStorageKeyFromPath(common.GetPacketCommitmentKey(portid, channelid, big.NewInt(int64(seq)))) proof, err := ap.QueryWasmProof(ctx, storageKey, height) - if err != nil { return nil, err } @@ -796,7 +787,6 @@ func (ap *WasmProvider) QueryPacketCommitment(ctx context.Context, height int64, Proof: proof, ProofHeight: clienttypes.NewHeight(0, uint64(height)), }, nil - } func (ap *WasmProvider) QueryPacketAcknowledgement(ctx context.Context, height int64, channelid, portid string, seq uint64) (ackRes *chantypes.QueryPacketAcknowledgementResponse, err error) { @@ -819,7 +809,6 @@ func (ap *WasmProvider) QueryPacketAcknowledgement(ctx context.Context, height i } func (ap *WasmProvider) QueryPacketReceipt(ctx context.Context, height int64, channelid, portid string, seq uint64) (recRes *chantypes.QueryPacketReceiptResponse, err error) { - // getting proof from commitment map in contract storageKey := getStorageKeyFromPath(common.GetPacketReceiptCommitmentKey(portid, channelid, big.NewInt(int64(seq)))) proof, err := ap.QueryWasmProof(ctx, storageKey, height) @@ -845,13 +834,11 @@ func (ap *WasmProvider) QueryPacketReceipt(ctx context.Context, height int64, ch } func (ap *WasmProvider) GetCommitmentPrefixFromContract(ctx context.Context) ([]byte, error) { - pktCommitmentParams, err := types.NewCommitmentPrefix().Bytes() if err != nil { return nil, err } return ap.QueryIBCHandlerContractProcessed(ctx, pktCommitmentParams) - } // ics 20 - transfer @@ -865,6 +852,7 @@ func (ap *WasmProvider) QueryDenomTrace(ctx context.Context, denom string) (*tra } return transfers.DenomTrace, nil } + func (ap *WasmProvider) QueryDenomTraces(ctx context.Context, offset, limit uint64, height int64) ([]transfertypes.DenomTrace, error) { qc := transfertypes.NewQueryClient(ap) p := DefaultPageRequest() @@ -900,7 +888,6 @@ func (ap *WasmProvider) QueryClientPrevConsensusStateHeight(ctx context.Context, var heights []int64 err = json.Unmarshal(res.Data.Bytes(), &heights) - if err != nil { return nil, err } diff --git a/relayer/chains/wasm/tx.go b/relayer/chains/wasm/tx.go index 797f2401c..c4e4f6e06 100644 --- a/relayer/chains/wasm/tx.go +++ b/relayer/chains/wasm/tx.go @@ -35,8 +35,8 @@ import ( rpcclient "github.com/cometbft/cometbft/rpc/client" conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" - "github.com/cosmos/relayer/v2/relayer/provider" itm "github.com/icon-project/IBC-Integration/libraries/go/common/tendermint" + "github.com/icon-project/relayer/v2/relayer/provider" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/input" diff --git a/relayer/chains/wasm/utils.go b/relayer/chains/wasm/utils.go index d842b7a64..d0066255e 100644 --- a/relayer/chains/wasm/utils.go +++ b/relayer/chains/wasm/utils.go @@ -8,7 +8,7 @@ import ( "strconv" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - "github.com/cosmos/relayer/v2/relayer/common" + "github.com/icon-project/relayer/v2/relayer/common" ) func getKey(data string) string { @@ -26,7 +26,6 @@ func getKeyLength(data string) string { func byteToInt(b []byte) (int, error) { return strconv.Atoi(string(b)) - } func ProcessContractResponse(p *wasmtypes.QuerySmartContractStateResponse) ([]byte, error) { diff --git a/relayer/chains/wasm/wasm_chain_processor.go b/relayer/chains/wasm/wasm_chain_processor.go index 0eb2712d9..2d5e348ee 100644 --- a/relayer/chains/wasm/wasm_chain_processor.go +++ b/relayer/chains/wasm/wasm_chain_processor.go @@ -13,9 +13,9 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/cosmos/relayer/v2/relayer/common" - "github.com/cosmos/relayer/v2/relayer/processor" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/common" + "github.com/icon-project/relayer/v2/relayer/processor" + "github.com/icon-project/relayer/v2/relayer/provider" ctypes "github.com/cometbft/cometbft/rpc/core/types" "github.com/cometbft/cometbft/types" @@ -123,7 +123,6 @@ func (l latestClientState) update(ctx context.Context, clientInfo clientInfo, cc // update latest if no existing state or provided consensus height is newer l[clientInfo.clientID] = clientState - } // Provider returns the ChainProvider, which provides the methods for querying, assembling IBC messages, and sending transactions. @@ -551,7 +550,6 @@ func (ccp *WasmChainProcessor) CurrentBlockHeight(ctx context.Context, persisten } func (ccp *WasmChainProcessor) Verify(ctx context.Context, untrusted *types.LightBlock) error { - if untrusted.Height != ccp.verifier.Header.Height+1 { return errors.New("headers must be adjacent in height") } @@ -587,7 +585,6 @@ func (ccp *WasmChainProcessor) Verify(ctx context.Context, untrusted *types.Ligh ccp.verifier.Header = untrusted return nil - } func verifyNewHeaderAndVals( @@ -595,8 +592,8 @@ func verifyNewHeaderAndVals( untrustedVals *types.ValidatorSet, trustedHeader *types.SignedHeader, now time.Time, - maxClockDrift time.Duration) error { - + maxClockDrift time.Duration, +) error { if err := untrustedHeader.ValidateBasic(trustedHeader.ChainID); err != nil { return fmt.Errorf("untrustedHeader.ValidateBasic failed: %w", err) } diff --git a/relayer/channel.go b/relayer/channel.go index 184ed599c..39eb785be 100644 --- a/relayer/channel.go +++ b/relayer/channel.go @@ -7,8 +7,8 @@ import ( chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" host "github.com/cosmos/ibc-go/v7/modules/core/24-host" - "github.com/cosmos/relayer/v2/relayer/processor" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/processor" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" ) diff --git a/relayer/client.go b/relayer/client.go index dcd85079f..6f40cd939 100644 --- a/relayer/client.go +++ b/relayer/client.go @@ -10,9 +10,9 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" - "github.com/cosmos/relayer/v2/relayer/chains/icon" - "github.com/cosmos/relayer/v2/relayer/common" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/chains/icon" + "github.com/icon-project/relayer/v2/relayer/common" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" "golang.org/x/sync/errgroup" ) @@ -358,7 +358,6 @@ func MsgUpdateClient( } func msgUpdateClientOneWay(ctx context.Context, src, dst *Chain, height int64) (provider.RelayerMessage, error) { - var updateHeader ibcexported.ClientMessage if err := retry.Do(func() error { var err error @@ -616,7 +615,6 @@ func findMatchingClient(ctx context.Context, src, dst *Chain, newClientState ibc for _, existingClientState := range clientsResp { clientID, err := provider.ClientsMatch(ctx, src.ChainProvider, dst.ChainProvider, existingClientState, newClientState) - // If there is an error parsing/type asserting the client state in ClientsMatch this is going // to make the entire find matching client logic fail. // We should really never be encountering an error here and if we do it is probably a sign of a diff --git a/relayer/connection.go b/relayer/connection.go index 9c64619cc..d98acfb40 100644 --- a/relayer/connection.go +++ b/relayer/connection.go @@ -5,8 +5,8 @@ import ( "time" conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" - "github.com/cosmos/relayer/v2/relayer/processor" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/processor" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" ) diff --git a/relayer/events.go b/relayer/events.go index 799844e89..586403f3a 100644 --- a/relayer/events.go +++ b/relayer/events.go @@ -6,7 +6,7 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" connectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/provider" ) // ParseClientIDFromEvents parses events emitted from a MsgCreateClient and returns the diff --git a/relayer/log-chain.go b/relayer/log-chain.go index 752d945b4..8dbe7faff 100644 --- a/relayer/log-chain.go +++ b/relayer/log-chain.go @@ -3,8 +3,8 @@ package relayer import ( "fmt" - "github.com/cosmos/relayer/v2/relayer/chains/cosmos" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/chains/cosmos" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" diff --git a/relayer/naive-strategy.go b/relayer/naive-strategy.go index c23415df8..e583371ff 100644 --- a/relayer/naive-strategy.go +++ b/relayer/naive-strategy.go @@ -7,7 +7,7 @@ import ( "github.com/avast/retry-go/v4" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" "golang.org/x/sync/errgroup" ) @@ -113,9 +113,7 @@ func UnrelayedSequences(ctx context.Context, src, dst *Chain, srcChannel *chanty wg.Wait() - var ( - srcUnreceivedPackets, dstUnreceivedPackets []uint64 - ) + var srcUnreceivedPackets, dstUnreceivedPackets []uint64 if len(srcPacketSeq) > 0 { wg.Add(1) @@ -542,7 +540,6 @@ func RelayPackets(ctx context.Context, log *zap.Logger, src, dst *Chain, sp Rela } return nil - } // AddMessagesForSequences constructs RecvMsgs and TimeoutMsgs from sequence numbers on a src chain diff --git a/relayer/packet-tx.go b/relayer/packet-tx.go index 1cb38c7b3..6236d1148 100644 --- a/relayer/packet-tx.go +++ b/relayer/packet-tx.go @@ -9,7 +9,7 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" ) diff --git a/relayer/path.go b/relayer/path.go index 228544c4b..9414a4d2c 100644 --- a/relayer/path.go +++ b/relayer/path.go @@ -6,7 +6,7 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" - "github.com/cosmos/relayer/v2/relayer/processor" + "github.com/icon-project/relayer/v2/relayer/processor" "golang.org/x/sync/errgroup" "gopkg.in/yaml.v3" ) diff --git a/relayer/processor/chain_processor.go b/relayer/processor/chain_processor.go index 5637a47ce..1b96ddf5e 100644 --- a/relayer/processor/chain_processor.go +++ b/relayer/processor/chain_processor.go @@ -3,7 +3,7 @@ package processor import ( "context" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/provider" ) // The ChainProcessor interface is reponsible for polling blocks and emitting IBC message events to the PathProcessors. diff --git a/relayer/processor/message_processor.go b/relayer/processor/message_processor.go index 2360ea3bf..58ec502ae 100644 --- a/relayer/processor/message_processor.go +++ b/relayer/processor/message_processor.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) @@ -83,7 +83,6 @@ func (mp *messageProcessor) processMessages( messages pathEndMessages, src, dst *pathEndRuntime, ) error { - // 2/3 rule enough_time_pass && Valid BTP Block needsClientUpdate, err := mp.shouldUpdateClientNow(ctx, src, dst) if err != nil { @@ -237,7 +236,6 @@ func (mp *messageProcessor) assembleMessage( // assembleMsgUpdateClient uses the ChainProvider from both pathEnds to assemble the client update header // from the source and then assemble the update client message in the correct format for the destination. func (mp *messageProcessor) assembleMsgUpdateClient(ctx context.Context, src, dst *pathEndRuntime, shouldUpdate bool) error { - if IsBTPLightClient(dst.clientState) { err := mp.handleMsgUpdateClientForBTPClient(ctx, src, dst, shouldUpdate) return err @@ -260,7 +258,6 @@ func (mp *messageProcessor) assembleMsgUpdateClient(ctx context.Context, src, ds deltaConsensusHeight := int64(clientConsensusHeight.RevisionHeight) - int64(trustedConsensusHeight.RevisionHeight) if trustedConsensusHeight.RevisionHeight != 0 && deltaConsensusHeight <= clientConsensusHeightUpdateThresholdBlocks { - return fmt.Errorf("observed client trusted height: %d does not equal latest client state height: %d", trustedConsensusHeight.RevisionHeight, clientConsensusHeight.RevisionHeight) } @@ -313,7 +310,6 @@ func (mp *messageProcessor) assembleMsgUpdateClient(ctx context.Context, src, ds } func (mp *messageProcessor) handleMsgUpdateClientForBTPClient(ctx context.Context, src, dst *pathEndRuntime, shouldUpdate bool) error { - clientID := dst.info.ClientID latestConsensusHeight := dst.clientState.ConsensusHeight @@ -575,7 +571,6 @@ func (mp *messageProcessor) sendSingleMessage( src, dst *pathEndRuntime, tracker messageToTrack, ) { - msgs := make([]provider.RelayerMessage, 0, 2) if !IsBTPLightClient(dst.clientState) { msgs = append(msgs, mp.msgUpdateClient) diff --git a/relayer/processor/path_end_runtime.go b/relayer/processor/path_end_runtime.go index aa48f414e..aa632c0b6 100644 --- a/relayer/processor/path_end_runtime.go +++ b/relayer/processor/path_end_runtime.go @@ -7,8 +7,8 @@ import ( conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/cosmos/relayer/v2/relayer/common" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/common" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" ) @@ -326,15 +326,12 @@ func (pathEnd *pathEndRuntime) shouldTerminate(ibcMessagesCache IBCMessagesCache zap.String("observed_counterparty_client_id", ci.CounterpartyClientID), ) if ci.ClientID == m.Termination.Info.ClientID { - foundClientID = true } if ci.ConnID == m.Termination.Info.ConnID { - foundConnectionID = true } if ci.CounterpartyClientID == m.Termination.Info.CounterpartyClientID { - foundCounterpartyClientID = true } if ci.CounterpartyConnID == m.Termination.Info.CounterpartyConnID { @@ -500,7 +497,6 @@ func (pathEnd *pathEndRuntime) shouldSendPacketMessage(message packetIBCMessage, eventType := message.eventType sequence := message.info.Sequence k, err := message.channelKey() - if err != nil { pathEnd.log.Error("Unexpected error checking if should send packet message", zap.String("event_type", eventType), @@ -743,7 +739,6 @@ func (pathEnd *pathEndRuntime) shouldSendConnectionMessage(message connectionIBC // shouldSendChannelMessage determines if the channel handshake message should be sent now. // It will also determine if the message needs to be given up on entirely and remove retention if so. func (pathEnd *pathEndRuntime) shouldSendChannelMessage(message channelIBCMessage, counterparty *pathEndRuntime) bool { - eventType := message.eventType channelKey := ChannelInfoChannelKey(message.info) if eventType != chantypes.EventTypeChannelOpenInit { diff --git a/relayer/processor/path_end_test.go b/relayer/processor/path_end_test.go index 1833640f8..9cbdc7b6b 100644 --- a/relayer/processor/path_end_test.go +++ b/relayer/processor/path_end_test.go @@ -3,7 +3,7 @@ package processor_test import ( "testing" - "github.com/cosmos/relayer/v2/relayer/processor" + "github.com/icon-project/relayer/v2/relayer/processor" "github.com/stretchr/testify/require" ) diff --git a/relayer/processor/path_processor.go b/relayer/processor/path_processor.go index b14fbc1a0..7e701fb92 100644 --- a/relayer/processor/path_processor.go +++ b/relayer/processor/path_processor.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" ) @@ -226,7 +226,6 @@ func (pp *PathProcessor) IsRelevantClient(chainID string, clientID string) bool if pp.pathEnd1.info.ChainID == chainID { return pp.pathEnd1.info.ClientID == clientID } else if pp.pathEnd2.info.ChainID == chainID { - return pp.pathEnd2.info.ClientID == clientID } @@ -234,7 +233,6 @@ func (pp *PathProcessor) IsRelevantClient(chainID string, clientID string) bool } func (pp *PathProcessor) IsRelevantConnection(chainID string, connectionID string) bool { - if pp.pathEnd1.info.ChainID == chainID { return pp.pathEnd1.isRelevantConnection(connectionID) } else if pp.pathEnd2.info.ChainID == chainID { diff --git a/relayer/processor/path_processor_internal.go b/relayer/processor/path_processor_internal.go index 8dd0c7f2f..5a751b720 100644 --- a/relayer/processor/path_processor_internal.go +++ b/relayer/processor/path_processor_internal.go @@ -12,8 +12,8 @@ import ( conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/cosmos/relayer/v2/relayer/common" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/common" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" "golang.org/x/sync/errgroup" ) @@ -939,7 +939,7 @@ func (pp *PathProcessor) processLatestMessages(ctx context.Context, cancel func( pp.updateClientTrustedState(pp.pathEnd1, pp.pathEnd2) pp.updateClientTrustedState(pp.pathEnd2, pp.pathEnd1) - //for btp updateClient steps + // for btp updateClient steps pp.UpdateBTPHeight(ctx, pp.pathEnd1, pp.pathEnd2) pp.UpdateBTPHeight(ctx, pp.pathEnd2, pp.pathEnd1) @@ -1218,7 +1218,6 @@ func (pp *PathProcessor) queuePendingRecvAndAcks( srcMu sync.Locker, dstMu sync.Locker, ) (bool, error) { - if len(seqs) == 0 { src.log.Debug("Nothing to flush", zap.String("channel", k.ChannelID), zap.String("port", k.PortID)) return true, nil diff --git a/relayer/processor/types.go b/relayer/processor/types.go index f32a636d3..f923a6d3f 100644 --- a/relayer/processor/types.go +++ b/relayer/processor/types.go @@ -6,14 +6,12 @@ import ( "sync" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/cosmos/relayer/v2/relayer/common" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/common" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap/zapcore" ) -var ( - zeroIndex = 0 -) +var zeroIndex = 0 // MessageLifecycle is used to send an initial IBC message to a chain // once the chains are in sync for the PathProcessor. @@ -21,7 +19,7 @@ var ( // PathProcessor will stop if it observes a message that matches // the MessageLifecycle's Termination message. type MessageLifecycle interface { - messageLifecycler() //noop + messageLifecycler() // noop } // Flush lifecycle informs the PathProcessor to terminate once @@ -667,7 +665,6 @@ func (q *ArrayQueue[T]) GetQueue() (T, error) { } item := q.items[0] return item, nil - } func (q *ArrayQueue[T]) ReplaceQueue(index int, element T) { diff --git a/relayer/processor/types_internal.go b/relayer/processor/types_internal.go index 54ab3ada8..1559f6a65 100644 --- a/relayer/processor/types_internal.go +++ b/relayer/processor/types_internal.go @@ -8,15 +8,17 @@ import ( conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/cosmos/relayer/v2/relayer/common" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/common" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap/zapcore" ) -var _ zapcore.ObjectMarshaler = packetIBCMessage{} -var _ zapcore.ObjectMarshaler = channelIBCMessage{} -var _ zapcore.ObjectMarshaler = connectionIBCMessage{} -var _ zapcore.ObjectMarshaler = clientICQMessage{} +var ( + _ zapcore.ObjectMarshaler = packetIBCMessage{} + _ zapcore.ObjectMarshaler = channelIBCMessage{} + _ zapcore.ObjectMarshaler = connectionIBCMessage{} + _ zapcore.ObjectMarshaler = clientICQMessage{} +) // pathEndMessages holds the different IBC messages that // will attempt to be sent to the pathEnd. @@ -348,9 +350,11 @@ type processingMessage struct { retryCount uint64 } -type packetProcessingCache map[ChannelKey]packetChannelMessageCache -type packetChannelMessageCache map[string]packetMessageSendCache -type packetMessageSendCache map[uint64]processingMessage +type ( + packetProcessingCache map[ChannelKey]packetChannelMessageCache + packetChannelMessageCache map[string]packetMessageSendCache + packetMessageSendCache map[uint64]processingMessage +) func (c packetChannelMessageCache) deleteMessages(toDelete ...map[string][]uint64) { for _, toDeleteMap := range toDelete { @@ -362,8 +366,10 @@ func (c packetChannelMessageCache) deleteMessages(toDelete ...map[string][]uint6 } } -type channelProcessingCache map[string]channelKeySendCache -type channelKeySendCache map[ChannelKey]processingMessage +type ( + channelProcessingCache map[string]channelKeySendCache + channelKeySendCache map[ChannelKey]processingMessage +) func (c channelProcessingCache) deleteMessages(toDelete ...map[string][]ChannelKey) { for _, toDeleteMap := range toDelete { @@ -375,8 +381,10 @@ func (c channelProcessingCache) deleteMessages(toDelete ...map[string][]ChannelK } } -type connectionProcessingCache map[string]connectionKeySendCache -type connectionKeySendCache map[ConnectionKey]processingMessage +type ( + connectionProcessingCache map[string]connectionKeySendCache + connectionKeySendCache map[ConnectionKey]processingMessage +) func (c connectionProcessingCache) deleteMessages(toDelete ...map[string][]ConnectionKey) { for _, toDeleteMap := range toDelete { diff --git a/relayer/processor/types_test.go b/relayer/processor/types_test.go index e6ea4a4ee..4d6a9e8b9 100644 --- a/relayer/processor/types_test.go +++ b/relayer/processor/types_test.go @@ -4,7 +4,7 @@ import ( "testing" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" - "github.com/cosmos/relayer/v2/relayer/processor" + "github.com/icon-project/relayer/v2/relayer/processor" "github.com/stretchr/testify/require" ) diff --git a/relayer/processor/utils.go b/relayer/processor/utils.go index 1837546f9..f79714b61 100644 --- a/relayer/processor/utils.go +++ b/relayer/processor/utils.go @@ -4,8 +4,8 @@ import ( "math" "strings" - "github.com/cosmos/relayer/v2/relayer/common" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/common" + "github.com/icon-project/relayer/v2/relayer/provider" ) func IsBTPLightClient(cs provider.ClientState) bool { diff --git a/relayer/query.go b/relayer/query.go index b9601cc51..c8f49893a 100644 --- a/relayer/query.go +++ b/relayer/query.go @@ -10,8 +10,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" - "github.com/cosmos/relayer/v2/relayer/common" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/common" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/zap" "golang.org/x/sync/errgroup" ) diff --git a/relayer/query_test.go b/relayer/query_test.go index fb67c60d1..fceae2324 100644 --- a/relayer/query_test.go +++ b/relayer/query_test.go @@ -1,10 +1,11 @@ package relayer import ( - "github.com/cosmos/relayer/v2/relayer/chains/cosmos" "testing" "time" + "github.com/icon-project/relayer/v2/relayer/chains/cosmos" + "github.com/stretchr/testify/require" ) diff --git a/relayer/relayMsgs.go b/relayer/relayMsgs.go index 698e8b28a..58a8423fe 100644 --- a/relayer/relayMsgs.go +++ b/relayer/relayMsgs.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer/provider" "go.uber.org/multierr" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/relayer/relaymsgs_test.go b/relayer/relaymsgs_test.go index dab099072..7671835a7 100644 --- a/relayer/relaymsgs_test.go +++ b/relayer/relaymsgs_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/cosmos/relayer/v2/relayer" - "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/relayer/v2/relayer" + "github.com/icon-project/relayer/v2/relayer/provider" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" ) diff --git a/relayer/strategies.go b/relayer/strategies.go index 5128af168..f080e92ed 100644 --- a/relayer/strategies.go +++ b/relayer/strategies.go @@ -10,11 +10,11 @@ import ( "github.com/avast/retry-go/v4" "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/cosmos/relayer/v2/relayer/chains/cosmos" - "github.com/cosmos/relayer/v2/relayer/chains/icon" - penumbraprocessor "github.com/cosmos/relayer/v2/relayer/chains/penumbra" - "github.com/cosmos/relayer/v2/relayer/chains/wasm" - "github.com/cosmos/relayer/v2/relayer/processor" + "github.com/icon-project/relayer/v2/relayer/chains/cosmos" + "github.com/icon-project/relayer/v2/relayer/chains/icon" + penumbraprocessor "github.com/icon-project/relayer/v2/relayer/chains/penumbra" + "github.com/icon-project/relayer/v2/relayer/chains/wasm" + "github.com/icon-project/relayer/v2/relayer/processor" "go.uber.org/zap" ) @@ -27,7 +27,7 @@ type ActiveChannel struct { const ( ProcessorEvents string = "events" ProcessorLegacy = "legacy" - DefaultClientUpdateThreshold = 86400000 * time.Millisecond //1 day + DefaultClientUpdateThreshold = 86400000 * time.Millisecond // 1 day DefaultFlushInterval = 5 * time.Minute DefaultMaxMsgLength = 5 TwoMB = 2 * 1024 * 1024 diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh index 725d881a7..2edf0572e 100755 --- a/scripts/protocgen.sh +++ b/scripts/protocgen.sh @@ -21,7 +21,7 @@ buf generate --template proto/buf.gen.penumbra.yaml buf.build/penumbra-zone/penu # # Note: Proto files are suffixed with the current binary version. -rm -r github.com/cosmos/relayer/v2/relayer/chains/penumbra/client -rm -r github.com/cosmos/relayer/v2/relayer/chains/penumbra/narsil -cp -r github.com/cosmos/relayer/v2/* ./ +rm -r github.com/icon-project/relayer/v2/relayer/chains/penumbra/client +rm -r github.com/icon-project/relayer/v2/relayer/chains/penumbra/narsil +cp -r github.com/icon-project/relayer/v2/* ./ rm -rf github.com