wip

Author: hoytech

src/events.cpp

@@ -247,6 +247,11 @@ bool deleteEventBasic(lmdb::txn &txn, uint64_t levId) {
 }
 
 
+static bool isEventABeforeEventB(const PackedEventView &a, const PackedEventView &b) {
+    // If timestamps are equal, then according to NIP-01, the one with the *greatest* lexical id is considered "earlier" (ie, discarded).
+    return a.created_at() < b.created_at() || (a.created_at() == b.created_at() && a.id() > b.id());
+}
+
 
 void writeEvents(lmdb::txn &txn, NegentropyFilterCache &neFilterCache, std::vector<EventToWrite> &evs, uint64_t logLevel) {
     std::sort(evs.begin(), evs.end(), [](auto &a, auto &b) {
@@ -291,27 +296,54 @@ void writeEvents(lmdb::txn &txn, NegentropyFilterCache &neFilterCache, std::vect
                     auto searchKey = makeKey_StringUint64(searchStr, packed.kind());
 
                     env.generic_foreachFull(txn, env.dbi_Event__replace, searchKey, lmdb::to_sv<uint64_t>(MAX_U64), [&](auto k, auto v) {
-                        ParsedKey_StringUint64 parsedKey(k);
-                        if (parsedKey.s == searchStr && parsedKey.n == packed.kind()) {
-                            auto otherEv = lookupEventByLevId(txn, lmdb::from_sv<uint64_t>(v));
+                        if (k != searchKey) return false;
 
-                            auto thisTimestamp = packed.created_at();
+                        auto otherEv = lookupEventByLevId(txn, lmdb::from_sv<uint64_t>(v));
+                        auto otherPacked = PackedEventView(otherEv.buf);
+
+                        if (isEventABeforeEventB(packed, otherPacked)) {
+                            ev.status = otherPacked.kind() == 5 ? EventWriteStatus::Deleted : EventWriteStatus::Replaced;
+                            return false; // found more recent replacement event, no need to scan more
+                        }
+                        return true;
+                    }, true);
+
+                    // If event is accepted (pending write), then do a second pass to remove/unindex outdated events
+
+                    if (ev.status == EventWriteStatus::Pending) {
+                        env.generic_foreachFull(txn, env.dbi_Event__replace, searchKey, lmdb::to_sv<uint64_t>(MAX_U64), [&](auto k, auto v) {
+                            if (k != searchKey) return false;
+
+                            auto otherEv = lookupEventByLevId(txn, lmdb::from_sv<uint64_t>(v));
                             auto otherPacked = PackedEventView(otherEv.buf);
-                            auto otherTimestamp = otherPacked.created_at();
+                        }, true);
+                    }
 
+
+/*
+                        if (isEventABeforeEventB(otherPacked, packed)) {
                             if (otherPacked.kind() == 5) {
-                                ev.status = EventWriteStatus::Deleted;
-                            } else if (otherTimestamp < thisTimestamp ||
-                                (otherTimestamp == thisTimestamp && packed.id() < otherPacked.id())) {
+                                // remove index entry?
+                            } else {
                                 if (logLevel >= 1) LI << "Deleting event (d-tag). id=" << to_hex(otherPacked.id());
                                 levIdsToDelete.push_back(otherEv.primaryKeyId);
-                            } else {
-                                ev.status = EventWriteStatus::Replaced;
                             }
+                        } else {
+                            ev.status = otherPacked.kind() == 5 ? EventWriteStatus::Deleted : EventWriteStatus::Replaced;
+                            return false; // found more recent replacement event, no need to scan more
                         }
-
-                        return false;
-                    }, true);
+                        */
+
+/*
+                        if (otherPacked.kind() == 5) {
+                            ev.status = EventWriteStatus::Deleted;
+                        } else if (isEventABeforeEventB(otherPacked, packed)) {
+                            if (logLevel >= 1) LI << "Deleting event (d-tag). id=" << to_hex(otherPacked.id());
+                            levIdsToDelete.push_back(otherEv.primaryKeyId);
+                        } else {
+                            ev.status = EventWriteStatus::Replaced;
+                        }
+                        */
                 }
             }
 
@@ -332,14 +364,18 @@ void writeEvents(lmdb::txn &txn, NegentropyFilterCache &neFilterCache, std::vect
                                 auto searchKey = makeKey_StringUint64(pubkey + dTag, kind);
 
                                 env.generic_foreachFull(txn, env.dbi_Event__replace, searchKey, lmdb::to_sv<uint64_t>(MAX_U64), [&](auto k, auto v) {
-                                    if (k == searchKey) {
-                                        auto otherEv = lookupEventByLevId(txn, lmdb::from_sv<uint64_t>(v));
-                                        if (PackedEventView(otherEv.buf).kind() == kind) { // Might be a deletion. Leave that.
-                                            if (logLevel >= 1) LI << "Deleting replaceable event (kind 5). id=" << to_hex(tagVal);
-                                            levIdsToDelete.push_back(lmdb::from_sv<uint64_t>(v));
-                                        }
+                                    if (k != searchKey) return false;
+
+                                    auto otherEv = lookupEventByLevId(txn, lmdb::from_sv<uint64_t>(v));
+                                    auto otherPacked = PackedEventView(otherEv.buf);
+
+                                    if (otherPacked.kind() == kind) {
+                                        if (logLevel >= 1) LI << "Deleting replaceable event (kind 5). id=" << to_hex(tagVal);
+                                        levIdsToDelete.push_back(lmdb::from_sv<uint64_t>(v));
+                                    } else if (otherPacked.kind() == kind) {
                                     }
-                                    return false;
+
+                                    return true;
                                 }, true);
                             }
                         } catch(...) {