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

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 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
+
+- use(featureFlags, apyRates, fees, addressProvider) ([#1993](https://github.com/ExodusMovement/exodus-hydra/issues/1993)) ([5aba49b](https://github.com/ExodusMovement/exodus-hydra/commit/5aba49bbea24f229900966c0abde5eb8932ac861))
+
 ## [2.0.0-alpha.45](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/headless@2.0.0-alpha.44...@exodus/headless@2.0.0-alpha.45) (2023-06-18)
 
 ### Features

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/headless",
-  "version": "2.0.0-alpha.45",
+  "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": "af48f92eb9e4b7758b6f145181c4c45a24cf5b65"
+  "gitHead": "003665277a4a7ee772af60ab555f5692b1f840f6"
 }

package/src/api.js

@@ -5,14 +5,10 @@ const createApi = ({ ioc, port }) => {
 
   const { assetsModule } = ioc.getByType('adapter')
 
-  const { addressProvider, 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()
@@ -22,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,
@@ -53,11 +27,6 @@ const createApi = ({ ioc, port }) => {
         return asset.name
       },
     },
-    addressProvider: {
-      getAddress: addressProvider.getAddress.bind(addressProvider),
-      getSupportedPurposes: addressProvider.getSupportedPurposes.bind(addressProvider),
-      getReceiveAddress: addressProvider.getReceiveAddress.bind(addressProvider),
-    },
     isMnemonicValid,
     subscribe: port.subscribe.bind(port),
     unsubscribe: port.unsubscribe.bind(port),

package/src/dependencies/atoms.js

@@ -1,31 +1,17 @@
-import { apyRatesAtomDefinition } from '@exodus/apy-rates/atoms'
-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 {
   enabledAndDisabledAssetsAtomDefinition,
   enabledAssetsAtomDefinition,
 } from '@exodus/enabled-assets/atoms'
-import { featureFlagsAtomDefinition } from '@exodus/feature-flags/atoms'
 
 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' },
@@ -66,10 +52,7 @@ const createAtomDependencies = () =>
       ],
     },
     { definition: balancesAtomDefinition },
-    { definition: featureFlagsAtomDefinition },
     { definition: baseAssetNamesToMonitorAtomDefinition },
-    { definition: restoreAtomDefinition },
-    { definition: apyRatesAtomDefinition },
   ].map(withType('atom'))
 
 export default createAtomDependencies

package/src/dependencies/index.js

@@ -4,11 +4,9 @@
 import assert from 'minimalistic-assert'
 
 import createAdapterDependencies from './adapters'
-import createAtomCollectionDependencies from './atom-collections'
 import createAtomDependencies from './atoms'
 import createConfigDependencies from './configs'
 import createModuleDependencies from './modules'
-import createMonitorDependencies from './monitors'
 import createPluginDependencies from './plugins'
 import { wrapConstant } from './utils'
 
@@ -35,12 +33,8 @@ const createDependencies = ({ adapters, config }) => {
 
   const modules = createModuleDependencies({ adapters, config })
 
-  const monitors = createMonitorDependencies({ adapters, config })
-
   const atoms = createAtomDependencies({ adapters, config })
 
-  const atomCollections = createAtomCollectionDependencies({ adapters, config })
-
   const adaptersTree = createAdapterDependencies({ adapters, config })
 
   const plugins = createPluginDependencies()
@@ -49,9 +43,7 @@ const createDependencies = ({ adapters, config }) => {
     .concat(adaptersTree)
     .concat(configs)
     .concat(modules)
-    .concat(monitors)
     .concat(atoms)
-    .concat(atomCollections)
     .concat(plugins)
     .concat(wrapConstant({ id: 'logger', type: 'module', value: logger }))
 }

package/src/dependencies/modules.js

@@ -1,12 +1,9 @@
-import createAddressProviderDependencies from '@exodus/address-provider'
 import availableAssetsModuleDefinition from '@exodus/available-assets/module'
 import balancesDefinition from '@exodus/balances/module'
 import enabledAssetsModuleDefinition from '@exodus/enabled-assets/module'
 import createExodusPricingClient from '@exodus/exodus-pricing-client'
-import featureFlagsDefinition from '@exodus/feature-flags/module'
 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'
@@ -32,10 +29,6 @@ const createModuleDependencies = ({ config }) =>
     {
       definition: keychainDefinition,
     },
-    {
-      definition: walletDefinition,
-      writesAtoms: ['lockedAtom'],
-    },
     {
       definition: walletCompatibilityModesDefinition,
     },
@@ -50,11 +43,6 @@ const createModuleDependencies = ({ config }) =>
       },
     },
     { definition: balancesDefinition, writesAtoms: ['balancesAtom'] },
