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

chore: apply detached x/wasmd #129

Merged
merged 2 commits into from
Jan 20, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ Ref: https://keepachangelog.com/en/1.0.0/

### Features
* (build) [\#126](https://github.com/line/lbm/pull/126) Automatically generates release note and binaries
* (x/wasmd) [\#355](https://github.com/line/lbm/pull/355) chore: apply detached x/wasmd

### Improvements

Expand Down
9 changes: 4 additions & 5 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,10 @@ import (
upgradeclient "github.com/line/lbm-sdk/x/upgrade/client"
upgradekeeper "github.com/line/lbm-sdk/x/upgrade/keeper"
upgradetypes "github.com/line/lbm-sdk/x/upgrade/types"
"github.com/line/lbm-sdk/x/wasm"
wasmclient "github.com/line/lbm-sdk/x/wasm/client"
wasmkeeper "github.com/line/lbm-sdk/x/wasm/keeper"
wasmlbmtypes "github.com/line/lbm-sdk/x/wasm/lbmtypes"
"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"

Expand Down Expand Up @@ -145,7 +145,6 @@ var (
distrtypes.ModuleName: nil,
foundation.ModuleName: nil,
foundation.TreasuryName: nil,
foundation.GovMinterName: {authtypes.Minter},
minttypes.ModuleName: {authtypes.Minter},
stakingtypes.BondedPoolName: {authtypes.Burner, authtypes.Staking},
stakingtypes.NotBondedPoolName: {authtypes.Burner, authtypes.Staking},
Expand Down
4 changes: 2 additions & 2 deletions cli_test/test_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,16 @@ import (
stakingcli "github.com/line/lbm-sdk/x/staking/client/cli"
staking "github.com/line/lbm-sdk/x/staking/types"
"github.com/line/lbm-sdk/x/stakingplus"
wasmcli "github.com/line/lbm-sdk/x/wasm/client/cli"
wasmcli "github.com/line/wasmd/x/wasm/client/cli"

wasmtypes "github.com/line/lbm-sdk/x/wasm/types"
ostcmd "github.com/line/ostracon/cmd/ostracon/commands"
ostcfg "github.com/line/ostracon/config"
ostflags "github.com/line/ostracon/libs/cli/flags"
"github.com/line/ostracon/libs/log"
osthttp "github.com/line/ostracon/rpc/client/http"
ostctypes "github.com/line/ostracon/rpc/core/types"
osttypes "github.com/line/ostracon/types"
wasmtypes "github.com/line/wasmd/x/wasm/types"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions cmd/lbm/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@ import (
banktypes "github.com/line/lbm-sdk/x/bank/types"
"github.com/line/lbm-sdk/x/crisis"
genutilcli "github.com/line/lbm-sdk/x/genutil/client/cli"
"github.com/line/lbm-sdk/x/wasm"
lbmtypes "github.com/line/lbm/types"
ostcli "github.com/line/ostracon/libs/cli"
"github.com/line/ostracon/libs/log"
"github.com/line/wasmd/x/wasm"
wasmkeeper "github.com/line/wasmd/x/wasm/keeper"
"github.com/prometheus/client_golang/prometheus"
"github.com/spf13/cast"
"github.com/spf13/cobra"
"github.com/spf13/viper"
dbm "github.com/tendermint/tm-db"

wasmkeeper "github.com/line/lbm-sdk/x/wasm/keeper"
"github.com/line/lbm/app"
"github.com/line/lbm/app/params"
)
Expand Down
41 changes: 21 additions & 20 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ 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.0
github.com/line/lbm-sdk v0.46.1-0.20230106043757-1ece23d83a0b
github.com/line/ostracon v1.0.7
github.com/prometheus/client_golang v1.13.1
github.com/line/wasmd v0.0.0-20230110072924-cae21ecd251c
github.com/prometheus/client_golang v1.14.0
github.com/rakyll/statik v0.1.7
github.com/spf13/cast v1.5.0
github.com/spf13/cobra v1.6.1
github.com/spf13/viper v1.13.0
github.com/spf13/viper v1.14.0
github.com/stretchr/testify v1.8.1
github.com/tendermint/tm-db v0.6.7
)
Expand All @@ -29,13 +30,13 @@ require (
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/coinbase/rosetta-sdk-go v0.8.1 // indirect
github.com/confio/ics23/go v0.7.0 // indirect
github.com/coinbase/rosetta-sdk-go v0.8.2 // indirect
github.com/confio/ics23/go v0.9.0 // indirect
github.com/coniks-sys/coniks-go v0.0.0-20180722014011-11acf4819b71 // indirect
github.com/cosmos/btcutil v1.0.4 // indirect
github.com/cosmos/go-bip39 v1.0.0 // indirect
github.com/cosmos/gorocksdb v1.2.0 // indirect
github.com/cosmos/iavl v0.19.3 // indirect
github.com/cosmos/iavl v0.19.4 // indirect
github.com/cosmos/ledger-cosmos-go v0.11.1 // indirect
github.com/cosmos/ledger-go v0.9.2 // indirect
github.com/danieljoos/wincred v1.0.2 // indirect
Expand All @@ -47,7 +48,7 @@ require (
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/dvsekhvalnov/jose2go v0.0.0-20200901110807-248326c1351b // indirect
github.com/felixge/httpsnoop v1.0.1 // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-kit/kit v0.12.0 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
Expand Down Expand Up @@ -82,11 +83,11 @@ require (
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
github.com/line/tm-db/v2 v2.0.0-init.1.0.20220121012851-61d2bc1d9486 // indirect
github.com/line/wasmvm v1.0.0-0.10.0 // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.17 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643 // indirect
github.com/minio/highwayhash v1.0.2 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
Expand All @@ -97,16 +98,16 @@ require (
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.39.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/r2ishiguro/vrf v0.0.0-20180716233122-192de52975eb // indirect
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect
github.com/regen-network/cosmos-proto v0.3.1 // indirect
github.com/rs/cors v1.8.2 // indirect
github.com/rs/zerolog v1.28.0 // indirect
github.com/sasha-s/go-deadlock v0.3.1 // indirect
github.com/spf13/afero v1.8.2 // indirect
github.com/spf13/afero v1.9.2 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.4.1 // indirect
Expand All @@ -117,13 +118,13 @@ require (
github.com/tendermint/tendermint v0.34.20 // indirect
github.com/zondax/hid v0.9.0 // indirect
go.etcd.io/bbolt v1.3.6 // indirect
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
golang.org/x/crypto v0.4.0 // indirect
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
golang.org/x/net v0.0.0-20220617184016-355a448f1bc9 // indirect
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect
golang.org/x/text v0.3.7 // indirect
google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect
golang.org/x/net v0.4.0 // indirect
golang.org/x/sys v0.3.0 // indirect
golang.org/x/term v0.3.0 // indirect
golang.org/x/text v0.5.0 // indirect
google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e // indirect
google.golang.org/grpc v1.50.1 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
Expand Down
Loading