various fixes for eip7002 & eip7251 tests

Author: pk910

pkg/coordinator/tasks/check_consensus_block_proposals/README.md

@@ -71,8 +71,8 @@ The `check_consensus_block_proposals` task assesses consensus block proposals ag
   `{publicKey: "0x0000...", address: "0x00..."}`
 
 - **`expectWithdrawals`**:\
-  Specifies expected withdrawal operations, including public keys, destination addresses, and minimum withdrawal amounts.
-  `{publicKey: "0x0000...", address: "0x00...", minAmount: 0}`
+  Specifies expected withdrawal operations, including public keys, destination addresses, and minimum/maximum withdrawal amounts.
+  `{publicKey: "0x0000...", address: "0x00...", minAmount: 0, maxAmount: 0}`
 
 - **`expectDepositRequests`**:\
   Specifies expected deposit request operations, each object detailing the public key, withdrawal credentials, and deposit amount.

pkg/coordinator/tasks/check_consensus_block_proposals/config.go

@@ -36,6 +36,7 @@ type Config struct {
 		PublicKey string   `yaml:"publicKey" json:"publicKey"`
 		Address   string   `yaml:"address" json:"address"`
 		MinAmount *big.Int `yaml:"minAmount" json:"minAmount"`
+		MaxAmount *big.Int `yaml:"maxAmount" json:"maxAmount"`
 	} `yaml:"expectWithdrawals" json:"expectWithdrawals"`
 	ExpectDepositRequests []struct {
 		PublicKey             string   `yaml:"publicKey" json:"publicKey"`

pkg/coordinator/tasks/check_consensus_block_proposals/task.go

@@ -646,6 +646,8 @@ func (t *Task) checkBlockWithdrawals(block *consensus.Block, blockData *spec.Ver
 						t.logger.Warnf("check failed: withdrawal found, but execution address does not match (have: %v, want: %v)", withdrawal.Address.String(), expectedWithdrawal.Address)
 					case expectedWithdrawal.MinAmount.Cmp(big.NewInt(0)) > 0 && expectedWithdrawal.MinAmount.Cmp(withdrawalAmount) > 0:
 						t.logger.Warnf("check failed: withdrawal found, but amount lower than minimum (have: %v, want >= %v)", withdrawalAmount, expectedWithdrawal.MinAmount)
+					case expectedWithdrawal.MaxAmount.Cmp(big.NewInt(0)) > 0 && expectedWithdrawal.MaxAmount.Cmp(withdrawalAmount) < 0:
+						t.logger.Warnf("check failed: withdrawal found, but amount higher than maximum (have: %v, want <= %v)", withdrawalAmount, expectedWithdrawal.MaxAmount)
 					default:
 						found = true
 					}

pkg/coordinator/tasks/run_task_options/task.go

@@ -110,14 +110,19 @@ func (t *Task) Execute(ctx context.Context) error {
 			}
 		case t.config.ExpectFailure:
 			if taskErr == nil {
+				t.ctx.SetResult(types.TaskResultFailure)
 				return fmt.Errorf("child task succeeded, but should have failed")
+			} else {
+				t.ctx.SetResult(types.TaskResultSuccess)
 			}
 		case t.config.IgnoreFailure:
 			if taskErr != nil {
 				t.logger.Warnf("child task failed: %w", taskErr)
 			}
+			t.ctx.SetResult(types.TaskResultSuccess)
 		default:
 			if taskErr != nil {
+				t.ctx.SetResult(types.TaskResultFailure)
 				return fmt.Errorf("child task failed: %w", taskErr)
 			}
 		}

pkg/coordinator/tasks/run_tasks_concurrent/config.go

