From ecce935f654fa116002d185871a72518b82d1a51 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 16:55:24 +0100 Subject: [PATCH 1/6] ci(mergify): upgrade configuration to current format (#4420) Co-authored-by: Mergify <37929162+mergify[bot]@users.noreply.github.com> --- .github/mergify.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 15d82166be..1444a55b3d 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,20 +1,16 @@ queue_rules: - name: default - conditions: + queue_conditions: + - "#approved-reviews-by>1" + - base=main + merge_conditions: - "#approved-reviews-by>1" + merge_method: squash + commit_message_template: | + {{ title }} (#{{ number }}) + {{ body }} pull_request_rules: - - name: automerge to main with label automerge and branch protection passing - conditions: - - "#approved-reviews-by>1" - - base=main - actions: - queue: - name: default - method: squash - commit_message_template: | - {{ title }} (#{{ number }}) - {{ body }} - name: backport patches to v28.x.y branch conditions: - base=main @@ -31,3 +27,7 @@ pull_request_rules: backport: branches: - release/v29.x.y + - name: refactored queue action rule + conditions: [] + actions: + queue: From da55a095652f3344c5afc91b83b18df90a565c19 Mon Sep 17 00:00:00 2001 From: KIMURA Yu <33382781+kimurayu45z@users.noreply.github.com> Date: Fri, 22 Nov 2024 15:51:14 +0700 Subject: [PATCH 2/6] fix(templates): fix simapp simulation method update->delete (#4421) --- .../simapp/x/{{moduleName}}/simulation/{{typeName}}.go.plush | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ignite/templates/typed/list/files/simapp/x/{{moduleName}}/simulation/{{typeName}}.go.plush b/ignite/templates/typed/list/files/simapp/x/{{moduleName}}/simulation/{{typeName}}.go.plush index 3de285e06d..fdfee44b07 100644 --- a/ignite/templates/typed/list/files/simapp/x/{{moduleName}}/simulation/{{typeName}}.go.plush +++ b/ignite/templates/typed/list/files/simapp/x/{{moduleName}}/simulation/{{typeName}}.go.plush @@ -107,7 +107,7 @@ func SimulateMsgDelete<%= TypeName.UpperCamel %>( var ( simAccount = simtypes.Account{} <%= TypeName.LowerCamel %> = types.<%= TypeName.UpperCamel %>{} - msg = &types.MsgUpdate<%= TypeName.UpperCamel %>{} + msg = &types.MsgDelete<%= TypeName.UpperCamel %>{} found = false ) From 4eaa0d691ec51f4bf200f9ca8f76dfb0740c91cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 09:58:06 +0100 Subject: [PATCH 3/6] chore(deps): bump cross-spawn from 7.0.3 to 7.0.6 in /docs (#4419) Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.6. - [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md) - [Commits](https://github.com/moxystudio/node-cross-spawn/compare/v7.0.3...v7.0.6) --- updated-dependencies: - dependency-name: cross-spawn dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Julien Robert --- docs/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/yarn.lock b/docs/yarn.lock index ff7fce1cb2..b23d3523d2 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -3273,9 +3273,9 @@ cross-fetch@^3.1.5: node-fetch "2.6.7" cross-spawn@^7.0.3: - version "7.0.3" - resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz" - integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + version "7.0.6" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f" + integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA== dependencies: path-key "^3.1.0" shebang-command "^2.0.0" From 00ff829ef6dc0a9110c7fe3587c8edc9406a47f7 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Fri, 22 Nov 2024 17:12:06 +0100 Subject: [PATCH 4/6] refactor(testnet): change alias and local-chains dir (#4409) * refactor(testnet): change alias and local-chains dir * `make lint-fix` --- docs/docs/03-CLI-Commands/01-cli-commands.md | 2 +- ignite/cmd/testnet.go | 9 +++------ ignite/cmd/testnet_multi_node.go | 5 ++--- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/docs/docs/03-CLI-Commands/01-cli-commands.md b/docs/docs/03-CLI-Commands/01-cli-commands.md index 48e5d30a64..b70e8d627b 100644 --- a/docs/docs/03-CLI-Commands/01-cli-commands.md +++ b/docs/docs/03-CLI-Commands/01-cli-commands.md @@ -3755,7 +3755,7 @@ Each validator's bonded stake can be adjusted according to your testing needs, p The multi-node command not only initializes these nodes but also gives you control over starting, stopping individual nodes. This level of control ensures you can test and iterate rapidly without needing to reinitialize the entire network each time a change is made. This makes it ideal for experimenting with validator behavior, network dynamics, and the impact of various configurations. -All initialized nodes will be stored under the `.ignite/local-chains//testnet/` directory, which allows easy access and management. +All initialized nodes will be stored under the `.ignite/local-chains//testnet/` directory, which allows easy access and management. Usage diff --git a/ignite/cmd/testnet.go b/ignite/cmd/testnet.go index 6574cf8e48..da91e7213a 100644 --- a/ignite/cmd/testnet.go +++ b/ignite/cmd/testnet.go @@ -7,12 +7,9 @@ import ( // NewTestnet returns a command that groups scaffolding related sub commands. func NewTestnet() *cobra.Command { c := &cobra.Command{ - Use: "testnet [command]", - Short: "Start a testnet local", - Long: `Start a testnet local - -`, - Aliases: []string{"s"}, + Use: "testnet [command]", + Short: "Start a testnet local", + Aliases: []string{"t"}, Args: cobra.ExactArgs(1), } diff --git a/ignite/cmd/testnet_multi_node.go b/ignite/cmd/testnet_multi_node.go index 7049005b0b..0f0ef96c51 100644 --- a/ignite/cmd/testnet_multi_node.go +++ b/ignite/cmd/testnet_multi_node.go @@ -2,6 +2,7 @@ package ignitecmd import ( "os" + "path" "strconv" "time" @@ -47,8 +48,6 @@ func NewTestnetMultiNode() *cobra.Command { Usage: ignite testnet multi-node [flags] - - `, Args: cobra.NoArgs, RunE: testnetMultiNodeHandler, @@ -108,7 +107,7 @@ func testnetMultiNode(cmd *cobra.Command, session *cliui.Session) error { } nodeDirPrefix, _ := cmd.Flags().GetString(flagNodeDirPrefix) - outputDir, err := xfilepath.Join(igcfg.DirPath, xfilepath.Path("local-chains/"+c.Name()+"d/"+"testnet/"))() + outputDir, err := xfilepath.Join(igcfg.DirPath, xfilepath.Path(path.Join("local-chains", c.Name(), "testnet")))() if err != nil { return err } From aa03d463f9e08aa9c2473e1b73b20d2fd358681a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 17:20:34 +0100 Subject: [PATCH 5/6] docs(cli): update generated docs (#4427) Co-authored-by: julienrbrt <29894366+julienrbrt@users.noreply.github.com> --- docs/docs/08-references/01-cli.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/docs/docs/08-references/01-cli.md b/docs/docs/08-references/01-cli.md index 6bb28914ea..d6cc4b3e09 100644 --- a/docs/docs/08-references/01-cli.md +++ b/docs/docs/08-references/01-cli.md @@ -3265,12 +3265,6 @@ ignite scaffold type NAME [field:type] ... [flags] Start a testnet local -**Synopsis** - -Start a testnet local - - - **Options** ``` @@ -3344,8 +3338,6 @@ Initialize the test network with the number of nodes and bonded from the config. - - ``` ignite testnet multi-node [flags] ``` From eaba5cf785f60cb88707d7bf8070e6c8f9970612 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Fri, 22 Nov 2024 17:56:37 +0100 Subject: [PATCH 6/6] chore: fix expected keepers (#4424) --- .../base/x/{{moduleName}}/types/expected_keepers.go.plush | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ignite/templates/module/create/files/base/x/{{moduleName}}/types/expected_keepers.go.plush b/ignite/templates/module/create/files/base/x/{{moduleName}}/types/expected_keepers.go.plush index 63ae1fbaed..4287d068ab 100644 --- a/ignite/templates/module/create/files/base/x/{{moduleName}}/types/expected_keepers.go.plush +++ b/ignite/templates/module/create/files/base/x/{{moduleName}}/types/expected_keepers.go.plush @@ -4,7 +4,7 @@ import ( "context" <%= if (dependencies.Contains("Staking")) { %>"cosmossdk.io/core/address" - stakingtypes "cosmossdk.io/x/staking/types"<% } %> + <% } %> sdk "github.com/cosmos/cosmos-sdk/types" <%= if (dependencies.Contains("Authz")) { %>"cosmossdk.io/x/authz"<% } %> ) @@ -16,7 +16,7 @@ import ( // StakingKeeper defines the expected interface for the Staking module. type StakingKeeper interface { ConsensusAddressCodec() address.Codec - ValidatorByConsAddr(context.Context, sdk.ConsAddress) (stakingtypes.ValidatorI, error) + ValidatorByConsAddr(context.Context, sdk.ConsAddress) (sdk.ValidatorI, error) // Methods imported from account should be defined here }