@baerae/zkap-zkp-react-native 0.1.1 → 0.1.3

package/ios/ZkapSdkModule.podspec

@@ -13,15 +13,14 @@ Pod::Spec.new do |s|
   s.swift_version  = '5.9'
   s.source         = { git: package['repository']['url'] }
 
-  s.source_files   = 'ios/**/*.{swift,h,m}'
+  s.source_files   = ['ZkapSdkModule.swift', 'uniffi/**/*.{swift,h,m}']
 
   # Pre-built Rust static libraries (generated by CI build-react-native.yml)
-  s.vendored_frameworks = 'ios/ZkapZkp.xcframework'
+  s.vendored_frameworks = 'ZkapZkp.xcframework'
 
-  # Expose C headers for the Rust FFI symbols
-  s.preserve_paths = 'ios/include/*.h'
+  # Expose C headers for the Rust FFI symbols (UniFFI-generated module)
+  s.preserve_paths = 'uniffi/*.h'
   s.xcconfig = {
-    'HEADER_SEARCH_PATHS' => '$(PODS_TARGET_SRCROOT)/ios/include',
     'OTHER_LDFLAGS' => '-lc++'
   }
 
@@ -29,6 +28,8 @@ Pod::Spec.new do |s|
 
   s.pod_target_xcconfig = {
     'DEFINES_MODULE' => 'YES',
-    'SWIFT_COMPILATION_MODE' => 'wholemodule'
+    'SWIFT_COMPILATION_MODE' => 'wholemodule',
+    'HEADER_SEARCH_PATHS' => '$(PODS_TARGET_SRCROOT)/uniffi',
+    'OTHER_CFLAGS' => '-fmodule-map-file=$(PODS_TARGET_SRCROOT)/uniffi/zkap_uniffi_bindingsFFI.modulemap'
   }
 end

package/ios/ZkapSdkModule.swift

