add lookback checks to check_consensus_block_proposals task

Author: pk910

pkg/coordinator/tasks/check_consensus_block_proposals/config.go

@@ -3,6 +3,7 @@ package checkconsensusblockproposals
 import "math/big"
 
 type Config struct {
+	CheckLookback                int    `yaml:"checkLookback" json:"checkLookback"`
 	BlockCount                   int    `yaml:"blockCount" json:"blockCount"`
 	GraffitiPattern              string `yaml:"graffitiPattern" json:"graffitiPattern"`
 	ValidatorNamePattern         string `yaml:"validatorNamePattern" json:"validatorNamePattern"`
@@ -55,7 +56,8 @@ type Config struct {
 
 func DefaultConfig() Config {
 	return Config{
-		BlockCount: 1,
+		CheckLookback: 1,
+		BlockCount:    1,
 	}
 }
 

pkg/coordinator/tasks/check_consensus_block_proposals/task.go

@@ -115,9 +115,33 @@ func (t *Task) Execute(ctx context.Context) error {
 	}
 
 	// check current block
-	if blocks := consensusPool.GetBlockCache().GetCachedBlocks(); len(blocks) > 0 {
-		if checkBlockMatch(blocks[0]) {
-			return nil
+	if t.config.CheckLookback > 0 {
+		if blocks := consensusPool.GetBlockCache().GetCachedBlocks(); len(blocks) > 0 {
+			lookbackBlocks := []*consensus.Block{}
+			block := blocks[0]
+
+			for {
+				lookbackBlocks = append(lookbackBlocks, block)
+				if len(lookbackBlocks) >= t.config.CheckLookback {
+					break
+				}
+
+				parentRoot := block.GetParentRoot()
+				if parentRoot == nil {
+					break
+				}
+
+				block = consensusPool.GetBlockCache().GetCachedBlockByRoot(*parentRoot)
+				if block == nil {
+					break
+				}
+			}
+
+			for i := len(lookbackBlocks) - 1; i >= 0; i-- {
+				if checkBlockMatch(lookbackBlocks[i]) {
+					return nil
+				}
+			}
 		}
 	}
 

playbooks/pectra-dev/eip7002-all.yaml

@@ -392,6 +392,18 @@ tasks:
               configVars:
                 expectBlsChanges: "| [{publicKey: .tasks.validator_pubkeys.outputs.pubkeys[3], address: .tasks.wallet_details.outputs.address}]"
 
+        # wait for balance to be <= 32ETH (await withdrawal after bls change)
+        - name: check_consensus_validator_status
+          title: "Wait for key 3 balance to be <= 32.01 ETH"
+          id: key3_status
+          timeout: 30m
+          config:
+            validatorStatus:
+            - active_ongoing
+            maxValidatorBalance: 32010000000
+          configVars:
+            validatorPubKey: "tasks.validator_pubkeys.outputs.pubkeys[3]"
+
         # generate withdrawal & wait for inclusion
         - name: run_task_background
           title: "Generate EL triggered partial withdrawal for key 3 & track inclusion"
@@ -421,13 +433,14 @@ tasks:
         - name: run_task_options
           title: "Monitor chain for 30min, expect no withdrawal with >= 0.1 ETH for key 3"
           config:
-            invertResult: true
+            expectFailure: true
             task:
               name: check_consensus_block_proposals
               title: "Check for >= 0.1 ETH withdrawal for key 3 (expect failure)"
               timeout: 30m
               config:
                 minWithdrawalCount: 1
+                checkLookback: 0
               configVars:
                 expectWithdrawals: "| [{publicKey: .tasks.validator_pubkeys.outputs.pubkeys[3], address: .tasks.wallet_details.outputs.address, minAmount: 100000000}]"