@xyo-network/os-runtime 3.0.12 → 3.0.13

package/dist/neutral/Caller.d.ts

@@ -17,7 +17,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): Promise<AccountInstance>;
+    getUserAccount(dappName: string, useSigners: boolean): Promise<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,GAAG,OAAO,CAAC,eAAe,CAAC;IAoB1D,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,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,EAAE,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC;IAgC/E,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/classes/node/DefaultPayloads/SigningKeyPayloads.d.ts

@@ -7,7 +7,7 @@ export declare class SigningKeyPayloads implements DefaultPayloadsInsertable {
     payloads(): Promise<({
         schema: string;
     } & import("@xyo-network/payload-model").PayloadFields)[]>;
-    private resolveXyoWallet;
+    private resolveUserWallet;
     private signingKeyPayload;
 }
 //# sourceMappingURL=SigningKeyPayloads.d.ts.map

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

@@ -1 +1 @@
-{"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;AAcnE,qBAAa,kBAAmB,YAAW,yBAAyB;IAEhE,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,QAAQ;gBADR,OAAO,EAAE,WAAW,EACpB,QAAQ,EAAE,QAAQ;IAGtB,QAAQ;;;YAqBA,gBAAgB;YAahB,iBAAiB;CAgBhC"}
+{"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/dist/neutral/index.mjs

@@ -723,7 +723,7 @@ var DappCaller = class extends DappCallerBase {
   /**
    * Get the user wallet
    */
-  async getUserAccount(dappName) {
+  async getUserAccount(dappName, useSigners) {
     const diviner = await this.getDappArchivistPayloadDiviner();
     const query = {
       dappName,
@@ -734,7 +734,15 @@ var DappCaller = class extends DappCallerBase {
     };
     const [payload] = assertEx8(await diviner.divine([query]), () => "Unable to find user wallet");
     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");
+    }
+    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");
     }
@@ -1594,7 +1602,7 @@ var SigningKeyPayloads = class {
     this.dappName = dappName;
   }
   async payloads() {
-    const wallet = await this.resolveXyoWallet();
+    const wallet = await this.resolveUserWallet();
     const defaultDappAccountSigningKeyPayloads = await this.signingKeyPayload(wallet, this.dappName, DEFAULT_DAPP_ACCOUNT_PATHS[this.dappName]);
     const additionalDappAccountSigningKeyPayloads = [];
     for (const [dappName, accountPaths] of Object.entries(ADDITIONAL_DAPP_ACCOUNT_PATHS)) {
@@ -1606,7 +1614,7 @@ var SigningKeyPayloads = class {
     }
     return [...additionalDappAccountSigningKeyPayloads, defaultDappAccountSigningKeyPayloads].filter(isAnyPayload2);
   }
-  async resolveXyoWallet() {
+  async resolveUserWallet() {
     const settingsCaller = new OsSettingsCaller(this.context);
     const latestWallet = await settingsCaller.getLatestUserWallet();
     const phrase = mnemonicArrayToString(latestWallet.mnemonic.mnemonic);