harmonize namespace + convert remaining Java code to Kotlin

madztheo · Jul 25, 2024 · 95364b5 · 95364b5
1 parent 4533586
commit 95364b5
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 35 deletions.
diff --git a/README.md b/README.md
@@ -55,7 +55,7 @@ circuit.setupSrs(srsPath)
 To generate a proof, you can call the `prove` method and pass in the inputs for the proof and the proof type. It will return a `Proof` object containing the proof with its public inputs and the verification key.
 
 ```kotlin
-import noir.Proof
+import com.noirandroid.lib.Proof
 import java.util.HashMap
 import android.util.Log
 

diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
@@ -58,7 +58,7 @@ afterEvaluate {
                 from(components["release"])
                 groupId = "com.github.madztheo"
                 artifactId = "noir_android"
-                version = "v0.30.0-8"
+                version = "v0.30.0-9"
             }
         }
     }
@@ -114,7 +114,7 @@ tasks.register<Copy>("copyRustLibs") {
     } else {
         // Download the .so file from the GitHub release
         download.run {
-            src("https://github.com/madztheo/noir_android/releases/download/v0.30.0-8/libnoir_java_arm64-v8a.so")
+            src("https://github.com/madztheo/noir_android/releases/download/v0.30.0-9/libnoir_java_arm64-v8a.so")
             dest("src/main/jniLibs/arm64-v8a/libnoir_java.so")
             overwrite(false)
         }

diff --git a/lib/src/main/java/com/noirandroid/lib/Circuit.kt b/lib/src/main/java/com/noirandroid/lib/Circuit.kt
@@ -1,8 +1,6 @@
 package com.noirandroid.lib
 
 import com.google.gson.Gson
-import noir.Noir
-import noir.Proof
 import android.util.Log
 
 data class CircuitManifest(

diff --git a/lib/src/main/java/com/noirandroid/lib/Noir.java b/lib/src/main/java/com/noirandroid/lib/Noir.java
diff --git a/lib/src/main/java/com/noirandroid/lib/Noir.kt b/lib/src/main/java/com/noirandroid/lib/Noir.kt
@@ -0,0 +1,11 @@
+package com.noirandroid.lib
+
+class Noir {
+    companion object {
+        external fun prove(circuitBytecode: String, initialWitness: Map<String, String>, proofType: String, numPoints: String): Proof
+
+        external fun verify(circuitBytecode: String, proof: Proof, proofType: String, numPoints: String): Boolean
+
+        external fun setup_srs(circuitBytecode: String, srsPath: String?): Int
+    }
+}
diff --git a/lib/src/main/java/com/noirandroid/lib/Proof.java b/lib/src/main/java/com/noirandroid/lib/Proof.java
diff --git a/lib/src/main/java/com/noirandroid/lib/Proof.kt b/lib/src/main/java/com/noirandroid/lib/Proof.kt
@@ -0,0 +1,3 @@
+package com.noirandroid.lib
+
+class Proof(val proof: String, val vk: String)
diff --git a/lib/src/main/java/noir_java/src/lib.rs b/lib/src/main/java/noir_java/src/lib.rs
@@ -14,7 +14,7 @@ use noir_rs::{
 };
 
 #[no_mangle]
-pub extern "system" fn Java_noir_Noir_setup_1srs<'local>(
+pub extern "system" fn Java_com_noirandroid_lib_Noir_00024Companion_setup_1srs<'local>(
     mut env: JNIEnv<'local>,
     _class: JClass<'local>,
     circuit_bytecode_jstr: JString<'local>,
@@ -45,7 +45,7 @@ pub extern "system" fn Java_noir_Noir_setup_1srs<'local>(
 
 
 #[no_mangle]
-pub extern "system" fn Java_noir_Noir_prove<'local>(
+pub extern "system" fn Java_com_noirandroid_lib_Noir_00024Companion_prove<'local>(
     mut env: JNIEnv<'local>,
     _class: JClass<'local>,
     circuit_bytecode_jstr: JString<'local>,
@@ -125,7 +125,7 @@ pub extern "system" fn Java_noir_Noir_prove<'local>(
         .expect("Failed to create Java string for vk");
 
     let proof_class = env
-        .find_class("noir/Proof")
+        .find_class("com/noirandroid/lib/Proof")
         .expect("Failed to find Proof class");
     env.new_object(
         proof_class,
@@ -137,7 +137,7 @@ pub extern "system" fn Java_noir_Noir_prove<'local>(
 }
 
 #[no_mangle]
-pub extern "system" fn Java_noir_Noir_verify<'local>(
+pub extern "system" fn Java_com_noirandroid_lib_Noir_00024Companion_verify<'local>(
     mut env: JNIEnv<'local>,
     _class: JClass<'local>,
     circuit_bytecode_jstr: JString<'local>,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		package com.noirandroid.lib

		class Proof(val proof: String, val vk: String)