Migrate to Gaia v3.0

AUTHORS.md

@@ -8,4 +8,4 @@ contributions under the terms of the [Apache License, Version 2.0]
 * Jack Zampolin (@jackzampolin)
 
 [Apache License, Version 2.0]: https://www.apache.org/licenses/LICENSE-2.0
-[LICENSE]: https://github.com/iqlusioninc/relayer/blob/master/LICENSE
+[LICENSE]: https://github.com/ovrclk/relayer/blob/master/LICENSE

Makefile

@@ -1,17 +1,17 @@
 VERSION := $(shell echo $(shell git describe --tags) | sed 's/^v//')
 COMMIT  := $(shell git log -1 --format='%H')
 SDKCOMMIT := $(shell go list -m -u -f '{{.Version}}' github.com/cosmos/cosmos-sdk)
-GAIACOMMIT := $(shell go list -m -u -f '{{.Version}}' github.com/cosmos/gaia)
+# GAIACOMMIT := $(shell go list -m -u -f '{{.Version}}' github.com/cosmos/gaia)
 all: ci-lint install
 
 ###############################################################################
 # Build / Install
 ###############################################################################
 
-LD_FLAGS = -X github.com/iqlusioninc/relayer/cmd.Version=$(VERSION) \
-	-X github.com/iqlusioninc/relayer/cmd.Commit=$(COMMIT) \
-	-X github.com/iqlusioninc/relayer/cmd.SDKCommit=$(SDKCOMMIT) \
-	-X github.com/iqlusioninc/relayer/cmd.GaiaCommit=$(GAIACOMMIT)
+LD_FLAGS = -X github.com/ovrclk/relayer/cmd.Version=$(VERSION) \
+	-X github.com/ovrclk/relayer/cmd.Commit=$(COMMIT) \
+	-X github.com/ovrclk/relayer/cmd.SDKCommit=$(SDKCOMMIT) \
+	-X github.com/ovrclk/relayer/cmd.GaiaCommit=$(GAIACOMMIT)
 
 BUILD_FLAGS := -ldflags '$(LD_FLAGS)'
 

README.md

@@ -2,7 +2,7 @@
 
 ![GOZ](./docs/images/github-repo-banner.png)
 
