chore: ensuring that all composite responses have 0x prefix

Author: saledjenic

src/rpc/rpc_composite_handlers.cpp

@@ -114,9 +114,9 @@ QJsonObject RpcService::handleExportExtendedPublicKey(quint64 id, const QJsonObj
     }
 
     QJsonObject keyObj;
-    keyObj["address"] = key.address;
-    keyObj["publicKey"] = key.publicKey;
-    keyObj["chainCode"] = key.chainCode;
+    keyObj["address"] = ensure0xPrefix(key.address);
+    keyObj["publicKey"] = ensure0xPrefix(key.publicKey);
+    keyObj["chainCode"] = ensure0xPrefix(key.chainCode);
     keyObj["xpub"] = key.xpub;
 
     return createSuccessResponse(id, keyObj);
@@ -178,19 +178,19 @@ QJsonObject RpcService::handleExportPublicKey(quint64 id, const QJsonObject& par
 
     QJsonObject response;
     if (!result.masterKeyAddress.isEmpty()) {
-        response["masterKeyAddress"] = result.masterKeyAddress;
+        response["masterKeyAddress"] = ensure0xPrefix(result.masterKeyAddress);
     }
     if (inputWasArray) {
         QJsonArray exportedArray;
         for (const auto& kp : result.exportedKeys) {
             QJsonObject keyObj;
-            keyObj["address"] = kp.address;
-            keyObj["publicKey"] = kp.publicKey;
+            keyObj["address"] = ensure0xPrefix(kp.address);
+            keyObj["publicKey"] = ensure0xPrefix(kp.publicKey);
             if (!kp.privateKey.isEmpty()) {
-                keyObj["privateKey"] = kp.privateKey;
+                keyObj["privateKey"] = ensure0xPrefix(kp.privateKey);
             }
             if (!kp.chainCode.isEmpty()) {
-                keyObj["chainCode"] = kp.chainCode;
+                keyObj["chainCode"] = ensure0xPrefix(kp.chainCode);
             }
             exportedArray.append(keyObj);
         }
@@ -201,13 +201,13 @@ QJsonObject RpcService::handleExportPublicKey(quint64 id, const QJsonObject& par
         } else {
             const auto& kp = result.exportedKeys.first();
             QJsonObject keyObj;
-            keyObj["address"] = kp.address;
-            keyObj["publicKey"] = kp.publicKey;
+            keyObj["address"] = ensure0xPrefix(kp.address);
+            keyObj["publicKey"] = ensure0xPrefix(kp.publicKey);
             if (!kp.privateKey.isEmpty()) {
-                keyObj["privateKey"] = kp.privateKey;
+                keyObj["privateKey"] = ensure0xPrefix(kp.privateKey);
             }
             if (!kp.chainCode.isEmpty()) {
-                keyObj["chainCode"] = kp.chainCode;
+                keyObj["chainCode"] = ensure0xPrefix(kp.chainCode);
             }
             response["exportedKey"] = keyObj;
         }

src/rpc/rpc_service.cpp

@@ -1,5 +1,6 @@
 #include "rpc_service.h"
 #include "../utils/constants.h"
+#include "../utils/common.h"
 #include "../session/session_manager.h"
 #include "../storage/file_pairing_storage.h"
 #include "keycard-qt/communication_manager.h"
@@ -237,14 +238,14 @@ QJsonObject RpcService::validateAndConfigureStorage(quint64 id, const QString& s
 
 QJsonObject RpcService::loginKeysToJson(const SessionManager::LoginKeys& keys) {
     QJsonObject whisperKey;
-    whisperKey["address"] = keys.whisperPrivateKey.address;
-    whisperKey["publicKey"] = keys.whisperPrivateKey.publicKey;
-    whisperKey["privateKey"] = keys.whisperPrivateKey.privateKey;
+    whisperKey["address"] = ensure0xPrefix(keys.whisperPrivateKey.address);
+    whisperKey["publicKey"] = ensure0xPrefix(keys.whisperPrivateKey.publicKey);
+    whisperKey["privateKey"] = ensure0xPrefix(keys.whisperPrivateKey.privateKey);
 
     QJsonObject encryptionKey;
-    encryptionKey["address"] = keys.encryptionPrivateKey.address;
-    encryptionKey["publicKey"] = keys.encryptionPrivateKey.publicKey;
-    encryptionKey["privateKey"] = keys.encryptionPrivateKey.privateKey;
+    encryptionKey["address"] = ensure0xPrefix(keys.encryptionPrivateKey.address);
+    encryptionKey["publicKey"] = ensure0xPrefix(keys.encryptionPrivateKey.publicKey);
+    encryptionKey["privateKey"] = ensure0xPrefix(keys.encryptionPrivateKey.privateKey);
 
     QJsonObject keysObject;
     keysObject["whisperPrivateKey"] = whisperKey;
@@ -257,16 +258,16 @@ QJsonObject RpcService::loginKeysToJson(const SessionManager::LoginKeys& keys) {
 }
 
 QJsonObject RpcService::recoverKeysToJson(const SessionManager::RecoverKeys& keys) {
-    // Helper to convert KeyPair to JSON
+    // Helper to convert KeyPair to JSON (hex values with 0x prefix)
     auto keyPairToJson = [](const SessionManager::KeyPair& kp) {
         QJsonObject obj;
-        obj["address"] = kp.address;
-        obj["publicKey"] = kp.publicKey;
+        obj["address"] = ensure0xPrefix(kp.address);
+        obj["publicKey"] = ensure0xPrefix(kp.publicKey);
         if (!kp.privateKey.isEmpty()) {
-            obj["privateKey"] = kp.privateKey;
+            obj["privateKey"] = ensure0xPrefix(kp.privateKey);
         }
         if (!kp.chainCode.isEmpty()) {
-            obj["chainCode"] = kp.chainCode;
+            obj["chainCode"] = ensure0xPrefix(kp.chainCode);
         }
         return obj;
     };

src/utils/common.h

@@ -8,4 +8,11 @@ namespace StatusKeycard {
         return str.startsWith("0x") ? str.mid(2) : str;
     }
 
+    inline QString ensure0xPrefix(const QString& hex) {
+        if (hex.isEmpty()) return hex;
+        if (hex.length() >= 2 && hex[0] == '0' && (hex[1] == 'x' || hex[1] == 'X'))
+            return hex;
+        return QString("0x") + hex;
+    }
+
 } // namespace StatusKeycard