@novastera-oss/nitro-metamask 0.7.2 → 0.7.5

package/README.md

@@ -57,7 +57,7 @@ No extra Android configuration is required for consumers of this package.
 - The package ships prebuilt `libecies.so` binaries per ABI under `android/src/main/jniLibs`.
 - Included ABIs: `arm64-v8a`, `armeabi-v7a`, `x86_64`, `x86`.
 - Consumers do **not** need Rust or Cargo installed.
-- Maintainers can rebuild ECIES from source with `-PNitroMetamask_buildEciesFromSource=true`.
+- ECIES: the **npm package always** ships all four prebuilt `libecies.so` under `android/src/main/jniLibs/{arm64-v8a,armeabi-v7a,x86_64,x86}/` (CI normalizes to that path before `npm publish`). Installs use **only** those prebuilts — no Rust. Bare git worktrees without that folder, or maintainers passing `-PNitroMetamask_buildEciesFromSource=true`, build from `rust/ecies-jni` only; Gradle never merges prebuilts and Rust output (avoids duplicate `libecies.so` / `mergeDebugJniLibFolders` failures).
 - CI verifies 16 KB ELF LOAD alignment for release native libraries before publish.
 
 For app developers, the expected upgrade path is:

package/android/build.gradle

@@ -18,6 +18,34 @@ def isNewArchitectureEnabled() {
   return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
 }
 
+/** True when the maintainer forces a Rust build even if prebuilts exist (CI). */
+ext.nitroMetamaskBuildEciesFromSource = {
+  return rootProject.hasProperty("NitroMetamask_buildEciesFromSource") &&
+    rootProject.getProperty("NitroMetamask_buildEciesFromSource").toString() == "true"
+}
+
+/** ABIs published in npm at android/src/main/jniLibs/<abi>/libecies.so (see scripts/ensure-npm-ecies-jni-layout.sh). */
+ext.nitroMetamaskEciesPrebuiltAbis = ["arm64-v8a", "armeabi-v7a", "x86_64", "x86"]
+
+/**
+ * True when all shipped prebuilts are present (typical npm install). Partial trees use Rust for missing ABIs
+ * only when the force flag is not set — we require the full set to match published tarball and avoid mixed jniLibs+Rust duplicate .so.
+ */
+ext.nitroMetamaskHasFullPrebuiltEciesJniLibs = {
+  def base = file("${projectDir}/src/main/jniLibs")
+  if (!base.isDirectory()) return false
+  return nitroMetamaskEciesPrebuiltAbis.every { abi -> new File(base, "${abi}/libecies.so").isFile() }
+}
+
+/**
+ * Use rust-ecies-jni (+ cargo) when: maintainer -P, OR full prebuilts missing (e.g. git without jniLibs).
+ * Published npm always includes full prebuilts at android/src/main/jniLibs — consumers never compile Rust.
+ */
+ext.nitroMetamaskUseEciesFromRustBuild = {
+  if (nitroMetamaskBuildEciesFromSource()) return true
+  return !nitroMetamaskHasFullPrebuiltEciesJniLibs()
+}
+
 // Nitro hybrid module: native bindings come from nitrogen/generated (NitroMetamask+autolinking.gradle + CMake).
 // Do not apply com.facebook.react / react { libraryName } here — that registers RN New-Arch Codegen (react_codegen_*)
 // and breaks consumers (CMake expects android/build/generated/source/codegen/jni/ which this package never ships).
