edge-core-js 2.44.0 → 2.46.0

package/lib/core/currency/wallet/currency-wallet-pixie.js

@@ -16,6 +16,7 @@ import { update } from 'yaob'
 
 
 
+
 import { makeJsonFile } from '../../../util/file-helpers'
 import { makePeriodicTask, } from '../../../util/periodic-task'
 import { snooze } from '../../../util/snooze'
@@ -45,9 +46,14 @@ import {
   loadSeenTxCheckpointFile,
   loadTokensFile,
   loadTxFileNames,
+  loadWalletSettingsFile,
   writeTokensFile
 } from './currency-wallet-files'
-import { initialTokenIds } from './currency-wallet-reducer'
+import {
+
+  initialTokenIds,
+  initialWalletSettings
+} from './currency-wallet-reducer'
 import { tokenIdsToCurrencyCodes, uniqueStrings } from './enabled-tokens'
 
 
@@ -118,6 +124,11 @@ export const walletPixie = combinePixies({
       // so the engine can start in the right state:
       await loadTokensFile(input)
 
+      const { hasWalletSettings = false } = walletState.currencyInfo
+      if (hasWalletSettings) {
+        await loadWalletSettingsFile(input)
+      }
+
       // Start the engine:
       const accountState = state.accounts[accountId]
       const engine = await plugin.makeCurrencyEngine(publicWalletInfo, {
@@ -138,7 +149,8 @@ export const walletPixie = combinePixies({
         // User settings:
         customTokens: _nullishCoalesce(accountState.customTokens[pluginId], () => ( {})),
         enabledTokenIds: input.props.walletState.allEnabledTokenIds,
-        userSettings: _nullishCoalesce(accountState.userSettings[pluginId], () => ( {}))
+        userSettings: _nullishCoalesce(accountState.userSettings[pluginId], () => ( {})),
+        walletSettings: input.props.walletState.walletSettings
       })
       input.onOutput(engine)
 
@@ -462,7 +474,8 @@ export const walletPixie = combinePixies({
 
   watcher(input) {
     let lastState
-    let lastSettings = {}
+    let lastUserSettings = {}
+    let lastWalletSettings = initialWalletSettings
     let lastTokens = {}
     let lastEnabledTokenIds = initialTokenIds
 
@@ -480,11 +493,12 @@ export const walletPixie = combinePixies({
       lastState = walletState
 
       // Update engine settings:
-      const userSettings = _nullishCoalesce(accountState.userSettings[pluginId], () => ( lastSettings))
-      if (lastSettings !== userSettings && engine != null) {
+      const userSettings =
+        _nullishCoalesce(accountState.userSettings[pluginId], () => ( lastUserSettings))
+      if (lastUserSettings !== userSettings && engine != null) {
         await engine.changeUserSettings(userSettings)
       }
-      lastSettings = userSettings
+      lastUserSettings = userSettings
 
       // Update the custom tokens:
       const customTokens = _nullishCoalesce(accountState.customTokens[pluginId], () => ( lastTokens))
@@ -505,6 +519,22 @@ export const walletPixie = combinePixies({
       }
       lastTokens = customTokens
 
+      // Update wallet-scoped settings:
+      const { hasWalletSettings = false } = walletState.currencyInfo
+      const { walletSettings } = walletState
+      const settingsChanged = lastWalletSettings !== walletSettings
+
+      if (
+        settingsChanged &&
+        _optionalChain([engine, 'optionalAccess', _5 => _5.changeWalletSettings]) != null &&
+        hasWalletSettings
+      ) {
+        await engine.changeWalletSettings(walletSettings).catch(error => {
+          input.props.onError(error)
+        })
+      }
+      lastWalletSettings = walletSettings
+
       // Update enabled tokens:
       const { allEnabledTokenIds } = walletState
       if (lastEnabledTokenIds !== allEnabledTokenIds && engine != null) {

package/lib/core/currency/wallet/currency-wallet-reducer.js

@@ -15,6 +15,7 @@ import { buildReducer, filterReducer, memoizeReducer } from 'redux-keto'
 
 
 
+
 import { compare } from '../../../util/compare'
 
 import { findCurrencyPluginId } from '../../plugins/plugins-selectors'
@@ -117,6 +118,9 @@ import { uniqueStrings } from './enabled-tokens'
 
 
 
+
+
+export const initialWalletSettings = {}
 
 // Used for detectedTokenIds & enabledTokenIds:
 export const initialTokenIds = []
@@ -250,6 +254,16 @@ const currencyWalletInner = buildReducer
     }
   },
 
+  walletSettings(state = initialWalletSettings, action) {
+    switch (action.type) {
+      case 'CURRENCY_WALLET_LOADED_WALLET_SETTINGS_FILE':
+      case 'CURRENCY_WALLET_CHANGED_WALLET_SETTINGS':
+        return action.payload.walletSettings
+      default:
+        return state
+    }
+  },
+
   engineFailure(state = null, action) {
     if (action.type === 'CURRENCY_ENGINE_FAILED') {
       const { error } = action.payload

package/lib/core/login/splitting.js

@@ -172,18 +172,14 @@ export async function splitWalletInfo(
   // Restore anything that has simply been deleted:
   if (toRestore.length > 0) {
     const newStates = {}
-    let hasChanges = false
     for (const existingWalletInfo of toRestore) {
-      if (existingWalletInfo.archived || existingWalletInfo.deleted) {
-        hasChanges = true
-        newStates[existingWalletInfo.id] = {
-          archived: false,
-          deleted: false,
-          migratedFromWalletId: existingWalletInfo.migratedFromWalletId
-        }
+      newStates[existingWalletInfo.id] = {
+        archived: false,
+        deleted: false,
+        migratedFromWalletId: existingWalletInfo.migratedFromWalletId
       }
     }
-    if (hasChanges) await changeWalletStates(ai, accountId, newStates)
+    await changeWalletStates(ai, accountId, newStates)
   }
 
   // Add the keys to the login: