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.

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

Update wasmd to v0.44.0 & IBC to v7.3.1 #707

Merged
merged 8 commits into from
Nov 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ jobs:
with:
repository: CoreumFoundation/crust
path: crust
# FIXME(dzmotryhil) replace with master on we merge it
ref: dzmitryhil/wasm-v0.44.0
- name: Set up crust
run: echo "$(pwd)/crust/bin" >> $GITHUB_PATH
- name: Setup go cache
Expand Down
4 changes: 4 additions & 0 deletions app/amino_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"testing"
_ "unsafe"

wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
sdktestdatatypes "github.com/cosmos/cosmos-sdk/testutil/testdata"
sdk "github.com/cosmos/cosmos-sdk/types"
sdktxtypes "github.com/cosmos/cosmos-sdk/types/tx"
Expand Down Expand Up @@ -85,6 +86,9 @@ func TestLegacyAmino_ExpectedMessages(t *testing.T) {
// internal cosmos
sdk.MsgTypeURL(&sdktestdatatypes.MsgCreateDog{}): {},
sdk.MsgTypeURL(&sdktxtypes.Tx{}): {},

// wasm
sdk.MsgTypeURL(&wasmtypes.MsgUpdateContractLabel{}): {},
}

for protoType := range revProtoTypes {
Expand Down
18 changes: 6 additions & 12 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ import (
ibctm "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
ibclocalhost "github.com/cosmos/ibc-go/v7/modules/light-clients/09-localhost"
"github.com/pkg/errors"
"github.com/prometheus/client_golang/prometheus"
"github.com/spf13/cast"

"github.com/CoreumFoundation/coreum/v3/app/openapi"
Expand Down Expand Up @@ -608,18 +609,15 @@ func New(
)),
}

// FIXME (wasmd-1575): This is commented out temporarily because it causes panics in telemetry server due to buggy
// initialization of wasm vm in version v0.41 of wasmd.
// Bug has been already fixed here: https://github.com/CosmWasm/wasmd/pull/1575
// and will be released in v0.42.
// if cast.ToBool(appOpts.Get("telemetry.enabled")) {
// wasmOpts = append(wasmOpts, wasmkeeper.WithVMCacheMetrics(prometheus.DefaultRegisterer))
// }
if cast.ToBool(appOpts.Get("telemetry.enabled")) {
wasmOpts = append(wasmOpts, wasmkeeper.WithVMCacheMetrics(prometheus.DefaultRegisterer))
}

// The last arguments can contain custom message handlers, and custom query handlers,
// if we want to allow any custom callbacks
// See https://github.com/CosmWasm/cosmwasm/blob/main/docs/CAPABILITIES-BUILT-IN.md
availableCapabilities := "iterator,staking,stargate,cosmwasm_1_1,cosmwasm_1_2,cosmwasm_1_3"
availableCapabilities := "iterator,staking,stargate,cosmwasm_1_1,cosmwasm_1_2,cosmwasm_1_3,cosmwasm_1_4"

app.WasmKeeper = wasmkeeper.NewKeeper(
appCodec,
keys[wasmtypes.StoreKey],
Expand All @@ -641,10 +639,6 @@ func New(
wasmOpts...,
)

// enable all wasm proposals
// FIXME(v47-legacy): remove once we finish with full migration
govRouter.AddRoute(wasmtypes.RouterKey, wasmkeeper.NewWasmProposalHandler(app.WasmKeeper, wasmtypes.EnableAllProposals)) //nolint:staticcheck // we need to keep backward compatibility

// FIXME(v4): drop once we drop gov v1beta1 compatibility.
// Set legacy router for backwards compatibility with gov v1beta1
app.GovKeeper.SetLegacyRouter(govRouter)
Expand Down
Loading
Loading