@xyo-network/os-runtime 3.0.14 → 3.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/os-runtime",
-  "version": "3.0.14",
+  "version": "3.0.16",
   "description": "Primary SDK for using XYO Protocol 2.0",
   "homepage": "https://xyo.network",
   "bugs": {
@@ -39,8 +39,8 @@
     "@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.14",
-    "@xyo-network/bios-model": "^3.0.14",
+    "@xyo-network/bios": "^3.0.16",
+    "@xyo-network/bios-model": "^3.0.16",
     "@xyo-network/bridge-model": "^3.0.7",
     "@xyo-network/diviner-abstract": "^3.0.7",
     "@xyo-network/diviner-model": "^3.0.7",
@@ -48,8 +48,8 @@
     "@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.14",
-    "@xyo-network/kernel-model": "^3.0.14",
+    "@xyo-network/kernel": "^3.0.16",
+    "@xyo-network/kernel-model": "^3.0.16",
     "@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.14",
+    "@xyo-network/os-model": "^3.0.16",
     "@xyo-network/payload-builder": "^3.0.7",
     "@xyo-network/payload-model": "^3.0.7",
     "@xyo-network/wallet-model": "^3.0.7",
@@ -72,7 +72,7 @@
     "@types/uuid": "^10.0.0",
     "@xylabs/ts-scripts-yarn3": "^4.0.1",
     "@xylabs/tsconfig": "^4.0.1",
-    "@xyo-network/bios-nodejs": "^3.0.14",
+    "@xyo-network/bios-nodejs": "^3.0.16",
     "typescript": "^5.5.4",
     "vitest": "^2.0.5"
   },

package/src/Caller.ts

@@ -1,7 +1,7 @@
 import { assertEx } from '@xylabs/assert'
 import type { Hash } from '@xylabs/hex'
+import type { Promisable } from '@xylabs/promise'
 import type { AccountInstance } from '@xyo-network/account'
