From 268b98739d925ccc08fcf887be5591872592101e Mon Sep 17 00:00:00 2001 From: Pantani Date: Fri, 27 Feb 2026 18:23:21 -0300 Subject: [PATCH 1/4] refactor: remove ibc keys placeholders --- ignite/services/scaffolder/module.go | 2 +- .../base/x/{{moduleName}}/types/keys.go.plush | 16 +++++++-- ignite/templates/module/create/ibc.go | 34 +------------------ ignite/templates/module/placeholders.go | 7 ---- 4 files changed, 15 insertions(+), 44 deletions(-) delete mode 100644 ignite/templates/module/placeholders.go diff --git a/ignite/services/scaffolder/module.go b/ignite/services/scaffolder/module.go index a6f717a5cd..3a77f71f01 100644 --- a/ignite/services/scaffolder/module.go +++ b/ignite/services/scaffolder/module.go @@ -222,7 +222,7 @@ func (s Scaffolder) CreateModule( // Scaffold IBC module if opts.IsIBC { - g, err = modulecreate.NewIBC(s.Tracer(), opts) + g, err = modulecreate.NewIBC(opts) if err != nil { return err } diff --git a/ignite/templates/module/create/files/base/x/{{moduleName}}/types/keys.go.plush b/ignite/templates/module/create/files/base/x/{{moduleName}}/types/keys.go.plush index 77f6241c47..9a55c9b9bc 100644 --- a/ignite/templates/module/create/files/base/x/{{moduleName}}/types/keys.go.plush +++ b/ignite/templates/module/create/files/base/x/{{moduleName}}/types/keys.go.plush @@ -13,11 +13,21 @@ const ( // It should be synced with the gov module's name if it is ever changed. // See: https://github.com/cosmos/cosmos-sdk/blob/v0.52.0-beta.2/x/gov/types/keys.go#L9 GovModuleName = "gov" +<%= if (isIBC) { %> + // Version defines the current version the IBC module supports + Version = "<%= moduleName %>-1" - <%= if (isIBC) { %>// this line is used by starport scaffolding # ibc/keys/name<% } %> + // PortID is the default port id that module binds to + PortID = "<%= moduleName %>" +<% } %> ) -<%= if (isIBC) { %>// this line is used by starport scaffolding # ibc/keys/port<% } %> +<%= if (isIBC) { %> +var ( + // PortKey defines the key to store the port ID in store + PortKey = collections.NewPrefix("<%= moduleName %>-port-") +) +<% } %> // ParamsKey is the prefix to retrieve all Params -var ParamsKey = collections.NewPrefix("p_<%= moduleName %>") +var ParamsKey = collections.NewPrefix("p_<%= moduleName %>") \ No newline at end of file diff --git a/ignite/templates/module/create/ibc.go b/ignite/templates/module/create/ibc.go index 1078320fd5..0efe487596 100644 --- a/ignite/templates/module/create/ibc.go +++ b/ignite/templates/module/create/ibc.go @@ -15,7 +15,6 @@ import ( "github.com/ignite/cli/v29/ignite/pkg/errors" "github.com/ignite/cli/v29/ignite/pkg/gomodulepath" - "github.com/ignite/cli/v29/ignite/pkg/placeholder" "github.com/ignite/cli/v29/ignite/pkg/protoanalysis/protoutil" "github.com/ignite/cli/v29/ignite/pkg/xast" "github.com/ignite/cli/v29/ignite/pkg/xgenny" @@ -25,7 +24,7 @@ import ( ) // NewIBC returns the generator to scaffold the implementation of the IBCModule interface inside a module. -func NewIBC(replacer placeholder.Replacer, opts *CreateOptions) (*genny.Generator, error) { +func NewIBC(opts *CreateOptions) (*genny.Generator, error) { subFs, err := fs.Sub(fsIBC, "files/ibc") if err != nil { return nil, errors.Errorf("fail to generate sub: %w", err) @@ -35,7 +34,6 @@ func NewIBC(replacer placeholder.Replacer, opts *CreateOptions) (*genny.Generato g.RunFn(genesisModify(opts)) g.RunFn(genesisTypesModify(opts)) g.RunFn(genesisProtoModify(opts)) - g.RunFn(keysModify(replacer, opts)) if err := g.OnlyFS(subFs, nil, nil); err != nil { return g, errors.Errorf("generator fs: %w", err) @@ -178,36 +176,6 @@ func genesisProtoModify(opts *CreateOptions) genny.RunFn { } } -func keysModify(replacer placeholder.Replacer, opts *CreateOptions) genny.RunFn { - return func(r *genny.Runner) error { - path := filepath.Join("x", opts.ModuleName, "types/keys.go") - f, err := r.Disk.Find(path) - if err != nil { - return err - } - - // Append version and the port ID in keys - templateName := `// Version defines the current version the IBC module supports -Version = "%[1]v-1" - -// PortID is the default port id that module binds to -PortID = "%[1]v"` - replacementName := fmt.Sprintf(templateName, opts.ModuleName) - content := replacer.Replace(f.String(), module.PlaceholderIBCKeysName, replacementName) - - // PlaceholderIBCKeysPort - templatePort := `var ( - // PortKey defines the key to store the port ID in store - PortKey = collections.NewPrefix("%[1]v-port-") -)` - replacementPort := fmt.Sprintf(templatePort, opts.ModuleName) - content = replacer.Replace(content, module.PlaceholderIBCKeysPort, replacementPort) - - newFile := genny.NewFileS(path, content) - return r.File(newFile) - } -} - func appIBCModify(opts *CreateOptions) genny.RunFn { return func(r *genny.Runner) error { path := module.PathIBCConfigGo diff --git a/ignite/templates/module/placeholders.go b/ignite/templates/module/placeholders.go deleted file mode 100644 index fbc82838b6..0000000000 --- a/ignite/templates/module/placeholders.go +++ /dev/null @@ -1,7 +0,0 @@ -package module - -const ( - // Placeholders in IBC module files. - PlaceholderIBCKeysName = "// this line is used by starport scaffolding # ibc/keys/name" - PlaceholderIBCKeysPort = "// this line is used by starport scaffolding # ibc/keys/port" -) From 60778bbf1696f176fdec1f2e884c0d77ee6ee58c Mon Sep 17 00:00:00 2001 From: Pantani Date: Fri, 27 Feb 2026 18:24:36 -0300 Subject: [PATCH 2/4] add changelog --- changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.md b/changelog.md index cdf2c18245..3a37ddad2c 100644 --- a/changelog.md +++ b/changelog.md @@ -10,6 +10,7 @@ - [#4880](https://github.com/ignite/cli/pull/4880) Add possibility to scaffold underscore package. - [#4878](https://github.com/ignite/cli/pull/4878) Improve the `xast` package readability. +- [#4883](https://github.com/ignite/cli/pull/4883) Remove ibc keys placeholders. ## [`v29.8.0`](https://github.com/ignite/cli/releases/tag/v29.8.0) From 770825903e2be74cd18e2a8a6d91606e8f7bfebd Mon Sep 17 00:00:00 2001 From: Pantani Date: Mon, 2 Mar 2026 17:23:29 -0300 Subject: [PATCH 3/4] trigger CI --- ignite/services/scaffolder/module.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ignite/services/scaffolder/module.go b/ignite/services/scaffolder/module.go index 3a77f71f01..b0327e6e52 100644 --- a/ignite/services/scaffolder/module.go +++ b/ignite/services/scaffolder/module.go @@ -324,4 +324,4 @@ func checkDependencies(dependencies []modulecreate.Dependency, appPath string) e } return nil -} +} \ No newline at end of file From 7cf855d5736f27ca9f44235509dd9e5ec6a40314 Mon Sep 17 00:00:00 2001 From: Pantani Date: Mon, 2 Mar 2026 17:30:30 -0300 Subject: [PATCH 4/4] trigger ci --- ignite/services/scaffolder/module.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ignite/services/scaffolder/module.go b/ignite/services/scaffolder/module.go index b0327e6e52..3a77f71f01 100644 --- a/ignite/services/scaffolder/module.go +++ b/ignite/services/scaffolder/module.go @@ -324,4 +324,4 @@ func checkDependencies(dependencies []modulecreate.Dependency, appPath string) e } return nil -} \ No newline at end of file +}