@xyo-network/os-runtime 3.0.10 → 3.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/os-runtime",
-  "version": "3.0.10",
+  "version": "3.0.12",
   "description": "Primary SDK for using XYO Protocol 2.0",
   "homepage": "https://xyo.network",
   "bugs": {
@@ -39,17 +39,17 @@
     "@xyo-network/archivist": "^3.0.7",
     "@xyo-network/archivist-indexeddb": "^3.0.7",
     "@xyo-network/archivist-model": "^3.0.7",
-    "@xyo-network/bios": "^3.0.10",
-    "@xyo-network/bios-model": "^3.0.10",
-    "@xyo-network/bridge-model": "^3.0.5",
-    "@xyo-network/diviner-abstract": "^3.0.5",
-    "@xyo-network/diviner-model": "^3.0.5",
-    "@xyo-network/diviner-payload-generic": "^3.0.5",
-    "@xyo-network/diviner-payload-indexeddb": "^3.0.5",
-    "@xyo-network/diviner-payload-model": "^3.0.5",
-    "@xyo-network/diviner-temporal-indexing-model": "^3.0.5",
-    "@xyo-network/kernel": "^3.0.10",
-    "@xyo-network/kernel-model": "^3.0.10",
+    "@xyo-network/bios": "^3.0.12",
+    "@xyo-network/bios-model": "^3.0.12",
+    "@xyo-network/bridge-model": "^3.0.7",
+    "@xyo-network/diviner-abstract": "^3.0.7",
+    "@xyo-network/diviner-model": "^3.0.7",
+    "@xyo-network/diviner-payload-generic": "^3.0.7",
+    "@xyo-network/diviner-payload-indexeddb": "^3.0.7",
+    "@xyo-network/diviner-payload-model": "^3.0.7",
+    "@xyo-network/diviner-temporal-indexing-model": "^3.0.7",
+    "@xyo-network/kernel": "^3.0.12",
+    "@xyo-network/kernel-model": "^3.0.12",
     "@xyo-network/manifest": "^3.0.7",
     "@xyo-network/manifest-wrapper": "^3.0.7",
     "@xyo-network/module-abstract": "^3.0.7",
@@ -58,7 +58,7 @@
     "@xyo-network/module-model": "^3.0.7",
     "@xyo-network/module-resolver": "^3.0.7",
     "@xyo-network/node-model": "^3.0.7",
-    "@xyo-network/os-model": "^3.0.10",
+    "@xyo-network/os-model": "^3.0.12",
     "@xyo-network/payload-builder": "^3.0.7",
     "@xyo-network/payload-model": "^3.0.7",
     "@xyo-network/wallet-model": "^3.0.7",
@@ -70,9 +70,9 @@
   "devDependencies": {
     "@types/semver": "^7.5.8",
     "@types/uuid": "^10.0.0",
-    "@xylabs/ts-scripts-yarn3": "^4.0.0",
-    "@xylabs/tsconfig": "^4.0.0",
-    "@xyo-network/bios-nodejs": "^3.0.10",
+    "@xylabs/ts-scripts-yarn3": "^4.0.1",
+    "@xylabs/tsconfig": "^4.0.1",
+    "@xyo-network/bios-nodejs": "^3.0.12",
     "typescript": "^5.5.4",
     "vitest": "^2.0.5"
   },

package/src/XyOs.ts

@@ -10,6 +10,7 @@ import type {
   DappId,
   DappPackageManifestPayload,
   DappParams,
+  SignersExternal,
   StackInitializer,
   XyOsContext,
   XyOsDappContext,
@@ -17,6 +18,7 @@ import type {
 } from '@xyo-network/os-model'
 import type { WalletInstance } from '@xyo-network/wallet-model'
 
+import { Signers } from './classes/index.ts'
 import type { DappRegistrationServiceParams } from './classes/registration/index.ts'
 import { DappRegistrationService } from './classes/registration/index.ts'
 import { EventBus } from './event/index.ts'
@@ -41,6 +43,7 @@ export class XyOs extends XyOsContextBase<XyOsParams> implements XyOsContext {
   protected _kernel: KernelExternal
   protected _locator: ModuleFactoryLocator
   protected dappRegistrationService: DappRegistrationService
+  protected signers: SignersExternal | undefined
   private stackManager: StackManager
 
   constructor({
@@ -59,6 +62,7 @@ export class XyOs extends XyOsContextBase<XyOsParams> implements XyOsContext {
     this._kernel = kernel
     this.stackManager = new StackManager(stackMap)
     this.dappRegistrationService = new DappRegistrationService(this, dappsConfiguration, this.locator, developmentMode)
+    if (this.signerPaths && this.kernel?.bios?.seedPhraseStore) this.signers = new Signers(this.signerPaths, this.kernel?.bios?.seedPhraseStore)
   }
 
   static get monitoring(): XyOsMonitor | undefined {
@@ -93,6 +97,10 @@ export class XyOs extends XyOsContextBase<XyOsParams> implements XyOsContext {
     return this.stackManager.stacks
   }
 
+  override get user() {
+    return { signers: this.signers?.getWalletKindSigner('user') }
+  }
+
   static async monitor<T>(fn: () => Promise<T>, eventConfig: MonitorEventConfig): Promise<T> {
     const { name, additionalProperties } = eventConfig
     const monitor = this.monitoring
@@ -119,6 +127,7 @@ export class XyOs extends XyOsContextBase<XyOsParams> implements XyOsContext {
       this._root = root
 
       this.stackManager.initialize(this)
+      if (this.signers) await this.signers.initialize()
     })
   }
 

package/src/XyOsBase.ts

@@ -8,7 +8,8 @@ import { BaseEmitter } from '@xyo-network/module-abstract'
 import { ModuleFactoryLocator } from '@xyo-network/module-factory-locator'
 import type { NodeInstance } from '@xyo-network/node-model'
 import type {
-  DappId, DappPackageManifestPayload, DappParams, EventBusInterface, StackInitializer, XyOsContext, XyOsDappContext,
+  DappId, DappPackageManifestPayload, DappParams, EventBusInterface, OsUser,
+  StackInitializer, WalletKindSignerPaths, XyOsContext, XyOsDappContext,
 } from '@xyo-network/os-model'
 import { Mutex } from 'async-mutex'
 
@@ -17,6 +18,7 @@ export interface XyOsContextParams<TManifest extends PackageManifest = PackageMa
   locator?: ModuleFactoryLocator
   manifest?: TManifest
   platformLocator?: ModuleFactoryLocator
+  signerPaths?: WalletKindSignerPaths
 }
 
 export class XyOsContextBase<TParams extends XyOsContextParams | void = void> extends BaseEmitter<
@@ -71,10 +73,18 @@ export class XyOsContextBase<TParams extends XyOsContextParams | void = void> ex
     return []
   }
 
+  get signerPaths() {
+    return this.params.signerPaths
+  }
+
   get state() {
     return this._root ? 'running' : 'stopped'
   }
 
+  get user(): OsUser {
+    throw new Error('Method not implemented. [user]')
+  }
+
   boot(_wallet: WalletInstance, _locator: ModuleFactoryLocator) {
     throw new Error('Method not implemented. [boot]')
   }

package/src/XyOsDapp.ts

@@ -3,7 +3,7 @@ import type { WalletInstance } from '@xyo-network/account'
 import { ManifestWrapper } from '@xyo-network/manifest-wrapper'
 import { ModuleFactoryLocator } from '@xyo-network/module-factory-locator'
 import type {
-  DappPackageManifestPayload, XyOsContext, XyOsDappContext, XyOsDappDetails,
+  DappPackageManifestPayload, OsUser, XyOsContext, XyOsDappContext, XyOsDappDetails,
 } from '@xyo-network/os-model'
 import { DappPackageManifestPayloadSchema } from '@xyo-network/os-model'
 
@@ -15,6 +15,7 @@ export interface XyOsDappContextParams extends XyOsContextParams<DappPackageMani
   dapp: XyOsDappDetails
   locator: ModuleFactoryLocator
   parent: XyOsContext
+  user: OsUser
 }
 
 export class XyOsDapp extends XyOsContextBase<XyOsDappContextParams> implements XyOsDappContext {
@@ -56,6 +57,10 @@ export class XyOsDapp extends XyOsContextBase<XyOsDappContextParams> implements
     return []
   }
 
+  override get user() {
+    return this.params.user
+  }
+
   override async boot(wallet: WalletInstance, locator?: ModuleFactoryLocator): Promise<void> {
     return await this._bootMutex.runExclusive(async () => {
       console.log('XyOsDapp:boot:start', wallet.address, this.dapp.id)

package/src/classes/registration/DappRegistrationService.ts

@@ -76,16 +76,17 @@ export class DappRegistrationService {
     this.addConnectionRequests()
   }
 
-  buildDapp(
+  async buildDapp(
     manifest: DappPackageManifestPayload,
     dappId = NameTransforms.slug(manifest.nodes[0]?.config.name),
     name = NameTransforms.moduleName(manifest.nodes[0]?.config.name),
-  ): Promisable<XyOsDappContext> {
+  ): Promise<XyOsDappContext> {
     const dapp = new XyOsDapp({
       dapp: { id: dappId, name },
       locator: this.locator,
       manifest,
       parent: this.context,
+      user: await this.getUser(),
     }) as XyOsDappContext
     this.builtDapps[dappId] = dapp
     return dapp
@@ -130,6 +131,14 @@ export class DappRegistrationService {
     this.context.eventBus.addConnection(this.exposeDappRequestConnection)
   }
 
+  /**
+   * A method to get the user property from context and eventually modify it before handing it to a dapp
+   * i.e. curating user-approved signers
+   */
+  private getUser(): Promisable<XyOsContext['user']> {
+    return this.context.user
+  }
+
   private async postRegistrationHandlers(registeredDapp: RegisteredDappSetResult) {
     if (registeredDapp.dapp) {
       if (isRegisteredDappExposedDappSet(registeredDapp)) {

package/src/classes/signer/Signers.ts

@@ -35,6 +35,10 @@ export class Signers implements SignersExternal {
     return this.signerAccounts.get(walletKind)?.get(signer)
   }
 
+  getWalletKindSigner(walletKind: WalletKind): SignerAccounts | undefined {
+    return this.signerAccounts.get(walletKind)
+  }
+
   async initialize() {
     for (const [walletKindName, signerPaths] of this.paths) {
       for (const [signerName, walletPath] of signerPaths.entries()) {