reorganize playbooks & updates for devnet 4

Author: pk910

playbooks/pectra-dev/wait-for-slot.yaml playbooks/dev/wait-for-slot.yamlplaybooks/pectra-dev/wait-for-slot.yaml renamed to playbooks/dev/wait-for-slot.yaml

@@ -272,35 +272,33 @@ tasks:
               configVars:
                 expectBlsChanges: "| [{publicKey: .tasks.validator_pubkeys.outputs.pubkeys[2], address: .tasks.wallet_details.outputs.address}]"
 
-        # generate deposit for key 2 (add 1 ETH) & wait for inclusion
+        # generate self consolidation for key 2 & wait for inclusion
         - name: run_task_background
-          title: "Generate deposit with 0x02 credential change for key 2 & track inclusion"
+          title: "Generate self consolidation for key 2 & track inclusion"
           timeout: 10m
           config:
             onBackgroundComplete: failOrIgnore
             backgroundTask:
-              name: generate_deposits
-              title: "Generate deposit with 0x02 credential change for key 2"
+              name: generate_consolidations
+              title: "Generate 1 self consolidation (key 2)"
               config:
                 limitTotal: 1
-                indexCount: 1
-                depositAmount: 1
-                topUpDeposit: false
+                sourceStartIndex: 2
+                sourceIndexCount: 1
                 awaitReceipt: true
                 failOnReject: true
               configVars:
-                mnemonic: "validatorMnemonic"
-                startIndex: "validatorStartIndex + 2"
+                sourceMnemonic: "validatorMnemonic"
+                targetValidatorIndex: "validatorStartIndex + 2"
                 walletPrivkey: "walletPrivkey"
-                depositContract: "depositContract"
-                withdrawalCredentials: "| \"0x020000000000000000000000\" + (.tasks.wallet_details.outputs.address | capture(\"(0x)?(?<addr>.+)\").addr)"
+            
             foregroundTask:
               name: check_consensus_block_proposals
-              title: "Wait for inclusion of top-up deposit for key 2"
+              title: "Wait for inclusion of self consolidation request for key 2"
               config:
-                minDepositRequestCount: 1
+                minConsolidationRequestCount: 1
               configVars:
-                expectDepositRequests: "| [{publicKey: .tasks.validator_pubkeys.outputs.pubkeys[2], amount: 1000000000}]"
+                expectConsolidationRequests: "| [{sourceAddress: .tasks.wallet_details.outputs.address, sourcePubkey: .tasks.validator_pubkeys.outputs.pubkeys[2]}]"
 
         # check if key 2 has 0x02 credentials
         - name: check_consensus_validator_status

playbooks/pectra-dev/eip7002-all.yaml

@@ -13,7 +13,7 @@ tasks:
     title: "Generate BLS changes for validator 0-300"
     timeout: 30m
     config:
-      testFile: https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/pectra-dev/bls-changes.yaml
+      testFile: https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/pectra-dev/kurtosis/bls-changes.yaml
       testConfig:
         validatorCount: 300
 
@@ -27,7 +27,7 @@ tasks:
     title: "Generate massive deposit with 0x02 creds"
     timeout: 30m
     config:
-      testFile: https://raw.githubusercontent.com/ethpandaops/assertoor/refs/heads/electra-support/playbooks/pectra-dev/massive-deposit-0x02.yaml
+      testFile: https://raw.githubusercontent.com/ethpandaops/assertoor/refs/heads/electra-support/playbooks/pectra-dev/kurtosis/massive-deposit-0x02.yaml
 
   # EIP-2935
   - name: check_consensus_slot_range
@@ -39,7 +39,7 @@ tasks:
     title: "Deploy and test blockhash contract"
     timeout: 30m
     config:
-      testFile: https://raw.githubusercontent.com/ethpandaops/assertoor/refs/heads/electra-support/playbooks/pectra-dev/blockhash-test.yaml
+      testFile: https://raw.githubusercontent.com/ethpandaops/assertoor/refs/heads/electra-support/playbooks/pectra-dev/kurtosis/blockhash-test.yaml
 
   # EIP-7002
   - name: check_consensus_slot_range
@@ -51,7 +51,7 @@ tasks:
     title: "Generate voluntary exits for validator 0-10"
     timeout: 30m
     config:
-      testFile: https://raw.githubusercontent.com/ethpandaops/assertoor/refs/heads/electra-support/playbooks/pectra-dev/voluntary-exits.yaml
+      testFile: https://raw.githubusercontent.com/ethpandaops/assertoor/refs/heads/electra-support/playbooks/pectra-dev/kurtosis/voluntary-exits.yaml
       testConfig:
         validatorCount: 10
   - name: check_consensus_slot_range
@@ -63,7 +63,7 @@ tasks:
     title: "EL-triggered exit test for validator 20"
     timeout: 30m
     config:
-      testFile: https://raw.githubusercontent.com/ethpandaops/assertoor/refs/heads/electra-support/playbooks/pectra-dev/el-triggered-exit.yaml
+      testFile: https://raw.githubusercontent.com/ethpandaops/assertoor/refs/heads/electra-support/playbooks/pectra-dev/kurtosis/el-triggered-exit.yaml
       testConfig:
         validatorIndex: 20
 
@@ -77,7 +77,7 @@ tasks:
     title: "Generate EL-triggered consolidation for validator 21"
     timeout: 30m
     config:
-      testFile: https://raw.githubusercontent.com/ethpandaops/assertoor/refs/heads/electra-support/playbooks/pectra-dev/el-triggered-consolidation.yaml
+      testFile: https://raw.githubusercontent.com/ethpandaops/assertoor/refs/heads/electra-support/playbooks/pectra-dev/kurtosis/el-triggered-consolidation.yaml
       testConfig:
         sourceValidatorIndex: 21
         targetValidatorIndex: 25
@@ -90,7 +90,7 @@ tasks:
     title: "Withdrawal credential change for validator 22 to 0x02 creds via self consolidation"
     timeout: 30m
     config:
-      testFile: https://raw.githubusercontent.com/ethpandaops/assertoor/refs/heads/electra-support/playbooks/pectra-dev/el-triggered-consolidation.yaml
+      testFile: https://raw.githubusercontent.com/ethpandaops/assertoor/refs/heads/electra-support/playbooks/pectra-dev/kurtosis/el-triggered-consolidation.yaml
       testConfig:
         sourceValidatorIndex: 22
         targetValidatorIndex: 22