@solana-mobile/seed-vault-lib 0.2.0 → 0.3.0

package/android/src/main/java/com/solanamobile/seedvault/reactnative/SerializationUtils.kt

@@ -73,7 +73,7 @@ internal fun SeedVaultEvent.toWritableMap() : WritableMap = Arguments.createMap(
                 Arguments.createMap().apply {
                     putArray("publicKey", response.publicKey.toWritableArray())
                     putString("publicKeyEncoded", response.publicKeyEncoded)
-                    putString("resolvedDerviationPath", response.resolvedDerivationPath.toString())
+                    putString("resolvedDerivationPath", response.resolvedDerivationPath.toString())
                 }
             }))
         }

package/android/src/main/java/com/solanamobile/seedvault/reactnative/SolanaMobileSeedVaultLibModule.kt

@@ -2,6 +2,7 @@ package com.solanamobile.seedvault.reactnative
 
 import android.app.Activity;
 import android.content.Intent;
+import android.content.pm.PackageManager
 import android.database.ContentObserver
 import android.net.Uri
 import android.os.Bundle
@@ -43,7 +44,10 @@ class SolanaMobileSeedVaultLibModule(val reactContext: ReactApplicationContext)
     init {
         reactContext.addActivityEventListener(mActivityEventListener)
 
-        observeSeedVaultContentChanges()
+        if (reactContext.checkSelfPermission(WalletContractV1.PERMISSION_ACCESS_SEED_VAULT) == PackageManager.PERMISSION_GRANTED &&
+                SeedVault.isAvailable(reactContext, true)) {
+            observeSeedVaultContentChanges()
+        }
     }
 
     @ReactMethod
@@ -62,9 +66,17 @@ class SolanaMobileSeedVaultLibModule(val reactContext: ReactApplicationContext)
 
     @ReactMethod
     fun hasUnauthorizedSeeds(promise: Promise) {
+        hasUnauthorizedSeedsForPurpose(WalletContractV1.PURPOSE_SIGN_SOLANA_TRANSACTION, promise)
+    }
+
+    @ReactMethod
+    fun hasUnauthorizedSeedsForPurpose(purpose: Double, promise: Promise) {
+        hasUnauthorizedSeedsForPurpose(purpose.toInt(), promise)
+    }
+
+    private fun hasUnauthorizedSeedsForPurpose(purpose: Int, promise: Promise) {
         val application = reactContext.currentActivity?.application!!
-        val hasUnauthorizedSeeds = Wallet.hasUnauthorizedSeedsForPurpose(application, 
-            WalletContractV1.PURPOSE_SIGN_SOLANA_TRANSACTION)
+        val hasUnauthorizedSeeds = Wallet.hasUnauthorizedSeedsForPurpose(application, purpose)
         promise.resolve(hasUnauthorizedSeeds)
     }
 
@@ -108,11 +120,10 @@ class SolanaMobileSeedVaultLibModule(val reactContext: ReactApplicationContext)
     }
 
     @ReactMethod
-    fun getAccounts(authToken: String, promise: Promise) {
+    fun getAccounts(authToken: String, filterOnColumn: String, value: Any, promise: Promise) {
         val application = reactContext.currentActivity?.application!!
         val accountsCursor = Wallet.getAccounts(application, authToken.toLong(),
-                    WalletContractV1.ACCOUNTS_ALL_COLUMNS,
-                    WalletContractV1.ACCOUNTS_ACCOUNT_IS_USER_WALLET, "1")!!
+                    WalletContractV1.ACCOUNTS_ALL_COLUMNS, filterOnColumn, value)!!
 
         val accounts = mutableListOf<Account>()
         
@@ -132,6 +143,11 @@ class SolanaMobileSeedVaultLibModule(val reactContext: ReactApplicationContext)
         promise.resolve(accounts.toWritableArray())
     }
 
+    @ReactMethod
+    fun getUserWallets(authToken: String, promise: Promise) {
+        getAccounts(authToken, WalletContractV1.ACCOUNTS_ACCOUNT_IS_USER_WALLET, "1", promise)
+    }
+
     @ReactMethod
     fun requestAuthorizeNewSeed() {
         Log.d(TAG, "Requesting authorization for a new seed...")
@@ -228,6 +244,16 @@ class SolanaMobileSeedVaultLibModule(val reactContext: ReactApplicationContext)
         Log.d(TAG, "Account name updated (to '$name')")
     }
 
