nihilist/haveno
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix invalid pub key warning on process mailbox messages

Browse Source
This commit is contained in:
woodser 2024-01-13 02:57:28 -05:00
parent 2966f8461c
commit ad77912171
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/main/java/haveno/core/trade/protocol/TradeProtocol.java
View File

@ -139,7 +139,7 @@ public abstract class TradeProtocol implements DecryptedDirectMessageListener, D
return;
}
if (!isPubKeyValid(decryptedMessageWithPubKey, peer)) {
if (!isPubKeyValid(decryptedMessageWithPubKey)) {
return;
}
@ -159,7 +159,7 @@ public abstract class TradeProtocol implements DecryptedDirectMessageListener, D
@Override
public void onMailboxMessageAdded(DecryptedMessageWithPubKey decryptedMessageWithPubKey, NodeAddress peer) {
if (!isPubKeyValid(decryptedMessageWithPubKey, peer)) return;
if (!isPubKeyValid(decryptedMessageWithPubKey)) return;
handleMailboxCollectionSkipValidation(Collections.singletonList(decryptedMessageWithPubKey));
}
@ -777,12 +777,6 @@ public abstract class TradeProtocol implements DecryptedDirectMessageListener, D
}
private boolean isPubKeyValid(DecryptedMessageWithPubKey message) {
MailboxMessage mailboxMessage = (MailboxMessage) message.getNetworkEnvelope();
NodeAddress sender = mailboxMessage.getSenderNodeAddress();
return isPubKeyValid(message, sender);
}
private boolean isPubKeyValid(DecryptedMessageWithPubKey message, NodeAddress sender) {
if (this instanceof ArbitratorProtocol) {
// valid if traders unknown
@ -806,7 +800,6 @@ public abstract class TradeProtocol implements DecryptedDirectMessageListener, D
}
// invalid
log.error("SignaturePubKey in message does not match the SignaturePubKey we have set for our arbitrator or trading peer.");
return false;
}