fix(state-transitions): Make setting of eth1 deposit index backward compatible

mod/state-transition/pkg/core/core_test.go

@@ -301,13 +301,3 @@ func buildNextBlock(
 		Body:          nextBlkBody,
 	}
 }
-
-var (
-	dummyExecutionPayload = &types.ExecutionPayload{
-		Timestamp:     0,
-		ExtraData:     []byte("testing"),
-		Transactions:  [][]byte{},
-		Withdrawals:   []*engineprimitives.Withdrawal{},
-		BaseFeePerGas: math.NewU256(0),
-	}
-)

mod/state-transition/pkg/core/state_processor.go

@@ -252,6 +252,11 @@ func (sp *StateProcessor[
 			if err = st.SetEth1DepositIndex(fixedDepositIdx); err != nil {
 				return nil, err
 			}
+
+			sp.logger.Info(
+				"Fixed Eth 1 deposit index",
+				"previous", idx, "fixed", fixedDepositIdx,
+			)
 		}
 
 		// Process the Epoch Boundary.

mod/state-transition/pkg/core/state_processor_genesis_test.go

@@ -124,7 +124,8 @@ func TestInitialize(t *testing.T) {
 		checkValidatorNonBartio(t, cs, st, dep)
 	}
 
-	// check that validator index is duly set
+	// check that deposit index is duly set. On betnet
+	// deposit index is set to the last accepted deposit.
 	latestValIdx, err := st.GetEth1DepositIndex()
 	require.NoError(t, err)
 	require.Equal(t, uint64(len(genDeposits)-1), latestValIdx)
@@ -246,10 +247,11 @@ func TestInitializeBartio(t *testing.T) {
 		checkValidatorBartio(t, cs, st, dep)
 	}
 
-	// check that validator index is duly set
+	// check that deposit index is duly set. On Bartio
+	// deposit index is off by 1.
 	latestValIdx, err := st.GetEth1DepositIndex()
 	require.NoError(t, err)
-	require.Equal(t, uint64(len(genDeposits)-1), latestValIdx)
+	require.Equal(t, uint64(len(genDeposits)), latestValIdx)
 }
 
 func checkValidatorBartio(

mod/state-transition/pkg/core/state_processor_staking.go

@@ -71,10 +71,38 @@ func (sp *StateProcessor[
 	st BeaconStateT,
 	dep DepositT,
 ) error {
-	if err := st.SetEth1DepositIndex(dep.GetIndex().Unwrap()); err != nil {
+	slot, err := st.GetSlot()
+	if err != nil {
 		return err
 	}
 
+	depositIndex := dep.GetIndex().Unwrap()
+	switch {
+	case sp.cs.DepositEth1ChainID() == spec.BartioChainID:
+		// Bartio has a bug which makes DepositEth1ChainID point to
+		// next deposit index, not latest processed deposit index.
+		// We keep it for backward compatibility.
+		depositIndex++
+	case sp.cs.DepositEth1ChainID() == spec.BoonetEth1ChainID &&
+		slot < math.U64(spec.BoonetFork2Height):
+		// Boonet pre fork2 has a bug which makes DepositEth1ChainID point to
+		// next deposit index, not latest processed deposit index.
+		// We keep it for backward compatibility.
+		depositIndex++
+	default:
+		// Nothing to do. We correctly set the deposit index to the last
+		// processed deposit index.
+	}
+
+	if err = st.SetEth1DepositIndex(depositIndex); err != nil {
+		return err
+	}
+
+	sp.logger.Info(
+		"Processed deposit to set Eth 1 deposit index",
+		"deposit_index", dep.GetIndex().Unwrap(),
+	)
+
 	return sp.applyDeposit(st, dep)
 }
 
@@ -94,7 +122,16 @@ func (sp *StateProcessor[
 	}
 
 	// if validator exist, just update its balance
-	return st.IncreaseBalance(idx, dep.GetAmount())
+	if err = st.IncreaseBalance(idx, dep.GetAmount()); err != nil {
+		return err
+	}
+
+	sp.logger.Info(
+		"Processed deposit to increase balance",
+		"deposit_amount", float64(dep.GetAmount().Unwrap())/math.GweiPerWei,
+		"validator_index", idx,
+	)
+	return nil
 }
 
 // createValidator creates a validator if the deposit is valid.
@@ -286,5 +323,14 @@ func (sp *StateProcessor[
 	if err != nil {
 		return err
 	}
-	return st.IncreaseBalance(idx, depositAmount)
+	if err = st.IncreaseBalance(idx, depositAmount); err != nil {
+		return err
+	}
+	sp.logger.Info(
+		"Processed deposit to create new validator",
+		"deposit_amount", float64(depositAmount.Unwrap())/math.GweiPerWei,
+		"validator_index", idx,
+		"withdrawal_epoch", val.GetWithdrawableEpoch(),
+	)
+	return nil
 }