@injectivelabs/wallet-trezor 1.14.56 → 1.14.57
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/utils.d.ts +2 -2
- package/dist/cjs/utils.d.ts.map +1 -1
- package/dist/cjs/utils.js +5 -22
- package/dist/cjs/utils.js.map +1 -1
- package/dist/esm/utils.d.ts +2 -2
- package/dist/esm/utils.d.ts.map +1 -1
- package/dist/esm/utils.js +5 -22
- package/dist/esm/utils.js.map +1 -1
- package/package.json +4 -5
package/dist/cjs/utils.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { type TypedMessageV4 } from '@injectivelabs/sdk-ts';
|
|
2
2
|
/**
|
|
3
3
|
* Calculates the domain_separator_hash and message_hash from an EIP-712 Typed Data object.
|
|
4
4
|
*
|
|
@@ -10,7 +10,7 @@ import { TypedMessage, MessageTypes } from '@metamask/eth-sig-util';
|
|
|
10
10
|
* @param {boolean} metamask_v4_compat - Set to `true` for compatibility with Metamask's signTypedData_v4 function.
|
|
11
11
|
* @returns {{domain_separator_hash: string, message_hash?: string} & T} The hashes.
|
|
12
12
|
*/
|
|
13
|
-
export declare const transformTypedData: <T extends
|
|
13
|
+
export declare const transformTypedData: <T extends TypedMessageV4>(data: T, metamask_v4_compat?: boolean) => {
|
|
14
14
|
domain_separator_hash: string;
|
|
15
15
|
message_hash?: string;
|
|
16
16
|
} & T;
|
package/dist/cjs/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,cAAc,EAIpB,MAAM,uBAAuB,CAAA;AAE9B;;;;;;;;;;GAUG;AACH,eAAO,MAAM,kBAAkB,GAAI,CAAC,SAAS,cAAc,EACzD,MAAM,CAAC,EACP,qBAAoB,OAAc,KACjC;IAAE,qBAAqB,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,CAmC7D,CAAA"}
|
package/dist/cjs/utils.js
CHANGED
|
@@ -2,24 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.transformTypedData = void 0;
|
|
4
4
|
const exceptions_1 = require("@injectivelabs/exceptions");
|
|
5
|
-
const
|
|
6
|
-
// Sanitization is used for T1 as eth-sig-util does not support BigInt
|
|
7
|
-
// @ts-ignore
|
|
8
|
-
function sanitizeData(data) {
|
|
9
|
-
switch (Object.prototype.toString.call(data)) {
|
|
10
|
-
case '[object Object]': {
|
|
11
|
-
// @ts-ignore
|
|
12
|
-
const entries = Object.keys(data).map((k) => [k, sanitizeData(data[k])]);
|
|
13
|
-
return Object.fromEntries(entries);
|
|
14
|
-
}
|
|
15
|
-
case '[object Array]':
|
|
16
|
-
return data.map((v) => sanitizeData(v));
|
|
17
|
-
case '[object BigInt]':
|
|
18
|
-
return data.toString();
|
|
19
|
-
default:
|
|
20
|
-
return data;
|
|
21
|
-
}
|
|
22
|
-
}
|
|
5
|
+
const sdk_ts_1 = require("@injectivelabs/sdk-ts");
|
|
23
6
|
/**
|
|
24
7
|
* Calculates the domain_separator_hash and message_hash from an EIP-712 Typed Data object.
|
|
25
8
|
*
|
|
@@ -35,12 +18,12 @@ const transformTypedData = (data, metamask_v4_compat = true) => {
|
|
|
35
18
|
if (!metamask_v4_compat) {
|
|
36
19
|
throw new exceptions_1.TrezorException(new Error('Trezor: Only version 4 of typed data signing is supported'));
|
|
37
20
|
}
|
|
38
|
-
const version =
|
|
39
|
-
const { types, primaryType, domain, message } =
|
|
40
|
-
const domainSeparatorHash =
|
|
21
|
+
const version = sdk_ts_1.SignTypedDataVersionV4;
|
|
22
|
+
const { types, primaryType, domain, message } = (0, sdk_ts_1.TypedDataUtilsSanitizeData)(data);
|
|
23
|
+
const domainSeparatorHash = (0, sdk_ts_1.TypedDataUtilsHashStruct)('EIP712Domain', (0, sdk_ts_1.sanitizeTypedData)(domain), types, version).toString('hex');
|
|
41
24
|
let messageHash = null;
|
|
42
25
|
if (primaryType !== 'EIP712Domain') {
|
|
43
|
-
messageHash =
|
|
26
|
+
messageHash = (0, sdk_ts_1.TypedDataUtilsHashStruct)(primaryType, (0, sdk_ts_1.sanitizeTypedData)(message), types, version).toString('hex');
|
|
44
27
|
}
|
|
45
28
|
return {
|
|
46
29
|
domain_separator_hash: domainSeparatorHash,
|
package/dist/cjs/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":";;;AAAA,0DAA2D;AAC3D,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":";;;AAAA,0DAA2D;AAC3D,kDAM8B;AAE9B;;;;;;;;;;GAUG;AACI,MAAM,kBAAkB,GAAG,CAChC,IAAO,EACP,qBAA8B,IAAI,EAC4B,EAAE;IAChE,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,MAAM,IAAI,4BAAe,CACvB,IAAI,KAAK,CAAC,2DAA2D,CAAC,CACvE,CAAA;IACH,CAAC;IAED,MAAM,OAAO,GAAG,+BAAsB,CAAA;IAEtC,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,GAC3C,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAA;IAElC,MAAM,mBAAmB,GAAG,IAAA,iCAAwB,EAClD,cAAc,EACd,IAAA,0BAAiB,EAAC,MAAM,CAAC,EACzB,KAAK,EACL,OAAO,CACR,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IAEjB,IAAI,WAAW,GAAG,IAAI,CAAA;IAEtB,IAAI,WAAW,KAAK,cAAc,EAAE,CAAC;QACnC,WAAW,GAAG,IAAA,iCAAwB,EACpC,WAAqB,EACrB,IAAA,0BAAiB,EAAC,OAAO,CAAC,EAC1B,KAAK,EACL,OAAO,CACR,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IACnB,CAAC;IAED,OAAO;QACL,qBAAqB,EAAE,mBAAmB;QAC1C,YAAY,EAAE,WAAqB;QACnC,GAAG,IAAI;KACR,CAAA;AACH,CAAC,CAAA;AAtCY,QAAA,kBAAkB,sBAsC9B"}
|
package/dist/esm/utils.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { type TypedMessageV4 } from '@injectivelabs/sdk-ts';
|
|
2
2
|
/**
|
|
3
3
|
* Calculates the domain_separator_hash and message_hash from an EIP-712 Typed Data object.
|
|
4
4
|
*
|
|
@@ -10,7 +10,7 @@ import { TypedMessage, MessageTypes } from '@metamask/eth-sig-util';
|
|
|
10
10
|
* @param {boolean} metamask_v4_compat - Set to `true` for compatibility with Metamask's signTypedData_v4 function.
|
|
11
11
|
* @returns {{domain_separator_hash: string, message_hash?: string} & T} The hashes.
|
|
12
12
|
*/
|
|
13
|
-
export declare const transformTypedData: <T extends
|
|
13
|
+
export declare const transformTypedData: <T extends TypedMessageV4>(data: T, metamask_v4_compat?: boolean) => {
|
|
14
14
|
domain_separator_hash: string;
|
|
15
15
|
message_hash?: string;
|
|
16
16
|
} & T;
|
package/dist/esm/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,cAAc,EAIpB,MAAM,uBAAuB,CAAA;AAE9B;;;;;;;;;;GAUG;AACH,eAAO,MAAM,kBAAkB,GAAI,CAAC,SAAS,cAAc,EACzD,MAAM,CAAC,EACP,qBAAoB,OAAc,KACjC;IAAE,qBAAqB,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,CAmC7D,CAAA"}
|
package/dist/esm/utils.js
CHANGED
|
@@ -1,22 +1,5 @@
|
|
|
1
1
|
import { TrezorException } from '@injectivelabs/exceptions';
|
|
2
|
-
import {
|
|
3
|
-
// Sanitization is used for T1 as eth-sig-util does not support BigInt
|
|
4
|
-
// @ts-ignore
|
|
5
|
-
function sanitizeData(data) {
|
|
6
|
-
switch (Object.prototype.toString.call(data)) {
|
|
7
|
-
case '[object Object]': {
|
|
8
|
-
// @ts-ignore
|
|
9
|
-
const entries = Object.keys(data).map((k) => [k, sanitizeData(data[k])]);
|
|
10
|
-
return Object.fromEntries(entries);
|
|
11
|
-
}
|
|
12
|
-
case '[object Array]':
|
|
13
|
-
return data.map((v) => sanitizeData(v));
|
|
14
|
-
case '[object BigInt]':
|
|
15
|
-
return data.toString();
|
|
16
|
-
default:
|
|
17
|
-
return data;
|
|
18
|
-
}
|
|
19
|
-
}
|
|
2
|
+
import { sanitizeTypedData, TypedDataUtilsHashStruct, SignTypedDataVersionV4, TypedDataUtilsSanitizeData, } from '@injectivelabs/sdk-ts';
|
|
20
3
|
/**
|
|
21
4
|
* Calculates the domain_separator_hash and message_hash from an EIP-712 Typed Data object.
|
|
22
5
|
*
|
|
@@ -32,12 +15,12 @@ export const transformTypedData = (data, metamask_v4_compat = true) => {
|
|
|
32
15
|
if (!metamask_v4_compat) {
|
|
33
16
|
throw new TrezorException(new Error('Trezor: Only version 4 of typed data signing is supported'));
|
|
34
17
|
}
|
|
35
|
-
const version =
|
|
36
|
-
const { types, primaryType, domain, message } =
|
|
37
|
-
const domainSeparatorHash =
|
|
18
|
+
const version = SignTypedDataVersionV4;
|
|
19
|
+
const { types, primaryType, domain, message } = TypedDataUtilsSanitizeData(data);
|
|
20
|
+
const domainSeparatorHash = TypedDataUtilsHashStruct('EIP712Domain', sanitizeTypedData(domain), types, version).toString('hex');
|
|
38
21
|
let messageHash = null;
|
|
39
22
|
if (primaryType !== 'EIP712Domain') {
|
|
40
|
-
messageHash =
|
|
23
|
+
messageHash = TypedDataUtilsHashStruct(primaryType, sanitizeTypedData(message), types, version).toString('hex');
|
|
41
24
|
}
|
|
42
25
|
return {
|
|
43
26
|
domain_separator_hash: domainSeparatorHash,
|
package/dist/esm/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EACL,iBAAiB,EAEjB,wBAAwB,EACxB,sBAAsB,EACtB,0BAA0B,GAC3B,MAAM,uBAAuB,CAAA;AAE9B;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,IAAO,EACP,qBAA8B,IAAI,EAC4B,EAAE;IAChE,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,MAAM,IAAI,eAAe,CACvB,IAAI,KAAK,CAAC,2DAA2D,CAAC,CACvE,CAAA;IACH,CAAC;IAED,MAAM,OAAO,GAAG,sBAAsB,CAAA;IAEtC,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,GAC3C,0BAA0B,CAAC,IAAI,CAAC,CAAA;IAElC,MAAM,mBAAmB,GAAG,wBAAwB,CAClD,cAAc,EACd,iBAAiB,CAAC,MAAM,CAAC,EACzB,KAAK,EACL,OAAO,CACR,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IAEjB,IAAI,WAAW,GAAG,IAAI,CAAA;IAEtB,IAAI,WAAW,KAAK,cAAc,EAAE,CAAC;QACnC,WAAW,GAAG,wBAAwB,CACpC,WAAqB,EACrB,iBAAiB,CAAC,OAAO,CAAC,EAC1B,KAAK,EACL,OAAO,CACR,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IACnB,CAAC;IAED,OAAO;QACL,qBAAqB,EAAE,mBAAmB;QAC1C,YAAY,EAAE,WAAqB;QACnC,GAAG,IAAI;KACR,CAAA;AACH,CAAC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@injectivelabs/wallet-trezor",
|
|
3
3
|
"description": "Trezor wallet strategy for use with @injectivelabs/wallet-core.",
|
|
4
|
-
"version": "1.14.
|
|
4
|
+
"version": "1.14.57",
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"type": "module",
|
|
7
7
|
"author": {
|
|
@@ -60,10 +60,9 @@
|
|
|
60
60
|
"@ethereumjs/common": "3.1.1",
|
|
61
61
|
"@ethereumjs/tx": "^4.1.1",
|
|
62
62
|
"@injectivelabs/exceptions": "^1.14.47",
|
|
63
|
-
"@injectivelabs/sdk-ts": "^1.14.
|
|
63
|
+
"@injectivelabs/sdk-ts": "^1.14.59",
|
|
64
64
|
"@injectivelabs/ts-types": "^1.14.47",
|
|
65
|
-
"@injectivelabs/wallet-base": "^1.14.
|
|
66
|
-
"@metamask/eth-sig-util": "^8.0.0",
|
|
65
|
+
"@injectivelabs/wallet-base": "^1.14.57",
|
|
67
66
|
"alchemy-sdk": "^3.4.7",
|
|
68
67
|
"hdkey": "^2.1.0"
|
|
69
68
|
},
|
|
@@ -73,5 +72,5 @@
|
|
|
73
72
|
"resolutions": {
|
|
74
73
|
"@ethereumjs/common": "3.1.1"
|
|
75
74
|
},
|
|
76
|
-
"gitHead": "
|
|
75
|
+
"gitHead": "c61921175ec31b6808a237ad5f83152b2b9570cc"
|
|
77
76
|
}
|