@xyo-network/wallet 2.21.19 → 2.21.20
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/cjs/Wallet/Base/Base.d.ts +1 -1
- package/dist/cjs/Wallet/Base/Base.js +5 -7
- package/dist/cjs/Wallet/Base/Base.js.map +1 -1
- package/dist/esm/Wallet/Base/Base.d.ts +1 -1
- package/dist/esm/Wallet/Base/Base.js +5 -7
- package/dist/esm/Wallet/Base/Base.js.map +1 -1
- package/package.json +3 -3
- package/src/Wallet/Base/Base.spec.ts +9 -4
- package/src/Wallet/Base/Base.ts +5 -7
|
@@ -3,6 +3,6 @@ export declare class XyoWalletBase {
|
|
|
3
3
|
protected _phrase: string;
|
|
4
4
|
protected _name: string;
|
|
5
5
|
constructor(phrase: string, name?: string);
|
|
6
|
-
getAccount(index: number): XyoAccount;
|
|
6
|
+
getAccount(index: number, salt?: string): XyoAccount;
|
|
7
7
|
static generate(): Promise<XyoWalletBase>;
|
|
8
8
|
}
|
|
@@ -11,13 +11,11 @@ class XyoWalletBase {
|
|
|
11
11
|
this._name = name;
|
|
12
12
|
this._phrase = phrase;
|
|
13
13
|
}
|
|
14
|
-
getAccount(index) {
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
counter--;
|
|
20
|
-
}
|
|
14
|
+
getAccount(index, salt) {
|
|
15
|
+
const hash = (0, sha_js_1.default)('sha256')
|
|
16
|
+
.update(`${index}${this._phrase}${salt !== null && salt !== void 0 ? salt : ''}`)
|
|
17
|
+
.digest()
|
|
18
|
+
.toString('hex');
|
|
21
19
|
return new account_1.XyoAccount({ privateKey: hash });
|
|
22
20
|
}
|
|
23
21
|
static generate() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Base.js","sourceRoot":"","sources":["../../../../src/Wallet/Base/Base.ts"],"names":[],"mappings":";;;;AAAA,2CAAsC;AACtC,kDAAiD;AACjD,4DAA0B;AAE1B,uCAAmC;AAEnC,MAAa,aAAa;IAGxB,YAAY,MAAc,EAAE,IAAI,GAAG,WAAW;QAC5C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;QACjB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAA;IACvB,CAAC;IAEM,UAAU,CAAC,KAAa
|
|
1
|
+
{"version":3,"file":"Base.js","sourceRoot":"","sources":["../../../../src/Wallet/Base/Base.ts"],"names":[],"mappings":";;;;AAAA,2CAAsC;AACtC,kDAAiD;AACjD,4DAA0B;AAE1B,uCAAmC;AAEnC,MAAa,aAAa;IAGxB,YAAY,MAAc,EAAE,IAAI,GAAG,WAAW;QAC5C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;QACjB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAA;IACvB,CAAC;IAEM,UAAU,CAAC,KAAa,EAAE,IAAa;QAC5C,MAAM,IAAI,GAAG,IAAA,gBAAK,EAAC,QAAQ,CAAC;aACzB,MAAM,CAAC,GAAG,KAAK,GAAG,IAAI,CAAC,OAAO,GAAG,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,EAAE,EAAE,CAAC;aAC9C,MAAM,EAAE;aACR,QAAQ,CAAC,KAAK,CAAC,CAAA;QAClB,OAAO,IAAI,oBAAU,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAA;IAC7C,CAAC;IAEM,MAAM,CAAO,QAAQ;;YAC1B,0CAA0C;YAC1C,MAAM,IAAA,cAAK,EAAC,CAAC,CAAC,CAAA;YACd,MAAM,QAAQ,GAAa,EAAE,CAAA;YAC7B,OAAO,QAAQ,CAAC,MAAM,GAAG,EAAE,EAAE;gBAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,aAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;gBAC5D,QAAQ,CAAC,IAAI,CAAC,aAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAA;aAClC;YACD,OAAO,IAAI,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;QAC9C,CAAC;KAAA;CACF;AA1BD,sCA0BC"}
|
|
@@ -3,6 +3,6 @@ export declare class XyoWalletBase {
|
|
|
3
3
|
protected _phrase: string;
|
|
4
4
|
protected _name: string;
|
|
5
5
|
constructor(phrase: string, name?: string);
|
|
6
|
-
getAccount(index: number): XyoAccount;
|
|
6
|
+
getAccount(index: number, salt?: string): XyoAccount;
|
|
7
7
|
static generate(): Promise<XyoWalletBase>;
|
|
8
8
|
}
|
|
@@ -7,13 +7,11 @@ export class XyoWalletBase {
|
|
|
7
7
|
this._name = name;
|
|
8
8
|
this._phrase = phrase;
|
|
9
9
|
}
|
|
10
|
-
getAccount(index) {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
counter--;
|
|
16
|
-
}
|
|
10
|
+
getAccount(index, salt) {
|
|
11
|
+
const hash = shajs('sha256')
|
|
12
|
+
.update(`${index}${this._phrase}${salt ?? ''}`)
|
|
13
|
+
.digest()
|
|
14
|
+
.toString('hex');
|
|
17
15
|
return new XyoAccount({ privateKey: hash });
|
|
18
16
|
}
|
|
19
17
|
static async generate() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Base.js","sourceRoot":"","sources":["../../../../src/Wallet/Base/Base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,KAAK,MAAM,QAAQ,CAAA;AAE1B,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAEnC,MAAM,OAAO,aAAa;IAGxB,YAAY,MAAc,EAAE,IAAI,GAAG,WAAW;QAC5C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;QACjB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAA;IACvB,CAAC;IAEM,UAAU,CAAC,KAAa
|
|
1
|
+
{"version":3,"file":"Base.js","sourceRoot":"","sources":["../../../../src/Wallet/Base/Base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,KAAK,MAAM,QAAQ,CAAA;AAE1B,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAEnC,MAAM,OAAO,aAAa;IAGxB,YAAY,MAAc,EAAE,IAAI,GAAG,WAAW;QAC5C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;QACjB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAA;IACvB,CAAC;IAEM,UAAU,CAAC,KAAa,EAAE,IAAa;QAC5C,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,CAAC;aACzB,MAAM,CAAC,GAAG,KAAK,GAAG,IAAI,CAAC,OAAO,GAAG,IAAI,IAAI,EAAE,EAAE,CAAC;aAC9C,MAAM,EAAE;aACR,QAAQ,CAAC,KAAK,CAAC,CAAA;QAClB,OAAO,IAAI,UAAU,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAA;IAC7C,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,QAAQ;QAC1B,0CAA0C;QAC1C,MAAM,KAAK,CAAC,CAAC,CAAC,CAAA;QACd,MAAM,QAAQ,GAAa,EAAE,CAAA;QAC7B,OAAO,QAAQ,CAAC,MAAM,GAAG,EAAE,EAAE;YAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;YAC5D,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAA;SAClC;QACD,OAAO,IAAI,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;IAC9C,CAAC;CACF"}
|
package/package.json
CHANGED
|
@@ -11,8 +11,8 @@
|
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"@xylabs/sdk-js": "^2.6.2",
|
|
14
|
-
"@xyo-network/account": "^2.21.
|
|
15
|
-
"@xyo-network/payload": "^2.21.
|
|
14
|
+
"@xyo-network/account": "^2.21.20",
|
|
15
|
+
"@xyo-network/payload": "^2.21.20",
|
|
16
16
|
"sha.js": "^2.4.11"
|
|
17
17
|
},
|
|
18
18
|
"description": "Primary SDK for using XYO Protocol 2.0",
|
|
@@ -52,6 +52,6 @@
|
|
|
52
52
|
},
|
|
53
53
|
"sideEffects": true,
|
|
54
54
|
"types": "dist/esm/index.d.ts",
|
|
55
|
-
"version": "2.21.
|
|
55
|
+
"version": "2.21.20",
|
|
56
56
|
"packageManager": "yarn@3.1.1"
|
|
57
57
|
}
|
|
@@ -2,9 +2,14 @@ import { XyoWalletBase } from './Base'
|
|
|
2
2
|
|
|
3
3
|
test('all', () => {
|
|
4
4
|
const wallet = new XyoWalletBase('test phrase')
|
|
5
|
-
const
|
|
5
|
+
const account0 = wallet.getAccount(0)
|
|
6
|
+
const account999999WithSalt = wallet.getAccount(999999, 'test')
|
|
6
7
|
|
|
7
|
-
expect(
|
|
8
|
-
expect(
|
|
9
|
-
expect(
|
|
8
|
+
expect(account0).toBeDefined()
|
|
9
|
+
expect(account0.addressValue.length).toBe(20)
|
|
10
|
+
expect(account0.public.address.hex).toBe('130ec96d95076f8c521b408efb368bfdc57fc078')
|
|
11
|
+
|
|
12
|
+
expect(account999999WithSalt).toBeDefined()
|
|
13
|
+
expect(account999999WithSalt.addressValue.length).toBe(20)
|
|
14
|
+
expect(account999999WithSalt.public.address.hex).toBe('7304f24bd4b24b7a78ed0f157b1e24d95dc3ed28')
|
|
10
15
|
})
|
package/src/Wallet/Base/Base.ts
CHANGED
|
@@ -12,13 +12,11 @@ export class XyoWalletBase {
|
|
|
12
12
|
this._phrase = phrase
|
|
13
13
|
}
|
|
14
14
|
|
|
15
|
-
public getAccount(index: number) {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
counter--
|
|
21
|
-
}
|
|
15
|
+
public getAccount(index: number, salt?: string) {
|
|
16
|
+
const hash = shajs('sha256')
|
|
17
|
+
.update(`${index}${this._phrase}${salt ?? ''}`)
|
|
18
|
+
.digest()
|
|
19
|
+
.toString('hex')
|
|
22
20
|
return new XyoAccount({ privateKey: hash })
|
|
23
21
|
}
|
|
24
22
|
|