Merge branch 'main' of github.com:babylonlabs-io/babylon into rafilx/…

…bump-ibc

CHANGELOG.md

@@ -75,6 +75,8 @@ invocation
 ### Bug fixes
 
 - [#591](https://github.com/babylonlabs-io/babylon/pull/591) bump ibc to v8.6.1 that fixes security issue
+- [#579](https://github.com/babylonlabs-io/babylon/pull/579) Slashed FP gets activated in voting power distribution
+cache if an old BTC delegation receives inclusion proof
 - [#592](https://github.com/babylonlabs-io/babylon/pull/592) finality: avoid refunding finality signatures over forks
 - [#525](https://github.com/babylonlabs-io/babylon/pull/525) fix: add back `NewIBCHeaderDecorator` post handler
 - [#563](https://github.com/babylonlabs-io/babylon/pull/563) reject coinbase staking transactions

test/replay/driver.go

@@ -550,7 +550,7 @@ func (d *BabylonAppDriver) GetBTCLCTip() (*wire.BlockHeader, uint32) {
 	return tipInfo.Header.ToBlockHeader(), tipInfo.Height
 }
 
-func blocksWithProofsToHeaderBytes(blocks []*datagen.BlockWithProofs) []bbn.BTCHeaderBytes {
+func BlocksWithProofsToHeaderBytes(blocks []*datagen.BlockWithProofs) []bbn.BTCHeaderBytes {
 	headerBytes := []bbn.BTCHeaderBytes{}
 	for _, block := range blocks {
 		headerBytes = append(headerBytes, bbn.NewBTCHeaderBytesFromBlockHeader(&block.Block.Header))
@@ -565,7 +565,7 @@ func (d *BabylonAppDriver) ExtendBTCLcWithNEmptyBlocks(
 ) (*wire.BlockHeader, uint32) {
 	tip, _ := d.GetBTCLCTip()
 	blocks := datagen.GenNEmptyBlocks(r, uint64(n), tip)
-	headers := blocksWithProofsToHeaderBytes(blocks)
+	headers := BlocksWithProofsToHeaderBytes(blocks)
 
 	d.SendTxWithMsgsFromDriverAccount(t, &btclighttypes.MsgInsertHeaders{
 		Signer:  d.GetDriverAccountAddress().String(),
@@ -583,7 +583,7 @@ func (d *BabylonAppDriver) GenBlockWithTransactions(
 ) *datagen.BlockWithProofs {
 	tip, _ := d.GetBTCLCTip()
 	block := datagen.GenRandomBtcdBlockWithTransactions(r, txs, tip)
-	headers := blocksWithProofsToHeaderBytes([]*datagen.BlockWithProofs{block})
+	headers := BlocksWithProofsToHeaderBytes([]*datagen.BlockWithProofs{block})
 
 	d.SendTxWithMsgsFromDriverAccount(t, &btclighttypes.MsgInsertHeaders{
 		Signer:  d.GetDriverAccountAddress().String(),

testutil/datagen/btcstaking.go

@@ -37,6 +37,15 @@ func GenRandomFinalityProvider(r *rand.Rand) (*bstypes.FinalityProvider, error)
 	return GenRandomFinalityProviderWithBTCSK(r, btcSK, "")
 }
 
+func GenRandomMsgCreateFinalityProvider(r *rand.Rand) (*bstypes.MsgCreateFinalityProvider, error) {
+	// BTC key pairs
+	btcSK, _, err := GenRandomBTCKeyPair(r)
+	if err != nil {
+		return nil, err
+	}
+	return GenRandomCreateFinalityProviderMsgWithBTCBabylonSKs(r, btcSK, GenRandomAccount().GetAddress())
+}
+
 func CreateNFinalityProviders(r *rand.Rand, t *testing.T, n int) []*bstypes.FinalityProvider {
 	fps := make([]*bstypes.FinalityProvider, n)
 	for i := 0; i < n; i++ {

x/btcstaking/keeper/btc_reorg_test.go

@@ -198,7 +198,7 @@ func TestSetLargestBtcReorg(t *testing.T) {
 			require.NoError(t, err)
 
 			actLargestBtcReorg := k.GetLargestBtcReorg(ctx)
-			require.Equal(t, tc.expectedLargestBtcReorg, actLargestBtcReorg)
+			require.EqualValues(t, tc.expectedLargestBtcReorg, actLargestBtcReorg)
 		})
 	}
 }

x/finality/keeper/power_dist_change.go

@@ -174,7 +174,7 @@ func (k Keeper) ProcessAllPowerDistUpdateEvents(
 ) *ftypes.VotingPowerDistCache {
 	// a map where key is finality provider's BTC PK hex and value is a list
 	// of BTC delegations satoshis amount that newly become active under this provider
-	activedSatsByFpBtcPk := map[string][]uint64{}
+	activatedSatsByFpBtcPk := map[string][]uint64{}
 	// a map where key is finality provider's BTC PK hex and value is a list
 	// of BTC delegations satoshis that were unbonded or expired without previously
 	// being unbonded
@@ -214,9 +214,11 @@ func (k Keeper) ProcessAllPowerDistUpdateEvents(
 						// This is a consumer FP rather than Babylon FP, skip it
 						continue
 					}
-					activedSatsByFpBtcPk[fpBTCPKHex] = append(activedSatsByFpBtcPk[fpBTCPKHex], btcDel.TotalSat)
+					activatedSatsByFpBtcPk[fpBTCPKHex] = append(activatedSatsByFpBtcPk[fpBTCPKHex], btcDel.TotalSat)
 				}
 
+				// FP could be already slashed when it is being activated, but it is okay
+				// since slashed finality providers do not earn rewards
 				k.processRewardTracker(ctx, fpByBtcPkHex, btcDel, func(fp, del sdk.AccAddress, sats uint64) {
 					k.MustProcessBtcDelegationActivated(ctx, fp, del, sats)
 				})
@@ -291,15 +293,15 @@ func (k Keeper) ProcessAllPowerDistUpdateEvents(
 		}
 
 		// process all new BTC delegations under this finality provider
-		if fpActiveSats, ok := activedSatsByFpBtcPk[fpBTCPKHex]; ok {
+		if fpActiveSats, ok := activatedSatsByFpBtcPk[fpBTCPKHex]; ok {
 			// handle new BTC delegations for this finality provider
 			for _, activatedSats := range fpActiveSats {
 				fp.AddBondedSats(activatedSats)
 			}
 			// remove the finality provider entry in fpActiveSats map, so that
 			// after the for loop the rest entries in fpActiveSats belongs to new
 			// finality providers with new BTC delegations
-			delete(activedSatsByFpBtcPk, fpBTCPKHex)
+			delete(activatedSatsByFpBtcPk, fpBTCPKHex)
 		}
 
 		// process all new unbonding BTC delegations under this finality provider
@@ -325,8 +327,8 @@ func (k Keeper) ProcessAllPowerDistUpdateEvents(
 		process new BTC delegations under new finality providers in activeBTCDels
 	*/
 	// sort new finality providers in activeBTCDels to ensure determinism
-	fpActiveBtcPkHexList := make([]string, 0, len(activedSatsByFpBtcPk))
-	for fpBTCPKHex := range activedSatsByFpBtcPk {
+	fpActiveBtcPkHexList := make([]string, 0, len(activatedSatsByFpBtcPk))
+	for fpBTCPKHex := range activatedSatsByFpBtcPk {
 		// if the fp was slashed, should not even be added to the list
 		_, isSlashed := slashedFPs[fpBTCPKHex]
 		if isSlashed {
@@ -346,6 +348,13 @@ func (k Keeper) ProcessAllPowerDistUpdateEvents(
 			// This is a consumer FP rather than Babylon FP, skip it
 			continue
 		}
+		// if the fp is slashed it shouldn't be included in the newDc
+		if newFP.IsSlashed() {
+			// case if a BTC delegation is created without inclusion proof
+			// the finality provider gets slashed
+			// inclusion proof gets included and generates an EventPowerDistUpdate_BtcDelStateUpdate
+			continue
+		}
 		fpDistInfo := ftypes.NewFinalityProviderDistInfo(newFP)
 
 		// check for jailing cases
@@ -357,7 +366,7 @@ func (k Keeper) ProcessAllPowerDistUpdateEvents(
 		}
 
 		// add each BTC delegation
-		fpActiveSats := activedSatsByFpBtcPk[fpBTCPKHex]
+		fpActiveSats := activatedSatsByFpBtcPk[fpBTCPKHex]
 		for _, activatedSats := range fpActiveSats {
 			fpDistInfo.AddBondedSats(activatedSats)
 		}