Merge branch 'main' into chore/new-network-path

ignite · Nov 22, 2024 · c81813c · c81813c
2 parents 890777f + eaba5cf
commit c81813c
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 36 deletions.
diff --git 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:
diff --git 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/<appd>/testnet/` directory, which allows easy access and management.
+All initialized nodes will be stored under the `.ignite/local-chains/<app>/testnet/` directory, which allows easy access and management.
 
 
 Usage

diff --git 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]
 ```

diff --git 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"

diff --git 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
@@ -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
 	}

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
@@ -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
         }
 

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
@@ -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
 		)