Skip to content

Commit

Permalink
Fix lint errors, remove unused code and fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
@iKapitonau
iKapitonau committed Aug 6, 2024
1 parent 73bdddf commit 71a80eb
Show file tree
Hide file tree
Showing 17 changed files with 121 additions and 193 deletions.
19 changes: 5 additions & 14 deletions app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ import (
sigtypes "github.com/cosmos/cosmos-sdk/types/tx/signing"
txmodule "github.com/cosmos/cosmos-sdk/x/auth/tx/config"

// "github.com/cosmos/cosmos-sdk/simapp"
"github.com/cosmos/cosmos-sdk/runtime"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
Expand All @@ -60,14 +59,11 @@ import (
v1_7 "github.com/scrtlabs/SecretNetwork/app/upgrades/v1.7"
v1_8 "github.com/scrtlabs/SecretNetwork/app/upgrades/v1.8"

// v1_9 "github.com/scrtlabs/SecretNetwork/app/upgrades/v1.9"

icaauthtypes "github.com/scrtlabs/SecretNetwork/x/mauth/types"

"github.com/cosmos/cosmos-sdk/version"
"github.com/cosmos/cosmos-sdk/x/auth/ante"

// authrest "github.com/cosmos/cosmos-sdk/x/auth/client/rest"
evidencetypes "cosmossdk.io/x/evidence/types"
"cosmossdk.io/x/feegrant"
authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
Expand All @@ -84,7 +80,6 @@ import (
capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper"
capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types"

// stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
"cosmossdk.io/log"
upgradetypes "cosmossdk.io/x/upgrade/types"
abci "github.com/cometbft/cometbft/abci/types"
Expand Down Expand Up @@ -118,13 +113,11 @@ var (
}

Upgrades = []upgrades.Upgrade{
// v1_3.Upgrade,
v1_4.Upgrade,
v1_5.Upgrade,
v1_6.Upgrade,
v1_7.Upgrade,
v1_8.Upgrade,
// v1_9.Upgrade,
v1_10.Upgrade,
v1_11.Upgrade,
v1_12.Upgrade,
Expand All @@ -134,7 +127,6 @@ var (

// Verify app interface at compile time
var (
// _ simapp.App = (*SecretNetworkApp)(nil)
_ runtime.AppI = (*SecretNetworkApp)(nil)
_ servertypes.Application = (*SecretNetworkApp)(nil)
)
Expand Down Expand Up @@ -168,10 +160,6 @@ func (app *SecretNetworkApp) GetInterfaceRegistry() types.InterfaceRegistry {
return app.interfaceRegistry
}

func (app *SecretNetworkApp) GetCodec() codec.Codec {
return app.appCodec
}

func (app *SecretNetworkApp) GetBaseApp() *baseapp.BaseApp {
return app.BaseApp
}
Expand Down Expand Up @@ -291,7 +279,8 @@ func NewSecretNetworkApp(

app.AppKeepers.InitSdkKeepers(appCodec, legacyAmino, bApp, ModuleAccountPermissions, app.BlockedAddrs(), invCheckPeriod, skipUpgradeHeights, homePath, logger, &app.event)

enabledSignModes := append(authtx.DefaultSignModes, sigtypes.SignMode_SIGN_MODE_TEXTUAL)
enabledSignModes := authtx.DefaultSignModes
enabledSignModes = append(enabledSignModes, sigtypes.SignMode_SIGN_MODE_TEXTUAL)

signingOpts, err := authtx.NewDefaultSigningOptions()
if err != nil {
Expand Down Expand Up @@ -445,7 +434,9 @@ func (app *SecretNetworkApp) InitChainer(ctx sdk.Context, req *abci.RequestInitC
panic(err)
}

app.AppKeepers.UpgradeKeeper.SetModuleVersionMap(ctx, app.mm.GetVersionMap())
if err := app.AppKeepers.UpgradeKeeper.SetModuleVersionMap(ctx, app.mm.GetVersionMap()); err != nil {
panic(err)
}

return app.mm.InitGenesis(ctx, app.appCodec, genesisState)
}
Expand Down
41 changes: 1 addition & 40 deletions app/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec"
"github.com/cosmos/cosmos-sdk/codec/address"
"github.com/cosmos/cosmos-sdk/codec/types"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
"github.com/cosmos/cosmos-sdk/x/auth"
Expand Down Expand Up @@ -84,14 +83,6 @@ var mbasics = module.NewBasicManager(
)...,
)

func customKVStoreKeys() []string {
return []string{
compute.StoreKey,
registration.StoreKey,
icaauth.StoreKey,
}
}

func customModuleBasics() []module.AppModuleBasic {
return []module.AppModuleBasic{
compute.AppModuleBasic{},
Expand All @@ -109,42 +100,12 @@ func ModuleBasics() module.BasicManager {
// EncodingConfig specifies the concrete encoding types to use for a given app.
// This is provided for compatibility between protobuf and amino implementations.
type EncodingConfig struct {
InterfaceRegistry types.InterfaceRegistry
InterfaceRegistry codectypes.InterfaceRegistry
Codec codec.Codec
TxConfig client.TxConfig
Amino *codec.LegacyAmino
}

// func MakeEncodingConfig() EncodingConfig {
// amino := codec.NewLegacyAmino()
// interfaceRegistry, _ := types.NewInterfaceRegistryWithOptions(types.InterfaceRegistryOptions{
// ProtoFiles: proto.HybridResolver,
// SigningOptions: signing.Options{
// AddressCodec: address.Bech32Codec{
// Bech32Prefix: sdk.GetConfig().GetBech32AccountAddrPrefix(),
// },
// ValidatorAddressCodec: address.Bech32Codec{
// Bech32Prefix: sdk.GetConfig().GetBech32ValidatorAddrPrefix(),
// },
// },
// })
// appCodec := codec.NewProtoCodec(interfaceRegistry)
// txCfg := tx.NewTxConfig(appCodec, tx.DefaultSignModes)

// std.RegisterInterfaces(interfaceRegistry)
// std.RegisterLegacyAminoCodec(amino)

// ModuleBasics().RegisterLegacyAminoCodec(amino)
// ModuleBasics().RegisterInterfaces(interfaceRegistry)

// return EncodingConfig{
// InterfaceRegistry: interfaceRegistry,
// Codec: appCodec,
// TxConfig: txCfg,
// Amino: amino,
// }
// }

type (
CodecOptions struct {
AccAddressPrefix string
Expand Down
1 change: 0 additions & 1 deletion app/encoding.go
View file

This file was deleted.

124 changes: 92 additions & 32 deletions app/export.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ package app

import (
"encoding/json"
"fmt"

cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"

storetypes "cosmossdk.io/store/types"
servertypes "github.com/cosmos/cosmos-sdk/server/types"
Expand All @@ -14,7 +17,7 @@ import (
func (app *SecretNetworkApp) ExportAppStateAndValidators(forZeroHeight bool, jailAllowedAddrs []string, modulesToExport []string,
) (servertypes.ExportedApp, error) {
// as if they could withdraw from the start of the next block
ctx := app.BaseApp.NewContext(true)
ctx := app.NewContextLegacy(true, cmtproto.Header{Height: app.LastBlockHeight()})

// We export at last height + 1, because that's the height at which
// Tendermint will start InitChain.
Expand Down Expand Up @@ -44,7 +47,7 @@ func (app *SecretNetworkApp) ExportAppStateAndValidators(forZeroHeight bool, jai
Validators: validators,
Height: height,
ConsensusParams: app.BaseApp.GetConsensusParams(ctx),
}, nil
}, err
}

// prepare for fresh start at zero height
Expand Down Expand Up @@ -75,24 +78,31 @@ func (app *SecretNetworkApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllow
/* Handle fee distribution state. */

// withdraw all validator commission
app.AppKeepers.StakingKeeper.IterateValidators(ctx, func(_ int64, val stakingtypes.ValidatorI) (stop bool) {
valAddr, _ := sdk.ValAddressFromBech32(val.GetOperator())
err := app.AppKeepers.StakingKeeper.IterateValidators(ctx, func(_ int64, val stakingtypes.ValidatorI) (stop bool) {
valAddr, err := app.AppKeepers.StakingKeeper.ValidatorAddressCodec().StringToBytes(val.GetOperator())
if err != nil {
panic(err)
}
_, _ = app.AppKeepers.DistrKeeper.WithdrawValidatorCommission(ctx, valAddr)
return false
})
if err != nil {
panic(err)
}

// withdraw all delegator rewards
dels, _ := app.AppKeepers.StakingKeeper.GetAllDelegations(ctx)
dels, err := app.AppKeepers.StakingKeeper.GetAllDelegations(ctx)
if err != nil {
panic(err)
}

for _, delegation := range dels {
valAddr, err := sdk.ValAddressFromBech32(delegation.ValidatorAddress)
if err != nil {
panic(err)
}

delAddr, err := sdk.AccAddressFromBech32(delegation.DelegatorAddress)
if err != nil {
panic(err)
}
delAddr := sdk.MustAccAddressFromBech32(delegation.DelegatorAddress)

_, _ = app.AppKeepers.DistrKeeper.WithdrawDelegationRewards(ctx, delAddr, valAddr)
}
Expand All @@ -108,15 +118,28 @@ func (app *SecretNetworkApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllow
ctx = ctx.WithBlockHeight(0)

// reinitialize all validators
app.AppKeepers.StakingKeeper.IterateValidators(ctx, func(_ int64, val stakingtypes.ValidatorI) (stop bool) {
valAddr, _ := sdk.ValAddressFromBech32(val.GetOperator())
err = app.AppKeepers.StakingKeeper.IterateValidators(ctx, func(_ int64, val stakingtypes.ValidatorI) (stop bool) {
valAddr, err := app.AppKeepers.StakingKeeper.ValidatorAddressCodec().StringToBytes(val.GetOperator())
if err != nil {
panic(err)
}
// donate any unwithdrawn outstanding reward fraction tokens to the community pool
scraps, _ := app.AppKeepers.DistrKeeper.GetValidatorOutstandingRewardsCoins(ctx, valAddr)
feePool, _ := app.AppKeepers.DistrKeeper.FeePool.Get(ctx)
scraps, err := app.AppKeepers.DistrKeeper.GetValidatorOutstandingRewardsCoins(ctx, valAddr)
if err != nil {
panic(err)
}
feePool, err := app.AppKeepers.DistrKeeper.FeePool.Get(ctx)
if err != nil {
panic(err)
}
feePool.CommunityPool = feePool.CommunityPool.Add(scraps...)
app.AppKeepers.DistrKeeper.FeePool.Set(ctx, feePool)
if err := app.AppKeepers.DistrKeeper.FeePool.Set(ctx, feePool); err != nil {
panic(err)
}

app.AppKeepers.DistrKeeper.Hooks().AfterValidatorCreated(ctx, valAddr)
if err := app.AppKeepers.DistrKeeper.Hooks().AfterValidatorCreated(ctx, valAddr); err != nil {
panic(err)
}
return false
})

Expand All @@ -126,14 +149,17 @@ func (app *SecretNetworkApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllow
if err != nil {
panic(err)
}
delAddr := sdk.MustAccAddressFromBech32(del.DelegatorAddress)

delAddr, err := sdk.AccAddressFromBech32(del.DelegatorAddress)
if err != nil {
panic(err)
if err := app.AppKeepers.DistrKeeper.Hooks().BeforeDelegationCreated(ctx, delAddr, valAddr); err != nil {
// never called as BeforeDelegationCreated always returns nil
panic(fmt.Errorf("error while incrementing period: %w", err))
}

app.AppKeepers.DistrKeeper.Hooks().BeforeDelegationCreated(ctx, delAddr, valAddr)
app.AppKeepers.DistrKeeper.Hooks().AfterDelegationModified(ctx, delAddr, valAddr)
if err := app.AppKeepers.DistrKeeper.Hooks().AfterDelegationModified(ctx, delAddr, valAddr); err != nil {
// never called as AfterDelegationModified always returns nil
panic(fmt.Errorf("error while creating a new delegation period record: %w", err))
}
}

// reset context height
Expand All @@ -142,22 +168,34 @@ func (app *SecretNetworkApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllow
/* Handle staking state. */

// iterate through redelegations, reset creation height
app.AppKeepers.StakingKeeper.IterateRedelegations(ctx, func(_ int64, red stakingtypes.Redelegation) (stop bool) {
err = app.AppKeepers.StakingKeeper.IterateRedelegations(ctx, func(_ int64, red stakingtypes.Redelegation) (stop bool) {
for i := range red.Entries {
red.Entries[i].CreationHeight = 0
}
app.AppKeepers.StakingKeeper.SetRedelegation(ctx, red)
err = app.AppKeepers.StakingKeeper.SetRedelegation(ctx, red)
if err != nil {
panic(err)
}
return false
})
if err != nil {
panic(err)
}

// iterate through unbonding delegations, reset creation height
app.AppKeepers.StakingKeeper.IterateUnbondingDelegations(ctx, func(_ int64, ubd stakingtypes.UnbondingDelegation) (stop bool) {
err = app.AppKeepers.StakingKeeper.IterateUnbondingDelegations(ctx, func(_ int64, ubd stakingtypes.UnbondingDelegation) (stop bool) {
for i := range ubd.Entries {
ubd.Entries[i].CreationHeight = 0
}
app.AppKeepers.StakingKeeper.SetUnbondingDelegation(ctx, ubd)
err = app.AppKeepers.StakingKeeper.SetUnbondingDelegation(ctx, ubd)
if err != nil {
panic(err)
}
return false
})
if err != nil {
panic(err)
}

// Iterate through validators by power descending, reset bond heights, and
// update bond intra-tx counters.
Expand All @@ -166,7 +204,7 @@ func (app *SecretNetworkApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllow
counter := int16(0)

for ; iter.Valid(); iter.Next() {
addr := sdk.ValAddress(iter.Key()[1:])
addr := sdk.ValAddress(stakingtypes.AddressFromValidatorsKey(iter.Key()))
validator, err := app.AppKeepers.StakingKeeper.GetValidator(ctx, addr)
if err != nil {
panic("expected validator, not found")
Expand All @@ -175,27 +213,49 @@ func (app *SecretNetworkApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllow
validator.UnbondingHeight = 0
if applyAllowedAddrs && !allowedAddrsMap[addr.String()] {
validator.Jailed = true
app.AppKeepers.StakingKeeper.SetValidator(ctx, validator)
app.AppKeepers.StakingKeeper.DeleteValidatorByPowerIndex(ctx, validator)
err = app.AppKeepers.StakingKeeper.SetValidator(ctx, validator)
if err != nil {
panic(err)
}
err = app.AppKeepers.StakingKeeper.DeleteValidatorByPowerIndex(ctx, validator)
if err != nil {
panic(err)
}
} else {
app.AppKeepers.StakingKeeper.SetValidator(ctx, validator)
err = app.AppKeepers.StakingKeeper.SetValidator(ctx, validator)
if err != nil {
panic(err)
}
}

counter++
}

iter.Close()
if err := iter.Close(); err != nil {
app.Logger().Error("error while closing the key-value store reverse prefix iterator: ", err)
return
}

_, err = app.AppKeepers.StakingKeeper.ApplyAndReturnValidatorSetUpdates(ctx)
if err != nil {
panic(err)
}

_, _ = app.AppKeepers.StakingKeeper.ApplyAndReturnValidatorSetUpdates(ctx)
/* Handle slashing state. */

// reset start height on signing infos
app.AppKeepers.SlashingKeeper.IterateValidatorSigningInfos(
err = app.AppKeepers.SlashingKeeper.IterateValidatorSigningInfos(
ctx,
func(addr sdk.ConsAddress, info slashingtypes.ValidatorSigningInfo) (stop bool) {
info.StartHeight = 0
app.AppKeepers.SlashingKeeper.SetValidatorSigningInfo(ctx, addr, info)
err = app.AppKeepers.SlashingKeeper.SetValidatorSigningInfo(ctx, addr, info)
if err != nil {
panic(err)
}
return false
},
)
if err != nil {
panic(err)
}
}
Loading

0 comments on commit 71a80eb

Please sign in to comment.