From be699e11df55828080197690ee4f90ba9ab52c13 Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Fri, 18 Apr 2025 16:53:39 +0200
Subject: [PATCH 01/21] feat(rollkit): upgrade rollkit

---
 rollkit/CHANGELOG.md            |  2 ++
 rollkit/template/boilerplate.go | 18 +++++++++++
 rollkit/template/rollkit.go     | 53 ++++++++++++++-------------------
 3 files changed, 43 insertions(+), 30 deletions(-)
 create mode 100644 rollkit/template/boilerplate.go

diff --git a/rollkit/CHANGELOG.md b/rollkit/CHANGELOG.md
index 0a5ed21c..ffe87a18 100644
--- a/rollkit/CHANGELOG.md
+++ b/rollkit/CHANGELOG.md
@@ -3,6 +3,8 @@
 ## Unreleased
 
 * [#112](https://github.com/ignite/apps/pull/112) Use default command instead cobra commands.
+* []() Upgrade Rollkit to `v1.x` and use [`go-execution-abci`](https://github.com/rollkit/go-execution-abci) instead of [`cosmos-sdk-starter`](https://github.com/rollkit/cosmos-sdk-starter).
+  * Note, if you already have rollkit installed, you need to redo the wiring manually.
 
 ## [`v0.2.1`](https://github.com/ignite/apps/releases/tag/rollkit/v0.2.1)
 
diff --git a/rollkit/template/boilerplate.go b/rollkit/template/boilerplate.go
new file mode 100644
index 00000000..741debaa
--- /dev/null
+++ b/rollkit/template/boilerplate.go
@@ -0,0 +1,18 @@
+package template
+
+const (
+	ServerAddCommandsWithStartCmdOptions = "AddCommandsWithStartCmdOptions"
+
+	RollkitV0XStartHandler  = "rollserv.StartHandler"
+	RolltkitV1XStartHandler = "abciserver.StartHandler"
+	RollkitServerOptions    = `server.AddCommandsWithStartCmdOptions(
+			rootCmd,
+			app.DefaultNodeHome,
+			newApp, appExport,
+			server.StartCmdOptions{
+				AddFlags: func(cmd *cobra.Command) {
+					abciserver.AddFlags(cmd)
+				},
+				StartCommandHandler: abciserver.StartHandler(),
+			})`
+)
diff --git a/rollkit/template/rollkit.go b/rollkit/template/rollkit.go
index 91f8d9e5..889c5e5d 100644
--- a/rollkit/template/rollkit.go
+++ b/rollkit/template/rollkit.go
@@ -41,8 +41,12 @@ func commandsModify(appPath, binaryName string, version cosmosver.Version) genny
 			return err
 		}
 
-		if strings.Contains(f.String(), "rollserv.StartHandler[servertypes.Application]") {
-			return errors.New("rollkit is already installed")
+		if strings.Contains(f.String(), RollkitV0XStartHandler) {
+			return errors.New("rollkit v0.x is already installed. Please remove it before installing rollkit v1.x")
+		}
+
+		if strings.Contains(f.String(), RolltkitV1XStartHandler) {
+			return errors.New("rollkit is already installed.")
 		}
 
 		if version.LT(cosmosver.StargateFiftyVersion) {
@@ -51,41 +55,30 @@ func commandsModify(appPath, binaryName string, version cosmosver.Version) genny
 
 		content, err := xast.AppendImports(
 			f.String(),
-			xast.WithLastNamedImport("rollserv", "github.com/rollkit/cosmos-sdk-starter/server"),
-			xast.WithLastNamedImport("rollconf", "github.com/rollkit/rollkit/config"),
+			xast.WithLastNamedImport("abciserver", "github.com/rollkit/go-execution-abci/server"),
 		)
 		if err != nil {
 			return err
 		}
 
-		// TODO(@julienrbrt) eventually use ast for simply replacing AddCommands or AddCommandsWithStartCmdOptions
-		const (
-			defaultv050ServerOptions       = "server.AddCommands(rootCmd, app.DefaultNodeHome, newApp, appExport, addModuleInitFlags)"
-			secondv050DefaultServerOptions = `server.AddCommandsWithStartCmdOptions(rootCmd, app.DefaultNodeHome, newApp, appExport, server.StartCmdOptions{
-				AddFlags: func(startCmd *cobra.Command) {
-					addModuleInitFlags(startCmd)
-				},
-			})`
-			thirdv050DefaultServerOptions = "server.AddCommandsWithStartCmdOptions(rootCmd, app.DefaultNodeHome, newApp, appExport, server.StartCmdOptions{})"
-
-			rollkitServerOptions = `server.AddCommandsWithStartCmdOptions(
-				rootCmd,
-				app.DefaultNodeHome,
-				newApp, appExport,
-				server.StartCmdOptions{
-					AddFlags: func(cmd *cobra.Command) {
-						rollconf.AddFlags(cmd)
-						addModuleInitFlags(cmd)
-					},
-					StartCommandHandler: rollserv.StartHandler[servertypes.Application],
-				})`
-		)
+		// replace potential legacy boilerplate present in an ignite v28 chain.
+		content = replaceLegacyAddCommands(content)
 
-		// try all 3 possible default server options
-		content = strings.ReplaceAll(content, defaultv050ServerOptions, rollkitServerOptions)
-		content = strings.ReplaceAll(content, secondv050DefaultServerOptions, rollkitServerOptions)
-		content = strings.ReplaceAll(content, thirdv050DefaultServerOptions, rollkitServerOptions)
+		// TODO(@julienrbrt): Requires xast to be able to modify function arguments.
+		// modifiers := []xast.Call{
+		// }
+
+		// content, err = xast.ModifyFunction(content, ServerAddCommandsWithStartCmdOptions, modifiers...)
+		// if err != nil {
+		// 	return err
+		// }
 
 		return r.File(genny.NewFileS(cmdPath, content))
 	}
 }
+
+// replaceLegacyAddCommands replaces the legacy `AddCommands` with a temporary `AddCommandsWithStartCmdOptions` boilerplate.
+// Atfterwards, we let the same xast function replace the `AddCommandsWithStartCmdOptions` argument.
+func replaceLegacyAddCommands(content string) string {
+	return strings.Replace(content, "AddCommands(", ServerAddCommandsWithStartCmdOptions+"(", 1)
+}

From faba514a6948509eb62e3058c8153caa11d7dd85 Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Fri, 18 Apr 2025 16:59:58 +0200
Subject: [PATCH 02/21] updates

---
 rollkit/CHANGELOG.md                              | 4 +++-
 rollkit/README.md                                 | 2 +-
 rollkit/template/{boilerplate.go => constants.go} | 6 +++---
 rollkit/template/rollkit.go                       | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)
 rename rollkit/template/{boilerplate.go => constants.go} (65%)

