From e09b5dedf422c58339a85be1f153fdd8e844842e Mon Sep 17 00:00:00 2001 From: Joe Abbey Date: Thu, 2 Mar 2023 12:39:15 -0500 Subject: [PATCH 1/3] GetLastTotalPower needs to be scaled to ubedrock --- app/fix_bonded_tokens_pool.go | 2 ++ app/fix_bonded_tokens_pool_test.go | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/fix_bonded_tokens_pool.go b/app/fix_bonded_tokens_pool.go index 10ae9c5f96..ed2dc8a99a 100644 --- a/app/fix_bonded_tokens_pool.go +++ b/app/fix_bonded_tokens_pool.go @@ -3,6 +3,7 @@ package app import ( "fmt" + "cosmossdk.io/math" "github.com/Pylons-tech/pylons/app/params" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" @@ -26,6 +27,7 @@ func (app *PylonsApp) FixBondedTokensPool(ctx sdk.Context) { // There is currently 15202 BEDROCK Total Power Delegated // Transferring the missing accounting from multisig to bonded_tokens_pool totalPower := app.StakingKeeper.GetLastTotalPower(ctx) + totalPower = totalPower.Mul(math.NewInt(1_000_000)) bondeTokensPoolBalance := bk.GetBalance(ctx, bondedTokensPoolAddress, params.StakingBaseCoinUnit) bondeTokensPoolDelta := totalPower.Sub(bondeTokensPoolBalance.Amount) diff --git a/app/fix_bonded_tokens_pool_test.go b/app/fix_bonded_tokens_pool_test.go index 7cbfbe65d0..9bb7ce2eed 100644 --- a/app/fix_bonded_tokens_pool_test.go +++ b/app/fix_bonded_tokens_pool_test.go @@ -81,10 +81,10 @@ func (suite *UpgradeTestSuite) TestFixBondedTokensPool() { // The bonded_tokens_pool should now be restored. bondedTokensPoolFixed := suite.App.BankKeeper.GetBalance(suite.Ctx, bondedTokensPoolAddress, params.StakingBaseCoinUnit) - suite.Require().NotEqual(bondedTokensPoolBefore.Amount, bondedTokensPoolFixed.Amount) + suite.Require().Equal(bondedTokensPoolBefore.Amount, bondedTokensPoolFixed.Amount) // The master wallet should now have 9 masterWalletBalance = suite.App.BankKeeper.GetBalance(suite.Ctx, multisigAddress, params.StakingBaseCoinUnit) - suite.Require().Equal(masterWalletBalance.Amount, math.NewInt(9_999_999)) + suite.Require().Equal(masterWalletBalance.Amount, math.NewInt(9_000_000)) } From 944941aaff2fcbb4ebf2b77849cd99e7b690b9d9 Mon Sep 17 00:00:00 2001 From: Michael Sofaer Date: Thu, 2 Mar 2023 09:44:44 -0800 Subject: [PATCH 2/3] Update fix_bonded_tokens_pool.go I just like to change things. --- app/fix_bonded_tokens_pool.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/fix_bonded_tokens_pool.go b/app/fix_bonded_tokens_pool.go index ed2dc8a99a..10df34f7bf 100644 --- a/app/fix_bonded_tokens_pool.go +++ b/app/fix_bonded_tokens_pool.go @@ -26,8 +26,8 @@ func (app *PylonsApp) FixBondedTokensPool(ctx sdk.Context) { // Account currently has 1 BEDROCK // There is currently 15202 BEDROCK Total Power Delegated // Transferring the missing accounting from multisig to bonded_tokens_pool - totalPower := app.StakingKeeper.GetLastTotalPower(ctx) - totalPower = totalPower.Mul(math.NewInt(1_000_000)) + totalPowerInBedrock := app.StakingKeeper.GetLastTotalPower(ctx) + totalPowerInUbedrock = totalPower.Mul(math.NewInt(1_000_000)) bondeTokensPoolBalance := bk.GetBalance(ctx, bondedTokensPoolAddress, params.StakingBaseCoinUnit) bondeTokensPoolDelta := totalPower.Sub(bondeTokensPoolBalance.Amount) From 937c558a9c4353502fa02e10bd1483a766cea5fb Mon Sep 17 00:00:00 2001 From: Joe Abbey Date: Thu, 2 Mar 2023 12:47:02 -0500 Subject: [PATCH 3/3] fixing the flow --- app/fix_bonded_tokens_pool.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/fix_bonded_tokens_pool.go b/app/fix_bonded_tokens_pool.go index 10df34f7bf..24a5881832 100644 --- a/app/fix_bonded_tokens_pool.go +++ b/app/fix_bonded_tokens_pool.go @@ -27,10 +27,10 @@ func (app *PylonsApp) FixBondedTokensPool(ctx sdk.Context) { // There is currently 15202 BEDROCK Total Power Delegated // Transferring the missing accounting from multisig to bonded_tokens_pool totalPowerInBedrock := app.StakingKeeper.GetLastTotalPower(ctx) - totalPowerInUbedrock = totalPower.Mul(math.NewInt(1_000_000)) + totalPowerInUbedrock := totalPowerInBedrock.Mul(math.NewInt(1_000_000)) bondeTokensPoolBalance := bk.GetBalance(ctx, bondedTokensPoolAddress, params.StakingBaseCoinUnit) - bondeTokensPoolDelta := totalPower.Sub(bondeTokensPoolBalance.Amount) + bondeTokensPoolDelta := totalPowerInUbedrock.Sub(bondeTokensPoolBalance.Amount) bondeTokensPoolAdjustment := sdk.NewCoins(sdk.NewCoin(params.StakingBaseCoinUnit, bondeTokensPoolDelta)) err := bk.SendCoinsFromAccountToModule(ctx, multisigAddress, stakingtypes.BondedPoolName, bondeTokensPoolAdjustment)