@qevm/hash 5.7.2 → 5.7.4
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/README.md +4 -5
- package/lib/_version.d.ts +1 -1
- package/lib/_version.js +1 -1
- package/lib/id.js +1 -1
- package/lib/id.js.map +1 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js.map +1 -1
- package/lib/message.d.ts +1 -1
- package/lib/message.d.ts.map +1 -1
- package/lib/message.js +4 -4
- package/lib/message.js.map +1 -1
- package/lib/namehash.d.ts.map +1 -1
- package/lib/namehash.js +9 -7
- package/lib/namehash.js.map +1 -1
- package/lib/typed-data.d.ts.map +1 -1
- package/lib/typed-data.js +49 -33
- package/lib/typed-data.js.map +1 -1
- package/package.json +34 -30
- package/src.ts/_version.ts +1 -1
- package/src.ts/id.ts +1 -1
- package/src.ts/index.ts +1 -5
- package/src.ts/message.ts +12 -9
- package/src.ts/namehash.ts +42 -23
- package/src.ts/typed-data.ts +271 -112
package/README.md
CHANGED
|
@@ -1,16 +1,15 @@
|
|
|
1
|
-
|
|
1
|
+
QuantumEVM Hash Utilities
|
|
2
2
|
=======================
|
|
3
3
|
|
|
4
|
-
This sub-module is part of the [ethers project](https://github.com/ethers-io/ethers.js).
|
|
4
|
+
This sub-module is part of the qethers, a fork of [ethers project](https://github.com/ethers-io/ethers.js).
|
|
5
5
|
|
|
6
6
|
It contains several common hashing utilities (but not the actual hash functions).
|
|
7
7
|
|
|
8
|
-
For more information, see the [documentation](https://docs.ethers.io/v5/api/utils/hashing/).
|
|
9
8
|
|
|
10
9
|
Importing
|
|
11
10
|
---------
|
|
12
11
|
|
|
13
|
-
Most users will prefer to use the [umbrella package](https://www.npmjs.com/package/
|
|
12
|
+
Most users will prefer to use the [umbrella package](https://www.npmjs.com/package/@qevm/qethers),
|
|
14
13
|
but for those with more specific needs, individual components can be imported.
|
|
15
14
|
|
|
16
15
|
```javascript
|
|
@@ -24,7 +23,7 @@ const {
|
|
|
24
23
|
messagePrefix,
|
|
25
24
|
hashMessage
|
|
26
25
|
|
|
27
|
-
} = require("@
|
|
26
|
+
} = require("@qevm/hash");
|
|
28
27
|
```
|
|
29
28
|
|
|
30
29
|
|
package/lib/_version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "hash/5.7.
|
|
1
|
+
export declare const version = "hash/5.7.4";
|
|
2
2
|
//# sourceMappingURL=_version.d.ts.map
|
package/lib/_version.js
CHANGED
package/lib/id.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.id = id;
|
|
4
|
-
const keccak256_1 = require("@
|
|
4
|
+
const keccak256_1 = require("@qevm/keccak256");
|
|
5
5
|
const strings_1 = require("@qevm/strings");
|
|
6
6
|
function id(text) {
|
|
7
7
|
return (0, keccak256_1.keccak256)((0, strings_1.toUtf8Bytes)(text));
|
package/lib/id.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"id.js","sourceRoot":"","sources":["../src.ts/id.ts"],"names":[],"mappings":";;AAGA,gBAEC;AALD
|
|
1
|
+
{"version":3,"file":"id.js","sourceRoot":"","sources":["../src.ts/id.ts"],"names":[],"mappings":";;AAGA,gBAEC;AALD,+CAA4C;AAC5C,2CAA4C;AAE5C,SAAgB,EAAE,CAAC,IAAY;IAC3B,OAAO,IAAA,qBAAS,EAAC,IAAA,qBAAW,EAAC,IAAI,CAAC,CAAC,CAAC;AACxC,CAAC"}
|
package/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src.ts/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,MAAM,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,OAAO,EAAE,gBAAgB,IAAI,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAErE,OAAO,EACH,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src.ts/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,MAAM,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,OAAO,EAAE,gBAAgB,IAAI,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAErE,OAAO,EACH,EAAE,EACF,SAAS,EACT,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,aAAa,EACb,WAAW,EACX,iBAAiB,GACpB,CAAC"}
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src.ts/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;AAEb,6BAA0B;AAStB,mFATK,OAAE,OASL;AARN,yCAA8D;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src.ts/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;AAEb,6BAA0B;AAStB,mFATK,OAAE,OASL;AARN,yCAA8D;AAS1D,0FATK,oBAAS,OASL;AAET,4FAXgB,sBAAW,OAWhB;AADX,yFAV6B,mBAAQ,OAU7B;AATZ,uCAAuD;AAanD,4FAbK,qBAAW,OAaL;AADX,8FAZkB,uBAAa,OAYlB;AAVjB,yCAA0C;AAStC,6FATK,uBAAY,OASL;AAPhB,6CAAqE;AAUjE,kGAVyB,6BAAiB,OAUzB"}
|
package/lib/message.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Bytes } from "@qevm/bytes";
|
|
2
|
-
export declare const messagePrefix = "\
|
|
2
|
+
export declare const messagePrefix = "\u0019QuantumEVM Signed Message\n";
|
|
3
3
|
export declare function hashMessage(message: Bytes | string): string;
|
|
4
4
|
//# sourceMappingURL=message.d.ts.map
|
package/lib/message.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../src.ts/message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAU,MAAM,aAAa,CAAC;AAI5C,eAAO,MAAM,aAAa,
|
|
1
|
+
{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../src.ts/message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAU,MAAM,aAAa,CAAC;AAI5C,eAAO,MAAM,aAAa,sCAAoC,CAAC;AAE/D,wBAAgB,WAAW,CAAC,OAAO,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,CAW3D"}
|
package/lib/message.js
CHANGED
|
@@ -3,17 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.messagePrefix = void 0;
|
|
4
4
|
exports.hashMessage = hashMessage;
|
|
5
5
|
const bytes_1 = require("@qevm/bytes");
|
|
6
|
-
const keccak256_1 = require("@
|
|
6
|
+
const keccak256_1 = require("@qevm/keccak256");
|
|
7
7
|
const strings_1 = require("@qevm/strings");
|
|
8
|
-
exports.messagePrefix = "\
|
|
8
|
+
exports.messagePrefix = "\x19QuantumEVM Signed Message\n";
|
|
9
9
|
function hashMessage(message) {
|
|
10
|
-
if (typeof
|
|
10
|
+
if (typeof message === "string") {
|
|
11
11
|
message = (0, strings_1.toUtf8Bytes)(message);
|
|
12
12
|
}
|
|
13
13
|
return (0, keccak256_1.keccak256)((0, bytes_1.concat)([
|
|
14
14
|
(0, strings_1.toUtf8Bytes)(exports.messagePrefix),
|
|
15
15
|
(0, strings_1.toUtf8Bytes)(String(message.length)),
|
|
16
|
-
message
|
|
16
|
+
message,
|
|
17
17
|
]));
|
|
18
18
|
}
|
|
19
19
|
//# sourceMappingURL=message.js.map
|
package/lib/message.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.js","sourceRoot":"","sources":["../src.ts/message.ts"],"names":[],"mappings":";;;AAMA,
|
|
1
|
+
{"version":3,"file":"message.js","sourceRoot":"","sources":["../src.ts/message.ts"],"names":[],"mappings":";;;AAMA,kCAWC;AAjBD,uCAA4C;AAC5C,+CAA4C;AAC5C,2CAA4C;AAE/B,QAAA,aAAa,GAAG,iCAAiC,CAAC;AAE/D,SAAgB,WAAW,CAAC,OAAuB;IAC/C,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,GAAG,IAAA,qBAAW,EAAC,OAAO,CAAC,CAAC;IACnC,CAAC;IACD,OAAO,IAAA,qBAAS,EACZ,IAAA,cAAM,EAAC;QACH,IAAA,qBAAW,EAAC,qBAAa,CAAC;QAC1B,IAAA,qBAAW,EAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACnC,OAAO;KACV,CAAC,CACL,CAAC;AACN,CAAC"}
|
package/lib/namehash.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"namehash.d.ts","sourceRoot":"","sources":["../src.ts/namehash.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"namehash.d.ts","sourceRoot":"","sources":["../src.ts/namehash.ts"],"names":[],"mappings":"AAgDA,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAIjD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAKjD;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAkB7C;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAoB9C"}
|
package/lib/namehash.js
CHANGED
|
@@ -6,8 +6,8 @@ exports.namehash = namehash;
|
|
|
6
6
|
exports.dnsEncode = dnsEncode;
|
|
7
7
|
const bytes_1 = require("@qevm/bytes");
|
|
8
8
|
const strings_1 = require("@qevm/strings");
|
|
9
|
-
const keccak256_1 = require("@
|
|
10
|
-
const logger_1 = require("@
|
|
9
|
+
const keccak256_1 = require("@qevm/keccak256");
|
|
10
|
+
const logger_1 = require("@qevm/logger");
|
|
11
11
|
const _version_1 = require("./_version");
|
|
12
12
|
const logger = new logger_1.Logger(_version_1.version);
|
|
13
13
|
const lib_1 = require("./ens-normalize/lib");
|
|
@@ -42,18 +42,20 @@ function ensNameSplit(name) {
|
|
|
42
42
|
return comps;
|
|
43
43
|
}
|
|
44
44
|
function ensNormalize(name) {
|
|
45
|
-
return ensNameSplit(name)
|
|
45
|
+
return ensNameSplit(name)
|
|
46
|
+
.map((comp) => (0, strings_1.toUtf8String)(comp))
|
|
47
|
+
.join(".");
|
|
46
48
|
}
|
|
47
49
|
function isValidName(name) {
|
|
48
50
|
try {
|
|
49
|
-
return
|
|
51
|
+
return ensNameSplit(name).length !== 0;
|
|
50
52
|
}
|
|
51
53
|
catch (error) { }
|
|
52
54
|
return false;
|
|
53
55
|
}
|
|
54
56
|
function namehash(name) {
|
|
55
57
|
/* istanbul ignore if */
|
|
56
|
-
if (typeof
|
|
58
|
+
if (typeof name !== "string") {
|
|
57
59
|
logger.throwArgumentError("invalid ENS name; not a string", "name", name);
|
|
58
60
|
}
|
|
59
61
|
let result = Zeros;
|
|
@@ -64,7 +66,7 @@ function namehash(name) {
|
|
|
64
66
|
return (0, bytes_1.hexlify)(result);
|
|
65
67
|
}
|
|
66
68
|
function dnsEncode(name) {
|
|
67
|
-
return (0, bytes_1.hexlify)((0, bytes_1.concat)(ensNameSplit(name).map((comp) => {
|
|
69
|
+
return ((0, bytes_1.hexlify)((0, bytes_1.concat)(ensNameSplit(name).map((comp) => {
|
|
68
70
|
// DNS does not allow components over 63 bytes in length
|
|
69
71
|
if (comp.length > 63) {
|
|
70
72
|
throw new Error("invalid DNS encoded entry; length exceeds 63 bytes");
|
|
@@ -73,6 +75,6 @@ function dnsEncode(name) {
|
|
|
73
75
|
bytes.set(comp, 1);
|
|
74
76
|
bytes[0] = bytes.length - 1;
|
|
75
77
|
return bytes;
|
|
76
|
-
}))) + "00";
|
|
78
|
+
}))) + "00");
|
|
77
79
|
}
|
|
78
80
|
//# sourceMappingURL=namehash.js.map
|
package/lib/namehash.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"namehash.js","sourceRoot":"","sources":["../src.ts/namehash.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"namehash.js","sourceRoot":"","sources":["../src.ts/namehash.ts"],"names":[],"mappings":"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"}
|
package/lib/typed-data.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typed-data.d.ts","sourceRoot":"","sources":["../src.ts/typed-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"typed-data.d.ts","sourceRoot":"","sources":["../src.ts/typed-data.ts"],"names":[],"mappings":"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"}
|
package/lib/typed-data.js
CHANGED
|
@@ -4,9 +4,9 @@ exports.TypedDataEncoder = void 0;
|
|
|
4
4
|
const address_1 = require("@qevm/address");
|
|
5
5
|
const bignumber_1 = require("@qevm/bignumber");
|
|
6
6
|
const bytes_1 = require("@qevm/bytes");
|
|
7
|
-
const keccak256_1 = require("@
|
|
8
|
-
const properties_1 = require("@
|
|
9
|
-
const logger_1 = require("@
|
|
7
|
+
const keccak256_1 = require("@qevm/keccak256");
|
|
8
|
+
const properties_1 = require("@qevm/properties");
|
|
9
|
+
const logger_1 = require("@qevm/logger");
|
|
10
10
|
const _version_1 = require("./_version");
|
|
11
11
|
const logger = new logger_1.Logger(_version_1.version);
|
|
12
12
|
const id_1 = require("./id");
|
|
@@ -31,14 +31,18 @@ const domainFieldTypes = {
|
|
|
31
31
|
version: "string",
|
|
32
32
|
chainId: "uint256",
|
|
33
33
|
verifyingContract: "address",
|
|
34
|
-
salt: "bytes32"
|
|
34
|
+
salt: "bytes32",
|
|
35
35
|
};
|
|
36
36
|
const domainFieldNames = [
|
|
37
|
-
"name",
|
|
37
|
+
"name",
|
|
38
|
+
"version",
|
|
39
|
+
"chainId",
|
|
40
|
+
"verifyingContract",
|
|
41
|
+
"salt",
|
|
38
42
|
];
|
|
39
43
|
function checkString(key) {
|
|
40
44
|
return function (value) {
|
|
41
|
-
if (typeof
|
|
45
|
+
if (typeof value !== "string") {
|
|
42
46
|
logger.throwArgumentError(`invalid domain value for ${JSON.stringify(key)}`, `domain.${key}`, value);
|
|
43
47
|
}
|
|
44
48
|
return value;
|
|
@@ -71,20 +75,24 @@ const domainChecks = {
|
|
|
71
75
|
}
|
|
72
76
|
catch (error) { }
|
|
73
77
|
return logger.throwArgumentError(`invalid domain value "salt"`, "domain.salt", value);
|
|
74
|
-
}
|
|
78
|
+
},
|
|
75
79
|
};
|
|
76
80
|
function getBaseEncoder(type) {
|
|
77
81
|
// intXX and uintXX
|
|
78
82
|
{
|
|
79
83
|
const match = type.match(/^(u?)int(\d*)$/);
|
|
80
84
|
if (match) {
|
|
81
|
-
const signed =
|
|
85
|
+
const signed = match[1] === "";
|
|
82
86
|
const width = parseInt(match[2] || "256");
|
|
83
|
-
if (width % 8 !== 0 ||
|
|
87
|
+
if (width % 8 !== 0 ||
|
|
88
|
+
width > 256 ||
|
|
89
|
+
(match[2] && match[2] !== String(width))) {
|
|
84
90
|
logger.throwArgumentError("invalid numeric width", "type", type);
|
|
85
91
|
}
|
|
86
|
-
const boundsUpper = MaxUint256.mask(signed ?
|
|
87
|
-
const boundsLower = signed
|
|
92
|
+
const boundsUpper = MaxUint256.mask(signed ? width - 1 : width);
|
|
93
|
+
const boundsLower = signed
|
|
94
|
+
? boundsUpper.add(One).mul(NegativeOne)
|
|
95
|
+
: Zero;
|
|
88
96
|
return function (value) {
|
|
89
97
|
const v = bignumber_1.BigNumber.from(value);
|
|
90
98
|
if (v.lt(boundsLower) || v.gt(boundsUpper)) {
|
|
@@ -112,23 +120,27 @@ function getBaseEncoder(type) {
|
|
|
112
120
|
}
|
|
113
121
|
}
|
|
114
122
|
switch (type) {
|
|
115
|
-
case "address":
|
|
116
|
-
return
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
123
|
+
case "address":
|
|
124
|
+
return function (value) {
|
|
125
|
+
return (0, bytes_1.hexZeroPad)((0, address_1.getAddress)(value), 32);
|
|
126
|
+
};
|
|
127
|
+
case "bool":
|
|
128
|
+
return function (value) {
|
|
129
|
+
return !value ? hexFalse : hexTrue;
|
|
130
|
+
};
|
|
131
|
+
case "bytes":
|
|
132
|
+
return function (value) {
|
|
133
|
+
return (0, keccak256_1.keccak256)(value);
|
|
134
|
+
};
|
|
135
|
+
case "string":
|
|
136
|
+
return function (value) {
|
|
137
|
+
return (0, id_1.id)(value);
|
|
138
|
+
};
|
|
127
139
|
}
|
|
128
140
|
return null;
|
|
129
141
|
}
|
|
130
142
|
function encodeType(name, fields) {
|
|
131
|
-
return `${name}(${fields.map(({ name, type }) =>
|
|
143
|
+
return `${name}(${fields.map(({ name, type }) => type + " " + name).join(",")})`;
|
|
132
144
|
}
|
|
133
145
|
class TypedDataEncoder {
|
|
134
146
|
constructor(types) {
|
|
@@ -173,12 +185,12 @@ class TypedDataEncoder {
|
|
|
173
185
|
});
|
|
174
186
|
}
|
|
175
187
|
// Deduce the primary type
|
|
176
|
-
const primaryTypes = Object.keys(parents).filter((n) =>
|
|
188
|
+
const primaryTypes = Object.keys(parents).filter((n) => parents[n].length === 0);
|
|
177
189
|
if (primaryTypes.length === 0) {
|
|
178
190
|
logger.throwArgumentError("missing primary type", "types", types);
|
|
179
191
|
}
|
|
180
192
|
else if (primaryTypes.length > 1) {
|
|
181
|
-
logger.throwArgumentError(`ambiguous primary types or unused types: ${primaryTypes.map((t) =>
|
|
193
|
+
logger.throwArgumentError(`ambiguous primary types or unused types: ${primaryTypes.map((t) => JSON.stringify(t)).join(", ")}`, "types", types);
|
|
182
194
|
}
|
|
183
195
|
(0, properties_1.defineReadOnly)(this, "primaryType", primaryTypes[0]);
|
|
184
196
|
// Check for circular type references
|
|
@@ -205,7 +217,9 @@ class TypedDataEncoder {
|
|
|
205
217
|
for (const name in subtypes) {
|
|
206
218
|
const st = Object.keys(subtypes[name]);
|
|
207
219
|
st.sort();
|
|
208
|
-
this._types[name] =
|
|
220
|
+
this._types[name] =
|
|
221
|
+
encodeType(name, types[name]) +
|
|
222
|
+
st.map((t) => encodeType(t, types[t])).join("");
|
|
209
223
|
}
|
|
210
224
|
}
|
|
211
225
|
getEncoder(type) {
|
|
@@ -327,7 +341,8 @@ class TypedDataEncoder {
|
|
|
327
341
|
domainFields.push({ name, type });
|
|
328
342
|
}
|
|
329
343
|
domainFields.sort((a, b) => {
|
|
330
|
-
return domainFieldNames.indexOf(a.name) -
|
|
344
|
+
return (domainFieldNames.indexOf(a.name) -
|
|
345
|
+
domainFieldNames.indexOf(b.name));
|
|
331
346
|
});
|
|
332
347
|
return TypedDataEncoder.hashStruct("EIP712Domain", { EIP712Domain: domainFields }, domain);
|
|
333
348
|
}
|
|
@@ -335,7 +350,7 @@ class TypedDataEncoder {
|
|
|
335
350
|
return (0, bytes_1.hexConcat)([
|
|
336
351
|
"0x1901",
|
|
337
352
|
TypedDataEncoder.hashDomain(domain),
|
|
338
|
-
TypedDataEncoder.from(types).hash(value)
|
|
353
|
+
TypedDataEncoder.from(types).hash(value),
|
|
339
354
|
]);
|
|
340
355
|
}
|
|
341
356
|
static hash(domain, types, value) {
|
|
@@ -348,14 +363,15 @@ class TypedDataEncoder {
|
|
|
348
363
|
// Look up all ENS names
|
|
349
364
|
const ensCache = {};
|
|
350
365
|
// Do we need to look up the domain's verifyingContract?
|
|
351
|
-
if (domain.verifyingContract &&
|
|
366
|
+
if (domain.verifyingContract &&
|
|
367
|
+
!(0, bytes_1.isHexString)(domain.verifyingContract, 32)) {
|
|
352
368
|
ensCache[domain.verifyingContract] = "0x";
|
|
353
369
|
}
|
|
354
370
|
// We are going to use the encoder to visit all the base values
|
|
355
371
|
const encoder = TypedDataEncoder.from(types);
|
|
356
372
|
// Get a list of all the addresses
|
|
357
373
|
encoder.visit(value, (type, value) => {
|
|
358
|
-
if (type === "address" && !(0, bytes_1.isHexString)(value,
|
|
374
|
+
if (type === "address" && !(0, bytes_1.isHexString)(value, 32)) {
|
|
359
375
|
ensCache[value] = "0x";
|
|
360
376
|
}
|
|
361
377
|
return value;
|
|
@@ -420,13 +436,13 @@ class TypedDataEncoder {
|
|
|
420
436
|
case "bool":
|
|
421
437
|
return !!value;
|
|
422
438
|
case "string":
|
|
423
|
-
if (typeof
|
|
439
|
+
if (typeof value !== "string") {
|
|
424
440
|
logger.throwArgumentError(`invalid string`, "value", value);
|
|
425
441
|
}
|
|
426
442
|
return value;
|
|
427
443
|
}
|
|
428
444
|
return logger.throwArgumentError("unsupported type", "type", type);
|
|
429
|
-
})
|
|
445
|
+
}),
|
|
430
446
|
};
|
|
431
447
|
}
|
|
432
448
|
}
|
package/lib/typed-data.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typed-data.js","sourceRoot":"","sources":["../src.ts/typed-data.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"typed-data.js","sourceRoot":"","sources":["../src.ts/typed-data.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,32 +1,36 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
"
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
"qethers"
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
"
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
"
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
2
|
+
"contributors": [
|
|
3
|
+
"Eugene Kuleshov <kulevgen32@gmail.com>",
|
|
4
|
+
"Richard Moore <me@ricmoo.com>"
|
|
5
|
+
],
|
|
6
|
+
"dependencies": {
|
|
7
|
+
"@qevm/abstract-signer": "^5.7.3",
|
|
8
|
+
"@qevm/address": "^5.7.3",
|
|
9
|
+
"@qevm/base64": "^5.7.1",
|
|
10
|
+
"@qevm/bignumber": "^5.7.1",
|
|
11
|
+
"@qevm/bytes": "^5.7.2",
|
|
12
|
+
"@qevm/keccak256": "^5.7.1",
|
|
13
|
+
"@qevm/logger": "^5.7.1",
|
|
14
|
+
"@qevm/properties": "^5.7.1",
|
|
15
|
+
"@qevm/strings": "^5.7.2"
|
|
16
|
+
},
|
|
17
|
+
"description": "Hash utility functions for qethers.",
|
|
18
|
+
"keywords": [
|
|
19
|
+
"QEVM",
|
|
20
|
+
"QuantumEVM",
|
|
21
|
+
"qethers"
|
|
22
|
+
],
|
|
23
|
+
"license": "MIT",
|
|
24
|
+
"main": "./lib/index.js",
|
|
25
|
+
"module": "./lib.esm/index.js",
|
|
26
|
+
"name": "@qevm/hash",
|
|
27
|
+
"publishConfig": {
|
|
28
|
+
"access": "public"
|
|
29
|
+
},
|
|
30
|
+
"scripts": {
|
|
31
|
+
"test": "echo \"Error: no test specified\" && exit 1"
|
|
32
|
+
},
|
|
33
|
+
"sideEffects": false,
|
|
34
|
+
"types": "./lib/index.d.ts",
|
|
35
|
+
"version": "5.7.4"
|
|
32
36
|
}
|
package/src.ts/_version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const version = "hash/5.7.
|
|
1
|
+
export const version = "hash/5.7.4";
|
package/src.ts/id.ts
CHANGED
package/src.ts/index.ts
CHANGED
package/src.ts/message.ts
CHANGED
|
@@ -1,15 +1,18 @@
|
|
|
1
1
|
import { Bytes, concat } from "@qevm/bytes";
|
|
2
|
-
import { keccak256 } from "@
|
|
2
|
+
import { keccak256 } from "@qevm/keccak256";
|
|
3
3
|
import { toUtf8Bytes } from "@qevm/strings";
|
|
4
4
|
|
|
5
|
-
export const messagePrefix = "\
|
|
5
|
+
export const messagePrefix = "\x19QuantumEVM Signed Message\n";
|
|
6
6
|
|
|
7
7
|
export function hashMessage(message: Bytes | string): string {
|
|
8
|
-
if (typeof
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
8
|
+
if (typeof message === "string") {
|
|
9
|
+
message = toUtf8Bytes(message);
|
|
10
|
+
}
|
|
11
|
+
return keccak256(
|
|
12
|
+
concat([
|
|
13
|
+
toUtf8Bytes(messagePrefix),
|
|
14
|
+
toUtf8Bytes(String(message.length)),
|
|
15
|
+
message,
|
|
16
|
+
]),
|
|
17
|
+
);
|
|
14
18
|
}
|
|
15
|
-
|