diff --git a/rollkit/CHANGELOG.md b/rollkit/CHANGELOG.md
index ffe87a18..1aa8aea0 100644
--- a/rollkit/CHANGELOG.md
+++ b/rollkit/CHANGELOG.md
@@ -2,8 +2,10 @@
 
 ## Unreleased
 
+## [`v0.3.0`](https://github.com/ignite/apps/releases/tag/rollkit/v0.3.0)
+
 * [#112](https://github.com/ignite/apps/pull/112) Use default command instead cobra commands.
-* []() Upgrade Rollkit to `v1.x` and use [`go-execution-abci`](https://github.com/rollkit/go-execution-abci) instead of [`cosmos-sdk-starter`](https://github.com/rollkit/cosmos-sdk-starter).
+* [#192](https://github.com/ignite/apps/pull/192) Upgrade Rollkit to `v1.x` and use [`go-execution-abci`](https://github.com/rollkit/go-execution-abci) instead of [`cosmos-sdk-starter`](https://github.com/rollkit/cosmos-sdk-starter).
   * Note, if you already have rollkit installed, you need to redo the wiring manually.
 
 ## [`v0.2.1`](https://github.com/ignite/apps/releases/tag/rollkit/v0.2.1)
diff --git a/rollkit/README.md b/rollkit/README.md
index b401913b..b744c35c 100644
--- a/rollkit/README.md
+++ b/rollkit/README.md
@@ -4,7 +4,7 @@ This Ignite App is aimed to extend [Ignite CLI](https://github.com/ignite/cli) a
 
 ## Prerequisites
 
-* Ignite CLI version v28.4.0 or greater.
+* Ignite CLI version v28.9.0 or greater.
 * Knowledge of blockchain development (Cosmos SDK).
 
 ## Usage
diff --git a/rollkit/template/boilerplate.go b/rollkit/template/constants.go
similarity index 65%
rename from rollkit/template/boilerplate.go
rename to rollkit/template/constants.go
index 741debaa..ffcfc6be 100644
--- a/rollkit/template/boilerplate.go
+++ b/rollkit/template/constants.go
@@ -3,9 +3,9 @@ package template
 const (
 	ServerAddCommandsWithStartCmdOptions = "AddCommandsWithStartCmdOptions"
 
-	RollkitV0XStartHandler  = "rollserv.StartHandler"
-	RolltkitV1XStartHandler = "abciserver.StartHandler"
-	RollkitServerOptions    = `server.AddCommandsWithStartCmdOptions(
+	RollkitV0XStartHandler = "rollserv.StartHandler"
+	RollkitV1XStartHandler = "abciserver.StartHandler"
+	RollkitServerOptions   = `server.AddCommandsWithStartCmdOptions(
 			rootCmd,
 			app.DefaultNodeHome,
 			newApp, appExport,
diff --git a/rollkit/template/rollkit.go b/rollkit/template/rollkit.go
index 889c5e5d..8d127187 100644
--- a/rollkit/template/rollkit.go
+++ b/rollkit/template/rollkit.go
@@ -45,7 +45,7 @@ func commandsModify(appPath, binaryName string, version cosmosver.Version) genny
 			return errors.New("rollkit v0.x is already installed. Please remove it before installing rollkit v1.x")
 		}
 
-		if strings.Contains(f.String(), RolltkitV1XStartHandler) {
+		if strings.Contains(f.String(), RollkitV1XStartHandler) {
 			return errors.New("rollkit is already installed.")
 		}
 
@@ -55,7 +55,7 @@ func commandsModify(appPath, binaryName string, version cosmosver.Version) genny
 
 		content, err := xast.AppendImports(
 			f.String(),
-			xast.WithLastNamedImport("abciserver", "github.com/rollkit/go-execution-abci/server"),
+			xast.WithLastNamedImport("abciserver", "github.com/rollkit/go-execution-abci/server"), // TODO(@julienrbrt): Download a specific version via go get beforehand
 		)
 		if err != nil {
 			return err

From f9f1280bccde7504bcaedc8793289c5dea58eecb Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Fri, 18 Apr 2025 17:07:23 +0200
Subject: [PATCH 03/21] updates

---
 rollkit/go.mod                |  2 ++
 rollkit/template/constants.go | 18 ------------------
 rollkit/template/rollkit.go   | 32 +++++++++++++++++++++++---------
 3 files changed, 25 insertions(+), 27 deletions(-)
 delete mode 100644 rollkit/template/constants.go

diff --git a/rollkit/go.mod b/rollkit/go.mod
index 37855649..cae89a2c 100644
--- a/rollkit/go.mod
+++ b/rollkit/go.mod
@@ -2,6 +2,8 @@ module github.com/ignite/apps/rollkit
 
 go 1.23.0
 
+replace github.com/ignite/cli/v28 => ../../cli
+
 require (
 	cosmossdk.io/math v1.5.0
 	github.com/cometbft/cometbft v0.38.17
diff --git a/rollkit/template/constants.go b/rollkit/template/constants.go
deleted file mode 100644
index ffcfc6be..00000000
--- a/rollkit/template/constants.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package template
-
-const (
-	ServerAddCommandsWithStartCmdOptions = "AddCommandsWithStartCmdOptions"
-
-	RollkitV0XStartHandler = "rollserv.StartHandler"
-	RollkitV1XStartHandler = "abciserver.StartHandler"
-	RollkitServerOptions   = `server.AddCommandsWithStartCmdOptions(
-			rootCmd,
-			app.DefaultNodeHome,
-			newApp, appExport,
-			server.StartCmdOptions{
-				AddFlags: func(cmd *cobra.Command) {
-					abciserver.AddFlags(cmd)
-				},
-				StartCommandHandler: abciserver.StartHandler(),
-			})`
-)
diff --git a/rollkit/template/rollkit.go b/rollkit/template/rollkit.go
index 8d127187..dddca4f2 100644
--- a/rollkit/template/rollkit.go
+++ b/rollkit/template/rollkit.go
@@ -32,6 +32,13 @@ func NewRollKitGenerator(chain *chain.Chain) (*genny.Generator, error) {
 	return g, nil
 }
 
+const (
+	ServerAddCommandsWithStartCmdOptions = "server.AddCommandsWithStartCmdOptions"
+
+	RollkitV0XStartHandler = "rollserv.StartHandler"
+	RollkitV1XStartHandler = "abciserver.StartHandler"
+)
+
 // commandsModify modifies the application start to use rollkit.
 func commandsModify(appPath, binaryName string, version cosmosver.Version) genny.RunFn {
 	return func(r *genny.Runner) error {
@@ -64,14 +71,21 @@ func commandsModify(appPath, binaryName string, version cosmosver.Version) genny
 		// replace potential legacy boilerplate present in an ignite v28 chain.
 		content = replaceLegacyAddCommands(content)
 
-		// TODO(@julienrbrt): Requires xast to be able to modify function arguments.
-		// modifiers := []xast.Call{
-		// }
-
-		// content, err = xast.ModifyFunction(content, ServerAddCommandsWithStartCmdOptions, modifiers...)
-		// if err != nil {
-		// 	return err
-		// }
+		// modify the add commands arguments using xast.
+		content, err = xast.ModifyCaller(content, ServerAddCommandsWithStartCmdOptions, func(args []string) ([]string, error) {
+			return []string{
+				"rootCmd",
+				"app.DefaultNodeHome",
+				"newApp",
+				"appExport",
+				`server.StartCmdOptions{
+				AddFlags: func(cmd *cobra.Command) {
+					abciserver.AddFlags(cmd)
+				},
+				StartCommandHandler: abciserver.StartHandler(),
+			})`,
+			}, nil
+		})
 
 		return r.File(genny.NewFileS(cmdPath, content))
 	}
@@ -80,5 +94,5 @@ func commandsModify(appPath, binaryName string, version cosmosver.Version) genny
 // replaceLegacyAddCommands replaces the legacy `AddCommands` with a temporary `AddCommandsWithStartCmdOptions` boilerplate.
 // Atfterwards, we let the same xast function replace the `AddCommandsWithStartCmdOptions` argument.
 func replaceLegacyAddCommands(content string) string {
-	return strings.Replace(content, "AddCommands(", ServerAddCommandsWithStartCmdOptions+"(", 1)
+	return strings.Replace(content, "server.AddCommands(", ServerAddCommandsWithStartCmdOptions+"(", 1)
 }

From fc31302c58f7c1043b2ae2a519bc2fd2482bccdb Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Fri, 18 Apr 2025 17:36:00 +0200
Subject: [PATCH 04/21] fixes

---
 rollkit/go.sum              | 2 --
 rollkit/template/rollkit.go | 8 +++++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/rollkit/go.sum b/rollkit/go.sum
index 71c98daf..3fb0287a 100644
--- a/rollkit/go.sum
+++ b/rollkit/go.sum
@@ -509,8 +509,6 @@ github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmK
 github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI=
 github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/ignite/cli/v28 v28.8.2 h1:35wFZkK9Bs8+GHMat2X37WBYCpbx8kX1DmYQIc7momQ=
-github.com/ignite/cli/v28 v28.8.2/go.mod h1:NQdeVKo3JywfXn2gPwDowWgw0tJdp1bVbKh/L5Dt9/Q=
 github.com/ignite/web v0.6.1 h1:kHG+T7NnR8cCPjAGxEFQD+njVYM08toeG57iYRXzpwo=
 github.com/ignite/web v0.6.1/go.mod h1:WZWBaBYF8RazN7dE462BLpvXDY8ScacxcJ07BKwX/jY=
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
diff --git a/rollkit/template/rollkit.go b/rollkit/template/rollkit.go
index dddca4f2..7f131cd0 100644
--- a/rollkit/template/rollkit.go
+++ b/rollkit/template/rollkit.go
@@ -83,7 +83,7 @@ func commandsModify(appPath, binaryName string, version cosmosver.Version) genny
 					abciserver.AddFlags(cmd)
 				},
 				StartCommandHandler: abciserver.StartHandler(),
-			})`,
+			}`,
 			}, nil
 		})
 
@@ -91,6 +91,12 @@ func commandsModify(appPath, binaryName string, version cosmosver.Version) genny
 	}
 }
 
+// updateDependencies makes sure the correct dependencies are added to the go.mod files.
+// go-execution-abci expects rollkit v1.0 to be used.
+func updateDependencies() error {
+	return nil
+}
+
 // replaceLegacyAddCommands replaces the legacy `AddCommands` with a temporary `AddCommandsWithStartCmdOptions` boilerplate.
 // Atfterwards, we let the same xast function replace the `AddCommandsWithStartCmdOptions` argument.
 func replaceLegacyAddCommands(content string) string {

From eb92ef25f030c82e647210faeec2ada78ba8b9f2 Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Fri, 18 Apr 2025 18:18:16 +0200
Subject: [PATCH 05/21] add dependency update

---
 rollkit/template/constants.go | 16 ++++++++++++++
 rollkit/template/rollkit.go   | 40 ++++++++++++++++++++++++++---------
 2 files changed, 46 insertions(+), 10 deletions(-)
 create mode 100644 rollkit/template/constants.go

diff --git a/rollkit/template/constants.go b/rollkit/template/constants.go
new file mode 100644
index 00000000..7a4eef00
--- /dev/null
+++ b/rollkit/template/constants.go
@@ -0,0 +1,16 @@
+package template
+
+const (
+	ServerAddCommandsWithStartCmdOptions = "server.AddCommandsWithStartCmdOptions"
+
+	RollkitV0XStartHandler = "rollserv.StartHandler"
+	RollkitV1XStartHandler = "abciserver.StartHandler"
+)
+
+const (
+	GoExecPackage = "github.com/rollkit/go-execution-abci"
+	GoExecVersion = "b266d3e0af4c9f0e95310443cdf69cc50036fcf4" // TODO(@julienrbrt): use tag when available
+
+	RollkitPackage = "github.com/rollkit/rollkit"
+	RollkitVersion = "455e945472d64b16a253f4818070973f716bcdb4" // TODO(@julienrbrt): use tag when available
+)
diff --git a/rollkit/template/rollkit.go b/rollkit/template/rollkit.go
index 7f131cd0..f2acfee3 100644
--- a/rollkit/template/rollkit.go
+++ b/rollkit/template/rollkit.go
@@ -1,6 +1,8 @@
 package template
 
 import (
+	"fmt"
+	"os"
 	"path/filepath"
 	"strings"
 
@@ -9,6 +11,7 @@ import (
 
 	"github.com/ignite/cli/v28/ignite/pkg/cosmosver"
 	"github.com/ignite/cli/v28/ignite/pkg/errors"
+	"github.com/ignite/cli/v28/ignite/pkg/gomodule"
 	"github.com/ignite/cli/v28/ignite/pkg/xast"
 	"github.com/ignite/cli/v28/ignite/pkg/xgenny"
 	"github.com/ignite/cli/v28/ignite/services/chain"
@@ -27,17 +30,16 @@ func NewRollKitGenerator(chain *chain.Chain) (*genny.Generator, error) {
 		return nil, err
 	}
 
-	g.RunFn(commandsModify(chain.AppPath(), binaryName, chain.Version))
+	appPath := chain.AppPath()
 
-	return g, nil
-}
+	if err := updateDependencies(appPath); err != nil {
+		return nil, fmt.Errorf("failed to update go.mod: %w", err)
+	}
 
-const (
-	ServerAddCommandsWithStartCmdOptions = "server.AddCommandsWithStartCmdOptions"
+	g.RunFn(commandsModify(appPath, binaryName, chain.Version))
 
-	RollkitV0XStartHandler = "rollserv.StartHandler"
-	RollkitV1XStartHandler = "abciserver.StartHandler"
-)
+	return g, nil
+}
 
 // commandsModify modifies the application start to use rollkit.
 func commandsModify(appPath, binaryName string, version cosmosver.Version) genny.RunFn {
@@ -93,8 +95,26 @@ func commandsModify(appPath, binaryName string, version cosmosver.Version) genny
 
 // updateDependencies makes sure the correct dependencies are added to the go.mod files.
 // go-execution-abci expects rollkit v1.0 to be used.
-func updateDependencies() error {
-	return nil
+func updateDependencies(appPath string) error {
+	gomod, err := gomodule.ParseAt(appPath)
+	if err != nil {
+		return fmt.Errorf("failed to parse go.mod: %w", err)
+	}
+
+	gomod.AddNewRequire(GoExecPackage, GoExecVersion, false)
+	gomod.AddNewRequire(RollkitPackage, RollkitVersion, true)
+
+	// temporarily add a replace for rollkit
+	// it can be removed once we have a tag
+	gomod.AddReplace(RollkitPackage, "", RollkitPackage, RollkitVersion)
+
+	// save go.mod
+	data, err := gomod.Format()
+	if err != nil {
+		return fmt.Errorf("failed to format go.mod: %w", err)
+	}
+
+	return os.WriteFile(filepath.Join(appPath, "go.mod"), data, 0o644)
 }
 
 // replaceLegacyAddCommands replaces the legacy `AddCommands` with a temporary `AddCommandsWithStartCmdOptions` boilerplate.

From 823652a235f59c2dfa4a5b180e59fd08b68312e8 Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Tue, 22 Apr 2025 10:03:46 +0200
Subject: [PATCH 06/21] bump tag

---
 rollkit/template/constants.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rollkit/template/constants.go b/rollkit/template/constants.go
index 7a4eef00..533308cc 100644
--- a/rollkit/template/constants.go
+++ b/rollkit/template/constants.go
@@ -12,5 +12,5 @@ const (
 	GoExecVersion = "b266d3e0af4c9f0e95310443cdf69cc50036fcf4" // TODO(@julienrbrt): use tag when available
 
 	RollkitPackage = "github.com/rollkit/rollkit"
-	RollkitVersion = "455e945472d64b16a253f4818070973f716bcdb4" // TODO(@julienrbrt): use tag when available
+	RollkitVersion = "27d0737c9ced624b478d17e7d623831d51b76b81" // TODO(@julienrbrt): use tag when available
 )

From cb3e1f5c8c41f2518e820478c1d3cd5b5a990ed1 Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Tue, 22 Apr 2025 17:48:18 +0200
Subject: [PATCH 07/21] bump ignite with new api

---
 rollkit/go.mod                | 4 +---
 rollkit/go.sum                | 2 ++
 rollkit/template/constants.go | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rollkit/go.mod b/rollkit/go.mod
index cae89a2c..b4a10431 100644
--- a/rollkit/go.mod
+++ b/rollkit/go.mod
@@ -2,8 +2,6 @@ module github.com/ignite/apps/rollkit
 
 go 1.23.0
 
-replace github.com/ignite/cli/v28 => ../../cli
-
 require (
 	cosmossdk.io/math v1.5.0
 	github.com/cometbft/cometbft v0.38.17
@@ -11,7 +9,7 @@ require (
 	github.com/gobuffalo/genny/v2 v2.1.0
 	github.com/gobuffalo/plush/v4 v4.1.19
 	github.com/hashicorp/go-plugin v1.6.1
-	github.com/ignite/cli/v28 v28.8.2
+	github.com/ignite/cli/v28 v28.9.0
 	github.com/stretchr/testify v1.10.0
 )
 
diff --git a/rollkit/go.sum b/rollkit/go.sum
index 3fb0287a..fced4242 100644
--- a/rollkit/go.sum
+++ b/rollkit/go.sum
@@ -509,6 +509,8 @@ github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmK
 github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI=
 github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/ignite/cli/v28 v28.9.0 h1:+lyF++nEZQcTuTE6UJVvIq+xV0yCdAqUTE/GK112WcI=
+github.com/ignite/cli/v28 v28.9.0/go.mod h1:NQdeVKo3JywfXn2gPwDowWgw0tJdp1bVbKh/L5Dt9/Q=
 github.com/ignite/web v0.6.1 h1:kHG+T7NnR8cCPjAGxEFQD+njVYM08toeG57iYRXzpwo=
 github.com/ignite/web v0.6.1/go.mod h1:WZWBaBYF8RazN7dE462BLpvXDY8ScacxcJ07BKwX/jY=
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
diff --git a/rollkit/template/constants.go b/rollkit/template/constants.go
index 533308cc..850b5b2a 100644
--- a/rollkit/template/constants.go
+++ b/rollkit/template/constants.go
@@ -12,5 +12,5 @@ const (
 	GoExecVersion = "b266d3e0af4c9f0e95310443cdf69cc50036fcf4" // TODO(@julienrbrt): use tag when available
 
 	RollkitPackage = "github.com/rollkit/rollkit"
-	RollkitVersion = "27d0737c9ced624b478d17e7d623831d51b76b81" // TODO(@julienrbrt): use tag when available
+	RollkitVersion = "9f2f92ea5c6e6f6db27378386e0942807739fb06" // TODO(@julienrbrt): use tag when available
 )

From 42664a8eda1fd29692066509d340f88469f55ecf Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Tue, 22 Apr 2025 17:50:54 +0200
Subject: [PATCH 08/21] use pseudo versions

---
 rollkit/template/constants.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rollkit/template/constants.go b/rollkit/template/constants.go
index 850b5b2a..82524db8 100644
--- a/rollkit/template/constants.go
+++ b/rollkit/template/constants.go
@@ -9,8 +9,8 @@ const (
 
 const (
 	GoExecPackage = "github.com/rollkit/go-execution-abci"
-	GoExecVersion = "b266d3e0af4c9f0e95310443cdf69cc50036fcf4" // TODO(@julienrbrt): use tag when available
+	GoExecVersion = "v0.2.1-0.20250422085442-d1b2d35accb1" // TODO(@julienrbrt): use tag when available
 
 	RollkitPackage = "github.com/rollkit/rollkit"
-	RollkitVersion = "9f2f92ea5c6e6f6db27378386e0942807739fb06" // TODO(@julienrbrt): use tag when available
+	RollkitVersion = "v0.14.2-0.20250422111549-9f2f92ea5c6e" // TODO(@julienrbrt): use tag when available
 )

From 1f808018f3619d5313d0a421269db7575e6fbd0f Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Tue, 22 Apr 2025 18:15:30 +0200
Subject: [PATCH 09/21] fix test

---
 rollkit/integration/app_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rollkit/integration/app_test.go b/rollkit/integration/app_test.go
index 59c47caa..35f541bc 100644
--- a/rollkit/integration/app_test.go
+++ b/rollkit/integration/app_test.go
@@ -67,7 +67,7 @@ func TestRollkit(t *testing.T) {
 		)),
 	))
 
-	if !strings.Contains(buf.String(), "--rollkit.da_") {
+	if !strings.Contains(buf.String(), "--rollkit.da") {
 		t.Errorf("rollkitd doesn't contain --rollkit flags: %s", buf.String())
 	}
 

From 2957de0bfd4df259c415048265020b89d273968a Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Tue, 22 Apr 2025 18:56:13 +0200
Subject: [PATCH 10/21] update readme and prep for genesis command update

---
 rollkit/README.md           | 15 ++++++++++++
 rollkit/cmd/init.go         |  1 +
 rollkit/template/rollkit.go | 46 +++++++++++++++++++++++++++++++++----
 3 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/rollkit/README.md b/rollkit/README.md
index b744c35c..2f40ff77 100644
--- a/rollkit/README.md
+++ b/rollkit/README.md
@@ -18,6 +18,21 @@ ignite chain build
 ignite rollkit init
 ```
 
+Then start `local-da` or use Celestia mainnet as data availability layer.
+
+```sh
+# go install github.com/rollkit/rollkit/da/cmd/local-da@latest
+git clone github.com/rollkit/rollkit --depth 1
+cd rollkit/da/cmd/local-da
+go run .
+```
+
+Finally, run the rollup node:
+
+```sh
+gmd start --rollkit.node.aggregator
+```
+
 Learn more about Rollkit and Ignite in their respective documentation:
 
 * <https://docs.ignite.com>
diff --git a/rollkit/cmd/init.go b/rollkit/cmd/init.go
index b91843b1..301090b6 100644
--- a/rollkit/cmd/init.go
+++ b/rollkit/cmd/init.go
@@ -13,6 +13,7 @@ import (
 	cmttypes "github.com/cometbft/cometbft/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
+
 	configchain "github.com/ignite/cli/v28/ignite/config/chain"
 	"github.com/ignite/cli/v28/ignite/pkg/cliui"
 	"github.com/ignite/cli/v28/ignite/pkg/cliui/colors"
diff --git a/rollkit/template/rollkit.go b/rollkit/template/rollkit.go
index f2acfee3..cffe10f6 100644
--- a/rollkit/template/rollkit.go
+++ b/rollkit/template/rollkit.go
@@ -36,13 +36,14 @@ func NewRollKitGenerator(chain *chain.Chain) (*genny.Generator, error) {
 		return nil, fmt.Errorf("failed to update go.mod: %w", err)
 	}
 
-	g.RunFn(commandsModify(appPath, binaryName, chain.Version))
+	g.RunFn(commandsStartModify(appPath, binaryName, chain.Version))
+	g.RunFn(commandsGenesisModify(appPath, binaryName))
 
 	return g, nil
 }
 
-// commandsModify modifies the application start to use rollkit.
-func commandsModify(appPath, binaryName string, version cosmosver.Version) genny.RunFn {
+// commandsStartModify modifies the application start to use rollkit.
+func commandsStartModify(appPath, binaryName string, version cosmosver.Version) genny.RunFn {
 	return func(r *genny.Runner) error {
 		cmdPath := filepath.Join(appPath, "cmd", binaryName, "cmd/commands.go")
 		f, err := r.Disk.Find(cmdPath)
@@ -64,7 +65,7 @@ func commandsModify(appPath, binaryName string, version cosmosver.Version) genny
 
 		content, err := xast.AppendImports(
 			f.String(),
-			xast.WithLastNamedImport("abciserver", "github.com/rollkit/go-execution-abci/server"), // TODO(@julienrbrt): Download a specific version via go get beforehand
+			xast.WithLastNamedImport("abciserver", "github.com/rollkit/go-execution-abci/server"),
 		)
 		if err != nil {
 			return err
@@ -93,6 +94,40 @@ func commandsModify(appPath, binaryName string, version cosmosver.Version) genny
 	}
 }
 
+// commandsGenesisModify modifies the application genesis command to use rollkit.
+func commandsGenesisModify(appPath, binaryName string) genny.RunFn {
+	return func(r *genny.Runner) error {
+		cmdPath := filepath.Join(appPath, "cmd", binaryName, "cmd/commands.go")
+		f, err := r.Disk.Find(cmdPath)
+		if err != nil {
+			return err
+		}
+
+		content, err := xast.AppendImports(
+			f.String(),
+			xast.WithLastNamedImport("rollconf", "github.com/rollkit/rollkit/pkg/config"),
+		)
+		if err != nil {
+			return err
+		}
+
+		// TODO add the following boilerplate
+
+		// update genesis command to use rollkit (only useful when not using `ignite rollkit init``)
+		// genesisCmd := genutilcli.InitCmd(basicManager, app.DefaultNodeHome)
+		// rollconf.AddFlags(genesisCmd)
+		// genesisCmdRunE := genesisCmd.RunE
+		// genesisCmd.RunE = func(cmd *cobra.Command, args []string) error {
+		// 	if err := genesisCmdRunE(cmd, args); err != nil {
+		// 		return err
+		// 	}
+		// 	return abciserver.InitRunE(cmd, args)
+		// }
+
+		return r.File(genny.NewFileS(cmdPath, content))
+	}
+}
+
 // updateDependencies makes sure the correct dependencies are added to the go.mod files.
 // go-execution-abci expects rollkit v1.0 to be used.
 func updateDependencies(appPath string) error {
@@ -102,11 +137,12 @@ func updateDependencies(appPath string) error {
 	}
 
 	gomod.AddNewRequire(GoExecPackage, GoExecVersion, false)
-	gomod.AddNewRequire(RollkitPackage, RollkitVersion, true)
+	gomod.AddNewRequire(RollkitPackage, RollkitVersion, false)
 
 	// temporarily add a replace for rollkit
 	// it can be removed once we have a tag
 	gomod.AddReplace(RollkitPackage, "", RollkitPackage, RollkitVersion)
+	gomod.AddReplace(GoExecPackage, "", GoExecPackage, RollkitVersion)
 
 	// save go.mod
 	data, err := gomod.Format()

From 53da8851ded044fffea5d48926ff5af42aa20a5e Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Wed, 23 Apr 2025 02:57:15 +0200
Subject: [PATCH 11/21] updates

---
 rollkit/template/rollkit.go | 40 ++++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/rollkit/template/rollkit.go b/rollkit/template/rollkit.go
index cffe10f6..469f7407 100644
--- a/rollkit/template/rollkit.go
+++ b/rollkit/template/rollkit.go
@@ -106,23 +106,39 @@ func commandsGenesisModify(appPath, binaryName string) genny.RunFn {
 		content, err := xast.AppendImports(
 			f.String(),
 			xast.WithLastNamedImport("rollconf", "github.com/rollkit/rollkit/pkg/config"),
+			xast.WithLastNamedImport("abciserver", "github.com/rollkit/go-execution-abci/server"),
+		)
+		if err != nil {
+			return err
+		}
+
+		// use ast to modify the function that initializes genesisCmd
+		content, err = xast.ModifyFunction(content, "initRootCmd",
+			xast.AppendFuncAtLine(`
+		genesisCmd := genutilcli.InitCmd(basicManager, app.DefaultNodeHome)
+		rollconf.AddFlags(genesisCmd)
+		genesisCmdRunE := genesisCmd.RunE
+		genesisCmd.RunE = func(cmd *cobra.Command, args []string) error {
+		    if err := genesisCmdRunE(cmd, args); err != nil {
+		        return err
+		    }
+		    return abciserver.InitRunE(cmd, args)
+		}
+		        `,
+				1),
 		)
 		if err != nil {
 			return err
 		}
 
-		// TODO add the following boilerplate
-
-		// update genesis command to use rollkit (only useful when not using `ignite rollkit init``)
-		// genesisCmd := genutilcli.InitCmd(basicManager, app.DefaultNodeHome)
-		// rollconf.AddFlags(genesisCmd)
-		// genesisCmdRunE := genesisCmd.RunE
-		// genesisCmd.RunE = func(cmd *cobra.Command, args []string) error {
-		// 	if err := genesisCmdRunE(cmd, args); err != nil {
-		// 		return err
-		// 	}
-		// 	return abciserver.InitRunE(cmd, args)
-		// }
+		// modify the add commands arguments using xast.
+		content, err = xast.ModifyCaller(content, "rootCmd.AddCommand", func(args []string) ([]string, error) {
+			if strings.Contains(args[0], "InitCmd") {
+				args[0] = "genesisCmd"
+			}
+
+			return args, nil
+		})
 
 		return r.File(genny.NewFileS(cmdPath, content))
 	}

From 6f838cedd685b134cef1f9c4ee0299fc97497d74 Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Wed, 23 Apr 2025 17:42:00 +0200
Subject: [PATCH 12/21] fixes

---
 rollkit/cmd/add.go            | 2 ++
 rollkit/template/constants.go | 4 ++--
 rollkit/template/rollkit.go   | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/rollkit/cmd/add.go b/rollkit/cmd/add.go
index 3b41661a..ff71072e 100644
--- a/rollkit/cmd/add.go
+++ b/rollkit/cmd/add.go
@@ -59,11 +59,13 @@ func AddHandler(ctx context.Context, cmd *plugin.ExecutedCommand) error {
 
 // finish finalize the scaffolded code (formating, dependencies).
 func finish(ctx context.Context, session *cliui.Session, path string) error {
+	session.StopSpinner()
 	session.StartSpinner("go mod tidy...")
 	if err := gocmd.ModTidy(ctx, path); err != nil {
 		return err
 	}
 
+	session.StopSpinner()
 	session.StartSpinner("Formatting code...")
 	if err := gocmd.Fmt(ctx, path); err != nil {
 		return err
diff --git a/rollkit/template/constants.go b/rollkit/template/constants.go
index 82524db8..318cd0b8 100644
--- a/rollkit/template/constants.go
+++ b/rollkit/template/constants.go
@@ -9,8 +9,8 @@ const (
 
 const (
 	GoExecPackage = "github.com/rollkit/go-execution-abci"
-	GoExecVersion = "v0.2.1-0.20250422085442-d1b2d35accb1" // TODO(@julienrbrt): use tag when available
+	GoExecVersion = "v0.2.1-0.20250423084551-59072faf8f18" // TODO(@julienrbrt): use tag when available
 
 	RollkitPackage = "github.com/rollkit/rollkit"
-	RollkitVersion = "v0.14.2-0.20250422111549-9f2f92ea5c6e" // TODO(@julienrbrt): use tag when available
+	RollkitVersion = "v0.14.2-0.20250423102443-62dd136ae02e" // TODO(@julienrbrt): use tag when available
 )
diff --git a/rollkit/template/rollkit.go b/rollkit/template/rollkit.go
index 469f7407..6f7ff592 100644
--- a/rollkit/template/rollkit.go
+++ b/rollkit/template/rollkit.go
@@ -125,7 +125,7 @@ func commandsGenesisModify(appPath, binaryName string) genny.RunFn {
 		    return abciserver.InitRunE(cmd, args)
 		}
 		        `,
-				1),
+				0),
 		)
 		if err != nil {
 			return err
@@ -158,7 +158,7 @@ func updateDependencies(appPath string) error {
 	// temporarily add a replace for rollkit
 	// it can be removed once we have a tag
 	gomod.AddReplace(RollkitPackage, "", RollkitPackage, RollkitVersion)
-	gomod.AddReplace(GoExecPackage, "", GoExecPackage, RollkitVersion)
+	gomod.AddReplace(GoExecPackage, "", GoExecPackage, GoExecVersion)
 
 	// save go.mod
 	data, err := gomod.Format()

From 88e15967642ca9b0f5569648e0a8113a0c1f17b4 Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Thu, 24 Apr 2025 16:07:04 +0200
Subject: [PATCH 13/21] go mod tidy

---
 rollkit/go.mod | 2 +-
 rollkit/go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rollkit/go.mod b/rollkit/go.mod
index b4a10431..2db1c487 100644
--- a/rollkit/go.mod
+++ b/rollkit/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/gobuffalo/genny/v2 v2.1.0
 	github.com/gobuffalo/plush/v4 v4.1.19
 	github.com/hashicorp/go-plugin v1.6.1
-	github.com/ignite/cli/v28 v28.9.0
+	github.com/ignite/cli/v28 v28.10.0
 	github.com/stretchr/testify v1.10.0
 )
 
diff --git a/rollkit/go.sum b/rollkit/go.sum
index fced4242..4207d1d3 100644
--- a/rollkit/go.sum
+++ b/rollkit/go.sum
@@ -509,8 +509,8 @@ github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmK
 github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI=
 github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/ignite/cli/v28 v28.9.0 h1:+lyF++nEZQcTuTE6UJVvIq+xV0yCdAqUTE/GK112WcI=
-github.com/ignite/cli/v28 v28.9.0/go.mod h1:NQdeVKo3JywfXn2gPwDowWgw0tJdp1bVbKh/L5Dt9/Q=
+github.com/ignite/cli/v28 v28.10.0 h1:/qhdqhYbNEYuZeslU5DILksNDfWw5FGZQpn0zQq3SY0=
+github.com/ignite/cli/v28 v28.10.0/go.mod h1:T2GMEMO2izmLg9PDdsrJ8u0YwZmBXy1Xnbg0W917HPQ=
 github.com/ignite/web v0.6.1 h1:kHG+T7NnR8cCPjAGxEFQD+njVYM08toeG57iYRXzpwo=
 github.com/ignite/web v0.6.1/go.mod h1:WZWBaBYF8RazN7dE462BLpvXDY8ScacxcJ07BKwX/jY=
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=

From fc2527110c0f977319e6be378405cc6359371cbe Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Thu, 24 Apr 2025 16:08:13 +0200
Subject: [PATCH 14/21] updates

---
 rollkit/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rollkit/README.md b/rollkit/README.md
index 2f40ff77..7aa8bb11 100644
--- a/rollkit/README.md
+++ b/rollkit/README.md
@@ -12,7 +12,7 @@ This Ignite App is aimed to extend [Ignite CLI](https://github.com/ignite/cli) a
 ```sh
 ignite s chain gm --address-prefix gm --minimal
 cd gm
-ignite app install -g github.com/ignite/apps/rollkit@rollkit/v0.2.1
+ignite app install -g github.com/ignite/apps/rollkit@latest
 ignite rollkit add
 ignite chain build
 ignite rollkit init

From 9d51c52305be37356a1ecadab8733b77842e1c37 Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Thu, 24 Apr 2025 17:05:34 +0200
Subject: [PATCH 15/21] bump commit

---
 rollkit/template/constants.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rollkit/template/constants.go b/rollkit/template/constants.go
index 318cd0b8..f2d4d899 100644
--- a/rollkit/template/constants.go
+++ b/rollkit/template/constants.go
@@ -9,7 +9,7 @@ const (
 
 const (
 	GoExecPackage = "github.com/rollkit/go-execution-abci"
-	GoExecVersion = "v0.2.1-0.20250423084551-59072faf8f18" // TODO(@julienrbrt): use tag when available
+	GoExecVersion = "v0.2.1-0.20250424150026-b82d5e904bb8" // TODO(@julienrbrt): use tag when available
 
 	RollkitPackage = "github.com/rollkit/rollkit"
 	RollkitVersion = "v0.14.2-0.20250423102443-62dd136ae02e" // TODO(@julienrbrt): use tag when available

From 89f97967b48f5b882e6d825dcb3d14d0669af123 Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Sun, 27 Apr 2025 10:11:40 +0200
Subject: [PATCH 16/21] feedback

---
 rollkit/template/rollkit.go | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/rollkit/template/rollkit.go b/rollkit/template/rollkit.go
index 6f7ff592..d92e189e 100644
--- a/rollkit/template/rollkit.go
+++ b/rollkit/template/rollkit.go
@@ -1,7 +1,6 @@
 package template
 
 import (
-	"fmt"
 	"os"
 	"path/filepath"
 	"strings"
@@ -33,7 +32,7 @@ func NewRollKitGenerator(chain *chain.Chain) (*genny.Generator, error) {
 	appPath := chain.AppPath()
 
 	if err := updateDependencies(appPath); err != nil {
-		return nil, fmt.Errorf("failed to update go.mod: %w", err)
+		return nil, errors.Errorf("failed to update go.mod: %w", err)
 	}
 
 	g.RunFn(commandsStartModify(appPath, binaryName, chain.Version))
@@ -149,7 +148,7 @@ func commandsGenesisModify(appPath, binaryName string) genny.RunFn {
 func updateDependencies(appPath string) error {
 	gomod, err := gomodule.ParseAt(appPath)
 	if err != nil {
-		return fmt.Errorf("failed to parse go.mod: %w", err)
+		return errors.Errorf("failed to parse go.mod: %w", err)
 	}
 
 	gomod.AddNewRequire(GoExecPackage, GoExecVersion, false)
@@ -163,7 +162,7 @@ func updateDependencies(appPath string) error {
 	// save go.mod
 	data, err := gomod.Format()
 	if err != nil {
-		return fmt.Errorf("failed to format go.mod: %w", err)
+		return errors.Errorf("failed to format go.mod: %w", err)
 	}
 
 	return os.WriteFile(filepath.Join(appPath, "go.mod"), data, 0o644)

From 1aa87d85ac0664cdeeaa41a6aa03428163fc708f Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Tue, 6 May 2025 15:37:19 +0200
Subject: [PATCH 17/21] latest tag

---
 rollkit/template/constants.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rollkit/template/constants.go b/rollkit/template/constants.go
index f2d4d899..194cd23d 100644
--- a/rollkit/template/constants.go
+++ b/rollkit/template/constants.go
@@ -9,8 +9,8 @@ const (
 
 const (
 	GoExecPackage = "github.com/rollkit/go-execution-abci"
-	GoExecVersion = "v0.2.1-0.20250424150026-b82d5e904bb8" // TODO(@julienrbrt): use tag when available
+	GoExecVersion = "v0.2.1-0.20250506104644-8cfcda881d20" // TODO(@julienrbrt): use tag when available
 
 	RollkitPackage = "github.com/rollkit/rollkit"
-	RollkitVersion = "v0.14.2-0.20250423102443-62dd136ae02e" // TODO(@julienrbrt): use tag when available
+	RollkitVersion = "v0.14.2-0.20250506085607-c574d7c79224" // TODO(@julienrbrt): use tag when available
 )

From afaf7cf165d0b18c4295168ad9cd1b6a8753c946 Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Tue, 6 May 2025 15:38:08 +0200
Subject: [PATCH 18/21] faster setup

---
 rollkit/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rollkit/README.md b/rollkit/README.md
index 7aa8bb11..41d21d88 100644
--- a/rollkit/README.md
+++ b/rollkit/README.md
@@ -10,11 +10,11 @@ This Ignite App is aimed to extend [Ignite CLI](https://github.com/ignite/cli) a
 ## Usage
 
 ```sh
-ignite s chain gm --address-prefix gm --minimal
+ignite s chain gm --address-prefix gm --minimal --no-module
 cd gm
 ignite app install -g github.com/ignite/apps/rollkit@latest
 ignite rollkit add
-ignite chain build
+ignite chain build --skip-proto
 ignite rollkit init
 ```
 

From 26cf5cf3d7d0d014cf45c05f90e5c611967f5591 Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Tue, 6 May 2025 15:41:22 +0200
Subject: [PATCH 19/21] Revert "latest tag"

This reverts commit 1aa87d85ac0664cdeeaa41a6aa03428163fc708f.
---
 rollkit/template/constants.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rollkit/template/constants.go b/rollkit/template/constants.go
index 194cd23d..f2d4d899 100644
--- a/rollkit/template/constants.go
+++ b/rollkit/template/constants.go
@@ -9,8 +9,8 @@ const (
 
 const (
 	GoExecPackage = "github.com/rollkit/go-execution-abci"
-	GoExecVersion = "v0.2.1-0.20250506104644-8cfcda881d20" // TODO(@julienrbrt): use tag when available
+	GoExecVersion = "v0.2.1-0.20250424150026-b82d5e904bb8" // TODO(@julienrbrt): use tag when available
 
 	RollkitPackage = "github.com/rollkit/rollkit"
-	RollkitVersion = "v0.14.2-0.20250506085607-c574d7c79224" // TODO(@julienrbrt): use tag when available
+	RollkitVersion = "v0.14.2-0.20250423102443-62dd136ae02e" // TODO(@julienrbrt): use tag when available
 )

From 8dc24c9585058ac1b80ba1d3705f041d4d4a4639 Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Wed, 7 May 2025 15:12:07 +0200
Subject: [PATCH 20/21] use latest tag

---
 rollkit/template/constants.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rollkit/template/constants.go b/rollkit/template/constants.go
index f2d4d899..95de6f8a 100644
--- a/rollkit/template/constants.go
+++ b/rollkit/template/constants.go
@@ -9,8 +9,8 @@ const (
 
 const (
 	GoExecPackage = "github.com/rollkit/go-execution-abci"
-	GoExecVersion = "v0.2.1-0.20250424150026-b82d5e904bb8" // TODO(@julienrbrt): use tag when available
+	GoExecVersion = "v0.14.2-0.20250506155912-dccebc0cab3e" // TODO(@julienrbrt): use tag when available
 
 	RollkitPackage = "github.com/rollkit/rollkit"
-	RollkitVersion = "v0.14.2-0.20250423102443-62dd136ae02e" // TODO(@julienrbrt): use tag when available
+	RollkitVersion = "v0.14.2-0.20250506085607-c574d7c79224" // TODO(@julienrbrt): use tag when available
 )

From 6df1530c06cd6c19f74f85c3b6c428ca449d6f4d Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Wed, 7 May 2025 15:20:36 +0200
Subject: [PATCH 21/21] typo

---
 rollkit/template/constants.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rollkit/template/constants.go b/rollkit/template/constants.go
index 95de6f8a..1e942172 100644
--- a/rollkit/template/constants.go
+++ b/rollkit/template/constants.go
@@ -9,7 +9,7 @@ const (
 
 const (
 	GoExecPackage = "github.com/rollkit/go-execution-abci"
-	GoExecVersion = "v0.14.2-0.20250506155912-dccebc0cab3e" // TODO(@julienrbrt): use tag when available
+	GoExecVersion = "v0.2.1-0.20250507114132-4abb42ac7c60" // TODO(@julienrbrt): use tag when available
 
 	RollkitPackage = "github.com/rollkit/rollkit"
 	RollkitVersion = "v0.14.2-0.20250506085607-c574d7c79224" // TODO(@julienrbrt): use tag when available