Skip to content

Commit

Permalink
feat!: remove the ignite realyer and tools commands with all ts-r…
Browse files Browse the repository at this point in the history
…ealyer logic (#4076)

* remove ts relayer

* remove unused commands

* remove ts relayer

* fix hermes relayer cmd for integration tests

* add relayer command ad default

* remove unused function

* Update changelog.md

* bump default hermes plugin version

* bump relayer into the tests

* run go mod tidy

* rollback relayer command into the integration tests

---------

Co-authored-by: Pantani <Pantani>
(cherry picked from commit 77b665f)

# Conflicts:
#	go.mod
#	go.sum
#	ignite/cmd/relayer.go
#	ignite/cmd/relayer_configure.go
#	ignite/cmd/relayer_connect.go
#	ignite/cmd/tools.go
#	ignite/pkg/nodetime/programs/ts-relayer/tsrelayer.go
#	ignite/pkg/relayer/chain.go
#	ignite/pkg/relayer/config/config.go
#	ignite/pkg/relayer/relayer.go
  • Loading branch information
Pantani authored and mergify[bot] committed Jul 2, 2024
1 parent 0048a1e commit 3276327
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 23 deletions.
12 changes: 12 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,18 @@
- [#4108](https://github.com/ignite/cli/pull/4108) Add `xast` package (cherry-picked from [#3770](https://github.com/ignite/cli/pull/3770))
- [#4110](https://github.com/ignite/cli/pull/4110) Scaffold a consumer chain with `interchain-security` v5.0.0.
- [#4117](https://github.com/ignite/cli/pull/4117), [#4125](https://github.com/ignite/cli/pull/4125) Support relative path when installing local plugins
- [#3707](https://github.com/ignite/cli/pull/3707) Add collections support.
- [#3977](https://github.com/ignite/cli/pull/3977) Add `chain lint` command to lint the chain's codebase using `golangci-lint`
- [#3770](https://github.com/ignite/cli/pull/3770) Add `scaffold configs` and `scaffold params` commands
- [#4001](https://github.com/ignite/cli/pull/4001) Improve `xgenny` dry run
- [#3967](https://github.com/ignite/cli/issues/3967) Add HD wallet parameters `address index` and `account number` to the chain account config
- [#4004](https://github.com/ignite/cli/pull/4004) Remove all import placeholders using the `xast` pkg
- [#4076](https://github.com/ignite/cli/pull/4076) Remove the ignite `relayer` and `tools` commands with all ts-relayer logic
- [#4071](https://github.com/ignite/cli/pull/4071) Support custom proto path
- [#3718](https://github.com/ignite/cli/pull/3718) Add `gen-mig-diffs` tool app to compare scaffold output of two versions of ignite
- [#4077](https://github.com/ignite/cli/pull/4077) Merge the swagger files manually instead use nodetime `swagger-combine`
- [#4100](https://github.com/ignite/cli/pull/4100) Set the `proto-dir` flag only for the `scaffold chain` command and use the proto path from the config
- [#4111](https://github.com/ignite/cli/pull/4111) Remove vuex generation

### Changes

Expand Down
6 changes: 5 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,16 @@ require (
github.com/goccy/go-yaml v1.11.2
github.com/golangci/golangci-lint v1.55.2
github.com/google/go-github/v48 v48.2.0
<<<<<<< HEAD
github.com/google/go-querystring v1.1.0
github.com/gookit/color v1.5.4
github.com/gorilla/mux v1.8.1
github.com/gorilla/rpc v1.2.1
github.com/hashicorp/go-hclog v1.5.0
=======
github.com/gorilla/mux v1.8.1
github.com/hashicorp/go-hclog v1.6.3
>>>>>>> 77b665f5 (feat!: remove the ignite `realyer` and `tools` commands with all ts-realyer logic (#4076))
github.com/hashicorp/go-plugin v1.6.0
github.com/iancoleman/strcase v0.3.0
github.com/ignite/ignite-files/nodetime v0.0.4
Expand Down Expand Up @@ -424,7 +429,6 @@ require (
github.com/uudashr/gocognit v1.1.2 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/xen0n/gosmopolitan v1.2.2 // indirect
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
github.com/yagipy/maintidx v1.0.0 // indirect
github.com/yeya24/promlinter v0.2.0 // indirect
github.com/ykadowak/zerologlint v0.1.3 // indirect
Expand Down
9 changes: 5 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -717,8 +717,13 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
<<<<<<< HEAD
github.com/gookit/color v1.5.4 h1:FZmqs7XOyGgCAxmWyPslpiok1k05wmY3SJTytgvYFs0=
github.com/gookit/color v1.5.4/go.mod h1:pZJOeOS8DM43rXbp4AZo1n9zCU2qjpcRko0b6/QJi9w=
=======
github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas=
github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=
>>>>>>> 77b665f5 (feat!: remove the ignite `realyer` and `tools` commands with all ts-realyer logic (#4076))
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/gordonklaus/ineffassign v0.0.0-20230610083614-0e73809eb601 h1:mrEEilTAUmaAORhssPPkxj84TsHrPMLBGW2Z4SoTxm8=
github.com/gordonklaus/ineffassign v0.0.0-20230610083614-0e73809eb601/go.mod h1:Qcp2HIAYhR7mNUVSIxZww3Guk4it82ghYcEXIAk+QT0=
Expand All @@ -731,8 +736,6 @@ github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2z
github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
github.com/gorilla/rpc v1.2.1 h1:yC+LMV5esttgpVvNORL/xX4jvTTEUE30UZhZ5JF7K9k=
github.com/gorilla/rpc v1.2.1/go.mod h1:uNpOihAlF5xRFLuTYhfR0yfCTm0WTQSQttkMSptRfGk=
github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
Expand Down Expand Up @@ -1426,8 +1429,6 @@ github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI
github.com/xen0n/gosmopolitan v1.2.2 h1:/p2KTnMzwRexIW8GlKawsTWOxn7UHA+jCMF/V8HHtvU=
github.com/xen0n/gosmopolitan v1.2.2/go.mod h1:7XX7Mj61uLYrj0qmeN0zi7XDon9JRAEhYQqAPLVNTeg=
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8=
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs=
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
github.com/yagipy/maintidx v1.0.0 h1:h5NvIsCz+nRDapQ0exNv4aJ0yXSI0420omVANTv3GJM=
github.com/yagipy/maintidx v1.0.0/go.mod h1:0qNf/I/CCZXSMhsRsrEPDZ+DkekpKLXAJfsTACwgXLk=
Expand Down
6 changes: 0 additions & 6 deletions ignite/cmd/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@ To get started, create a blockchain:
NewGenerate(),
NewNode(),
NewAccount(),
NewRelayer(),
NewTools(),
NewDocs(),
NewVersion(),
NewApp(),
Expand Down Expand Up @@ -206,10 +204,6 @@ func checkNewVersion(ctx context.Context) {
fmt.Printf("⬆️ Ignite CLI %s is available! To upgrade: https://docs.ignite.com/welcome/install#upgrade", next)
}

func printSection(session *cliui.Session, title string) error {
return session.Printf("------\n%s\n------\n\n", title)
}

func newCache(cmd *cobra.Command) (cache.Storage, error) {
cacheRootDir, err := config.DirPath()
if err != nil {
Expand Down
10 changes: 9 additions & 1 deletion ignite/cmd/plugin_default.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ type defaultPlugin struct {
const (
PluginNetworkVersion = "v0.2.2"
PluginNetworkPath = "github.com/ignite/cli-plugin-network@" + PluginNetworkVersion
PluginRelayerVersion = "hermes/v0.2.2"
PluginRelayerPath = "github.com/ignite/apps/hermes@" + PluginRelayerVersion
)

// defaultPlugins holds the plugin that are considered trustable and for which
Expand All @@ -30,9 +32,15 @@ var defaultPlugins = []defaultPlugin{
aliases: []string{"n"},
path: PluginNetworkPath,
},
{
use: "relayer",
short: "Connect blockchains with an IBC relayer",
aliases: []string{"r"},
path: PluginRelayerPath,
},
}

// ensureDefaultPlugins ensures that all defaultPlugins are wether registered
// ensureDefaultPlugins ensures that all defaultPlugins are whether registered
// in cfg OR have an install command added to rootCmd.
func ensureDefaultPlugins(rootCmd *cobra.Command, cfg *pluginsconfig.Config) {
for _, dp := range defaultPlugins {
Expand Down
9 changes: 0 additions & 9 deletions ignite/pkg/nodetime/nodetime.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,6 @@ const (

// CommandSwaggerCombine is https://www.npmjs.com/package/swagger-combine.
CommandSwaggerCombine CommandName = "swagger-combine"

// CommandIBCSetup is https://github.com/confio/ts-relayer/blob/main/spec/ibc-setup.md.
CommandIBCSetup = "ibc-setup"

// CommandIBCRelayer is https://github.com/confio/ts-relayer/blob/main/spec/ibc-relayer.md.
CommandIBCRelayer = "ibc-relayer"

// CommandXRelayer is a relayer wrapper for Ignite CLI made using the confio relayer.
CommandXRelayer = "xrelayer"
)

// CommandName represents a high level command under nodetime.
Expand Down
4 changes: 2 additions & 2 deletions integration/relayer/cmd_relayer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ func TestBlogIBC(t *testing.T) {
"install",
"-g",
// filepath.Join(goenv.GoPath(), "src/github.com/ignite/apps/hermes"), // Local path for test proposals
"github.com/ignite/apps/hermes@hermes/v0.2.1",
"github.com/ignite/apps/hermes@hermes/v0.2.2",
),
)),
))
Expand Down Expand Up @@ -637,5 +637,5 @@ func TestBlogIBC(t *testing.T) {
// TODO test ibc using the blog post methods:
// step.Exec(app.Binary(), "tx", "blog", "send-ibc-post", "transfer", "channel-0", "Hello", "Hello_Mars-Alice_from_Earth", "--chain-id", earthChainID, "--from", "alice", "--node", earthGRPC, "--output", "json", "--log_format", "json", "--yes")
// TODO test ibc using the hermes ft-transfer:
// step.Exec(envtest.IgniteApp, "relayer", "hermes", "exec", "--", "--config", earthConfig, "tx", "ft-transfer", "--timeout-seconds", "1000", "--dst-chain", earthChainID, "--src-chain", marsChainID, "--src-port", "transfer", "--src-channel", "channel-0", "--amount", "100000", "--denom", "stake", "--output", "json", "--log_format", "json", "--yes")
// step.Exec(envtest.IgniteApp, "hermes", "exec", "--", "--config", earthConfig, "tx", "ft-transfer", "--timeout-seconds", "1000", "--dst-chain", earthChainID, "--src-chain", marsChainID, "--src-port", "transfer", "--src-channel", "channel-0", "--amount", "100000", "--denom", "stake", "--output", "json", "--log_format", "json", "--yes")
}

0 comments on commit 3276327

Please sign in to comment.