<feat>(jni): impl transaction builder v2 in jni. (#192)

FISCO-BCOS · Nov 30, 2023 · c943e81 · c943e81
1 parent 9377614
commit c943e81
Show file tree

Hide file tree

Showing 18 changed files with 1,055 additions and 205 deletions.
diff --git a/bindings/java/jni/build.gradle b/bindings/java/jni/build.gradle
@@ -31,7 +31,7 @@ dependencies {
 
 archivesBaseName = 'bcos-sdk-jni'
 group = 'org.fisco-bcos'
-version = '3.5.1-SNAPSHOT'
+version = '3.6.0-SNAPSHOT'
 
 // Additional attribute definition
 ext {

diff --git a/bindings/java/jni/scripts/java2jni.sh b/bindings/java/jni/scripts/java2jni.sh
@@ -30,7 +30,7 @@ function convert_java_to_jni() {
 # convert_java_to_jni ${JAVA_SOURCE_PATH}
 
 # classes="rpc.RpcJniObj amop.AmopJniObj event.EventSubJniObj BcosSDKJniObj"
-classes="utilities.keypair.KeyPairJniObj utilities.tx.TransactionBuilderJniObj utilities.receipt.ReceiptBuilderJniObj utilities.signature.SignatureJniObj"
+classes="BcosSDKJniObj utilities.keypair.KeyPairJniObj utilities.tx.TransactionBuilderJniObj utilities.tx.TransactionBuilderV2JniObj utilities.tx.TransactionStructBuilderJniObj utilities.receipt.ReceiptBuilderJniObj utilities.signature.SignatureJniObj"
 
 for class in ${classes}
 do

diff --git a/bindings/java/jni/src/main/c/jni/org_fisco_bcos_sdk_common.h b/bindings/java/jni/src/main/c/jni/org_fisco_bcos_sdk_common.h
@@ -9,6 +9,11 @@
 extern "C" {
 #endif
 
+#define GET_J_STRING_CONTENT(env, jstr) \
+    (env)->GetStringUTFChars((jstr), NULL)
+#define GET_J_STRING_CONTENT_DEF(env, jstr, def) \
+    ((jstr) == NULL ? (def) : GET_J_STRING_CONTENT((env), (jstr)))
+
 struct cb_context
 {
     JavaVM* jvm;

diff --git a/bindings/java/jni/src/main/c/jni/org_fisco_bcos_sdk_jni_BcosSDKJniObj.cpp b/bindings/java/jni/src/main/c/jni/org_fisco_bcos_sdk_jni_BcosSDKJniObj.cpp
@@ -128,6 +128,33 @@ static void on_receive_block_notifier(const char* group, int64_t block_number, v
     // env->DeleteGlobalRef(jcallback);
 }
 
+
+/*
+ * Class:     org_fisco_bcos_sdk_jni_BcosSDKJniObj
+ * Method:    localProtocolInfo
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_fisco_bcos_sdk_jni_BcosSDKJniObj_localProtocolInfo(
+    JNIEnv* env, jobject self)
+{
+    void* sdk = bcos_sdk_get_native_pointer(env, self);
+    uint32_t info = bcos_sdk_get_local_protocol_info(sdk);
+    return (jint)info;
+}
+
+/*
+ * Class:     org_fisco_bcos_sdk_jni_BcosSDKJniObj
+ * Method:    negotiatedProtocolInfo
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_fisco_bcos_sdk_jni_BcosSDKJniObj_negotiatedProtocolInfo(
+    JNIEnv* env, jobject self)
+{
+    void* sdk = bcos_sdk_get_native_pointer(env, self);
+    uint32_t info = bcos_sdk_get_negotiated_protocol_info(sdk);
+    return (jint)info;
+}
+
 /*
  * Class:     org_fisco_bcos_sdk_jni_BcosSDKJniObj
  * Method:    registerBlockNotifier

diff --git a/bindings/java/jni/src/main/c/jni/org_fisco_bcos_sdk_jni_BcosSDKJniObj.h b/bindings/java/jni/src/main/c/jni/org_fisco_bcos_sdk_jni_BcosSDKJniObj.h
diff --git a/...s/java/jni/src/main/c/jni/org_fisco_bcos_sdk_jni_utilities_receipt_ReceiptBuilderJniObj.h b/...s/java/jni/src/main/c/jni/org_fisco_bcos_sdk_jni_utilities_receipt_ReceiptBuilderJniObj.h
diff --git a/...ings/java/jni/src/main/c/jni/org_fisco_bcos_sdk_jni_utilities_signature_SignatureJniObj.h b/...ings/java/jni/src/main/c/jni/org_fisco_bcos_sdk_jni_utilities_signature_SignatureJniObj.h