Skip to content

Commit 4e1d8e7

Browse files
barnabasbusabarnabasbusa
authored
Merge pull request #83 from ethpandaops/bbusa/fix-deposit-contract
fix: change all deposit addresses to mainnet
2 parents 34dac86 + f17a876 commit 4e1d8e7

15 files changed

Lines changed: 82 additions & 82 deletions

‎example/config/all_tests.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ tests:
107107
timeout: 5m
108108
config:
109109
minClientCount: 1
110-
110+
111111
- name: run_tasks_concurrent
112112
title: "Generate deposits & Track inclusion"
113113
config:
@@ -119,7 +119,7 @@ tests:
119119
limitTotal: 100
120120
limitPerSlot: 5
121121
walletPrivkey: "94eb3102993b41ec55c241060f47daa0f6372e2e3ad7e91612ae36c364042e44"
122-
depositContract: "0x4242424242424242424242424242424242424242"
122+
depositContract: "0x00000000219ab540356cBB839Cbe05303d7705Fa"
123123

124124
- name: run_task_matrix
125125
title: "Check deposit inclusion with all client pairs"
@@ -145,7 +145,7 @@ tests:
145145
timeout: 5m
146146
config:
147147
minClientCount: 1
148-
148+
149149
- name: run_tasks_concurrent
150150
title: "Generate exits & Track inclusion"
151151
config:

