diff --git a/app/app_test.go b/app/app_test.go index cada79bf..7939cbda 100644 --- a/app/app_test.go +++ b/app/app_test.go @@ -17,12 +17,12 @@ import ( func TestWasmdExport(t *testing.T) { db := db.NewMemDB() - gapp := NewWasmApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, 0, wasm.DefaultEnabledProposals, map[int64]bool{}) + gapp := NewWasmApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, 0, wasm.EnableAllProposals, map[int64]bool{}) err := setGenesis(gapp) require.NoError(t, err) // Making a new app object with the db, so that initchain hasn't been called - newGapp := NewWasmApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, 0, wasm.DefaultEnabledProposals, map[int64]bool{}) + newGapp := NewWasmApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, 0, wasm.EnableAllProposals, map[int64]bool{}) _, _, err = newGapp.ExportAppStateAndValidators(false, []string{}) require.NoError(t, err, "ExportAppStateAndValidators should not have an error") } @@ -30,7 +30,7 @@ func TestWasmdExport(t *testing.T) { // ensure that black listed addresses are properly set in bank keeper func TestBlackListedAddrs(t *testing.T) { db := db.NewMemDB() - gapp := NewWasmApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, 0, wasm.DefaultEnabledProposals, map[int64]bool{}) + gapp := NewWasmApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, 0, wasm.EnableAllProposals, map[int64]bool{}) for acc := range maccPerms { require.True(t, gapp.bankKeeper.BlacklistedAddr(gapp.supplyKeeper.GetModuleAddress(acc))) diff --git a/app/integration/common_test.go b/app/integration/common_test.go index d3d2fa37..e2eae32c 100644 --- a/app/integration/common_test.go +++ b/app/integration/common_test.go @@ -32,7 +32,7 @@ const ( // Setup initializes a new wasmd.WasmApp. A Nop logger is set in WasmApp. func Setup(isCheckTx bool) *wasmd.WasmApp { db := dbm.NewMemDB() - app := wasmd.NewWasmApp(log.NewNopLogger(), db, nil, true, 0, wasm.DefaultEnabledProposals, nil) + app := wasmd.NewWasmApp(log.NewNopLogger(), db, nil, true, 0, wasm.EnableAllProposals, nil) // app := wasmd.NewWasmApp(log.NewNopLogger(), db, nil, true, map[int64]bool{}, 0) if !isCheckTx { // init chain must be called to stop deliverState from being nil @@ -58,7 +58,7 @@ func Setup(isCheckTx bool) *wasmd.WasmApp { // genesis accounts. func SetupWithGenesisAccounts(genAccs []authexported.GenesisAccount) *wasmd.WasmApp { db := dbm.NewMemDB() - app := wasmd.NewWasmApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, 0, wasm.DefaultEnabledProposals, nil) + app := wasmd.NewWasmApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, 0, wasm.EnableAllProposals, nil) // app := wasmd.NewWasmApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, map[int64]bool{}, 0) // initialize the chain with the passed in genesis accounts diff --git a/app/sim_bench_test.go b/app/sim_bench_test.go index 05f839e0..fe40b2b5 100644 --- a/app/sim_bench_test.go +++ b/app/sim_bench_test.go @@ -27,7 +27,7 @@ func BenchmarkFullAppSimulation(b *testing.B) { } }() - app := NewWasmApp(logger, db, nil, true, simapp.FlagPeriodValue, wasm.DefaultEnabledProposals, map[int64]bool{}, interBlockCacheOpt()) + app := NewWasmApp(logger, db, nil, true, simapp.FlagPeriodValue, wasm.EnableAllProposals, map[int64]bool{}, interBlockCacheOpt()) // run randomized simulation _, simParams, simErr := simulation.SimulateFromSeed( @@ -66,7 +66,7 @@ func BenchmarkInvariants(b *testing.B) { } }() - app := NewWasmApp(logger, db, nil, true, simapp.FlagPeriodValue, wasm.DefaultEnabledProposals, map[int64]bool{}, interBlockCacheOpt()) + app := NewWasmApp(logger, db, nil, true, simapp.FlagPeriodValue, wasm.EnableAllProposals, map[int64]bool{}, interBlockCacheOpt()) // run randomized simulation _, simParams, simErr := simulation.SimulateFromSeed( diff --git a/app/sim_test.go b/app/sim_test.go index 164f9830..fde219c3 100644 --- a/app/sim_test.go +++ b/app/sim_test.go @@ -63,7 +63,7 @@ func TestFullAppSimulation(t *testing.T) { require.NoError(t, os.RemoveAll(dir)) }() - app := NewWasmApp(logger, db, nil, true, simapp.FlagPeriodValue, wasm2.DefaultEnabledProposals, map[int64]bool{}, fauxMerkleModeOpt) + app := NewWasmApp(logger, db, nil, true, simapp.FlagPeriodValue, wasm2.EnableAllProposals, map[int64]bool{}, fauxMerkleModeOpt) require.Equal(t, appName, app.Name()) // run randomized simulation @@ -95,7 +95,7 @@ func TestAppImportExport(t *testing.T) { require.NoError(t, os.RemoveAll(dir)) }() - app := NewWasmApp(logger, db, nil, true, simapp.FlagPeriodValue, wasm2.DefaultEnabledProposals, map[int64]bool{}, fauxMerkleModeOpt) + app := NewWasmApp(logger, db, nil, true, simapp.FlagPeriodValue, wasm2.EnableAllProposals, map[int64]bool{}, fauxMerkleModeOpt) require.Equal(t, appName, app.Name()) // Run randomized simulation @@ -129,7 +129,7 @@ func TestAppImportExport(t *testing.T) { require.NoError(t, os.RemoveAll(newDir)) }() - newApp := NewWasmApp(log.NewNopLogger(), newDB, nil, true, simapp.FlagPeriodValue, wasm2.DefaultEnabledProposals, map[int64]bool{}, fauxMerkleModeOpt) + newApp := NewWasmApp(log.NewNopLogger(), newDB, nil, true, simapp.FlagPeriodValue, wasm2.EnableAllProposals, map[int64]bool{}, fauxMerkleModeOpt) require.Equal(t, appName, newApp.Name()) var genesisState GenesisState @@ -181,7 +181,7 @@ func TestAppSimulationAfterImport(t *testing.T) { require.NoError(t, os.RemoveAll(dir)) }() - app := NewWasmApp(logger, db, nil, true, simapp.FlagPeriodValue, wasm2.DefaultEnabledProposals, map[int64]bool{}, fauxMerkleModeOpt) + app := NewWasmApp(logger, db, nil, true, simapp.FlagPeriodValue, wasm2.EnableAllProposals, map[int64]bool{}, fauxMerkleModeOpt) require.Equal(t, appName, app.Name()) // Run randomized simulation @@ -220,7 +220,7 @@ func TestAppSimulationAfterImport(t *testing.T) { require.NoError(t, os.RemoveAll(newDir)) }() - newApp := NewWasmApp(log.NewNopLogger(), newDB, nil, true, simapp.FlagPeriodValue, wasm2.DefaultEnabledProposals, map[int64]bool{}, fauxMerkleModeOpt) + newApp := NewWasmApp(log.NewNopLogger(), newDB, nil, true, simapp.FlagPeriodValue, wasm2.EnableAllProposals, map[int64]bool{}, fauxMerkleModeOpt) require.Equal(t, appName, newApp.Name()) newApp.InitChain(abci.RequestInitChain{ @@ -264,7 +264,7 @@ func TestAppStateDeterminism(t *testing.T) { db := dbm.NewMemDB() - app := NewWasmApp(logger, db, nil, true, simapp.FlagPeriodValue, wasm2.DefaultEnabledProposals, map[int64]bool{}, interBlockCacheOpt()) + app := NewWasmApp(logger, db, nil, true, simapp.FlagPeriodValue, wasm2.EnableAllProposals, map[int64]bool{}, interBlockCacheOpt()) fmt.Printf( "running non-determinism simulation; seed %d: %d/%d, attempt: %d/%d\n", diff --git a/cmd/wasmd/main.go b/cmd/wasmd/main.go index c609760d..af768d52 100644 --- a/cmd/wasmd/main.go +++ b/cmd/wasmd/main.go @@ -86,7 +86,7 @@ func newApp(logger log.Logger, db dbm.DB, traceStore io.Writer) abci.Application } return app.NewWasmApp(logger, db, traceStore, true, invCheckPeriod, - wasm.DefaultEnabledProposals, skipUpgradeHeights, + wasm.EnableAllProposals, skipUpgradeHeights, baseapp.SetPruning(store.NewPruningOptionsFromString(viper.GetString("pruning"))), baseapp.SetMinGasPrices(viper.GetString(server.FlagMinGasPrices)), baseapp.SetHaltHeight(viper.GetUint64(server.FlagHaltHeight)), @@ -99,7 +99,7 @@ func exportAppStateAndTMValidators( ) (json.RawMessage, []tmtypes.GenesisValidator, error) { if height != -1 { - gapp := app.NewWasmApp(logger, db, traceStore, false, uint(1), wasm.DefaultEnabledProposals, nil) + gapp := app.NewWasmApp(logger, db, traceStore, false, uint(1), wasm.EnableAllProposals, nil) err := gapp.LoadHeight(height) if err != nil { return nil, nil, err @@ -107,6 +107,6 @@ func exportAppStateAndTMValidators( return gapp.ExportAppStateAndValidators(forZeroHeight, jailWhiteList) } - gapp := app.NewWasmApp(logger, db, traceStore, true, uint(1), wasm.DefaultEnabledProposals, nil) + gapp := app.NewWasmApp(logger, db, traceStore, true, uint(1), wasm.EnableAllProposals, nil) return gapp.ExportAppStateAndValidators(forZeroHeight, jailWhiteList) } diff --git a/cmd/wasmd/replay.go b/cmd/wasmd/replay.go index 333d9b48..be683ea2 100644 --- a/cmd/wasmd/replay.go +++ b/cmd/wasmd/replay.go @@ -92,7 +92,7 @@ func replayTxs(rootDir string) error { fmt.Fprintln(os.Stderr, "Creating application") gapp := app.NewWasmApp( // TODO: do we want to set skipUpgradeHieghts here? - ctx.Logger, appDB, traceStoreWriter, true, uint(1), wasm.DefaultEnabledProposals, nil, + ctx.Logger, appDB, traceStoreWriter, true, uint(1), wasm.EnableAllProposals, nil, baseapp.SetPruning(store.PruneEverything)) // Genesis diff --git a/lcd_test/helpers.go b/lcd_test/helpers.go index 8ef99215..43c62e2f 100644 --- a/lcd_test/helpers.go +++ b/lcd_test/helpers.go @@ -74,7 +74,7 @@ func InitializeLCD(nValidators int, initAddrs []sdk.AccAddress, minting bool, po logger = log.NewFilter(logger, log.AllowError()) db := dbm.NewMemDB() - gapp := app.NewWasmApp(logger, db, nil, true, 0, wasm.DefaultEnabledProposals, nil, baseapp.SetPruning(store.PruneNothing)) + gapp := app.NewWasmApp(logger, db, nil, true, 0, wasm.EnableAllProposals, nil, baseapp.SetPruning(store.PruneNothing)) cdc = app.MakeCodec() genDoc, valConsPubKeys, valOperAddrs, privVal, err := defaultGenesis(config, nValidators, initAddrs, minting) diff --git a/x/wasm/alias.go b/x/wasm/alias.go index b2d5644c..354c9a00 100644 --- a/x/wasm/alias.go +++ b/x/wasm/alias.go @@ -71,23 +71,24 @@ var ( NewWasmProposalHandler = keeper.NewWasmProposalHandler // variable aliases - ModuleCdc = types.ModuleCdc - DefaultCodespace = types.DefaultCodespace - ErrCreateFailed = types.ErrCreateFailed - ErrAccountExists = types.ErrAccountExists - ErrInstantiateFailed = types.ErrInstantiateFailed - ErrExecuteFailed = types.ErrExecuteFailed - ErrGasLimit = types.ErrGasLimit - ErrInvalidGenesis = types.ErrInvalidGenesis - ErrNotFound = types.ErrNotFound - ErrQueryFailed = types.ErrQueryFailed - ErrInvalidMsg = types.ErrInvalidMsg - KeyLastCodeID = types.KeyLastCodeID - KeyLastInstanceID = types.KeyLastInstanceID - CodeKeyPrefix = types.CodeKeyPrefix - ContractKeyPrefix = types.ContractKeyPrefix - ContractStorePrefix = types.ContractStorePrefix - DefaultEnabledProposals = types.DefaultEnabledProposals + ModuleCdc = types.ModuleCdc + DefaultCodespace = types.DefaultCodespace + ErrCreateFailed = types.ErrCreateFailed + ErrAccountExists = types.ErrAccountExists + ErrInstantiateFailed = types.ErrInstantiateFailed + ErrExecuteFailed = types.ErrExecuteFailed + ErrGasLimit = types.ErrGasLimit + ErrInvalidGenesis = types.ErrInvalidGenesis + ErrNotFound = types.ErrNotFound + ErrQueryFailed = types.ErrQueryFailed + ErrInvalidMsg = types.ErrInvalidMsg + KeyLastCodeID = types.KeyLastCodeID + KeyLastInstanceID = types.KeyLastInstanceID + CodeKeyPrefix = types.CodeKeyPrefix + ContractKeyPrefix = types.ContractKeyPrefix + ContractStorePrefix = types.ContractStorePrefix + EnableAllProposals = types.EnableAllProposals + DisableAllProposals = types.DisableAllProposals ) type ( diff --git a/x/wasm/internal/keeper/test_common.go b/x/wasm/internal/keeper/test_common.go index 1657d8bc..91a721a4 100644 --- a/x/wasm/internal/keeper/test_common.go +++ b/x/wasm/internal/keeper/test_common.go @@ -181,7 +181,7 @@ func CreateTestInput(t *testing.T, isCheckTx bool, tempDir string, supportedFeat govRouter := gov.NewRouter(). AddRoute(params.RouterKey, params.NewParamChangeProposalHandler(paramsKeeper)). AddRoute(govtypes.RouterKey, govtypes.ProposalHandler). - AddRoute(wasmtypes.RouterKey, NewWasmProposalHandler(keeper, wasmtypes.DefaultEnabledProposals)) + AddRoute(wasmtypes.RouterKey, NewWasmProposalHandler(keeper, wasmtypes.EnableAllProposals)) govKeeper := gov.NewKeeper( cdc, keyGov, paramsKeeper.Subspace(govtypes.DefaultParamspace).WithKeyTable(gov.ParamKeyTable()), supplyKeeper, stakingKeeper, govRouter, diff --git a/x/wasm/internal/types/proposal.go b/x/wasm/internal/types/proposal.go index 994137e6..39e29dee 100644 --- a/x/wasm/internal/types/proposal.go +++ b/x/wasm/internal/types/proposal.go @@ -21,8 +21,11 @@ const ( ProposalTypeClearAdmin ProposalType = "ClearAdmin" ) -// DefaultEnabledProposals contains all wasm gov types as keys. -var DefaultEnabledProposals = []ProposalType{ +// DisableAllProposals contains no wasm gov types. +var DisableAllProposals []ProposalType + +// EnableAllProposals contains all wasm gov types as keys. +var EnableAllProposals = []ProposalType{ ProposalTypeStoreCode, ProposalTypeStoreInstantiateContract, ProposalTypeMigrateContract,