@novastera-oss/nitro-metamask 0.5.6 → 0.6.3

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,72 @@
 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 configuredAbis = ((rootProject.getProperties().get("reactNativeArchitectures"))?.split(",")
+  ?: ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]) as List<String>
+
+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
+}
+
+def hasPrebuiltEciesForConfiguredAbis = { ->
+  def missing = []
+  configuredAbis.each { abi ->
+    def soFile = new File(eciesPrebuiltDir, "${abi}/libecies.so")
+    if (!soFile.isFile()) {
+      missing.add("${abi}/libecies.so")
+    }
+  }
+  return [available: missing.isEmpty(), missing: missing]
+}
+
+tasks.register("verifyPrebuiltEciesLibs") {
+  group = "verification"
+  description = "Verify prebuilt libecies.so exists for all configured ABIs"
+
+  doLast {
+    def result = hasPrebuiltEciesForConfiguredAbis()
+    def missing = result.missing
+
+    if (!missing.isEmpty()) {
+      throw new GradleException(
+        "Missing prebuilt ECIES native libraries under android/src/main/jniLibs: ${missing.join(', ')}. " +
+        "If this is a source checkout, install Rust + cargo-ndk and build 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)"
   onlyIf {
-    eciesRustDir.isDirectory() && eciesCargoToml.isFile()
+    def prebuiltStatus = hasPrebuiltEciesForConfiguredAbis()
+    (buildEciesFromSource || !prebuiltStatus.available) &&
+      eciesRustDir.isDirectory() && eciesCargoToml.isFile()
   }
   workingDir eciesRustDir
   standardOutput System.out
@@ -26,11 +81,17 @@ afterEvaluate {
   def ndkDir = (ndkProp instanceof File) ? ndkProp : ndkProp.get().asFile
   def ndkPath = ndkDir.absolutePath
   def ndkVer = project.android.ndkVersion
-  def abis = reactNativeArchitectures()
+  def abis = configuredAbis
   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}")
@@ -48,7 +109,15 @@ afterEvaluate {
     }
   }
 
+  def prebuiltStatus = hasPrebuiltEciesForConfiguredAbis()
+  def canBuildFromSource = hasCargoExecutable() && eciesRustDir.isDirectory() && eciesCargoToml.isFile()
+  def shouldBuildFromSource = buildEciesFromSource || (!prebuiltStatus.available && canBuildFromSource)
+
   tasks.matching { it.name.startsWith("preBuild") }.configureEach {
-    dependsOn("cargoNdkBuildEcies")
+    if (shouldBuildFromSource) {
+      dependsOn("cargoNdkBuildEcies")
+    } else {
+      dependsOn("verifyPrebuiltEciesLibs")
+    }
   }
 }

package/lib/typescript/src/specs/nitro-metamask.nitro.d.ts

@@ -1,12 +1,12 @@
-import { type HybridObject } from 'react-native-nitro-modules';
+import { type HybridObject, type Int64 } from 'react-native-nitro-modules';
 export interface ConnectResult {
     address: string;
-    chainId: bigint;
+    chainId: Int64;
 }
 export interface ConnectSignResult {
     signature: string;
     address: string;
-    chainId: bigint;
+    chainId: Int64;
 }
 export interface NitroMetamask extends HybridObject<{
     ios: 'swift';
@@ -33,7 +33,7 @@ export interface NitroMetamask extends HybridObject<{
      * @param exp - Expiration timestamp (as bigint)
      * @returns Promise resolving to ConnectSignResult containing signature, address, and chainId
      */
-    connectSign(nonce: string, exp: bigint): Promise<ConnectSignResult>;
+    connectSign(nonce: string, exp: Int64): Promise<ConnectSignResult>;
     /**
      * Get the currently connected wallet address.
      * Returns null if not connected.
@@ -43,6 +43,6 @@ export interface NitroMetamask extends HybridObject<{
      * Get the current chain ID.
      * Returns null if not connected.
      */
-    getChainId(): Promise<bigint | null>;
+    getChainId(): Promise<Int64 | null>;
 }
 //# sourceMappingURL=nitro-metamask.nitro.d.ts.map

package/lib/typescript/src/specs/nitro-metamask.nitro.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nitro-metamask.nitro.d.ts","sourceRoot":"","sources":["../../../../src/specs/nitro-metamask.nitro.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAE9D,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,aAAc,SAAQ,YAAY,CAAC;IAAE,GAAG,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,QAAQ,CAAA;CAAE,CAAC;IACtF;;;;;;;;;OASG;IACH,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1D,OAAO,IAAI,OAAO,CAAC,aAAa,CAAC,CAAA;IACjC,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAC7C;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;IACnE;;;OAGG;IACH,UAAU,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAA;IACpC;;;OAGG;IACH,UAAU,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAA;CACrC"}
+{"version":3,"file":"nitro-metamask.nitro.d.ts","sourceRoot":"","sources":["../../../../src/specs/nitro-metamask.nitro.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAE1E,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,KAAK,CAAA;CACf;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,KAAK,CAAA;CACf;AAED,MAAM,WAAW,aAAc,SAAQ,YAAY,CAAC;IAAE,GAAG,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,QAAQ,CAAA;CAAE,CAAC;IACtF;;;;;;;;;OASG;IACH,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1D,OAAO,IAAI,OAAO,CAAC,aAAa,CAAC,CAAA;IACjC,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAC7C;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;IAClE;;;OAGG;IACH,UAAU,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAA;IACpC;;;OAGG;IACH,UAAU,IAAI,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,CAAA;CACpC"}

package/nitro.json

@@ -14,8 +14,14 @@
   },
   "autolinking": {
     "NitroMetamask": {
-      "swift": "HybridNitroMetamask",
-      "kotlin": "HybridNitroMetamask"
+      "ios": {
+        "language": "swift",
+        "implementationClassName": "HybridNitroMetamask"
+      },
+      "android": {
+        "language": "kotlin",
+        "implementationClassName": "HybridNitroMetamask"
+      }
     }
   },
   "ignorePaths": [

package/nitrogen/generated/android/NitroMetamask+autolinking.cmake

@@ -2,7 +2,7 @@
 # NitroMetamask+autolinking.cmake
 # This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 # https://github.com/mrousavy/nitro
-# Copyright © 2026 Marc Rousavy @ Margelo
+# Copyright © Marc Rousavy @ Margelo
 #
 
 # This is a CMake file that adds all files generated by Nitrogen

package/nitrogen/generated/android/NitroMetamask+autolinking.gradle

@@ -2,7 +2,7 @@
 /// NitroMetamask+autolinking.gradle
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 /// This is a Gradle file that adds all files generated by Nitrogen

package/nitrogen/generated/android/NitroMetamaskOnLoad.cpp

@@ -2,7 +2,7 @@
 /// NitroMetamaskOnLoad.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #ifndef BUILDING_NITROMETAMASK_WITH_GENERATED_CMAKE_PROJECT
@@ -21,24 +21,34 @@
 namespace margelo::nitro::nitrometamask {
 
 int initialize(JavaVM* vm) {
+  return facebook::jni::initialize(vm, []() {
+    ::margelo::nitro::nitrometamask::registerAllNatives();
+  });
+}
+
+struct JHybridNitroMetamaskSpecImpl: public jni::JavaClass<JHybridNitroMetamaskSpecImpl, JHybridNitroMetamaskSpec::JavaPart> {
+  static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitrometamask/HybridNitroMetamask;";
+  static std::shared_ptr<JHybridNitroMetamaskSpec> create() {
+    static const auto constructorFn = javaClassStatic()->getConstructor<JHybridNitroMetamaskSpecImpl::javaobject()>();
+    jni::local_ref<JHybridNitroMetamaskSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridNitroMetamaskSpec();
+  }
+};
+
+void registerAllNatives() {
   using namespace margelo::nitro;
   using namespace margelo::nitro::nitrometamask;
-  using namespace facebook;
-
-  return facebook::jni::initialize(vm, [] {
-    // Register native JNI methods
-    margelo::nitro::nitrometamask::JHybridNitroMetamaskSpec::registerNatives();
-
-    // Register Nitro Hybrid Objects
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "NitroMetamask",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridNitroMetamaskSpec::javaobject> object("com/margelo/nitro/nitrometamask/HybridNitroMetamask");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-  });
+
+  // Register native JNI methods
+  margelo::nitro::nitrometamask::JHybridNitroMetamaskSpec::CxxPart::registerNatives();
+
+  // Register Nitro Hybrid Objects
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "NitroMetamask",
+    []() -> std::shared_ptr<HybridObject> {
+      return JHybridNitroMetamaskSpecImpl::create();
+    }
+  );
 }
 
 } // namespace margelo::nitro::nitrometamask

package/nitrogen/generated/android/NitroMetamaskOnLoad.hpp

@@ -2,24 +2,33 @@
 /// NitroMetamaskOnLoad.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include <jni.h>
+#include <functional>
 #include <NitroModules/NitroDefines.hpp>
 
 namespace margelo::nitro::nitrometamask {
 
+  [[deprecated("Use registerNatives() instead.")]]
+  int initialize(JavaVM* vm);
+
   /**
-   * Initializes the native (C++) part of NitroMetamask, and autolinks all Hybrid Objects.
-   * Call this in your `JNI_OnLoad` function (probably inside `cpp-adapter.cpp`).
+   * Register the native (C++) part of NitroMetamask, and autolinks all Hybrid Objects.
+   * Call this in your `JNI_OnLoad` function (probably inside `cpp-adapter.cpp`),
+   * inside a `facebook::jni::initialize(vm, ...)` call.
    * Example:
    * ```cpp (cpp-adapter.cpp)
    * JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
-   *   return margelo::nitro::nitrometamask::initialize(vm);
+   *   return facebook::jni::initialize(vm, []() {
+   *     // register all NitroMetamask HybridObjects
+   *     margelo::nitro::nitrometamask::registerNatives();
+   *     // any other custom registrations go here.
+   *   });
    * }
    * ```
    */
-  int initialize(JavaVM* vm);
+  void registerAllNatives();
 
 } // namespace margelo::nitro::nitrometamask

package/nitrogen/generated/android/c++/JConnectResult.hpp

@@ -2,7 +2,7 @@
 /// JConnectResult.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -21,7 +21,7 @@ namespace margelo::nitro::nitrometamask {
    */
   struct JConnectResult final: public jni::JavaClass<JConnectResult> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitrometamask/ConnectResult;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitrometamask/ConnectResult;";
 
   public:
     /**

package/nitrogen/generated/android/c++/JConnectSignResult.hpp

@@ -2,7 +2,7 @@
 /// JConnectSignResult.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -21,7 +21,7 @@ namespace margelo::nitro::nitrometamask {
    */
   struct JConnectSignResult final: public jni::JavaClass<JConnectSignResult> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitrometamask/ConnectSignResult;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitrometamask/ConnectSignResult;";
 
   public:
     /**

package/nitrogen/generated/android/c++/JHybridNitroMetamaskSpec.cpp

@@ -2,7 +2,7 @@
 /// JHybridNitroMetamaskSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JHybridNitroMetamaskSpec.hpp"
@@ -28,30 +28,31 @@ namespace margelo::nitro::nitrometamask { struct ConnectSignResult; }
 
 namespace margelo::nitro::nitrometamask {
 
-  jni::local_ref<JHybridNitroMetamaskSpec::jhybriddata> JHybridNitroMetamaskSpec::initHybrid(jni::alias_ref<jhybridobject> jThis) {
-    return makeCxxInstance(jThis);
-  }
-
-  void JHybridNitroMetamaskSpec::registerNatives() {
-    registerHybrid({
-      makeNativeMethod("initHybrid", JHybridNitroMetamaskSpec::initHybrid),
-    });
+  std::shared_ptr<JHybridNitroMetamaskSpec> JHybridNitroMetamaskSpec::JavaPart::getJHybridNitroMetamaskSpec() {
+    auto hybridObject = JHybridObject::JavaPart::getJHybridObject();
+    auto castHybridObject = std::dynamic_pointer_cast<JHybridNitroMetamaskSpec>(hybridObject);
+    if (castHybridObject == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to downcast JHybridObject to JHybridNitroMetamaskSpec!");
+    }
+    return castHybridObject;
   }
 
-  size_t JHybridNitroMetamaskSpec::getExternalMemorySize() noexcept {
-    static const auto method = javaClassStatic()->getMethod<jlong()>("getMemorySize");
-    return method(_javaPart);
+  jni::local_ref<JHybridNitroMetamaskSpec::CxxPart::jhybriddata> JHybridNitroMetamaskSpec::CxxPart::initHybrid(jni::alias_ref<jhybridobject> jThis) {
+    return makeCxxInstance(jThis);
   }
 
-  void JHybridNitroMetamaskSpec::dispose() noexcept {
-    static const auto method = javaClassStatic()->getMethod<void()>("dispose");
-    method(_javaPart);
+  std::shared_ptr<JHybridObject> JHybridNitroMetamaskSpec::CxxPart::createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) {
+    auto castJavaPart = jni::dynamic_ref_cast<JHybridNitroMetamaskSpec::JavaPart>(javaPart);
+    if (castJavaPart == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to cast JHybridObject::JavaPart to JHybridNitroMetamaskSpec::JavaPart!");
+    }
+    return std::make_shared<JHybridNitroMetamaskSpec>(castJavaPart);
   }
 
-  std::string JHybridNitroMetamaskSpec::toString() {
-    static const auto method = javaClassStatic()->getMethod<jni::JString()>("toString");
-    auto javaString = method(_javaPart);
-    return javaString->toStdString();
+  void JHybridNitroMetamaskSpec::CxxPart::registerNatives() {
+    registerHybrid({
+      makeNativeMethod("initHybrid", JHybridNitroMetamaskSpec::CxxPart::initHybrid),
+    });
   }
 
   // Properties
@@ -59,11 +60,11 @@ namespace margelo::nitro::nitrometamask {
 
   // Methods
   void JHybridNitroMetamaskSpec::configure(const std::optional<std::string>& dappUrl, const std::optional<std::string>& deepLinkScheme) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* dappUrl */, jni::alias_ref<jni::JString> /* deepLinkScheme */)>("configure");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* dappUrl */, jni::alias_ref<jni::JString> /* deepLinkScheme */)>("configure");
     method(_javaPart, dappUrl.has_value() ? jni::make_jstring(dappUrl.value()) : nullptr, deepLinkScheme.has_value() ? jni::make_jstring(deepLinkScheme.value()) : nullptr);
   }
   std::shared_ptr<Promise<ConnectResult>> JHybridNitroMetamaskSpec::connect() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("connect");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("connect");
     auto __result = method(_javaPart);
     return [&]() {
       auto __promise = Promise<ConnectResult>::create();
@@ -79,7 +80,7 @@ namespace margelo::nitro::nitrometamask {
     }();
   }
   std::shared_ptr<Promise<std::string>> JHybridNitroMetamaskSpec::signMessage(const std::string& message) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* message */)>("signMessage");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* message */)>("signMessage");
     auto __result = method(_javaPart, jni::make_jstring(message));
     return [&]() {
       auto __promise = Promise<std::string>::create();
@@ -95,7 +96,7 @@ namespace margelo::nitro::nitrometamask {
     }();
   }
   std::shared_ptr<Promise<ConnectSignResult>> JHybridNitroMetamaskSpec::connectSign(const std::string& nonce, int64_t exp) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* nonce */, int64_t /* exp */)>("connectSign");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* nonce */, int64_t /* exp */)>("connectSign");
     auto __result = method(_javaPart, jni::make_jstring(nonce), exp);
     return [&]() {
       auto __promise = Promise<ConnectSignResult>::create();
@@ -111,7 +112,7 @@ namespace margelo::nitro::nitrometamask {
     }();
   }
   std::shared_ptr<Promise<std::variant<nitro::NullType, std::string>>> JHybridNitroMetamaskSpec::getAddress() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("getAddress");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("getAddress");
     auto __result = method(_javaPart);
     return [&]() {
       auto __promise = Promise<std::variant<nitro::NullType, std::string>>::create();
@@ -127,7 +128,7 @@ namespace margelo::nitro::nitrometamask {
     }();
   }
   std::shared_ptr<Promise<std::variant<nitro::NullType, int64_t>>> JHybridNitroMetamaskSpec::getChainId() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("getChainId");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("getChainId");
     auto __result = method(_javaPart);
     return [&]() {
       auto __promise = Promise<std::variant<nitro::NullType, int64_t>>::create();

package/nitrogen/generated/android/c++/JHybridNitroMetamaskSpec.hpp

@@ -2,7 +2,7 @@
 /// HybridNitroMetamaskSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -18,33 +18,33 @@ namespace margelo::nitro::nitrometamask {
 
   using namespace facebook;
 
-  class JHybridNitroMetamaskSpec: public jni::HybridClass<JHybridNitroMetamaskSpec, JHybridObject>,
-                                  public virtual HybridNitroMetamaskSpec {
+  class JHybridNitroMetamaskSpec: public virtual HybridNitroMetamaskSpec, public virtual JHybridObject {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitrometamask/HybridNitroMetamaskSpec;";
-    static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
-    static void registerNatives();
-
-  protected:
-    // C++ constructor (called from Java via `initHybrid()`)
-    explicit JHybridNitroMetamaskSpec(jni::alias_ref<jhybridobject> jThis) :
-      HybridObject(HybridNitroMetamaskSpec::TAG),
-      HybridBase(jThis),
-      _javaPart(jni::make_global(jThis)) {}
+    struct JavaPart: public jni::JavaClass<JavaPart, JHybridObject::JavaPart> {
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitrometamask/HybridNitroMetamaskSpec;";
+      std::shared_ptr<JHybridNitroMetamaskSpec> getJHybridNitroMetamaskSpec();
+    };
+    struct CxxPart: public jni::HybridClass<CxxPart, JHybridObject::CxxPart> {
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitrometamask/HybridNitroMetamaskSpec$CxxPart;";
+      static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
+      static void registerNatives();
+      using HybridBase::HybridBase;
+    protected:
+      std::shared_ptr<JHybridObject> createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) override;
+    };
 
   public:
+    explicit JHybridNitroMetamaskSpec(const jni::local_ref<JHybridNitroMetamaskSpec::JavaPart>& javaPart):
+      HybridObject(HybridNitroMetamaskSpec::TAG),
+      JHybridObject(javaPart),
+      _javaPart(jni::make_global(javaPart)) {}
     ~JHybridNitroMetamaskSpec() override {
       // Hermes GC can destroy JS objects on a non-JNI Thread.
       jni::ThreadScope::WithClassLoader([&] { _javaPart.reset(); });
     }
 
   public:
-    size_t getExternalMemorySize() noexcept override;
-    void dispose() noexcept override;
-    std::string toString() override;
-
-  public:
-    inline const jni::global_ref<JHybridNitroMetamaskSpec::javaobject>& getJavaPart() const noexcept {
+    inline const jni::global_ref<JHybridNitroMetamaskSpec::JavaPart>& getJavaPart() const noexcept {
       return _javaPart;
     }
 
@@ -62,9 +62,7 @@ namespace margelo::nitro::nitrometamask {
     std::shared_ptr<Promise<std::variant<nitro::NullType, int64_t>>> getChainId() override;
 
   private:
-    friend HybridBase;
-    using HybridBase::HybridBase;
-    jni::global_ref<JHybridNitroMetamaskSpec::javaobject> _javaPart;
+    jni::global_ref<JHybridNitroMetamaskSpec::JavaPart> _javaPart;
   };
 
 } // namespace margelo::nitro::nitrometamask

package/nitrogen/generated/android/c++/JVariant_NullType_Long.cpp

@@ -2,7 +2,7 @@
 /// JVariant_NullType_Long.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JVariant_NullType_Long.hpp"

package/nitrogen/generated/android/c++/JVariant_NullType_Long.hpp

@@ -2,7 +2,7 @@
 /// JVariant_NullType_Long.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -23,7 +23,7 @@ namespace margelo::nitro::nitrometamask {
    */
   class JVariant_NullType_Long: public jni::JavaClass<JVariant_NullType_Long> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitrometamask/Variant_NullType_Long;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitrometamask/Variant_NullType_Long;";
 
     static jni::local_ref<JVariant_NullType_Long> create_0(jni::alias_ref<JNull> value) {
       static const auto method = javaClassStatic()->getStaticMethod<JVariant_NullType_Long(jni::alias_ref<JNull>)>("create");
@@ -48,7 +48,7 @@ namespace margelo::nitro::nitrometamask {
   namespace JVariant_NullType_Long_impl {
     class First final: public jni::JavaClass<First, JVariant_NullType_Long> {
     public:
-      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitrometamask/Variant_NullType_Long$First;";
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitrometamask/Variant_NullType_Long$First;";
     
       [[nodiscard]] jni::local_ref<JNull> getValue() const {
         static const auto field = javaClassStatic()->getField<JNull>("value");
@@ -58,7 +58,7 @@ namespace margelo::nitro::nitrometamask {
     
     class Second final: public jni::JavaClass<Second, JVariant_NullType_Long> {
     public:
-      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitrometamask/Variant_NullType_Long$Second;";
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitrometamask/Variant_NullType_Long$Second;";
     
       [[nodiscard]] int64_t getValue() const {
         static const auto field = javaClassStatic()->getField<int64_t>("value");

package/nitrogen/generated/android/c++/JVariant_NullType_String.cpp

@@ -2,7 +2,7 @@
 /// JVariant_NullType_String.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JVariant_NullType_String.hpp"

package/nitrogen/generated/android/c++/JVariant_NullType_String.hpp

@@ -2,7 +2,7 @@
 /// JVariant_NullType_String.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -24,7 +24,7 @@ namespace margelo::nitro::nitrometamask {
    */
   class JVariant_NullType_String: public jni::JavaClass<JVariant_NullType_String> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitrometamask/Variant_NullType_String;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitrometamask/Variant_NullType_String;";
 
     static jni::local_ref<JVariant_NullType_String> create_0(jni::alias_ref<JNull> value) {
       static const auto method = javaClassStatic()->getStaticMethod<JVariant_NullType_String(jni::alias_ref<JNull>)>("create");
@@ -49,7 +49,7 @@ namespace margelo::nitro::nitrometamask {
   namespace JVariant_NullType_String_impl {
     class First final: public jni::JavaClass<First, JVariant_NullType_String> {
     public:
-      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitrometamask/Variant_NullType_String$First;";
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitrometamask/Variant_NullType_String$First;";
     
       [[nodiscard]] jni::local_ref<JNull> getValue() const {
         static const auto field = javaClassStatic()->getField<JNull>("value");
@@ -59,7 +59,7 @@ namespace margelo::nitro::nitrometamask {
     
     class Second final: public jni::JavaClass<Second, JVariant_NullType_String> {
     public:
-      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitrometamask/Variant_NullType_String$Second;";
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitrometamask/Variant_NullType_String$Second;";
     
       [[nodiscard]] jni::local_ref<jni::JString> getValue() const {
         static const auto field = javaClassStatic()->getField<jni::JString>("value");