Revert "feat: staking config (#10988)"

This reverts commit 5e9656f.

CHANGELOG.md

@@ -140,10 +140,9 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * [\#11124](https://github.com/cosmos/cosmos-sdk/pull/11124) Add `GetAllVersions` to application store
 * (x/authz) [\#10447](https://github.com/cosmos/cosmos-sdk/pull/10447) authz `NewGrant` takes a new argument: block time, to correctly validate expire time.
 * [\#10961](https://github.com/cosmos/cosmos-sdk/pull/10961) Support third-party modules to add extension snapshots to state-sync.
-* [\#10988](https://github.com/cosmos/cosmos-sdk/pull/10988) Removes sdk.PowerReduction as a global and pass it directly to the staking keeper on creation. 
- - Deletes `types/staking.go` and moves the functions to `x/staking/types/power_reduction.go`
 * [\#11274](https://github.com/cosmos/cosmos-sdk/pull/11274) `types/errors.New` now is an alias for `types/errors.Register` and should only be used in initialization code.
 
+
 ### Client Breaking Changes
 
 * [\#11089](https://github.com/cosmos/cosmos-sdk/pull/11089]) interacting with the node through `grpc.Dial` requires clients to pass a codec refer to [doc](docs/run-node/interact-node.md).

doc/proto-docs.md

@@ -0,0 +1,99 @@
+<!-- This file is auto-generated. Please do not modify it yourself. -->
+# Protobuf Documentation
+
+<a name="top"></a>
+
+## Table of Contents
+
+* [cosmos/base/query/v1beta1/pagination.proto](#cosmosbasequeryv1beta1paginationproto)
+ * [PageRequest](#pagerequest)
+ * [PageResponse](#pageresponse)
+* [Scalar Value Types](#scalar-value-types)
+
+<a name="cosmos/base/query/v1beta1/pagination.proto"></a>
+<p align="right"><a href="#top">Top</a></p>
+
+## cosmos/base/query/v1beta1/pagination.proto
+
+
+
+<a name="cosmos.base.query.v1beta1.PageRequest"></a>
+
+### PageRequest
+
+PageRequest is to be embedded in gRPC request messages for efficient
+pagination. Ex:
+
+ message SomeRequest {
+ Foo some_parameter = 1;
+ PageRequest pagination = 2;
+ }
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `key` | [bytes](#bytes) | | key is a value returned in PageResponse.next_key to begin querying the next page most efficiently. Only one of offset or key should be set. |
+| `offset` | [uint64](#uint64) | | offset is a numeric offset that can be used when key is unavailable. It is less efficient than using key. Only one of offset or key should be set. |
+| `limit` | [uint64](#uint64) | | limit is the total number of results to be returned in the result page. If left empty it will default to a value to be set by each app. |
+| `count_total` | [bool](#bool) | | count_total is set to true to indicate that the result set should include a count of the total number of items available for pagination in UIs. count_total is only respected when offset is used. It is ignored when key is set. |
+| `reverse` | [bool](#bool) | | reverse is set to true if results are to be returned in the descending order.
+
+Since: cosmos-sdk 0.43 |
+
+
+
+
+
+
+<a name="cosmos.base.query.v1beta1.PageResponse"></a>
+
+### PageResponse
+
+PageResponse is to be embedded in gRPC response messages where the
+corresponding request message has used PageRequest.
+
+ message SomeResponse {
+ repeated Bar results = 1;
+ PageResponse page = 2;
+ }
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `next_key` | [bytes](#bytes) | | next_key is the key to be passed to PageRequest.key to query the next page most efficiently |
+| `total` | [uint64](#uint64) | | total is total number of results available if PageRequest.count_total was set, its value is undefined otherwise |
+
+
+
+
+
+ <!-- end messages -->
+
+ <!-- end enums -->
+
+ <!-- end HasExtensions -->
+
+ <!-- end services -->
+
+
+
+## Scalar Value Types
+
+| .proto Type | Notes | C++ | Java | Python | Go | C# | PHP | Ruby |
+| ----------- | ----- | --- | ---- | ------ | -- | -- | --- | ---- |
+| <a name="double" /> double | | double | double | float | float64 | double | float | Float |
+| <a name="float" /> float | | float | float | float | float32 | float | float | Float |
+| <a name="int32" /> int32 | Uses variable-length encoding. Inefficient for encoding negative numbers – if your field is likely to have negative values, use sint32 instead. | int32 | int | int | int32 | int | integer | Bignum or Fixnum (as required) |
+| <a name="int64" /> int64 | Uses variable-length encoding. Inefficient for encoding negative numbers – if your field is likely to have negative values, use sint64 instead. | int64 | long | int/long | int64 | long | integer/string | Bignum |
+| <a name="uint32" /> uint32 | Uses variable-length encoding. | uint32 | int | int/long | uint32 | uint | integer | Bignum or Fixnum (as required) |
+| <a name="uint64" /> uint64 | Uses variable-length encoding. | uint64 | long | int/long | uint64 | ulong | integer/string | Bignum or Fixnum (as required) |
+| <a name="sint32" /> sint32 | Uses variable-length encoding. Signed int value. These more efficiently encode negative numbers than regular int32s. | int32 | int | int | int32 | int | integer | Bignum or Fixnum (as required) |
+| <a name="sint64" /> sint64 | Uses variable-length encoding. Signed int value. These more efficiently encode negative numbers than regular int64s. | int64 | long | int/long | int64 | long | integer/string | Bignum |
+| <a name="fixed32" /> fixed32 | Always four bytes. More efficient than uint32 if values are often greater than 2^28. | uint32 | int | int | uint32 | uint | integer | Bignum or Fixnum (as required) |
+| <a name="fixed64" /> fixed64 | Always eight bytes. More efficient than uint64 if values are often greater than 2^56. | uint64 | long | int/long | uint64 | ulong | integer/string | Bignum |
+| <a name="sfixed32" /> sfixed32 | Always four bytes. | int32 | int | int | int32 | int | integer | Bignum or Fixnum (as required) |
+| <a name="sfixed64" /> sfixed64 | Always eight bytes. | int64 | long | int/long | int64 | long | integer/string | Bignum |
+| <a name="bool" /> bool | | bool | boolean | boolean | bool | bool | boolean | TrueClass/FalseClass |
+| <a name="string" /> string | A string must always contain UTF-8 encoded or 7-bit ASCII text. | string | String | str/unicode | string | string | string | String (UTF-8) |
+| <a name="bytes" /> bytes | May contain any arbitrary sequence of bytes. | string | ByteString | str | []byte | ByteString | string | String (ASCII-8BIT) |
+

simapp/app.go

@@ -267,14 +267,8 @@ func NewSimApp(
  app.BankKeeper = bankkeeper.NewBaseKeeper(
  appCodec, keys[banktypes.StoreKey], app.AccountKeeper, app.GetSubspace(banktypes.ModuleName), app.ModuleAccountAddrs(),
  )
-
- stakingConfig := stakingtypes.DefaultConfig()
- /*
- Example of setting staking params:
- stakingConfig.PowerReduction = sdk.NewIntFromUint64(10)
- */
  stakingKeeper := stakingkeeper.NewKeeper(
- appCodec, keys[stakingtypes.StoreKey], app.AccountKeeper, app.BankKeeper, app.GetSubspace(stakingtypes.ModuleName), stakingConfig,
+ appCodec, keys[stakingtypes.StoreKey], app.AccountKeeper, app.BankKeeper, app.GetSubspace(stakingtypes.ModuleName),
  )
  app.MintKeeper = mintkeeper.NewKeeper(
  appCodec, keys[minttypes.StoreKey], app.GetSubspace(minttypes.ModuleName), &stakingKeeper,

simapp/simd/cmd/testnet.go

@@ -282,8 +282,8 @@ func initTestnetFiles(
  return err
  }
 
- accTokens := sdk.NewIntFromUint64(1000_000_000)
- accStakingTokens := sdk.NewIntFromUint64(500_000_000)
+ accTokens := sdk.TokensFromConsensusPower(1000, sdk.DefaultPowerReduction)
+ accStakingTokens := sdk.TokensFromConsensusPower(500, sdk.DefaultPowerReduction)
  coins := sdk.Coins{
  sdk.NewCoin("testtoken", accTokens),
  sdk.NewCoin(sdk.DefaultBondDenom, accStakingTokens),
@@ -292,7 +292,7 @@ func initTestnetFiles(
  genBalances = append(genBalances, banktypes.Balance{Address: addr.String(), Coins: coins.Sort()})
  genAccounts = append(genAccounts, authtypes.NewBaseAccount(addr, nil, 0, 0))
 
- valTokens := sdk.NewIntFromUint64(100_000_000)
+ valTokens := sdk.TokensFromConsensusPower(100, sdk.DefaultPowerReduction)
  createValMsg, err := stakingtypes.NewMsgCreateValidator(
  sdk.ValAddress(addr),
  valPubKeys[i],

simapp/test_helpers.go

@@ -154,7 +154,7 @@ func genesisStateWithValSet(t *testing.T,
  validators := make([]stakingtypes.Validator, 0, len(valSet.Validators))
  delegations := make([]stakingtypes.Delegation, 0, len(valSet.Validators))
 
- bondAmt := stakingtypes.DefaultConfig().PowerReduction
+ bondAmt := sdk.DefaultPowerReduction
 
  for _, val := range valSet.Validators {
  pk, err := cryptocodec.FromTmPubKeyInterface(val.PubKey)

testutil/network/network.go

@@ -116,9 +116,9 @@ func DefaultConfig() Config {
  NumValidators: 4,
  BondDenom: sdk.DefaultBondDenom,
  MinGasPrices: fmt.Sprintf("0.000006%s", sdk.DefaultBondDenom),
- AccountTokens: sdk.NewIntFromUint64(1000_000_000),
- StakingTokens: sdk.NewIntFromUint64(500_000_000),
- BondedTokens: sdk.NewIntFromUint64(100_000_000),
+ AccountTokens: sdk.TokensFromConsensusPower(1000, sdk.DefaultPowerReduction),
+ StakingTokens: sdk.TokensFromConsensusPower(500, sdk.DefaultPowerReduction),
+ BondedTokens: sdk.TokensFromConsensusPower(100, sdk.DefaultPowerReduction),
  PruningStrategy: storetypes.PruningOptionNothing,
  CleanupDir: true,
  SigningAlgo: string(hd.Secp256k1Type),

types/module/module.go

@@ -335,7 +335,7 @@ func (m *Manager) InitGenesis(ctx sdk.Context, cdc codec.JSONCodec, genesisData
 
  // a chain must initialize with a non-empty validator set
  if len(validatorUpdates) == 0 {
- panic(fmt.Sprintf("validator set is empty after InitGenesis, please ensure at least one validator is initialized with a delegation greater than or equal to the DefaultPowerReduction, found in x/staking/types/config.go"))
+ panic(fmt.Sprintf("validator set is empty after InitGenesis, please ensure at least one validator is initialized with a delegation greater than or equal to the DefaultPowerReduction (%d)", sdk.DefaultPowerReduction))
  }
 
  return abci.ResponseInitChain{

types/globals.go → types/staking.go

@@ -17,3 +17,16 @@ const (
  // https://tendermint.com/docs/spec/abci/apps.html#endblock
  ValidatorUpdateDelay int64 = 1
 )
+
+// DefaultPowerReduction is the default amount of staking tokens required for 1 unit of consensus-engine power
+var DefaultPowerReduction = NewIntFromUint64(1000000)
+
+// TokensToConsensusPower - convert input tokens to potential consensus-engine power
+func TokensToConsensusPower(tokens Int, powerReduction Int) int64 {
+ return (tokens.Quo(powerReduction)).Int64()
+}
+
+// TokensFromConsensusPower - convert input power to tokens
+func TokensFromConsensusPower(power int64, powerReduction Int) Int {
+ return NewInt(power).Mul(powerReduction)
+}

types/staking_test.go

@@ -0,0 +1,26 @@
+package types_test
+
+import (
+ "testing"
+
+ "github.com/stretchr/testify/suite"
+
+ sdk "github.com/cosmos/cosmos-sdk/types"
+)
+
+type stakingTestSuite struct {
+ suite.Suite
+}
+
+func TestStakingTestSuite(t *testing.T) {
+ suite.Run(t, new(stakingTestSuite))
+}
+
+func (s *stakingTestSuite) SetupSuite() {
+ s.T().Parallel()
+}
+
+func (s *stakingTestSuite) TestTokensToConsensusPower() {
+ s.Require().Equal(int64(0), sdk.TokensToConsensusPower(sdk.NewInt(999_999), sdk.DefaultPowerReduction))
+ s.Require().Equal(int64(1), sdk.TokensToConsensusPower(sdk.NewInt(1_000_000), sdk.DefaultPowerReduction))
+}

x/auth/client/testutil/suite.go

@@ -648,7 +648,7 @@ func (s *IntegrationTestSuite) TestCLISendGenerateSignAndBroadcast() {
  account, err := val1.ClientCtx.Keyring.Key("newAccount")
  s.Require().NoError(err)
 
- sendTokens := sdk.NewCoin(s.cfg.BondDenom, testutil.TokensFromConsensusPower(10, testutil.DefaultpowerReduction))
+ sendTokens := sdk.NewCoin(s.cfg.BondDenom, sdk.TokensFromConsensusPower(10, sdk.DefaultPowerReduction))
 
  addr, err := account.GetAddress()
  s.Require().NoError(err)
@@ -849,7 +849,7 @@ func (s *IntegrationTestSuite) TestCLIMultisignInsufficientCosigners() {
 func (s *IntegrationTestSuite) TestCLIEncode() {
  val1 := s.network.Validators[0]
 
- sendTokens := sdk.NewCoin(s.cfg.BondDenom, testutil.TokensFromConsensusPower(10, testutil.DefaultpowerReduction))
+ sendTokens := sdk.NewCoin(s.cfg.BondDenom, sdk.TokensFromConsensusPower(10, sdk.DefaultPowerReduction))
 
  normalGeneratedTx, err := s.createBankMsg(
  val1, val1.Address,

x/auth/migrations/v043/store_test.go

@@ -9,7 +9,6 @@ import (
  tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
  "github.com/cosmos/cosmos-sdk/simapp"
- "github.com/cosmos/cosmos-sdk/testutil"
  sdk "github.com/cosmos/cosmos-sdk/types"
  authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
  authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
@@ -658,7 +657,7 @@ func dirtyTrackingFields(ctx sdk.Context, vesting exported.VestingAccount, app *
 }
 
 func createValidator(t *testing.T, ctx sdk.Context, app *simapp.SimApp, powers int64) (sdk.AccAddress, sdk.ValAddress) {
- valTokens := testutil.TokensFromConsensusPower(powers, testutil.DefaultpowerReduction)
+ valTokens := sdk.TokensFromConsensusPower(powers, sdk.DefaultPowerReduction)
  addrs := simapp.AddTestAddrsIncremental(app, ctx, 1, valTokens)
  valAddrs := simapp.ConvertAddrsToValAddrs(addrs)
  pks := simapp.CreateTestPubKeys(1)
@@ -670,7 +669,6 @@ func createValidator(t *testing.T, ctx sdk.Context, app *simapp.SimApp, powers i
  app.AccountKeeper,
  app.BankKeeper,
  app.GetSubspace(stakingtypes.ModuleName),
- stakingtypes.DefaultConfig(),
  )
 
  val1, err := stakingtypes.NewValidator(valAddrs[0], pks[0], stakingtypes.Description{})

x/bank/keeper/grpc_query_test.go

@@ -4,7 +4,6 @@ import (
  gocontext "context"
  "fmt"
 
- sdktestutil "github.com/cosmos/cosmos-sdk/testutil"
  "github.com/cosmos/cosmos-sdk/testutil/testdata"
  sdk "github.com/cosmos/cosmos-sdk/types"
  "github.com/cosmos/cosmos-sdk/types/query"
@@ -325,7 +324,7 @@ func (suite *IntegrationTestSuite) TestGRPCDenomOwners() {
 
  bal := sdk.NewCoins(sdk.NewCoin(
  sdk.DefaultBondDenom,
- sdktestutil.TokensFromConsensusPower(initialPower/10, sdktestutil.DefaultpowerReduction),
+ sdk.TokensFromConsensusPower(initialPower/10, sdk.DefaultPowerReduction),
  ))
  suite.Require().NoError(keeper.SendCoinsFromModuleToAccount(ctx, minttypes.ModuleName, acc.GetAddress(), bal))
  }

x/bank/keeper/keeper_test.go

@@ -12,7 +12,6 @@ import (
 
  "github.com/cosmos/cosmos-sdk/baseapp"
  "github.com/cosmos/cosmos-sdk/simapp"
- sdktestutil "github.com/cosmos/cosmos-sdk/testutil"
  sdk "github.com/cosmos/cosmos-sdk/types"
  "github.com/cosmos/cosmos-sdk/types/query"
  authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
@@ -41,7 +40,8 @@ var (
  randomPermAcc = authtypes.NewEmptyModuleAccount(randomPerm, "random")
 
  // The default power validators are initialized to have within tests
- initCoins = sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdktestutil.TokensFromConsensusPower(initialPower, sdktestutil.DefaultpowerReduction)))
+ initTokens = sdk.TokensFromConsensusPower(initialPower, sdk.DefaultPowerReduction)
+ initCoins = sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, initTokens))
 )
 
 func newFooCoin(amt int64) sdk.Coin {

x/bank/types/balance_test.go

@@ -7,7 +7,6 @@ import (
  "github.com/stretchr/testify/require"
 
  "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
- "github.com/cosmos/cosmos-sdk/testutil"
  sdk "github.com/cosmos/cosmos-sdk/types"
  bank "github.com/cosmos/cosmos-sdk/x/bank/types"
 )
@@ -142,7 +141,8 @@ func TestBalance_GetAddress(t *testing.T) {
 
 func TestSanitizeBalances(t *testing.T) {
  // 1. Generate balances
- coin := sdk.NewCoin("benchcoin", testutil.TokensFromConsensusPower(81, testutil.DefaultpowerReduction))
+ tokens := sdk.TokensFromConsensusPower(81, sdk.DefaultPowerReduction)
+ coin := sdk.NewCoin("benchcoin", tokens)
  coins := sdk.Coins{coin}
  addrs, _ := makeRandomAddressesAndPublicKeys(20)
 
@@ -193,7 +193,9 @@ func BenchmarkSanitizeBalances1000(b *testing.B) {
 
 func benchmarkSanitizeBalances(b *testing.B, nAddresses int) {
  b.ReportAllocs()
- coins := sdk.NewCoins(sdk.NewCoin("benchcoin", testutil.TokensFromConsensusPower(81, testutil.DefaultpowerReduction)))
+ tokens := sdk.TokensFromConsensusPower(81, sdk.DefaultPowerReduction)
+ coin := sdk.NewCoin("benchcoin", tokens)
+ coins := sdk.Coins{coin}
  addrs, _ := makeRandomAddressesAndPublicKeys(nAddresses)
 
  b.ResetTimer()

x/evidence/keeper/keeper_test.go

@@ -5,20 +5,20 @@ import (
  "fmt"
  "time"
 
+ minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
+
  "github.com/stretchr/testify/suite"
  tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
  "github.com/cosmos/cosmos-sdk/baseapp"
  "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
  cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
  "github.com/cosmos/cosmos-sdk/simapp"
- "github.com/cosmos/cosmos-sdk/testutil"
  sdk "github.com/cosmos/cosmos-sdk/types"
  authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
  "github.com/cosmos/cosmos-sdk/x/evidence/exported"
  "github.com/cosmos/cosmos-sdk/x/evidence/keeper"
  "github.com/cosmos/cosmos-sdk/x/evidence/types"
- minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
 )
 
 var (
@@ -35,7 +35,7 @@ var (
  }
 
  // The default power validators are initialized to have within tests
- initAmt = testutil.TokensFromConsensusPower(200, testutil.DefaultpowerReduction)
+ initAmt = sdk.TokensFromConsensusPower(200, sdk.DefaultPowerReduction)
  initCoins = sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, initAmt))
 )