diff --git a/Makefile b/Makefile index 82183047..f20f8b07 100644 --- a/Makefile +++ b/Makefile @@ -69,6 +69,8 @@ coral_ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=coral \ -X github.com/CosmWasm/wasmd/app.NodeDir=.corald \ -X github.com/CosmWasm/wasmd/app.Bech32Prefix=coral \ -X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)" +# we could consider enabling governance override? +# -X github.com/CosmWasm/wasmd/app.EnableSpecificProposals=MigrateContract,UpdateAdmin,ClearAdmin \ coral_ldflags += $(LDFLAGS) coral_ldflags := $(strip $(coral_ldflags)) @@ -78,6 +80,7 @@ flex_ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=gaiaflex \ -X github.com/cosmos/cosmos-sdk/version.ClientName=gaiaflex \ -X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \ -X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \ + -X github.com/CosmWasm/wasmd/app.ProposalsEnabled=true \ -X github.com/CosmWasm/wasmd/app.CLIDir=.gaiaflex \ -X github.com/CosmWasm/wasmd/app.NodeDir=.gaiaflexd \ -X github.com/CosmWasm/wasmd/app.Bech32Prefix=cosmos \ @@ -86,7 +89,6 @@ flex_ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=gaiaflex \ flex_ldflags += $(LDFLAGS) flex_ldflags := $(strip $(flex_ldflags)) - BUILD_FLAGS := -tags $(build_tags_comma_sep) -ldflags '$(ldflags)' -trimpath CORAL_BUILD_FLAGS := -tags $(build_tags_comma_sep) -ldflags '$(coral_ldflags)' -trimpath FLEX_BUILD_FLAGS := -tags $(build_tags_comma_sep) -ldflags '$(flex_ldflags)' -trimpath diff --git a/app/app.go b/app/app.go index cc45f80f..e0eb742c 100644 --- a/app/app.go +++ b/app/app.go @@ -1,6 +1,7 @@ package app import ( + "fmt" "io" "os" "path/filepath" @@ -46,8 +47,9 @@ var ( NodeDir = ".wasmd" Bech32Prefix = sdk.Bech32MainPrefix - // If EnabledSpecificProposals is "", then we check this to decide to enable all or disable all x/wasm proposals - ProposalsEnabled = false + // If EnabledSpecificProposals is "", and this is "true", then enable all x/wasm proposals. + // If EnabledSpecificProposals is "", and this is not "true", then disable all x/wasm proposals. + ProposalsEnabled = "false" // If set to non-empty string it must be comma-separated list of values that are all a subset // of "EnableAllProposals" (takes precedence over ProposalsEnabled) // https://github.com/CosmWasm/wasmd/blob/02a54d33ff2c064f3539ae12d75d027d9c665f05/x/wasm/internal/types/proposal.go#L28-L34 @@ -58,9 +60,11 @@ var ( // produce a list of enabled proposals to pass into wasmd app. func GetEnabledProposals() []wasm.ProposalType { if EnableSpecificProposals == "" { - if ProposalsEnabled { + if ProposalsEnabled == "true" { + fmt.Println("Enabled all proposals") return wasm.EnableAllProposals } else { + fmt.Println("Disabled all proposals") return wasm.DisableAllProposals } } @@ -69,6 +73,7 @@ func GetEnabledProposals() []wasm.ProposalType { if err != nil { panic(err) } + fmt.Printf("Enabled proposals: %s\n", proposals) return proposals }