fix: bump to latest libsession-util dev

Author: Bilb

.gitattributes

@@ -1,21 +1,17 @@
 .circleci export-ignore
 .github export-ignore
-libsession-util/external/libsodium-internal/test export-ignore
-libsession-util/external/zstd/doc export-ignore
-libsession-util/external/zstd/tests export-ignore
-libsession-util/tests export-ignore
-libsession-util/external/nlohmann-json/tests export-ignore
-libsession-util/external/nlohmann-json/docs export-ignore
-libsession-util/external/oxen-encoding/tests export-ignore
-libsession-util/external/oxen-libquic/external/ngtcp2 export-ignore
-libsession-util/external/oxen-libquic/tests export-ignore
+**/test export-ignore
+**/tests export-ignore
+**/doc export-ignore
+**/docs export-ignore
+libsession-util/session-router/external/oxen-libquic/external/ngtcp2 export-ignore
+
+
+# protobuf
 libsession-util/external/protobuf/csharp export-ignore
 libsession-util/external/protobuf/java export-ignore
 libsession-util/external/protobuf/objectivec export-ignore
 libsession-util/external/protobuf/php export-ignore
 libsession-util/external/protobuf/python export-ignore
 libsession-util/external/protobuf/ruby export-ignore
 libsession-util/external/protobuf/kokoro export-ignore
-libsession-util/external/oxen-libquic/external/oxen-logging/fmt/test export-ignore
-libsession-util/external/oxen-libquic/external/oxen-logging/spdlog/tests export-ignore
-libsession-util/external/oxen-libquic/external/oxen-encoding/tests export-ignore

CMakeLists.txt

@@ -54,7 +54,7 @@ SET(WITH_TESTS OFF)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
-set(ENABLE_ONIONREQ OFF)
+set(ENABLE_NETWORKING OFF)
 
 # when building from a release of libsession on desktop, it complains that ios-cmake is not up to date
 # as it is not part of the archive. We actually don't care about it on session-desktop

libsession-util

@@ -3,7 +3,7 @@
   "name": "libsession_util_nodejs",
   "packageManager": "pnpm@10.28.1",
   "description": "Wrappers for the Session Util Library",
-  "version": "0.6.12",
+  "version": "0.6.14",
   "license": "GPL-3.0",
   "author": {
     "name": "Oxen Project",
@@ -13,7 +13,7 @@
     "clean": "rimraf .cache build",
     "lint:cpp": "cppcheck --std=c++20 -j8  src",
     "lint": "find src include -name '*.cpp' -o -name '*.hpp' | xargs clang-format-19 -i",
-    "install": "cmake-js build --runtime=electron --runtime-version=40.0.0 --CDSUBMODULE_CHECK=OFF --CDLOCAL_MIRROR=https://oxen.rocks/deps --CDENABLE_ONIONREQ=OFF --CDWITH_TESTS=OFF",
+    "install": "cmake-js build --runtime=electron --runtime-version=40.0.0 --CDSUBMODULE_CHECK=OFF --CDLOCAL_MIRROR=https://oxen.rocks/deps --CDENABLE_NETWORKING=OFF --CDWITH_TESTS=OFF",
     "prepare_release": "sh prepare_release.sh",
     "dedup": "pnpm dedupe --check"
   },

package.json

@@ -17,14 +17,14 @@ using config::UserProfile;
 session::config::ProConfig pro_config_from_object(Napi::Object input) {
     session::config::ProConfig pro_config = {};
 
-    auto rotating_privkey_hex_js = input.Get("rotatingPrivKeyHex");
-    assertIsString(rotating_privkey_hex_js, "pro_config_from_object.rotating_privkey_js");
-    auto rotating_privkey_cpp = from_hex_to_vector(
-            toCppString(rotating_privkey_hex_js, "pro_config_from_object.rotating_privkey_js"));
-    assert_length(rotating_privkey_cpp, 64, "pro_config_from_object.rotating_privkey_js");
+    auto rotating_seed_hex_js = input.Get("rotatingSeedHex");
+    assertIsString(rotating_seed_hex_js, "pro_config_from_object.rotating_seed_js");
+    auto rotating_seed_cpp = from_hex_to_vector(
+            toCppString(rotating_seed_hex_js, "pro_config_from_object.rotating_seed_js"));
+    assert_length(rotating_seed_cpp, 32, "pro_config_from_object.rotating_seed_js");
     std::copy(
-            rotating_privkey_cpp.begin(),
-            rotating_privkey_cpp.end(),
+            rotating_seed_cpp.begin(),
+            rotating_seed_cpp.end(),
             pro_config.rotating_privkey.begin());
 
     auto proProof = input.Get("proProof");
@@ -46,18 +46,6 @@ session::config::ProConfig pro_config_from_object(Napi::Object input) {
             gen_index_hash_cpp.end(),
             pro_config.proof.gen_index_hash.begin());
 
-    // extract rotatingPubkeyHex
-    auto rotating_pubkey_hex_js = proof_js.Get("rotatingPubkeyHex");
-    assertIsString(rotating_pubkey_hex_js, "pro_config_from_object.rotatingPubkeyHex");
-    auto rotating_pubkey_hex_cpp =
-            toCppString(rotating_pubkey_hex_js, "pro_config_from_object.rotatingPubkeyHex");
-    auto rotating_pubkey_cpp = from_hex_to_vector(rotating_pubkey_hex_cpp);
-    assert_length(rotating_pubkey_cpp, 32, "pro_config_from_object.rotatingPubkeyHex");
-    std::copy(
-            rotating_pubkey_cpp.begin(),
-            rotating_pubkey_cpp.end(),
-            pro_config.proof.rotating_pubkey.begin());
-
     // extract backend signature
     auto signature_hex_js = proof_js.Get("signatureHex");
     assertIsString(signature_hex_js, "pro_config_from_object.signature_hex_js");
@@ -278,6 +266,10 @@ void UserConfigWrapper::setProConfig(const Napi::CallbackInfo& info) {
         auto pro_config_js = info[0];
         assertIsObject(pro_config_js);
 
+        // This is quite messed up, but the type expected by libsession is not correct here.
+        // It needs a seed in the rotatingPrivKey and will discard the rotatingPubkey in the
+        // proProof.
+        // When calling get_pro_config, it will deduce those two from the seed stored above.
         session::config::ProConfig pro_config =
                 pro_config_from_object(pro_config_js.As<Napi::Object>());
 

src/user_config.cpp

@@ -43,10 +43,21 @@ declare module 'libsession_util_nodejs' {
     rotatingPrivKeyHex: string;
   };
 
+  type WithRotatingSeedHex = {
+    /**
+     * 32 bytes, 64 chars
+     */
+    rotatingPrivKeyHex: string;
+  };
+
   type ProConfig = WithRotatingPrivKeyHex & {
     proProof: ProProof;
   };
 
+  type ProConfigSet = WithRotatingSeedHex & {
+    proProof: Omit<ProProof, 'rotatingPubkeyHex'>;
+  };
+
   export type ProOriginatingPlatform = 'Nil' | 'Google' | 'iOS';
 
   export type ProBackendProviderConstantType = {

types/pro/pro.d.ts

@@ -38,7 +38,7 @@ declare module 'libsession_util_nodejs' {
      */
     getNoteToSelfExpiry: () => number | undefined;
 
-    setProConfig: (proConfig: ProConfig) => void;
+    setProConfig: (proConfig: ProConfigSet) => void;
     getProConfig: () => ProConfig | null;
     removeProConfig: () => boolean;