@novastera-oss/nitro-metamask 0.2.1 → 0.2.2

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

@@ -1,47 +1,65 @@
 package com.margelo.nitro.nitrometamask
 
-import io.metamask.androidsdk.ConnectOptions
-import io.metamask.androidsdk.EthereumClient
-import io.metamask.androidsdk.Request
-import io.metamask.androidsdk.RequestResult
+import io.metamask.androidsdk.Ethereum
+import io.metamask.androidsdk.EthereumRequest
+import io.metamask.androidsdk.EthereumMethod
+import io.metamask.androidsdk.Result
 
 class HybridMetamaskConnector : HybridMetamaskConnectorSpec() {
-    private val client by lazy { EthereumClient.getInstance() }
+    private val ethereum by lazy { 
+        Ethereum.getInstance()
+    }
 
     override suspend fun connect(): ConnectResult {
-        val response = client.connect(ConnectOptions())
-        val address = response.accounts.firstOrNull()
-            ?: throw IllegalStateException("MetaMask SDK returned no accounts")
-
-        return ConnectResult(
-            address = address,
-            chainId = response.chainId.toString()
-        )
+        val result = ethereum.connect()
+        return when (result) {
+            is Result.Success.Item -> {
+                // result.value contains the connection result
+                // Based on SDK docs, this should contain address and chainId
+                val connectionResult = result.value
+                // Extract address and chainId from the result
+                // The SDK returns account info in result.value
+                val address = ethereum.selectedAddress
+                    ?: throw IllegalStateException("MetaMask SDK returned no address")
+                val chainId = ethereum.chainId
+                    ?: throw IllegalStateException("MetaMask SDK returned no chainId")
+                
+                ConnectResult(
+                    address = address,
+                    chainId = chainId.toString()
+                )
+            }
+            is Result.Error -> {
+                throw Exception(result.error.message ?: "Failed to connect to MetaMask")
+            }
+            else -> {
+                throw IllegalStateException("Unexpected result type from MetaMask connect")
+            }
+        }
     }
 
     override suspend fun signMessage(message: String): String {
-        val address = client.getSelectedAddress() 
+        val address = ethereum.selectedAddress
             ?: throw IllegalStateException("No connected account. Call connect() first.")
         
-        // Convert message to hex-encoded format for personal_sign
-        // personal_sign expects: personal_sign(messageHex, address)
-        // where messageHex is "0x" + hex-encoded UTF-8 bytes
-        val messageBytes = message.toByteArray(Charsets.UTF_8)
-        val messageHex = "0x" + messageBytes.joinToString("") { "%02x".format(it) }
-        
-        val request = Request(
-            method = "personal_sign",
-            params = listOf(messageHex, address)
+        // Based on SDK documentation, personal_sign params are: [address, message]
+        // The SDK handles message encoding internally
+        val request = EthereumRequest(
+            method = EthereumMethod.PERSONAL_SIGN.value,
+            params = listOf(address, message)
         )
         
-        val result = client.sendRequest(request)
+        val result = ethereum.sendRequest(request)
         return when (result) {
-            is RequestResult.Success -> {
-                result.data as? String ?: throw IllegalStateException("Invalid signature response")
+            is Result.Success.Item -> {
+                result.value as? String ?: throw IllegalStateException("Invalid signature response")
             }
-            is RequestResult.Error -> {
+            is Result.Error -> {
                 throw Exception(result.error.message ?: "Failed to sign message")
             }
+            else -> {
+                throw IllegalStateException("Unexpected result type from MetaMask signMessage")
+            }
         }
     }
 }

package/ios/HybridMetamaskConnector.swift

@@ -5,16 +5,18 @@ class HybridMetamaskConnector: HybridMetamaskConnectorSpec {
   private let sdk = MetaMaskSDK.shared
 
   func connect() async throws -> ConnectResult {
-    try await withCheckedThrowingContinuation { continuation in
-      sdk.connect { response in
-        switch response {
-        case .success(let account):
-          let result = ConnectResult(address: account.address, chainId: "\(account.chainId)")
-          continuation.resume(returning: result)
-        case .failure(let error):
-          continuation.resume(throwing: error)
-        }
+    // Based on MetaMask iOS SDK docs: let connectResult = await metamaskSDK.connect()
+    let connectResult = await sdk.connect()
+    
+    switch connectResult {
+    case .success(let value):
+      // After successful connection, get account info from SDK
+      guard let account = sdk.account else {
+        throw NSError(domain: "MetamaskConnector", code: -1, userInfo: [NSLocalizedDescriptionKey: "MetaMask SDK returned no account"])
       }
+      return ConnectResult(address: account.address, chainId: "\(account.chainId)")
+    case .failure(let error):
+      throw error
     }
   }
 
@@ -24,16 +26,10 @@ class HybridMetamaskConnector: HybridMetamaskConnectorSpec {
       throw NSError(domain: "MetamaskConnector", code: -1, userInfo: [NSLocalizedDescriptionKey: "No connected account. Call connect() first."])
     }
     
-    // Convert message to hex-encoded format for personal_sign
-    // personal_sign expects: personal_sign(messageHex, address)
-    // where messageHex is "0x" + hex-encoded UTF-8 bytes
-    // Reference: https://github.com/MetaMask/metamask-ios-sdk#5-connect-with-request
-    guard let messageData = message.data(using: .utf8) else {
-      throw NSError(domain: "MetamaskConnector", code: -1, userInfo: [NSLocalizedDescriptionKey: "Failed to encode message"])
-    }
-    
-    let messageHex = "0x" + messageData.map { String(format: "%02x", $0) }.joined()
-    let params: [String] = [messageHex, account.address]
+    // Based on MetaMask iOS SDK docs, personal_sign params are: [account, message]
+    // The SDK handles message encoding internally
+    // Reference: https://github.com/MetaMask/metamask-ios-sdk
+    let params: [String] = [account.address, message]
     
     // Create EthereumRequest for personal_sign JSON-RPC method
     let request = EthereumRequest(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@novastera-oss/nitro-metamask",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "nitro-metamask",
   "main": "lib/index",
   "module": "lib/index",