@@ -8,98 +8,140 @@ public class ZkapSdkModule: Module {
         // generateHash
         // ──────────────────────────────────────────
         AsyncFunction("generateHash") { (inputJson: String) -> String in
-            guard let cInput = inputJson.cString(using: .utf8) else {
-                throw ZkapError.invalidInput("Failed to encode inputJson as UTF-8")
-            }
-            let result = zkap_generate_hash(cInput)
-            defer { zkap_free_string(result) }
-            return try ZkapSdkModule.unwrapResult(result)
-        }
+            let data = inputJson.data(using: .utf8)!
+            let obj = try JSONSerialization.jsonObject(with: data) as! [String: Any]
+            let messages = obj["messages"] as! [String]
 
-        // ──────────────────────────────────────────
-        // generateAnchor
-        // ──────────────────────────────────────────
-        AsyncFunction("generateAnchor") { (inputJson: String) -> String in
-            guard let cInput = inputJson.cString(using: .utf8) else {
-                throw ZkapError.invalidInput("Failed to encode inputJson as UTF-8")
-            }
-            let result = zkap_generate_anchor(cInput)
-            defer { zkap_free_string(result) }
-            return try ZkapSdkModule.unwrapResult(result)
+            let result = try generateHash(messages: messages)
+
+            let output: [String: Any] = ["result": result]
+            let outData = try JSONSerialization.data(withJSONObject: output)
+            return String(data: outData, encoding: .utf8)!
         }
 
         // ──────────────────────────────────────────
         // generateAudHash
         // ──────────────────────────────────────────
         AsyncFunction("generateAudHash") { (inputJson: String) -> String in
-            guard let cInput = inputJson.cString(using: .utf8) else {
-                throw ZkapError.invalidInput("Failed to encode inputJson as UTF-8")
-            }
-            let result = zkap_generate_aud_hash(cInput)
-            defer { zkap_free_string(result) }
-            return try ZkapSdkModule.unwrapResult(result)
+            let data = inputJson.data(using: .utf8)!
+            let obj = try JSONSerialization.jsonObject(with: data) as! [String: Any]
+            let config = parseConfig(obj["config"] as! [String: Any])
+            let audList = obj["aud_list"] as! [String]
+
+            let result = try generateAudHash(config: config, audList: audList)
+
+            let output: [String: Any] = [
+                "aud_hashes": result.audHashes,
+                "h_aud_list": result.hAudList
+            ]
+            let outData = try JSONSerialization.data(withJSONObject: output)
+            return String(data: outData, encoding: .utf8)!
         }
 
         // ──────────────────────────────────────────
         // generateLeafHash
         // ──────────────────────────────────────────
         AsyncFunction("generateLeafHash") { (inputJson: String) -> String in
-            guard let cInput = inputJson.cString(using: .utf8) else {
-                throw ZkapError.invalidInput("Failed to encode inputJson as UTF-8")
+            let data = inputJson.data(using: .utf8)!
+            let obj = try JSONSerialization.jsonObject(with: data) as! [String: Any]
+            let config = parseConfig(obj["config"] as! [String: Any])
+            let iss = obj["iss"] as! String
+            let pkB64 = obj["pk_b64"] as! String
+
+            let result = try generateLeafHash(config: config, iss: iss, pkB64: pkB64)
+
+            let output: [String: Any] = ["result": result]
+            let outData = try JSONSerialization.data(withJSONObject: output)
+            return String(data: outData, encoding: .utf8)!
+        }
+
+        // ──────────────────────────────────────────
+        // generateAnchor
+        // ──────────────────────────────────────────
+        AsyncFunction("generateAnchor") { (inputJson: String) -> String in
+            let data = inputJson.data(using: .utf8)!
+            let obj = try JSONSerialization.jsonObject(with: data) as! [String: Any]
+            let config = parseConfig(obj["config"] as! [String: Any])
+            let rawSecrets = obj["secrets"] as! [[String: Any]]
+            let secrets = rawSecrets.map { s in
+                ZkapSecret(
+                    sub: s["sub"] as! String,
+                    iss: s["iss"] as! String,
+                    aud: s["aud"] as! String
+                )
             }
-            let result = zkap_generate_leaf_hash(cInput)
-            defer { zkap_free_string(result) }
-            return try ZkapSdkModule.unwrapResult(result)
+
+            let result = try generateAnchor(config: config, secrets: secrets)
+
+            let output: [String: Any] = ["evaluations": result.evaluations]
+            let outData = try JSONSerialization.data(withJSONObject: output)
+            return String(data: outData, encoding: .utf8)!
         }
 
         // ──────────────────────────────────────────
         // prove
         // ──────────────────────────────────────────
         AsyncFunction("prove") { (inputJson: String) -> String in
-            guard let cInput = inputJson.cString(using: .utf8) else {
-                throw ZkapError.invalidInput("Failed to encode inputJson as UTF-8")
+            let data = inputJson.data(using: .utf8)!
+            let obj = try JSONSerialization.jsonObject(with: data) as! [String: Any]
+            let config = parseConfig(obj["config"] as! [String: Any])
+            let req = obj["request"] as! [String: Any]
+
+            let rawLeafIndices = req["leaf_indices"] as! [Any]
+            let leafIndices: [UInt64] = rawLeafIndices.map { v in
+                if let n = v as? Int { return UInt64(n) }
+                if let n = v as? UInt64 { return n }
+                return UInt64(v as! NSNumber)
             }
-            let result = zkap_prove(cInput)
-            defer { zkap_free_string(result) }
-            return try ZkapSdkModule.unwrapResult(result)
-        }
-    }
 
-    // ──────────────────────────────────────────────────────────────
-    // Helpers
-    // ──────────────────────────────────────────────────────────────
+            let request = ZkapProofRequest(
+                pkPath: req["pk_path"] as! String,
+                jwts: req["jwts"] as! [String],
+                pkOps: req["pk_ops"] as! [String],
+                merklePaths: req["merkle_paths"] as! [[String]],
+                leafIndices: leafIndices,
+                root: req["root"] as! String,
+                anchorEvals: req["anchor_evals"] as! [String],
+                hanchor: req["hanchor"] as! String,
+                hSignUserOp: req["h_sign_user_op"] as! String,
+                random: req["random"] as! String,
+                audHashList: req["aud_hash_list"] as! [String]
+            )
 
-    /// Convert a raw C string pointer returned by the Rust FFI into a Swift String.
-    /// Throws ZkapError.rustError if the JSON contains an "error" field.
-    private static func unwrapResult(_ ptr: UnsafeMutablePointer<CChar>?) throws -> String {
-        guard let ptr = ptr else {
-            throw ZkapError.rustError("Rust FFI returned null pointer")
-        }
-        let json = String(cString: ptr)
+            let result = try prove(config: config, request: request)
 
-        // Check for error response: {"error": "..."}
-        if let data = json.data(using: .utf8),
-           let obj = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
-           let errMsg = obj["error"] as? String {
-            throw ZkapError.rustError(errMsg)
+            let output: [String: Any] = [
+                "proofs": result.proofs,
+                "shared_inputs": result.sharedInputs,
+                "partial_rhs_list": result.partialRhsList,
+                "jwt_exp_list": result.jwtExpList
+            ]
+            let outData = try JSONSerialization.data(withJSONObject: output)
+            return String(data: outData, encoding: .utf8)!
         }
 
-        return json
     }
 }
 
 // ──────────────────────────────────────────────────────────────────
-// Error types
+// Helpers
 // ──────────────────────────────────────────────────────────────────
 
-enum ZkapError: Error, CustomStringConvertible {
-    case invalidInput(String)
-    case rustError(String)
-
-    var description: String {
-        switch self {
-        case .invalidInput(let msg): return "[zkap] Invalid input: \(msg)"
-        case .rustError(let msg): return "[zkap] Rust error: \(msg)"
-        }
-    }
+private func parseConfig(_ d: [String: Any]) -> ZkapCircuitConfig {
+    ZkapCircuitConfig(
+        maxJwtB64Len: UInt64(d["max_jwt_b64_len"] as! Int),
+        maxPayloadB64Len: UInt64(d["max_payload_b64_len"] as! Int),
+        maxAudLen: UInt64(d["max_aud_len"] as! Int),
+        maxExpLen: UInt64(d["max_exp_len"] as! Int),
+        maxIssLen: UInt64(d["max_iss_len"] as! Int),
+        maxNonceLen: UInt64(d["max_nonce_len"] as! Int),
+        maxSubLen: UInt64(d["max_sub_len"] as! Int),
+        n: UInt64(d["n"] as! Int),
+        k: UInt64(d["k"] as! Int),
+        treeHeight: UInt64(d["tree_height"] as! Int),
+        numAudienceLimit: UInt64(d["num_audience_limit"] as! Int),
+        claims: d["claims"] as! [String],
+        forbiddenString: d["forbidden_string"] as! String
+    )
 }
+

package/ios/ZkapZkp.xcframework/Info.plist

@@ -6,38 +6,38 @@
 	<array>
 		<dict>
 			<key>BinaryPath</key>
-			<string>libzkap_zkp_rn_sim.a</string>
+			<string>libzkap_uniffi_bindings.a</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
-			<string>libzkap_zkp_rn_sim.a</string>
+			<string>libzkap_uniffi_bindings.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
-			<string>libzkap_zkp_rn.a</string>
+			<string>libzkap_uniffi_bindings.a</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
-			<string>libzkap_zkp_rn.a</string>
+			<string>libzkap_uniffi_bindings.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>