refactor: require native shared components implementation

demo/package.json

@@ -13,6 +13,10 @@
     "faber": "ts-node src/FaberInquirer.ts",
     "refresh": "rm -rf ./node_modules ./yarn.lock && yarn"
   },
+  "dependencies": {
+    "@hyperledger/indy-vdr-shared": "^0.1.0-dev.6",
+    "@hyperledger/anoncreds-shared": "^0.1.0-dev.6"
+  },
   "devDependencies": {
     "@aries-framework/anoncreds": "*",
     "@aries-framework/anoncreds-rs": "*",

demo/src/BaseAgent.ts

@@ -25,6 +25,8 @@ import {
 import { IndySdkAnonCredsRegistry, IndySdkModule, IndySdkSovDidResolver } from '@aries-framework/indy-sdk'
 import { IndyVdrAnonCredsRegistry, IndyVdrModule, IndyVdrSovDidResolver } from '@aries-framework/indy-vdr'
 import { agentDependencies, HttpInboundTransport } from '@aries-framework/node'
+import { anoncreds } from '@hyperledger/anoncreds-shared'
+import { indyVdr } from '@hyperledger/indy-vdr-shared'
 import { randomUUID } from 'crypto'
 import indySdk from 'indy-sdk'
 
@@ -123,10 +125,12 @@ function getAskarAnonCredsIndyModules() {
       ],
     }),
     anoncreds: new AnonCredsModule({
+      anoncreds,
       registries: [new IndyVdrAnonCredsRegistry()],
     }),
     anoncredsRs: new AnonCredsRsModule(),
     indyVdr: new IndyVdrModule({
+      indyVdr,
       networks: [indyNetworkConfig],
     }),
     dids: new DidsModule({
@@ -164,6 +168,7 @@ function getLegacyIndySdkModules() {
       ],
     }),
     anoncreds: new AnonCredsModule({
+      anoncreds,
       registries: [new IndySdkAnonCredsRegistry()],
     }),
     indySdk: new IndySdkModule({

packages/anoncreds-rs/tests/indy-flow.test.ts

@@ -27,6 +27,7 @@ import {
   ProofState,
   ProofExchangeRecord,
 } from '@aries-framework/core'
+import { anoncreds } from '@hyperledger/anoncreds-nodejs'
 import { Subject } from 'rxjs'
 
 import { InMemoryStorageService } from '../../../tests/InMemoryStorageService'
@@ -39,6 +40,7 @@ import { AnonCredsRsVerifierService } from '../src/services/AnonCredsRsVerifierS
 
 const registry = new InMemoryAnonCredsRegistry()
 const anonCredsModuleConfig = new AnonCredsModuleConfig({
+  anoncreds,
   registries: [registry],
 })
 

packages/anoncreds/package.json

@@ -31,6 +31,8 @@
   },
   "devDependencies": {
     "@aries-framework/node": "0.3.3",
+    "@hyperledger/indy-vdr-nodejs": "^0.1.0-dev.6",
+    "@hyperledger/anoncreds-nodejs": "^0.1.0-dev.6",
     "indy-sdk": "^1.16.0-dev-1636",
     "rimraf": "^4.0.7",
     "rxjs": "^7.8.0",

packages/anoncreds/src/AnonCredsModuleConfig.ts

@@ -1,10 +1,47 @@
 import type { AnonCredsRegistry } from './services'
+import type { Anoncreds } from '@hyperledger/anoncreds-shared'
 
 /**
  * @public
  * AnonCredsModuleConfigOptions defines the interface for the options of the AnonCredsModuleConfig class.
  */
 export interface AnonCredsModuleConfigOptions {
+  /**
+   *
+   * ## Node.JS
+   *
+   * ```ts
+   * import { anoncreds } from '@hyperledger/anoncreds-nodejs'
+   *
+   * const agent = new Agent({
+   *  config: {},
+   *  dependencies: agentDependencies,
+   *  modules: {
+   *   anoncreds: new AnoncredsModule({
+   *      anoncreds,
+   *   })
+   *  }
+   * })
+   * ```
+   *
+   * ## React Native
+   *
+   * ```ts
+   * import { anoncreds } from '@hyperledger/anoncreds-react-native'
+   *
+   * const agent = new Agent({
+   *  config: {},
+   *  dependencies: agentDependencies,
+   *  modules: {
+   *   anoncreds: new AnoncredsModule({
+   *      anoncreds,
+   *   })
+   *  }
+   * })
+   * ```
+   */
+  anoncreds: Anoncreds
+
   /**
    * A list of AnonCreds registries to make available to the AnonCreds module.
    */

packages/anoncreds/src/__tests__/AnonCredsModule.test.ts

@@ -1,6 +1,8 @@
 import type { AnonCredsRegistry } from '../services'
 import type { DependencyManager } from '@aries-framework/core'
 
+import { anoncreds } from '@hyperledger/anoncreds-nodejs'
+
 import { AnonCredsModule } from '../AnonCredsModule'
 import { AnonCredsModuleConfig } from '../AnonCredsModuleConfig'
 import {
@@ -22,6 +24,7 @@ const registry = {} as AnonCredsRegistry
 describe('AnonCredsModule', () => {
   test('registers dependencies on the dependency manager', () => {
     const anonCredsModule = new AnonCredsModule({
+      anoncreds,
       registries: [registry],
     })
     anonCredsModule.register(dependencyManager)

packages/anoncreds/src/__tests__/AnonCredsModuleConfig.test.ts

@@ -1,12 +1,15 @@
 import type { AnonCredsRegistry } from '../services'
 
+import { anoncreds } from '@hyperledger/anoncreds-nodejs'
+
 import { AnonCredsModuleConfig } from '../AnonCredsModuleConfig'
 
 describe('AnonCredsModuleConfig', () => {
   test('sets values', () => {
     const registry = {} as AnonCredsRegistry
 
     const config = new AnonCredsModuleConfig({
+      anoncreds,
       registries: [registry],
     })
 

packages/anoncreds/src/formats/__tests__/legacy-indy-format-services.test.ts

@@ -10,6 +10,7 @@ import {
   ProofState,
   EventEmitter,
 } from '@aries-framework/core'
+import { anoncreds } from '@hyperledger/anoncreds-nodejs'
 import * as indySdk from 'indy-sdk'
 import { Subject } from 'rxjs'
 
@@ -37,6 +38,7 @@ import { LegacyIndyProofFormatService } from '../LegacyIndyProofFormatService'
 
 const registry = new InMemoryAnonCredsRegistry()
 const anonCredsModuleConfig = new AnonCredsModuleConfig({
+  anoncreds,
   registries: [registry],
 })
 

packages/anoncreds/src/services/registry/__tests__/AnonCredsRegistryService.test.ts

@@ -1,5 +1,7 @@
 import type { AnonCredsRegistry } from '../AnonCredsRegistry'
 
+import { anoncreds } from '@hyperledger/anoncreds-nodejs'
+
 import { getAgentContext } from '../../../../../core/tests/helpers'
 import { AnonCredsModuleConfig } from '../../../AnonCredsModuleConfig'
 import { AnonCredsError } from '../../../error'
@@ -18,6 +20,7 @@ const agentContext = getAgentContext({
     [
       AnonCredsModuleConfig,
       new AnonCredsModuleConfig({
+        anoncreds,
         registries: [registryOne, registryTwo],
       }),
     ],

packages/anoncreds/tests/anoncreds.test.ts

@@ -1,5 +1,6 @@
 import { Agent, KeyDerivationMethod, KeyType, TypedArrayEncoder } from '@aries-framework/core'
 import { agentDependencies } from '@aries-framework/node'
+import { anoncreds } from '@hyperledger/anoncreds-nodejs'
 import * as indySdk from 'indy-sdk'
 
 import { IndySdkModule } from '../../indy-sdk/src/IndySdkModule'
@@ -85,6 +86,7 @@ const agent = new Agent({
       indySdk,
     }),
     anoncreds: new AnonCredsModule({
+      anoncreds,
       registries: [
         new InMemoryAnonCredsRegistry({
           existingSchemas,

packages/anoncreds/tests/legacyAnonCredsSetup.ts

@@ -27,6 +27,8 @@ import {
   V2ProofProtocol,
   DidsModule,
 } from '@aries-framework/core'
+import { anoncreds } from '@hyperledger/anoncreds-nodejs'
+import { indyVdr } from '@hyperledger/indy-vdr-nodejs'
 import { randomUUID } from 'crypto'
 
 import { AnonCredsRsModule } from '../../anoncreds-rs/src'
@@ -95,6 +97,7 @@ export const getLegacyAnonCredsModules = ({
       ],
     }),
     anoncreds: new AnonCredsModule({
+      anoncreds,
       registries: [new IndySdkAnonCredsRegistry()],
     }),
     dids: new DidsModule({
@@ -149,10 +152,12 @@ export const getAskarAnonCredsIndyModules = ({
       ],
     }),
     anoncreds: new AnonCredsModule({
+      anoncreds,
       registries: [new IndyVdrAnonCredsRegistry()],
     }),
     anoncredsRs: new AnonCredsRsModule(),
     indyVdr: new IndyVdrModule({
+      indyVdr,
       networks: [indyNetworkConfig],
     }),
     dids: new DidsModule({

packages/askar/src/AskarModule.ts

@@ -1,33 +1,18 @@
+import type { AskarModuleConfigOptions } from './AskarModuleConfig'
 import type { DependencyManager, Module } from '@aries-framework/core'
 
-import { AriesFrameworkError, InjectionSymbols } from '@aries-framework/core'
-
+import { AskarModuleConfig } from './AskarModuleConfig'
 import { AskarStorageService } from './storage'
-import { AskarWallet } from './wallet'
 
 export class AskarModule implements Module {
-  public register(dependencyManager: DependencyManager) {
-    try {
-      // eslint-disable-next-line import/no-extraneous-dependencies
-      require('@hyperledger/aries-askar-nodejs')
-    } catch (error) {
-      try {
-        require('@hyperledger/aries-askar-react-native')
-      } catch (error) {
-        throw new Error('Could not load aries-askar bindings')
-      }
-    }
+  public readonly config: AskarModuleConfig
 
-    if (dependencyManager.isRegistered(InjectionSymbols.Wallet)) {
-      throw new AriesFrameworkError('There is an instance of Wallet already registered')
-    } else {
-      dependencyManager.registerContextScoped(InjectionSymbols.Wallet, AskarWallet)
-    }
+  public constructor(config: AskarModuleConfigOptions) {
+    this.config = new AskarModuleConfig(config)
+  }
+  public register(dependencyManager: DependencyManager) {
+    dependencyManager.registerInstance(AskarModuleConfig, this.config)
 
-    if (dependencyManager.isRegistered(InjectionSymbols.StorageService)) {
-      throw new AriesFrameworkError('There is an instance of StorageService already registered')
-    } else {
-      dependencyManager.registerSingleton(InjectionSymbols.StorageService, AskarStorageService)
-    }
+    dependencyManager.registerSingleton(AskarStorageService)
   }
 }

packages/askar/src/AskarModuleConfig.ts

@@ -0,0 +1,65 @@
+import type { AskarWalletPostgresConfig } from './wallet'
+import type { AriesAskar } from '@hyperledger/aries-askar-shared'
+
+/**
+ * @public
+ * AnonCredsModuleConfigOptions defines the interface for the options of the AnonCredsModuleConfig class.
+ */
+export interface AskarModuleConfigOptions {
+  /**
+   *
+   * ## Node.JS
+   *
+   * ```ts
+   * import { ariesAskar } from '@hyperledger/aries-askar-nodejs'
+   *
+   * const agent = new Agent({
+   *  config: {},
+   *  dependencies: agentDependencies,
+   *  modules: {
+   *   ariesAskar: new AskarModule({
+   *      ariesAskar,
+   *   })
+   *  }
+   * })
+   * ```
+   *
+   * ## React Native
+   *
+   * ```ts
+   * import { ariesAskar } from '@hyperledger/aries-askar-react-native'
+   *
+   * const agent = new Agent({
+   *  config: {},
+   *  dependencies: agentDependencies,
+   *  modules: {
+   *   ariesAskar: new AskarModule({
+   *      ariesAskar,
+   *   })
+   *  }
+   * })
+   * ```
+   */
+  ariesAskar: AriesAskar
+
+  /**
+   * A list of Askar wallets to connect to.
+   */
+  wallets: [AskarWalletPostgresConfig, ...AskarWalletPostgresConfig[]]
+}
+
+/**
+ * @public
+ */
+export class AskarModuleConfig {
+  private options: AskarModuleConfigOptions
+
+  public constructor(options: AskarModuleConfigOptions) {
+    this.options = options
+  }
+
+  /** See {@link AskarModuleConfigOptions.wallets} */
+  public get wallets() {
+    return this.options.wallets
+  }
+}

packages/core/package.json

@@ -51,6 +51,7 @@
     "web-did-resolver": "^2.0.8"
   },
   "devDependencies": {
+    "@hyperledger/anoncreds-nodejs": "^0.1.0-dev.6",
     "@types/bn.js": "^5.1.0",
     "@types/events": "^3.0.0",
     "@types/luxon": "^1.27.0",

packages/core/src/modules/credentials/protocol/v2/__tests__/v2.ldproof.credentials.propose-offerED25519.test.ts

@@ -1,5 +1,6 @@
 import type { EventReplaySubject } from '../../../../../../tests'
 
+import { anoncreds } from '@hyperledger/anoncreds-nodejs'
 import { randomUUID } from 'crypto'
 
 import {
@@ -104,6 +105,7 @@ const getIndyJsonLdModules = () =>
       ],
     }),
     anoncreds: new AnonCredsModule({
+      anoncreds,
       registries: [new IndySdkAnonCredsRegistry()],
     }),
     dids: new DidsModule({

packages/indy-vdr/src/IndyVdrModule.ts

@@ -15,17 +15,6 @@ export class IndyVdrModule implements Module {
   }
 
   public register(dependencyManager: DependencyManager) {
-    try {
-      // eslint-disable-next-line import/no-extraneous-dependencies
-      require('@hyperledger/indy-vdr-nodejs')
-    } catch (error) {
-      try {
-        require('@hyperledger/indy-vdr-react-native')
-      } catch (error) {
-        throw new Error('Error registering bindings for Indy VDR')
-      }
-    }
-
     // Config
     dependencyManager.registerInstance(IndyVdrModuleConfig, this.config)