Allow setting wasmopts in binary, for eg. telemetry

osmosis-labs · Jan 25, 2022 · 346d056 · 346d056
1 parent 6684b49
commit 346d056
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 13 deletions.
diff --git a/app/app.go b/app/app.go
@@ -131,7 +131,6 @@ import (
 
 const appName = "OsmosisApp"
 
-// We pull these out so we can set them with LDFLAGS in the Makefile
 var (
 	// 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.
@@ -140,6 +139,9 @@ var (
 	// of "EnableAllProposals" (takes precedence over ProposalsEnabled)
 	// https://github.com/CosmWasm/wasmd/blob/02a54d33ff2c064f3539ae12d75d027d9c665f05/x/wasm/internal/types/proposal.go#L28-L34
 	EnableSpecificProposals = ""
+
+	// use this for clarity in argument list
+	EmptyWasmOpts []wasm.Option
 )
 
 // GetEnabledProposals parses the ProposalsEnabled / EnableSpecificProposals values to
@@ -303,12 +305,10 @@ func init() {
 }
 
 // NewOsmosis returns a reference to an initialized Osmosis.
-// FIXME: @alpe do we add wasmOpts []wasm.Option here? Do we set that directly in InitNormalKeepers?
-// I couldn't find any non-test code that used this. I am guessing we don't need to expose it here
 func NewOsmosisApp(
 	logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest bool, skipUpgradeHeights map[int64]bool,
 	homePath string, invCheckPeriod uint, encodingConfig appparams.EncodingConfig, appOpts servertypes.AppOptions,
-	enabledProposals []wasm.ProposalType,
+	enabledProposals []wasm.ProposalType, wasmOpts []wasm.Option,
 	baseAppOptions ...func(*baseapp.BaseApp),
 ) *OsmosisApp {
 
@@ -348,7 +348,7 @@ func NewOsmosisApp(
 
 	app.InitSpecialKeepers(skipUpgradeHeights, homePath, invCheckPeriod)
 	app.setupUpgradeStoreLoaders()
-	app.InitNormalKeepers(homePath, appOpts, enabledProposals)
+	app.InitNormalKeepers(homePath, appOpts, enabledProposals, wasmOpts)
 	app.SetupHooks()
 	app.setupUpgradeHandlers()
 

diff --git a/app/config.go b/app/config.go
@@ -53,6 +53,7 @@ func NewAppConstructor(encodingCfg params.EncodingConfig) network.AppConstructor
 			encodingCfg,
 			simapp.EmptyAppOptions{},
 			GetEnabledProposals(),
+			EmptyWasmOpts,
 			baseapp.SetMinGasPrices(val.AppConfig.MinGasPrices),
 		)
 	}

diff --git a/app/keepers.go b/app/keepers.go
@@ -115,6 +115,7 @@ func (app *OsmosisApp) InitNormalKeepers(
 	homePath string,
 	appOpts servertypes.AppOptions,
 	enabledProposals []wasm.ProposalType,
+	wasmOpts []wasm.Option,
 ) {
 	appCodec := app.appCodec
 	bApp := app.BaseApp
@@ -294,8 +295,7 @@ func (app *OsmosisApp) InitNormalKeepers(
 		wasmDir,
 		wasmConfig,
 		supportedFeatures,
-		// TODO: input from caller or just hardcode here?
-		// wasmOpts...,
+		wasmOpts...,
 	)
 
 	// wire up x/wasm to IBC

diff --git a/app/test_helpers.go b/app/test_helpers.go
@@ -14,7 +14,7 @@ import (
 // Setup initializes a new OsmosisApp
 func Setup(isCheckTx bool) *OsmosisApp {
 	db := dbm.NewMemDB()
-	app := NewOsmosisApp(log.NewNopLogger(), db, nil, true, map[int64]bool{}, DefaultNodeHome, 5, MakeEncodingConfig(), simapp.EmptyAppOptions{}, GetEnabledProposals())
+	app := NewOsmosisApp(log.NewNopLogger(), db, nil, true, map[int64]bool{}, DefaultNodeHome, 5, MakeEncodingConfig(), simapp.EmptyAppOptions{}, GetEnabledProposals(), EmptyWasmOpts)
 	if !isCheckTx {
 		genesisState := NewDefaultGenesisState()
 		stateBytes, err := json.MarshalIndent(genesisState, "", " ")
@@ -42,7 +42,7 @@ func SetupTestingAppWithLevelDb(isCheckTx bool) (app *OsmosisApp, cleanupFn func
 	if err != nil {
 		panic(err)
 	}
-	app = NewOsmosisApp(log.NewNopLogger(), db, nil, true, map[int64]bool{}, DefaultNodeHome, 5, MakeEncodingConfig(), simapp.EmptyAppOptions{}, GetEnabledProposals())
+	app = NewOsmosisApp(log.NewNopLogger(), db, nil, true, map[int64]bool{}, DefaultNodeHome, 5, MakeEncodingConfig(), simapp.EmptyAppOptions{}, GetEnabledProposals(), EmptyWasmOpts)
 	if !isCheckTx {
 		genesisState := NewDefaultGenesisState()
 		stateBytes, err := json.MarshalIndent(genesisState, "", " ")

diff --git a/cmd/osmosisd/cmd/root.go b/cmd/osmosisd/cmd/root.go
@@ -254,8 +254,6 @@ func newApp(logger log.Logger, db dbm.DB, traceStore io.Writer, appOpts serverty
 	if cast.ToBool(appOpts.Get("telemetry.enabled")) {
 		wasmOpts = append(wasmOpts, wasmkeeper.WithVMCacheMetrics(prometheus.DefaultRegisterer))
 	}
-	// TODO: add this to NewOsmosis App
-	_ = wasmOpts
 
 	return osmosis.NewOsmosisApp(
 		logger, db, traceStore, true, skipUpgradeHeights,
@@ -264,6 +262,7 @@ func newApp(logger log.Logger, db dbm.DB, traceStore io.Writer, appOpts serverty
 		osmosis.MakeEncodingConfig(), // Ideally, we would reuse the one created by NewRootCmd.
 		appOpts,
 		osmosis.GetEnabledProposals(),
+		wasmOpts,
 		baseapp.SetPruning(pruningOpts),
 		baseapp.SetMinGasPrices(cast.ToString(appOpts.Get(server.FlagMinGasPrices))),
 		baseapp.SetMinRetainBlocks(cast.ToUint64(appOpts.Get(server.FlagMinRetainBlocks))),
@@ -287,13 +286,13 @@ func createOsmosisAppAndExport(
 	encCfg.Marshaler = codec.NewProtoCodec(encCfg.InterfaceRegistry)
 	var app *osmosis.OsmosisApp
 	if height != -1 {
-		app = osmosis.NewOsmosisApp(logger, db, traceStore, false, map[int64]bool{}, "", uint(1), encCfg, appOpts, osmosis.GetEnabledProposals())
+		app = osmosis.NewOsmosisApp(logger, db, traceStore, false, map[int64]bool{}, "", uint(1), encCfg, appOpts, osmosis.GetEnabledProposals(), osmosis.EmptyWasmOpts)
 
 		if err := app.LoadHeight(height); err != nil {
 			return servertypes.ExportedApp{}, err
 		}
 	} else {
-		app = osmosis.NewOsmosisApp(logger, db, traceStore, true, map[int64]bool{}, "", uint(1), encCfg, appOpts, osmosis.GetEnabledProposals())
+		app = osmosis.NewOsmosisApp(logger, db, traceStore, true, map[int64]bool{}, "", uint(1), encCfg, appOpts, osmosis.GetEnabledProposals(), osmosis.EmptyWasmOpts)
 	}
 
 	return app.ExportAppStateAndValidators(forZeroHeight, jailWhiteList)

diff --git a/simapp/sim_test.go b/simapp/sim_test.go
@@ -79,6 +79,7 @@ func fullAppSimulation(tb testing.TB, is_testing bool) {
 		app.MakeEncodingConfig(),
 		sdkSimapp.EmptyAppOptions{},
 		app.GetEnabledProposals(),
+		app.EmptyWasmOpts,
 		interBlockCacheOpt(),
 		fauxMerkleModeOpt)
 
@@ -156,6 +157,7 @@ func TestAppStateDeterminism(t *testing.T) {
 				app.MakeEncodingConfig(),
 				sdkSimapp.EmptyAppOptions{},
 				app.GetEnabledProposals(),
+				app.EmptyWasmOpts,
 				interBlockCacheOpt())
 
 			fmt.Printf(