diff --git a/changelog.md b/changelog.md index b3b97efc98..736449c706 100644 --- a/changelog.md +++ b/changelog.md @@ -11,6 +11,10 @@ - [#4794](https://github.com/ignite/cli/pull/4794) Update `cosmossdk.io/log` version to `v1.6.1` and remove `bytedance/sonic` version override from template. +### Fixes + +- [#4803](https://github.com/ignite/cli/pull/4803) Fix simulations for custom address prefix. + ## [`v29.3.1`](https://github.com/ignite/cli/releases/tag/v29.3.1) ### Fixes diff --git a/go.mod b/go.mod index 5803d0de55..b3dd394f62 100644 --- a/go.mod +++ b/go.mod @@ -14,10 +14,10 @@ require ( github.com/cenkalti/backoff v2.2.1+incompatible github.com/charmbracelet/bubbles v0.21.0 github.com/charmbracelet/bubbletea v1.3.5 - github.com/charmbracelet/fang v0.3.0 + github.com/charmbracelet/fang v0.4.0 github.com/charmbracelet/glow v1.5.1 github.com/charmbracelet/lipgloss v1.1.0 - github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.2 + github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.3 github.com/cockroachdb/errors v1.12.0 github.com/cometbft/cometbft v0.38.17 github.com/cosmos/cosmos-sdk v0.53.3 diff --git a/go.sum b/go.sum index 6b72a7814a..39f09900f3 100644 --- a/go.sum +++ b/go.sum @@ -421,8 +421,8 @@ github.com/charmbracelet/charm v0.8.7 h1:FJ9b7IxWUWHOPR72zS/QJLEqtudOB2Mwfc+Sir0 github.com/charmbracelet/charm v0.8.7/go.mod h1:ApJYwJljEjODkOYJgFDzbUqztLrCWQct9zyPD+xcVr4= github.com/charmbracelet/colorprofile v0.3.1 h1:k8dTHMd7fgw4bnFd7jXTLZrSU/CQrKnL3m+AxCzDz40= github.com/charmbracelet/colorprofile v0.3.1/go.mod h1:/GkGusxNs8VB/RSOh3fu0TJmQ4ICMMPApIIVn0KszZ0= -github.com/charmbracelet/fang v0.3.0 h1:Be6TB+ExS8VWizTQRJgjqbJBudKrmVUet65xmFPGhaA= -github.com/charmbracelet/fang v0.3.0/go.mod h1:b0ZfEXZeBds0I27/wnTfnv2UVigFDXHhrFNwQztfA0M= +github.com/charmbracelet/fang v0.4.0 h1:boBxmdcFghTeotqkD2itXi7SMBozdIlcslRqjboSJDg= +github.com/charmbracelet/fang v0.4.0/go.mod h1:9gCUAHmVx5BwSafeyNr3GI0GgvlB1WYjL21SkPp1jyU= github.com/charmbracelet/glamour v0.6.0 h1:wi8fse3Y7nfcabbbDuwolqTqMQPMnVPeZhDM273bISc= github.com/charmbracelet/glamour v0.6.0/go.mod h1:taqWV4swIMMbWALc0m7AfE9JkPSU8om2538k9ITBxOc= github.com/charmbracelet/glow v1.5.1 h1:o1mwT4xXXpkfUhJG6euQayNxLZf9yKctOCNHLztrwdE= @@ -431,8 +431,8 @@ github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJ github.com/charmbracelet/lipgloss v0.6.0/go.mod h1:tHh2wr34xcHjC2HCXIlGSG1jaDF0S0atAUvBMP6Ppuk= github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY= github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30= -github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.2 h1:vq2enzx1Hr3UenVefpPEf+E2xMmqtZoSHhx8IE+V8ug= -github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.2/go.mod h1:EJWvaCrhOhNGVZMvcjc0yVryl4qqpMs8tz0r9WyEkdQ= +github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.3 h1:W6DpZX6zSkZr0iFq6JVh1vItLoxfYtNlaxOJtWp8Kis= +github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.3/go.mod h1:65HTtKURcv/ict9ZQhr6zT84JqIjMcJbyrZYHHKNfKA= github.com/charmbracelet/x/ansi v0.8.0 h1:9GTq3xq9caJW8ZrBTe0LIe2fvfLR/bYXKTx2llXn7xE= github.com/charmbracelet/x/ansi v0.8.0/go.mod h1:wdYl/ONOLHLIVmQaxbIYEC/cRKOQyjTkowiI4blgS9Q= github.com/charmbracelet/x/cellbuf v0.0.13 h1:/KBBKHuVRbq1lYx5BzEHBAFBP8VcQzJejZ/IA3iR28k= diff --git a/ignite/templates/app/files-minimal/app/app.go.plush b/ignite/templates/app/files-minimal/app/app.go.plush index 1f616d595a..3a30a9ff3f 100644 --- a/ignite/templates/app/files-minimal/app/app.go.plush +++ b/ignite/templates/app/files-minimal/app/app.go.plush @@ -69,9 +69,6 @@ type App struct { } func init() { - <%= if (DefaultDenom) { %> - sdk.DefaultBondDenom = "<%= DefaultDenom %>" - <% } %> var err error clienthelpers.EnvPrefix = Name DefaultNodeHome, err = clienthelpers.GetNodeHomeDirectory("." + Name) @@ -245,4 +242,4 @@ func BlockedAddresses() map[string]bool { } return result -} \ No newline at end of file +} diff --git a/ignite/templates/app/files/app/app.go.plush b/ignite/templates/app/files/app/app.go.plush index def9015807..ad956c108e 100644 --- a/ignite/templates/app/files/app/app.go.plush +++ b/ignite/templates/app/files/app/app.go.plush @@ -11,7 +11,7 @@ import ( circuitkeeper "cosmossdk.io/x/circuit/keeper" upgradekeeper "cosmossdk.io/x/upgrade/keeper" storetypes "cosmossdk.io/store/types" - + abci "github.com/cometbft/cometbft/abci/types" dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/baseapp" @@ -103,9 +103,6 @@ type App struct { } func init() { - <%= if (DefaultDenom) { %> - sdk.DefaultBondDenom = "<%= DefaultDenom %>" - <% } %> var err error clienthelpers.EnvPrefix = Name DefaultNodeHome, err = clienthelpers.GetNodeHomeDirectory("." + Name) @@ -299,4 +296,4 @@ func BlockedAddresses() map[string]bool { } return result -} \ No newline at end of file +} diff --git a/ignite/templates/app/files/app/config.go.plush b/ignite/templates/app/files/app/config.go.plush index 656813aa41..422b008fff 100644 --- a/ignite/templates/app/files/app/config.go.plush +++ b/ignite/templates/app/files/app/config.go.plush @@ -3,7 +3,12 @@ package app import sdk "github.com/cosmos/cosmos-sdk/types" func init() { - // Set prefixes + // Set bond denom + <%= if (DefaultDenom) { %> + sdk.DefaultBondDenom = "<%= DefaultDenom %>" + <% } %> + + // Set address prefixes accountPubKeyPrefix := AccountAddressPrefix + "pub" validatorAddressPrefix := AccountAddressPrefix + "valoper" validatorPubKeyPrefix := AccountAddressPrefix + "valoperpub" @@ -17,4 +22,4 @@ func init() { config.SetBech32PrefixForValidator(validatorAddressPrefix, validatorPubKeyPrefix) config.SetBech32PrefixForConsensusNode(consNodeAddressPrefix, consNodePubKeyPrefix) config.Seal() -} \ No newline at end of file +} diff --git a/ignite/templates/app/files/app/sim_bench_test.go.plush b/ignite/templates/app/files/app/sim_bench_test.go.plush index 57892c4c4f..27652a1099 100644 --- a/ignite/templates/app/files/app/sim_bench_test.go.plush +++ b/ignite/templates/app/files/app/sim_bench_test.go.plush @@ -58,7 +58,7 @@ func BenchmarkFullAppSimulation(b *testing.B) { app.BaseApp, simtestutil.AppStateFn(app.AppCodec(), app.SimulationManager(), app.DefaultGenesis()), simtypes.RandomAccounts, // Replace with own random account function if using keys other than secp256k1 - simtestutil.SimulationOperations(app, app.AppCodec(), config), + simtestutil.BuildSimulationOperations(app, app.AppCodec(), config, app.TxConfig()), BlockedAddresses(), config, app.AppCodec(), @@ -76,4 +76,4 @@ func BenchmarkFullAppSimulation(b *testing.B) { if config.Commit { simtestutil.PrintStats(db) } -} \ No newline at end of file +} diff --git a/ignite/templates/app/files/app/sim_test.go.plush b/ignite/templates/app/files/app/sim_test.go.plush index f5f3e37375..ddc68eb6e3 100644 --- a/ignite/templates/app/files/app/sim_test.go.plush +++ b/ignite/templates/app/files/app/sim_test.go.plush @@ -95,7 +95,7 @@ func BenchmarkSimulation(b *testing.B) { bApp.BaseApp, simtestutil.AppStateFn(bApp.AppCodec(), bApp.SimulationManager(), bApp.DefaultGenesis()), simulationtypes.RandomAccounts, - simtestutil.SimulationOperations(bApp, bApp.AppCodec(), config), + simtestutil.BuildSimulationOperations(bApp, bApp.AppCodec(), config, bApp.TxConfig()), BlockedAddresses(), config, bApp.AppCodec(), @@ -142,7 +142,7 @@ func TestFullAppSimulation(t *testing.T) { app.BaseApp, simtestutil.AppStateFn(app.AppCodec(), app.SimulationManager(), app.DefaultGenesis()), simulationtypes.RandomAccounts, - simtestutil.SimulationOperations(app, app.AppCodec(), config), + simtestutil.BuildSimulationOperations(app, app.AppCodec(), config, app.TxConfig()), BlockedAddresses(), config, app.AppCodec(), @@ -186,7 +186,7 @@ func TestAppImportExport(t *testing.T) { bApp.BaseApp, simtestutil.AppStateFn(bApp.AppCodec(), bApp.SimulationManager(), bApp.DefaultGenesis()), simulationtypes.RandomAccounts, - simtestutil.SimulationOperations(bApp, bApp.AppCodec(), config), + simtestutil.BuildSimulationOperations(bApp, bApp.AppCodec(), config, bApp.TxConfig()), BlockedAddresses(), config, bApp.AppCodec(), @@ -306,7 +306,7 @@ func TestAppSimulationAfterImport(t *testing.T) { bApp.BaseApp, simtestutil.AppStateFn(bApp.AppCodec(), bApp.SimulationManager(), bApp.DefaultGenesis()), simulationtypes.RandomAccounts, - simtestutil.SimulationOperations(bApp, bApp.AppCodec(), config), + simtestutil.BuildSimulationOperations(bApp, bApp.AppCodec(), config, bApp.TxConfig()), BlockedAddresses(), config, bApp.AppCodec(), @@ -356,7 +356,7 @@ func TestAppSimulationAfterImport(t *testing.T) { newApp.BaseApp, simtestutil.AppStateFn(bApp.AppCodec(), bApp.SimulationManager(), bApp.DefaultGenesis()), simulationtypes.RandomAccounts, - simtestutil.SimulationOperations(newApp, newApp.AppCodec(), config), + simtestutil.BuildSimulationOperations(newApp, newApp.AppCodec(), config, newApp.TxConfig()), BlockedAddresses(), config, bApp.AppCodec(), @@ -440,7 +440,7 @@ func TestAppStateDeterminism(t *testing.T) { bApp.DefaultGenesis(), ), simulationtypes.RandomAccounts, - simtestutil.SimulationOperations(bApp, bApp.AppCodec(), config), + simtestutil.BuildSimulationOperations(bApp, bApp.AppCodec(), config, bApp.TxConfig()), BlockedAddresses(), config, bApp.AppCodec(),