‎pkg/coordinator/tasks/generate_slashings/task.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,14 +310,14 @@ func (t *Task) generateSurroundAttesterSlashing(validatorIndex uint64, validator
310310
attestationData1 := &phase0.AttestationData{
311311
Slot: phase0.Slot(slot1),
312312
Index: phase0.CommitteeIndex(committeeIndex),
313-
BeaconBlockRoot: phase0.Root(ethcommon.FromHex("0x4242424242424242424242424242424242424242424242424242424242424242")),
313+
BeaconBlockRoot: phase0.Root(ethcommon.FromHex("0x00000000219ab540356cBB839Cbe05303d7705Fa424242424242424242424242")),
314314
Source: source1,
315315
Target: target1,
316316
}
317317
attestationData2 := &phase0.AttestationData{
318318
Slot: phase0.Slot(slot2),
319319
Index: phase0.CommitteeIndex(committeeIndex),
320-
BeaconBlockRoot: phase0.Root(ethcommon.FromHex("0x4242424242424242424242424242424242424242424242424242424242424242")),
320+
BeaconBlockRoot: phase0.Root(ethcommon.FromHex("0x00000000219ab540356cBB839Cbe05303d7705Fa424242424242424242424242")),
321321
Source: source2,
322322
Target: target2,
323323
}

‎playbooks/dev/dev-deposits.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ config:
77
validatorMnemonic: ""
88
depositCount: 2
99
depositAmount: 32
10-
depositContract: "0x4242424242424242424242424242424242424242"
10+
depositContract: "0x00000000219ab540356cBB839Cbe05303d7705Fa"
1111
waitForElectra: false
1212
tasks:
1313
- name: check_clients_are_healthy

‎playbooks/dev/validator-lifecycle-test.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ tasks:
2222
limitTotal: 300
2323
limitPerSlot: 20
2424
limitPending: 50
25-
depositContract: "0x4242424242424242424242424242424242424242"
25+
depositContract: "0x00000000219ab540356cBB839Cbe05303d7705Fa"
2626
awaitReceipt: true
2727
configVars:
2828
walletPrivkey: "walletPrivkey"
@@ -66,7 +66,7 @@ tasks:
6666
validatorNamePattern: "validatorPairName"
6767
config:
6868
minDepositCount: 1
69-
69+
7070
# due to the deposits we should reach un-finality soon.
7171
- name: check_consensus_validator_status
7272
title: "Wait for the last deposit to become activated"

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ config:
77
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"
88
validatorStartIndex: 0
99
useExistingValidators: false
10-
depositContract: "0x4242424242424242424242424242424242424242"
10+
depositContract: "0x00000000219ab540356cBB839Cbe05303d7705Fa"
1111
tasks:
1212
- name: check_clients_are_healthy
1313
title: "Check if at least one client is ready"
@@ -162,12 +162,12 @@ tasks:
162162
minWithdrawalRequestCount: 1
163163
configVars:
164164
expectWithdrawalRequests: "| [{validatorPubkey: .tasks.validator_pubkeys.outputs.pubkeys[0], sourceAddress: .tasks.wallet_details.outputs.address, amount: 0}]"
165-
165+
166166
- name: sleep
167167
title: "Wait for EL triggered exit to be processed"
168168
config:
169169
duration: 20m
170-
170+
171171
- name: check_consensus_validator_status
172172
title: "Check if key 0 is still active"
173173
config:
@@ -231,7 +231,7 @@ tasks:
231231
minWithdrawalRequestCount: 1
232232
configVars:
233233
expectWithdrawalRequests: "| [{validatorPubkey: .tasks.validator_pubkeys.outputs.pubkeys[1], sourceAddress: .tasks.wallet_details.outputs.address, amount: 0}]"
234-
234+
235235
# wait for exit to be processed
236236
- name: check_consensus_validator_status
237237
title: "Wait for key 1 to exit"
@@ -293,15 +293,15 @@ tasks:
293293
targetPublicKey: "tasks.validator_pubkeys.outputs.pubkeys[2]"
294294
sourceStartIndex: "validatorStartIndex + 2"
295295
walletPrivkey: "walletPrivkey"
296-
296+
297297
foregroundTask:
298298
name: check_consensus_block_proposals
299299
title: "Wait for inclusion of self consolidation request for key 2"
300300
config:
301301
minConsolidationRequestCount: 1
302302
configVars:
303303
expectConsolidationRequests: "| [{sourceAddress: .tasks.wallet_details.outputs.address, sourcePubkey: .tasks.validator_pubkeys.outputs.pubkeys[2]}]"
304-
304+
305305
# check if key 2 has 0x02 credentials
306306
- name: check_consensus_validator_status
307307
title: "Get validator info for key 2 (expect 0x02 credentials)"
@@ -316,7 +316,7 @@ tasks:
316316
- name: run_shell
317317
title: "Check if key 2 has 0x02 credentials"
318318
config:
319-
envVars:
319+
envVars:
320320
validator: "tasks.key2_status.outputs.validator"
321321
command: |
322322
withdrawal_creds=$(echo "$validator" | jq -r '.validator.withdrawal_credentials')
@@ -351,7 +351,7 @@ tasks:
351351
minWithdrawalRequestCount: 1
352352
configVars:
353353
expectWithdrawalRequests: "| [{validatorPubkey: .tasks.validator_pubkeys.outputs.pubkeys[2], sourceAddress: .tasks.wallet_details.outputs.address, amount: 0}]"
354-
354+
355355
# wait for exit to be processed
356356
- name: check_consensus_validator_status
357357
title: "Wait for key 2 to exit"
@@ -429,7 +429,7 @@ tasks:
429429
minWithdrawalRequestCount: 1
430430
configVars:
431431
expectWithdrawalRequests: "| [{validatorPubkey: .tasks.validator_pubkeys.outputs.pubkeys[3], sourceAddress: .tasks.wallet_details.outputs.address, amount: 1000000000}]"
432-
432+
433433
# check chain for 30 minutes, expect no withdrawal with >= 0.1 ETH for key 3
434434
- name: run_task_options
435435
title: "Monitor chain for 30min, expect no withdrawal with >= 0.1 ETH for key 3"
@@ -494,7 +494,7 @@ tasks:
494494
targetPublicKey: "tasks.validator_pubkeys.outputs.pubkeys[4]"
495495
sourceStartIndex: "validatorStartIndex + 4"
496496
walletPrivkey: "walletPrivkey"
497-
497+
498498
foregroundTask:
499499
name: check_consensus_block_proposals
500500
title: "Wait for inclusion of self consolidation request for key 4"
@@ -548,7 +548,7 @@ tasks:
548548
- name: run_shell
549549
title: "Check if key 4 has 0x02 credentials"
550550
config:
551-
envVars:
551+
envVars:
552552
validator: "tasks.key4_status.outputs.validator"
553553
command: |
554554
balance=$(echo "$validator" | jq -r '.balance')
@@ -657,15 +657,15 @@ tasks:
657657
targetPublicKey: "tasks.validator_pubkeys.outputs.pubkeys[5]"
658658
sourceStartIndex: "validatorStartIndex + 5"
659659
walletPrivkey: "walletPrivkey"
660-
660+
661661
foregroundTask:
662662
name: check_consensus_block_proposals
663663
title: "Wait for inclusion of self consolidation request for key 5"
664664
config:
665665
minConsolidationRequestCount: 1
666666
configVars:
667667
expectConsolidationRequests: "| [{sourceAddress: .tasks.wallet_details.outputs.address, sourcePubkey: .tasks.validator_pubkeys.outputs.pubkeys[5]}]"
668-
668+
669669
# generate top-up deposit for key 5 (add 1 ETH) & wait for inclusion
670670
- name: run_task_background
671671
title: "Generate top-up deposit for key 5 & track inclusion"
@@ -709,7 +709,7 @@ tasks:
709709
- name: run_shell
710710
title: "Check if key 5 has 0x02 credentials"
711711
config:
712-
envVars:
712+
envVars:
713713
validator: "tasks.key5_status.outputs.validator"
714714
command: |
715715
balance=$(echo "$validator" | jq -r '.balance')
@@ -827,7 +827,7 @@ tasks:
827827
targetPublicKey: "tasks.validator_pubkeys.outputs.pubkeys[6]"
828828
sourceStartIndex: "validatorStartIndex + 6"
829829
walletPrivkey: "walletPrivkey"
830-
830+
831831
foregroundTask:
832832
name: check_consensus_block_proposals
833833
title: "Wait for inclusion of self consolidation request for key 6"
@@ -862,7 +862,7 @@ tasks:
862862
minDepositRequestCount: 1
863863
configVars:
864864
expectDepositRequests: "| [{publicKey: .tasks.validator_pubkeys.outputs.pubkeys[6], amount: 10000000000}]"
865-
865+
866866
- name: run_tasks
867867
title: "Prepare key 7 (BLS change, self consolidation, top-up deposit)"
868868
config:
@@ -910,7 +910,7 @@ tasks:
910910
targetPublicKey: "tasks.validator_pubkeys.outputs.pubkeys[7]"
911911
sourceStartIndex: "validatorStartIndex + 7"
912912
walletPrivkey: "walletPrivkey"
913-
913+
914914
foregroundTask:
915915
name: check_consensus_block_proposals
916916
title: "Wait for inclusion of self consolidation request for key 7"
@@ -945,7 +945,7 @@ tasks:
945945
minDepositRequestCount: 1
946946
configVars:
947947
expectDepositRequests: "| [{publicKey: .tasks.validator_pubkeys.outputs.pubkeys[7], amount: 10000000000}]"
948-
948+
949949
# wait for topup deposit to be processed
950950
- name: check_consensus_validator_status
951951
title: "Wait for key 6 balance to increase > 41 ETH"
@@ -1094,7 +1094,7 @@ tasks:
10941094
minWithdrawalRequestCount: 1
10951095
configVars:
10961096
expectWithdrawalRequests: "| [{validatorPubkey: .tasks.validator_pubkeys.outputs.pubkeys[6], sourceAddress: .tasks.wallet_details.outputs.address, amount: 0}]"
1097-
1097+
10981098
# send voluntary exit for key 7
10991099
- name: run_task_options
11001100
title: "Expect failure for voluntary exit for key 7"
@@ -1129,7 +1129,7 @@ tasks:
11291129
minWithdrawalCount: 1
11301130
configVars:
11311131
expectWithdrawals: "| [{publicKey: .tasks.validator_pubkeys.outputs.pubkeys[7], address: .tasks.wallet_details.outputs.address, minAmount: 1000000000, maxAmount: 1000000000}]"
1132-
1132+
11331133
# Test8:
11341134

11351135
# Test9:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ config:
66
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"
77
validatorStartIndex: 0
88
useExistingValidators: false
9-
depositContract: "0x4242424242424242424242424242424242424242"
9+
depositContract: "0x00000000219ab540356cBB839Cbe05303d7705Fa"
1010

1111
tasks:
1212
- name: check_clients_are_healthy
@@ -791,7 +791,7 @@ tasks:
791791
validatorPubKey: "tasks.validator_pubkeys.outputs.pubkeys[9]"
792792

793793
# Test6: Change withdrawal credentials of a validator to 0x02, consolidate another validator with 0x01 credentials into it, create a slashing for the second validator right after the consolidation request, assert no consolidation
794-
# keys: 10, 11
794+
# keys: 10, 11
795795
- name: run_tasks
796796
title: "Test6: Change withdrawal credentials of a validator to 0x02, consolidate another validator with 0x01 credentials into it, create a slashing for the second validator right after the consolidation request, assert no consolidation"
797797
config:

‎playbooks/pectra-dev/kurtosis/33eth-deposit.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: "33eth-deposit"
33
timeout: 278h
44
config:
55
#walletPrivkey: ""
6-
depositContract: "0x4242424242424242424242424242424242424242"
6+
depositContract: "0x00000000219ab540356cBB839Cbe05303d7705Fa"
77

88
tasks:
99
- name: check_clients_are_healthy

‎playbooks/pectra-dev/kurtosis/consolidion-overflow-tests.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: "consolidation overflow test"
33
timeout: 672h
44
config:
55
walletPrivkey: ""
6-
depositContract: "0x4242424242424242424242424242424242424242"
6+
depositContract: "0x00000000219ab540356cBB839Cbe05303d7705Fa"
77
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"
88
depositWaitSlot: 34
99
tasks:
@@ -167,13 +167,13 @@ tasks:
167167
echo "Balance too low! expected: >= 2048.0 ETH, got: $balance Gwei"
168168
exit 1
169169
fi
170-
170+
171171
effective_balance=$(echo "$validator" | jq -r '.validator.effective_balance')
172172
if [ "$effective_balance" != "2048000000000" ]; then
173173
echo "Effective balance too low! expected: 2048 ETH, got: $effective_balance Gwei"
174174
exit 1
175175
fi
176-
176+
177177
withdrawal_creds=$(echo "$validator" | jq -r '.validator.withdrawal_credentials')
178178
if [[ ! "$withdrawal_creds" == "0x02"* ]]; then
179179
echo "Invalid withdrawal credentials! expected: 0x02*, got: $withdrawal_creds"

‎playbooks/pectra-dev/kurtosis/eip6110-double-deposit.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: "EIP6110 double deposit test"
44
timeout: 1h
55
config:
66
walletPrivkey: ""
7-
depositContract: "0x4242424242424242424242424242424242424242"
7+
depositContract: "0x00000000219ab540356cBB839Cbe05303d7705Fa"
88
tasks:
99
- name: check_clients_are_healthy
1010
title: "Check if at least one client is ready"

‎playbooks/pectra-dev/kurtosis/eip7002-lh-bug.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ config:
66
walletPrivkey: ""
77
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"
88
validatorStartIndex: 0
9-
depositContract: "0x4242424242424242424242424242424242424242"
9+
depositContract: "0x00000000219ab540356cBB839Cbe05303d7705Fa"
1010
tasks:
1111
- name: check_clients_are_healthy
1212
title: "Check if at least one client is ready"
@@ -135,7 +135,7 @@ tasks:
135135
minDepositRequestCount: 1
136136
configVars:
137137
expectDepositRequests: "| [{publicKey: .tasks.validator_pubkeys.outputs.pubkeys[2], amount: 1000000000}]"
138-
138+
139139
# check if key 2 has 0x02 credentials
140140
- name: check_consensus_validator_status
141141
title: "Get validator info for key 2 (expect 0x02 credentials)"
@@ -150,7 +150,7 @@ tasks:
150150
- name: run_shell
151151
title: "Check if key 2 has 0x02 credentials"
152152
config:
153-
envVars:
153+
envVars:
154154
validator: "tasks.key2_status.outputs.validator"
155155
command: |
156156
withdrawal_creds=$(echo "$validator" | jq -r '.validator.withdrawal_credentials')
@@ -190,7 +190,7 @@ tasks:
190190
minWithdrawalRequestCount: 1
191191
configVars:
192192
expectWithdrawalRequests: "| [{validatorPubkey: .tasks.validator_pubkeys.outputs.pubkeys[2], sourceAddress: .tasks.wallet_details.outputs.address, amount: 0}]"
193-
193+
194194
# wait for exit to be processed
195195
- name: check_consensus_validator_status
196196
title: "Wait for key 2 to exit"

0 commit comments

Comments
 (0)