@novastera-oss/nitro-metamask 0.5.6 → 0.6.2

package/README.md

@@ -54,7 +54,10 @@ Add this inside your `MainActivity` `<activity>` tag:
 No extra Android configuration is required for consumers of this package.
 
 - `@novastera-oss/nitro-metamask` excludes the legacy `io.metamask.ecies:ecies` native library from transitive dependencies.
-- The package builds and ships its own `libecies.so` from `rust/ecies-jni` with linker flag `-Wl,-z,max-page-size=16384`.
+- 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`.
 - CI verifies 16 KB ELF LOAD alignment for release native libraries before publish.
 
 For app developers, the expected upgrade path is:

package/android/cargo-ecies.gradle

@@ -1,17 +1,67 @@
 def eciesRustDir = file("${projectDir}/../rust/ecies-jni")
 def eciesCargoToml = file("${projectDir}/../rust/ecies-jni/Cargo.toml")
 def eciesJniOut = file("${buildDir}/intermediates/rust-ecies-jni")
+def eciesPrebuiltDir = file("${projectDir}/src/main/jniLibs")
+def buildEciesFromSource = (project.findProperty("NitroMetamask_buildEciesFromSource") ?: "false").toString().toBoolean()
 
 def reactNativeArchitectures() {
   def value = rootProject.getProperties().get("reactNativeArchitectures")
   return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
 }
 
+def hasCargoExecutable = { ->
+  def path = System.getenv("PATH") ?: ""
+  if (path.isEmpty()) {
+    return false
+  }
+
+  def names = ["cargo"]
+  def isWindows = (System.getProperty("os.name") ?: "").toLowerCase().contains("win")
+  if (isWindows) {
+    names = ["cargo.exe", "cargo.bat", "cargo.cmd"]
+  }
+
+  for (dirPath in path.split(java.io.File.pathSeparator)) {
+    for (name in names) {
+      def candidate = new File(dirPath, name)
+      if (candidate.isFile() && candidate.canExecute()) {
+        return true
+      }
+    }
+  }
+
+  return false
+}
+
+tasks.register("verifyPrebuiltEciesLibs") {
+  group = "verification"
+  description = "Verify prebuilt libecies.so exists for all configured ABIs"
+
+  doLast {
+    def missing = []
+    reactNativeArchitectures().each { abi ->
+      def soFile = file("${eciesPrebuiltDir}/${abi}/libecies.so")
+      if (!soFile.isFile()) {
+        missing.add("${abi}/libecies.so")
+      }
+    }
+
+    if (!missing.isEmpty()) {
+      throw new GradleException(
+        "Missing prebuilt ECIES native libraries under android/src/main/jniLibs: ${missing.join(', ')}. " +
+        "Consumers should use prebuilt libs (no Cargo required). " +
+        "Maintainers can regenerate with -PNitroMetamask_buildEciesFromSource=true."
+      )
+    }
+  }
+}
+
 tasks.register("cargoNdkBuildEcies", Exec) {
   group = "build"
-  description = "Build libecies.so via Rust (cargo-ndk), 16 KB max page size"
+  description = "Build libecies.so via Rust (maintainer-only)"
+  enabled = buildEciesFromSource
   onlyIf {
-    eciesRustDir.isDirectory() && eciesCargoToml.isFile()
+    buildEciesFromSource && eciesRustDir.isDirectory() && eciesCargoToml.isFile()
   }
   workingDir eciesRustDir
   standardOutput System.out
@@ -28,9 +78,15 @@ afterEvaluate {
   def ndkVer = project.android.ndkVersion
   def abis = reactNativeArchitectures()
   def outPath = eciesJniOut.absolutePath
-
   tasks.named("cargoNdkBuildEcies", Exec).configure {
     doFirst {
+      if (!hasCargoExecutable()) {
+        throw new GradleException(
+          "Cargo is not available. This build mode is maintainer-only. " +
+          "Run without -PNitroMetamask_buildEciesFromSource to use bundled prebuilt libraries."
+        )
+      }
+
       eciesJniOut.mkdirs()
       if (!ndkDir.exists()) {
         throw new GradleException("ANDROID NDK not found; ndkVersion is ${ndkVer}")
@@ -49,6 +105,10 @@ afterEvaluate {
   }
 
   tasks.matching { it.name.startsWith("preBuild") }.configureEach {
-    dependsOn("cargoNdkBuildEcies")
+    if (buildEciesFromSource) {
+      dependsOn("cargoNdkBuildEcies")
+    } else {
+      dependsOn("verifyPrebuiltEciesLibs")
+    }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@novastera-oss/nitro-metamask",
-  "version": "0.5.6",
+  "version": "0.6.2",
   "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",
@@ -12,7 +12,8 @@
     "clean": "git clean -dfX",
     "release": "semantic-release",
     "build": "npm run typecheck && bob build",
-    "codegen": "nitrogen --logLevel=\"debug\" && npm run build"
+    "codegen": "nitrogen --logLevel=\"debug\" && npm run build",
+    "build:ecies:all-abis": "cd example/android && ./gradlew :app:assembleRelease -PreactNativeArchitectures=arm64-v8a,armeabi-v7a,x86_64,x86 -PNitroMetamask_buildEciesFromSource=true --no-daemon --stacktrace"
   },
   "keywords": [
     "react-native",
@@ -47,6 +48,7 @@
     "android/CMakeLists.txt",
     "android/proguard-rules.pro",
     "android/src",
+    "android/src/main/jniLibs",
     "ios/**/*.h",
     "ios/**/*.m",
     "ios/**/*.mm",