@exodus/headless 2.0.0-alpha.46 → 2.0.0-alpha.47

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.
 
+## [2.0.0-alpha.47](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/headless@2.0.0-alpha.46...@exodus/headless@2.0.0-alpha.47) (2023-06-18)
+
+### Features
+
+- use(wallet) ([#1994](https://github.com/ExodusMovement/exodus-hydra/issues/1994)) ([6686257](https://github.com/ExodusMovement/exodus-hydra/commit/668625744087ee77068fc64671ce80ea0c3c62a4))
+
 ## [2.0.0-alpha.46](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/headless@2.0.0-alpha.45...@exodus/headless@2.0.0-alpha.46) (2023-06-18)
 
 ### Features

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/headless",
-  "version": "2.0.0-alpha.46",
+  "version": "2.0.0-alpha.47",
   "description": "The headless Exodus wallet SDK",
   "author": "Exodus Movement Inc",
   "main": "src/index.js",
@@ -88,5 +88,5 @@
     "nock": "^13.3.1",
     "p-defer": "^4.0.0"
   },
-  "gitHead": "9946e9d678eb80b4cb7de96fb76c804ae5e31fc9"
+  "gitHead": "003665277a4a7ee772af60ab555f5692b1f840f6"
 }

package/src/api.js

@@ -5,13 +5,10 @@ const createApi = ({ ioc, port }) => {
 
   const { assetsModule } = ioc.getByType('adapter')
 
-  const { application, enabledAssets, remoteConfig, wallet } = ioc.getByType('module')
+  const { enabledAssets, remoteConfig } = ioc.getByType('module')
 
   const { feeMonitors, nftsMonitor } = ioc.getByType('monitor')
 
-  // TODO: decide where this belongs
-  const { passphraseCache } = ioc.getAll()
-
   // TODO: do this on 'unload'
   const stop = () => {
     remoteConfig.stop()
@@ -21,28 +18,6 @@ const createApi = ({ ioc, port }) => {
 
   return {
     ...Object.assign({}, ...Object.values(apis)),
-    wallet: {
-      exists: () => wallet.exists(),
-      start: application.start,
-      load: application.load,
-      unload: application.unload,
-      create: application.create,
-      lock: application.lock,
-      unlock: application.unlock,
-      import: application.import,
-      delete: application.delete,
-      getMnemonic: application.getMnemonic,
-      setBackedUp: application.setBackedUp,
-      changePassphrase: application.changePassphrase,
-      restoreFromCurrentPhrase: async ({ passphrase } = {}) => {
-        if (!passphrase) passphrase = await passphraseCache.get()
-        const mnemonic = await application.getMnemonic({ passphrase })
-
-        await application.import({ passphrase, mnemonic })
-      },
-      changeLockTimer: application.changeLockTimer,
-      isLocked: () => wallet.isLocked(),
-    },
     assets: {
       enable: enabledAssets.enable,
       disable: enabledAssets.disable,

package/src/dependencies/atoms.js

@@ -1,8 +1,4 @@
-import {
-  createInMemoryAtom,
-  createRemoteConfigAtomFactory,
-  createStorageAtomFactory,
-} from '@exodus/atoms'
+import { createRemoteConfigAtomFactory, createStorageAtomFactory } from '@exodus/atoms'
 import { availableAssetNamesAtomDefinition } from '@exodus/available-assets/atoms'
 import { balancesAtomDefinition } from '@exodus/balances/atoms'
 import {
@@ -12,18 +8,10 @@ import {
 
 import baseAssetNamesToMonitorAtomDefinition from '../atoms/base-asset-names-to-monitor'
 import nonDustBalanceAssetNamesAtomDefinition from '../atoms/non-dust-balance-asset-names-atom'
-import restoreAtomDefinition from '../atoms/restore'
 import { withType } from './utils'
 
 const createAtomDependencies = () =>
   [
-    {
-      definition: {
-        id: 'lockedAtom',
-        factory: () => createInMemoryAtom({ defaultValue: true }),
-        dependencies: [],
-      },
-    },
     {
       definition: enabledAndDisabledAssetsAtomDefinition,
       storage: { namespace: 'enabledAssets' },
@@ -65,7 +53,6 @@ const createAtomDependencies = () =>
     },
     { definition: balancesAtomDefinition },
     { definition: baseAssetNamesToMonitorAtomDefinition },
-    { definition: restoreAtomDefinition },
   ].map(withType('atom'))
 
 export default createAtomDependencies

package/src/dependencies/modules.js

@@ -4,7 +4,6 @@ import enabledAssetsModuleDefinition from '@exodus/enabled-assets/module'
 import createExodusPricingClient from '@exodus/exodus-pricing-client'
 import createKeyIdentifierProvider from '@exodus/key-identifier-provider'
 import keychainDefinition from '@exodus/keychain/module'
-import walletDefinition from '@exodus/wallet/module'
 import walletCompatibilityModesDefinition from '@exodus/wallet-compatibility-modes/module'
 
 import createApplication from '../application'
@@ -30,10 +29,6 @@ const createModuleDependencies = ({ config }) =>
     {
       definition: keychainDefinition,
     },
-    {
-      definition: walletDefinition,
-      writesAtoms: ['lockedAtom'],
-    },
     {
       definition: walletCompatibilityModesDefinition,
     },

package/src/index.js

@@ -22,6 +22,7 @@ import rates from './modules/rates'
 import referrals from './modules/referrals'
 import remoteConfig from './modules/remote-config'
 import topMovers from './modules/top-movers'
+import wallet from './modules/wallet'
 import walletAccounts from './modules/wallet-accounts'
 import attachPlugins from './plugins/attach'
 
@@ -29,6 +30,7 @@ const createExodus = ({ adapters, config, port }) => {
   const ioc = createIOC({ adapters, config })
   const { headless: headlessConfig, topMoversMonitor } = config
 
+  ioc.use(wallet())
   ioc.use(walletAccounts())
   ioc.use(blockchainMetadata())
   ioc.use(remoteConfig())

package/src/modules/wallet/api.js

@@ -0,0 +1,34 @@
+const createWalletApi = ({ wallet, application, passphraseCache }) => {
+  const restoreFromCurrentPhrase = async ({ passphrase } = {}) => {
+    if (!passphrase) passphrase = await passphraseCache.get()
+    const mnemonic = await application.getMnemonic({ passphrase })
+    await application.import({ passphrase, mnemonic })
+  }
+
+  return {
+    wallet: {
+      exists: () => wallet.exists(),
+      start: application.start,
+      load: application.load,
+      unload: application.unload,
+      create: application.create,
+      lock: application.lock,
+      unlock: application.unlock,
+      import: application.import,
+      delete: application.delete,
+      getMnemonic: application.getMnemonic,
+      setBackedUp: application.setBackedUp,
+      changePassphrase: application.changePassphrase,
+      changeLockTimer: application.changeLockTimer,
+      restoreFromCurrentPhrase,
+      isLocked: () => wallet.isLocked(),
+    },
+  }
+}
+
+export default {
+  id: 'walletApi',
+  type: 'api',
+  factory: createWalletApi,
+  dependencies: ['wallet', 'application', 'passphraseCache'],
+}

package/src/modules/wallet/index.js

@@ -0,0 +1,24 @@
+import walletDefinition from '@exodus/wallet/module'
+
+import walletApi from './api'
+import lockedAtomDefinition from './locked-atom'
+import restoreAtomDefinition from './restore-atom'
+import restorePluginDefinition from './restore-plugin'
+
+const wallet = () => {
+  return {
+    id: 'wallet',
+    definitions: [
+      {
+        definition: { type: 'module', ...walletDefinition },
+        writesAtoms: ['lockedAtom'],
+      },
+      { definition: lockedAtomDefinition },
+      { definition: restoreAtomDefinition },
+      { definition: restorePluginDefinition },
+      { definition: walletApi },
+    ],
+  }
+}
+
+export default wallet

package/src/modules/wallet/locked-atom.js

@@ -0,0 +1,10 @@
+import { createInMemoryAtom } from '@exodus/atoms'
+
+const lockedAtomDefinition = {
+  id: 'lockedAtom',
+  type: 'atom',
+  factory: () => createInMemoryAtom({ defaultValue: true }),
+  dependencies: [],
+}
+
+export default lockedAtomDefinition

package/src/{plugins/restore.js → modules/wallet/restore-plugin.js}

@@ -11,6 +11,7 @@ const restorePlugin = ({ restoreAtom }) => {
 
 export default {
   id: 'restorePlugin',
+  type: 'plugin',
   factory: restorePlugin,
   dependencies: ['restoreAtom'],
 }

package/src/plugins/index.js

@@ -1,6 +1,5 @@
 import autoEnableAssetsPlugin from '@exodus/auto-enable-assets-plugin'
 
 import logLifecyclePlugin from './log-lifecycle'
-import restorePlugin from './restore'
 
-export default [logLifecyclePlugin, restorePlugin, autoEnableAssetsPlugin]
+export default [logLifecyclePlugin, autoEnableAssetsPlugin]