+    @ReactMethod
+    fun updateAccountIsUserWallet(authToken: String, accountId: String, isUserWallet: Boolean) {
+        Wallet.updateAccountIsUserWallet(reactContext, authToken.toLong(), accountId.toLong(), isUserWallet)
+    }
+
+    @ReactMethod
+    fun updateAccountIsValid(authToken: String, accountId: String, isValid: Boolean) {
+        Wallet.updateAccountIsValid(reactContext, authToken.toLong(), accountId.toLong(), isValid)
+    }
+
     @ReactMethod
     fun requestSignMessage(authToken: String, derivationPath: String, message: ReadableArray) {
         requestSignMessages(authToken, listOf(SigningRequest(message.toByteArray(), arrayListOf(Uri.parse(derivationPath)))))
@@ -419,7 +445,7 @@ class SolanaMobileSeedVaultLibModule(val reactContext: ReactApplicationContext)
                         Arguments.createMap().apply {
                             putArray("publicKey", response.publicKey.toWritableArray())
                             putString("publicKeyEncoded", response.publicKeyEncoded)
-                            putString("resolvedDerviationPath", response.resolvedDerivationPath.toString())
+                            putString("resolvedDerivationPath", response.resolvedDerivationPath.toString())
                         }
                     }), null
                 )
@@ -430,6 +456,21 @@ class SolanaMobileSeedVaultLibModule(val reactContext: ReactApplicationContext)
         }
     }
 
