Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: add cosmwasm_1_3 feature, use capabilities from wasm keeper #8764

Merged
merged 4 commits into from
Oct 17, 2024
+4 −12
Merged

fix: add cosmwasm_1_3 feature, use capabilities from wasm keeper #8764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b25bca5
Use capabilities
mattverse Oct 9, 2024
f477db7
fix test
mattverse Oct 9, 2024
5c9259b
Add changelog
mattverse Oct 9, 2024
e89f6d5
Merge branch 'main' into mattverse/wasm-capa
mattverse Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

* [#8682](https://github.com/osmosis-labs/osmosis/pull/8682) chore: bump cosmwasm-optimizer
* [#8734](https://github.com/osmosis-labs/osmosis/pull/8734) chore: update cosmwasm vm
* [#8764](https://github.com/osmosis-labs/osmosis/pull/8764) chore: add cosmwasm 1_3 feature

### Config

Expand Down
15 changes: 3 additions & 12 deletions app/keepers/keepers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,17 +574,8 @@ func (appKeepers *AppKeepers) InitNormalKeepers(
// if we want to allow any custom callbacks
// The last arguments can contain custom message handlers, and custom query handlers,
// if we want to allow any custom callbacks
supportedFeatures := []string{
"iterator",
"staking",
"stargate",
"osmosis",
"cosmwasm_1_1",
"cosmwasm_1_2",
"cosmwasm_1_4",
"cosmwasm_2_0",
"cosmwasm_2_1",
}
wasmCapabilities := wasmkeeper.BuiltInCapabilities()
wasmCapabilities = append(wasmCapabilities, "osmosis")

wasmOpts = append(owasm.RegisterCustomPlugins(appKeepers.BankKeeper, appKeepers.TokenFactoryKeeper), wasmOpts...)
wasmOpts = append(owasm.RegisterStargateQueries(*bApp.GRPCQueryRouter(), appCodec), wasmOpts...)
Expand All @@ -605,7 +596,7 @@ func (appKeepers *AppKeepers) InitNormalKeepers(
bApp.GRPCQueryRouter(),
wasmDir,
wasmConfig,
supportedFeatures,
wasmCapabilities,
authtypes.NewModuleAddress(govtypes.ModuleName).String(),
wasmOpts...,
)
Expand Down