Merge branch 'main' into JeancarloBarrios/add-cosmowasm-support

regen-network · Dec 31, 2024 · 8b9270a · 8b9270a
2 parents 062d744 + ed29110
commit 8b9270a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -55,3 +55,11 @@ pull_request_rules:
       backport:
         branches:
           - release/v5.1.x
+  - name: backport patches to v6.0.x branch
+    conditions:
+      - base=main
+      - label=backport/v6.0.x
+    actions:
+      backport:
+        branches:
+          - release/v6.0.x
diff --git a/app/app.go b/app/app.go
@@ -834,7 +834,7 @@ func NewRegenApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest
 		}
 	}
 
-	return app
+	app.SetPostHandler(postHandler)
 }
 
 func (app *RegenApp) setAnteHandler(txConfig client.TxConfig, wasmConfig wasmtypes.WasmConfig, txCounterStoreKey storetypes.StoreKey) {

diff --git a/app/client/cli/root.go b/app/client/cli/root.go
@@ -192,6 +192,16 @@ func genesisCommand(encodingConfig testutil.TestEncodingConfig, cmds ...*cobra.C
 	return cmd
 }
 
+// genesisCommand builds genesis-related `simd genesis` command. Users may provide application specific commands as a parameter
+func genesisCommand(encodingConfig testutil.TestEncodingConfig, cmds ...*cobra.Command) *cobra.Command {
+	cmd := genutilcli.GenesisCoreCommand(encodingConfig.TxConfig, app.ModuleBasics, app.DefaultNodeHome)
+
+	for _, subCmd := range cmds {
+		cmd.AddCommand(subCmd)
+	}
+	return cmd
+}
+
 func queryCommand() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                        "query",
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
     	}
-    	return app
+    	app.SetPostHandler(postHandler)
     }
     func (app *RegenApp) setAnteHandler(txConfig client.TxConfig, wasmConfig wasmtypes.WasmConfig, txCounterStoreKey storetypes.StoreKey) {
@@ Expand Down @@