Add backend switching with walletSettings

Author: peachbits

src/monero/MoneroEngine.ts

@@ -13,6 +13,7 @@ import {
   NoAmountSpecifiedError,
   PendingFundsError
 } from 'edge-core-js/types'
+import type { WalletBackend } from 'react-native-monero-lwsf'
 import { TransactionDirection } from 'react-native-monero-lwsf'
 import { base64, base64url } from 'rfc4648'
 
@@ -36,13 +37,15 @@ import {
   asMoneroPrivateKeys,
   asMoneroUserSettings,
   asMoneroWalletOtherData,
+  asMoneroWalletSettings,
   asSafeMoneroWalletInfo,
   LoginResponse,
   MoneroInitOptions,
   MoneroNetworkInfo,
   MoneroPrivateKeys,
   MoneroUserSettings,
   MoneroWalletOtherData,
+  MoneroWalletSettings,
   SafeMoneroWalletInfo,
   translateFee
 } from './moneroTypes'
@@ -54,6 +57,7 @@ export class MoneroEngine extends CurrencyEngine<
 > {
   networkInfo: MoneroNetworkInfo
   currentSettings: MoneroUserSettings
+  currentWalletSettings: MoneroWalletSettings
   otherData!: MoneroWalletOtherData
   initOptions: MoneroInitOptions
   unlockedBalance: string
@@ -63,6 +67,7 @@ export class MoneroEngine extends CurrencyEngine<
   private txSortOrder: 'asc' | 'desc' = 'asc'
   private unsubscribeWalletEvent?: () => void
   private abortKeysWait?: () => void
+  private settingsChangeQueue: Promise<void> = Promise.resolve()
 
   constructor(
     env: PluginEnvironment<MoneroNetworkInfo>,
@@ -77,7 +82,12 @@ export class MoneroEngine extends CurrencyEngine<
 
     this.unlockedBalance = '0'
 
+    // Shared across all wallets using this engine:
     this.currentSettings = asMoneroUserSettings(opts.userSettings)
+    // Unique to this particular wallet instance:
+    this.currentWalletSettings = asMoneroWalletSettings(
+      opts.walletSettings ?? {}
+    )
 
     // Singleton promise resolved once by the first syncNetwork call.
     // Stays resolved across restarts so onStart gets keys immediately.
@@ -98,36 +108,47 @@ export class MoneroEngine extends CurrencyEngine<
           base64.parse(this.walletId)
         )
 
+        const { backend } = this.currentWalletSettings
+        this.log.warn('Using backend:', backend)
         const defaults = asMoneroUserSettings({})
-        const daemonAddress = this.currentSettings.enableCustomServers
-          ? this.currentSettings.moneroLightwalletServer
-          : defaults.moneroLightwalletServer
+        const daemonAddress =
+          backend === 'lws'
+            ? this.currentSettings.enableCustomServers
+              ? this.currentSettings.moneroLightwalletServer
+              : defaults.moneroLightwalletServer
+            : this.currentSettings.enableCustomMonerod
+            ? this.currentSettings.monerodServer
+            : defaults.monerodServer
 
         try {
-          // LWS setup: API key and login
-          const isEdgeLws = daemonAddress === this.networkInfo.edgeLwsServer
+          // LWS-specific setup: API key and login
           let loginResult: LoginResponse | undefined
-          await this.tools.cppBridge.setLwsApiKey(
-            isEdgeLws ? this.initOptions.edgeApiKey : ''
-          )
-          if (isEdgeLws) {
-            loginResult = await this.loginToLwsServer(
-              daemonAddress,
-              this.walletInfo.keys.moneroAddress,
-              this.walletInfo.keys.moneroViewKeyPrivate
+          if (backend === 'lws') {
+            const isEdgeLws = daemonAddress === this.networkInfo.edgeLwsServer
+            await this.tools.cppBridge.setLwsApiKey(
+              isEdgeLws ? this.initOptions.edgeApiKey : ''
             )
+            if (isEdgeLws) {
+              loginResult = await this.loginToLwsServer(
+                daemonAddress,
+                this.walletInfo.keys.moneroAddress,
+                this.walletInfo.keys.moneroViewKeyPrivate
+              )
+            }
           }
 
           // Resolve birthday height (never open a wallet with height 0)
           const birthdayHeight = await this.resolveBirthdayHeight(
             keys.birthdayHeight,
+            backend,
             daemonAddress,
+            defaults.moneroLightwalletServer,
             loginResult
           )
 
           await this.tools.cppBridge.openWallet(
             base64UrlWalletId,
-            'lws',
+            backend,
             keys.moneroKey,
             base64url.stringify(base64.parse(keys.dataKey)),
             this.networkInfo.networkType,
@@ -188,7 +209,9 @@ export class MoneroEngine extends CurrencyEngine<
    */
   private async resolveBirthdayHeight(
     height: number | undefined,
+    backend: WalletBackend,
     daemonAddress: string,
+    edgeLwsServer: string,
     loginResult?: LoginResponse
   ): Promise<number> {
     if (height != null) return height
@@ -198,12 +221,20 @@ export class MoneroEngine extends CurrencyEngine<
       return loginResult.start_height
     }
 
-    // Fall back to getAddressInfo
+    // For monerod wallets, fall back to the Edge LWS server
+    const serverUrl = backend === 'lws' ? daemonAddress : edgeLwsServer
     const addressInfo = await this.getAddressInfo(
-      daemonAddress,
+      serverUrl,
       this.walletInfo.keys.moneroAddress,
       this.walletInfo.keys.moneroViewKeyPrivate
     )
+
+    if (addressInfo.start_height === 0) {
+      throw new Error(
+        'Cannot open wallet: birthdayHeight is 0. ' +
+          'The wallet creation height could not be determined.'
+      )
+    }
     return addressInfo.start_height
   }
 
@@ -531,7 +562,7 @@ export class MoneroEngine extends CurrencyEngine<
     await this.clearBlockchainCache()
     await this.tools.cppBridge.deleteWallet(
       base64url.stringify(base64.parse(this.walletId)),
-      'lws'
+      this.currentWalletSettings.backend
     )
     await this.startEngine()
   }
@@ -542,9 +573,30 @@ export class MoneroEngine extends CurrencyEngine<
       return
     }
 
-    this.currentSettings = newSettings
-    await this.killEngine()
-    await this.startEngine()
+    this.settingsChangeQueue = this.settingsChangeQueue.then(async () => {
+      this.currentSettings = newSettings
+      await this.killEngine()
+      await this.startEngine()
+    })
+    await this.settingsChangeQueue
+  }
+
+  async changeWalletSettings(walletSettings: JsonObject): Promise<void> {
+    const newSettings = asMaybe(asMoneroWalletSettings)(walletSettings)
+    if (
+      newSettings == null ||
+      matchJson(this.currentWalletSettings, newSettings)
+    ) {
+      return
+    }
+
+    this.settingsChangeQueue = this.settingsChangeQueue.then(async () => {
+      this.currentWalletSettings = newSettings
+      await this.killEngine()
+      await this.clearBlockchainCache()
+      await this.startEngine()
+    })
+    await this.settingsChangeQueue
   }
 
   async getMaxSpendable(edgeSpendInfo: EdgeSpendInfo): Promise<string> {

src/monero/moneroInfo.ts

@@ -41,6 +41,7 @@ export const currencyInfo: EdgeCurrencyInfo = {
   ],
 
   defaultSettings,
+  hasWalletSettings: true,
 
   unsafeSyncNetwork: true,
   chainDisplayName: 'Monero',

src/monero/moneroTypes.ts

@@ -6,9 +6,14 @@ import {
   asObject,
   asOptional,
   asString,
+  asValue,
   Cleaner
 } from 'cleaners'
-import type { NetworkType, WalletEventData } from 'react-native-monero-lwsf'
+import type {
+  NetworkType,
+  WalletBackend,
+  WalletEventData
+} from 'react-native-monero-lwsf'
 import { TransactionPriority } from 'react-native-monero-lwsf'
 import type { Subscriber } from 'yaob'
 
@@ -33,6 +38,11 @@ export const asMoneroUserSettings = asObject({
 })
 export type MoneroUserSettings = ReturnType<typeof asMoneroUserSettings>
 
+export const asMoneroWalletSettings = asObject({
+  backend: asMaybe<WalletBackend>(asValue('lws', 'monerod'), 'lws')
+})
+export type MoneroWalletSettings = ReturnType<typeof asMoneroWalletSettings>
+
 export const asMoneroKeyOptions = asObject({
   birthdayHeight: asNumber
 })