@@ -117,9 +145,12 @@ android {
 
   sourceSets {
     main {
-      // Local/CI build: libecies.so built from rust/ecies-jni via cargoNdkBuildEcies
-      // npm consumers: libecies.so shipped as prebuilt in android/src/main/jniLibs
-      jniLibs.srcDirs += ["${buildDir}/intermediates/rust-ecies-jni", "src/main/jniLibs"]
+      // Never both trees: duplicate libecies.so breaks mergeDebugJniLibFolders (see README).
+      if (nitroMetamaskUseEciesFromRustBuild()) {
+        jniLibs.srcDirs += ["${buildDir}/intermediates/rust-ecies-jni"]
+      } else {
+        jniLibs.srcDirs += ["src/main/jniLibs"]
+      }
       aidl.srcDirs += ["src/main/aidl"]
     }
   }

package/android/cargo-ecies.gradle

@@ -6,7 +6,8 @@
 //
 // The built .so files land in:
 //   android/build/intermediates/rust-ecies-jni/<abi>/libecies.so
-// which is already on jniLibs.srcDirs in build.gradle.
+// When jniLibs use rust-ecies-jni: all four prebuilts missing under src/main/jniLibs (e.g. git dev), or
+// -PNitroMetamask_buildEciesFromSource=true. Published npm has android/src/main/jniLibs/<4 ABIs>/libecies.so only — no cargo.
 // ──────────────────────────────────────────────────────────────────────────────
 
 def eciesRustDir   = file("${projectDir}/../rust/ecies-jni")
@@ -47,10 +48,17 @@ def findBin = { String name ->
   return null
 }
 
+// Eager (configuration-time) — do not use `project` inside Task.onlyIf { } or Gradle 9+ configuration
+// cache fails: "invocation of 'project' references a Gradle script object from a Groovy closure at execution time".
+def cargoNdkBuildEciesShouldRun = project.nitroMetamaskUseEciesFromRustBuild() &&
+  eciesRustDir.isDirectory() &&
+  eciesCargoToml.isFile()
+
 tasks.register("cargoNdkBuildEcies", Exec) {
   group       = "build"
-  description = "Build libecies.so from Rust source (local: host ABI only, CI: all ABIs)"
-  onlyIf      { eciesRustDir.isDirectory() && eciesCargoToml.isFile() }
+  description = "Build libecies.so from Rust when jniLibs use rust-ecies-jni (see build.gradle)"
+  // Set `enabled` at configuration time (not `onlyIf { project... }`) for Gradle 9 configuration cache.
+  enabled     = cargoNdkBuildEciesShouldRun
   workingDir  eciesRustDir
   standardOutput System.out
   errorOutput    System.err
@@ -89,7 +97,9 @@ afterEvaluate {
     }
   }
 
-  tasks.matching { it.name.startsWith("preBuild") }.configureEach {
-    dependsOn("cargoNdkBuildEcies")
+  if (cargoNdkBuildEciesShouldRun) {
+    tasks.matching { it.name.startsWith("preBuild") }.configureEach {
+      dependsOn("cargoNdkBuildEcies")
+    }
   }
 }

package/android/src/main/cpp/cpp-adapter.cpp

@@ -1,6 +1,8 @@
+#include <fbjni/fbjni.h>
 #include <jni.h>
+
 #include "NitroMetamaskOnLoad.hpp"
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
-  return margelo::nitro::nitrometamask::initialize(vm);
+  return facebook::jni::initialize(vm, []() { margelo::nitro::nitrometamask::registerAllNatives(); });
 }

package/android/src/main/java/com/margelo/nitro/nitrometamask/NitroMetamaskPackage.kt

@@ -37,10 +37,9 @@ class NitroMetamaskPackage : BaseReactPackage() {
                     "NitroMetamaskPackage",
                     false, // canOverrideExistingModule
                     true, // needsEagerInit
-                    true, // hasConstants
                     false, // isCxxModule
-                    true // isTurboModule
-                )
+                    true, // isTurboModule
+                ),
             )
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@novastera-oss/nitro-metamask",
-  "version": "0.7.2",
+  "version": "0.7.5",
   "description": "Native mobile MetaMask wallet integration for React Native. Part of Novastera CRM/ERP platform ecosystem. Provides secure authentication and message signing for Web3 mobile applications.",
   "main": "./lib/commonjs/index.js",
   "module": "./lib/module/index.js",
@@ -47,7 +47,10 @@
     "android/CMakeLists.txt",
     "android/proguard-rules.pro",
     "android/src",
-    "android/src/main/jniLibs",
+    "android/src/main/jniLibs/arm64-v8a/libecies.so",
+    "android/src/main/jniLibs/armeabi-v7a/libecies.so",
+    "android/src/main/jniLibs/x86_64/libecies.so",
+    "android/src/main/jniLibs/x86/libecies.so",
     "android/src/main/java/io/metamask/**",
     "android/src/main/aidl/**",
     "ios/metamask-ios-sdk/**",