Two causes of the "every message I send shows up again as a reply from the peer": 1. Harvest bug — the full-refresh path fed a SENT tx's outgoing memos (from z_viewtransaction outgoing outputs) into the chat metadata extractor, and ChatService::ingest marks everything Incoming. So each send was re-ingested as a phantom "from peer" message. The recent-refresh path already omitted this, so it was accidental. Drop the outgoing chat-harvest (keep the tx-history harvest); genuine incoming still comes from z_listreceivedbyaddress, and our sends are recorded by the local echo. 2. Own-identity ingest filter — a memo whose sender public key equals our own identity is by definition something we sent (only we hold our key); it must never be ingested as incoming. Skip those in ingest. This also collapses same-seed self-chat (running the SAME wallet in the full node and Lite makes them one chat identity, so sends land on an address we also own and loop back). For a real two-party chat use two DIFFERENT wallets/seeds — same-seed wallets are one identity and can't be distinct peers. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
135 lines
5.7 KiB
C++
135 lines
5.7 KiB
C++
// DragonX Wallet - HushChat service (implementation).
|
|
|
|
#include "chat_service.h"
|
|
|
|
#include "chat_database.h"
|
|
#include "chat_identity.h" // chatIdentityPublicKeyHex
|
|
|
|
#include <utility>
|
|
|
|
namespace dragonx::chat {
|
|
|
|
ChatService::~ChatService() {
|
|
clearIdentity();
|
|
}
|
|
|
|
void ChatService::setIdentity(const ChatKeyPair& keys) {
|
|
identity_ = keys;
|
|
has_identity_ = true;
|
|
}
|
|
|
|
void ChatService::clearIdentity() {
|
|
wipeChatKeyPair(identity_);
|
|
has_identity_ = false;
|
|
}
|
|
|
|
int ChatService::ingest(const std::vector<HushChatTransactionMetadata>& metadata,
|
|
const std::unordered_map<std::string, std::int64_t>& txTimestamps,
|
|
std::int64_t fallbackTimestamp,
|
|
std::vector<std::string>* newIncomingCids) {
|
|
if (!has_identity_) return 0;
|
|
|
|
const std::string myPubKey = chatIdentityPublicKeyHex(identity_);
|
|
|
|
int added = 0;
|
|
for (const auto& meta : metadata) {
|
|
// A memo whose sender is our OWN identity is something we sent (only we hold our key). The local
|
|
// echo already records it as outgoing — ingesting it as incoming would duplicate it as a phantom
|
|
// "from peer" message. (This also collapses same-seed self-chat, where the "peer" wallet shares
|
|
// our identity, so every message would otherwise loop back.)
|
|
if (!myPubKey.empty() && meta.sender_public_key_hex == myPubKey) continue;
|
|
|
|
ChatMessage message;
|
|
message.direction = ChatDirection::Incoming;
|
|
message.txid = meta.txid;
|
|
message.conversation_id = meta.conversation_id;
|
|
message.peer_zaddr = meta.reply_zaddr;
|
|
message.peer_public_key_hex = meta.sender_public_key_hex;
|
|
const auto timeIt = txTimestamps.find(meta.txid);
|
|
message.timestamp = timeIt != txTimestamps.end() ? timeIt->second : fallbackTimestamp;
|
|
message.payload_position = meta.payload_position;
|
|
|
|
if (meta.type == HushChatHeaderType::ContactRequest) {
|
|
message.kind = ChatMessageKind::ContactRequest;
|
|
message.body = meta.payload_memo; // plaintext request text
|
|
} else {
|
|
message.kind = ChatMessageKind::Message;
|
|
std::string plaintext;
|
|
const ChatCryptoStatus status = decryptIncoming(
|
|
identity_, meta.sender_public_key_hex, meta.secretstream_header_hex,
|
|
meta.payload_memo, plaintext);
|
|
if (status != ChatCryptoStatus::Ok) continue; // drop undecryptable silently
|
|
message.body = std::move(plaintext);
|
|
}
|
|
|
|
// In-memory store dedups (txid+position); only persist the genuinely new ones. On the next
|
|
// session loadFromDatabase() repopulates the store, so re-scanning the chain re-ingests but
|
|
// the store dedup prevents a duplicate write.
|
|
if (store_.append(message)) {
|
|
if (db_) db_->append(message);
|
|
++added;
|
|
// Every ingested message is incoming — report its cid so the caller can notify without
|
|
// relying on a seen-watermark delta (which block-time vs wall-clock skew can swallow).
|
|
if (newIncomingCids) newIncomingCids->push_back(message.conversation_id);
|
|
}
|
|
}
|
|
return added;
|
|
}
|
|
|
|
void ChatService::loadFromDatabase() {
|
|
if (!db_) return;
|
|
for (const auto& message : db_->load()) {
|
|
store_.append(message);
|
|
}
|
|
}
|
|
|
|
std::string ChatService::identityPublicKeyHex() const {
|
|
if (!has_identity_) return {};
|
|
return chatIdentityPublicKeyHex(identity_);
|
|
}
|
|
|
|
ChatComposeStatus ChatService::composeMessage(const std::string& myReplyZaddr,
|
|
const std::string& peerPublicKeyHex,
|
|
const std::string& peerZaddr,
|
|
const std::string& conversationId,
|
|
const std::string& plaintext,
|
|
OutgoingChatMemos& out) const {
|
|
if (!has_identity_) return ChatComposeStatus::MissingField;
|
|
return buildOutgoingMessage(identity_, chatIdentityPublicKeyHex(identity_), myReplyZaddr,
|
|
peerPublicKeyHex, peerZaddr, conversationId, plaintext, out);
|
|
}
|
|
|
|
ChatComposeStatus ChatService::composeContactRequest(const std::string& myReplyZaddr,
|
|
const std::string& peerZaddr,
|
|
const std::string& conversationId,
|
|
const std::string& requestText,
|
|
OutgoingChatMemos& out) const {
|
|
if (!has_identity_) return ChatComposeStatus::MissingField;
|
|
return buildOutgoingContactRequest(chatIdentityPublicKeyHex(identity_), myReplyZaddr,
|
|
peerZaddr, conversationId, requestText, out);
|
|
}
|
|
|
|
bool ChatService::recordOutgoing(const ChatMessage& message) {
|
|
if (store_.append(message)) {
|
|
if (db_) db_->append(message);
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool ChatService::recordOutgoingPending(const ChatMessage& message) {
|
|
// Persist immediately (as Sending) so a send survives an app quit before the broadcast resolves;
|
|
// resolveOutgoing() then UPSERTS the row to the final status. A stray persisted Sending (crash mid-
|
|
// broadcast) loads as Sent (see ChatDatabase::deserialize).
|
|
const bool appended = store_.append(message);
|
|
if (appended && db_) db_->upsert(message);
|
|
return appended;
|
|
}
|
|
|
|
void ChatService::resolveOutgoing(const std::string& txid, ChatDelivery delivery) {
|
|
const ChatMessage* updated = store_.updateDelivery(txid, delivery);
|
|
if (updated && db_) db_->upsert(*updated); // overwrite the Sending row with the final status
|
|
}
|
|
|
|
} // namespace dragonx::chat
|