Skip to content

Commit 3276327

Browse files
Pantanimergify[bot]
authored andcommitted
feat!: remove the ignite realyer and tools commands with all ts-realyer 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
1 parent 0048a1e commit 3276327

File tree

7 files changed

+33
-23
lines changed

7 files changed

+33
-23
lines changed

Diff for: changelog.md

+12
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,18 @@
3939
- [#4108](https://github.com/ignite/cli/pull/4108) Add `xast` package (cherry-picked from [#3770](https://github.com/ignite/cli/pull/3770))
4040
- [#4110](https://github.com/ignite/cli/pull/4110) Scaffold a consumer chain with `interchain-security` v5.0.0.
4141
- [#4117](https://github.com/ignite/cli/pull/4117), [#4125](https://github.com/ignite/cli/pull/4125) Support relative path when installing local plugins
42+
- [#3707](https://github.com/ignite/cli/pull/3707) Add collections support.
43+
- [#3977](https://github.com/ignite/cli/pull/3977) Add `chain lint` command to lint the chain's codebase using `golangci-lint`
44+
- [#3770](https://github.com/ignite/cli/pull/3770) Add `scaffold configs` and `scaffold params` commands
45+
- [#4001](https://github.com/ignite/cli/pull/4001) Improve `xgenny` dry run
46+
- [#3967](https://github.com/ignite/cli/issues/3967) Add HD wallet parameters `address index` and `account number` to the chain account config
47+
- [#4004](https://github.com/ignite/cli/pull/4004) Remove all import placeholders using the `xast` pkg
48+
- [#4076](https://github.com/ignite/cli/pull/4076) Remove the ignite `relayer` and `tools` commands with all ts-relayer logic
49+
- [#4071](https://github.com/ignite/cli/pull/4071) Support custom proto path
50+
- [#3718](https://github.com/ignite/cli/pull/3718) Add `gen-mig-diffs` tool app to compare scaffold output of two versions of ignite
51+
- [#4077](https://github.com/ignite/cli/pull/4077) Merge the swagger files manually instead use nodetime `swagger-combine`
52+
- [#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
53+
- [#4111](https://github.com/ignite/cli/pull/4111) Remove vuex generation
4254

4355
### Changes
4456

Diff for: go.mod

+5-1
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,16 @@ require (
4444
github.com/goccy/go-yaml v1.11.2
4545
github.com/golangci/golangci-lint v1.55.2
4646
github.com/google/go-github/v48 v48.2.0
47+
<<<<<<< HEAD
4748
github.com/google/go-querystring v1.1.0
4849
github.com/gookit/color v1.5.4
4950
github.com/gorilla/mux v1.8.1
5051
github.com/gorilla/rpc v1.2.1
5152
github.com/hashicorp/go-hclog v1.5.0
53+
=======
54+
github.com/gorilla/mux v1.8.1
55+
github.com/hashicorp/go-hclog v1.6.3
56+
>>>>>>> 77b665f5 (feat!: remove the ignite `realyer` and `tools` commands with all ts-realyer logic (#4076))
5257
github.com/hashicorp/go-plugin v1.6.0
5358
github.com/iancoleman/strcase v0.3.0
5459
github.com/ignite/ignite-files/nodetime v0.0.4
@@ -424,7 +429,6 @@ require (
424429
github.com/uudashr/gocognit v1.1.2 // indirect
425430
github.com/xanzy/ssh-agent v0.3.3 // indirect
426431
github.com/xen0n/gosmopolitan v1.2.2 // indirect
427-
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
428432
github.com/yagipy/maintidx v1.0.0 // indirect
429433
github.com/yeya24/promlinter v0.2.0 // indirect
430434
github.com/ykadowak/zerologlint v0.1.3 // indirect

Diff for: go.sum

+5-4
Original file line numberDiff line numberDiff line change
@@ -717,8 +717,13 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
717717
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
718718
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
719719
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
720+
<<<<<<< HEAD
720721
github.com/gookit/color v1.5.4 h1:FZmqs7XOyGgCAxmWyPslpiok1k05wmY3SJTytgvYFs0=
721722
github.com/gookit/color v1.5.4/go.mod h1:pZJOeOS8DM43rXbp4AZo1n9zCU2qjpcRko0b6/QJi9w=
723+
=======
724+
github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas=
725+
github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=
726+
>>>>>>> 77b665f5 (feat!: remove the ignite `realyer` and `tools` commands with all ts-realyer logic (#4076))
722727
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
723728
github.com/gordonklaus/ineffassign v0.0.0-20230610083614-0e73809eb601 h1:mrEEilTAUmaAORhssPPkxj84TsHrPMLBGW2Z4SoTxm8=
724729
github.com/gordonklaus/ineffassign v0.0.0-20230610083614-0e73809eb601/go.mod h1:Qcp2HIAYhR7mNUVSIxZww3Guk4it82ghYcEXIAk+QT0=
@@ -731,8 +736,6 @@ github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2z
731736
github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
732737
github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
733738
github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
734-
github.com/gorilla/rpc v1.2.1 h1:yC+LMV5esttgpVvNORL/xX4jvTTEUE30UZhZ5JF7K9k=
735-
github.com/gorilla/rpc v1.2.1/go.mod h1:uNpOihAlF5xRFLuTYhfR0yfCTm0WTQSQttkMSptRfGk=
736739
github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
737740
github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
738741
github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
@@ -1426,8 +1429,6 @@ github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI
14261429
github.com/xen0n/gosmopolitan v1.2.2 h1:/p2KTnMzwRexIW8GlKawsTWOxn7UHA+jCMF/V8HHtvU=
14271430
github.com/xen0n/gosmopolitan v1.2.2/go.mod h1:7XX7Mj61uLYrj0qmeN0zi7XDon9JRAEhYQqAPLVNTeg=
14281431
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
1429-
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8=
1430-
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs=
14311432
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
14321433
github.com/yagipy/maintidx v1.0.0 h1:h5NvIsCz+nRDapQ0exNv4aJ0yXSI0420omVANTv3GJM=
14331434
github.com/yagipy/maintidx v1.0.0/go.mod h1:0qNf/I/CCZXSMhsRsrEPDZ+DkekpKLXAJfsTACwgXLk=

Diff for: ignite/cmd/cmd.go

-6
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@ To get started, create a blockchain:
7676
NewGenerate(),
7777
NewNode(),
7878
NewAccount(),
79-
NewRelayer(),
80-
NewTools(),
8179
NewDocs(),
8280
NewVersion(),
8381
NewApp(),
@@ -206,10 +204,6 @@ func checkNewVersion(ctx context.Context) {
206204
fmt.Printf("⬆️ Ignite CLI %s is available! To upgrade: https://docs.ignite.com/welcome/install#upgrade", next)
207205
}
208206

209-
func printSection(session *cliui.Session, title string) error {
210-
return session.Printf("------\n%s\n------\n\n", title)
211-
}
212-
213207
func newCache(cmd *cobra.Command) (cache.Storage, error) {
214208
cacheRootDir, err := config.DirPath()
215209
if err != nil {

Diff for: ignite/cmd/plugin_default.go

+9-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ type defaultPlugin struct {
1818
const (
1919
PluginNetworkVersion = "v0.2.2"
2020
PluginNetworkPath = "github.com/ignite/cli-plugin-network@" + PluginNetworkVersion
21+
PluginRelayerVersion = "hermes/v0.2.2"
22+
PluginRelayerPath = "github.com/ignite/apps/hermes@" + PluginRelayerVersion
2123
)
2224

2325
// defaultPlugins holds the plugin that are considered trustable and for which
@@ -30,9 +32,15 @@ var defaultPlugins = []defaultPlugin{
3032
aliases: []string{"n"},
3133
path: PluginNetworkPath,
3234
},
35+
{
36+
use: "relayer",
37+
short: "Connect blockchains with an IBC relayer",
38+
aliases: []string{"r"},
39+
path: PluginRelayerPath,
40+
},
3341
}
3442

35-
// ensureDefaultPlugins ensures that all defaultPlugins are wether registered
43+
// ensureDefaultPlugins ensures that all defaultPlugins are whether registered
3644
// in cfg OR have an install command added to rootCmd.
3745
func ensureDefaultPlugins(rootCmd *cobra.Command, cfg *pluginsconfig.Config) {
3846
for _, dp := range defaultPlugins {

Diff for: ignite/pkg/nodetime/nodetime.go

-9
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,6 @@ const (
2525

2626
// CommandSwaggerCombine is https://www.npmjs.com/package/swagger-combine.
2727
CommandSwaggerCombine CommandName = "swagger-combine"
28-
29-
// CommandIBCSetup is https://github.com/confio/ts-relayer/blob/main/spec/ibc-setup.md.
30-
CommandIBCSetup = "ibc-setup"
31-
32-
// CommandIBCRelayer is https://github.com/confio/ts-relayer/blob/main/spec/ibc-relayer.md.
33-
CommandIBCRelayer = "ibc-relayer"
34-
35-
// CommandXRelayer is a relayer wrapper for Ignite CLI made using the confio relayer.
36-
CommandXRelayer = "xrelayer"
3728
)
3829

3930
// CommandName represents a high level command under nodetime.

Diff for: integration/relayer/cmd_relayer_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ func TestBlogIBC(t *testing.T) {
446446
"install",
447447
"-g",
448448
// filepath.Join(goenv.GoPath(), "src/github.com/ignite/apps/hermes"), // Local path for test proposals
449-
"github.com/ignite/apps/hermes@hermes/v0.2.1",
449+
"github.com/ignite/apps/hermes@hermes/v0.2.2",
450450
),
451451
)),
452452
))
@@ -637,5 +637,5 @@ func TestBlogIBC(t *testing.T) {
637637
// TODO test ibc using the blog post methods:
638638
// 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")
639639
// TODO test ibc using the hermes ft-transfer:
640-
// 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")
640+
// 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")
641641
}

0 commit comments

Comments
 (0)