-import { Account } from '@xyo-network/account'
 import type { PayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model'
 import { PayloadDivinerQuerySchema } from '@xyo-network/diviner-payload-model'
 import type {
@@ -10,8 +10,6 @@ import type {
   DappInjectableParams,
   DappIntent,
   RegisteredDappAccess,
-  SigningKey,
-  SigningKeyFields,
   XyOsContext,
 } from '@xyo-network/os-model'
 import {
@@ -20,7 +18,6 @@ import {
   DappIntentTypes,
   DappMode,
   RegisteredDappAccessSchema,
-  SigningKeySchema,
 } from '@xyo-network/os-model'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import type { Payload, WithMeta } from '@xyo-network/payload-model'
@@ -116,29 +113,11 @@ export class DappCaller extends DappCallerBase {
   /**
    * Get the user wallet
    */
-  async getUserAccount(dappName: string, useSigners?: boolean): Promise<AccountInstance> {
-    // old implementation
-    const diviner = await this.getDappArchivistPayloadDiviner()
-    const query: PayloadDivinerQueryPayload<SigningKeyFields> = {
-      dappName,
-      limit: 1,
-      order: 'desc',
-      schema: PayloadDivinerQuerySchema,
-      schemas: [SigningKeySchema],
-    }
-    const [payload] = assertEx(await diviner.divine([query]), () => 'Unable to find user wallet') as WithMeta<SigningKey>[]
-    if (payload) {
-      console.log('*** old implementation address', await Account.fromPrivateKey(payload.privateKey))
-      if (!useSigners) return await Account.fromPrivateKey(payload.privateKey)
-    } else {
-      throw new Error('Unable to find user wallet')
-    }
-
+  getUserAccount(dappName: string): Promisable<AccountInstance> {
     // new implementation
-    const account = this.context.user.signers?.get('Name Service')
+    const account = this.context.user.signers?.get(dappName)
 
     if (account) {
-      console.log('*** new implementation address', account)
       return account
     } else {
       throw new Error('Unable to find user wallet')
@@ -148,19 +127,8 @@ export class DappCaller extends DappCallerBase {
   /**
    * Get all wallets for the user
    */
-  async getUserAccountsAll(): Promise<SigningKey[]> {
-    const diviner = await this.getDappArchivistPayloadDiviner()
-    const query: PayloadDivinerQueryPayload<SigningKeyFields> = {
-      order: 'desc',
-      schema: PayloadDivinerQuerySchema,
-      schemas: [SigningKeySchema],
-    }
-    const payloads = assertEx(await diviner.divine([query]), () => 'Unable to find user wallet') as WithMeta<SigningKey>[]
-    if (payloads?.length) {
-      return payloads
-    } else {
-      throw new Error('Unable to find user wallet')
-    }
+  getUserAccountsAll(): Promisable<AccountInstance[]> {
+    return [...this.context.user.signers?.values() ?? []]
   }
 
   /**

package/src/classes/node/DefaultPayloads/DefaultPayloads.ts

@@ -7,7 +7,6 @@ import type { InsertableConstructor } from '../../lib/index.ts'
 import { createInsertable } from '../../lib/index.ts'
 import { DappAccessPayloads } from './DappAccessPayloads.ts'
 import { NodeInfoPayload } from './NodeInfoPayload.ts'
-import { SigningKeyPayloads } from './SigningKeyPayloads.ts'
 
 export class DefaultPayloads {
   constructor(
@@ -17,7 +16,7 @@ export class DefaultPayloads {
   ) {}
 
   async insert() {
-    const insertables: InsertableConstructor[] = [NodeInfoPayload, SigningKeyPayloads, DappAccessPayloads]
+    const insertables: InsertableConstructor[] = [NodeInfoPayload, DappAccessPayloads]
     const insertPayloads: Payload[] = []
     for (const insertable of insertables) {
       const classInstance = createInsertable(insertable, this.xyOs, this.dappName)

package/dist/neutral/classes/node/DefaultPayloads/SigningKeyPayloads.d.ts

@@ -1,13 +0,0 @@
-import type { DappName, XyOsContext } from '@xyo-network/os-model';
-import type { DefaultPayloadsInsertable } from '../../lib/index.ts';
-export declare class SigningKeyPayloads implements DefaultPayloadsInsertable {
-    private context;
-    private dappName;
-    constructor(context: XyOsContext, dappName: DappName);
-    payloads(): Promise<({
-        schema: string;
-    } & import("@xyo-network/payload-model").PayloadFields)[]>;
-    private resolveUserWallet;
-    private signingKeyPayload;
-}
-//# sourceMappingURL=SigningKeyPayloads.d.ts.map

package/dist/neutral/classes/node/DefaultPayloads/SigningKeyPayloads.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"SigningKeyPayloads.d.ts","sourceRoot":"","sources":["../../../../../src/classes/node/DefaultPayloads/SigningKeyPayloads.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAMlE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAA;AAenE,qBAAa,kBAAmB,YAAW,yBAAyB;IAEhE,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,QAAQ;gBADR,OAAO,EAAE,WAAW,EACpB,QAAQ,EAAE,QAAQ;IAGtB,QAAQ;;;YAqBA,iBAAiB;YAajB,iBAAiB;CAgBhC"}

package/src/classes/node/DefaultPayloads/SigningKeyPayloads.ts

@@ -1,81 +0,0 @@
-import { assertEx } from '@xylabs/assert'
-import { hexFrom } from '@xylabs/hex'
-import { HDWallet } from '@xyo-network/account'
-import type { DappName, XyOsContext } from '@xyo-network/os-model'
-import { mnemonicArrayToString, SigningKeySchema } from '@xyo-network/os-model'
-import type { Payload } from '@xyo-network/payload-model'
-import { isAnyPayload } from '@xyo-network/payload-model'
-import type { WalletInstance } from '@xyo-network/wallet-model'
-
-import type { DefaultPayloadsInsertable } from '../../lib/index.ts'
-import { OsSettingsCaller } from '../../settings/index.ts'
-
-const DappsWithAdditionalPayloads = new Set(['Profile'])
-
-const DefaultName: DappName = 'Name Service' as const
-
-const DEFAULT_DAPP_ACCOUNT_PATHS: Record<string, string> = { [DefaultName]: "1'/1" } as const
-
-// WIP - for now, dApps listed here can gain access to the signing key for other dapps
-// In the future, this will be controlled by the user
-const ADDITIONAL_DAPP_ACCOUNT_PATHS: Record<string, Record<string, string>>
-= { ['Profile']: { [DefaultName]: DEFAULT_DAPP_ACCOUNT_PATHS[DefaultName] } } as const
-
-/** @deprecated - use user signers from os context */
-export class SigningKeyPayloads implements DefaultPayloadsInsertable {
-  constructor(
-    private context: XyOsContext,
-    private dappName: DappName,
-  ) {}
-
-  async payloads() {
-    const wallet = await this.resolveUserWallet()
-
-    // get the signing key payloads for the default dapp account
-    const defaultDappAccountSigningKeyPayloads = await this.signingKeyPayload(wallet, this.dappName, DEFAULT_DAPP_ACCOUNT_PATHS[this.dappName])
-
-    // and any additional dapp accounts
-    const additionalDappAccountSigningKeyPayloads: (Payload | undefined)[] = []
-    for (const [dappName, accountPaths] of Object.entries(ADDITIONAL_DAPP_ACCOUNT_PATHS)) {
-      if (dappName !== this.dappName || !DappsWithAdditionalPayloads.has(dappName)) continue
-
-      for (const additionalDappAccountName of Object.keys(accountPaths)) {
-        const signingKeyPayload = await this.signingKeyPayload(wallet, additionalDappAccountName, accountPaths[additionalDappAccountName])
-        additionalDappAccountSigningKeyPayloads.push(signingKeyPayload)
-      }
-    }
-
-    // filter so we only return valid payloads
-    return [...additionalDappAccountSigningKeyPayloads, defaultDappAccountSigningKeyPayloads].filter(isAnyPayload) as Payload[]
-  }
-
-  private async resolveUserWallet() {
-    // get the user's wallet
-    const settingsCaller = new OsSettingsCaller(this.context)
-    const latestWallet = await settingsCaller.getLatestUserWallet()
-
-    // find the phrase
-    const phrase = mnemonicArrayToString(latestWallet.mnemonic.mnemonic)
-    const assertedPhrase = assertEx(phrase, () => 'No phrase found in latest wallet')
-
-    // create a wallet instance
-    return await HDWallet.fromPhrase(assertedPhrase)
-  }
-
-  private async signingKeyPayload(wallet: WalletInstance, name: string, path?: string) {
-    if (path) {
-      // derive the sub account
-      const subAccount = await wallet.derivePath(path)
-
-      // get the private key
-      const privateKey = hexFrom(subAccount.privateKey, { prefix: false })
-
-      // return the payload
-      return {
-        dappName: name,
-        privateKey,
-        schema: SigningKeySchema,
-      }
-    }
-  }
-}