From 8f966974e98a5d76857fedbad4dc1f7b8e07d8bb Mon Sep 17 00:00:00 2001
From: Josh Rickmar <jrick@companyzero.com>
Date: Thu, 30 May 2024 20:58:27 +0000
Subject: [PATCH] mixpool: Log correct accepted orphans

---
 mixing/mixpool/mixpool.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mixing/mixpool/mixpool.go b/mixing/mixpool/mixpool.go
index 337e7c9a2..43add9e9c 100644
--- a/mixing/mixpool/mixpool.go
+++ b/mixing/mixpool/mixpool.go
@@ -837,7 +837,6 @@ var zeroHash chainhash.Hash
 // All newly accepted messages, including any orphan key exchange messages
 // that were processed after processing missing pair requests, are returned.
 func (p *Pool) AcceptMessage(msg mixing.Message) (accepted []mixing.Message, err error) {
-	hash := msg.Hash()
 	defer func() {
 		if err == nil && len(accepted) == 0 {
 			// Duplicate message; don't log it again.
@@ -847,6 +846,7 @@ func (p *Pool) AcceptMessage(msg mixing.Message) (accepted []mixing.Message, err
 			return
 		}
 		if err != nil {
+			hash := msg.Hash()
 			switch msg.(type) {
 			case *wire.MsgMixPairReq:
 				log.Debugf("Rejected message %T %v by %x: %v",
@@ -858,6 +858,7 @@ func (p *Pool) AcceptMessage(msg mixing.Message) (accepted []mixing.Message, err
 			return
 		}
 		for _, msg := range accepted {
+			hash := msg.Hash()
 			switch msg.(type) {
 			case *wire.MsgMixPairReq:
 				log.Debugf("Accepted message %T %v by %x", msg, hash, msg.Pub())
@@ -868,6 +869,7 @@ func (p *Pool) AcceptMessage(msg mixing.Message) (accepted []mixing.Message, err
 		}
 	}()
 
+	hash := msg.Hash()
 	if hash == zeroHash {
 		return nil, fmt.Errorf("message of type %T has not been hashed", msg)
 	}