Added master key generation and pro proof serialization

Author: SessionHero01

library/src/main/cpp/CMakeLists.txt

@@ -160,4 +160,6 @@ target_link_libraries( # Specifies the target library.
         webpdemux
         webpdecoder
         yuv
+        nlohmann_json
+        oxenc
 )

library/src/main/cpp/ed25519.cpp

@@ -43,4 +43,19 @@ Java_network_loki_messenger_libsession_1util_ED25519_generate(JNIEnv *env, jobje
 
         return jni_utils::new_key_pair(env, util::bytes_from_span(env, pk), util::bytes_from_span(env, sk));
     });
+}
+
+extern "C"
+JNIEXPORT jbyteArray JNICALL
+Java_network_loki_messenger_libsession_1util_ED25519_generateProKeyPair(JNIEnv *env, jobject thiz,
+                                                                        jbyteArray ed25519_seed) {
+    return jni_utils::run_catching_cxx_exception_or_throws<jbyteArray>(env, [=] {
+        return util::bytes_from_span(
+                env,
+                session::ed25519::ed25519_pro_privkey_for_ed25519_seed(
+                        jni_utils::JavaByteArrayRef(env, ed25519_seed).get()
+                )
+        );
+
+    });
 }

library/src/main/cpp/pro_proof.cpp

@@ -1,7 +1,10 @@
 #include <session/session_protocol.hpp>
-
+#include <oxenc/base64.h>
+#include <nlohmann/json.hpp>
 #include <jni.h>
+
 #include "util.h"
+#include "jni_utils.h"
 
 
 extern "C"
@@ -35,14 +38,44 @@ extern "C"
 JNIEXPORT jstring JNICALL
 Java_network_loki_messenger_libsession_1util_pro_ProProof_00024Companion_nativeSerialize(
         JNIEnv *env, jobject thiz, jlong native_value) {
-    // TODO: implement nativeSerialize()
+    const auto& proof =
+            *reinterpret_cast<session::ProProof*>(native_value);
+    nlohmann::json j;
+    j["version"] = proof.version;
+    j["gen_index_hash"] = oxenc::to_base64(proof.gen_index_hash);
+    j["rotating_pubkey"] = oxenc::to_base64(proof.rotating_pubkey);
+    j["expiry_unix_ts_ms"] = proof.expiry_unix_ts.time_since_epoch().count();
+    j["sig"] = oxenc::to_base64(proof.sig);
+
+    return util::jstringFromOptional(env, j.dump());
+}
+
+template<size_t N>
+void from_json(const nlohmann::json& j, std::array<uint8_t, N>& arr) {
+    auto b64_str = j.get<std::string_view>();
+    auto bytes = oxenc::from_base64(b64_str);
+    if (bytes.size() != N) {
+        throw std::invalid_argument{"Invalid array size in from_json"};
+    }
+    std::copy(bytes.begin(), bytes.end(), arr.begin());
 }
 
 extern "C"
 JNIEXPORT jlong JNICALL
 Java_network_loki_messenger_libsession_1util_pro_ProProof_00024Companion_nativeDeserialize(
         JNIEnv *env, jobject thiz, jstring data) {
-    // TODO: implement nativeDeserialize()
+    return jni_utils::run_catching_cxx_exception_or_throws<jlong>(env, [=]() {
+        auto j = nlohmann::json::parse(jni_utils::JavaStringRef(env, data).view());
+
+        return reinterpret_cast<jlong>(new session::ProProof {
+            .version = j.at("version").get<uint8_t>(),
+            .gen_index_hash = j.at("gen_index_hash").get<session::array_uc32>(),
+            .rotating_pubkey = j.at("rotating_pubkey").get<session::array_uc32>(),
+            .expiry_unix_ts = std::chrono::sys_time<std::chrono::milliseconds>{
+                std::chrono::milliseconds{static_cast<int64_t>(j.at("expiry_unix_ts_ms").get<uint64_t>())}},
+            .sig = j.at("sig").get<session::array_uc64>(),
+        });
+    });
 }
 
 extern "C"

library/src/main/java/network/loki/messenger/libsession_util/ED25519.kt

@@ -29,4 +29,13 @@ object ED25519 : LibSessionUtilCApi() {
     ): Boolean
 
     external fun generate(seed: ByteArray?): KeyPair
+
+    /**
+     * Generate the deterministic Master Session Pro key for signing requests to interact with the
+     * Session Pro features of the protocol.
+     *
+     * @param ed25519Seed The seed the user uses to generate their session id
+     * @return The libsodium-style Master Session Pro Ed25519 secret key, 64 bytes.
+     */
+    external fun generateProPrivateKey(ed25519Seed: ByteArray): ByteArray
 }