ox 0.7.1 → 0.8.0
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/CHANGELOG.md +45 -0
- package/_cjs/core/Keystore.js +20 -24
- package/_cjs/core/Keystore.js.map +1 -1
- package/_cjs/core/TransactionEnvelopeEip1559.js +2 -2
- package/_cjs/core/TransactionEnvelopeEip1559.js.map +1 -1
- package/_cjs/core/TransactionEnvelopeEip2930.js +2 -2
- package/_cjs/core/TransactionEnvelopeEip2930.js.map +1 -1
- package/_cjs/core/TransactionEnvelopeEip4844.js +2 -2
- package/_cjs/core/TransactionEnvelopeEip4844.js.map +1 -1
- package/_cjs/core/TransactionEnvelopeEip7702.js +2 -2
- package/_cjs/core/TransactionEnvelopeEip7702.js.map +1 -1
- package/_cjs/core/TransactionEnvelopeLegacy.js +2 -2
- package/_cjs/core/TransactionEnvelopeLegacy.js.map +1 -1
- package/_cjs/version.js +1 -1
- package/_esm/core/Keystore.js +28 -32
- package/_esm/core/Keystore.js.map +1 -1
- package/_esm/core/TransactionEnvelopeEip1559.js +2 -2
- package/_esm/core/TransactionEnvelopeEip1559.js.map +1 -1
- package/_esm/core/TransactionEnvelopeEip2930.js +2 -2
- package/_esm/core/TransactionEnvelopeEip2930.js.map +1 -1
- package/_esm/core/TransactionEnvelopeEip4844.js +2 -2
- package/_esm/core/TransactionEnvelopeEip4844.js.map +1 -1
- package/_esm/core/TransactionEnvelopeEip7702.js +2 -2
- package/_esm/core/TransactionEnvelopeEip7702.js.map +1 -1
- package/_esm/core/TransactionEnvelopeLegacy.js +2 -2
- package/_esm/core/TransactionEnvelopeLegacy.js.map +1 -1
- package/_esm/index.js +2 -2
- package/_esm/version.js +1 -1
- package/_types/core/Keystore.d.ts +28 -31
- package/_types/core/Keystore.d.ts.map +1 -1
- package/_types/core/P256.d.ts +1 -51
- package/_types/core/P256.d.ts.map +1 -1
- package/_types/core/Secp256k1.d.ts +1 -51
- package/_types/core/Secp256k1.d.ts.map +1 -1
- package/_types/core/TransactionEnvelopeEip1559.d.ts.map +1 -1
- package/_types/core/TransactionEnvelopeEip2930.d.ts.map +1 -1
- package/_types/core/TransactionEnvelopeEip4844.d.ts.map +1 -1
- package/_types/core/TransactionEnvelopeEip7702.d.ts.map +1 -1
- package/_types/core/TransactionEnvelopeLegacy.d.ts.map +1 -1
- package/_types/index.d.ts +2 -2
- package/_types/version.d.ts +1 -1
- package/core/Keystore.ts +52 -50
- package/core/TransactionEnvelopeEip1559.ts +2 -1
- package/core/TransactionEnvelopeEip2930.ts +2 -1
- package/core/TransactionEnvelopeEip4844.ts +2 -1
- package/core/TransactionEnvelopeEip7702.ts +2 -1
- package/core/TransactionEnvelopeLegacy.ts +2 -1
- package/index.ts +2 -2
- package/package.json +7 -7
- package/version.ts +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,50 @@
|
|
|
1
1
|
# ox
|
|
2
2
|
|
|
3
|
+
## 0.8.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [`7fc1da0`](https://github.com/wevm/ox/commit/7fc1da0717a17dbac0e4effed2ea3911c7ca3236) Thanks [@jxom](https://github.com/jxom)! - **Breaking(`Keystore`):** Keystore derivation functions (e.g. `Keystore.pbkdf2`) now return a tuple of the key and derivation options,
|
|
8
|
+
instead of an object with the key and options.
|
|
9
|
+
|
|
10
|
+
```diff
|
|
11
|
+
import { Keystore } from 'ox'
|
|
12
|
+
|
|
13
|
+
- const key = Keystore.pbkdf2({ password: 'testpassword' })
|
|
14
|
+
+ const [key, opts] = Keystore.pbkdf2({ password: 'testpassword' })
|
|
15
|
+
```
|
|
16
|
+
|
|
17
|
+
- [`7fc1da0`](https://github.com/wevm/ox/commit/7fc1da0717a17dbac0e4effed2ea3911c7ca3236) Thanks [@jxom](https://github.com/jxom)! - **Breaking(`Keystore`):** `Keystore.decrypt` function interface no longer requires an object as the second parameter, now it only requires the key itself.
|
|
18
|
+
|
|
19
|
+
```diff
|
|
20
|
+
import { Keystore } from 'ox'
|
|
21
|
+
|
|
22
|
+
const [key, opts] = Keystore.pbkdf2({ password: 'testpassword' })
|
|
23
|
+
|
|
24
|
+
const encrypted = await Keystore.encrypt(secret, key, opts)
|
|
25
|
+
|
|
26
|
+
+ const decrypted = await Keystore.decrypt(encrypted, key)
|
|
27
|
+
```
|
|
28
|
+
|
|
29
|
+
- [`7fc1da0`](https://github.com/wevm/ox/commit/7fc1da0717a17dbac0e4effed2ea3911c7ca3236) Thanks [@jxom](https://github.com/jxom)! - **Breaking(`Keystore`):** `Keystore.encrypt` function interface has changed to require derivation options (`opts`).
|
|
30
|
+
|
|
31
|
+
```diff
|
|
32
|
+
import { Keystore } from 'ox'
|
|
33
|
+
|
|
34
|
+
const [key, opts] = Keystore.pbkdf2({ password: 'testpassword' })
|
|
35
|
+
|
|
36
|
+
- const encrypted = await Keystore.encrypt(secret, key)
|
|
37
|
+
+ const encrypted = await Keystore.encrypt(secret, key, opts)
|
|
38
|
+
```
|
|
39
|
+
|
|
40
|
+
## 0.7.2
|
|
41
|
+
|
|
42
|
+
### Patch Changes
|
|
43
|
+
|
|
44
|
+
- [`6090531`](https://github.com/wevm/ox/commit/6090531e29be96d2bd1eda1f85f3e7322b48ff18) Thanks [@jxom](https://github.com/jxom)! - Updated dependencies.
|
|
45
|
+
|
|
46
|
+
- [`c4c7070`](https://github.com/wevm/ox/commit/c4c7070c7d50fd8d745e5f881305bdf4aa5362d0) Thanks [@jxom](https://github.com/jxom)! - Fixed parsing of zeroish nonces.
|
|
47
|
+
|
|
3
48
|
## 0.7.1
|
|
4
49
|
|
|
5
50
|
### Patch Changes
|
package/_cjs/core/Keystore.js
CHANGED
|
@@ -14,33 +14,33 @@ const Bytes = require("./Bytes.js");
|
|
|
14
14
|
const Hash = require("./Hash.js");
|
|
15
15
|
async function decrypt(keystore, key, options = {}) {
|
|
16
16
|
const { as = 'Hex' } = options;
|
|
17
|
-
const key_ = Bytes.from(
|
|
17
|
+
const key_ = Bytes.from(typeof key === 'function' ? key() : key);
|
|
18
18
|
const encKey = Bytes.slice(key_, 0, 16);
|
|
19
19
|
const macKey = Bytes.slice(key_, 16, 32);
|
|
20
20
|
const ciphertext = Bytes.from(`0x${keystore.crypto.ciphertext}`);
|
|
21
21
|
const mac = Hash.keccak256(Bytes.concat(macKey, ciphertext));
|
|
22
22
|
if (!Bytes.isEqual(mac, Bytes.from(`0x${keystore.crypto.mac}`)))
|
|
23
23
|
throw new Error('corrupt keystore');
|
|
24
|
-
const data = (0, aes_1.ctr)(encKey,
|
|
24
|
+
const data = (0, aes_1.ctr)(encKey, Bytes.from(`0x${keystore.crypto.cipherparams.iv}`)).decrypt(ciphertext);
|
|
25
25
|
if (as === 'Hex')
|
|
26
26
|
return Bytes.toHex(data);
|
|
27
27
|
return data;
|
|
28
28
|
}
|
|
29
|
-
async function encrypt(privateKey, key, options
|
|
30
|
-
const { id = crypto.randomUUID() } = options;
|
|
31
|
-
const key_ = Bytes.from(
|
|
29
|
+
async function encrypt(privateKey, key, options) {
|
|
30
|
+
const { id = crypto.randomUUID(), kdf, kdfparams, iv } = options;
|
|
31
|
+
const key_ = Bytes.from(typeof key === 'function' ? key() : key);
|
|
32
32
|
const value_ = Bytes.from(privateKey);
|
|
33
33
|
const encKey = Bytes.slice(key_, 0, 16);
|
|
34
34
|
const macKey = Bytes.slice(key_, 16, 32);
|
|
35
|
-
const ciphertext = (0, aes_1.ctr)(encKey,
|
|
35
|
+
const ciphertext = (0, aes_1.ctr)(encKey, iv).encrypt(value_);
|
|
36
36
|
const mac = Hash.keccak256(Bytes.concat(macKey, ciphertext));
|
|
37
37
|
return {
|
|
38
38
|
crypto: {
|
|
39
39
|
cipher: 'aes-128-ctr',
|
|
40
40
|
ciphertext: Bytes.toHex(ciphertext).slice(2),
|
|
41
|
-
cipherparams: { iv: Bytes.toHex(
|
|
42
|
-
kdf
|
|
43
|
-
kdfparams
|
|
41
|
+
cipherparams: { iv: Bytes.toHex(iv).slice(2) },
|
|
42
|
+
kdf,
|
|
43
|
+
kdfparams,
|
|
44
44
|
mac: Bytes.toHex(mac).slice(2),
|
|
45
45
|
},
|
|
46
46
|
id,
|
|
@@ -50,10 +50,9 @@ async function encrypt(privateKey, key, options = {}) {
|
|
|
50
50
|
function pbkdf2(options) {
|
|
51
51
|
const { iv, iterations = 262_144, password } = options;
|
|
52
52
|
const salt = options.salt ? Bytes.from(options.salt) : Bytes.random(32);
|
|
53
|
-
const key = Bytes.toHex((0, pbkdf2_1.pbkdf2)(sha2_1.sha256, password, salt, { c: iterations, dkLen: 32 }))
|
|
54
|
-
return defineKey({
|
|
53
|
+
const key = Bytes.toHex((0, pbkdf2_1.pbkdf2)(sha2_1.sha256, password, salt, { c: iterations, dkLen: 32 }));
|
|
54
|
+
return defineKey(() => key, {
|
|
55
55
|
iv,
|
|
56
|
-
key: () => key,
|
|
57
56
|
kdfparams: {
|
|
58
57
|
c: iterations,
|
|
59
58
|
dklen: 32,
|
|
@@ -69,10 +68,9 @@ async function pbkdf2Async(options) {
|
|
|
69
68
|
const key = Bytes.toHex(await (0, pbkdf2_1.pbkdf2Async)(sha2_1.sha256, password, salt, {
|
|
70
69
|
c: iterations,
|
|
71
70
|
dkLen: 32,
|
|
72
|
-
}))
|
|
73
|
-
return defineKey({
|
|
71
|
+
}));
|
|
72
|
+
return defineKey(() => key, {
|
|
74
73
|
iv,
|
|
75
|
-
key: () => key,
|
|
76
74
|
kdfparams: {
|
|
77
75
|
c: iterations,
|
|
78
76
|
dklen: 32,
|
|
@@ -87,10 +85,9 @@ function scrypt(options) {
|
|
|
87
85
|
const p = 8;
|
|
88
86
|
const r = 1;
|
|
89
87
|
const salt = options.salt ? Bytes.from(options.salt) : Bytes.random(32);
|
|
90
|
-
const key = Bytes.toHex((0, scrypt_1.scrypt)(password, salt, { N: n, dkLen: 32, r, p }))
|
|
91
|
-
return defineKey({
|
|
88
|
+
const key = Bytes.toHex((0, scrypt_1.scrypt)(password, salt, { N: n, dkLen: 32, r, p }));
|
|
89
|
+
return defineKey(() => key, {
|
|
92
90
|
iv,
|
|
93
|
-
key: () => key,
|
|
94
91
|
kdfparams: {
|
|
95
92
|
dklen: 32,
|
|
96
93
|
n,
|
|
@@ -106,10 +103,9 @@ async function scryptAsync(options) {
|
|
|
106
103
|
const p = 8;
|
|
107
104
|
const r = 1;
|
|
108
105
|
const salt = options.salt ? Bytes.from(options.salt) : Bytes.random(32);
|
|
109
|
-
const key = Bytes.toHex(await (0, scrypt_1.scryptAsync)(password, salt, { N: n, dkLen: 32, r, p }))
|
|
110
|
-
return defineKey({
|
|
106
|
+
const key = Bytes.toHex(await (0, scrypt_1.scryptAsync)(password, salt, { N: n, dkLen: 32, r, p }));
|
|
107
|
+
return defineKey(() => key, {
|
|
111
108
|
iv,
|
|
112
|
-
key: () => key,
|
|
113
109
|
kdfparams: {
|
|
114
110
|
dklen: 32,
|
|
115
111
|
n,
|
|
@@ -120,8 +116,8 @@ async function scryptAsync(options) {
|
|
|
120
116
|
kdf: 'scrypt',
|
|
121
117
|
});
|
|
122
118
|
}
|
|
123
|
-
function defineKey(key) {
|
|
124
|
-
const iv =
|
|
125
|
-
return { ...
|
|
119
|
+
function defineKey(key, options) {
|
|
120
|
+
const iv = options.iv ? Bytes.from(options.iv) : Bytes.random(16);
|
|
121
|
+
return [key, { ...options, iv }];
|
|
126
122
|
}
|
|
127
123
|
//# sourceMappingURL=Keystore.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Keystore.js","sourceRoot":"","sources":["../../core/Keystore.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"Keystore.js","sourceRoot":"","sources":["../../core/Keystore.ts"],"names":[],"mappings":";;AAiGA,0BAwBC;AA2DD,0BA4BC;AAsBD,wBAkBC;AA4BD,kCAqBC;AAmBD,wBAsBC;AA4BD,kCAsBC;AApYD,4CAAwC;AACxC,iDAG6B;AAC7B,iDAG6B;AAC7B,6CAA2C;AAC3C,oCAAmC;AAEnC,kCAAiC;AAqF1B,KAAK,UAAU,OAAO,CAC3B,QAAkB,EAClB,GAAQ,EACR,UAA+B,EAAE;IAEjC,MAAM,EAAE,EAAE,GAAG,KAAK,EAAE,GAAG,OAAO,CAAA;IAC9B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,GAAG,KAAK,UAAU,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;IAEhE,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;IACvC,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC,CAAA;IAExC,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAA;IAChE,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;IAE5D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;QAC7D,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAA;IAErC,MAAM,IAAI,GAAG,IAAA,SAAG,EACd,MAAM,EACN,KAAK,CAAC,IAAI,CAAC,KAAK,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,CACnD,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;IAErB,IAAI,EAAE,KAAK,KAAK;QAAE,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,CAAU,CAAA;IACnD,OAAO,IAAa,CAAA;AACtB,CAAC;AA2DM,KAAK,UAAU,OAAO,CAC3B,UAAiC,EACjC,GAAQ,EACR,OAAwB;IAExB,MAAM,EAAE,EAAE,GAAG,MAAM,CAAC,UAAU,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,GAAG,OAAO,CAAA;IAEhE,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,GAAG,KAAK,UAAU,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;IAChE,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IAErC,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;IACvC,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC,CAAA;IAExC,MAAM,UAAU,GAAG,IAAA,SAAG,EAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IAClD,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;IAE5D,OAAO;QACL,MAAM,EAAE;YACN,MAAM,EAAE,aAAa;YACrB,UAAU,EAAE,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;YAC5C,YAAY,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;YAC9C,GAAG;YACH,SAAS;YACT,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;SACT;QACvB,EAAE;QACF,OAAO,EAAE,CAAC;KACX,CAAA;AACH,CAAC;AAsBD,SAAgB,MAAM,CAAC,OAAuB;IAC5C,MAAM,EAAE,EAAE,EAAE,UAAU,GAAG,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAA;IAEtD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IACvE,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK,CACrB,IAAA,eAAY,EAAC,aAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CACnE,CAAA;IAED,OAAO,SAAS,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE;QAC1B,EAAE;QACF,SAAS,EAAE;YACT,CAAC,EAAE,UAAU;YACb,KAAK,EAAE,EAAE;YACT,GAAG,EAAE,aAAa;YAClB,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;SACjC;QACD,GAAG,EAAE,QAAQ;KACd,CAAmC,CAAA;AACtC,CAAC;AA4BM,KAAK,UAAU,WAAW,CAAC,OAAuB;IACvD,MAAM,EAAE,EAAE,EAAE,UAAU,GAAG,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAA;IAEtD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IACvE,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK,CACrB,MAAM,IAAA,oBAAiB,EAAC,aAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;QAC9C,CAAC,EAAE,UAAU;QACb,KAAK,EAAE,EAAE;KACV,CAAC,CACH,CAAA;IAED,OAAO,SAAS,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE;QAC1B,EAAE;QACF,SAAS,EAAE;YACT,CAAC,EAAE,UAAU;YACb,KAAK,EAAE,EAAE;YACT,GAAG,EAAE,aAAa;YAClB,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;SACjC;QACD,GAAG,EAAE,QAAQ;KACd,CAAmC,CAAA;AACtC,CAAC;AAmBD,SAAgB,MAAM,CAAC,OAAuB;IAC5C,MAAM,EAAE,EAAE,EAAE,CAAC,GAAG,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAA;IAE7C,MAAM,CAAC,GAAG,CAAC,CAAA;IACX,MAAM,CAAC,GAAG,CAAC,CAAA;IAEX,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IACvE,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK,CACrB,IAAA,eAAY,EAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CACxD,CAAA;IAED,OAAO,SAAS,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE;QAC1B,EAAE;QACF,SAAS,EAAE;YACT,KAAK,EAAE,EAAE;YACT,CAAC;YACD,CAAC;YACD,CAAC;YACD,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;SACjC;QACD,GAAG,EAAE,QAAQ;KACd,CAAmC,CAAA;AACtC,CAAC;AA4BM,KAAK,UAAU,WAAW,CAAC,OAAuB;IACvD,MAAM,EAAE,EAAE,EAAE,CAAC,GAAG,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAA;IAE7C,MAAM,CAAC,GAAG,CAAC,CAAA;IACX,MAAM,CAAC,GAAG,CAAC,CAAA;IAEX,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IACvE,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK,CACrB,MAAM,IAAA,oBAAiB,EAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CACnE,CAAA;IAED,OAAO,SAAS,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE;QAC1B,EAAE;QACF,SAAS,EAAE;YACT,KAAK,EAAE,EAAE;YACT,CAAC;YACD,CAAC;YACD,CAAC;YACD,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;SACjC;QACD,GAAG,EAAE,QAAQ;KACd,CAAmC,CAAA;AACtC,CAAC;AASD,SAAS,SAAS,CAGhB,GAAQ,EAAE,OAAgB;IAC1B,MAAM,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IACjE,OAAO,CAAC,GAAG,EAAE,EAAE,GAAG,OAAO,EAAE,EAAE,EAAE,CAAU,CAAA;AAC3C,CAAC"}
|
|
@@ -70,8 +70,8 @@ function deserialize(serialized) {
|
|
|
70
70
|
transaction.gas = BigInt(gas);
|
|
71
71
|
if (Hex.validate(data) && data !== '0x')
|
|
72
72
|
transaction.data = data;
|
|
73
|
-
if (Hex.validate(nonce)
|
|
74
|
-
transaction.nonce = BigInt(nonce);
|
|
73
|
+
if (Hex.validate(nonce))
|
|
74
|
+
transaction.nonce = nonce === '0x' ? 0n : BigInt(nonce);
|
|
75
75
|
if (Hex.validate(value) && value !== '0x')
|
|
76
76
|
transaction.value = BigInt(value);
|
|
77
77
|
if (Hex.validate(maxFeePerGas) && maxFeePerGas !== '0x')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TransactionEnvelopeEip1559.js","sourceRoot":"","sources":["../../core/TransactionEnvelopeEip1559.ts"],"names":[],"mappings":";;;AAoEA,wBAkBC;AAgCD,
|
|
1
|
+
{"version":3,"file":"TransactionEnvelopeEip1559.js","sourceRoot":"","sources":["../../core/TransactionEnvelopeEip1559.ts"],"names":[],"mappings":";;;AAoEA,wBAkBC;AAgCD,kCAwEC;AAkFD,oBAyBC;AA0DD,wCAIC;AAsCD,oBAkBC;AAkED,8BAqCC;AA4CD,sBA2BC;AAwBD,4BASC;AA9mBD,8CAA6C;AAC7C,wCAAuC;AAEvC,kCAAiC;AACjC,gCAA+B;AAC/B,gCAA+B;AAC/B,4CAA2C;AAC3C,gEAA+D;AAiClD,QAAA,cAAc,GAAG,MAAe,CAAA;AAKhC,QAAA,IAAI,GAAG,SAAkB,CAAA;AAuBtC,SAAgB,MAAM,CACpB,QAAuD;IAEvD,MAAM,EAAE,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,EAAE,EAAE,GAAG,QAAQ,CAAA;IACpE,IAAI,OAAO,IAAI,CAAC;QACd,MAAM,IAAI,mBAAmB,CAAC,mBAAmB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;IAChE,IAAI,EAAE;QAAE,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAA;IAC7C,IAAI,YAAY,IAAI,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,IAAI,IAAI,GAAG,EAAE;QACxD,MAAM,IAAI,mBAAmB,CAAC,kBAAkB,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAA;IAC5E,IACE,oBAAoB;QACpB,YAAY;QACZ,oBAAoB,GAAG,YAAY;QAEnC,MAAM,IAAI,mBAAmB,CAAC,mBAAmB,CAAC;YAChD,YAAY;YACZ,oBAAoB;SACrB,CAAC,CAAA;AACN,CAAC;AAgCD,SAAgB,WAAW,CACzB,UAAsB;IAEtB,MAAM,gBAAgB,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAA;IAE5D,MAAM,CACJ,OAAO,EACP,KAAK,EACL,oBAAoB,EACpB,YAAY,EACZ,GAAG,EACH,EAAE,EACF,KAAK,EACL,IAAI,EACJ,UAAU,EACV,OAAO,EACP,CAAC,EACD,CAAC,EACF,GAAG,gBAAsC,CAAA;IAE1C,IAAI,CAAC,CAAC,gBAAgB,CAAC,MAAM,KAAK,CAAC,IAAI,gBAAgB,CAAC,MAAM,KAAK,EAAE,CAAC;QACpE,MAAM,IAAI,mBAAmB,CAAC,sBAAsB,CAAC;YACnD,UAAU,EAAE;gBACV,OAAO;gBACP,KAAK;gBACL,oBAAoB;gBACpB,YAAY;gBACZ,GAAG;gBACH,EAAE;gBACF,KAAK;gBACL,IAAI;gBACJ,UAAU;gBACV,GAAG,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC;oBAC7B,CAAC,CAAC;wBACE,OAAO;wBACP,CAAC;wBACD,CAAC;qBACF;oBACH,CAAC,CAAC,EAAE,CAAC;aACR;YACD,UAAU;YACV,IAAI,EAAJ,YAAI;SACL,CAAC,CAAA;IAEJ,IAAI,WAAW,GAAG;QAChB,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC;QACxB,IAAI,EAAJ,YAAI;KACyB,CAAA;IAC/B,IAAI,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,IAAI;QAAE,WAAW,CAAC,EAAE,GAAG,EAAE,CAAA;IACxD,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,IAAI;QAAE,WAAW,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA;IACpE,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,IAAI;QAAE,WAAW,CAAC,IAAI,GAAG,IAAI,CAAA;IAChE,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC;QACrB,WAAW,CAAC,KAAK,GAAG,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACzD,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,IAAI;QAAE,WAAW,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;IAC5E,IAAI,GAAG,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,YAAY,KAAK,IAAI;QACrD,WAAW,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC,CAAA;IACjD,IAAI,GAAG,CAAC,QAAQ,CAAC,oBAAoB,CAAC,IAAI,oBAAoB,KAAK,IAAI;QACrE,WAAW,CAAC,oBAAoB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAA;IACjE,IAAI,UAAW,CAAC,MAAM,KAAK,CAAC,IAAI,UAAU,KAAK,IAAI;QACjD,WAAW,CAAC,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,UAAiB,CAAC,CAAA;IAEtE,MAAM,SAAS,GACb,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACtE,IAAI,SAAS;QACX,WAAW,GAAG;YACZ,GAAG,WAAW;YACd,GAAG,SAAS;SACiB,CAAA;IAEjC,MAAM,CAAC,WAAW,CAAC,CAAA;IAEnB,OAAO,WAAW,CAAA;AACpB,CAAC;AAkFD,SAAgB,IAAI,CAMlB,QAGc,EACd,UAAmC,EAAE;IAErC,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAA;IAE7B,MAAM,SAAS,GAAG,CAChB,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAClC,CAAA;IAE/B,MAAM,CAAC,SAAS,CAAC,CAAA;IAEjB,OAAO;QACL,GAAG,SAAS;QACZ,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/C,IAAI,EAAE,SAAS;KACP,CAAA;AACZ,CAAC;AA0DD,SAAgB,cAAc,CAC5B,QAAoC;IAEpC,OAAO,IAAI,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;AAC1C,CAAC;AAsCD,SAAgB,IAAI,CAClB,QAAyE,EACzE,UAAiC,EAAE;IAEnC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAA;IAC3B,OAAO,IAAI,CAAC,SAAS,CACnB,SAAS,CAAC;QACR,GAAG,QAAQ;QACX,GAAG,CAAC,OAAO;YACT,CAAC,CAAC;gBACE,CAAC,EAAE,SAAS;gBACZ,CAAC,EAAE,SAAS;gBACZ,OAAO,EAAE,SAAS;gBAClB,CAAC,EAAE,SAAS;aACb;YACH,CAAC,CAAC,EAAE,CAAC;KACR,CAAC,CACH,CAAA;AACH,CAAC;AAkED,SAAgB,SAAS,CACvB,QAAuD,EACvD,UAA6B,EAAE;IAE/B,MAAM,EACJ,OAAO,EACP,GAAG,EACH,KAAK,EACL,EAAE,EACF,KAAK,EACL,YAAY,EACZ,oBAAoB,EACpB,UAAU,EACV,IAAI,EACJ,KAAK,GACN,GAAG,QAAQ,CAAA;IAEZ,MAAM,CAAC,QAAQ,CAAC,CAAA;IAEhB,MAAM,eAAe,GAAG,UAAU,CAAC,WAAW,CAAC,UAAU,CAAC,CAAA;IAE1D,MAAM,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,IAAI,QAAQ,CAAC,CAAA;IAElE,MAAM,UAAU,GAAG;QACjB,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC;QACvB,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI;QACpC,oBAAoB,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,IAAI;QAClE,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI;QAClD,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI;QAChC,EAAE,IAAI,IAAI;QACV,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI;QACpC,IAAI,IAAI,KAAK,IAAI,IAAI;QACrB,eAAe;QACf,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KACnD,CAAA;IAED,OAAO,GAAG,CAAC,MAAM,CAAC,sBAAc,EAAE,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAe,CAAA;AAC1E,CAAC;AA4CD,SAAgB,KAAK,CAAC,QAAkD;IACtE,MAAM,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAE7C,OAAO;QACL,GAAG,QAAQ;QACX,OAAO,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC;QACzC,IAAI,EAAE,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,KAAK;QACrC,IAAI,EAAE,KAAK;QACX,GAAG,CAAC,OAAO,QAAQ,CAAC,GAAG,KAAK,QAAQ;YAClC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACvC,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,OAAO,QAAQ,CAAC,KAAK,KAAK,QAAQ;YACpC,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YAC3C,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,OAAO,QAAQ,CAAC,KAAK,KAAK,QAAQ;YACpC,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YAC3C,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,OAAO,QAAQ,CAAC,YAAY,KAAK,QAAQ;YAC3C,CAAC,CAAC,EAAE,YAAY,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YACzD,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,OAAO,QAAQ,CAAC,oBAAoB,KAAK,QAAQ;YACnD,CAAC,CAAC;gBACE,oBAAoB,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,oBAAoB,CAAC;aACpE;YACH,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KACxC,CAAA;AACZ,CAAC;AAwBD,SAAgB,QAAQ,CACtB,QAAuD;IAEvD,IAAI,CAAC;QACH,MAAM,CAAC,QAAQ,CAAC,CAAA;QAChB,OAAO,IAAI,CAAA;IACb,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC"}
|
|
@@ -62,8 +62,8 @@ function deserialize(serialized) {
|
|
|
62
62
|
transaction.gas = BigInt(gas);
|
|
63
63
|
if (Hex.validate(data) && data !== '0x')
|
|
64
64
|
transaction.data = data;
|
|
65
|
-
if (Hex.validate(nonce)
|
|
66
|
-
transaction.nonce = BigInt(nonce);
|
|
65
|
+
if (Hex.validate(nonce))
|
|
66
|
+
transaction.nonce = nonce === '0x' ? 0n : BigInt(nonce);
|
|
67
67
|
if (Hex.validate(value) && value !== '0x')
|
|
68
68
|
transaction.value = BigInt(value);
|
|
69
69
|
if (Hex.validate(gasPrice) && gasPrice !== '0x')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TransactionEnvelopeEip2930.js","sourceRoot":"","sources":["../../core/TransactionEnvelopeEip2930.ts"],"names":[],"mappings":";;;AAkEA,wBASC;AA+BD,
|
|
1
|
+
{"version":3,"file":"TransactionEnvelopeEip2930.js","sourceRoot":"","sources":["../../core/TransactionEnvelopeEip2930.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,8 +84,8 @@ function deserialize(serialized) {
|
|
|
84
84
|
transaction.gas = BigInt(gas);
|
|
85
85
|
if (Hex.validate(data) && data !== '0x')
|
|
86
86
|
transaction.data = data;
|
|
87
|
-
if (Hex.validate(nonce)
|
|
88
|
-
transaction.nonce = BigInt(nonce);
|
|
87
|
+
if (Hex.validate(nonce))
|
|
88
|
+
transaction.nonce = nonce === '0x' ? 0n : BigInt(nonce);
|
|
89
89
|
if (Hex.validate(value) && value !== '0x')
|
|
90
90
|
transaction.value = BigInt(value);
|
|
91
91
|
if (Hex.validate(maxFeePerBlobGas) && maxFeePerBlobGas !== '0x')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TransactionEnvelopeEip4844.js","sourceRoot":"","sources":["../../core/TransactionEnvelopeEip4844.ts"],"names":[],"mappings":";;;AA0EA,wBAsBC;AAoCD,
|
|
1
|
+
{"version":3,"file":"TransactionEnvelopeEip4844.js","sourceRoot":"","sources":["../../core/TransactionEnvelopeEip4844.ts"],"names":[],"mappings":";;;AA0EA,wBAsBC;AAoCD,kCA8FC;AAoGD,oBAyBC;AAgED,wCAIC;AAqCD,oBAmBC;AAgFD,8BA2DC;AAqDD,sBA4BC;AAwBD,4BASC;AAxtBD,8CAA6C;AAC7C,oCAAmC;AAEnC,kCAAiC;AACjC,gCAA+B;AAC/B,gCAA+B;AAC/B,gCAA+B;AAC/B,4CAA2C;AAC3C,gEAA+D;AAC/D,8EAA6E;AAuChE,QAAA,cAAc,GAAG,MAAe,CAAA;AAKhC,QAAA,IAAI,GAAG,SAAkB,CAAA;AAqBtC,SAAgB,MAAM,CACpB,QAAuD;IAEvD,MAAM,EAAE,mBAAmB,EAAE,GAAG,QAAQ,CAAA;IACxC,IAAI,mBAAmB,EAAE,CAAC;QACxB,IAAI,mBAAmB,CAAC,MAAM,KAAK,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,6BAA6B,EAAE,CAAA;QACjD,KAAK,MAAM,IAAI,IAAI,mBAAmB,EAAE,CAAC;YACvC,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAC3B,MAAM,OAAO,GAAG,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;YACnD,IAAI,IAAI,KAAK,EAAE;gBACb,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;YAC/D,IAAI,OAAO,KAAK,GAAG,CAAC,oBAAoB;gBACtC,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC;oBAC/C,IAAI;oBACJ,OAAO;iBACR,CAAC,CAAA;QACN,CAAC;IACH,CAAC;IACD,0BAA0B,CAAC,MAAM,CAC/B,QAAuE,CACxE,CAAA;AACH,CAAC;AAoCD,SAAgB,WAAW,CACzB,UAAsB;IAEtB,MAAM,yBAAyB,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAA;IAErE,MAAM,iBAAiB,GAAG,yBAAyB,CAAC,MAAM,KAAK,CAAC,CAAA;IAEhE,MAAM,gBAAgB,GAAG,iBAAiB;QACxC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAE;QAC/B,CAAC,CAAC,yBAAyB,CAAA;IAC7B,MAAM,YAAY,GAAG,iBAAiB;QACpC,CAAC,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC,CAAC;QACpC,CAAC,CAAC,EAAE,CAAA;IAEN,MAAM,CACJ,OAAO,EACP,KAAK,EACL,oBAAoB,EACpB,YAAY,EACZ,GAAG,EACH,EAAE,EACF,KAAK,EACL,IAAI,EACJ,UAAU,EACV,gBAAgB,EAChB,mBAAmB,EACnB,OAAO,EACP,CAAC,EACD,CAAC,EACF,GAAG,gBAAgB,CAAA;IACpB,MAAM,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,CAAC,GAAG,YAAY,CAAA;IAEjD,IAAI,CAAC,CAAC,gBAAgB,CAAC,MAAM,KAAK,EAAE,IAAI,gBAAgB,CAAC,MAAM,KAAK,EAAE,CAAC;QACrE,MAAM,IAAI,mBAAmB,CAAC,sBAAsB,CAAC;YACnD,UAAU,EAAE;gBACV,OAAO;gBACP,KAAK;gBACL,oBAAoB;gBACpB,YAAY;gBACZ,GAAG;gBACH,EAAE;gBACF,KAAK;gBACL,IAAI;gBACJ,UAAU;gBACV,GAAG,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC;oBAC7B,CAAC,CAAC;wBACE,OAAO;wBACP,CAAC;wBACD,CAAC;qBACF;oBACH,CAAC,CAAC,EAAE,CAAC;aACR;YACD,UAAU;YACV,IAAI,EAAJ,YAAI;SACL,CAAC,CAAA;IAEJ,IAAI,WAAW,GAAG;QAChB,mBAAmB,EAAE,mBAAgC;QACrD,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC;QACxB,IAAI,EAAJ,YAAI;KACyB,CAAA;IAC/B,IAAI,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,IAAI;QAAE,WAAW,CAAC,EAAE,GAAG,EAAE,CAAA;IACxD,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,IAAI;QAAE,WAAW,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA;IACpE,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,IAAI;QAAE,WAAW,CAAC,IAAI,GAAG,IAAI,CAAA;IAChE,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC;QACrB,WAAW,CAAC,KAAK,GAAG,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACzD,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,IAAI;QAAE,WAAW,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;IAC5E,IAAI,GAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC,IAAI,gBAAgB,KAAK,IAAI;QAC7D,WAAW,CAAC,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAA;IACzD,IAAI,GAAG,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,YAAY,KAAK,IAAI;QACrD,WAAW,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC,CAAA;IACjD,IAAI,GAAG,CAAC,QAAQ,CAAC,oBAAoB,CAAC,IAAI,oBAAoB,KAAK,IAAI;QACrE,WAAW,CAAC,oBAAoB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAA;IACjE,IAAI,UAAU,EAAE,MAAM,KAAK,CAAC,IAAI,UAAU,KAAK,IAAI;QACjD,WAAW,CAAC,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,UAAiB,CAAC,CAAA;IACtE,IAAI,KAAK,IAAI,WAAW,IAAI,MAAM;QAChC,WAAW,CAAC,QAAQ,GAAG,KAAK,CAAC,UAAU,CAAC,KAAkB,EAAE;YAC1D,WAAW,EAAE,WAAwB;YACrC,MAAM,EAAE,MAAmB;SAC5B,CAAC,CAAA;IAEJ,MAAM,SAAS,GACb,CAAC,IAAI,CAAC,IAAI,OAAO;QACf,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,OAAkB,EAAE,CAAY,EAAE,CAAY,CAAC,CAAC;QACvE,CAAC,CAAC,SAAS,CAAA;IACf,IAAI,SAAS;QACX,WAAW,GAAG;YACZ,GAAG,WAAW;YACd,GAAG,SAAS;SACiB,CAAA;IAEjC,MAAM,CAAC,WAAW,CAAC,CAAA;IAEnB,OAAO,WAAW,CAAA;AACpB,CAAC;AAoGD,SAAgB,IAAI,CAMlB,QAGc,EACd,UAAmC,EAAE;IAErC,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAA;IAE7B,MAAM,SAAS,GAAG,CAChB,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAClC,CAAA;IAE/B,MAAM,CAAC,SAAS,CAAC,CAAA;IAEjB,OAAO;QACL,GAAG,SAAS;QACZ,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/C,IAAI,EAAE,SAAS;KACP,CAAA;AACZ,CAAC;AAgED,SAAgB,cAAc,CAC5B,QAAoC;IAEpC,OAAO,IAAI,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;AAC1C,CAAC;AAqCD,SAAgB,IAAI,CAClB,QAAyE,EACzE,UAAiC,EAAE;IAEnC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAA;IAC3B,OAAO,IAAI,CAAC,SAAS,CACnB,SAAS,CAAC;QACR,GAAG,QAAQ;QACX,GAAG,CAAC,OAAO;YACT,CAAC,CAAC;gBACE,QAAQ,EAAE,SAAS;gBACnB,CAAC,EAAE,SAAS;gBACZ,CAAC,EAAE,SAAS;gBACZ,OAAO,EAAE,SAAS;gBAClB,CAAC,EAAE,SAAS;aACb;YACH,CAAC,CAAC,EAAE,CAAC;KACR,CAAC,CACH,CAAA;AACH,CAAC;AAgFD,SAAgB,SAAS,CACvB,QAAuD,EACvD,UAA6B,EAAE;IAE/B,MAAM,EACJ,mBAAmB,EACnB,OAAO,EACP,GAAG,EACH,KAAK,EACL,EAAE,EACF,KAAK,EACL,gBAAgB,EAChB,YAAY,EACZ,oBAAoB,EACpB,UAAU,EACV,IAAI,GACL,GAAG,QAAQ,CAAA;IAEZ,MAAM,CAAC,QAAQ,CAAC,CAAA;IAEhB,MAAM,eAAe,GAAG,UAAU,CAAC,WAAW,CAAC,UAAU,CAAC,CAAA;IAE1D,MAAM,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,IAAI,QAAQ,CAAC,CAAA;IAElE,MAAM,UAAU,GAAG;QACjB,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC;QACvB,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI;QACpC,oBAAoB,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,IAAI;QAClE,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI;QAClD,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI;QAChC,EAAE,IAAI,IAAI;QACV,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI;QACpC,IAAI,IAAI,IAAI;QACZ,eAAe;QACf,gBAAgB,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI;QAC1D,mBAAmB,IAAI,EAAE;QACzB,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KAC1C,CAAA;IAEV,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,QAAQ,CAAC,QAAQ,CAAA;IACtD,MAAM,KAAK,GAAc,EAAE,CAAA;IAC3B,MAAM,WAAW,GAAc,EAAE,CAAA;IACjC,MAAM,MAAM,GAAc,EAAE,CAAA;IAC5B,IAAI,QAAQ;QACV,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACzC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAE,CAAA;YAChD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAChB,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;YAC5B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACpB,CAAC;IAEH,OAAO,GAAG,CAAC,MAAM,CACf,MAAM,EACN,QAAQ;QACN,CAAC;YACC,GAAG,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;QACvD,CAAC;YACC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CACd,CAAA;AACjB,CAAC;AAqDD,SAAgB,KAAK,CAAC,QAAkD;IACtE,MAAM,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAE7C,OAAO;QACL,GAAG,QAAQ;QACX,OAAO,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC;QACzC,IAAI,EAAE,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,KAAK;QACrC,GAAG,CAAC,OAAO,QAAQ,CAAC,GAAG,KAAK,QAAQ;YAClC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACvC,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,OAAO,QAAQ,CAAC,KAAK,KAAK,QAAQ;YACpC,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YAC3C,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,OAAO,QAAQ,CAAC,KAAK,KAAK,QAAQ;YACpC,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YAC3C,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,OAAO,QAAQ,CAAC,gBAAgB,KAAK,QAAQ;YAC/C,CAAC,CAAC,EAAE,gBAAgB,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE;YACjE,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,OAAO,QAAQ,CAAC,YAAY,KAAK,QAAQ;YAC3C,CAAC,CAAC,EAAE,YAAY,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YACzD,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,OAAO,QAAQ,CAAC,oBAAoB,KAAK,QAAQ;YACnD,CAAC,CAAC,EAAE,oBAAoB,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE;YACzE,CAAC,CAAC,EAAE,CAAC;QACP,IAAI,EAAE,KAAK;QACX,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KACxC,CAAA;AACZ,CAAC;AAwBD,SAAgB,QAAQ,CACtB,QAAuD;IAEvD,IAAI,CAAC;QACH,MAAM,CAAC,QAAQ,CAAC,CAAA;QAChB,OAAO,IAAI,CAAA;IACb,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC"}
|
|
@@ -69,8 +69,8 @@ function deserialize(serialized) {
|
|
|
69
69
|
transaction.gas = BigInt(gas);
|
|
70
70
|
if (Hex.validate(data) && data !== '0x')
|
|
71
71
|
transaction.data = data;
|
|
72
|
-
if (Hex.validate(nonce)
|
|
73
|
-
transaction.nonce = BigInt(nonce);
|
|
72
|
+
if (Hex.validate(nonce))
|
|
73
|
+
transaction.nonce = nonce === '0x' ? 0n : BigInt(nonce);
|
|
74
74
|
if (Hex.validate(value) && value !== '0x')
|
|
75
75
|
transaction.value = BigInt(value);
|
|
76
76
|
if (Hex.validate(maxFeePerGas) && maxFeePerGas !== '0x')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TransactionEnvelopeEip7702.js","sourceRoot":"","sources":["../../core/TransactionEnvelopeEip7702.ts"],"names":[],"mappings":";;;AAwEA,wBAeC;AA+BD,
|
|
1
|
+
{"version":3,"file":"TransactionEnvelopeEip7702.js","sourceRoot":"","sources":["../../core/TransactionEnvelopeEip7702.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,8 +57,8 @@ function deserialize(serialized) {
|
|
|
57
57
|
transaction.gas = BigInt(gas);
|
|
58
58
|
if (Hex.validate(data) && data !== '0x')
|
|
59
59
|
transaction.data = data;
|
|
60
|
-
if (Hex.validate(nonce)
|
|
61
|
-
transaction.nonce = BigInt(nonce);
|
|
60
|
+
if (Hex.validate(nonce))
|
|
61
|
+
transaction.nonce = nonce === '0x' ? 0n : BigInt(nonce);
|
|
62
62
|
if (Hex.validate(value) && value !== '0x')
|
|
63
63
|
transaction.value = BigInt(value);
|
|
64
64
|
if (Hex.validate(gasPrice) && gasPrice !== '0x')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TransactionEnvelopeLegacy.js","sourceRoot":"","sources":["../../core/TransactionEnvelopeLegacy.ts"],"names":[],"mappings":";;;AAgEA,wBAOC;AA+BD,
|
|
1
|
+
{"version":3,"file":"TransactionEnvelopeLegacy.js","sourceRoot":"","sources":["../../core/TransactionEnvelopeLegacy.ts"],"names":[],"mappings":"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"}
|
package/_cjs/version.js
CHANGED
package/_esm/core/Keystore.js
CHANGED
|
@@ -20,8 +20,8 @@ import * as Hash from './Hash.js';
|
|
|
20
20
|
* // JSON keystore.
|
|
21
21
|
* const keystore = { crypto: { ... }, id: '...', version: 3 }
|
|
22
22
|
*
|
|
23
|
-
* //
|
|
24
|
-
* const key =
|
|
23
|
+
* // Key that was previously derived from `Keystore.scrypt` or `Keystore.pbkdf2`.
|
|
24
|
+
* const key = "0x..."
|
|
25
25
|
*
|
|
26
26
|
* // Decrypt the private key.
|
|
27
27
|
* const privateKey = await Keystore.decrypt(keystore, key)
|
|
@@ -35,14 +35,14 @@ import * as Hash from './Hash.js';
|
|
|
35
35
|
*/
|
|
36
36
|
export async function decrypt(keystore, key, options = {}) {
|
|
37
37
|
const { as = 'Hex' } = options;
|
|
38
|
-
const key_ = Bytes.from(
|
|
38
|
+
const key_ = Bytes.from(typeof key === 'function' ? key() : key);
|
|
39
39
|
const encKey = Bytes.slice(key_, 0, 16);
|
|
40
40
|
const macKey = Bytes.slice(key_, 16, 32);
|
|
41
41
|
const ciphertext = Bytes.from(`0x${keystore.crypto.ciphertext}`);
|
|
42
42
|
const mac = Hash.keccak256(Bytes.concat(macKey, ciphertext));
|
|
43
43
|
if (!Bytes.isEqual(mac, Bytes.from(`0x${keystore.crypto.mac}`)))
|
|
44
44
|
throw new Error('corrupt keystore');
|
|
45
|
-
const data = ctr(encKey,
|
|
45
|
+
const data = ctr(encKey, Bytes.from(`0x${keystore.crypto.cipherparams.iv}`)).decrypt(ciphertext);
|
|
46
46
|
if (as === 'Hex')
|
|
47
47
|
return Bytes.toHex(data);
|
|
48
48
|
return data;
|
|
@@ -63,10 +63,10 @@ export async function decrypt(keystore, key, options = {}) {
|
|
|
63
63
|
* const privateKey = Secp256k1.randomPrivateKey()
|
|
64
64
|
*
|
|
65
65
|
* // Derive key from password.
|
|
66
|
-
* const key = Keystore.pbkdf2({ password: 'testpassword' })
|
|
66
|
+
* const [key, opts] = Keystore.pbkdf2({ password: 'testpassword' })
|
|
67
67
|
*
|
|
68
68
|
* // Encrypt the private key.
|
|
69
|
-
* const encrypted = await Keystore.encrypt(privateKey, key)
|
|
69
|
+
* const encrypted = await Keystore.encrypt(privateKey, key, opts)
|
|
70
70
|
* // @log: {
|
|
71
71
|
* // @log: "crypto": {
|
|
72
72
|
* // @log: "cipher": "aes-128-ctr",
|
|
@@ -93,21 +93,21 @@ export async function decrypt(keystore, key, options = {}) {
|
|
|
93
93
|
* @param options - Encryption options.
|
|
94
94
|
* @returns Encrypted keystore.
|
|
95
95
|
*/
|
|
96
|
-
export async function encrypt(privateKey, key, options
|
|
97
|
-
const { id = crypto.randomUUID() } = options;
|
|
98
|
-
const key_ = Bytes.from(
|
|
96
|
+
export async function encrypt(privateKey, key, options) {
|
|
97
|
+
const { id = crypto.randomUUID(), kdf, kdfparams, iv } = options;
|
|
98
|
+
const key_ = Bytes.from(typeof key === 'function' ? key() : key);
|
|
99
99
|
const value_ = Bytes.from(privateKey);
|
|
100
100
|
const encKey = Bytes.slice(key_, 0, 16);
|
|
101
101
|
const macKey = Bytes.slice(key_, 16, 32);
|
|
102
|
-
const ciphertext = ctr(encKey,
|
|
102
|
+
const ciphertext = ctr(encKey, iv).encrypt(value_);
|
|
103
103
|
const mac = Hash.keccak256(Bytes.concat(macKey, ciphertext));
|
|
104
104
|
return {
|
|
105
105
|
crypto: {
|
|
106
106
|
cipher: 'aes-128-ctr',
|
|
107
107
|
ciphertext: Bytes.toHex(ciphertext).slice(2),
|
|
108
|
-
cipherparams: { iv: Bytes.toHex(
|
|
109
|
-
kdf
|
|
110
|
-
kdfparams
|
|
108
|
+
cipherparams: { iv: Bytes.toHex(iv).slice(2) },
|
|
109
|
+
kdf,
|
|
110
|
+
kdfparams,
|
|
111
111
|
mac: Bytes.toHex(mac).slice(2),
|
|
112
112
|
},
|
|
113
113
|
id,
|
|
@@ -121,7 +121,7 @@ export async function encrypt(privateKey, key, options = {}) {
|
|
|
121
121
|
* ```ts twoslash
|
|
122
122
|
* import { Keystore } from 'ox'
|
|
123
123
|
*
|
|
124
|
-
* const key = Keystore.pbkdf2({ password: 'testpassword' })
|
|
124
|
+
* const [key, opts] = Keystore.pbkdf2({ password: 'testpassword' })
|
|
125
125
|
* ```
|
|
126
126
|
*
|
|
127
127
|
* @param options - PBKDF2 options.
|
|
@@ -130,10 +130,9 @@ export async function encrypt(privateKey, key, options = {}) {
|
|
|
130
130
|
export function pbkdf2(options) {
|
|
131
131
|
const { iv, iterations = 262_144, password } = options;
|
|
132
132
|
const salt = options.salt ? Bytes.from(options.salt) : Bytes.random(32);
|
|
133
|
-
const key = Bytes.toHex(pbkdf2_noble(sha256, password, salt, { c: iterations, dkLen: 32 }))
|
|
134
|
-
return defineKey({
|
|
133
|
+
const key = Bytes.toHex(pbkdf2_noble(sha256, password, salt, { c: iterations, dkLen: 32 }));
|
|
134
|
+
return defineKey(() => key, {
|
|
135
135
|
iv,
|
|
136
|
-
key: () => key,
|
|
137
136
|
kdfparams: {
|
|
138
137
|
c: iterations,
|
|
139
138
|
dklen: 32,
|
|
@@ -150,7 +149,7 @@ export function pbkdf2(options) {
|
|
|
150
149
|
* ```ts twoslash
|
|
151
150
|
* import { Keystore } from 'ox'
|
|
152
151
|
*
|
|
153
|
-
* const key = await Keystore.pbkdf2Async({ password: 'testpassword' })
|
|
152
|
+
* const [key, opts] = await Keystore.pbkdf2Async({ password: 'testpassword' })
|
|
154
153
|
* ```
|
|
155
154
|
*
|
|
156
155
|
* @param options - PBKDF2 options.
|
|
@@ -162,10 +161,9 @@ export async function pbkdf2Async(options) {
|
|
|
162
161
|
const key = Bytes.toHex(await pbkdf2Async_noble(sha256, password, salt, {
|
|
163
162
|
c: iterations,
|
|
164
163
|
dkLen: 32,
|
|
165
|
-
}))
|
|
166
|
-
return defineKey({
|
|
164
|
+
}));
|
|
165
|
+
return defineKey(() => key, {
|
|
167
166
|
iv,
|
|
168
|
-
key: () => key,
|
|
169
167
|
kdfparams: {
|
|
170
168
|
c: iterations,
|
|
171
169
|
dklen: 32,
|
|
@@ -182,7 +180,7 @@ export async function pbkdf2Async(options) {
|
|
|
182
180
|
* ```ts twoslash
|
|
183
181
|
* import { Keystore } from 'ox'
|
|
184
182
|
*
|
|
185
|
-
* const key = Keystore.scrypt({ password: 'testpassword' })
|
|
183
|
+
* const [key, opts] = Keystore.scrypt({ password: 'testpassword' })
|
|
186
184
|
* ```
|
|
187
185
|
*
|
|
188
186
|
* @param options - Scrypt options.
|
|
@@ -193,10 +191,9 @@ export function scrypt(options) {
|
|
|
193
191
|
const p = 8;
|
|
194
192
|
const r = 1;
|
|
195
193
|
const salt = options.salt ? Bytes.from(options.salt) : Bytes.random(32);
|
|
196
|
-
const key = Bytes.toHex(scrypt_noble(password, salt, { N: n, dkLen: 32, r, p }))
|
|
197
|
-
return defineKey({
|
|
194
|
+
const key = Bytes.toHex(scrypt_noble(password, salt, { N: n, dkLen: 32, r, p }));
|
|
195
|
+
return defineKey(() => key, {
|
|
198
196
|
iv,
|
|
199
|
-
key: () => key,
|
|
200
197
|
kdfparams: {
|
|
201
198
|
dklen: 32,
|
|
202
199
|
n,
|
|
@@ -214,7 +211,7 @@ export function scrypt(options) {
|
|
|
214
211
|
* ```ts twoslash
|
|
215
212
|
* import { Keystore } from 'ox'
|
|
216
213
|
*
|
|
217
|
-
* const key = await Keystore.scryptAsync({ password: 'testpassword' })
|
|
214
|
+
* const [key, opts] = await Keystore.scryptAsync({ password: 'testpassword' })
|
|
218
215
|
* ```
|
|
219
216
|
*
|
|
220
217
|
* @param options - Scrypt options.
|
|
@@ -225,10 +222,9 @@ export async function scryptAsync(options) {
|
|
|
225
222
|
const p = 8;
|
|
226
223
|
const r = 1;
|
|
227
224
|
const salt = options.salt ? Bytes.from(options.salt) : Bytes.random(32);
|
|
228
|
-
const key = Bytes.toHex(await scryptAsync_noble(password, salt, { N: n, dkLen: 32, r, p }))
|
|
229
|
-
return defineKey({
|
|
225
|
+
const key = Bytes.toHex(await scryptAsync_noble(password, salt, { N: n, dkLen: 32, r, p }));
|
|
226
|
+
return defineKey(() => key, {
|
|
230
227
|
iv,
|
|
231
|
-
key: () => key,
|
|
232
228
|
kdfparams: {
|
|
233
229
|
dklen: 32,
|
|
234
230
|
n,
|
|
@@ -241,8 +237,8 @@ export async function scryptAsync(options) {
|
|
|
241
237
|
}
|
|
242
238
|
///////////////////////////////////////////////////////////////////////////
|
|
243
239
|
/** @internal */
|
|
244
|
-
function defineKey(key) {
|
|
245
|
-
const iv =
|
|
246
|
-
return { ...
|
|
240
|
+
function defineKey(key, options) {
|
|
241
|
+
const iv = options.iv ? Bytes.from(options.iv) : Bytes.random(16);
|
|
242
|
+
return [key, { ...options, iv }];
|
|
247
243
|
}
|
|
248
244
|
//# sourceMappingURL=Keystore.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Keystore.js","sourceRoot":"","sources":["../../core/Keystore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAA;AACxC,OAAO,EACL,WAAW,IAAI,iBAAiB,EAChC,MAAM,IAAI,YAAY,GACvB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EACL,WAAW,IAAI,iBAAiB,EAChC,MAAM,IAAI,YAAY,GACvB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAC3C,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAEnC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"Keystore.js","sourceRoot":"","sources":["../../core/Keystore.ts"],"names":[],"mappings":"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"}
|