+    @ReactMethod
+    fun resolveDerivationPath(derivationPath: String, promise: Promise) {
+        resolveDerivationPath(Uri.parse(derivationPath), WalletContractV1.PURPOSE_SIGN_SOLANA_TRANSACTION, promise)
+    }
+
+    @ReactMethod
+    fun resolveDerivationPathForPurpose(derivationPath: String, purpose: Double, promise: Promise) {
+        resolveDerivationPath(Uri.parse(derivationPath), purpose.toInt(), promise)
+    }
+
+    private fun resolveDerivationPath(derivationPath: Uri, purpose: Int, promise: Promise) {
+        val resolvedDerivationPath = Wallet.resolveDerivationPath(reactContext, derivationPath, purpose)
+        promise.resolve(resolvedDerivationPath.toString())
+    }
+
     private fun sendEvent(reactContext: ReactContext, eventName: String, params: WritableMap? = null) {
         reactContext
             .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
@@ -453,7 +494,6 @@ class SolanaMobileSeedVaultLibModule(val reactContext: ReactApplicationContext)
                     throw NotImplementedError("Stub for legacy onChange")
 
                 override fun onChange(selfChange: Boolean, uris: Collection<Uri>, flags: Int) {
-                    Log.d(TAG, "Received change notification for $uris (flags=$flags); refreshing viewmodel")
                     sendEvent(reactContext, SEED_VAULT_CONTENT_CHANGE_EVENT_BRIDGE_NAME, 
                         params = Arguments.createMap().apply {
                             putString("__type", "SeedVaultContentChange")
@@ -542,4 +582,4 @@ class SolanaMobileSeedVaultLibModule(val reactContext: ReactApplicationContext)
         private const val DEFAULT_ACTIVITY_RESULT_TIMEOUT_MS = 300000L
         private const val MINIMUM_ACTIVITY_RESULT_TIMEOUT_MS = 30000L
     }
-}
+}

package/lib/types/index.d.ts

@@ -107,6 +107,7 @@ type SigningResult = Readonly<{
 }>;
 interface AuthorizeSeedAPI {
     hasUnauthorizedSeeds(): boolean;
+    hasUnauthorizedSeedsForPurpose(purpose: SeedPurpose): boolean;
     getAuthorizedSeeds(): Seed[];
     authorizeNewSeed(): {
         authToken: AuthToken;
@@ -114,14 +115,22 @@ interface AuthorizeSeedAPI {
     deauthorizeSeed(authToken: AuthToken): void;
 }
 interface AccountAPI {
-    getAccounts(authToken: AuthToken): Account[];
+    getAccounts(authToken: AuthToken, filterOnColumn: string, value: any): Account[];
+    getUserWallets(authToken: AuthToken): Account[];
     updateAccountName(authToken: AuthToken, accountId: number, name?: string): void;
+    updateAccountIsUserWallet(authToken: AuthToken, accountId: number, isUserWallet: boolean): void;
+    updateAccountIsValid(authToken: AuthToken, accountId: number, isValid: boolean): void;
 }
 interface CreateNewSeedAPI {
     createNewSeed(): {
         authToken: AuthToken;
     };
 }
+// TODO
+// interface ImplementationLimitsAPI {
+//     getImplementationLimits(): void
+//     getImplementationLimitsForPurpose()
+// }
 interface ImportExistingSeedAPI {
     importExistingSeed(): {
         authToken: AuthToken;
@@ -130,6 +139,8 @@ interface ImportExistingSeedAPI {
 interface PublicKeyAPI {
     getPublicKey(authToken: AuthToken, derivationPath: DerivationPath): SeedPublicKey;
     getPublicKeys(authToken: AuthToken, derivationPaths: DerivationPath[]): SeedPublicKey[];
+    resolveDerivationPath(derivationPath: DerivationPath): DerivationPath;
+    resolveDerivationPathForPurpose(derivationPath: DerivationPath, purpose: SeedPurpose): DerivationPath;
 }
 interface SignMessagesAPI {
     signMessage(authToken: AuthToken, derivationPath: DerivationPath, message: Base64EncodedMessage): SigningResult;
@@ -139,7 +150,10 @@ interface SignTransactionsAPI {
     signTransaction(authToken: AuthToken, derivationPath: DerivationPath, transaction: Base64EncodedTransaction): SigningResult;
     signTransactions(authToken: AuthToken, signingRequests: SigningRequest[]): SigningResult[];
 }
-interface SeedVaultAPI extends AuthorizeSeedAPI, AccountAPI, CreateNewSeedAPI, ImportExistingSeedAPI, PublicKeyAPI, SignMessagesAPI, SignTransactionsAPI {
+interface SeedVaultAvailabilityAPI {
+    isSeedVaultAvailable(allowSimulated: boolean): boolean;
+}
+interface SeedVaultAPI extends AuthorizeSeedAPI, AccountAPI, CreateNewSeedAPI, ImportExistingSeedAPI, PublicKeyAPI, SeedVaultAvailabilityAPI, SignMessagesAPI, SignTransactionsAPI {
 }
 declare const SeedVaultPermissionAndroid: Permission;
 declare function useSeedVault(handleSeedVaultEvent: (event: SeedVaultEvent) => void, handleContentChange: (event: SeedVaultContentChange) => void): void;

package/lib/types/index.native.d.ts

@@ -107,6 +107,7 @@ type SigningResult = Readonly<{
 }>;
 interface AuthorizeSeedAPI {
     hasUnauthorizedSeeds(): boolean;
+    hasUnauthorizedSeedsForPurpose(purpose: SeedPurpose): boolean;
     getAuthorizedSeeds(): Seed[];
     authorizeNewSeed(): {
         authToken: AuthToken;
@@ -114,14 +115,22 @@ interface AuthorizeSeedAPI {
     deauthorizeSeed(authToken: AuthToken): void;
 }
 interface AccountAPI {
-    getAccounts(authToken: AuthToken): Account[];
+    getAccounts(authToken: AuthToken, filterOnColumn: string, value: any): Account[];
+    getUserWallets(authToken: AuthToken): Account[];
     updateAccountName(authToken: AuthToken, accountId: number, name?: string): void;
+    updateAccountIsUserWallet(authToken: AuthToken, accountId: number, isUserWallet: boolean): void;
+    updateAccountIsValid(authToken: AuthToken, accountId: number, isValid: boolean): void;
 }
 interface CreateNewSeedAPI {
     createNewSeed(): {
         authToken: AuthToken;
     };
 }
+// TODO
+// interface ImplementationLimitsAPI {
+//     getImplementationLimits(): void
+//     getImplementationLimitsForPurpose()
+// }
 interface ImportExistingSeedAPI {
     importExistingSeed(): {
         authToken: AuthToken;
@@ -130,6 +139,8 @@ interface ImportExistingSeedAPI {
 interface PublicKeyAPI {
     getPublicKey(authToken: AuthToken, derivationPath: DerivationPath): SeedPublicKey;
     getPublicKeys(authToken: AuthToken, derivationPaths: DerivationPath[]): SeedPublicKey[];
+    resolveDerivationPath(derivationPath: DerivationPath): DerivationPath;
+    resolveDerivationPathForPurpose(derivationPath: DerivationPath, purpose: SeedPurpose): DerivationPath;
 }
 interface SignMessagesAPI {
     signMessage(authToken: AuthToken, derivationPath: DerivationPath, message: Base64EncodedMessage): SigningResult;
@@ -139,7 +150,10 @@ interface SignTransactionsAPI {
     signTransaction(authToken: AuthToken, derivationPath: DerivationPath, transaction: Base64EncodedTransaction): SigningResult;
     signTransactions(authToken: AuthToken, signingRequests: SigningRequest[]): SigningResult[];
 }
-interface SeedVaultAPI extends AuthorizeSeedAPI, AccountAPI, CreateNewSeedAPI, ImportExistingSeedAPI, PublicKeyAPI, SignMessagesAPI, SignTransactionsAPI {
+interface SeedVaultAvailabilityAPI {
+    isSeedVaultAvailable(allowSimulated: boolean): boolean;
+}
+interface SeedVaultAPI extends AuthorizeSeedAPI, AccountAPI, CreateNewSeedAPI, ImportExistingSeedAPI, PublicKeyAPI, SeedVaultAvailabilityAPI, SignMessagesAPI, SignTransactionsAPI {
 }
 declare const SeedVaultPermissionAndroid: Permission;
 declare function useSeedVault(handleSeedVaultEvent: (event: SeedVaultEvent) => void, handleContentChange: (event: SeedVaultContentChange) => void): void;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@solana-mobile/seed-vault-lib",
     "description": "A React Native wrapper of the Solana Mobile, Seed Vault SDK. Apps can use this to interact with seed vault implementations on Android",
-    "version": "0.2.0",
+    "version": "0.3.0",
     "author": "Marco Martinez <marco.martinez@solanamobile.com>",
     "repository": "https://github.com/solana-mobile/seed-vault-sdk",
     "license": "Apache-2.0",

package/src/types.ts

@@ -48,20 +48,30 @@ export type SigningResult = Readonly<{
 
 interface AuthorizeSeedAPI {
     hasUnauthorizedSeeds(): boolean
+    hasUnauthorizedSeedsForPurpose(purpose: SeedPurpose): boolean
     getAuthorizedSeeds(): Seed[]
     authorizeNewSeed(): {authToken: AuthToken}
     deauthorizeSeed(authToken: AuthToken): void
 }
 
 interface AccountAPI {
-    getAccounts(authToken: AuthToken): Account[]
+    getAccounts(authToken: AuthToken, filterOnColumn: string, value: any): Account[]
+    getUserWallets(authToken: AuthToken): Account[]
     updateAccountName(authToken: AuthToken, accountId: number, name?: string): void
+    updateAccountIsUserWallet(authToken: AuthToken, accountId: number, isUserWallet: boolean): void
+    updateAccountIsValid(authToken: AuthToken, accountId: number, isValid: boolean): void
 }
 
 interface CreateNewSeedAPI {
     createNewSeed(): {authToken: AuthToken}
 }
 
+// TODO
+// interface ImplementationLimitsAPI {
+//     getImplementationLimits(): void
+//     getImplementationLimitsForPurpose()
+// }
+
 interface ImportExistingSeedAPI {
     importExistingSeed(): {authToken: AuthToken}
 }
@@ -69,6 +79,8 @@ interface ImportExistingSeedAPI {
 interface PublicKeyAPI {
     getPublicKey(authToken: AuthToken, derivationPath: DerivationPath): SeedPublicKey
     getPublicKeys(authToken: AuthToken, derivationPaths: DerivationPath[]): SeedPublicKey[]
+    resolveDerivationPath(derivationPath: DerivationPath): DerivationPath
+    resolveDerivationPathForPurpose(derivationPath: DerivationPath, purpose: SeedPurpose): DerivationPath
 }
 
 interface SignMessagesAPI {
@@ -81,11 +93,16 @@ interface SignTransactionsAPI {
     signTransactions(authToken: AuthToken, signingRequests: SigningRequest[]): SigningResult[]
 }
 
+interface SeedVaultAvailabilityAPI {
+    isSeedVaultAvailable(allowSimulated: boolean): boolean
+}
+
 export interface SeedVaultAPI 
     extends AuthorizeSeedAPI,
         AccountAPI,
         CreateNewSeedAPI,
         ImportExistingSeedAPI,
         PublicKeyAPI,
+        SeedVaultAvailabilityAPI,
         SignMessagesAPI, 
-        SignTransactionsAPI {}
+        SignTransactionsAPI {}