react-native-nitro-ark 0.0.77-rc.6 → 0.0.77-rc.7

package/android/src/main/cpp/NitroArkJni.cpp

@@ -32,6 +32,7 @@ void ThrowJavaException(JNIEnv* env, const char* message) {
   jclass exClass = env->FindClass("java/lang/RuntimeException");
   if (exClass != nullptr) {
     env->ThrowNew(exClass, message);
+    env->DeleteLocalRef(exClass);
   }
   __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, "Throwing Java exception: %s", message);
 }
@@ -88,18 +89,30 @@ jobject MakeArrayList(JNIEnv* env, const std::vector<std::string>& elements) {
     return nullptr;
   jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
   jmethodID arrayListAdd = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-  if (arrayListCtor == nullptr || arrayListAdd == nullptr)
+  if (arrayListCtor == nullptr || arrayListAdd == nullptr) {
+    env->DeleteLocalRef(arrayListClass);
     return nullptr;
+  }
 
   jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-  if (arrayListObj == nullptr)
+  if (arrayListObj == nullptr) {
+    env->DeleteLocalRef(arrayListClass);
     return nullptr;
+  }
 
   for (const auto& element : elements) {
     jstring jStr = env->NewStringUTF(element.c_str());
-    if (jStr != nullptr) {
-      env->CallBooleanMethod(arrayListObj, arrayListAdd, jStr);
-      env->DeleteLocalRef(jStr);
+    if (jStr == nullptr) {
+      env->DeleteLocalRef(arrayListObj);
+      env->DeleteLocalRef(arrayListClass);
+      return nullptr;
+    }
+    env->CallBooleanMethod(arrayListObj, arrayListAdd, jStr);
+    env->DeleteLocalRef(jStr);
+    if (env->ExceptionCheck()) {
+      env->DeleteLocalRef(arrayListObj);
+      env->DeleteLocalRef(arrayListClass);
+      return nullptr;
     }
   }
   env->DeleteLocalRef(arrayListClass);
@@ -112,8 +125,10 @@ jobject MakeRoundStatusResult(JNIEnv* env, const bark_cxx::RoundStatus& status)
     return nullptr;
   jmethodID ctor =
       env->GetMethodID(cls, "<init>", "(Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;ZZ)V");
-  if (ctor == nullptr)
+  if (ctor == nullptr) {
+    env->DeleteLocalRef(cls);
     return nullptr;
+  }
 
   std::string statusStr(status.status.data(), status.status.length());
   std::string fundingTxid(status.funding_txid.data(), status.funding_txid.length());
@@ -128,14 +143,43 @@ jobject MakeRoundStatusResult(JNIEnv* env, const bark_cxx::RoundStatus& status)
   jobject txidList = MakeArrayList(env, txids);
 
   jstring jStatus = env->NewStringUTF(statusStr.c_str());
-  jstring jFundingTxid = fundingTxid.empty() ? nullptr : env->NewStringUTF(fundingTxid.c_str());
-  jstring jError = error.empty() ? nullptr : env->NewStringUTF(error.c_str());
+  if (jStatus == nullptr) {
+    if (txidList)
+      env->DeleteLocalRef(txidList);
+    env->DeleteLocalRef(cls);
+    return nullptr;
+  }
+
+  jstring jFundingTxid = nullptr;
+  if (!fundingTxid.empty()) {
+    jFundingTxid = env->NewStringUTF(fundingTxid.c_str());
+    if (jFundingTxid == nullptr) {
+      env->DeleteLocalRef(jStatus);
+      if (txidList)
+        env->DeleteLocalRef(txidList);
+      env->DeleteLocalRef(cls);
+      return nullptr;
+    }
+  }
+
+  jstring jError = nullptr;
+  if (!error.empty()) {
+    jError = env->NewStringUTF(error.c_str());
+    if (jError == nullptr) {
+      env->DeleteLocalRef(jStatus);
+      if (jFundingTxid)
+        env->DeleteLocalRef(jFundingTxid);
+      if (txidList)
+        env->DeleteLocalRef(txidList);
+      env->DeleteLocalRef(cls);
+      return nullptr;
+    }
+  }
 
   jobject result =
       env->NewObject(cls, ctor, jStatus, jFundingTxid, txidList, jError, status.is_final, status.is_success);
 
-  if (jStatus)
-    env->DeleteLocalRef(jStatus);
+  env->DeleteLocalRef(jStatus);
   if (jFundingTxid)
     env->DeleteLocalRef(jFundingTxid);
   if (jError)
@@ -151,21 +195,31 @@ jobject MakeKeyPairResult(JNIEnv* env, const bark_cxx::KeyPairResult& keypair) {
   if (cls == nullptr)
     return nullptr;
   jmethodID ctor = env->GetMethodID(cls, "<init>", "(Ljava/lang/String;Ljava/lang/String;)V");
-  if (ctor == nullptr)
+  if (ctor == nullptr) {
+    env->DeleteLocalRef(cls);
     return nullptr;
+  }
 
   std::string pub(keypair.public_key.data(), keypair.public_key.length());
   std::string sec(keypair.secret_key.data(), keypair.secret_key.length());
 
   jstring jPub = env->NewStringUTF(pub.c_str());
+  if (jPub == nullptr) {
+    env->DeleteLocalRef(cls);
+    return nullptr;
+  }
+
   jstring jSec = env->NewStringUTF(sec.c_str());
+  if (jSec == nullptr) {
+    env->DeleteLocalRef(jPub);
+    env->DeleteLocalRef(cls);
+    return nullptr;
+  }
 
   jobject result = env->NewObject(cls, ctor, jPub, jSec);
 
-  if (jPub)
-    env->DeleteLocalRef(jPub);
-  if (jSec)
-    env->DeleteLocalRef(jSec);
+  env->DeleteLocalRef(jPub);
+  env->DeleteLocalRef(jSec);
   env->DeleteLocalRef(cls);
   return result;
 }
@@ -175,25 +229,41 @@ jobject MakeBolt11Invoice(JNIEnv* env, const bark_cxx::Bolt11Invoice& invoice) {
   if (cls == nullptr)
     return nullptr;
   jmethodID ctor = env->GetMethodID(cls, "<init>", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
-  if (ctor == nullptr)
+  if (ctor == nullptr) {
+    env->DeleteLocalRef(cls);
     return nullptr;
+  }
 
   std::string bolt11(invoice.bolt11_invoice.data(), invoice.bolt11_invoice.length());
   std::string paymentSecret(invoice.payment_secret.data(), invoice.payment_secret.length());
   std::string paymentHash(invoice.payment_hash.data(), invoice.payment_hash.length());
 
   jstring jBolt11 = env->NewStringUTF(bolt11.c_str());
+  if (jBolt11 == nullptr) {
+    env->DeleteLocalRef(cls);
+    return nullptr;
+  }
+
   jstring jSecret = env->NewStringUTF(paymentSecret.c_str());
+  if (jSecret == nullptr) {
+    env->DeleteLocalRef(jBolt11);
+    env->DeleteLocalRef(cls);
+    return nullptr;
+  }
+
   jstring jHash = env->NewStringUTF(paymentHash.c_str());
+  if (jHash == nullptr) {
+    env->DeleteLocalRef(jBolt11);
+    env->DeleteLocalRef(jSecret);
+    env->DeleteLocalRef(cls);
+    return nullptr;
+  }
 
   jobject result = env->NewObject(cls, ctor, jBolt11, jSecret, jHash);
 
-  if (jBolt11)
-    env->DeleteLocalRef(jBolt11);
-  if (jSecret)
-    env->DeleteLocalRef(jSecret);
-  if (jHash)
-    env->DeleteLocalRef(jHash);
+  env->DeleteLocalRef(jBolt11);
+  env->DeleteLocalRef(jSecret);
+  env->DeleteLocalRef(jHash);
   env->DeleteLocalRef(cls);
   return result;
 }
@@ -242,7 +312,7 @@ JNIEXPORT void JNICALL Java_com_margelo_nitro_nitroark_NitroArkNative_loadWallet
     opts.mnemonic = mnemonic;
 
     auto birthday_height = GetOptionalInt(env, jBirthdayHeight);
-    thread_local uint32_t birthday_height_val = 0;
+    uint32_t birthday_height_val = 0;
     if (birthday_height.has_value()) {
       birthday_height_val = static_cast<uint32_t>(birthday_height.value());
       opts.birthday_height = &birthday_height_val;
@@ -268,13 +338,13 @@ JNIEXPORT void JNICALL Java_com_margelo_nitro_nitroark_NitroArkNative_loadWallet
 
     opts.config = config;
 
+    std::string birthday_height_str = opts.birthday_height != nullptr ? std::to_string(*opts.birthday_height) : "null";
     __android_log_print(ANDROID_LOG_INFO, LOG_TAG,
                         "load_wallet(native) datadir=%s regtest=%s signet=%s bitcoin=%s birthday_height=%s ark=%s "
                         "esplora=%s bitcoind=%s",
                         datadir.c_str(), opts.regtest ? "true" : "false", opts.signet ? "true" : "false",
-                        opts.bitcoin ? "true" : "false",
-                        opts.birthday_height != nullptr ? std::to_string(*opts.birthday_height).c_str() : "null",
-                        config.ark.c_str(), config.esplora.c_str(), config.bitcoind.c_str());
+                        opts.bitcoin ? "true" : "false", birthday_height_str.c_str(), config.ark.c_str(),
+                        config.esplora.c_str(), config.bitcoind.c_str());
 
     bark_cxx::load_wallet(datadir, opts);
     __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "load_wallet(native) success");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nitro-ark",
-  "version": "0.0.77-rc.6",
+  "version": "0.0.77-rc.7",
   "description": "Pure C++ Nitro Modules for Ark client",
   "source": "./src/index.tsx",
   "main": "./lib/module/index.js",