@xyo-network/os-runtime 3.0.12 → 3.0.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/neutral/Caller.d.ts +1 -1
- package/dist/neutral/Caller.d.ts.map +1 -1
- package/dist/neutral/classes/node/DefaultPayloads/SigningKeyPayloads.d.ts +1 -1
- package/dist/neutral/classes/node/DefaultPayloads/SigningKeyPayloads.d.ts.map +1 -1
- package/dist/neutral/index.mjs +12 -4
- package/dist/neutral/index.mjs.map +1 -1
- package/package.json +7 -7
- package/src/Caller.ts +14 -2
- package/src/classes/node/DefaultPayloads/SigningKeyPayloads.ts +3 -2
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@xyo-network/os-runtime",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.14",
|
|
4
4
|
"description": "Primary SDK for using XYO Protocol 2.0",
|
|
5
5
|
"homepage": "https://xyo.network",
|
|
6
6
|
"bugs": {
|
|
@@ -39,8 +39,8 @@
|
|
|
39
39
|
"@xyo-network/archivist": "^3.0.7",
|
|
40
40
|
"@xyo-network/archivist-indexeddb": "^3.0.7",
|
|
41
41
|
"@xyo-network/archivist-model": "^3.0.7",
|
|
42
|
-
"@xyo-network/bios": "^3.0.
|
|
43
|
-
"@xyo-network/bios-model": "^3.0.
|
|
42
|
+
"@xyo-network/bios": "^3.0.14",
|
|
43
|
+
"@xyo-network/bios-model": "^3.0.14",
|
|
44
44
|
"@xyo-network/bridge-model": "^3.0.7",
|
|
45
45
|
"@xyo-network/diviner-abstract": "^3.0.7",
|
|
46
46
|
"@xyo-network/diviner-model": "^3.0.7",
|
|
@@ -48,8 +48,8 @@
|
|
|
48
48
|
"@xyo-network/diviner-payload-indexeddb": "^3.0.7",
|
|
49
49
|
"@xyo-network/diviner-payload-model": "^3.0.7",
|
|
50
50
|
"@xyo-network/diviner-temporal-indexing-model": "^3.0.7",
|
|
51
|
-
"@xyo-network/kernel": "^3.0.
|
|
52
|
-
"@xyo-network/kernel-model": "^3.0.
|
|
51
|
+
"@xyo-network/kernel": "^3.0.14",
|
|
52
|
+
"@xyo-network/kernel-model": "^3.0.14",
|
|
53
53
|
"@xyo-network/manifest": "^3.0.7",
|
|
54
54
|
"@xyo-network/manifest-wrapper": "^3.0.7",
|
|
55
55
|
"@xyo-network/module-abstract": "^3.0.7",
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
"@xyo-network/module-model": "^3.0.7",
|
|
59
59
|
"@xyo-network/module-resolver": "^3.0.7",
|
|
60
60
|
"@xyo-network/node-model": "^3.0.7",
|
|
61
|
-
"@xyo-network/os-model": "^3.0.
|
|
61
|
+
"@xyo-network/os-model": "^3.0.14",
|
|
62
62
|
"@xyo-network/payload-builder": "^3.0.7",
|
|
63
63
|
"@xyo-network/payload-model": "^3.0.7",
|
|
64
64
|
"@xyo-network/wallet-model": "^3.0.7",
|
|
@@ -72,7 +72,7 @@
|
|
|
72
72
|
"@types/uuid": "^10.0.0",
|
|
73
73
|
"@xylabs/ts-scripts-yarn3": "^4.0.1",
|
|
74
74
|
"@xylabs/tsconfig": "^4.0.1",
|
|
75
|
-
"@xyo-network/bios-nodejs": "^3.0.
|
|
75
|
+
"@xyo-network/bios-nodejs": "^3.0.14",
|
|
76
76
|
"typescript": "^5.5.4",
|
|
77
77
|
"vitest": "^2.0.5"
|
|
78
78
|
},
|
package/src/Caller.ts
CHANGED
|
@@ -116,7 +116,8 @@ export class DappCaller extends DappCallerBase {
|
|
|
116
116
|
/**
|
|
117
117
|
* Get the user wallet
|
|
118
118
|
*/
|
|
119
|
-
async getUserAccount(dappName: string): Promise<AccountInstance> {
|
|
119
|
+
async getUserAccount(dappName: string, useSigners?: boolean): Promise<AccountInstance> {
|
|
120
|
+
// old implementation
|
|
120
121
|
const diviner = await this.getDappArchivistPayloadDiviner()
|
|
121
122
|
const query: PayloadDivinerQueryPayload<SigningKeyFields> = {
|
|
122
123
|
dappName,
|
|
@@ -127,7 +128,18 @@ export class DappCaller extends DappCallerBase {
|
|
|
127
128
|
}
|
|
128
129
|
const [payload] = assertEx(await diviner.divine([query]), () => 'Unable to find user wallet') as WithMeta<SigningKey>[]
|
|
129
130
|
if (payload) {
|
|
130
|
-
|
|
131
|
+
console.log('*** old implementation address', await Account.fromPrivateKey(payload.privateKey))
|
|
132
|
+
if (!useSigners) return await Account.fromPrivateKey(payload.privateKey)
|
|
133
|
+
} else {
|
|
134
|
+
throw new Error('Unable to find user wallet')
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
// new implementation
|
|
138
|
+
const account = this.context.user.signers?.get('Name Service')
|
|
139
|
+
|
|
140
|
+
if (account) {
|
|
141
|
+
console.log('*** new implementation address', account)
|
|
142
|
+
return account
|
|
131
143
|
} else {
|
|
132
144
|
throw new Error('Unable to find user wallet')
|
|
133
145
|
}
|
|
@@ -21,6 +21,7 @@ const DEFAULT_DAPP_ACCOUNT_PATHS: Record<string, string> = { [DefaultName]: "1'/
|
|
|
21
21
|
const ADDITIONAL_DAPP_ACCOUNT_PATHS: Record<string, Record<string, string>>
|
|
22
22
|
= { ['Profile']: { [DefaultName]: DEFAULT_DAPP_ACCOUNT_PATHS[DefaultName] } } as const
|
|
23
23
|
|
|
24
|
+
/** @deprecated - use user signers from os context */
|
|
24
25
|
export class SigningKeyPayloads implements DefaultPayloadsInsertable {
|
|
25
26
|
constructor(
|
|
26
27
|
private context: XyOsContext,
|
|
@@ -28,7 +29,7 @@ export class SigningKeyPayloads implements DefaultPayloadsInsertable {
|
|
|
28
29
|
) {}
|
|
29
30
|
|
|
30
31
|
async payloads() {
|
|
31
|
-
const wallet = await this.
|
|
32
|
+
const wallet = await this.resolveUserWallet()
|
|
32
33
|
|
|
33
34
|
// get the signing key payloads for the default dapp account
|
|
34
35
|
const defaultDappAccountSigningKeyPayloads = await this.signingKeyPayload(wallet, this.dappName, DEFAULT_DAPP_ACCOUNT_PATHS[this.dappName])
|
|
@@ -48,7 +49,7 @@ export class SigningKeyPayloads implements DefaultPayloadsInsertable {
|
|
|
48
49
|
return [...additionalDappAccountSigningKeyPayloads, defaultDappAccountSigningKeyPayloads].filter(isAnyPayload) as Payload[]
|
|
49
50
|
}
|
|
50
51
|
|
|
51
|
-
private async
|
|
52
|
+
private async resolveUserWallet() {
|
|
52
53
|
// get the user's wallet
|
|
53
54
|
const settingsCaller = new OsSettingsCaller(this.context)
|
|
54
55
|
const latestWallet = await settingsCaller.getLatestUserWallet()
|