@xyo-network/os-runtime 3.0.11 → 3.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/os-runtime",
-  "version": "3.0.11",
+  "version": "3.0.13",
   "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.11",
-    "@xyo-network/bios-model": "^3.0.11",
-    "@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.11",
-    "@xyo-network/kernel-model": "^3.0.11",
+    "@xyo-network/bios": "^3.0.13",
+    "@xyo-network/bios-model": "^3.0.13",
+    "@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.13",
+    "@xyo-network/kernel-model": "^3.0.13",
     "@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.11",
+    "@xyo-network/os-model": "^3.0.13",
     "@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.11",
+    "@xylabs/ts-scripts-yarn3": "^4.0.1",
+    "@xylabs/tsconfig": "^4.0.1",
+    "@xyo-network/bios-nodejs": "^3.0.13",
     "typescript": "^5.5.4",
     "vitest": "^2.0.5"
   },

package/src/Caller.ts

@@ -116,7 +116,8 @@ export class DappCaller extends DappCallerBase {
   /**
    * Get the user wallet
    */
-  async getUserAccount(dappName: string): Promise<AccountInstance> {
+  async getUserAccount(dappName: string, useSigners: boolean): Promise<AccountInstance> {
+    // old implementation
     const diviner = await this.getDappArchivistPayloadDiviner()
     const query: PayloadDivinerQueryPayload<SigningKeyFields> = {
       dappName,
@@ -127,7 +128,18 @@ export class DappCaller extends DappCallerBase {
     }
     const [payload] = assertEx(await diviner.divine([query]), () => 'Unable to find user wallet') as WithMeta<SigningKey>[]
     if (payload) {
-      return await Account.fromPrivateKey(payload.privateKey)
+      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')
+    }
+
+    // new implementation
+    const account = this.context.user.signers?.get('Name Service')
+
+    if (account) {
+      console.log('*** new implementation address', account)
+      return account
     } else {
       throw new Error('Unable to find user wallet')
     }

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

@@ -21,6 +21,7 @@ const DEFAULT_DAPP_ACCOUNT_PATHS: Record<string, string> = { [DefaultName]: "1'/
 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,
@@ -28,7 +29,7 @@ export class SigningKeyPayloads implements DefaultPayloadsInsertable {
   ) {}
 
   async payloads() {
-    const wallet = await this.resolveXyoWallet()
+    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])
@@ -48,7 +49,7 @@ export class SigningKeyPayloads implements DefaultPayloadsInsertable {
     return [...additionalDappAccountSigningKeyPayloads, defaultDappAccountSigningKeyPayloads].filter(isAnyPayload) as Payload[]
   }
 
-  private async resolveXyoWallet() {
+  private async resolveUserWallet() {
     // get the user's wallet
     const settingsCaller = new OsSettingsCaller(this.context)
     const latestWallet = await settingsCaller.getLatestUserWallet()