Skip to content

Commit

Permalink
feat: bump github.com/line/lbm-sdk from 66988a235 to 0.46.0-rc9 (#111)
Browse files Browse the repository at this point in the history
* Bump github.com/line/lbm-sdk to 15168bfb5

* Bump github.com/line/lbm-sdk to 392277a33

* Bump github.com/line/lbm-sdk to 4fcf9858e

Bump actions/setup-go to 3.3.1

* Bump github.com/line/lbm-sdk to fee8f643a

* Bump github.com/line/lbm-sdk to aa713c490

* Bump github.com/line/lbm-sdk to e25624dbe

Bump github.com/stretchr/testify to 1.8.1

* Bump github.com/line/lbm-sdk to 715a8f5f9

Bump github.com/spf13/cobra to 1.6.1

* Bump github.com/line/lbm-sdk to ea17c5a2e

* Bump github.com/line/lbm-sdk to eb1b5e2f9

* Bump github.com/line/lbm-sdk to v0.46.0-rc9

* Update CHANGELOG.md

* Lint
  • Loading branch information
0Tech committed Oct 28, 2022
1 parent c85bc2e commit 31bcd5f
Show file tree
Hide file tree
Showing 10 changed files with 531 additions and 122 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
**/**.go
go.mod
go.sum
- uses: actions/setup-go@v3.2.1
- uses: actions/setup-go@v3.3.1
with:
go-version: 1.18
- uses: golangci/golangci-lint-action@v3
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/sims.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
if: "!contains(github.event.head_commit.message, 'skip-sims')"
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3.2.1
- uses: actions/setup-go@v3.3.1
with:
go-version: 1.18
- name: Display go version
Expand All @@ -33,7 +33,7 @@ jobs:
runs-on: self-hosted
needs: build
steps:
- uses: actions/setup-go@v3.2.1
- uses: actions/setup-go@v3.3.1
with:
go-version: 1.18
- name: Display go version
Expand All @@ -50,7 +50,7 @@ jobs:
needs: [build, install-runsim]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3.2.1
- uses: actions/setup-go@v3.3.1
with:
go-version: 1.18
- name: Display go version
Expand All @@ -76,7 +76,7 @@ jobs:
needs: [build, install-runsim]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3.2.1
- uses: actions/setup-go@v3.3.1
with:
go-version: 1.18
- name: Display go version
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
needs: [build, install-runsim]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3.2.1
- uses: actions/setup-go@v3.3.1
with:
go-version: 1.18
- name: Display go version
Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
needs: [build, install-runsim]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3.2.1
- uses: actions/setup-go@v3.3.1
with:
go-version: 1.18
- name: Display go version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Install Go
uses: actions/setup-go@v3.2.1
uses: actions/setup-go@v3.3.1
with:
go-version: 1.18
# - name: Unshallow
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
install-tparse:
runs-on: self-hosted
steps:
- uses: actions/setup-go@v3.2.1
- uses: actions/setup-go@v3.3.1
with:
go-version: 1.18
- name: Display go version
Expand All @@ -39,7 +39,7 @@ jobs:
go-arch: ["amd64"]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3.2.1
- uses: actions/setup-go@v3.3.1
with:
go-version: 1.18
- uses: technote-space/get-diff-action@v6.1.1
Expand All @@ -56,7 +56,7 @@ jobs:
runs-on: self-hosted
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3.2.1
- uses: actions/setup-go@v3.3.1
with:
go-version: 1.18
- name: Create a file with all the pkgs
Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
part: ["00", "01", "02", "03"]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3.2.1
- uses: actions/setup-go@v3.3.1
with:
go-version: 1.18
- uses: technote-space/get-diff-action@v6.1.1
Expand Down Expand Up @@ -169,7 +169,7 @@ jobs:
part: ["00", "01", "02", "03"]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3.2.1
- uses: actions/setup-go@v3.3.1
with:
go-version: 1.18
- uses: technote-space/get-diff-action@v6.1.1
Expand Down Expand Up @@ -237,7 +237,7 @@ jobs:
part: ["00", "01", "02", "03"]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3.2.1
- uses: actions/setup-go@v3.3.1
with:
go-version: 1.18
- uses: technote-space/get-diff-action@v6.1.1
Expand Down Expand Up @@ -301,7 +301,7 @@ jobs:
needs: [build, tests]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3.2.1
- uses: actions/setup-go@v3.3.1
with:
go-version: 1.18
- name: Install docker-compose
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@ Ref: https://keepachangelog.com/en/1.0.0/
## [Unreleased]

### Features
* [\#108](https://github.com/line/lbm/pull/108) bump github.com/line/lbm-sdk from e19f863a8 to a389b6330
* [\#108](https://github.com/line/lbm/pull/108) Bump github.com/line/lbm-sdk from e19f863a8 to a389b6330
* [\#110](https://github.com/line/lbm/pull/110) apply GovMint on x/foundation
* [\#111](https://github.com/line/lbm/pull/111) Bump github.com/line/lbm-sdk from 66988a235 to 0.46.0-rc9

### Improvements

Expand Down
11 changes: 4 additions & 7 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ import (
feegrantkeeper "github.com/line/lbm-sdk/x/feegrant/keeper"
feegrantmodule "github.com/line/lbm-sdk/x/feegrant/module"
"github.com/line/lbm-sdk/x/foundation"
foundationclient "github.com/line/lbm-sdk/x/foundation/client"
foundationkeeper "github.com/line/lbm-sdk/x/foundation/keeper"
foundationmodule "github.com/line/lbm-sdk/x/foundation/module"
"github.com/line/lbm-sdk/x/genutil"
Expand Down Expand Up @@ -123,7 +122,6 @@ var (
gov.NewAppModuleBasic(
append(
wasmclient.ProposalHandlers,
foundationclient.UpdateFoundationParamsProposalHandler,
paramsclient.ProposalHandler,
distrclient.ProposalHandler,
upgradeclient.ProposalHandler,
Expand All @@ -145,8 +143,8 @@ var (
maccPerms = map[string][]string{
authtypes.FeeCollectorName: nil,
distrtypes.ModuleName: nil,
foundation.ModuleName: nil,
foundation.TreasuryName: nil,
foundation.AdministratorName: nil,
foundation.GovMinterName: {authtypes.Minter},
minttypes.ModuleName: {authtypes.Minter},
stakingtypes.BondedPoolName: {authtypes.Burner, authtypes.Staking},
Expand All @@ -156,7 +154,7 @@ var (

// module accounts that are allowed to receive tokens
allowedReceivingModAcc = map[string]bool{
distrtypes.ModuleName: true,
// govtypes.ModuleName: true, // TODO: uncomment it when authority is ready
}
)

Expand Down Expand Up @@ -304,7 +302,7 @@ func NewLinkApp(
app.FeeGrantKeeper = feegrantkeeper.NewKeeper(appCodec, keys[feegrant.StoreKey], app.AccountKeeper)
app.UpgradeKeeper = upgradekeeper.NewKeeper(skipUpgradeHeights, keys[upgradetypes.StoreKey], appCodec, homePath, app.BaseApp)
foundationConfig := foundation.DefaultConfig()
app.FoundationKeeper = foundationkeeper.NewKeeper(appCodec, keys[foundation.StoreKey], app.BaseApp.MsgServiceRouter(), app.AccountKeeper, app.BankKeeper, stakingKeeper, authtypes.FeeCollectorName, foundationConfig)
app.FoundationKeeper = foundationkeeper.NewKeeper(appCodec, keys[foundation.StoreKey], app.BaseApp.MsgServiceRouter(), app.AccountKeeper, app.BankKeeper, authtypes.FeeCollectorName, foundationConfig, foundation.DefaultAuthority().String())

// register the staking hooks
// NOTE: stakingKeeper above is passed by reference, so that it will contain these hooks
Expand Down Expand Up @@ -359,7 +357,6 @@ func NewLinkApp(
AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(app.ParamsKeeper)).
AddRoute(distrtypes.RouterKey, distr.NewCommunityPoolSpendProposalHandler(app.DistrKeeper)).
AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(app.UpgradeKeeper)).
AddRoute(foundation.RouterKey, foundationkeeper.NewProposalHandler(app.FoundationKeeper)).
AddRoute(wasm.RouterKey, wasmkeeper.NewWasmProposalHandler(app.WasmKeeper, wasmlbmtypes.EnableAllProposals))

govKeeper := govkeeper.NewKeeper(
Expand Down Expand Up @@ -397,7 +394,7 @@ func NewLinkApp(
capability.NewAppModule(appCodec, *app.CapabilityKeeper),
crisis.NewAppModule(&app.CrisisKeeper, skipGenesisInvariants),
feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry),
foundationmodule.NewAppModule(appCodec, app.FoundationKeeper, app.StakingKeeper),
foundationmodule.NewAppModule(appCodec, app.FoundationKeeper),
gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper),
mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper),
slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper),
Expand Down
6 changes: 3 additions & 3 deletions cli_test/test_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -612,10 +612,10 @@ func (f *Fixtures) TxFoundationGrantCreateValidator(members []sdk.AccAddress, gr

// TxFoundationGrant is lbm tx foundation submit-proposal on grant
func (f *Fixtures) TxFoundationGrant(members []sdk.AccAddress, grantee sdk.AccAddress, authorization foundation.Authorization, flags ...string) (testutil.BufferWriter, error) {
operator := f.QueryFoundationInfo().Info.Operator
authority := foundation.DefaultAuthority()
msg := &foundation.MsgGrant{
Operator: operator,
Grantee: grantee.String(),
Authority: authority.String(),
Grantee: grantee.String(),
}
require.NoError(f.T, msg.SetAuthorization(authorization))

Expand Down
2 changes: 2 additions & 0 deletions cmd/lbm/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ func initAppConfig() (string, interface{}) {
//
// In simapp, we set the min gas prices to 0.
srvCfg.MinGasPrices = "0stake"
// srvCfg.BaseConfig.IAVLDisableFastNode = true // disable fastnode by default

customAppConfig := CustomAppConfig{
Config: *srvCfg,
Expand Down Expand Up @@ -289,6 +290,7 @@ func newApp(logger log.Logger, db dbm.DB, traceStore io.Writer, appOpts serverty
baseapp.SetSnapshotStore(snapshotStore),
baseapp.SetSnapshotInterval(cast.ToUint64(appOpts.Get(server.FlagStateSyncSnapshotInterval))),
baseapp.SetSnapshotKeepRecent(cast.ToUint32(appOpts.Get(server.FlagStateSyncSnapshotKeepRecent))),
baseapp.SetChanCheckTxSize(cast.ToUint(appOpts.Get(server.FlagChanCheckTxSize))),
)
}

Expand Down
14 changes: 7 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +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-rc8.0.20221017154056-66988a235a0e
github.com/line/lbm-sdk v0.46.0-rc9
github.com/line/ostracon v1.0.7-0.20220906074149-e6ecd80874f8
github.com/prometheus/client_golang v1.13.0
github.com/rakyll/statik v0.1.7
github.com/spf13/cast v1.5.0
github.com/spf13/cobra v1.6.0
github.com/spf13/cobra v1.6.1
github.com/spf13/viper v1.13.0
github.com/stretchr/testify v1.8.0
github.com/stretchr/testify v1.8.1
github.com/tendermint/tm-db v0.6.7
)

Expand All @@ -35,7 +35,7 @@ require (
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.17.3 // indirect
github.com/cosmos/iavl v0.19.3 // 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 Down Expand Up @@ -77,7 +77,7 @@ require (
github.com/jmhodges/levigo v1.0.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d // indirect
github.com/klauspost/compress v1.13.6 // indirect
github.com/klauspost/compress v1.15.1 // indirect
github.com/lib/pq v1.10.6 // indirect
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
Expand Down Expand Up @@ -114,13 +114,13 @@ require (
github.com/tendermint/btcd v0.1.1 // indirect
github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 // indirect
github.com/tendermint/go-amino v0.16.0 // indirect
github.com/tendermint/tendermint v0.34.19 // indirect
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/net v0.0.0-20220617184016-355a448f1bc9 // indirect
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // 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
google.golang.org/grpc v1.49.0 // indirect
Expand Down
Loading

0 comments on commit 31bcd5f

Please sign in to comment.