diff --git a/.github/images/builder.Dockerfile b/.github/images/builder.Dockerfile index eda693af..a90a7432 100644 --- a/.github/images/builder.Dockerfile +++ b/.github/images/builder.Dockerfile @@ -14,7 +14,7 @@ RUN set -eux; apk add --no-cache ca-certificates build-base; RUN apk add git -ARG WASMVM_VERSION="v1.2.3" +ARG WASMVM_VERSION="v1.3.0" ARG WASMVM_LIB="libwasmvm_muslc.x86_64.a" ARG WASMVM_BASE_URL="https://github.com/CosmWasm/wasmvm/releases/download/$WASMVM_VERSION" ARG WASMVM_URL="$WASMVM_BASE_URL/$WASMVM_LIB" diff --git a/app/modules.go b/app/modules.go index daae0f1c..67d70fda 100644 --- a/app/modules.go +++ b/app/modules.go @@ -87,7 +87,7 @@ var maccPerms = map[string][]string{ // non-dependant module elements, such as codec registration // and genesis verification. var ModuleBasics = module.NewBasicManager( - genutil.AppModuleBasic{}, + genutil.NewAppModuleBasic(genutiltypes.DefaultMessageValidator), auth.AppModuleBasic{}, bank.AppModuleBasic{}, capability.AppModuleBasic{}, diff --git a/cmd/nolusd/root.go b/cmd/nolusd/root.go index b0fd97d4..9d603be0 100644 --- a/cmd/nolusd/root.go +++ b/cmd/nolusd/root.go @@ -11,6 +11,7 @@ import ( tmcfg "github.com/cometbft/cometbft/config" tmcli "github.com/cometbft/cometbft/libs/cli" "github.com/cometbft/cometbft/libs/log" + tmtypes "github.com/cometbft/cometbft/types" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/config" @@ -351,6 +352,23 @@ func (a appCreator) newApp( panic(err) } + homePath, ok := appOpts.Get(flags.FlagHome).(string) + if !ok || homePath == "" { + logger.Error("application home not set, using DefaultNodeHome") + homePath = app.DefaultNodeHome + } + + chainID := cast.ToString(appOpts.Get(flags.FlagChainID)) + if chainID == "" { + // fallback to genesis chain-id + appGenesis, err := tmtypes.GenesisDocFromFile(filepath.Join(homePath, "config", "genesis.json")) + if err != nil { + panic(err) + } + + chainID = appGenesis.ChainID + } + return app.New( logger, db, @@ -373,6 +391,7 @@ func (a appCreator) newApp( Interval: cast.ToUint64(appOpts.Get(server.FlagStateSyncSnapshotInterval)), KeepRecent: cast.ToUint32(appOpts.Get(server.FlagStateSyncSnapshotKeepRecent)), }), + baseapp.SetChainID(chainID), ) } diff --git a/scripts/internal/genesis.sh b/scripts/internal/genesis.sh index 17bf4e7f..4922fa9a 100644 --- a/scripts/internal/genesis.sh +++ b/scripts/internal/genesis.sh @@ -185,6 +185,7 @@ __set_token_denominations() { | jq '.app_state["crisis"]["constant_fee"]["denom"]="'"$currency"'"' \ | jq '.app_state["gov"]["deposit_params"]["min_deposit"][0]["denom"]="'"$currency"'"' \ | jq '.app_state["gov"]["deposit_params"]["min_deposit"][0]["denom"]="'"$currency"'"' \ + | jq '.app_state["gov"]["params"]["min_deposit"][0]["denom"]="'"$currency"'"' \ | jq '.app_state["tax"]["params"]["base_denom"]="'"$currency"'"' \ | jq '.app_state["mint"]["params"]["mint_denom"]="'"$currency"'"' > "$genesis_tmp_file" mv "$genesis_tmp_file" "$genesis_file" diff --git a/wasmbinding/query_plugin.go b/wasmbinding/query_plugin.go index ab137eb8..50f7de29 100644 --- a/wasmbinding/query_plugin.go +++ b/wasmbinding/query_plugin.go @@ -14,5 +14,8 @@ type QueryPlugin struct { // NewQueryPlugin returns a reference to a new QueryPlugin. func NewQueryPlugin(icaControllerKeeper *icacontrollerkeeper.Keeper, icqKeeper *icqkeeper.Keeper, feeRefunderKeeper *feerefunderkeeper.Keeper) *QueryPlugin { - return &QueryPlugin{icaControllerKeeper: icaControllerKeeper, icqKeeper: icqKeeper, feeRefunderKeeper: feeRefunderKeeper} + return &QueryPlugin{ + icaControllerKeeper: icaControllerKeeper, + icqKeeper: icqKeeper, + feeRefunderKeeper: feeRefunderKeeper} }