Merge remote-tracking branch 'origin/main' into feat/new-simple-spinner

# Conflicts: # go.mod # go.sum
ignite · Feb 25, 2025 · 886b334 · 886b334
2 parents 12803d9 + a126f68
commit 886b334
Show file tree

Hide file tree

Showing 25 changed files with 47 additions and 217 deletions.
diff --git a/.github/ISSUE_TEMPLATE/release-tracker.md b/.github/ISSUE_TEMPLATE/release-tracker.md
@@ -42,7 +42,6 @@ versions of cli to guarantee that no regression is introduced -->
 - [ ] Update [`changelog.md`](https://github.com/ignite/cli/blob/main/changelog.md)
 - [ ] Update [`readme.md](https://github.com/ignite/cli/blob/main/readme.md):
   - [ ] Version matrix.
-  - [ ] Link to Gitpod with a URL to the newly released stable version.
 - [ ] Update docs site:
   - [ ] Add new release tag to [`docs/versioned_docs`](https://github.com/ignite/cli/tree/main/docs/versioned_docs).
 - [ ] After changes to docs site are deployed, check [docs.ignite.com/](https://docs.ignite.com/) is updated.

diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
diff --git a/.gitpod.yml b/.gitpod.yml
diff --git a/.gitpod/readme.md b/.gitpod/readme.md
diff --git a/changelog.md b/changelog.md
@@ -50,6 +50,7 @@
 - [#4361](https://github.com/ignite/cli/pull/4361) Remove unused `KeyPrefix` method
 - [#4384](https://github.com/ignite/cli/pull/4384) Compare genesis params into chain genesis tests
 - [#4463](https://github.com/ignite/cli/pull/4463) Run `chain simulation` with any simulation test case
+- [#4533](https://github.com/ignite/cli/pull/4533) Promote GitHub codespace instead of Gitpod
 
 ### Fixes
 
@@ -76,6 +77,7 @@
 - [#4474](https://github.com/ignite/cli/pull/4474) Fix issue in `build --release` command
 - [#4479](https://github.com/ignite/cli/pull/4479) Scaffold an `uint64 type crashs Ignite
 - [#4483](https://github.com/ignite/cli/pull/4483) Fix default flag parser for apps
+- [#4532](https://github.com/ignite/cli/pull/4532) Fix non working _shortcuts_ in validator home config
 
 ## [`v28.7.0`](https://github.com/ignite/cli/releases/tag/v28.7.0)
 

diff --git a/docs/docs/01-welcome/02-install.md b/docs/docs/01-welcome/02-install.md
@@ -5,8 +5,7 @@ description: Steps to install Ignite CLI on your local computer.
 
 # Install Ignite CLI
 
-You can run [Ignite CLI](https://github.com/ignite/cli) in a web-based Gitpod IDE or you can install Ignite CLI on your
-local computer.
+You can run [Ignite CLI](https://github.com/ignite/cli) in a web-based IDE or you can install Ignite CLI on your local computer.
 
 ## Prerequisites
 

diff --git a/go.mod b/go.mod
@@ -4,6 +4,7 @@ go 1.23.6
 
 require (
 	cosmossdk.io/math v1.5.0
+	dario.cat/mergo v1.0.1
 	github.com/99designs/keyring v1.2.2
 	github.com/AlecAivazis/survey/v2 v2.3.7
 	github.com/DATA-DOG/go-sqlmock v1.5.2
@@ -42,7 +43,6 @@ require (
 	github.com/hashicorp/go-plugin v1.6.3
 	github.com/iancoleman/strcase v0.3.0
 	github.com/ignite/web v0.6.1
-	github.com/imdario/mergo v0.3.15
 	github.com/lib/pq v1.10.9
 	github.com/manifoldco/promptui v0.9.0
 	github.com/mitchellh/mapstructure v1.5.0
@@ -94,7 +94,6 @@ require (
 	cosmossdk.io/log v1.4.1 // indirect
 	cosmossdk.io/store v1.1.1 // indirect
 	cosmossdk.io/x/tx v0.13.7 // indirect
-	dario.cat/mergo v1.0.1 // indirect
 	filippo.io/edwards25519 v1.0.0 // indirect
 	github.com/4meepo/tagalign v1.4.1 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
@@ -295,6 +294,7 @@ require (
 	github.com/hexops/gotextdiff v1.0.3 // indirect
 	github.com/huandu/skiplist v1.2.0 // indirect
 	github.com/huandu/xstrings v1.4.0 // indirect
+	github.com/imdario/mergo v0.3.15 // indirect
 	github.com/improbable-eng/grpc-web v0.15.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect

diff --git a/ignite/cmd/cmd.go b/ignite/cmd/cmd.go
@@ -18,7 +18,6 @@ import (
 	uilog "github.com/ignite/cli/v29/ignite/pkg/cliui/log"
 	"github.com/ignite/cli/v29/ignite/pkg/dircache"
 	"github.com/ignite/cli/v29/ignite/pkg/errors"
-	"github.com/ignite/cli/v29/ignite/pkg/gitpod"
 	"github.com/ignite/cli/v29/ignite/pkg/goenv"
 	"github.com/ignite/cli/v29/ignite/pkg/gomodulepath"
 	"github.com/ignite/cli/v29/ignite/version"
@@ -259,10 +258,6 @@ func deprecated() []*cobra.Command {
 }
 
 func checkNewVersion(cmd *cobra.Command) {
-	if gitpod.IsOnGitpod() {
-		return
-	}
-
 	ctx, cancel := context.WithTimeout(cmd.Context(), checkVersionTimeout)
 	defer cancel()
 

diff --git a/ignite/config/chain/base/config.go b/ignite/config/chain/base/config.go
@@ -1,7 +1,7 @@
 package base
 
 import (
-	"github.com/imdario/mergo"
+	"dario.cat/mergo"
 
 	"github.com/ignite/cli/v29/ignite/config/chain/defaults"
 	"github.com/ignite/cli/v29/ignite/config/chain/version"

diff --git a/ignite/config/chain/v0/config.go b/ignite/config/chain/v0/config.go
@@ -3,7 +3,7 @@ package v0
 import (
 	"io"
 
-	"github.com/imdario/mergo"
+	"dario.cat/mergo"
 	"gopkg.in/yaml.v3"
 
 	"github.com/ignite/cli/v29/ignite/config/chain/base"

diff --git a/ignite/config/chain/v1/config.go b/ignite/config/chain/v1/config.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/imdario/mergo"
+	"dario.cat/mergo"
 	"gopkg.in/yaml.v3"
 
 	"github.com/ignite/cli/v29/ignite/config/chain/base"

diff --git a/ignite/config/chain/v1/validator.go b/ignite/config/chain/v1/validator.go
@@ -36,9 +36,6 @@ type Gentx struct {
 	// Moniker is the validator's (optional) moniker.
 	Moniker string `yaml:"moniker" doc:"Optional moniker for the validator."`
 
-	// Home is directory for config and data.
-	Home string `yaml:"home" doc:"Directory for configuration and data."`
-
 	// KeyringBackend is keyring's backend.
 	KeyringBackend string `yaml:"keyring-backend" doc:"Backend for the keyring."`
 

diff --git a/ignite/internal/analytics/analytics.go b/ignite/internal/analytics/analytics.go
@@ -13,7 +13,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/ignite/cli/v29/ignite/config"
-	"github.com/ignite/cli/v29/ignite/pkg/gitpod"
 	"github.com/ignite/cli/v29/ignite/pkg/matomo"
 	"github.com/ignite/cli/v29/ignite/pkg/randstr"
 	"github.com/ignite/cli/v29/ignite/pkg/sentry"
@@ -89,7 +88,6 @@ func SendMetric(wg *sync.WaitGroup, cmd *cobra.Command) {
 		Uname:           versionInfo.Uname,
 		CWD:             versionInfo.CWD,
 		BuildFromSource: versionInfo.BuildFromSource,
-		IsGitPod:        gitpod.IsOnGitpod(),
 		IsCI:            getIsCI(),
 	}
 

diff --git a/ignite/pkg/cliui/model/events.go b/ignite/pkg/cliui/model/events.go
@@ -52,7 +52,7 @@ func (m *StatusEvents) ClearEvents() {
 }
 
 func (m StatusEvents) Wait() tea.Cmd {
-	return tea.Batch(spinner.Tick, m.WaitEvent)
+	return tea.Batch(m.spinner.Tick, m.WaitEvent)
 }
 
 func (m StatusEvents) WaitEvent() tea.Msg {
@@ -173,7 +173,7 @@ func (m Events) Wait() tea.Cmd {
 	// and if so make sure that the spinner is updated.
 	if e := m.events.Back(); e != nil {
 		if evt := e.Value.(events.Event); evt.InProgress() {
-			return tea.Batch(spinner.Tick, m.WaitEvent)
+			return tea.Batch(m.spinner.Tick, m.WaitEvent)
 		}
 	}
 

diff --git a/ignite/pkg/cliui/model/spinner.go b/ignite/pkg/cliui/model/spinner.go
@@ -4,6 +4,7 @@ import (
 	"time"
 
 	"github.com/charmbracelet/bubbles/spinner"
+	"github.com/charmbracelet/lipgloss"
 )
 
 // ColorSpinner defines the foreground color for the spinner.
@@ -17,8 +18,8 @@ var Spinner = spinner.Spinner{
 
 // NewSpinner returns a new spinner model.
 func NewSpinner() spinner.Model {
-	s := spinner.NewModel()
+	s := spinner.New()
 	s.Spinner = Spinner
-	s.ForegroundColor = ColorSpinner
+	s.Style = lipgloss.NewStyle().Foreground(lipgloss.Color(ColorSpinner))
 	return s
 }
diff --git a/ignite/pkg/cosmosfaucet/try_retrieve.go b/ignite/pkg/cosmosfaucet/try_retrieve.go
@@ -101,7 +101,7 @@ func guessFaucetURLs(rpcAddress string) ([]*url.URL, error) {
 	}{
 		{"4500", "", "."},
 		{"", "faucet", "."},
-		{"", "4500", "-"}, // Gitpod uses port number as sub domain name.
+		{"", "4500", "-"},
 	}
 
 	// creating guesses addresses by basing RPC address.

diff --git a/ignite/pkg/cosmosgen/generate_composables.go b/ignite/pkg/cosmosgen/generate_composables.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/imdario/mergo"
+	"dario.cat/mergo"
 	"golang.org/x/sync/errgroup"
 
 	"github.com/ignite/cli/v29/ignite/pkg/cosmosanalysis/module"

diff --git a/ignite/pkg/gitpod/gitpod.go b/ignite/pkg/gitpod/gitpod.go
diff --git a/ignite/pkg/matomo/matomo.go b/ignite/pkg/matomo/matomo.go
@@ -53,8 +53,8 @@ type (
 		// 1 = internal ON not supported at present | 0 = internal OFF.
 		Dimension2 uint `url:"dimension2"`
 
-		// Dimension3 is gitpod (0 or 1).
-		// 1 = isGitpod ON | 0 = isGitpod OFF.
+		// Dimension3 is deprecated.
+		// Should always be 0.
 		Dimension3 uint `url:"dimension3"`
 
 		// Dimension4 ignite version
@@ -116,7 +116,6 @@ type (
 		CWD             string
 		ScaffoldType    string
 		BuildFromSource bool
-		IsGitPod        bool
 		IsCI            bool
 	}
 )
@@ -221,7 +220,6 @@ func (c Client) SendMetric(sessionID string, metric Metric) error {
 		Second:      now.Second(),
 		Dimension1:  0,
 		Dimension2:  formatBool(metric.IsCI),
-		Dimension3:  formatBool(metric.IsGitPod),
 		Dimension4:  metric.Version,
 		Dimension6:  metric.ConfigVersion,
 		Dimension7:  metric.Cmd,