feat: keep groupPk/secKey in metagroup for debugging purposes if needed

Author: Bilb

.yarnrc.yml

@@ -1,2 +1,3 @@
 nodeLinker: node-modules
-patchFolder: patches
+
+patchFolder: patches

CMakeLists.txt

@@ -16,7 +16,6 @@ if(NOT N EQUAL 0)
 else()
   set(CMAKE_BUILD_PARALLEL_LEVEL 4)  # Fallback to 16 if detection fails
 endif()
-# set(CMAKE_BUILD_PARALLEL_LEVEL 32)
 message(STATUS "Number of processors detected: ${N}")
 
 

src/groups/meta_group.hpp

@@ -25,12 +25,20 @@ class MetaGroup {
     shared_ptr<config::groups::Info> info;
     shared_ptr<config::groups::Members> members;
     shared_ptr<config::groups::Keys> keys;
+    string edGroupPubKey;
+    std::optional<string> edGroupSecKey;
 
     MetaGroup(
             shared_ptr<config::groups::Info> info,
             shared_ptr<config::groups::Members> members,
-            shared_ptr<config::groups::Keys> keys) :
-            info{info}, members{members}, keys{keys} {};
+            shared_ptr<config::groups::Keys> keys,
+            session::ustring edGroupPubKey,
+            std::optional<session::ustring> edGroupSecKey) :
+            info{info}, members{members}, keys{keys} {
+
+        this->edGroupPubKey = oxenc::to_hex(edGroupPubKey);
+        this->edGroupSecKey = edGroupSecKey ? oxenc::to_hex(*edGroupSecKey) : nullptr;
+    };
 
     explicit MetaGroup(const Napi::CallbackInfo& info) {}
 };

src/groups/meta_group_wrapper.cpp

@@ -469,32 +469,13 @@ Napi::Value MetaGroupWrapper::memberSetInvited(const Napi::CallbackInfo& info) {
         assertIsBoolean(info[1]);
         auto pubkeyHex = toCppString(info[0], __PRETTY_FUNCTION__);
         auto failed = toCppBoolean(info[1], __PRETTY_FUNCTION__);
-        auto m = this->meta_group->members->get_or_construct(pubkeyHex);
 
-        // this->meta_group->members->log(
-        //         session::config::LogLevel::warning,
-        //         "libsession-util before: needsDump? " +
-        //                 std::string(this->needsDump(info) ? "true" : "false"));
-        // this->meta_group->members->log(
-        //         session::config::LogLevel::warning,
-        //         "libsession-util before: invite_failed of " + std::string(pubkeyHex) +
-        //                 " val: " + std::string(m.invite_failed() ? "true" : "false"));
+        auto m = this->meta_group->members->get_or_construct(pubkeyHex);
         m.set_invited(failed);
         this->meta_group->members->set(m);
-        // this->meta_group->members->log(
-        //         session::config::LogLevel::warning,
-        //         "libsession-util after: invite_failed of " + std::string(pubkeyHex) +
-        //                 " val: " + std::string(m.invite_failed() ? "true" : "false"));
-        auto refreshed = this->meta_group->members->get_or_construct(m.session_id);
-        // this->meta_group->members->log(
-        //         session::config::LogLevel::warning,
-        //         "libsession-util refreshed: invite_failed of " + std::string(pubkeyHex) +
-        //                 " val: " + std::string(refreshed.invite_failed() ? "true" : "false"));
-        // this->meta_group->members->log(
-        //         session::config::LogLevel::warning,
-        //         "libsession-util after: needsDump? of " +
-        //                 std::string(this->needsDump(info) ? "true" : "false"));
-        return refreshed;
+
+        return this->meta_group->members->get_or_construct(pubkeyHex);
+
     });
 }
 

src/meta/meta_base_wrapper.hpp

@@ -101,7 +101,7 @@ class MetaBaseWrapper {
                     *info,
                     *members);
 
-            return std::make_unique<session::nodeapi::MetaGroup>(info, members, keys);
+            return std::make_unique<session::nodeapi::MetaGroup>(info, members, keys,group_ed25519_pubkey, group_ed25519_secretkey);
         });
     }
 };