Merge branch '446-module-triggers' into 0.1.5.1

cybercongress · Feb 4, 2020 · aa0f47d · aa0f47d
2 parents 5fb24d4 + 991a9f3
commit aa0f47d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/x/bank/exported/exported.go b/x/bank/exported/exported.go
@@ -28,7 +28,7 @@ type IndexedKeeper interface {
 
 	Load(sdk.Context, sdk.Context)
 
-	FixUserStake() bool
+	FixUserStake(ctx sdk.Context) bool
 	UpdateStake(cbd.AccNumber, int64)
 	GetTotalStakes() map[cbd.AccNumber]uint64
 	EndBlocker(sdk.Context)

diff --git a/x/bank/internal/keeper/index.go b/x/bank/internal/keeper/index.go
@@ -3,6 +3,8 @@ package keeper
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth"
+	"github.com/tendermint/tendermint/crypto"
+
 	cbd "github.com/cybercongress/cyberd/types"
 )
 
@@ -51,7 +53,17 @@ func (s *IndexedKeeper) getCollectFunc(ctx sdk.Context, userStake map[cbd.AccNum
 }
 
 // return true if some stake changed
-func (s *IndexedKeeper) FixUserStake() bool {
+func (s *IndexedKeeper) FixUserStake(ctx sdk.Context) bool {
+
+	// Standalone changes of modules balance should not trigger a rank recalculation
+	modulesNames := [6]string{"bonded_tokens_pool", "not_bonded_tokens_pool", "gov", "distribution", "mint", "fee_collector"}
+	for _, name := range modulesNames {
+		supplyModuleAddress := sdk.AccAddress(crypto.AddressHash([]byte(name)))
+		supplyModuleAccount := s.accountKeeper.GetAccount(ctx, supplyModuleAddress)
+		supplyModuleAccountNumber := cbd.AccNumber(supplyModuleAccount.GetAccountNumber())
+		s.userTotalStake[supplyModuleAccountNumber] = s.userNewTotalStake[supplyModuleAccountNumber]
+	}
+
 	stakeChanged := false
 	for k, v := range s.userNewTotalStake {
 		if s.userTotalStake[k] != v {

diff --git a/x/rank/internal/keeper/state.go b/x/rank/internal/keeper/state.go
@@ -130,7 +130,7 @@ func (s *StateKeeper) EndBlocker(ctx sdk.Context, log log.Logger) {
 		s.applyNextRank()
 
 		s.cidCount = int64(currentCidsCount)
-		stakeChanged := s.stakeKeeper.FixUserStake()
+		stakeChanged := s.stakeKeeper.FixUserStake(ctx)
 
 		// start new calculation
 		if s.hasNewLinksForPeriod || stakeChanged {

diff --git a/x/rank/internal/types/expected_keepers.go b/x/rank/internal/types/expected_keepers.go
@@ -8,7 +8,7 @@ import (
 )
 
 type StakeKeeper interface {
-	FixUserStake() bool
+	FixUserStake(ctx sdk.Context) bool
 	GetTotalStakes() map[cbd.AccNumber]uint64
 }