@@ -13,6 +13,9 @@ type Config struct {
 	// number of failed child tasks to make this task fail (0 = all tasks)
 	FailTaskCount uint64 `yaml:"failTaskCount" json:"failTaskCount"`
 
+	// fail task if neither succeedTaskCount nor failTaskCount is reached, but all tasks completed
+	FailOnUndecided bool `yaml:"failOnUndecided" json:"failOnUndecided"`
+
 	// create a new variable scope for the child tasks
 	NewVariableScope bool `yaml:"newVariableScope" json:"newVariableScope"`
 

pkg/coordinator/tasks/run_tasks_concurrent/task.go

@@ -207,7 +207,12 @@ func (t *Task) Execute(ctx context.Context) error {
 			if !taskComplete {
 				taskComplete = true
 
-				t.ctx.SetResult(types.TaskResultSuccess)
+				if t.config.FailOnUndecided {
+					t.ctx.SetResult(types.TaskResultFailure)
+				} else {
+					t.ctx.SetResult(types.TaskResultSuccess)
+				}
+
 				t.logger.Infof("all child tasks completed (%v success, %v failure)", successCount, failureCount)
 			}
 		}

playbooks/pectra-dev/eip7002-all.yaml

@@ -1,7 +1,7 @@
 
 id: eip7002-all
 name: "EIP7002 test (el triggerable exits)"
-timeout: 38h
+timeout: 72h
 config:
   walletPrivkey: ""
   validatorMnemonic: "giant issue aisle success illegal bike spike question tent bar rely arctic volcano long crawl hungry vocal artwork sniff fantasy very lucky have athlete"
@@ -85,7 +85,7 @@ tasks:
         tasks:
         - name: check_consensus_validator_status
           title: "Wait for validators to be active"
-          timeout: 2h
+          timeout: 24h
           config:
             validatorStatus:
             - active_ongoing
@@ -130,6 +130,7 @@ tasks:
   id: tests
   config:
     failTaskCount: 0
+    failOnUndecided: true
     tasks:
 
     # Test1: Submit a exit request from an address with 0x00 credentials, assert no exit
@@ -240,7 +241,7 @@ tasks:
             - active_exiting
             - exited_unslashed
           configVars:
-            validatorPubKey: "tasks.all_pubkeys.outputs.pubkeys[1]"
+            validatorPubKey: "tasks.validator_pubkeys.outputs.pubkeys[1]"
 
     # Test3: Submit a exit request from an address with 0x02 credentials, assert exit
     # keys: 2
@@ -490,7 +491,6 @@ tasks:
                 failOnReject: true
               configVars:
                 sourceMnemonic: "validatorMnemonic"
-                targetValidatorIndex: "validatorStartIndex + 4"
                 targetPublicKey: "tasks.validator_pubkeys.outputs.pubkeys[4]"
                 sourceStartIndex: "validatorStartIndex + 4"
                 walletPrivkey: "walletPrivkey"
@@ -535,7 +535,7 @@ tasks:
         - name: check_consensus_validator_status
           title: "Wait for key 4 balance to increase > 33 ETH"
           id: key4_status
-          timeout: 30m
+          timeout: 4h
           config:
             validatorStatus:
             - active_ongoing
@@ -600,13 +600,13 @@ tasks:
 
         # wait for withdrawal to be processed
         - name: check_consensus_block_proposals
-          title: "Check for >= 1 ETH withdrawal for key 4"
+          title: "Check for exact 1 ETH withdrawal for key 4"
           timeout: 2h
           config:
             minWithdrawalCount: 1
           configVars:
-            expectWithdrawals: "| [{publicKey: .tasks.validator_pubkeys.outputs.pubkeys[4], address: .tasks.wallet_details.outputs.address, minAmount: 1000000000}]"
-        
+            expectWithdrawals: "| [{publicKey: .tasks.validator_pubkeys.outputs.pubkeys[4], address: .tasks.wallet_details.outputs.address, minAmount: 1000000000, maxAmount: 1000000000}]"
+
 
     # Test6: Submit a partial 2 ETH withdrawal request from an address with 0x02 credentials and balance < 34 ETH, assert < 2 ETH withdrawal
     # keys: 5
@@ -698,7 +698,7 @@ tasks:
         - name: check_consensus_validator_status
           title: "Get validator info for key 5 (expect 0x02 credentials)"
           id: key5_status
-          timeout: 30m
+          timeout: 4h
           config:
             withdrawalCredsPrefix: "0x02"
             validatorStatus:
@@ -762,7 +762,7 @@ tasks:
         # check chain for 30 minutes, expect withdrawal with >= 0.5 ETH & < 1.5 ETH for key 5
         - name: check_consensus_block_proposals
           title: "Check withdrawal for key 5 (expect in range 0.5-1.5 ETH)"
-          timeout: 30m
+          timeout: 2h
           id: key5_withdrawal
           config:
             minWithdrawalCount: 1

playbooks/pectra-dev/eip7251-all.yaml

@@ -230,6 +230,7 @@ tasks:
   id: tests
   config:
     failTaskCount: 0
+    failOnUndecided: true
     tasks:
 
     # Test1: Change withdrawal credentials of a validator to 0x02 (via self-consolidation) and consolidate another validator with 0x01 credentials into it
@@ -1015,19 +1016,23 @@ tasks:
 
         - name: check_consensus_validator_status
           title: "Check if key 12 is slashed"
+          timeout: 30m
           config:
             validatorStatus:
             - active_slashed
             - exited_slashed
           configVars:
             validatorPubKey: "tasks.validator_pubkeys.outputs.pubkeys[12]"
 
-        # check if key 13 is still active
+        # check if key 13 is exited
         - name: check_consensus_validator_status
-          title: "Check if key 13 is still active"
+          title: "Check if key 13 is exited"
+          timeout: 5m
           config:
             validatorStatus:
-            - active_ongoing
+            - exited_unslashed
+            - withdrawal_possible
+            - withdrawal_done
           configVars:
             validatorPubKey: "tasks.validator_pubkeys.outputs.pubkeys[13]"