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.

Sign up for GitHub

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

Backmerge v0.3.x #260

Merged
merged 17 commits into from
Dec 22, 2021
Merged

Backmerge v0.3.x #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d9c8935
Create and recursively chown .cheqnode directory
ankurdotb Nov 13, 2021
d9c5d70
Update postremove script to mop-up system service configurations for …
ankurdotb Nov 13, 2021
8a2d47e
Updated Debian package installer details
ankurdotb Nov 13, 2021
336474c
Update postinst script
Toktar Nov 13, 2021
3c0795d
Fix upgrade handler for 0.3 packages
Dec 13, 2021
68e3205
Add namespace adding
Dec 13, 2021
83c4e8b
Merge pull request #254 from cheqd/upgrade_handler
Toktar Dec 14, 2021
83a2d69
Bump cosmos sdk to v0.44.5
askolesov Dec 16, 2021
1be5b62
Bump tenderming to v0.34.15
askolesov Dec 16, 2021
473118e
Fix state export
askolesov Dec 20, 2021
358a104
Merge pull request #257 from cheqd/bugfix/state-export
askolesov Dec 21, 2021
2fe4e9c
Merge branch 'main_v0.2.x' into main_v0.3.x
askolesov Dec 21, 2021
7c7ff23
Merge branch 'main_v0.3.x' into main
askolesov Dec 21, 2021
2027652
Tidy go modules
askolesov Dec 21, 2021
7cd5909
Fix commission withdraw in state export
askolesov Dec 21, 2021
6a24ccb
Merge pull request #261 from cheqd/bugfix/withdraw_in_state_export
Toktar Dec 21, 2021
2d378db
Merge branch 'main_v0.3.x' into backmerge_v0.3.x
askolesov Dec 21, 2021
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
11 changes: 10 additions & 1 deletion app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,10 @@ func New(
// Upgrade handler
app.UpgradeKeeper.SetUpgradeHandler("v0.3", func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
ctx.Logger().Info("Handler for upgrade plan: v0.3")
return fromVM, nil

app.TestNetMigration(ctx)
initialVM := app.mm.GetVersionMap()
return initialVM, nil
})

app.UpgradeKeeper.SetUpgradeHandler("v0.4", func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
Expand Down Expand Up @@ -496,6 +499,12 @@ func (app *App) EndBlocker(ctx sdk.Context, req abci.RequestEndBlock) abci.Respo
return app.mm.EndBlock(ctx, req)
}

func (app *App) TestNetMigration(ctx sdk.Context) {
if ctx.ChainID() == "cheqd-testnet-2" {
app.cheqdKeeper.SetDidNamespace(ctx, "testnet")
}
}

// InitChainer application update at chain initialization
func (app *App) InitChainer(ctx sdk.Context, req abci.RequestInitChain) abci.ResponseInitChain {
// FIXME: This should have been done from the beginning.
Expand Down
8 changes: 7 additions & 1 deletion app/export.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,11 @@ func (app *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []str

// withdraw all validator commission
app.StakingKeeper.IterateValidators(ctx, func(_ int64, val stakingtypes.ValidatorI) (stop bool) {
accumCommission := app.DistrKeeper.GetValidatorAccumulatedCommission(ctx, val.GetOperator())
if accumCommission.Commission.IsZero() {
return false
}

_, err := app.DistrKeeper.WithdrawValidatorCommission(ctx, val.GetOperator())
if err != nil {
panic(err)
Expand Down Expand Up @@ -150,7 +155,8 @@ func (app *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []str
counter := int16(0)

for ; iter.Valid(); iter.Next() {
addr := sdk.ValAddress(iter.Key()[1:])
// The first byte is used for collection prefix, the second - for addr length
addr := sdk.ValAddress(iter.Key()[2:])
validator, found := app.StakingKeeper.GetValidator(ctx, addr)
if !found {
panic("expected validator, not found")
Expand Down
5 changes: 2 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ require (
github.com/grpc-ecosystem/grpc-gateway v1.16.0
github.com/multiformats/go-multibase v0.0.3
github.com/rakyll/statik v0.1.7
github.com/spf13/cast v1.3.1
github.com/spf13/cast v1.4.1
github.com/spf13/cobra v1.2.1
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.8.1
github.com/spf13/viper v1.9.0
github.com/stretchr/testify v1.7.0
github.com/tendermint/tendermint v0.34.14
github.com/tendermint/tm-db v0.6.4
Expand Down Expand Up @@ -58,7 +58,6 @@ require (
github.com/gogo/gateway v1.1.0 // indirect
github.com/golang/snappy v0.0.3 // indirect
github.com/google/btree v1.0.0 // indirect
github.com/google/go-cmp v0.5.6 // indirect
github.com/google/orderedcode v0.0.1 // indirect
github.com/gorilla/handlers v1.5.1 // indirect
github.com/gorilla/websocket v1.4.2 // indirect
Expand Down
Loading