-    {
-      definition: featureFlagsDefinition,
-      writesAtoms: ['featureFlagAtoms'],
-    },
-    ...createAddressProviderDependencies(config.addressProvider),
   ].map(withType('module'))
 
 export default createModuleDependencies

package/src/index.js

@@ -5,9 +5,13 @@ import attachAtoms from './atoms/attach'
 import { atomsToAttach } from './constants'
 import createIOC from './ioc'
 import abTesting from './modules/ab-testing'
+import addressProvider from './modules/address-provider'
+import apyRates from './modules/apy-rates'
 import blockchainMetadata from './modules/blockchain-metadata'
 import connectedOrigins from './modules/connected-origins'
 import cryptoNews from './modules/crypto-news'
+import featureFlags from './modules/feature-flags'
+import fees from './modules/fees'
 import geolocation from './modules/geolocation'
 import kyc from './modules/kyc'
 import locale from './modules/locale'
@@ -18,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'
 
@@ -25,12 +30,16 @@ 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())
   ioc.use(geolocation())
   ioc.use(marketHistory())
+  ioc.use(fees())
   ioc.use(rates())
+  ioc.use(apyRates())
+  ioc.use(featureFlags())
   ioc.use(locale())
   ioc.use(nfts())
   ioc.use(kyc())
@@ -40,6 +49,7 @@ const createExodus = ({ adapters, config, port }) => {
   ioc.use(personalNotes())
   ioc.use(cryptoNews())
   ioc.use(topMovers({ config: topMoversMonitor }))
+  ioc.use(addressProvider({ config: config.addressProvider }))
 
   ioc.register({ definition: { id: 'port', type: 'port', factory: () => port } })
 
@@ -48,26 +58,15 @@ const createExodus = ({ adapters, config, port }) => {
 
     const { assetsModule, storage } = ioc.getByType('adapter')
 
-    const { application, enabledAssets, featureFlags, unlockEncryptedStorage } =
-      ioc.getByType('module')
-
-    const { apyRatesMonitor, feeMonitors } = ioc.getByType('monitor')
-
-    feeMonitors.on('fees-load', () => port.emit('fees-load', feeMonitors.getAllFeeData()))
-    feeMonitors.on('fees-update', (payload) => port.emit('fees-update', payload))
+    const { application, enabledAssets, unlockEncryptedStorage } = ioc.getByType('module')
 
     application.hook('start', (payload) => {
-      featureFlags.load()
-
       port.emit('start', payload)
     })
 
     application.hook('unlock', async () => {
       if (typeof storage.unlock === 'function') unlockEncryptedStorage(storage)
 
-      feeMonitors.start()
-      apyRatesMonitor.start()
-
       await assetsModule.load()
       await enabledAssets.load()
     })
@@ -81,7 +80,6 @@ const createExodus = ({ adapters, config, port }) => {
         //
         assetsModule.clear(),
         enabledAssets.clear(),
-        featureFlags.clear(),
       ])
     })
 

package/src/modules/address-provider/api.js

@@ -0,0 +1,14 @@
+const createAddressProviderApi = ({ addressProvider }) => ({
+  addressProvider: {
+    getAddress: addressProvider.getAddress.bind(addressProvider),
+    getSupportedPurposes: addressProvider.getSupportedPurposes.bind(addressProvider),
+    getReceiveAddress: addressProvider.getReceiveAddress.bind(addressProvider),
+  },
+})
+
+export default {
+  id: 'addressProviderApi',
+  type: 'api',
+  factory: createAddressProviderApi,
+  dependencies: ['addressProvider'],
+}

package/src/modules/address-provider/index.js

@@ -0,0 +1,15 @@
+import createAddressProviderDependencies from '@exodus/address-provider'
+
+import { withType } from '../../dependencies/utils'
+import addressProviderApi from './api'
+
+const addressProvider = ({ config }) => {
+  const dependencies = createAddressProviderDependencies(config).map(withType('module'))
+
+  return {
+    id: 'addressProvider',
+    definitions: [...dependencies, { definition: addressProviderApi }],
+  }
+}
+
+export default addressProvider

package/src/modules/apy-rates/index.js

@@ -0,0 +1,20 @@
+import { apyRatesAtomDefinition } from '@exodus/apy-rates/atoms'
+import apyRatesMonitorDefinition from '@exodus/apy-rates/monitor'
+
+import apyRatesPlugin from './plugin'
+
+const apyRates = () => {
+  return {
+    id: 'apyRates',
+    definitions: [
+      {
+        definition: apyRatesMonitorDefinition,
+        writesAtoms: ['apyRatesAtom'],
+      },
+      { definition: apyRatesAtomDefinition },
+      { definition: apyRatesPlugin },
+    ],
+  }
+}
+
+export default apyRates

