Skip to content

Commit fe83797

Browse files
pk910pk910
committed
fix eip7002-all playbook for devnet 4
1 parent fbe6fd8 commit fe83797

File tree

1 file changed

+70
-13
lines changed

1 file changed

+70
-13
lines changed

‎playbooks/pectra-dev/eip7002-all.yaml‎

Lines changed: 70 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,8 @@ tasks:
289289
failOnReject: true
290290
configVars:
291291
sourceMnemonic: "validatorMnemonic"
292-
targetValidatorIndex: "validatorStartIndex + 2"
292+
targetPublicKey: "tasks.validator_pubkeys.outputs.pubkeys[2]"
293+
sourceStartIndex: "validatorStartIndex + 2"
293294
walletPrivkey: "walletPrivkey"
294295

295296
foregroundTask:
@@ -444,7 +445,7 @@ tasks:
444445
onBackgroundComplete: failOrIgnore
445446
backgroundTask:
446447
name: generate_bls_changes
447-
title: "Send BLS change for key 4 (0x02 credentials)"
448+
title: "Send BLS change for key 4 (0x01 credentials)"
448449
config:
449450
limitTotal: 1
450451
indexCount: 1
@@ -460,27 +461,55 @@ tasks:
460461
configVars:
461462
expectBlsChanges: "| [{publicKey: .tasks.validator_pubkeys.outputs.pubkeys[4], address: .tasks.wallet_details.outputs.address}]"
462463

464+
# generate self consolidation for key 4 & wait for inclusion
465+
- name: run_task_background
466+
title: "Generate self consolidation for key 4 & track inclusion"
467+
timeout: 10m
468+
config:
469+
onBackgroundComplete: failOrIgnore
470+
backgroundTask:
471+
name: generate_consolidations
472+
title: "Generate 1 self consolidation (key 4)"
473+
config:
474+
limitTotal: 1
475+
sourceIndexCount: 1
476+
awaitReceipt: true
477+
failOnReject: true
478+
configVars:
479+
sourceMnemonic: "validatorMnemonic"
480+
targetValidatorIndex: "validatorStartIndex + 4"
481+
targetPublicKey: "tasks.validator_pubkeys.outputs.pubkeys[4]"
482+
sourceStartIndex: "validatorStartIndex + 4"
483+
walletPrivkey: "walletPrivkey"
484+
485+
foregroundTask:
486+
name: check_consensus_block_proposals
487+
title: "Wait for inclusion of self consolidation request for key 4"
488+
config:
489+
minConsolidationRequestCount: 1
490+
configVars:
491+
expectConsolidationRequests: "| [{sourceAddress: .tasks.wallet_details.outputs.address, sourcePubkey: .tasks.validator_pubkeys.outputs.pubkeys[4]}]"
492+
463493
# generate top-up deposit for key 4 (add 2 ETH) & wait for inclusion
464494
- name: run_task_background
465-
title: "Generate top-up deposit with 0x02 credential change for key 4 & track inclusion"
495+
title: "Generate top-up deposit for key 4 & track inclusion"
466496
timeout: 10m
467497
config:
468498
onBackgroundComplete: failOrIgnore
469499
backgroundTask:
470500
name: generate_deposits
471-
title: "Generate top-up deposit with 0x02 credential change for key 4"
501+
title: "Generate top-up deposit for key 4"
472502
config:
473503
limitTotal: 1
474504
indexCount: 1
475505
depositAmount: 2
476506
awaitReceipt: true
477507
failOnReject: true
508+
topUpDeposit: true
478509
configVars:
479-
mnemonic: "validatorMnemonic"
480-
startIndex: "validatorStartIndex + 4"
510+
publicKey: "tasks.validator_pubkeys.outputs.pubkeys[4]"
481511
walletPrivkey: "walletPrivkey"
482512
depositContract: "depositContract"
483-
withdrawalCredentials: "| \"0x020000000000000000000000\" + (.tasks.wallet_details.outputs.address | capture(\"(0x)?(?<addr>.+)\").addr)"
484513
foregroundTask:
485514
name: check_consensus_block_proposals
486515
title: "Wait for inclusion of top-up deposit for key 4"
@@ -596,27 +625,54 @@ tasks:
596625
configVars:
597626
expectBlsChanges: "| [{publicKey: .tasks.validator_pubkeys.outputs.pubkeys[5], address: .tasks.wallet_details.outputs.address}]"
598627

