mirror of
https://github.com/0glabs/0g-chain.git
synced 2024-11-14 20:15:18 +00:00
f757d7ab15
* Update cosmos-sdk to v0.45.10-kava * Add RegisterNodeService to app * Update cosmos proto files * Update cosmos proto files * Use tagged v0.45.10-kava-v0.19-0.21 cosmos version * update x/auth/legacy to x/auth/migrations * Delete rest packages and registration * Remove rest from proposal handlers * Remove legacy types referencing removed sdk types * Remove legacy tx broadcast handler * Update incentive staking hooks to return error * Remove grpc replace directive, use new grpc version * Fix storetypes import * Update tally_handler with updated gov types * Delete legacy types * Use new gov default config * Update RegisterTendermintService params Signed-off-by: drklee3 <derrick@dlee.dev> * Replace sdk.StoreKey with storetypes.StoreKey * Replace sdk.Int#ToDec with sdk.NewDecFromInt * Replace sdk.NewUintFromBigInt with sdkmath.NewUintFromBigInt Signed-off-by: drklee3 <derrick@dlee.dev> * Update most intances of govtypes to govv1beta1 * Unpack coin slice for Coins#Sub and Coins#SafeSub Signed-off-by: drklee3 <derrick@dlee.dev> * Update committee gov codec registration Signed-off-by: drklee3 <derrick@dlee.dev> * Update migrate utils period_vesting Coins#Sub Signed-off-by: drklee3 <derrick@dlee.dev> * Update Coin#Sub in community proposal handler Signed-off-by: drklee3 <derrick@dlee.dev> * Update Coin#Sub, FundModuleAccount/FundAccount in banktestutil Signed-off-by: drklee3 <derrick@dlee.dev> * Update community, earn, kavadist proposal gov registration * Update evm cli client EthSecp256k1Type check * AccAddressFromHex to AccAddressFromHexUnsafe * Add mint DefaultInflationCalculationFn to earn test * Update use of removed staking.NewHandler * Rename FlagIAVLFastNode -> FlagDisableIAVLFastNode * cmd: Update new snapshot app option Signed-off-by: drklee3 <derrick@dlee.dev> * cmd: Add tendermint default config, use cosmos rpc status command Signed-off-by: drklee3 <derrick@dlee.dev> * Update ethermint import path github.com/tharsis/ethermint -> github.com/evmos/ethermint * Upgrade ibc-go to v6 * Update proto dependencies Signed-off-by: drklee3 <derrick@dlee.dev> * Update Tally handler test with new gov types * Update helpers.GenTx -> helpers.GenSignedMockTx * Update evmkeeper.NewKeeper params Signed-off-by: drklee3 <derrick@dlee.dev> * Update ante authz, tests * Add feemarket transient key, pass subspaces to evm/feemarket keepers * Update new ante decorators * Add new addModuleInitFlags to server commands * Pass codec to keyring.New in genaccounts * Pass codec to client keys add * Add SendCoins to evmutil bank_keeper * Use github.com/cosmos/iavl@v0.19.5 * Add ante HandlerOptions * Add unimplemented SendCoins to evmutil bank keeper Ethermint x/evm does not use this method * Update init-new-chain script to disable post-london blocks * Modify test genesis states to append 1 validator * Update tally handler test to use string values * Prevent querying balance for empty sdk.AccAddress in auction bidding test * Set default bond denom to ukava * Remove overwritten bank genesis total supply in committee proposal test Signed-off-by: drklee3 <derrick@dlee.dev> * Use ukava for testing staked balance * Disable minting in community proposal handler test Previously stake denom is used, which resulted in 0 minted coins * Update hard APYToSPY test expected value Increased iterations in sdk.ApproxRoot, updated closer to real value * Fix NewDecCoinsFromCoins bug in incentive collectDerivativeStakingRewards * Allow bkava earn incentive test values to match within small margin for rounding Signed-off-by: drklee3 <derrick@dlee.dev> * Update invalid denom in issuance message coin validation Colons are now valid in denoms Signed-off-by: drklee3 <derrick@dlee.dev> * Remove genesis validator in incentive delegation tests * Update pricefeed market test for invalid denom Signed-off-by: drklee3 <derrick@dlee.dev> * Update incentive delegator rewards test without genesis validator Signed-off-by: drklee3 <derrick@dlee.dev> * Add validator to export test * Clear bank state in minting tests Signed-off-by: drklee3 <derrick@dlee.dev> * Remove validator for no stake tally test Signed-off-by: drklee3 <derrick@dlee.dev> * Clear incentive state before InitGenesis in incentive genesis export test * Update swagger Signed-off-by: drklee3 <derrick@dlee.dev> * Update ethermint version to match replaced version * Remove legacy swagger * Add NewEthEmitEventDecorator * Remove redundant func for AddModuleInitFlags * Remove unused addBankBalanceForAddress func * Add SetIAVLLazyLoading option to app cmd * Use legacy.RegisterAminoMsg for committee msg concrete registration * Remove unnecessary Amino field * Add evm_util bankkeeper SendCoins comment * Update test method ResetBankState to DeleteGenesisValidatorCoins to be more clear * Validate incentive params.RewardsPerSecond to be non-zero * Validate swap pools to disallow colons in token denoms * Register all legacy amino types on gov modulecdc * Remove redundant Comittee interface registration * Pin goleveldb to v1.0.1-0.20210819022825-2ae1ddf74ef7 Causes failed to load state at height errors * Update ethermint to new pinned version with minGasPrices parse error fix * Update cosmos fork dependcy commit to include reverted account constructor patch * Update Cosmos v0.46.11 and cometbft v0.34.27 * Bump minimum go version to 1.19 * Update tendermint proto * Update internal testnet genesis * Move NewCanTransferDecorator before NewEthGasConsumeDecorator * Add hard borrow store tests (#1514) * add store tests for Borrow type * refactor Deposit tests to match * Fix old bep3 tests (#1515) * Update Ethermint to 1b17445 to fix duplicate proto registration * Add custom status command to use snake_case and stdout * Add SetInflation helper * Reduce ambiguity with evm CanSignEthTx error * Remove init genesis validator claim in test * Add disabled evmante.NewMinGasPriceDecorator with x/feemarket note * chore: use tagged versions for Cosmos and Ethermint forks * update kvtool & increase wait for ibc transfer test --------- Signed-off-by: drklee3 <derrick@dlee.dev> Co-authored-by: Ruaridh <rhuairahrighairidh@users.noreply.github.com> Co-authored-by: Robert Pirtle <astropirtle@gmail.com>
313 lines
12 KiB
Go
313 lines
12 KiB
Go
package keeper
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
sdk "github.com/cosmos/cosmos-sdk/types"
|
|
|
|
hardtypes "github.com/kava-labs/kava/x/hard/types"
|
|
"github.com/kava-labs/kava/x/incentive/types"
|
|
)
|
|
|
|
// AccumulateHardSupplyRewards calculates new rewards to distribute this block and updates the global indexes to reflect this.
|
|
// The provided rewardPeriod must be valid to avoid panics in calculating time durations.
|
|
func (k Keeper) AccumulateHardSupplyRewards(ctx sdk.Context, rewardPeriod types.MultiRewardPeriod) {
|
|
previousAccrualTime, found := k.GetPreviousHardSupplyRewardAccrualTime(ctx, rewardPeriod.CollateralType)
|
|
if !found {
|
|
previousAccrualTime = ctx.BlockTime()
|
|
}
|
|
|
|
indexes, found := k.GetHardSupplyRewardIndexes(ctx, rewardPeriod.CollateralType)
|
|
if !found {
|
|
indexes = types.RewardIndexes{}
|
|
}
|
|
|
|
acc := types.NewAccumulator(previousAccrualTime, indexes)
|
|
|
|
totalSource := k.getHardSupplyTotalSourceShares(ctx, rewardPeriod.CollateralType)
|
|
|
|
acc.Accumulate(rewardPeriod, totalSource, ctx.BlockTime())
|
|
|
|
k.SetPreviousHardSupplyRewardAccrualTime(ctx, rewardPeriod.CollateralType, acc.PreviousAccumulationTime)
|
|
if len(acc.Indexes) > 0 {
|
|
// the store panics when setting empty or nil indexes
|
|
k.SetHardSupplyRewardIndexes(ctx, rewardPeriod.CollateralType, acc.Indexes)
|
|
}
|
|
}
|
|
|
|
// getHardSupplyTotalSourceShares fetches the sum of all source shares for a supply reward.
|
|
// In the case of hard supply, this is the total supplied divided by the supply interest factor.
|
|
// This gives the "pre interest" value of the total supplied.
|
|
func (k Keeper) getHardSupplyTotalSourceShares(ctx sdk.Context, denom string) sdk.Dec {
|
|
totalSuppliedCoins, found := k.hardKeeper.GetSuppliedCoins(ctx)
|
|
if !found {
|
|
// assume no coins have been supplied
|
|
totalSuppliedCoins = sdk.NewCoins()
|
|
}
|
|
totalSupplied := totalSuppliedCoins.AmountOf(denom)
|
|
|
|
interestFactor, found := k.hardKeeper.GetSupplyInterestFactor(ctx, denom)
|
|
if !found {
|
|
// assume nothing has been borrowed so the factor starts at it's default value
|
|
interestFactor = sdk.OneDec()
|
|
}
|
|
|
|
// return supplied/factor to get the "pre interest" value of the current total supplied
|
|
return sdk.NewDecFromInt(totalSupplied).Quo(interestFactor)
|
|
}
|
|
|
|
// InitializeHardSupplyReward initializes the supply-side of a hard liquidity provider claim
|
|
// by creating the claim and setting the supply reward factor index
|
|
func (k Keeper) InitializeHardSupplyReward(ctx sdk.Context, deposit hardtypes.Deposit) {
|
|
claim, found := k.GetHardLiquidityProviderClaim(ctx, deposit.Depositor)
|
|
if !found {
|
|
claim = types.NewHardLiquidityProviderClaim(deposit.Depositor, sdk.Coins{}, nil, nil)
|
|
}
|
|
|
|
var supplyRewardIndexes types.MultiRewardIndexes
|
|
for _, coin := range deposit.Amount {
|
|
globalRewardIndexes, found := k.GetHardSupplyRewardIndexes(ctx, coin.Denom)
|
|
if !found {
|
|
globalRewardIndexes = types.RewardIndexes{}
|
|
}
|
|
supplyRewardIndexes = supplyRewardIndexes.With(coin.Denom, globalRewardIndexes)
|
|
}
|
|
|
|
claim.SupplyRewardIndexes = supplyRewardIndexes
|
|
k.SetHardLiquidityProviderClaim(ctx, claim)
|
|
}
|
|
|
|
// SynchronizeHardSupplyReward updates the claim object by adding any accumulated rewards
|
|
// and updating the reward index value
|
|
func (k Keeper) SynchronizeHardSupplyReward(ctx sdk.Context, deposit hardtypes.Deposit) {
|
|
claim, found := k.GetHardLiquidityProviderClaim(ctx, deposit.Depositor)
|
|
if !found {
|
|
return
|
|
}
|
|
|
|
// Source shares for hard deposits is their normalized deposit amount
|
|
normalizedDeposit, err := deposit.NormalizedDeposit()
|
|
if err != nil {
|
|
panic(fmt.Sprintf("during deposit reward sync, could not get normalized deposit for %s: %s", deposit.Depositor, err.Error()))
|
|
}
|
|
|
|
for _, normedDeposit := range normalizedDeposit {
|
|
claim = k.synchronizeSingleHardSupplyReward(ctx, claim, normedDeposit.Denom, normedDeposit.Amount)
|
|
}
|
|
k.SetHardLiquidityProviderClaim(ctx, claim)
|
|
}
|
|
|
|
// synchronizeSingleHardSupplyReward synchronizes a single rewarded supply denom in a hard claim.
|
|
// It returns the claim without setting in the store.
|
|
// The public methods for accessing and modifying claims are preferred over this one. Direct modification of claims is easy to get wrong.
|
|
func (k Keeper) synchronizeSingleHardSupplyReward(ctx sdk.Context, claim types.HardLiquidityProviderClaim, denom string, sourceShares sdk.Dec) types.HardLiquidityProviderClaim {
|
|
globalRewardIndexes, found := k.GetHardSupplyRewardIndexes(ctx, denom)
|
|
if !found {
|
|
// The global factor is only not found if
|
|
// - the supply denom has not started accumulating rewards yet (either there is no reward specified in params, or the reward start time hasn't been hit)
|
|
// - OR it was wrongly deleted from state (factors should never be removed while unsynced claims exist)
|
|
// If not found we could either skip this sync, or assume the global factor is zero.
|
|
// Skipping will avoid storing unnecessary factors in the claim for non rewarded denoms.
|
|
// And in the event a global factor is wrongly deleted, it will avoid this function panicking when calculating rewards.
|
|
return claim
|
|
}
|
|
|
|
userRewardIndexes, found := claim.SupplyRewardIndexes.Get(denom)
|
|
if !found {
|
|
// Normally the reward indexes should always be found.
|
|
// But if a denom was not rewarded then becomes rewarded (ie a reward period is added to params), then the indexes will be missing from claims for that supplied denom.
|
|
// So given the reward period was just added, assume the starting value for any global reward indexes, which is an empty slice.
|
|
userRewardIndexes = types.RewardIndexes{}
|
|
}
|
|
|
|
newRewards, err := k.CalculateRewards(userRewardIndexes, globalRewardIndexes, sourceShares)
|
|
if err != nil {
|
|
// Global reward factors should never decrease, as it would lead to a negative update to claim.Rewards.
|
|
// This panics if a global reward factor decreases or disappears between the old and new indexes.
|
|
panic(fmt.Sprintf("corrupted global reward indexes found: %v", err))
|
|
}
|
|
|
|
claim.Reward = claim.Reward.Add(newRewards...)
|
|
claim.SupplyRewardIndexes = claim.SupplyRewardIndexes.With(denom, globalRewardIndexes)
|
|
|
|
return claim
|
|
}
|
|
|
|
// UpdateHardSupplyIndexDenoms adds any new deposit denoms to the claim's supply reward index
|
|
func (k Keeper) UpdateHardSupplyIndexDenoms(ctx sdk.Context, deposit hardtypes.Deposit) {
|
|
claim, found := k.GetHardLiquidityProviderClaim(ctx, deposit.Depositor)
|
|
if !found {
|
|
claim = types.NewHardLiquidityProviderClaim(deposit.Depositor, sdk.Coins{}, nil, nil)
|
|
}
|
|
|
|
depositDenoms := getDenoms(deposit.Amount)
|
|
supplyRewardIndexDenoms := claim.SupplyRewardIndexes.GetCollateralTypes()
|
|
|
|
supplyRewardIndexes := claim.SupplyRewardIndexes
|
|
|
|
// Create a new multi-reward index in the claim for every new deposit denom
|
|
uniqueDepositDenoms := setDifference(depositDenoms, supplyRewardIndexDenoms)
|
|
|
|
for _, denom := range uniqueDepositDenoms {
|
|
globalSupplyRewardIndexes, found := k.GetHardSupplyRewardIndexes(ctx, denom)
|
|
if !found {
|
|
globalSupplyRewardIndexes = types.RewardIndexes{}
|
|
}
|
|
supplyRewardIndexes = supplyRewardIndexes.With(denom, globalSupplyRewardIndexes)
|
|
}
|
|
|
|
// Delete multi-reward index from claim if the collateral type is no longer deposited
|
|
uniqueSupplyRewardDenoms := setDifference(supplyRewardIndexDenoms, depositDenoms)
|
|
|
|
for _, denom := range uniqueSupplyRewardDenoms {
|
|
supplyRewardIndexes = supplyRewardIndexes.RemoveRewardIndex(denom)
|
|
}
|
|
|
|
claim.SupplyRewardIndexes = supplyRewardIndexes
|
|
k.SetHardLiquidityProviderClaim(ctx, claim)
|
|
}
|
|
|
|
// SynchronizeHardLiquidityProviderClaim adds any accumulated rewards
|
|
func (k Keeper) SynchronizeHardLiquidityProviderClaim(ctx sdk.Context, owner sdk.AccAddress) {
|
|
// Synchronize any hard liquidity supply-side rewards
|
|
deposit, foundDeposit := k.hardKeeper.GetDeposit(ctx, owner)
|
|
if foundDeposit {
|
|
k.SynchronizeHardSupplyReward(ctx, deposit)
|
|
}
|
|
|
|
// Synchronize any hard liquidity borrow-side rewards
|
|
borrow, foundBorrow := k.hardKeeper.GetBorrow(ctx, owner)
|
|
if foundBorrow {
|
|
k.SynchronizeHardBorrowReward(ctx, borrow)
|
|
}
|
|
}
|
|
|
|
// SimulateHardSynchronization calculates a user's outstanding hard rewards by simulating reward synchronization
|
|
func (k Keeper) SimulateHardSynchronization(ctx sdk.Context, claim types.HardLiquidityProviderClaim) types.HardLiquidityProviderClaim {
|
|
// 1. Simulate Hard supply-side rewards
|
|
for _, ri := range claim.SupplyRewardIndexes {
|
|
globalRewardIndexes, foundGlobalRewardIndexes := k.GetHardSupplyRewardIndexes(ctx, ri.CollateralType)
|
|
if !foundGlobalRewardIndexes {
|
|
continue
|
|
}
|
|
|
|
userRewardIndexes, foundUserRewardIndexes := claim.SupplyRewardIndexes.GetRewardIndex(ri.CollateralType)
|
|
if !foundUserRewardIndexes {
|
|
continue
|
|
}
|
|
|
|
userRewardIndexIndex, foundUserRewardIndexIndex := claim.SupplyRewardIndexes.GetRewardIndexIndex(ri.CollateralType)
|
|
if !foundUserRewardIndexIndex {
|
|
continue
|
|
}
|
|
|
|
for _, globalRewardIndex := range globalRewardIndexes {
|
|
userRewardIndex, foundUserRewardIndex := userRewardIndexes.RewardIndexes.GetRewardIndex(globalRewardIndex.CollateralType)
|
|
if !foundUserRewardIndex {
|
|
userRewardIndex = types.NewRewardIndex(globalRewardIndex.CollateralType, sdk.ZeroDec())
|
|
userRewardIndexes.RewardIndexes = append(userRewardIndexes.RewardIndexes, userRewardIndex)
|
|
claim.SupplyRewardIndexes[userRewardIndexIndex].RewardIndexes = append(claim.SupplyRewardIndexes[userRewardIndexIndex].RewardIndexes, userRewardIndex)
|
|
}
|
|
|
|
globalRewardFactor := globalRewardIndex.RewardFactor
|
|
userRewardFactor := userRewardIndex.RewardFactor
|
|
rewardsAccumulatedFactor := globalRewardFactor.Sub(userRewardFactor)
|
|
if rewardsAccumulatedFactor.IsZero() {
|
|
continue
|
|
}
|
|
deposit, found := k.hardKeeper.GetDeposit(ctx, claim.GetOwner())
|
|
if !found {
|
|
continue
|
|
}
|
|
newRewardsAmount := rewardsAccumulatedFactor.Mul(sdk.NewDecFromInt(deposit.Amount.AmountOf(ri.CollateralType))).RoundInt()
|
|
if newRewardsAmount.IsZero() || newRewardsAmount.IsNegative() {
|
|
continue
|
|
}
|
|
|
|
factorIndex, foundFactorIndex := userRewardIndexes.RewardIndexes.GetFactorIndex(globalRewardIndex.CollateralType)
|
|
if !foundFactorIndex {
|
|
continue
|
|
}
|
|
claim.SupplyRewardIndexes[userRewardIndexIndex].RewardIndexes[factorIndex].RewardFactor = globalRewardIndex.RewardFactor
|
|
newRewardsCoin := sdk.NewCoin(userRewardIndex.CollateralType, newRewardsAmount)
|
|
claim.Reward = claim.Reward.Add(newRewardsCoin)
|
|
}
|
|
}
|
|
|
|
// 2. Simulate Hard borrow-side rewards
|
|
for _, ri := range claim.BorrowRewardIndexes {
|
|
globalRewardIndexes, foundGlobalRewardIndexes := k.GetHardBorrowRewardIndexes(ctx, ri.CollateralType)
|
|
if !foundGlobalRewardIndexes {
|
|
continue
|
|
}
|
|
|
|
userRewardIndexes, foundUserRewardIndexes := claim.BorrowRewardIndexes.GetRewardIndex(ri.CollateralType)
|
|
if !foundUserRewardIndexes {
|
|
continue
|
|
}
|
|
|
|
userRewardIndexIndex, foundUserRewardIndexIndex := claim.BorrowRewardIndexes.GetRewardIndexIndex(ri.CollateralType)
|
|
if !foundUserRewardIndexIndex {
|
|
continue
|
|
}
|
|
|
|
for _, globalRewardIndex := range globalRewardIndexes {
|
|
userRewardIndex, foundUserRewardIndex := userRewardIndexes.RewardIndexes.GetRewardIndex(globalRewardIndex.CollateralType)
|
|
if !foundUserRewardIndex {
|
|
userRewardIndex = types.NewRewardIndex(globalRewardIndex.CollateralType, sdk.ZeroDec())
|
|
userRewardIndexes.RewardIndexes = append(userRewardIndexes.RewardIndexes, userRewardIndex)
|
|
claim.BorrowRewardIndexes[userRewardIndexIndex].RewardIndexes = append(claim.BorrowRewardIndexes[userRewardIndexIndex].RewardIndexes, userRewardIndex)
|
|
}
|
|
|
|
globalRewardFactor := globalRewardIndex.RewardFactor
|
|
userRewardFactor := userRewardIndex.RewardFactor
|
|
rewardsAccumulatedFactor := globalRewardFactor.Sub(userRewardFactor)
|
|
if rewardsAccumulatedFactor.IsZero() {
|
|
continue
|
|
}
|
|
borrow, found := k.hardKeeper.GetBorrow(ctx, claim.GetOwner())
|
|
if !found {
|
|
continue
|
|
}
|
|
newRewardsAmount := rewardsAccumulatedFactor.Mul(sdk.NewDecFromInt(borrow.Amount.AmountOf(ri.CollateralType))).RoundInt()
|
|
if newRewardsAmount.IsZero() || newRewardsAmount.IsNegative() {
|
|
continue
|
|
}
|
|
|
|
factorIndex, foundFactorIndex := userRewardIndexes.RewardIndexes.GetFactorIndex(globalRewardIndex.CollateralType)
|
|
if !foundFactorIndex {
|
|
continue
|
|
}
|
|
claim.BorrowRewardIndexes[userRewardIndexIndex].RewardIndexes[factorIndex].RewardFactor = globalRewardIndex.RewardFactor
|
|
newRewardsCoin := sdk.NewCoin(userRewardIndex.CollateralType, newRewardsAmount)
|
|
claim.Reward = claim.Reward.Add(newRewardsCoin)
|
|
}
|
|
}
|
|
|
|
return claim
|
|
}
|
|
|
|
// Set setDifference: A - B
|
|
func setDifference(a, b []string) (diff []string) {
|
|
m := make(map[string]bool)
|
|
|
|
for _, item := range b {
|
|
m[item] = true
|
|
}
|
|
|
|
for _, item := range a {
|
|
if _, ok := m[item]; !ok {
|
|
diff = append(diff, item)
|
|
}
|
|
}
|
|
return
|
|
}
|
|
|
|
func getDenoms(coins sdk.Coins) []string {
|
|
denoms := []string{}
|
|
for _, coin := range coins {
|
|
denoms = append(denoms, coin.Denom)
|
|
}
|
|
return denoms
|
|
}
|