changes on #4897

Author: domiwei

cl/phase1/core/state/epbs.go

@@ -178,6 +178,30 @@ func GetPendingBalanceToWithdrawForBuilder(s abstract.BeaconState, builderIndex
 	return total
 }
 
+// IsPendingValidator returns true if there's a pending deposit for the given pubkey
+// with a valid signature. This is used to prevent builder deposits from being applied
+// when there's already a valid pending validator deposit for the same pubkey.
+// [New in Gloas:EIP7732]
+func IsPendingValidator(s abstract.BeaconState, pubkey common.Bytes48) bool {
+	pendingDeposits := s.GetPendingDeposits()
+	if pendingDeposits == nil {
+		return false
+	}
+	cfg := s.BeaconConfig()
+	for i := 0; i < pendingDeposits.Len(); i++ {
+		deposit := pendingDeposits.Get(i)
+		if deposit.PubKey != pubkey {
+			continue
+		}
+		// Check if this pending deposit has a valid signature
+		valid, err := IsValidDepositSignature(cfg, deposit.PubKey, deposit.WithdrawalCredentials, deposit.Amount, deposit.Signature)
+		if err == nil && valid {
+			return true
+		}
+	}
+	return false
+}
+
 // IsBuilderPubkey returns true if the given pubkey belongs to any builder in the state.
 // [New in Gloas:EIP7732]
 func IsBuilderPubkey(s abstract.BeaconState, pubkey common.Bytes48) bool {

cl/transition/impl/eth2/operations.go

@@ -1523,10 +1523,14 @@ func (I *impl) ProcessDepositRequest(s abstract.BeaconState, depositRequest *sol
 	// [New in Gloas:EIP7732] Route builder deposits immediately
 	if s.Version() >= clparams.GloasVersion {
 		isBuilder := state.IsBuilderPubkey(s, depositRequest.PubKey)
-		_, isValidator := s.ValidatorIndexByPubkey(depositRequest.PubKey)
-		isBuilderPrefix := state.IsBuilderWithdrawalCredential(depositRequest.WithdrawalCredentials, s.BeaconConfig())
-
-		if isBuilder || (isBuilderPrefix && !isValidator) {
+		_, isExistingValidator := s.ValidatorIndexByPubkey(depositRequest.PubKey)
+		hasBuilderPrefix := state.IsBuilderWithdrawalCredential(depositRequest.WithdrawalCredentials, s.BeaconConfig())
+		// Check if there's a pending deposit with valid signature for this pubkey
+		isPendingValidator := state.IsPendingValidator(s, depositRequest.PubKey)
+		// isValidator includes both existing validators and pending validators with valid signatures
+		isValidator := isExistingValidator || isPendingValidator
+
+		if isBuilder || (hasBuilderPrefix && !isValidator) {
 			state.ApplyDepositForBuilder(s, depositRequest.PubKey, depositRequest.WithdrawalCredentials, depositRequest.Amount, depositRequest.Signature, s.Slot())
 			return nil
 		}