From e27fae11e2cbd3d7c42424a486fd2388ec9abe0d Mon Sep 17 00:00:00 2001
From: Jim McDonald <Jim@mcdee.net>
Date: Fri, 9 Dec 2022 17:02:07 +0000
Subject: [PATCH] Better verbose block output.

---
 CHANGELOG.md                | 3 +++
 cmd/block/info/output.go    | 4 ++--
 cmd/validator/exit/input.go | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce878a7..dfde789 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+dev:
+  - provide details of BLS to execution change operations with verbose block output
+
 1.26.3:
   - provide support for additional S3 store options
   - show error when attempting to delete non-filesystem wallets
diff --git a/cmd/block/info/output.go b/cmd/block/info/output.go
index 84a397f..e1625be 100644
--- a/cmd/block/info/output.go
+++ b/cmd/block/info/output.go
@@ -224,7 +224,7 @@ func outputBlockVoluntaryExits(ctx context.Context, eth2Client eth2client.Servic
 			if err != nil {
 				res.WriteString(fmt.Sprintf("  Error: failed to obtain validators: %v\n", err))
 			} else {
-				res.WriteString(fmt.Sprintf("    Validator: %#x (%d)\n", validators[0].Validator.PublicKey, voluntaryExit.Message.ValidatorIndex))
+				res.WriteString(fmt.Sprintf("    Validator: %#x (%d)\n", validators[voluntaryExit.Message.ValidatorIndex].Validator.PublicKey, voluntaryExit.Message.ValidatorIndex))
 				res.WriteString(fmt.Sprintf("    Epoch: %d\n", voluntaryExit.Message.Epoch))
 			}
 		}
@@ -244,7 +244,7 @@ func outputBlockBLSToExecutionChanges(ctx context.Context, eth2Client eth2client
 			if err != nil {
 				res.WriteString(fmt.Sprintf("  Error: failed to obtain validators: %v\n", err))
 			} else {
-				res.WriteString(fmt.Sprintf("    Validator: %#x (%d)\n", validators[0].Validator.PublicKey, op.Message.ValidatorIndex))
+				res.WriteString(fmt.Sprintf("    Validator: %#x (%d)\n", validators[op.Message.ValidatorIndex].Validator.PublicKey, op.Message.ValidatorIndex))
 				res.WriteString(fmt.Sprintf("    BLS public key: %#x\n", op.Message.FromBLSPubkey))
 				res.WriteString(fmt.Sprintf("    Execution address: %#x\n", op.Message.ToExecutionAddress))
 			}
diff --git a/cmd/validator/exit/input.go b/cmd/validator/exit/input.go
index 7cd682a..afd507f 100644
--- a/cmd/validator/exit/input.go
+++ b/cmd/validator/exit/input.go
@@ -101,6 +101,9 @@ func inputKey(ctx context.Context, data *dataIn) (*dataIn, error) {
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to create acount from key")
 	}
+	if err := data.account.(e2wtypes.AccountLocker).Unlock(ctx, nil); err != nil {
+		return nil, errors.Wrap(err, "failed to unlock account")
+	}
 	return inputChainData(ctx, data)
 }