From 4b3e2c5ffed4e0691c030761b5410209eb5d2a41 Mon Sep 17 00:00:00 2001
From: 0xturboblitz <florent.tavernier@gmail.com>
Date: Tue, 21 May 2024 13:32:54 +0900
Subject: [PATCH] fix registration proof generation on android

---
 .../java/com/awesomeproject/ProverModule.kt   | 26 +++++++------------
 app/src/utils/prover.ts                       |  4 +--
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/app/android/app/src/main/java/com/awesomeproject/ProverModule.kt b/app/android/app/src/main/java/com/awesomeproject/ProverModule.kt
index bcf0a10b4..eeece2b5f 100644
--- a/app/android/app/src/main/java/com/awesomeproject/ProverModule.kt
+++ b/app/android/app/src/main/java/com/awesomeproject/ProverModule.kt
@@ -34,22 +34,14 @@ class ProverModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     Log.e(TAG, "dat_file_name in provePassport kotlin: " + dat_file_name)
     Log.e(TAG, "inputs in provePassport kotlin: " + inputs.toString())
 
-    val formattedInputs = mutableMapOf<String, Any?>(
-      "mrz" to inputs.getArray("mrz")?.toArrayList()?.map { it.toString() },
-      "reveal_bitmap" to inputs.getArray("reveal_bitmap")?.toArrayList()?.map { it.toString() },
-      "dataHashes" to inputs.getArray("dataHashes")?.toArrayList()?.map { it.toString() },
-      "datahashes_padded_length" to inputs.getArray("datahashes_padded_length")?.toArrayList()?.map { it.toString() }?.firstOrNull(),
-      "eContentBytes" to inputs.getArray("eContentBytes")?.toArrayList()?.map { it.toString() },
-      "signature" to inputs.getArray("signature")?.toArrayList()?.map { it.toString() },
-      "signatureAlgorithm" to inputs.getArray("signatureAlgorithm")?.toArrayList()?.map { it.toString() }?.firstOrNull(),
-      "pubkey" to inputs.getArray("pubkey")?.toArrayList()?.map { it.toString() },
-      "pathIndices" to inputs.getArray("pathIndices")?.toArrayList()?.map { it.toString() },
-      "siblings" to inputs.getArray("siblings")?.toArrayList()?.map { it.toString() },
-      "root" to inputs.getArray("root")?.toArrayList()?.map { it.toString() }?.firstOrNull(),
-      "address" to inputs.getArray("address")?.toArrayList()?.map { it.toString() }?.firstOrNull(),
-      "current_date" to inputs.getArray("current_date")?.toArrayList()?.map { it.toString() },
-      "majority" to inputs.getArray("majority")?.toArrayList()?.map { it.toString() },
-    )
+    val formattedInputs = mutableMapOf<String, Any?>()
+
+    val iterator = inputs.keySetIterator()
+    while (iterator.hasNextKey()) {
+        val key = iterator.nextKey()
+        val array = inputs.getArray(key)?.toArrayList()?.map { it.toString() }
+        formattedInputs[key] = if (array?.size == 1) array.firstOrNull() else array
+    }
 
     val gson = GsonBuilder().setPrettyPrinting().create()
     Log.e(TAG, gson.toJson(formattedInputs))
@@ -75,7 +67,7 @@ class ProverModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     val zkpTools = ZKPTools(reactApplicationContext)
 
     val witnessCalcFunction = when (witness_calculator) {
-        "register_sha256withrsaencryption_65537" -> zkpTools::witnesscalc_register_sha256WithRSAEncryption_65537
+        "register_sha256WithRSAEncryption_65537" -> zkpTools::witnesscalc_register_sha256WithRSAEncryption_65537
         "disclose" -> zkpTools::witnesscalc_disclose
         else -> throw IllegalArgumentException("Invalid witness calculator name")
     }  
diff --git a/app/src/utils/prover.ts b/app/src/utils/prover.ts
index 1b4895891..7aa144cc0 100644
--- a/app/src/utils/prover.ts
+++ b/app/src/utils/prover.ts
@@ -8,12 +8,12 @@ export const generateProof = async (
 ) => {
   try {
     console.log('launching generateProof function');
-    console.log('inputs in App.tsx', inputs);
+    console.log('inputs in prover.ts', inputs);
 
     const zkey_path = `${RNFS.DocumentDirectoryPath}/${circuit}.zkey`
     // Example: "/data/user/0/com.proofofpassport/files/register_sha256WithRSAEncryption_65537.zkey" on android
     const witness_calculator = circuit;
-    const dat_file_name = circuit.toLowerCase();
+    const dat_file_name = Platform.OS == "android" ? circuit.toLowerCase() : circuit;
 
     const response = await NativeModules.Prover.runProveAction(
       zkey_path,