-![Relayer Build](https://github.com/iqlusioninc/relayer/workflows/Build%20then%20run%20CI%20Chains/badge.svg)
+![Relayer Build](https://github.com/ovrclk/relayer/workflows/Build%20then%20run%20CI%20Chains/badge.svg)
 
 The Cosmos IBC `relayer` package contains a basic relayer implementation that is
 meant for users wishing to relay packets/data between sets of IBC enabled chains.
@@ -29,9 +29,9 @@ If you would like to join the relayer testnet, please [check out the instruction
 
 | chain | tests | supported ports |
 |-------|--------|----------------|
-| [`gaia`](https://github.com/cosmos/gaia) | ![gaia](https://github.com/iqlusioninc/relayer/workflows/TESTING%20-%20gaia%20to%20gaia%20integration/badge.svg) | `transfer` |
-| `microtick` | ![microtick](https://github.com/iqlusioninc/relayer/workflows/TESTING%20-%20mtd%20to%20ibc%20integration/badge.svg) | `transfer` |
-| [`rocketzone`](https://github.com/rocket-protocol/rocketzone) | ![rocketzone](https://github.com/iqlusioninc/relayer/workflows/TESTING%20-%20rocketzone%20to%20ibc%20integration/badge.svg) | `transfer` |
+| [`gaia`](https://github.com/cosmos/gaia) | ![gaia](https://github.com/ovrclk/relayer/workflows/TESTING%20-%20gaia%20to%20gaia%20integration/badge.svg) | `transfer` |
+| `microtick` | ![microtick](https://github.com/ovrclk/relayer/workflows/TESTING%20-%20mtd%20to%20ibc%20integration/badge.svg) | `transfer` |
+| [`rocketzone`](https://github.com/rocket-protocol/rocketzone) | ![rocketzone](https://github.com/ovrclk/relayer/workflows/TESTING%20-%20rocketzone%20to%20ibc%20integration/badge.svg) | `transfer` |
 | [`coco`](https://github.com/CosmicCompass/post-chain) | ![coco](https://github.com/CosmicCompass/relayer/workflows/TESTING%20-%20coco%20to%20ibc%20integration/badge.svg) | `transfer` |
 
 ## Demoing the Relayer

cmd/chains.go

@@ -12,7 +12,7 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	"github.com/iqlusioninc/relayer/relayer"
+	"github.com/ovrclk/relayer/relayer"
 )
 
 const (
@@ -52,8 +52,7 @@ func chainsAddrCmd() *cobra.Command {
 				return err
 			}
 
-			done := chain.UseSDKContext()
-			defer done()
+			chain.UseSDKContext()
 
 			addr, err := chain.GetAddress()
 			if err != nil {

cmd/config.go

@@ -25,7 +25,7 @@ import (
 	"time"
 
 	"github.com/cosmos/cosmos-sdk/client/flags"
-	"github.com/iqlusioninc/relayer/relayer"
+	"github.com/ovrclk/relayer/relayer"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"gopkg.in/yaml.v2"
@@ -325,7 +325,7 @@ func validateConfig(c *Config) error {
 	}
 
 	for _, i := range c.Chains {
-		if err := i.Init(homePath, appCodec, cdc, to, debug); err != nil {
+		if err := i.Init(homePath, to, debug); err != nil {
 			return fmt.Errorf("did you remember to run 'rly config init' error:%w", err)
 		}
 	}

cmd/dev.go

@@ -1,14 +1,10 @@
 package cmd
 
 import (
-	"encoding/csv"
-	"encoding/json"
 	"fmt"
 	"os"
-	"time"
 
-	"github.com/DataDog/datadog-go/statsd"
-	tmclient "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
+	// tmclient "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/spf13/cobra"
@@ -26,99 +22,10 @@ func devCommand() *cobra.Command {
 		rlyService(),
 		listenCmd(),
 		genesisCmd(),
-		gozDataCmd(),
-		gozCSVCmd(),
-		gozStatsDCmd(),
 	)
 	return cmd
 }
 
-func gozCSVCmd() *cobra.Command {
-	cmd := &cobra.Command{
-		Use:     "goz-csv [chain-id] [file]",
-		Aliases: []string{"csv"},
-		Short:   "read in source of truth csv, and enrich on chain w/ team data",
-		Args:    cobra.ExactArgs(2),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			to, err := readGoZCsv(args[1])
-			if err != nil {
-				return err
-			}
-
-			cd, err := fetchClientData(args[0])
-			if err != nil {
-				return err
-			}
-			w := csv.NewWriter(os.Stdout)
-
-			for _, c := range cd {
-				info := to[c.ChainID]
-				if info != nil {
-					c.TeamInfo = info
-					if err := w.Write([]string{c.TeamInfo.Name, c.TeamInfo.Address, c.TeamInfo.RPCAddr, c.ClientID}); err != nil {
-						return err
-					}
-				}
-			}
-			w.Flush()
-
-			return nil
-		},
-	}
-	return cmd
-}
-
-func gozStatsDCmd() *cobra.Command {
-	cmd := &cobra.Command{
-		Use:     "goz-statsd [chain-id] [file] [statsd-host] [statd-port]",
-		Aliases: []string{"statsd"},
-		Short:   "read in source of truth csv",
-		Args:    cobra.ExactArgs(4),
-		RunE: func(cmd *cobra.Command, args []string) error {
-
-			to, err := readGoZCsv(args[1])
-			if err != nil {
-				return err
-			}
-			client, err := statsd.New(args[2])
-			if err != nil {
-				return err
-			}
-
-			cd, err := fetchClientData(args[0])
-			if err != nil {
-				return err
-			}
-			for _, c := range cd {
-				info := to[c.ChainID]
-				c.TeamInfo = info
-				c.StatsD(client, args[3])
-			}
-			return nil
-		},
-	}
-	return cmd
-}
-
-func gozDataCmd() *cobra.Command {
-	cmd := &cobra.Command{
-		Use:     "goz-dump [chain-id]",
-		Aliases: []string{"dump", "goz"},
-		Short:   "fetch the list of chains connected as a CSV dump",
-		Args:    cobra.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			cd, err := fetchClientData(args[0])
-			if err != nil {
-				return err
-			}
-			out, _ := json.Marshal(cd)
-			fmt.Println(string(out))
-			return nil
-		},
-	}
-	return cmd
-}
-
 func genesisCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "genesis [chain-id]",
@@ -328,126 +235,3 @@ WantedBy=multi-user.target
 	}
 	return cmd
 }
-
-func readGoZCsv(path string) (map[string]*teamInfo, error) {
-	// open the CSV file
-	f, err := os.Open(path)
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-
-	// create the csv reader
-	cs := csv.NewReader(f)
-
-	// ignore the header line
-	if _, err := cs.Read(); err != nil {
-		return nil, err
-	}
-
-	// read all the records into memory
-	records, err := cs.ReadAll()
-	if err != nil {
-		return nil, err
-	}
-
-	// format the map[chain-id]Info
-	var out = map[string]*teamInfo{}
-	for _, r := range records {
-		out[r[2]] = &teamInfo{r[0], r[1], r[3]}
-	}
-
-	return out, nil
-}
-
-type teamInfo struct {
-	Name    string `json:"name"`
-	Address string `json:"address"`
-	RPCAddr string `json:"rpc-addr"`
-}
-
-func fetchClientData(chainID string) ([]*clientData, error) {
-	c, err := config.Chains.Get(chainID)
-	if err != nil {
-		return nil, err
-	}
-
-	clients, err := c.QueryClients(1, 1000)
-	if err != nil {
-		return nil, err
-	}
-
-	header, err := c.UpdateLiteWithHeader()
-	if err != nil {
-		return nil, err
-	}
-
-	chans, err := c.QueryChannels(1, 10000)
-	if err != nil {
-		return nil, err
-	}
-
-	var clientDatas = []*clientData{}
-	for _, cl := range clients {
-		tmdata, ok := cl.(tmclient.ClientState)
-		if !ok {
-			continue
-		}
-		cd := &clientData{
-			ClientID:         cl.GetID(),
-			ChainID:          cl.GetChainID(),
-			TimeOfLastUpdate: tmdata.LastHeader.Time,
-			ChannelIDs:       []string{},
-		}
-
-		if err := c.AddPath(cd.ClientID, dcon, dcha, dpor, dord); err != nil {
-			return nil, err
-		}
-
-		conns, err := c.QueryConnectionsUsingClient(header.Height)
-		if err != nil {
-			return nil, err
-		}
-
-		cd.ConnectionIDs = conns.ConnectionPaths
-		for _, conn := range cd.ConnectionIDs {
-			for _, ch := range chans {
-				for _, co := range ch.ConnectionHops {
-					if co == conn {
-						cd.ChannelIDs = append(cd.ChannelIDs, ch.ID)
-					}
-				}
-			}
-		}
-
-		// todo deal with channels
-		clientDatas = append(clientDatas, cd)
-
-	}
-	return clientDatas, nil
-}
-
-type clientData struct {
-	ClientID         string    `json:"client-id"`
-	ConnectionIDs    []string  `json:"connection-ids"`
-	ChannelIDs       []string  `json:"channel-ids"`
-	ChainID          string    `json:"chain-id"`
-	TimeOfLastUpdate time.Time `json:"time-last-update"`
-	TeamInfo         *teamInfo `json:"team-info"`
-}
-
-func (cd *clientData) StatsD(cl *statsd.Client, prefix string) {
-	switch {
-	case len(cd.ConnectionIDs) != 1:
-		byt, _ := json.Marshal(cd)
-		fmt.Fprintf(os.Stderr, "%s", string(byt))
-	case len(cd.ChannelIDs) != 1:
-		byt, _ := json.Marshal(cd)
-		fmt.Fprintf(os.Stderr, "%s", string(byt))
-		// TODO: add more cases here
-	}
-	cl.TimeInMilliseconds(fmt.Sprintf("relayer.%s.client", prefix), //nolint:errcheck // ignore error
-		float64(time.Since(cd.TimeOfLastUpdate).Milliseconds()),
-		[]string{"teamname", cd.TeamInfo.Name, "chain-id", cd.ChainID,
-			"client-id", cd.ClientID, "connection-id", cd.ConnectionIDs[0], "channelid", cd.ChannelIDs[0]}, 1)
-}

cmd/flags.go

@@ -31,16 +31,12 @@ var (
 func liteFlags(cmd *cobra.Command) *cobra.Command {
 	cmd.Flags().Int64(flags.FlagHeight, -1, "Trusted header's height")
 	cmd.Flags().BytesHexP(flagHash, "x", []byte{}, "Trusted header's hash")
-	cmd.Flags().StringP(flagURL, "u", "", "Optional URL to fetch trusted-hash and trusted-height")
 	if err := viper.BindPFlag(flags.FlagHeight, cmd.Flags().Lookup(flags.FlagHeight)); err != nil {
 		panic(err)
 	}
 	if err := viper.BindPFlag(flagHash, cmd.Flags().Lookup(flagHash)); err != nil {
 		panic(err)
 	}
-	if err := viper.BindPFlag(flagURL, cmd.Flags().Lookup(flagURL)); err != nil {
-		panic(err)
-	}
 	return cmd
 }
 
@@ -53,9 +49,9 @@ func heightFlag(cmd *cobra.Command) *cobra.Command {
 }
 
 func paginationFlags(cmd *cobra.Command) *cobra.Command {
-	cmd.Flags().IntP(flags.FlagPage, "p", 1, "pagination page of light clients to to query for")
-	cmd.Flags().IntP(flags.FlagLimit, "l", 100, "pagination limit of light clients to query for")
-	if err := viper.BindPFlag(flags.FlagPage, cmd.Flags().Lookup(flags.FlagPage)); err != nil {
+	cmd.Flags().Uint64P(flags.FlagOffset, "o", 0, "pagination offset for query")
+	cmd.Flags().Uint64P(flags.FlagLimit, "l", 100, "pagination limit for query")
+	if err := viper.BindPFlag(flags.FlagOffset, cmd.Flags().Lookup(flags.FlagOffset)); err != nil {
 		panic(err)
 	}
 	if err := viper.BindPFlag(flags.FlagLimit, cmd.Flags().Lookup(flags.FlagLimit)); err != nil {