diff --git a/pkg/coordinator/tasks/check_consensus_block_proposals/task.go b/pkg/coordinator/tasks/check_consensus_block_proposals/task.go index 218fb5c..2a48c6d 100644 --- a/pkg/coordinator/tasks/check_consensus_block_proposals/task.go +++ b/pkg/coordinator/tasks/check_consensus_block_proposals/task.go @@ -640,7 +640,6 @@ func (t *Task) checkBlockWithdrawals(block *consensus.Block, blockData *spec.Ver if validator.Validator.PublicKey.String() == expectedWithdrawal.PublicKey { withdrawalAmount := big.NewInt(int64(withdrawal.Amount)) - withdrawalAmount = withdrawalAmount.Mul(withdrawalAmount, big.NewInt(1000000000)) switch { case expectedWithdrawal.Address != "" && !strings.EqualFold(expectedWithdrawal.Address, withdrawal.Address.String()): diff --git a/playbooks/pectra-dev/validator-lifecycle-test-v3.yaml b/playbooks/pectra-dev/validator-lifecycle-test-v3.yaml index cd64887..e73af2f 100644 --- a/playbooks/pectra-dev/validator-lifecycle-test-v3.yaml +++ b/playbooks/pectra-dev/validator-lifecycle-test-v3.yaml @@ -557,13 +557,13 @@ tasks: config: minWithdrawalCount: 1 configVars: - expectWithdrawals: "| [{publicKey: .tasks.all_pubkeys.outputs.pubkeys[1], address: .tasks.depositor_wallet.outputs.childWallet.address, minAmount: 900000000000000000}]" + expectWithdrawals: "| [{publicKey: .tasks.all_pubkeys.outputs.pubkeys[1], address: .tasks.depositor_wallet.outputs.childWallet.address, minAmount: 900000000}]" - name: check_consensus_block_proposals title: "Wait for partial withdrawal (>15.9 ETH) for key 4" config: minWithdrawalCount: 1 configVars: - expectWithdrawals: "| [{publicKey: .tasks.all_pubkeys.outputs.pubkeys[4], address: .tasks.depositor_wallet.outputs.childWallet.address, minAmount: 15900000000000000000}]" + expectWithdrawals: "| [{publicKey: .tasks.all_pubkeys.outputs.pubkeys[4], address: .tasks.depositor_wallet.outputs.childWallet.address, minAmount: 15900000000}]" # key status: # index 0: active 64 ETH (32 ETH EB), 0x00 withdrawal creds @@ -846,7 +846,7 @@ tasks: config: minWithdrawalCount: 1 configVars: - expectWithdrawals: "| [{publicKey: .tasks.all_pubkeys.outputs.pubkeys[8], address: .tasks.depositor_wallet.outputs.childWallet.address, minAmount: 31900000000000000000}]" + expectWithdrawals: "| [{publicKey: .tasks.all_pubkeys.outputs.pubkeys[8], address: .tasks.depositor_wallet.outputs.childWallet.address, minAmount: 31900000000}]" # generate EL triggered exit - name: run_tasks diff --git a/playbooks/stable/validator-lifecycle-test-v2.yaml b/playbooks/stable/validator-lifecycle-test-v2.yaml index cca0109..f734528 100644 --- a/playbooks/stable/validator-lifecycle-test-v2.yaml +++ b/playbooks/stable/validator-lifecycle-test-v2.yaml @@ -143,7 +143,7 @@ tasks: config: minWithdrawalCount: 1 configVars: - expectWithdrawals: "| [{publicKey: .validatorPubkeys[0], address: .depositorAddress, minAmount: 31000000000000000000}]" + expectWithdrawals: "| [{publicKey: .validatorPubkeys[0], address: .depositorAddress, minAmount: 31000000000}]" # slash 2 validators before exitability delay (1 with withdrawal address, 1 without) - name: run_tasks @@ -313,7 +313,7 @@ tasks: config: minWithdrawalCount: 1 configVars: - expectWithdrawals: "| [{publicKey: .validatorPubkey, address: .depositorAddress, minAmount: 31000000000000000000}]" + expectWithdrawals: "| [{publicKey: .validatorPubkey, address: .depositorAddress, minAmount: 31000000000}]" # status: @@ -436,19 +436,19 @@ tasks: config: minWithdrawalCount: 1 configVars: - expectWithdrawals: "| [{publicKey: .validatorPubkeys[5], address: .depositorAddress, minAmount: 63500000000000000000}]" + expectWithdrawals: "| [{publicKey: .validatorPubkeys[5], address: .depositorAddress, minAmount: 63500000000}]" - name: check_consensus_block_proposals title: "Wait for partial withdrawal for ${{ validatorPubkeys[8] }}" config: minWithdrawalCount: 1 configVars: - expectWithdrawals: "| [{publicKey: .validatorPubkeys[8], address: .depositorAddress, minAmount: 31500000000000000000}]" + expectWithdrawals: "| [{publicKey: .validatorPubkeys[8], address: .depositorAddress, minAmount: 31500000000}]" - name: check_consensus_block_proposals title: "Wait for partial withdrawal for ${{ validatorPubkeys[9] }}" config: minWithdrawalCount: 1 configVars: - expectWithdrawals: "| [{publicKey: .validatorPubkeys[9], address: .depositorAddress, minAmount: 31500000000000000000}]" + expectWithdrawals: "| [{publicKey: .validatorPubkeys[9], address: .depositorAddress, minAmount: 31500000000}]" # all keys should be extied now.