@exodus/headless 3.1.0 → 3.1.1

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.1.1](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/headless@3.1.0...@exodus/headless@3.1.1) (2024-01-29)
+
+### Bug Fixes
+
+- **headless:** lockedAtom writes ([#5555](https://github.com/ExodusMovement/exodus-hydra/issues/5555)) ([aa24ca0](https://github.com/ExodusMovement/exodus-hydra/commit/aa24ca03d07e5b47ef2d1bd08de22a569496c6a2))
+
 ## [3.1.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/headless@3.0.0...@exodus/headless@3.1.0) (2024-01-27)
 
 ### Features

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/headless",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "The platform-agnostic Exodus wallet SDK",
   "author": "Exodus Movement Inc.",
   "main": "src/index.js",
@@ -44,7 +44,7 @@
     "@exodus/geolocation": "^4.1.0",
     "@exodus/hd-key-slip-10": "^2.0.0",
     "@exodus/key-identifier-provider": "^1.4.0",
-    "@exodus/keychain": "^4.3.0",
+    "@exodus/keychain": "^5.0.1",
     "@exodus/locale": "^2.0.2",
     "@exodus/module": "^1.2.2",
     "@exodus/pricing": "^1.1.0",
@@ -102,5 +102,5 @@
     "msw": "^2.0.0",
     "p-defer": "^4.0.0"
   },
-  "gitHead": "38053d333d27638496b513254340e94a230d86fc"
+  "gitHead": "5f285cee06abaf98437619a5a8aa5381b8eefc36"
 }

package/src/application/module/application.js

@@ -33,6 +33,7 @@ class Application extends ExodusModule {
   #hooks = {}
   #wallet = null
   #storage = null
+  #lockedAtom = null
   #backedUpAtom = null
   #passphraseCache = null
   #applicationStarted = null
@@ -41,6 +42,7 @@ class Application extends ExodusModule {
   constructor({
     wallet,
     unsafeStorage,
+    lockedAtom,
     backedUpAtom,
     passphraseCache = passphraseCachePlaceholder,
     logger,
@@ -48,6 +50,7 @@ class Application extends ExodusModule {
     super({ name: 'Application', logger })
 
     this.#wallet = wallet
+    this.#lockedAtom = lockedAtom
     this.#backedUpAtom = backedUpAtom
     this.#passphraseCache = passphraseCache
     this.#storage = unsafeStorage.namespace('flags')
@@ -216,6 +219,7 @@ class Application extends ExodusModule {
 
     await this.#applicationStarted
     await this.#wallet.lock(opts)
+    await this.#lockedAtom.set(true)
     await this.#passphraseCache.clear()
     await this.fire(Hook.Lock)
 
@@ -251,6 +255,7 @@ class Application extends ExodusModule {
       this._logger.log('unlocking with cache')
 
       await this.#wallet.unlock({ passphrase })
+      await this.#lockedAtom.set(false)
 
       await this.fire(Hook.Migrate)
       await this.fire(Hook.Unlock)
@@ -268,6 +273,7 @@ class Application extends ExodusModule {
 
     await this.#applicationStarted
     await this.#wallet.unlock({ passphrase })
+    await this.#lockedAtom.set(false)
 
     await this.fire(Hook.Migrate)
     await this.fire(Hook.Unlock)

package/src/application/module/index.js

@@ -4,7 +4,14 @@ const applicationDefinition = {
   id: 'application',
   type: 'module',
   factory: createApplication,
-  dependencies: ['unsafeStorage', 'backedUpAtom', 'passphraseCache?', 'wallet', 'logger'],
+  dependencies: [
+    'unsafeStorage',
+    'backedUpAtom',
+    'lockedAtom',
+    'passphraseCache?',
+    'wallet',
+    'logger',
+  ],
 }
 
 export default applicationDefinition

package/src/application/plugins/lifecycle.js

@@ -30,14 +30,6 @@ const applicationLifecyclePlugin = ({
     await restoreAtom.set(false)
   }
 
-  const onLock = async () => {
-    await lockedAtom.set(true)
-  }
-
-  const onUnlock = async () => {
-    await lockedAtom.set(false)
-  }
-
   const onBackup = async () => {
     await backedUpAtom.set(true)
   }
@@ -50,7 +42,7 @@ const applicationLifecyclePlugin = ({
     await backedUpAtom.set(undefined)
   }
 
-  return { onStart, onLoad, onImport, onAssetsSynced, onLock, onUnlock, onBackup, onStop, onClear }
+  return { onStart, onLoad, onImport, onAssetsSynced, onBackup, onStop, onClear }
 }
 
 const applicationLifecyclePluginDefinition = {

package/src/index.js

@@ -22,6 +22,7 @@ import walletAccounts from '@exodus/wallet-accounts'
 
 import createApi from './api'
 import application from './application'
+import createDependencies from './dependencies'
 import createIOC from './ioc'
 import attachMigrations from './migrations/attach'
 import attachPlugins from './plugins/attach'
@@ -52,6 +53,7 @@ const createExodus = ({ adapters, config, port, debug = false }) => {
   ioc.use(wallet())
   ioc.use(walletAccounts())
 
+  ioc.registerMultiple(createDependencies({ adapters, config }))
   ioc.register({ definition: { id: 'port', type: 'port', factory: () => port } })
 
   const resolve = () => {

package/src/ioc.js

@@ -11,8 +11,6 @@ import performanceMonitor from '@exodus/dependency-preprocessors/src/preprocesso
 import readOnlyAtoms from '@exodus/dependency-preprocessors/src/preprocessors/read-only-atoms'
 import assert from 'minimalistic-assert'
 
-import createDependencies from './dependencies'
-
 const createIOC = ({ adapters, config, debug }) => {
   const { createLogger, unsafeStorage, performance = {} } = adapters
   const {
@@ -52,7 +50,7 @@ const createIOC = ({ adapters, config, debug }) => {
     debuggerPreprocessor({ debug, unsafeStorage }),
   ].filter(Boolean)
 
-  const nodes = createDependencies({ adapters, config })
+  const nodes = []
 
   const registerMultiple = (dependencies) => {
     nodes.push(...dependencies)

package/src/unlock-encrypted-storage.js

@@ -1,13 +1,17 @@
 import { EXODUS_KEY_IDS } from '@exodus/keychain/module'
+import sodium from '@exodus/sodium-crypto'
+
+const WALLET_INFO_KEY = EXODUS_KEY_IDS.WALLET_INFO
 
 const createUnlockEncryptedStorage = ({ keychain }) => {
   return async (encryptedStorage) => {
-    // should the key id be part of a `config` dep?
-    const sodiumEncryptor = keychain.createSodiumEncryptor(EXODUS_KEY_IDS.WALLET_INFO)
+    // Fusion might write on storage even after keychain is locked, so we get keys
+    // directly instead of creating encryptor that does not preserves it anymore
+    const { privateKey } = await keychain.exportKey(WALLET_INFO_KEY, { exportPrivate: true })
 
     await encryptedStorage.unlock({
-      encrypt: (data) => sodiumEncryptor.encryptSecretBox({ data }),
-      decrypt: (data) => sodiumEncryptor.decryptSecretBox({ data }),
+      encrypt: (data) => sodium.encryptSecret(data, privateKey),
+      decrypt: (data) => sodium.decryptSecret(data, privateKey),
     })
   }
 }