LaconicNetwork/cosmos-sdk
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

working

Browse Source
This commit is contained in:
rigelrozanski 2018-09-14 02:35:02 -04:00
parent dae32a3d65
commit d60f620787
12 changed files with 108 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
x/distribution/abci_app.go Normal file
View File

@ -0,0 +1,17 @@
package distribution
import (
"github.com/cosmos/cosmos-sdk/x/distribution/keeper"
abci "github.com/tendermint/tendermint/abci/types"
)
// set the proposer for determining distribution during endblock
func BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock, k keeper.Keeper) {
consAddr := sdk.ConsAddress{req.Header.Proposer.Address}
k.SetProposerConsAddr(consAddr)
}
// allocate fees
func EndBlocker(ctx sdk.Context, k keeper.Keeper) {
k.AllocateFees(ctx)
}

9
x/distribution/begin_block.go
View File

@ -1,9 +0,0 @@
package distribution
import "github.com/cosmos/cosmos-sdk/x/distribution/keeper"
// slashing begin block functionality
func BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock, dk keeper.Keeper) (tags sdk.Tags) {
return
}

26
x/distribution/hooks.go
View File

@ -26,3 +26,29 @@ Whenever a validator is slashed or enters/leaves the validator group all of the
validator entitled reward tokens must be simultaneously withdrawn from
`Global.Pool` and added to `ValidatorDistInfo.Pool`.
*/
// Create a new validator distribution record
func (k Keeper) onValidatorBonded(ctx sdk.Context, address sdk.ConsAddress) {
slashingPeriod := ValidatorSlashingPeriod{
ValidatorAddr: address,
StartHeight: ctx.BlockHeight(),
EndHeight: 0,
SlashedSoFar: sdk.ZeroDec(),
}
k.addOrUpdateValidatorSlashingPeriod(ctx, slashingPeriod)
}
//_________________________________________________________________________________________
// Wrapper struct for sdk.ValidatorHooks
type ValidatorHooks struct {
k Keeper
}
var _ sdk.ValidatorHooks = ValidatorHooks{}
// nolint
func (k Keeper) ValidatorHooks() sdk.ValidatorHooks { return ValidatorHooks{k} }
func (v ValidatorHooks) OnValidatorBonded(ctx sdk.Context, address sdk.ConsAddress) {
v.k.onValidatorBonded(ctx, address)
}

7
x/distribution/keeper/allocation.go
View File

@ -2,15 +2,14 @@ package keeper
import (
sdk "github.com/cosmos/cosmos-sdk/types"
abci "github.com/tendermint/tendermint/abci/types"
)
// Allocate fees handles distribution of the collected fees
func (k Keeper) AllocateFees(ctx sdk.Context, req abci.RequestBeginBlock) {
func (k Keeper) AllocateFees(ctx sdk.Context) {
// get the proposer of this block
proposerAddr := req.Header.Proposer.PubKey // XXX use address?
proserValidator := k.stakeKeeper.GetValidatorFromConsAddr(ctx, proposerAddr)
proposerConsAddr := k.GetProposerConsAddr(ctx)
proserValidator := k.stakeKeeper.GetValidatorFromConsAddr(ctx, proposerConsAddr)
proposerDist := k.GetFeeDistribution(ctx, proserValidator.OperatorAddr)
// get the fees which have been getting collected through all the

27
x/distribution/keeper/delegation.go
View File

@ -3,7 +3,6 @@ package keeper
import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/distribution/types"
"github.com/cosmos/cosmos-sdk/x/stake"
)
// get the delegator distribution info
@ -35,17 +34,17 @@ func (k Keeper) WithdrawDelegationReward(ctx sdk.Context, delegatorAddr,
withdrawAddr sdk.AccAddress, validatorAddr sdk.ValAddress) {
height := ctx.BlockHeight()
pool := stake.GetPool()
feePool := GetFeePool()
delInfo := GetDelegationDistInfo(delegatorAddr, validatorAddr)
valInfo := GetValidatorDistInfo(validatorAddr)
validator := GetValidator(validatorAddr)
pool := k.sk.GetPool(ctx)
feePool := k.GetFeePool(ctx)
delInfo := k.GetDelegationDistInfo(ctx, delegatorAddr, validatorAddr)
valInfo := k.GetValidatorDistInfo(ctx, validatorAddr)
validator := k.GetValidator(ctx, validatorAddr)
feePool, withdraw := delInfo.WithdrawRewards(feePool, valInfo, height, pool.BondedTokens,
validator.Tokens, validator.DelegatorShares, validator.Commission)
SetFeePool(feePool)
AddCoins(withdrawAddr, withdraw.TruncateDecimal())
k.SetFeePool(ctx, feePool)
k.ck.AddCoins(ctx, withdrawAddr, withdraw.TruncateDecimal())
}
///////////////////////////////////////////////////////////////////////////////////////
@ -61,14 +60,14 @@ func (k Keeper) WithdrawDelegationRewardsAll(ctx sdk.Context, delegatorAddr, wit
func (k Keeper) GetDelegatorRewardsAll(ctx sdk.Context, delAddr sdk.AccAddress, height int64) DecCoins {
withdraw := sdk.NewDec(0)
pool := stake.GetPool()
feePool := GetFeePool()
pool := k.sk.GetPool(ctx)
feePool := k.GetFeePool(ctx)
// iterate over all the delegations
operationAtDelegation := func(_ int64, del types.Delegation) (stop bool) {
delInfo := GetDelegationDistInfo(delAddr, del.ValidatorAddr)
valInfo := GetValidatorDistInfo(del.ValidatorAddr)
validator := GetValidator(del.ValidatorAddr)
delInfo := k.GetDelegationDistInfo(ctx, delAddr, del.ValidatorAddr)
valInfo := k.GetValidatorDistInfo(ctx, del.ValidatorAddr)
validator := k.sk.GetValidator(ctx, del.ValidatorAddr)
feePool, diWithdraw := delInfo.WithdrawRewards(feePool, valInfo, height, pool.BondedTokens,
validator.Tokens, validator.DelegatorShares, validator.Commission)
@ -78,6 +77,6 @@ func (k Keeper) GetDelegatorRewardsAll(ctx sdk.Context, delAddr sdk.AccAddress,
}
k.stakeKeeper.IterateDelegations(ctx, delAddr, operationAtDelegation)
SetFeePool(feePool)
k.SetFeePool(ctx, feePool)
return withdraw
}

22
x/distribution/keeper/keeper.go
View File

@ -1,9 +1,10 @@
package keeper
import (
wire "github.com/tendermint/go-wire"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/distribution/types"
wire "github.com/tendermint/go-wire"
)
// keeper of the stake store
@ -55,9 +56,22 @@ func (k Keeper) SetFeePool(ctx sdk.Context, feePool types.FeePool) {
//______________________________________________________________________
// set the global fee pool distribution info
func (k Keeper) GetFeePool(ctx sdk.Context, proposerPK sdk.PubKey) {
// set the proposer public key for this block
func (k Keeper) GetProposerConsAddr(ctx sdk.Context) (consAddr sdk.ConsAddress) {
store := ctx.KVStore(k.storeKey)
b := k.cdc.MustMarshalBinary(proposerPK)
b := store.Get(ProposerKey)
if b == nil {
panic("Stored fee pool should not have been nil")
}
k.cdc.MustUnmarshalBinary(b, &consAddr)
return
}
// get the proposer public key for this block
func (k Keeper) SetProposerConsAddr(ctx sdk.Context, consAddr sdk.ConsAddress) {
store := ctx.KVStore(k.storeKey)
b := k.cdc.MustMarshalBinary(consAddr)
store.Set(ProposerKey, b)
}

10
x/distribution/keeper/validator.go
View File

@ -11,7 +11,7 @@ func (k Keeper) GetValidatorDistInfo(ctx sdk.Context,
store := ctx.KVStore(k.storeKey)
b := store.Get(GetValidatorDistInfoKey(operatorAddr))
b := store.Get(GetValidatorDistInfoKey(ctx, operatorAddr))
if b == nil {
panic("Stored delegation-distribution info should not have been nil")
}
@ -24,7 +24,7 @@ func (k Keeper) GetValidatorDistInfo(ctx sdk.Context,
func (k Keeper) SetValidatorDistInfo(ctx sdk.Context, vdi types.ValidatorDistInfo) {
store := ctx.KVStore(k.storeKey)
b := k.cdc.MustMarshalBinary(vdi)
store.Set(GetValidatorDistInfoKey(vdi.OperatorAddr), b)
store.Set(GetValidatorDistInfoKey(ctx, vdi.OperatorAddr), b)
}
// XXX TODO
@ -33,12 +33,12 @@ func (k Keeper) WithdrawValidatorRewardsAll(ctx sdk.Context,
// withdraw self-delegation
height := ctx.BlockHeight()
validator := k.GetValidator(operatorAddr)
withdraw := k.GetDelegatorRewardsAll(validator.OperatorAddr, height)
validator := k.GetValidator(ctx, operatorAddr)
withdraw := k.GetDelegatorRewardsAll(ctx, validator.OperatorAddr, height)
// withdrawal validator commission rewards
pool := k.stakeKeeper.GetPool(ctx)
valInfo := k.GetValidatorDistInfo(operatorAddr)
valInfo := k.GetValidatorDistInfo(ctx, operatorAddr)
feePool := k.GetFeePool(ctx)
feePool, commission := valInfo.WithdrawCommission(feePool, valInfo, height, pool.BondedTokens,
validator.Tokens, validator.Commission)

13
x/distribution/types/dec_coin.go
View File

@ -87,3 +87,16 @@ func (coins DecCoins) Plus(coinsB DecCoins) DecCoins {
}
}
}
// multiply all the coins by a multiple
func (coins DecCoins) Mul(multiple sdk.Dec) DecCoins {
products := make([]DecCoin, len(coins))
for i, coin := range coins {
product := DecCoins{
Denom: coin.Denom,
Amount: coin.Amount.Mul(multiple),
}
products[i] = product
}
return products
}

13
x/distribution/types/delegator_info.go
View File

@ -11,20 +11,19 @@ type DelegatorDistInfo struct {
// withdraw rewards from delegator
func (di DelegatorDistInfo) WithdrawRewards(g Global, vi ValidatorDistInfo,
height int64, totalBonded, vdTokens, totalDelShares, commissionRate Dec) (
di DelegatorDistInfo, g Global, withdrawn DecCoins) {
height int64, totalBonded, vdTokens, totalDelShares, delegatorShares,
commissionRate Dec) (di DelegatorDistInfo, g Global, withdrawn DecCoins) {
vi.UpdateTotalDelAccum(height, totalDelShares)
g = vi.TakeGlobalRewards(g, height, totalBonded, vdTokens, commissionRate)
blocks = height - di.WithdrawalHeight
di.WithdrawalHeight = height
accum = delegatorShares * blocks
accum := delegatorShares.Mul(sdk.NewDec(blocks))
withdrawalTokens := vi.Pool.Mul(accum.Quo(vi.TotalDelAccum))
withdrawalTokens := vi.Pool * accum / vi.TotalDelAccum
vi.TotalDelAccum -= accum
vi.Pool = vi.Pool.Sub(withdrawalTokens)
vi.TotalDelAccum = vi.TotalDelAccum.sub(accum)
vi.Pool -= withdrawalTokens
vi.TotalDelAccum -= accum
return di, g, withdrawalTokens
}

2
x/distribution/types/fee_pool.go
View File

@ -11,7 +11,7 @@ type TotalAccum struct {
// update total validator accumulation factor
func (ta TotalAccum) Update(height int64, accumCreatedPerBlock sdk.Dec) TotalAccum {
blocks := height - ta.UpdateHeight
f.Accum += accumCreatedPerBlock.Mul(sdk.NewDec(blocks))
f.Accum = f.Accum.Add(accumCreatedPerBlock.Mul(sdk.NewDec(blocks)))
ta.UpdateHeight = height
return ta
}

8
x/stake/keeper/key.go
View File

@ -3,8 +3,6 @@ package keeper
import (
"encoding/binary"
"github.com/tendermint/tendermint/crypto"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/stake/types"
)
@ -17,7 +15,7 @@ var (
ParamKey = []byte{0x00} // key for parameters relating to staking
PoolKey = []byte{0x01} // key for the staking pools
ValidatorsKey = []byte{0x02} // prefix for each key to a validator
ValidatorsByPubKeyIndexKey = []byte{0x03} // prefix for each key to a validator index, by pubkey
ValidatorsByConsAddrKey = []byte{0x03} // prefix for each key to a validator index, by pubkey
ValidatorsBondedIndexKey = []byte{0x04} // prefix for each key to a validator index, for bonded validators
ValidatorsByPowerIndexKey = []byte{0x05} // prefix for each key to a validator index, sorted by power
ValidatorCliffIndexKey = []byte{0x06} // key for the validator index of the cliff validator
@ -44,8 +42,8 @@ func GetValidatorKey(operatorAddr sdk.ValAddress) []byte {
// gets the key for the validator with pubkey
// VALUE: validator operator address ([]byte)
func GetValidatorByPubKeyIndexKey(pubkey crypto.PubKey) []byte {
return append(ValidatorsByPubKeyIndexKey, pubkey.Bytes()...)
func GetValidatorByConsAddrKey(addr sdk.ConsAddress) []byte {
return append(ValidatorsByConsAddrKey, addr.Bytes()...)
}
// gets the key for the current validator group

5
x/stake/keeper/validator.go
View File

@ -76,9 +76,10 @@ func (k Keeper) SetValidator(ctx sdk.Context, validator types.Validator) {
}
// validator index
func (k Keeper) SetValidatorByPubKeyIndex(ctx sdk.Context, validator types.Validator) {
func (k Keeper) SetValidatorByConsAddr(ctx sdk.Context, validator types.Validator) {
store := ctx.KVStore(k.storeKey)
store.Set(GetValidatorByPubKeyIndexKey(validator.ConsPubKey), validator.OperatorAddr)
consAddr := sdk.consAddress{validator.Address()}
store.Set(GetValidatorByPubKeyIndexKey(consAddr), validator.OperatorAddr)
}
// validator index