@ledgerhq/evm-tools 1.2.5-spl-test.0 → 1.3.0-nightly.2
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/.turbo/turbo-build.log +1 -1
- package/CHANGELOG.md +24 -4
- package/lib/message/EIP712/index.d.ts.map +1 -1
- package/lib/message/EIP712/index.js +4 -3
- package/lib/message/EIP712/index.js.map +1 -1
- package/lib-es/message/EIP712/index.d.ts.map +1 -1
- package/lib-es/message/EIP712/index.js +4 -3
- package/lib-es/message/EIP712/index.js.map +1 -1
- package/package.json +6 -5
- package/src/message/EIP712/index.ts +4 -8
package/.turbo/turbo-build.log
CHANGED
package/CHANGELOG.md
CHANGED
|
@@ -1,12 +1,32 @@
|
|
|
1
1
|
# @ledgerhq/evm-tools
|
|
2
2
|
|
|
3
|
-
## 1.
|
|
3
|
+
## 1.3.0-nightly.2
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#8175](https://github.com/LedgerHQ/ledger-live/pull/8175) [`b93a421`](https://github.com/LedgerHQ/ledger-live/commit/b93a421866519b80fdd8a029caea97323eceae93) Thanks [@lambertkevin](https://github.com/lambertkevin)! - Remove `ethers` from dependencies and use sub-librairies instead to reduce the package size.
|
|
8
|
+
|
|
9
|
+
### Patch Changes
|
|
10
|
+
|
|
11
|
+
- Updated dependencies [[`b93a421`](https://github.com/LedgerHQ/ledger-live/commit/b93a421866519b80fdd8a029caea97323eceae93)]:
|
|
12
|
+
- @ledgerhq/live-env@2.4.1-nightly.2
|
|
13
|
+
- @ledgerhq/cryptoassets-evm-signatures@13.5.2-nightly.2
|
|
14
|
+
|
|
15
|
+
## 1.2.5-nightly.1
|
|
16
|
+
|
|
17
|
+
### Patch Changes
|
|
18
|
+
|
|
19
|
+
- Updated dependencies [[`95fbec9`](https://github.com/LedgerHQ/ledger-live/commit/95fbec9fdff75cd6d4ac23e189e876efffc81906)]:
|
|
20
|
+
- @ledgerhq/live-env@2.4.1-nightly.1
|
|
21
|
+
- @ledgerhq/cryptoassets-evm-signatures@13.5.2-nightly.1
|
|
22
|
+
|
|
23
|
+
## 1.2.5-nightly.0
|
|
4
24
|
|
|
5
25
|
### Patch Changes
|
|
6
26
|
|
|
7
|
-
- Updated dependencies [[`5c13c7b`](https://github.com/LedgerHQ/ledger-live/commit/5c13c7bf743333f09cbfee720d275dfae7e157d2)
|
|
8
|
-
- @ledgerhq/live-env@2.4.1-
|
|
9
|
-
- @ledgerhq/cryptoassets-evm-signatures@13.5.2-
|
|
27
|
+
- Updated dependencies [[`5c13c7b`](https://github.com/LedgerHQ/ledger-live/commit/5c13c7bf743333f09cbfee720d275dfae7e157d2)]:
|
|
28
|
+
- @ledgerhq/live-env@2.4.1-nightly.0
|
|
29
|
+
- @ledgerhq/cryptoassets-evm-signatures@13.5.2-nightly.0
|
|
10
30
|
|
|
11
31
|
## 1.2.4
|
|
12
32
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/message/EIP712/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/message/EIP712/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAKrD,OAAO,EAA4B,cAAc,EAAE,MAAM,SAAS,CAAC;AAGnE,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,IAAI,aAAa,CAS1E;AAED,eAAO,MAAM,wBAAwB,QAAS,OAAO,MAAM,EAAE,OAAO,CAAC,KAAG,OAAO,MAAM,EAAE,OAAO,CAgB7F,CAAC;AAEF,eAAO,MAAM,uBAAuB,YAAa,aAAa,KAAG,MAKhE,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,YACtB,aAAa,uBACD,OAAO,kBACZ,MAAM,GAAG,IAAI,KAC5B,QAAQ,cAAc,GAAG,SAAS,CAgCpC,CAAC;AA4BF;;;GAGG;AACH,eAAO,MAAM,gBAAgB,SAAU,MAAM,iBAAiB,aAAa,KAAG,MAAM,GAAG,MAAM,EAmB5F,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,8BAA8B,gBAC5B,aAAa,kBACX,MAAM,KACpB,QAAQ;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,EAAE,GAAG,IAAI,CAwE9D,CAAC"}
|
|
@@ -24,10 +24,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
exports.getEIP712FieldsDisplayedOnNano = exports.getValueFromPath = exports.getFiltersForMessage = exports.getSchemaHashForMessage = exports.sortObjectAlphabetically = exports.isEIP712Message = void 0;
|
|
27
|
-
const ethers_1 = require("ethers");
|
|
28
27
|
const axios_1 = __importDefault(require("axios"));
|
|
29
28
|
const sha224_1 = __importDefault(require("crypto-js/sha224"));
|
|
30
29
|
const live_env_1 = require("@ledgerhq/live-env");
|
|
30
|
+
const constants_1 = require("@ethersproject/constants");
|
|
31
|
+
const hash_1 = require("@ethersproject/hash");
|
|
31
32
|
const eip712_1 = __importDefault(require("@ledgerhq/cryptoassets-evm-signatures/data/eip712"));
|
|
32
33
|
const eip712_v2_1 = __importDefault(require("@ledgerhq/cryptoassets-evm-signatures/data/eip712_v2"));
|
|
33
34
|
// As defined in [spec](https://eips.ethereum.org/EIPS/eip-712), the properties below are all required.
|
|
@@ -70,7 +71,7 @@ exports.getSchemaHashForMessage = getSchemaHashForMessage;
|
|
|
70
71
|
const getFiltersForMessage = (message, shouldUseV1Filters, calServiceURL) => __awaiter(void 0, void 0, void 0, function* () {
|
|
71
72
|
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
72
73
|
const schemaHash = (0, exports.getSchemaHashForMessage)(message);
|
|
73
|
-
const verifyingContract = ((_b = (_a = message.domain) === null || _a === void 0 ? void 0 : _a.verifyingContract) === null || _b === void 0 ? void 0 : _b.toLowerCase()) ||
|
|
74
|
+
const verifyingContract = ((_b = (_a = message.domain) === null || _a === void 0 ? void 0 : _a.verifyingContract) === null || _b === void 0 ? void 0 : _b.toLowerCase()) || constants_1.AddressZero;
|
|
74
75
|
try {
|
|
75
76
|
if (calServiceURL) {
|
|
76
77
|
const { data } = yield axios_1.default.get(`${calServiceURL}/v1/dapps`, {
|
|
@@ -187,7 +188,7 @@ const getEIP712FieldsDisplayedOnNano = (messageData_1, ...args_1) => __awaiter(v
|
|
|
187
188
|
}
|
|
188
189
|
displayedInfos.push({
|
|
189
190
|
label: "Message hash",
|
|
190
|
-
value:
|
|
191
|
+
value: hash_1._TypedDataEncoder.hashStruct(messageData.primaryType, otherTypes, messageData.message),
|
|
191
192
|
});
|
|
192
193
|
return displayedInfos;
|
|
193
194
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/message/EIP712/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/message/EIP712/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/message/EIP712/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/message/EIP712/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAKrD,OAAO,EAA4B,cAAc,EAAE,MAAM,SAAS,CAAC;AAGnE,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,IAAI,aAAa,CAS1E;AAED,eAAO,MAAM,wBAAwB,QAAS,OAAO,MAAM,EAAE,OAAO,CAAC,KAAG,OAAO,MAAM,EAAE,OAAO,CAgB7F,CAAC;AAEF,eAAO,MAAM,uBAAuB,YAAa,aAAa,KAAG,MAKhE,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,YACtB,aAAa,uBACD,OAAO,kBACZ,MAAM,GAAG,IAAI,KAC5B,QAAQ,cAAc,GAAG,SAAS,CAgCpC,CAAC;AA4BF;;;GAGG;AACH,eAAO,MAAM,gBAAgB,SAAU,MAAM,iBAAiB,aAAa,KAAG,MAAM,GAAG,MAAM,EAmB5F,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,8BAA8B,gBAC5B,aAAa,kBACX,MAAM,KACpB,QAAQ;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,EAAE,GAAG,IAAI,CAwE9D,CAAC"}
|
|
@@ -18,10 +18,11 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
18
18
|
}
|
|
19
19
|
return t;
|
|
20
20
|
};
|
|
21
|
-
import { ethers } from "ethers";
|
|
22
21
|
import axios from "axios";
|
|
23
22
|
import SHA224 from "crypto-js/sha224";
|
|
24
23
|
import { getEnv } from "@ledgerhq/live-env";
|
|
24
|
+
import { AddressZero } from "@ethersproject/constants";
|
|
25
|
+
import { _TypedDataEncoder as TypedDataEncoder } from "@ethersproject/hash";
|
|
25
26
|
import EIP712CAL from "@ledgerhq/cryptoassets-evm-signatures/data/eip712";
|
|
26
27
|
import EIP712CALV2 from "@ledgerhq/cryptoassets-evm-signatures/data/eip712_v2";
|
|
27
28
|
// As defined in [spec](https://eips.ethereum.org/EIPS/eip-712), the properties below are all required.
|
|
@@ -61,7 +62,7 @@ export const getSchemaHashForMessage = (message) => {
|
|
|
61
62
|
export const getFiltersForMessage = (message, shouldUseV1Filters, calServiceURL) => __awaiter(void 0, void 0, void 0, function* () {
|
|
62
63
|
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
63
64
|
const schemaHash = getSchemaHashForMessage(message);
|
|
64
|
-
const verifyingContract = ((_b = (_a = message.domain) === null || _a === void 0 ? void 0 : _a.verifyingContract) === null || _b === void 0 ? void 0 : _b.toLowerCase()) ||
|
|
65
|
+
const verifyingContract = ((_b = (_a = message.domain) === null || _a === void 0 ? void 0 : _a.verifyingContract) === null || _b === void 0 ? void 0 : _b.toLowerCase()) || AddressZero;
|
|
65
66
|
try {
|
|
66
67
|
if (calServiceURL) {
|
|
67
68
|
const { data } = yield axios.get(`${calServiceURL}/v1/dapps`, {
|
|
@@ -176,7 +177,7 @@ export const getEIP712FieldsDisplayedOnNano = (messageData_1, ...args_1) => __aw
|
|
|
176
177
|
}
|
|
177
178
|
displayedInfos.push({
|
|
178
179
|
label: "Message hash",
|
|
179
|
-
value:
|
|
180
|
+
value: TypedDataEncoder.hashStruct(messageData.primaryType, otherTypes, messageData.message),
|
|
180
181
|
});
|
|
181
182
|
return displayedInfos;
|
|
182
183
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/message/EIP712/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/message/EIP712/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ledgerhq/evm-tools",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.3.0-nightly.2",
|
|
4
4
|
"description": "EVM tooling used for coin integrations & app bindings",
|
|
5
5
|
"main": "./index.ts",
|
|
6
6
|
"keywords": [
|
|
@@ -45,11 +45,12 @@
|
|
|
45
45
|
},
|
|
46
46
|
"license": "Apache-2.0",
|
|
47
47
|
"dependencies": {
|
|
48
|
+
"@ethersproject/constants": "^5.7.0",
|
|
49
|
+
"@ethersproject/hash": "^5.7.0",
|
|
48
50
|
"axios": "1.7.7",
|
|
49
51
|
"crypto-js": "4.2.0",
|
|
50
|
-
"
|
|
51
|
-
"@ledgerhq/
|
|
52
|
-
"@ledgerhq/live-env": "^2.4.1-spl-test.0"
|
|
52
|
+
"@ledgerhq/cryptoassets-evm-signatures": "^13.5.2-nightly.2",
|
|
53
|
+
"@ledgerhq/live-env": "^2.4.1-nightly.2"
|
|
53
54
|
},
|
|
54
55
|
"devDependencies": {
|
|
55
56
|
"@types/axios": "^0.14.0",
|
|
@@ -58,7 +59,7 @@
|
|
|
58
59
|
"@types/node": "^20.8.10",
|
|
59
60
|
"jest": "^29.7.0",
|
|
60
61
|
"ts-jest": "^29.1.1",
|
|
61
|
-
"@ledgerhq/types-live": "^6.
|
|
62
|
+
"@ledgerhq/types-live": "^6.52.4"
|
|
62
63
|
},
|
|
63
64
|
"scripts": {
|
|
64
65
|
"clean": "rimraf lib lib-es",
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { ethers } from "ethers";
|
|
2
1
|
import axios from "axios";
|
|
3
2
|
import SHA224 from "crypto-js/sha224";
|
|
4
3
|
import { getEnv } from "@ledgerhq/live-env";
|
|
5
4
|
import { EIP712Message } from "@ledgerhq/types-live";
|
|
5
|
+
import { AddressZero } from "@ethersproject/constants";
|
|
6
|
+
import { _TypedDataEncoder as TypedDataEncoder } from "@ethersproject/hash";
|
|
6
7
|
import EIP712CAL from "@ledgerhq/cryptoassets-evm-signatures/data/eip712";
|
|
7
8
|
import EIP712CALV2 from "@ledgerhq/cryptoassets-evm-signatures/data/eip712_v2";
|
|
8
9
|
import { CALServiceEIP712Response, MessageFilters } from "./types";
|
|
@@ -57,8 +58,7 @@ export const getFiltersForMessage = async (
|
|
|
57
58
|
calServiceURL?: string | null,
|
|
58
59
|
): Promise<MessageFilters | undefined> => {
|
|
59
60
|
const schemaHash = getSchemaHashForMessage(message);
|
|
60
|
-
const verifyingContract =
|
|
61
|
-
message.domain?.verifyingContract?.toLowerCase() || ethers.constants.AddressZero;
|
|
61
|
+
const verifyingContract = message.domain?.verifyingContract?.toLowerCase() || AddressZero;
|
|
62
62
|
try {
|
|
63
63
|
if (calServiceURL) {
|
|
64
64
|
const { data } = await axios.get<CALServiceEIP712Response>(`${calServiceURL}/v1/dapps`, {
|
|
@@ -197,11 +197,7 @@ export const getEIP712FieldsDisplayedOnNano = async (
|
|
|
197
197
|
|
|
198
198
|
displayedInfos.push({
|
|
199
199
|
label: "Message hash",
|
|
200
|
-
value:
|
|
201
|
-
messageData.primaryType,
|
|
202
|
-
otherTypes,
|
|
203
|
-
messageData.message,
|
|
204
|
-
),
|
|
200
|
+
value: TypedDataEncoder.hashStruct(messageData.primaryType, otherTypes, messageData.message),
|
|
205
201
|
});
|
|
206
202
|
|
|
207
203
|
return displayedInfos;
|