package/src/modules/apy-rates/plugin.js

@@ -0,0 +1,14 @@
+const createApyRatesLifecyclePlugin = ({ apyRatesMonitor }) => {
+  const onUnlock = () => {
+    apyRatesMonitor.start()
+  }
+
+  return { onUnlock }
+}
+
+export default {
+  id: 'apyRatesLifecyclePlugin',
+  type: 'plugin',
+  factory: createApyRatesLifecyclePlugin,
+  dependencies: ['apyRatesMonitor'],
+}

package/src/modules/feature-flags/index.js

@@ -0,0 +1,35 @@
+import {
+  featureFlagAtomsDefinition,
+  featureFlagsAtomDefinition,
+  remoteConfigFeatureFlagAtomsDefinition,
+} from '@exodus/feature-flags/atoms'
+import featureFlagsDefinition from '@exodus/feature-flags/module'
+
+import featureFlagsPlugin from './plugin'
+
+const featureFlags = () => {
+  return {
+    id: 'featureFlags',
+    definitions: [
+      {
+        definition: featureFlagsDefinition,
+        writesAtoms: ['featureFlagAtoms'],
+      },
+      {
+        definition: featureFlagAtomsDefinition,
+        storage: { namespace: 'featureFlags' },
+        aliases: [
+          {
+            implementationId: 'unsafeStorage',
+            interfaceId: 'storage',
+          },
+        ],
+      },
+      { definition: featureFlagsAtomDefinition },
+      { definition: remoteConfigFeatureFlagAtomsDefinition },
+      { definition: featureFlagsPlugin },
+    ],
+  }
+}
+
+export default featureFlags

package/src/modules/feature-flags/plugin.js

@@ -0,0 +1,18 @@
+const createFeatureFlagsLifecyclePlugin = ({ featureFlags }) => {
+  const onStart = () => {
+    featureFlags.load()
+  }
+
+  const onClear = async () => {
+    await featureFlags.clear()
+  }
+
+  return { onStart, onClear }
+}
+
+export default {
+  id: 'featureFlagsLifecyclePlugin',
+  type: 'plugin',
+  factory: createFeatureFlagsLifecyclePlugin,
+  dependencies: ['featureFlags'],
+}

package/src/modules/fees/index.js

@@ -0,0 +1,16 @@
+import feeMonitorsDefinition from '@exodus/fee-monitors/monitor'
+
+import feesPlugin from './plugin'
+
+const fees = () => {
+  return {
+    id: 'fees',
+    definitions: [
+      // ...
+      { definition: feeMonitorsDefinition },
+      { definition: feesPlugin },
+    ],
+  }
+}
+
+export default fees

package/src/modules/fees/plugin.js

@@ -0,0 +1,17 @@
+const createFeesLifecyclePlugin = ({ feeMonitors, port }) => {
+  feeMonitors.on('fees-load', () => port.emit('fees-load', feeMonitors.getAllFeeData()))
+  feeMonitors.on('fees-update', (payload) => port.emit('fees-update', payload))
+
+  const onUnlock = () => {
+    feeMonitors.start()
+  }
+
+  return { onUnlock }
+}
+
+export default {
+  id: 'feesLifecyclePlugin',
+  type: 'plugin',
+  factory: createFeesLifecyclePlugin,
+  dependencies: ['feeMonitors', 'port'],
+}

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]

package/src/dependencies/atom-collections.js

@@ -1,25 +0,0 @@
-import {
-  featureFlagAtomsDefinition,
-  remoteConfigFeatureFlagAtomsDefinition,
-} from '@exodus/feature-flags/atoms'
-
-import { withType } from './utils'
-
-const createAtomCollectionDependencies = () =>
-  [
-    {
-      definition: remoteConfigFeatureFlagAtomsDefinition,
-    },
-    {
-      definition: featureFlagAtomsDefinition,
-      storage: { namespace: 'featureFlags' },
-      aliases: [
-        {
-          implementationId: 'unsafeStorage',
-          interfaceId: 'storage',
-        },
-      ],
-    },
-  ].map(withType('atom-collection'))
-
-export default createAtomCollectionDependencies

package/src/dependencies/monitors.js

@@ -1,15 +0,0 @@
-import apyRatesMonitorDefinition from '@exodus/apy-rates/monitor'
-import feeMonitorsDefinition from '@exodus/fee-monitors/monitor'
-
-import { withType } from './utils'
-
-const createMonitorDependencies = ({ config }) =>
-  [
-    { definition: feeMonitorsDefinition },
-    {
-      definition: apyRatesMonitorDefinition,
-      writesAtoms: ['apyRatesAtom'],
-    },
-  ].map(withType('monitor'))
-
-export default createMonitorDependencies