@xyo-network/os-runtime 3.0.14 → 3.0.15

package/dist/neutral/Caller.d.ts

@@ -1,4 +1,5 @@
 import type { Hash } from '@xylabs/hex';
+import type { Promisable } from '@xylabs/promise';
 import type { AccountInstance } from '@xyo-network/account';
 import type { DappAccessRequest, DappId, DappInjectableParams, DappIntent, SigningKey, XyOsContext } from '@xyo-network/os-model';
 import { DappIntentTypes, DappMode } from '@xyo-network/os-model';
@@ -17,7 +18,7 @@ export declare class DappCaller extends DappCallerBase {
     getRegisteredDappAccessByName(name: string): Promise<WithMeta<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & import("@xyo-network/os-model").RegisteredDappAccessFields & {
         schema: "network.xyo.os.dapp.access.registered";
     }>>;
-    getUserAccount(dappName: string, useSigners?: boolean): Promise<AccountInstance>;
+    getUserAccount(dappName: string): Promisable<AccountInstance>;
     getUserAccountsAll(): Promise<SigningKey[]>;
     makeDappAccessRequest(requestingDappId: DappAccessRequest['requestingDappId'], registeredDappAccessHash: DappAccessRequest['registeredDappAccessHash'], mode?: DappAccessRequest['mode'], destinationArchivist?: DappAccessRequest['destinationArchivist']): Promise<void>;
     makeDappIntentRequest(sourceDappId: DappId, targetDappId: DappId, intent?: DappIntentTypes, mode?: DappMode, params?: DappIntent['params']): Promise<WithMeta<WithMeta<{

package/dist/neutral/Caller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Caller.d.ts","sourceRoot":"","sources":["../../src/Caller.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAI3D,OAAO,KAAK,EACV,iBAAiB,EACjB,MAAM,EACN,oBAAoB,EACpB,UAAU,EAEV,UAAU,EAEV,WAAW,EACZ,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAGL,eAAe,EACf,QAAQ,EAGT,MAAM,uBAAuB,CAAA;AAE9B,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AAEnE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAIpD,qBAAa,UAAW,SAAQ,cAAc;gBAChC,OAAO,EAAE,WAAW;IAS1B,0BAA0B,CAAC,QAAQ,GAAE,OAAO,EAAO,EAAE,KAAK,GAAE,OAAe;IAqBjF,kBAAkB,CAAC,IAAI,EAAE,iBAAiB,CAAC,MAAM,CAAC,EAAE,wBAAwB,EAAE,IAAI,EAAE,gBAAgB,EAAE,MAAM,EAAE,oBAAoB,CAAC,EAAE,MAAM;;;IAerI,qBAAqB;;;IAerB,uBAAuB,IAAI,OAAO,CAAC,oBAAoB,EAAE,GAAG,SAAS,CAAC;IAUtE,6BAA6B,CAAC,IAAI,EAAE,MAAM;;;IAgB1C,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC;IAgChF,kBAAkB,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;IAsB3C,qBAAqB,CACzB,gBAAgB,EAAE,iBAAiB,CAAC,kBAAkB,CAAC,EACvD,wBAAwB,EAAE,iBAAiB,CAAC,0BAA0B,CAAC,EACvE,IAAI,CAAC,EAAE,iBAAiB,CAAC,MAAM,CAAC,EAChC,oBAAoB,CAAC,EAAE,iBAAiB,CAAC,sBAAsB,CAAC;IAkB5D,qBAAqB,CACzB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,MAAM,GAAE,eAAwC,EAChD,IAAI,GAAE,QAA0B,EAChC,MAAM,CAAC,EAAE,UAAU,CAAC,QAAQ,CAAC;;;IAgBzB,4BAA4B,CAAC,YAAY,EAAE,eAAe,YAAwB,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAkB3H"}
+{"version":3,"file":"Caller.d.ts","sourceRoot":"","sources":["../../src/Caller.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAI3D,OAAO,KAAK,EACV,iBAAiB,EACjB,MAAM,EACN,oBAAoB,EACpB,UAAU,EAEV,UAAU,EAEV,WAAW,EACZ,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAGL,eAAe,EACf,QAAQ,EAGT,MAAM,uBAAuB,CAAA;AAE9B,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AAEnE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAIpD,qBAAa,UAAW,SAAQ,cAAc;gBAChC,OAAO,EAAE,WAAW;IAS1B,0BAA0B,CAAC,QAAQ,GAAE,OAAO,EAAO,EAAE,KAAK,GAAE,OAAe;IAqBjF,kBAAkB,CAAC,IAAI,EAAE,iBAAiB,CAAC,MAAM,CAAC,EAAE,wBAAwB,EAAE,IAAI,EAAE,gBAAgB,EAAE,MAAM,EAAE,oBAAoB,CAAC,EAAE,MAAM;;;IAerI,qBAAqB;;;IAerB,uBAAuB,IAAI,OAAO,CAAC,oBAAoB,EAAE,GAAG,SAAS,CAAC;IAUtE,6BAA6B,CAAC,IAAI,EAAE,MAAM;;;IAgBhD,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,CAAC,eAAe,CAAC;IAcvD,kBAAkB,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;IAsB3C,qBAAqB,CACzB,gBAAgB,EAAE,iBAAiB,CAAC,kBAAkB,CAAC,EACvD,wBAAwB,EAAE,iBAAiB,CAAC,0BAA0B,CAAC,EACvE,IAAI,CAAC,EAAE,iBAAiB,CAAC,MAAM,CAAC,EAChC,oBAAoB,CAAC,EAAE,iBAAiB,CAAC,sBAAsB,CAAC;IAkB5D,qBAAqB,CACzB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,MAAM,GAAE,eAAwC,EAChD,IAAI,GAAE,QAA0B,EAChC,MAAM,CAAC,EAAE,UAAU,CAAC,QAAQ,CAAC;;;IAgBzB,4BAA4B,CAAC,YAAY,EAAE,eAAe,YAAwB,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAkB3H"}

package/dist/neutral/index.mjs

@@ -524,7 +524,6 @@ import { PayloadBuilder as PayloadBuilder3 } from "@xyo-network/payload-builder"
 
 // src/Caller.ts
 import { assertEx as assertEx8 } from "@xylabs/assert";
-import { Account } from "@xyo-network/account";
 import { PayloadDivinerQuerySchema as PayloadDivinerQuerySchema4 } from "@xyo-network/diviner-payload-model";
 import {
   DappAccessRequestSchema as DappAccessRequestSchema2,
@@ -723,25 +722,9 @@ var DappCaller = class extends DappCallerBase {
   /**
    * Get the user wallet
    */
-  async getUserAccount(dappName, useSigners) {
-    const diviner = await this.getDappArchivistPayloadDiviner();
-    const query = {
-      dappName,
-      limit: 1,
-      order: "desc",
-      schema: PayloadDivinerQuerySchema4,
-      schemas: [SigningKeySchema]
-    };
-    const [payload] = assertEx8(await diviner.divine([query]), () => "Unable to find user wallet");
-    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");
-    }
-    const account = this.context.user.signers?.get("Name Service");
+  getUserAccount(dappName) {
+    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");