628+
# generate self consolidation for key 5 & wait for inclusion
629+
- name: run_task_background
630+
title: "Generate self consolidation for key 5 & track inclusion"
631+
timeout: 10m
632+
config:
633+
onBackgroundComplete: failOrIgnore
634+
backgroundTask:
635+
name: generate_consolidations
636+
title: "Generate 1 self consolidation (key 5)"
637+
config:
638+
limitTotal: 1
639+
sourceIndexCount: 1
640+
awaitReceipt: true
641+
failOnReject: true
642+
configVars:
643+
sourceMnemonic: "validatorMnemonic"
644+
targetPublicKey: "tasks.validator_pubkeys.outputs.pubkeys[5]"
645+
sourceStartIndex: "validatorStartIndex + 5"
646+
walletPrivkey: "walletPrivkey"
647+
648+
foregroundTask:
649+
name: check_consensus_block_proposals
650+
title: "Wait for inclusion of self consolidation request for key 5"
651+
config:
652+
minConsolidationRequestCount: 1
653+
configVars:
654+
expectConsolidationRequests: "| [{sourceAddress: .tasks.wallet_details.outputs.address, sourcePubkey: .tasks.validator_pubkeys.outputs.pubkeys[5]}]"
655+
599656
# generate top-up deposit for key 5 (add 1 ETH) & wait for inclusion
600657
- name: run_task_background
601-
title: "Generate top-up deposit with 0x02 credential change for key 5 & track inclusion"
658+
title: "Generate top-up deposit for key 5 & track inclusion"
602659
timeout: 10m
603660
config:
604661
onBackgroundComplete: failOrIgnore
605662
backgroundTask:
606663
name: generate_deposits
607-
title: "Generate top-up deposit with 0x02 credential change for key 5"
664+
title: "Generate top-up deposit for key 5"
608665
config:
609666
limitTotal: 1
610667
indexCount: 1
611668
depositAmount: 1
612669
awaitReceipt: true
613670
failOnReject: true
671+
topUpDeposit: true
614672
configVars:
615-
mnemonic: "validatorMnemonic"
616-
startIndex: "validatorStartIndex + 5"
673+
publicKey: "tasks.validator_pubkeys.outputs.pubkeys[5]"
617674
walletPrivkey: "walletPrivkey"
618675
depositContract: "depositContract"
619-
withdrawalCredentials: "| \"0x020000000000000000000000\" + (.tasks.wallet_details.outputs.address | capture(\"(0x)?(?<addr>.+)\").addr)"
620676
foregroundTask:
621677
name: check_consensus_block_proposals
622678
title: "Wait for inclusion of top-up deposit for key 5"
@@ -625,7 +681,7 @@ tasks:
625681
configVars:
626682
expectDepositRequests: "| [{publicKey: .tasks.validator_pubkeys.outputs.pubkeys[5], amount: 1000000000}]"
627683

628-
# check if key 5 has 0x02 credentials
684+
# check if key 5 has 0x02 credentials and topped up balance
629685
- name: check_consensus_validator_status
630686
title: "Get validator info for key 5 (expect 0x02 credentials)"
631687
id: key5_status
@@ -634,6 +690,7 @@ tasks:
634690
withdrawalCredsPrefix: "0x02"
635691
validatorStatus:
636692
- active_ongoing
693+
minValidatorBalance: 32900000000
637694
configVars:
638695
validatorPubKey: "tasks.validator_pubkeys.outputs.pubkeys[5]"
639696
- name: run_shell

0 commit comments

Comments
 (0)