@vultisig/walletcore-native 0.1.1 → 0.2.0

package/CHANGELOG.md

@@ -0,0 +1,17 @@
+# @vultisig/walletcore-native
+
+## 0.2.0
+
+### Minor Changes
+
+- [#1541](https://github.com/vultisig/vultisig-sdk/pull/1541) [`b9f81af`](https://github.com/vultisig/vultisig-sdk/commit/b9f81af9065a5c0bfc2f86f8fb20aa51e670ab77) Thanks [@realpaaao](https://github.com/realpaaao)! - Add Robinhood Chain (Arbitrum Orbit EVM L2, chain id 4663, ETH gas). Swaps enabled via LiFi and KyberSwap.
+
+## 0.1.2
+
+### Patch Changes
+
+- [#272](https://github.com/vultisig/vultisig-sdk/pull/272) [`496fa54`](https://github.com/vultisig/vultisig-sdk/commit/496fa54a7132d14c82933f27b78b428d4c0caf4a) Thanks [@NeOMakinG](https://github.com/NeOMakinG)! - Fix Android Kotlin compilation against TrustWallet JNI bindings
+  - Import `wallet.core.java.AnySigner` (lives outside `wallet.core.jni.*`)
+  - Fix `anyAddressIsValidSS58` return type (`Nothing` -> `Boolean`) so Kotlin can reify the type parameter
+  - Use `AnySigner.nativePlan(byte[], int)` instead of protobuf `plan()` overload that requires 3 params
+  - Pass required `bounceable` and `testnet` boolean params to `TONAddressConverter.toUserFriendly`

package/android/build.gradle

@@ -47,7 +47,8 @@ repositories {
             username = System.getenv("GITHUB_USER")
                 ?: System.getenv("GITHUB_ACTOR")
                 ?: "token"
-            password = System.getenv("GITHUB_TOKEN")
+            password = System.getenv("TRUSTWALLET_PAT")
+                ?: System.getenv("GITHUB_TOKEN")
                 ?: System.getenv("GH_TOKEN")
                 ?: ""
         }
@@ -60,7 +61,7 @@ repositories {
 dependencies {
     implementation project(':expo-modules-core')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${safeExtGet('kotlinVersion', '1.8.10')}"
-    implementation 'com.trustwallet:wallet-core:4.3.22'
+    implementation 'com.trustwallet:wallet-core:4.7.0'
 }
 
 def safeExtGet(prop, fallback) {

package/android/src/main/java/expo/modules/walletcore/ExpoWalletCoreModule.kt

@@ -3,6 +3,7 @@ package expo.modules.walletcore
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
 import wallet.core.jni.*
+import wallet.core.java.AnySigner
 
 class ExpoWalletCoreModule : Module() {
     // NOTE: nextHandle and the key/wallet maps are accessed from the Expo module
@@ -64,6 +65,7 @@ class ExpoWalletCoreModule : Module() {
                 "cronosChain" to CoinType.CRONOSCHAIN,
                 "blast" to CoinType.BLAST,
                 "zksync" to CoinType.ZKSYNC,
+                "robinhoodChain" to CoinType.ROBINHOODCHAIN,
                 "osmosis" to CoinType.OSMOSIS,
                 "terraV2" to CoinType.TERRAV2,
                 "noble" to CoinType.NOBLE,
@@ -143,15 +145,8 @@ class ExpoWalletCoreModule : Module() {
             AnyAddress.isValidBech32(address, CoinType.createFromValue(coinType), hrp)
         }
 
-        // The Trust Wallet Core Android JNI binding does not expose an SS58-prefix
-        // overload on AnyAddress. Throw rather than returning a potentially incorrect
-        // result, so callers know this code path is not supported yet.
-        Function("anyAddressIsValidSS58") { _address: String, _coinType: Int, _ss58Prefix: Int ->
-            throw Exception(
-                "anyAddressIsValidSS58 is not supported on Android: the JNI binding " +
-                "does not expose an SS58-prefix overload. Use anyAddressIsValid as a " +
-                "fallback (ignores ss58Prefix) or implement a pure-Kotlin SS58 check."
-            )
+        Function("anyAddressIsValidSS58") { address: String, coinType: Int, ss58Prefix: Int ->
+            AnyAddress.isValidSS58(address, CoinType.createFromValue(coinType), ss58Prefix)
         }
 
         Function("anyAddressCreateWithString") { address: String, coinType: Int ->
@@ -198,7 +193,7 @@ class ExpoWalletCoreModule : Module() {
         // AnySigner
         Function("anySignerPlan") { txInputDataBase64: String, coinType: Int ->
             val txData = android.util.Base64.decode(txInputDataBase64, android.util.Base64.NO_WRAP)
-            val result = AnySigner.plan(txData, CoinType.createFromValue(coinType))
+            val result = AnySigner.nativePlan(txData, coinType)
             android.util.Base64.encodeToString(result, android.util.Base64.NO_WRAP)
         }
 
@@ -338,7 +333,7 @@ class ExpoWalletCoreModule : Module() {
 
         // TONAddressConverter
         Function("tonAddressToUserFriendly") { address: String ->
-            TONAddressConverter.toUserFriendly(address)
+            TONAddressConverter.toUserFriendly(address, false, false)
         }
 
         // SolanaAddress

package/ios/ExpoWalletCore.podspec

@@ -13,5 +13,5 @@ Pod::Spec.new do |s|
   s.source_files   = '*.swift'
 
   s.dependency 'ExpoModulesCore'
-  s.dependency 'TrustWalletCore', '4.3.22'
+  s.dependency 'TrustWalletCore', '4.7.0'
 end

package/ios/ExpoWalletCoreModule.swift

@@ -92,6 +92,7 @@ public class ExpoWalletCoreModule: Module {
                 "polygon": .polygon, "optimism": .optimism,
                 "cronosChain": .cronosChain, "blast": .blast,
                 "zksync": .zksync, "osmosis": .osmosis,
+                "robinhoodChain": .robinhoodChain,
                 "terraV2": .terraV2, "terra": .terra,
                 "noble": .noble, "kujira": .kujira,
                 "dydx": .dydx, "akash": .akash, "mantle": .mantle, "sei": .sei,
@@ -342,7 +343,13 @@ public class ExpoWalletCoreModule: Module {
                 throw NSError(domain: "ExpoWalletCore", code: -1, userInfo: [NSLocalizedDescriptionKey: "Invalid HDWallet handle"])
             }
             let ct = try coinTypeFromValue(coinType)
-            let key = wallet.getKey(coin: ct, derivationPath: derivationPath)
+            guard let key = wallet.getKey(coin: ct, derivationPath: derivationPath) else {
+                throw NSError(
+                    domain: "ExpoWalletCore",
+                    code: -1,
+                    userInfo: [NSLocalizedDescriptionKey: "Failed to derive PrivateKey for CoinType raw value \(coinType)"]
+                )
+            }
             return storePrivateKey(key)
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vultisig/walletcore-native",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "Native WalletCore bridge for Vultisig SDK (React Native / Expo)",
   "main": "src/index.ts",
   "types": "src/index.ts",
@@ -15,10 +15,10 @@
     "@noble/hashes": "^1.8.0"
   },
   "peerDependencies": {
-    "expo": ">=51.0.0"
+    "expo": ">=56.0.8"
   },
   "devDependencies": {
-    "expo": ">=51.0.0"
+    "expo": ">=56.0.12"
   },
   "publishConfig": {
     "access": "public"

package/src/ExpoWalletCoreModule.ts

@@ -129,12 +129,7 @@ interface ExpoWalletCoreModuleType {
   hdWalletGetAddressForCoin(handle: number, coinType: number): string
 
   /** Get the extended private key. */
-  hdWalletGetExtendedPrivateKey(
-    handle: number,
-    purposeValue: number,
-    coinType: number,
-    versionValue: number
-  ): string
+  hdWalletGetExtendedPrivateKey(handle: number, purposeValue: number, coinType: number, versionValue: number): string
 
   /** Free an HDWallet handle. */
   freeHDWallet(handle: number): void

package/src/index.test.ts

@@ -0,0 +1,41 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const native = vi.hoisted(() => ({
+  derivationPath: vi.fn((_coinType: number) => "m/44'/60'/0'/0/0"),
+  deriveAddressFromPublicKey: vi.fn((_coinType: number, _handle: number) => '0x1234'),
+}))
+
+vi.mock('expo-modules-core', () => ({
+  requireNativeModule: () => native,
+}))
+
+import { type NativePublicKeyInstance, NativeWalletCore } from './index'
+
+describe('NativeWalletCore Robinhood contract', () => {
+  beforeEach(() => vi.clearAllMocks())
+
+  it('passes the canonical finite coin type to the native derivation bridge', () => {
+    const walletCore = NativeWalletCore.getInstance()
+    const coinType = walletCore.CoinType.robinhoodChain
+
+    expect(coinType).toBe(10_004_663)
+    expect(Number.isInteger(coinType)).toBe(true)
+    expect(walletCore.CoinTypeExt.derivationPath(coinType)).toBe("m/44'/60'/0'/0/0")
+    expect(native.derivationPath).toHaveBeenCalledWith(10_004_663)
+  })
+
+  it('uses the same EVM address derivation contract as Ethereum', () => {
+    const walletCore = NativeWalletCore.getInstance()
+    const publicKey = { _handle: 7 } as NativePublicKeyInstance
+
+    const ethereumAddress = walletCore.CoinTypeExt.deriveAddressFromPublicKey(walletCore.CoinType.ethereum, publicKey)
+    const robinhoodAddress = walletCore.CoinTypeExt.deriveAddressFromPublicKey(
+      walletCore.CoinType.robinhoodChain,
+      publicKey
+    )
+
+    expect(robinhoodAddress).toBe(ethereumAddress)
+    expect(native.deriveAddressFromPublicKey).toHaveBeenNthCalledWith(1, 60, 7)
+    expect(native.deriveAddressFromPublicKey).toHaveBeenNthCalledWith(2, 10_004_663, 7)
+  })
+})

package/src/index.ts

@@ -5,6 +5,7 @@
  * Provides a JS object matching the WalletCore API shape expected by the SDK.
  */
 import { keccak_256 } from '@noble/hashes/sha3'
+
 import ExpoWalletCore from './ExpoWalletCoreModule'
 
 // ---------------------------------------------------------------------------
@@ -95,13 +96,22 @@ export interface WalletCoreLike {
     isValidBech32(address: string, coinType: number, hrp: string): boolean
     isValidSS58(address: string, coinType: number, ss58Prefix: number): boolean
     createWithString(address: string, coinType: number): NativeAnyAddressInstance
-    createBech32WithPublicKey(publicKey: NativePublicKeyInstance, coinType: number, hrp: string): NativeAnyAddressInstance
+    createBech32WithPublicKey(
+      publicKey: NativePublicKeyInstance,
+      coinType: number,
+      hrp: string
+    ): NativeAnyAddressInstance
     createBech32(address: string, coinType: number, hrp: string): NativeAnyAddressInstance
   }
 
   TransactionCompiler: {
     preImageHashes(coinType: number, txInputData: Uint8Array): Uint8Array
-    compileWithSignatures(coinType: number, txInputData: Uint8Array, signatures: NativeDataVectorInstance, publicKeys: NativeDataVectorInstance): Uint8Array
+    compileWithSignatures(
+      coinType: number,
+      txInputData: Uint8Array,
+      signatures: NativeDataVectorInstance,
+      publicKeys: NativeDataVectorInstance
+    ): Uint8Array
   }
 
   DataVector: {
@@ -161,31 +171,27 @@ export interface WalletCoreLike {
 // ---------------------------------------------------------------------------
 // Helpers — base64 <-> Uint8Array
 // ---------------------------------------------------------------------------
+//
+// Both helpers assume `Buffer` is globally available. On RN/Hermes that is
+// guaranteed because `@vultisig/sdk`'s react-native entrypoint installs the
+// buffer polyfill before any module graph import runs; on Node it is a
+// builtin. Consumers importing `@vultisig/walletcore-native` directly
+// (without going through @vultisig/sdk's RN entrypoint) must polyfill
+// `globalThis.Buffer` themselves before invoking any WalletCore method.
 
 function toBase64(bytes: Uint8Array | Buffer): string {
-  if (Buffer.isBuffer(bytes)) {
-    return bytes.toString('base64')
-  }
-  let binary = ''
-  for (let i = 0; i < bytes.length; i++) {
-    binary += String.fromCharCode(bytes[i]!)
-  }
-  return btoa(binary)
+  const buf = Buffer.isBuffer(bytes) ? bytes : Buffer.from(bytes.buffer, bytes.byteOffset, bytes.byteLength)
+  return buf.toString('base64')
 }
 
 function fromBase64(b64: string): Uint8Array {
-  const binary = atob(b64)
-  const bytes = new Uint8Array(binary.length)
-  for (let i = 0; i < binary.length; i++) {
-    bytes[i] = binary.charCodeAt(i)
-  }
-  return bytes
+  return new Uint8Array(Buffer.from(b64, 'base64'))
 }
 
 // ---------------------------------------------------------------------------
 // CoinType enum — numeric values matching TrustWallet's CoinType
-// Values sourced from TrustWallet wallet-core v4.2.9:
-// https://github.com/trustwallet/wallet-core/blob/v4.2.9/include/TrustWalletCore/TWCoinType.h
+// Values sourced from TrustWallet wallet-core v4.7.0:
+// https://github.com/trustwallet/wallet-core/blob/4.7.0/include/TrustWalletCore/TWCoinType.h
 // ---------------------------------------------------------------------------
 
 const CoinTypeValues: Record<string, number> = {
@@ -216,6 +222,7 @@ const CoinTypeValues: Record<string, number> = {
   cronosChain: 10000025,
   blast: 81457,
   zksync: 10000324,
+  robinhoodChain: 10004663,
   osmosis: 10000118,
   terraV2: 10000330,
   noble: 18000118,
@@ -601,9 +608,7 @@ function abiEncode(name: string, params: AbiParam[]): Uint8Array {
 
   // Concatenate: selector + heads + tails
   const totalLen =
-    selector.length +
-    headParts.reduce((sum, p) => sum + p.length, 0) +
-    tailParts.reduce((sum, p) => sum + p.length, 0)
+    selector.length + headParts.reduce((sum, p) => sum + p.length, 0) + tailParts.reduce((sum, p) => sum + p.length, 0)
 
   const result = new Uint8Array(totalLen)
   let offset = 0
@@ -785,16 +790,8 @@ export class NativeWalletCore {
           const dataB64 = ExpoWalletCore.anyAddressData(address, coinType)
           return new NativeAnyAddress(desc, dataB64)
         },
-        createBech32WithPublicKey(
-          publicKey: NativePublicKey,
-          coinType: number,
-          hrp: string
-        ): NativeAnyAddress {
-          const desc = ExpoWalletCore.anyAddressCreateBech32WithPublicKey(
-            publicKey._handle,
-            coinType,
-            hrp
-          )
+        createBech32WithPublicKey(publicKey: NativePublicKey, coinType: number, hrp: string): NativeAnyAddress {
+          const desc = ExpoWalletCore.anyAddressCreateBech32WithPublicKey(publicKey._handle, coinType, hrp)
           return new NativeAnyAddress(desc)
         },
         createBech32(address: string, coinType: number, hrp: string): NativeAnyAddress {