diff --git a/app/app.go b/app/app.go index 0aa1b731..b1b6eb11 100644 --- a/app/app.go +++ b/app/app.go @@ -93,7 +93,6 @@ import ( "github.com/line/wasmd/x/wasm" wasmclient "github.com/line/wasmd/x/wasm/client" wasmkeeper "github.com/line/wasmd/x/wasm/keeper" - wasmlbmtypes "github.com/line/wasmd/x/wasm/lbmtypes" appparams "github.com/line/lbm/app/params" @@ -285,7 +284,7 @@ func NewLinkApp( appCodec, keys[authtypes.StoreKey], app.GetSubspace(authtypes.ModuleName), authtypes.ProtoBaseAccount, maccPerms, ) app.BankKeeper = bankpluskeeper.NewBaseKeeper( - appCodec, keys[banktypes.StoreKey], app.AccountKeeper, app.GetSubspace(banktypes.ModuleName), app.BlockedAddrs(), + appCodec, keys[banktypes.StoreKey], app.AccountKeeper, app.GetSubspace(banktypes.ModuleName), app.BlockedAddrs(), true, ) stakingKeeper := stakingkeeper.NewKeeper( appCodec, keys[stakingtypes.StoreKey], app.AccountKeeper, app.BankKeeper, app.GetSubspace(stakingtypes.ModuleName), @@ -351,8 +350,6 @@ func NewLinkApp( wasmDir, wasmConfig, supportedFeatures, - nil, - nil, wasmOpts..., ) @@ -362,7 +359,7 @@ func NewLinkApp( AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(app.ParamsKeeper)). AddRoute(distrtypes.RouterKey, distr.NewCommunityPoolSpendProposalHandler(app.DistrKeeper)). AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(app.UpgradeKeeper)). - AddRoute(wasm.RouterKey, wasmkeeper.NewWasmProposalHandler(app.WasmKeeper, wasmlbmtypes.EnableAllProposals)) + AddRoute(wasm.RouterKey, wasmkeeper.NewWasmProposalHandler(app.WasmKeeper, wasm.EnableAllProposals)) govKeeper := govkeeper.NewKeeper( appCodec, keys[govtypes.StoreKey], app.GetSubspace(govtypes.ModuleName), app.AccountKeeper, app.BankKeeper, diff --git a/go.mod b/go.mod index 8fdf842f..4f4b196b 100644 --- a/go.mod +++ b/go.mod @@ -5,9 +5,9 @@ go 1.18 require ( github.com/golang/mock v1.6.0 github.com/gorilla/mux v1.8.0 - github.com/line/lbm-sdk v0.46.1-0.20230203145231-ef335aa722a7 + github.com/line/lbm-sdk v0.46.1-0.20230206030416-a7557b1d1029 github.com/line/ostracon v1.0.7 - github.com/line/wasmd v0.0.0-20230126123700-4c460775b510 + github.com/line/wasmd v0.0.0-20230209081529-e0d9c95a8af8 github.com/prometheus/client_golang v1.14.0 github.com/rakyll/statik v0.1.7 github.com/spf13/cast v1.5.0 diff --git a/go.sum b/go.sum index c16a1953..dfc848b6 100644 --- a/go.sum +++ b/go.sum @@ -421,12 +421,14 @@ github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-b github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= github.com/line/ibc-go/v3 v3.3.1 h1:tcyOlWoPbNnRhASJMdfXVzEOmqPs9kM2c/25siH++cw= github.com/line/ibc-go/v3 v3.3.1/go.mod h1:jqimrnKidXAxySD2axhpuBUSFZEyxHiLhLoLJGOZMss= -github.com/line/lbm-sdk v0.46.1-0.20230203145231-ef335aa722a7 h1:KuJUg0cU7d0Y2+NDCDnkymPJzGB11K2c5IZ3FUZUuWw= -github.com/line/lbm-sdk v0.46.1-0.20230203145231-ef335aa722a7/go.mod h1:1ETe81CehDdQ88NRCNRaauVf1F+kyDk0dexQLpzNGLs= +github.com/line/lbm-sdk v0.46.1-0.20230206030416-a7557b1d1029 h1:tHlX8LruyuAFIN1LTtwA8CRPq2ipM0DAvX+RwODbbfo= +github.com/line/lbm-sdk v0.46.1-0.20230206030416-a7557b1d1029/go.mod h1:1ETe81CehDdQ88NRCNRaauVf1F+kyDk0dexQLpzNGLs= github.com/line/ostracon v1.0.7 h1:8vh/gsM6Sf6z2s38og8YufIhrWN2TwXpm4I3DqKEVyI= github.com/line/ostracon v1.0.7/go.mod h1:gmEKYdaMaDAl5xJ8sJJo0s6OvzBSZwM01nWRCGA5oDY= github.com/line/wasmd v0.0.0-20230126123700-4c460775b510 h1:tk3k8WFnIU/KMRgncYuz1kmryKJOrV3Ry7EPEIHQBjY= github.com/line/wasmd v0.0.0-20230126123700-4c460775b510/go.mod h1:dyRiks97NpT+qW7JxSNxquM3O/YkT1mF7sb1Lqnva+c= +github.com/line/wasmd v0.0.0-20230209081529-e0d9c95a8af8 h1:zGzMlzhFb0KXS8J5NDIBDaPy22wDqFfE86O90OxR2/M= +github.com/line/wasmd v0.0.0-20230209081529-e0d9c95a8af8/go.mod h1:XTegi+GSbAJQJkV5SAE0fG/E5k1IFiln7fyi13ykMDk= github.com/line/wasmvm v1.1.1-0.11.0.0.20230113085344-89650a7edd05 h1:Gtz45izC5JFrS+H35rEJ/TEgdXJr+3WSpkynRk52M5U= github.com/line/wasmvm v1.1.1-0.11.0.0.20230113085344-89650a7edd05/go.mod h1:Lq3FVvi/rb+OOlTxqtcqcao2GGESQ4hUpuXMcjdJbco= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=