wasmlc: use builtIncapabilities for light client contracts

Author: hard-nett

app/app.go

@@ -251,7 +251,7 @@ func NewBitsongApp(
 
 	ibcWasmConfig := wasmlctypes.WasmConfig{
 		DataDir:               filepath.Join(homePath, "ibc_08-wasm"),
-		SupportedCapabilities: []string{"iterator", "stargate", "abort"},
+		SupportedCapabilities: keepers.ExtendedBuiltInCapabilities(),
 		ContractDebugMode:     false,
 	}
 

app/keepers/keepers.go

@@ -85,9 +85,7 @@ import (
 )
 
 func ExtendedBuiltInCapabilities() []string {
-	originalCaps := wasmkeeper.BuiltInCapabilities()
-	extendedCaps := append(originalCaps, "bitsong", "cosmwasm_3_0")
-	return extendedCaps
+	return append(wasmkeeper.BuiltInCapabilities(), "bitsong", "cosmwasm_3_0")
 }
 
 // module account permissions
@@ -186,7 +184,6 @@ func NewAppKeepers(
 	// & add capability keeper and ScopeToModule for ibc module
 	appKeepers.CapabilityKeeper = capabilitykeeper.NewKeeper(appCodec, appKeepers.keys[capabilitytypes.StoreKey], appKeepers.memKeys[capabilitytypes.MemStoreKey])
 	appKeepers.ScopedIBCKeeper = appKeepers.CapabilityKeeper.ScopeToModule(ibcexported.ModuleName)
-	appKeepers.ScopedTransferKeeper = appKeepers.CapabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName)
 	appKeepers.ScopedWasmKeeper = appKeepers.CapabilityKeeper.ScopeToModule(wasmtypes.ModuleName)
 
 	invCheckPeriod := cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod))
@@ -287,11 +284,10 @@ func NewAppKeepers(
 	)
 	appKeepers.SlashingKeeper = &slashKeeper
 
-	// https://github.com/cosmos/cosmos-sdk/blob/v0.53.0/UPGRADING.md?plain=1#L192
 	mintKeeper := mintkeeper.NewKeeper(
 		appCodec, runtime.NewKVStoreService(appKeepers.keys[minttypes.StoreKey]), stakingKeeper,
 		appKeepers.AccountKeeper, appKeepers.BankKeeper, authtypes.FeeCollectorName, govModAddress,
-		// mintkeeper.WithMintFn(myCustomMintFunc), // Use custom minting function
+		// mintkeeper.WithMintFn(myCustomMintFunc), // Use custom minting function: https://github.com/cosmos/cosmos-sdk/blob/v0.53.0/UPGRADING.md?plain=1#L192
 	)
 	appKeepers.MintKeeper = &mintKeeper
 
@@ -436,16 +432,15 @@ func NewAppKeepers(
 	// wire wasm to IBC
 
 	// Create static IBC router, add transfer route, then set and seal it
-	ibcRouter := porttypes.NewRouter()
-	ibcRouter.AddRoute(ibctransfertypes.ModuleName, transferStack).
+	ibcRouter := porttypes.NewRouter().
+		AddRoute(ibctransfertypes.ModuleName, transferStack).
 		AddRoute(wasmtypes.ModuleName, wasm.NewIBCHandler(appKeepers.WasmKeeper, appKeepers.IBCKeeper.ChannelKeeper, appKeepers.TransferKeeper, appKeepers.IBCKeeper.ChannelKeeper))
-
-	// Seal the router
 	appKeepers.IBCKeeper.SetRouter(ibcRouter)
 
 	clientKeeper := appKeepers.IBCKeeper.ClientKeeper
 	storeProvider := appKeepers.IBCKeeper.ClientKeeper.GetStoreProvider()
 
+	// Add tendermint & ibcWasm light client routes
 	tmLightClientModule := ibctm.NewLightClientModule(appCodec, storeProvider)
 	ibcWasmLightClientModule := ibcwlc.NewLightClientModule(*appKeepers.IBCWasmClientKeeper, storeProvider)
 	clientKeeper.AddRoute(ibctm.ModuleName, &tmLightClientModule)

app/upgrades/v024/upgrades.go

@@ -32,7 +32,9 @@ func CreateV024Upgrade(mm *module.Manager, configurator module.Configurator, bpm
 		// retrieve config.toml
 		appConfigPath := filepath.Join(homepath, "config", "config.toml")
 		configBytes, err := os.ReadFile(appConfigPath)
-
+		if err != nil {
+			return nil, err
+		}
 		// unmarshal file
 		var config map[string]interface{}
 		if err := toml.Unmarshal(configBytes, &config); err != nil {

cmd/bitsongd/cmd/root.go

@@ -257,6 +257,8 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) {
 	testnetserver.AddTestnetCreatorCommand(rootCmd, newTestnetApp, addModuleInitFlags)
 	wasmcli.ExtendUnsafeResetAllCmd(rootCmd)
 
+	// TODO: spin up a streaming oracle
+
 	// add keybase, auxiliary RPC, query, and tx child commands
 	rootCmd.AddCommand(
 		server.StatusCommand(),
@@ -265,7 +267,6 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) {
 		queryCommand(),
 		txCommand(),
 		keys.Commands(),
-		server.ExportCmd(appExport, bitsong.DefaultNodeHome),
 	)
 }
 

tests/ict/setup.go

@@ -69,7 +69,7 @@ var (
 		GasAdjustment:       2.0,
 		TrustingPeriod:      "112h",
 		NoHostMount:         false,
-		ConfigFileOverrides: nil,
+		ConfigFileOverrides: nil, // TODO: use faster blocks
 		EncodingConfig:      btsgEncoding(),
 		ModifyGenesis:       cosmos.ModifyGenesis(defaultGenesisKV),
 	}