viem 2.12.1 → 2.12.4
Sign up to get free protection for your applications and to get access to all the features.
- package/CHANGELOG.md +20 -0
- package/README.md +1 -1
- package/_cjs/actions/wallet/signTypedData.js +1 -3
- package/_cjs/actions/wallet/signTypedData.js.map +1 -1
- package/_cjs/chains/definitions/polygonAmoy.js +1 -1
- package/_cjs/chains/definitions/polygonAmoy.js.map +1 -1
- package/_cjs/errors/version.js +1 -1
- package/_cjs/utils/siwe/parseSiweMessage.js +1 -1
- package/_cjs/utils/siwe/parseSiweMessage.js.map +1 -1
- package/_cjs/utils/typedData.js +31 -5
- package/_cjs/utils/typedData.js.map +1 -1
- package/_esm/actions/ens/getEnsText.js +1 -1
- package/_esm/actions/wallet/signTypedData.js +2 -4
- package/_esm/actions/wallet/signTypedData.js.map +1 -1
- package/_esm/chains/definitions/polygonAmoy.js +1 -1
- package/_esm/chains/definitions/polygonAmoy.js.map +1 -1
- package/_esm/errors/version.js +1 -1
- package/_esm/utils/siwe/parseSiweMessage.js +1 -1
- package/_esm/utils/siwe/parseSiweMessage.js.map +1 -1
- package/_esm/utils/typedData.js +30 -5
- package/_esm/utils/typedData.js.map +1 -1
- package/_types/actions/ens/getEnsText.d.ts +1 -1
- package/_types/actions/wallet/signTypedData.d.ts +2 -2
- package/_types/actions/wallet/signTypedData.d.ts.map +1 -1
- package/_types/chains/definitions/polygonAmoy.d.ts +1 -1
- package/_types/clients/decorators/public.d.ts +1 -1
- package/_types/errors/version.d.ts +1 -1
- package/_types/types/contract.d.ts +5 -5
- package/_types/types/contract.d.ts.map +1 -1
- package/_types/types/utils.d.ts +1 -0
- package/_types/types/utils.d.ts.map +1 -1
- package/_types/utils/typedData.d.ts +2 -0
- package/_types/utils/typedData.d.ts.map +1 -1
- package/actions/ens/getEnsText.ts +1 -1
- package/actions/wallet/signTypedData.ts +4 -6
- package/chains/definitions/polygonAmoy.ts +1 -1
- package/clients/decorators/public.ts +1 -1
- package/errors/version.ts +1 -1
- package/package.json +1 -1
- package/types/contract.ts +6 -5
- package/types/utils.ts +3 -0
- package/utils/siwe/parseSiweMessage.ts +1 -1
- package/utils/typedData.ts +49 -5
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,25 @@
|
|
|
1
1
|
# viem
|
|
2
2
|
|
|
3
|
+
## 2.12.4
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`ddfce938e4760f60be54ee97802d819cc2b052d8`](https://github.com/wevm/viem/commit/ddfce938e4760f60be54ee97802d819cc2b052d8) Thanks [@jxom](https://github.com/jxom)! - Resolved issue where hex-like strings were incorrectly being lowercased in `signTypedData`.
|
|
8
|
+
|
|
9
|
+
## 2.12.3
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- [#2305](https://github.com/wevm/viem/pull/2305) [`36da346561767c5aecccf09b36d3f7a9f99e6844`](https://github.com/wevm/viem/commit/36da346561767c5aecccf09b36d3f7a9f99e6844) Thanks [@JuoCode](https://github.com/JuoCode)! - Removed trailing slash from polygonAmoy explorer URL.
|
|
14
|
+
|
|
15
|
+
## 2.12.2
|
|
16
|
+
|
|
17
|
+
### Patch Changes
|
|
18
|
+
|
|
19
|
+
- [#2307](https://github.com/wevm/viem/pull/2307) [`15d40229ff4f0624f7edf11b9f37f9b0a135647f`](https://github.com/wevm/viem/commit/15d40229ff4f0624f7edf11b9f37f9b0a135647f) Thanks [@tmm](https://github.com/tmm)! - Fixed type inference for payable `value` property.
|
|
20
|
+
|
|
21
|
+
- [#2303](https://github.com/wevm/viem/pull/2303) [`271893feb0cf26a4fb1ad4a04a16e5186542fdce`](https://github.com/wevm/viem/commit/271893feb0cf26a4fb1ad4a04a16e5186542fdce) Thanks [@hbriese](https://github.com/hbriese)! - Fixed parsing SIWE message containing domain with port
|
|
22
|
+
|
|
3
23
|
## 2.12.1
|
|
4
24
|
|
|
5
25
|
### Patch Changes
|
package/README.md
CHANGED
|
@@ -87,7 +87,7 @@ const blockNumber = await client.getBlockNumber();
|
|
|
87
87
|
|
|
88
88
|
Check out the following places for more viem-related content:
|
|
89
89
|
|
|
90
|
-
- Follow [@
|
|
90
|
+
- Follow [@wevm_dev](https://twitter.com/wevm_dev), [@jakemoxey](https://twitter.com/jakemoxey), and [@awkweb](https://twitter.com/awkweb) on Twitter for project updates
|
|
91
91
|
- Join the [discussions on GitHub](https://github.com/wevm/viem/discussions)
|
|
92
92
|
- [Share your project/organization](https://github.com/wevm/viem/discussions/104) that uses viem
|
|
93
93
|
|
|
@@ -3,8 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.signTypedData = void 0;
|
|
4
4
|
const parseAccount_js_1 = require("../../accounts/utils/parseAccount.js");
|
|
5
5
|
const account_js_1 = require("../../errors/account.js");
|
|
6
|
-
const isHex_js_1 = require("../../utils/data/isHex.js");
|
|
7
|
-
const stringify_js_1 = require("../../utils/stringify.js");
|
|
8
6
|
const typedData_js_1 = require("../../utils/typedData.js");
|
|
9
7
|
async function signTypedData(client, parameters) {
|
|
10
8
|
const { account: account_ = client.account, domain, message, primaryType, } = parameters;
|
|
@@ -20,7 +18,7 @@ async function signTypedData(client, parameters) {
|
|
|
20
18
|
(0, typedData_js_1.validateTypedData)({ domain, message, primaryType, types });
|
|
21
19
|
if (account.type === 'local')
|
|
22
20
|
return account.signTypedData({ domain, message, primaryType, types });
|
|
23
|
-
const typedData = (0,
|
|
21
|
+
const typedData = (0, typedData_js_1.serializeTypedData)({ domain, message, primaryType, types });
|
|
24
22
|
return client.request({
|
|
25
23
|
method: 'eth_signTypedData_v4',
|
|
26
24
|
params: [account.address, typedData],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signTypedData.js","sourceRoot":"","sources":["../../../actions/wallet/signTypedData.ts"],"names":[],"mappings":";;;AAGA,0EAG6C;AAI7C,wDAGgC;
|
|
1
|
+
{"version":3,"file":"signTypedData.js","sourceRoot":"","sources":["../../../actions/wallet/signTypedData.ts"],"names":[],"mappings":";;;AAGA,0EAG6C;AAI7C,wDAGgC;AAShC,2DAMiC;AA0H1B,KAAK,UAAU,aAAa,CAMjC,MAAyC,EACzC,UAAoE;IAEpE,MAAM,EACJ,OAAO,EAAE,QAAQ,GAAG,MAAM,CAAC,OAAO,EAClC,MAAM,EACN,OAAO,EACP,WAAW,GACZ,GAAG,UAAgD,CAAA;IAEpD,IAAI,CAAC,QAAQ;QACX,MAAM,IAAI,iCAAoB,CAAC;YAC7B,QAAQ,EAAE,oCAAoC;SAC/C,CAAC,CAAA;IACJ,MAAM,OAAO,GAAG,IAAA,8BAAY,EAAC,QAAQ,CAAC,CAAA;IAEtC,MAAM,KAAK,GAAG;QACZ,YAAY,EAAE,IAAA,sCAAuB,EAAC,EAAE,MAAM,EAAE,CAAC;QACjD,GAAG,UAAU,CAAC,KAAK;KACpB,CAAA;IAID,IAAA,gCAAiB,EAAC,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAA;IAE1D,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO;QAC1B,OAAO,OAAO,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAA;IAEvE,MAAM,SAAS,GAAG,IAAA,iCAAkB,EAAC,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAA;IAC7E,OAAO,MAAM,CAAC,OAAO,CACnB;QACE,MAAM,EAAE,sBAAsB;QAC9B,MAAM,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC;KACrC,EACD,EAAE,UAAU,EAAE,CAAC,EAAE,CAClB,CAAA;AACH,CAAC;AA1CD,sCA0CC"}
|
|
@@ -14,7 +14,7 @@ exports.polygonAmoy = (0, defineChain_js_1.defineChain)({
|
|
|
14
14
|
blockExplorers: {
|
|
15
15
|
default: {
|
|
16
16
|
name: 'PolygonScan',
|
|
17
|
-
url: 'https://amoy.polygonscan.com
|
|
17
|
+
url: 'https://amoy.polygonscan.com',
|
|
18
18
|
apiUrl: 'https://api-amoy.polygonscan.com/api',
|
|
19
19
|
},
|
|
20
20
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"polygonAmoy.js","sourceRoot":"","sources":["../../../chains/definitions/polygonAmoy.ts"],"names":[],"mappings":";;;AAAA,qEAA8D;AAEjD,QAAA,WAAW,GAAiB,IAAA,4BAAW,EAAC;IACnD,EAAE,EAAE,MAAM;IACV,IAAI,EAAE,cAAc;IACpB,cAAc,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE;IAChE,OAAO,EAAE;QACP,OAAO,EAAE;YACP,IAAI,EAAE,CAAC,qCAAqC,CAAC;SAC9C;KACF;IACD,cAAc,EAAE;QACd,OAAO,EAAE;YACP,IAAI,EAAE,aAAa;YACnB,GAAG,EAAE
|
|
1
|
+
{"version":3,"file":"polygonAmoy.js","sourceRoot":"","sources":["../../../chains/definitions/polygonAmoy.ts"],"names":[],"mappings":";;;AAAA,qEAA8D;AAEjD,QAAA,WAAW,GAAiB,IAAA,4BAAW,EAAC;IACnD,EAAE,EAAE,MAAM;IACV,IAAI,EAAE,cAAc;IACpB,cAAc,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE;IAChE,OAAO,EAAE;QACP,OAAO,EAAE;YACP,IAAI,EAAE,CAAC,qCAAqC,CAAC;SAC9C;KACF;IACD,cAAc,EAAE;QACd,OAAO,EAAE;YACP,IAAI,EAAE,aAAa;YACnB,GAAG,EAAE,8BAA8B;YACnC,MAAM,EAAE,sCAAsC;SAC/C;KACF;IACD,SAAS,EAAE;QACT,UAAU,EAAE;YACV,OAAO,EAAE,4CAA4C;YACrD,YAAY,EAAE,OAAO;SACtB;KACF;IACD,OAAO,EAAE,IAAI;CACd,CAAC,CAAA"}
|
package/_cjs/errors/version.js
CHANGED
|
@@ -20,6 +20,6 @@ function parseSiweMessage(message) {
|
|
|
20
20
|
};
|
|
21
21
|
}
|
|
22
22
|
exports.parseSiweMessage = parseSiweMessage;
|
|
23
|
-
const prefixRegex = /^(?:(?<scheme>[a-zA-Z][a-zA-Z0-9+-.]*):\/\/)?(?<domain>[a-zA-Z0-9+-.]*) (?:wants you to sign in with your Ethereum account:\n)(?<address>0x[a-fA-F0-9]{40})\n\n(?:(?<statement>.*)\n\n)?/;
|
|
23
|
+
const prefixRegex = /^(?:(?<scheme>[a-zA-Z][a-zA-Z0-9+-.]*):\/\/)?(?<domain>[a-zA-Z0-9+-.]*(?::[0-9]{1,5})?) (?:wants you to sign in with your Ethereum account:\n)(?<address>0x[a-fA-F0-9]{40})\n\n(?:(?<statement>.*)\n\n)?/;
|
|
24
24
|
const suffixRegex = /(?:URI: (?<uri>.+))\n(?:Version: (?<version>.+))\n(?:Chain ID: (?<chainId>\d+))\n(?:Nonce: (?<nonce>[a-zA-Z0-9]+))\n(?:Issued At: (?<issuedAt>.+))(?:\nExpiration Time: (?<expirationTime>.+))?(?:\nNot Before: (?<notBefore>.+))?(?:\nRequest ID: (?<requestId>.+))?/;
|
|
25
25
|
//# sourceMappingURL=parseSiweMessage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseSiweMessage.js","sourceRoot":"","sources":["../../../utils/siwe/parseSiweMessage.ts"],"names":[],"mappings":";;;AAYA,SAAgB,gBAAgB,CAC9B,OAAe;IAEf,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC;QAClE,EAAE,MAAM,IAAI,EAAE,CAKf,CAAA;IACD,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,MAAM,EAAE,GAC1E,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,MAAM,IAAI,EAAE,CASxC,CAAA;IACH,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IACxE,OAAO;QACL,GAAG,MAAM;QACT,GAAG,MAAM;QACT,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAChD,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,IAAI,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvE,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACrD,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACxD,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7B,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACpC,CAAA;AACH,CAAC;AAlCD,4CAkCC;AAGD,MAAM,WAAW,GACf,
|
|
1
|
+
{"version":3,"file":"parseSiweMessage.js","sourceRoot":"","sources":["../../../utils/siwe/parseSiweMessage.ts"],"names":[],"mappings":";;;AAYA,SAAgB,gBAAgB,CAC9B,OAAe;IAEf,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC;QAClE,EAAE,MAAM,IAAI,EAAE,CAKf,CAAA;IACD,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,MAAM,EAAE,GAC1E,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,MAAM,IAAI,EAAE,CASxC,CAAA;IACH,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IACxE,OAAO;QACL,GAAG,MAAM;QACT,GAAG,MAAM;QACT,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAChD,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,IAAI,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvE,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACrD,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACxD,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7B,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACpC,CAAA;AACH,CAAC;AAlCD,4CAkCC;AAGD,MAAM,WAAW,GACf,0MAA0M,CAAA;AAG5M,MAAM,WAAW,GACf,uQAAuQ,CAAA"}
|
package/_cjs/utils/typedData.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.domainSeparator = exports.getTypesForEIP712Domain = exports.validateTypedData = void 0;
|
|
3
|
+
exports.domainSeparator = exports.getTypesForEIP712Domain = exports.validateTypedData = exports.serializeTypedData = void 0;
|
|
4
4
|
const abi_js_1 = require("../errors/abi.js");
|
|
5
5
|
const address_js_1 = require("../errors/address.js");
|
|
6
6
|
const isAddress_js_1 = require("./address/isAddress.js");
|
|
@@ -8,6 +8,34 @@ const size_js_1 = require("./data/size.js");
|
|
|
8
8
|
const toHex_js_1 = require("./encoding/toHex.js");
|
|
9
9
|
const regex_js_1 = require("./regex.js");
|
|
10
10
|
const hashTypedData_js_1 = require("./signature/hashTypedData.js");
|
|
11
|
+
const stringify_js_1 = require("./stringify.js");
|
|
12
|
+
function serializeTypedData(parameters) {
|
|
13
|
+
const { domain: domain_, message: message_, primaryType, types, } = parameters;
|
|
14
|
+
const normalizeData = (struct, data_) => {
|
|
15
|
+
const data = { ...data_ };
|
|
16
|
+
for (const param of struct) {
|
|
17
|
+
const { name, type } = param;
|
|
18
|
+
if (type === 'address')
|
|
19
|
+
data[name] = data[name].toLowerCase();
|
|
20
|
+
}
|
|
21
|
+
return data;
|
|
22
|
+
};
|
|
23
|
+
const domain = (() => {
|
|
24
|
+
if (!types.EIP712Domain)
|
|
25
|
+
return {};
|
|
26
|
+
if (!domain_)
|
|
27
|
+
return {};
|
|
28
|
+
return normalizeData(types.EIP712Domain, domain_);
|
|
29
|
+
})();
|
|
30
|
+
const message = (() => {
|
|
31
|
+
if (primaryType === 'EIP712Domain')
|
|
32
|
+
return undefined;
|
|
33
|
+
return normalizeData(types[primaryType], message_);
|
|
34
|
+
})();
|
|
35
|
+
console.log(message);
|
|
36
|
+
return (0, stringify_js_1.stringify)({ domain, message, primaryType, types });
|
|
37
|
+
}
|
|
38
|
+
exports.serializeTypedData = serializeTypedData;
|
|
11
39
|
function validateTypedData(parameters) {
|
|
12
40
|
const { domain, message, primaryType, types } = parameters;
|
|
13
41
|
const validateData = (struct, data) => {
|
|
@@ -41,10 +69,8 @@ function validateTypedData(parameters) {
|
|
|
41
69
|
};
|
|
42
70
|
if (types.EIP712Domain && domain)
|
|
43
71
|
validateData(types.EIP712Domain, domain);
|
|
44
|
-
if (primaryType !== 'EIP712Domain')
|
|
45
|
-
|
|
46
|
-
validateData(type, message);
|
|
47
|
-
}
|
|
72
|
+
if (primaryType !== 'EIP712Domain')
|
|
73
|
+
validateData(types[primaryType], message);
|
|
48
74
|
}
|
|
49
75
|
exports.validateTypedData = validateTypedData;
|
|
50
76
|
function getTypesForEIP712Domain({ domain, }) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typedData.js","sourceRoot":"","sources":["../../utils/typedData.ts"],"names":[],"mappings":";;;AAEA,6CAAyD;AACzD,qDAA0D;AAK1D,yDAA2E;AAC3E,4CAAyD;AACzD,kDAA4E;AAC5E,yCAAqD;AACrD,mEAGqC;
|
|
1
|
+
{"version":3,"file":"typedData.js","sourceRoot":"","sources":["../../utils/typedData.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,7 +35,7 @@ import { readContract, } from '../public/readContract.js';
|
|
|
35
35
|
* name: normalize('wevm.eth'),
|
|
36
36
|
* key: 'com.twitter',
|
|
37
37
|
* })
|
|
38
|
-
* // '
|
|
38
|
+
* // 'wevm_dev'
|
|
39
39
|
*/
|
|
40
40
|
export async function getEnsText(client, { blockNumber, blockTag, name, key, gatewayUrls, strict, universalResolverAddress: universalResolverAddress_, }) {
|
|
41
41
|
let universalResolverAddress = universalResolverAddress_;
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
import { parseAccount, } from '../../accounts/utils/parseAccount.js';
|
|
2
2
|
import { AccountNotFoundError, } from '../../errors/account.js';
|
|
3
|
-
import {
|
|
4
|
-
import { stringify } from '../../utils/stringify.js';
|
|
5
|
-
import { getTypesForEIP712Domain, validateTypedData, } from '../../utils/typedData.js';
|
|
3
|
+
import { getTypesForEIP712Domain, serializeTypedData, validateTypedData, } from '../../utils/typedData.js';
|
|
6
4
|
/**
|
|
7
5
|
* Signs typed data and calculates an Ethereum-specific signature in [https://eips.ethereum.org/EIPS/eip-712](https://eips.ethereum.org/EIPS/eip-712): `sign(keccak256("\x19\x01" ‖ domainSeparator ‖ hashStruct(message)))`
|
|
8
6
|
*
|
|
@@ -117,7 +115,7 @@ export async function signTypedData(client, parameters) {
|
|
|
117
115
|
validateTypedData({ domain, message, primaryType, types });
|
|
118
116
|
if (account.type === 'local')
|
|
119
117
|
return account.signTypedData({ domain, message, primaryType, types });
|
|
120
|
-
const typedData =
|
|
118
|
+
const typedData = serializeTypedData({ domain, message, primaryType, types });
|
|
121
119
|
return client.request({
|
|
122
120
|
method: 'eth_signTypedData_v4',
|
|
123
121
|
params: [account.address, typedData],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signTypedData.js","sourceRoot":"","sources":["../../../actions/wallet/signTypedData.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,YAAY,GACb,MAAM,sCAAsC,CAAA;AAI7C,OAAO,EACL,oBAAoB,GAErB,MAAM,yBAAyB,CAAA;
|
|
1
|
+
{"version":3,"file":"signTypedData.js","sourceRoot":"","sources":["../../../actions/wallet/signTypedData.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,YAAY,GACb,MAAM,sCAAsC,CAAA;AAI7C,OAAO,EACL,oBAAoB,GAErB,MAAM,yBAAyB,CAAA;AAShC,OAAO,EAGL,uBAAuB,EACvB,kBAAkB,EAClB,iBAAiB,GAClB,MAAM,0BAA0B,CAAA;AAwBjC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiGG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAMjC,MAAyC,EACzC,UAAoE;IAEpE,MAAM,EACJ,OAAO,EAAE,QAAQ,GAAG,MAAM,CAAC,OAAO,EAClC,MAAM,EACN,OAAO,EACP,WAAW,GACZ,GAAG,UAAgD,CAAA;IAEpD,IAAI,CAAC,QAAQ;QACX,MAAM,IAAI,oBAAoB,CAAC;YAC7B,QAAQ,EAAE,oCAAoC;SAC/C,CAAC,CAAA;IACJ,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAA;IAEtC,MAAM,KAAK,GAAG;QACZ,YAAY,EAAE,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC;QACjD,GAAG,UAAU,CAAC,KAAK;KACpB,CAAA;IAED,uFAAuF;IACvF,qDAAqD;IACrD,iBAAiB,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAA;IAE1D,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO;QAC1B,OAAO,OAAO,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAA;IAEvE,MAAM,SAAS,GAAG,kBAAkB,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAA;IAC7E,OAAO,MAAM,CAAC,OAAO,CACnB;QACE,MAAM,EAAE,sBAAsB;QAC9B,MAAM,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC;KACrC,EACD,EAAE,UAAU,EAAE,CAAC,EAAE,CAClB,CAAA;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"polygonAmoy.js","sourceRoot":"","sources":["../../../chains/definitions/polygonAmoy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AAE9D,MAAM,CAAC,MAAM,WAAW,GAAG,aAAa,CAAC,WAAW,CAAC;IACnD,EAAE,EAAE,MAAM;IACV,IAAI,EAAE,cAAc;IACpB,cAAc,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE;IAChE,OAAO,EAAE;QACP,OAAO,EAAE;YACP,IAAI,EAAE,CAAC,qCAAqC,CAAC;SAC9C;KACF;IACD,cAAc,EAAE;QACd,OAAO,EAAE;YACP,IAAI,EAAE,aAAa;YACnB,GAAG,EAAE
|
|
1
|
+
{"version":3,"file":"polygonAmoy.js","sourceRoot":"","sources":["../../../chains/definitions/polygonAmoy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AAE9D,MAAM,CAAC,MAAM,WAAW,GAAG,aAAa,CAAC,WAAW,CAAC;IACnD,EAAE,EAAE,MAAM;IACV,IAAI,EAAE,cAAc;IACpB,cAAc,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE;IAChE,OAAO,EAAE;QACP,OAAO,EAAE;YACP,IAAI,EAAE,CAAC,qCAAqC,CAAC;SAC9C;KACF;IACD,cAAc,EAAE;QACd,OAAO,EAAE;YACP,IAAI,EAAE,aAAa;YACnB,GAAG,EAAE,8BAA8B;YACnC,MAAM,EAAE,sCAAsC;SAC/C;KACF;IACD,SAAS,EAAE;QACT,UAAU,EAAE;YACV,OAAO,EAAE,4CAA4C;YACrD,YAAY,EAAE,OAAO;SACtB;KACF;IACD,OAAO,EAAE,IAAI;CACd,CAAC,CAAA"}
|
package/_esm/errors/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const version = '2.12.
|
|
1
|
+
export const version = '2.12.4';
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
|
@@ -24,7 +24,7 @@ export function parseSiweMessage(message) {
|
|
|
24
24
|
};
|
|
25
25
|
}
|
|
26
26
|
// https://regexr.com/80gdj
|
|
27
|
-
const prefixRegex = /^(?:(?<scheme>[a-zA-Z][a-zA-Z0-9+-.]*):\/\/)?(?<domain>[a-zA-Z0-9+-.]*) (?:wants you to sign in with your Ethereum account:\n)(?<address>0x[a-fA-F0-9]{40})\n\n(?:(?<statement>.*)\n\n)?/;
|
|
27
|
+
const prefixRegex = /^(?:(?<scheme>[a-zA-Z][a-zA-Z0-9+-.]*):\/\/)?(?<domain>[a-zA-Z0-9+-.]*(?::[0-9]{1,5})?) (?:wants you to sign in with your Ethereum account:\n)(?<address>0x[a-fA-F0-9]{40})\n\n(?:(?<statement>.*)\n\n)?/;
|
|
28
28
|
// https://regexr.com/80gf9
|
|
29
29
|
const suffixRegex = /(?:URI: (?<uri>.+))\n(?:Version: (?<version>.+))\n(?:Chain ID: (?<chainId>\d+))\n(?:Nonce: (?<nonce>[a-zA-Z0-9]+))\n(?:Issued At: (?<issuedAt>.+))(?:\nExpiration Time: (?<expirationTime>.+))?(?:\nNot Before: (?<notBefore>.+))?(?:\nRequest ID: (?<requestId>.+))?/;
|
|
30
30
|
//# sourceMappingURL=parseSiweMessage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseSiweMessage.js","sourceRoot":"","sources":["../../../utils/siwe/parseSiweMessage.ts"],"names":[],"mappings":"AAKA;;;;;;GAMG;AACH,MAAM,UAAU,gBAAgB,CAC9B,OAAe;IAEf,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC;QAClE,EAAE,MAAM,IAAI,EAAE,CAKf,CAAA;IACD,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,MAAM,EAAE,GAC1E,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,MAAM,IAAI,EAAE,CASxC,CAAA;IACH,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IACxE,OAAO;QACL,GAAG,MAAM;QACT,GAAG,MAAM;QACT,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAChD,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,IAAI,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvE,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACrD,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACxD,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7B,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACpC,CAAA;AACH,CAAC;AAED,2BAA2B;AAC3B,MAAM,WAAW,GACf,
|
|
1
|
+
{"version":3,"file":"parseSiweMessage.js","sourceRoot":"","sources":["../../../utils/siwe/parseSiweMessage.ts"],"names":[],"mappings":"AAKA;;;;;;GAMG;AACH,MAAM,UAAU,gBAAgB,CAC9B,OAAe;IAEf,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC;QAClE,EAAE,MAAM,IAAI,EAAE,CAKf,CAAA;IACD,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,MAAM,EAAE,GAC1E,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,MAAM,IAAI,EAAE,CASxC,CAAA;IACH,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IACxE,OAAO;QACL,GAAG,MAAM;QACT,GAAG,MAAM;QACT,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAChD,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,IAAI,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvE,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACrD,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACxD,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7B,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACpC,CAAA;AACH,CAAC;AAED,2BAA2B;AAC3B,MAAM,WAAW,GACf,0MAA0M,CAAA;AAE5M,2BAA2B;AAC3B,MAAM,WAAW,GACf,uQAAuQ,CAAA"}
|
package/_esm/utils/typedData.js
CHANGED
|
@@ -5,6 +5,33 @@ import { size } from './data/size.js';
|
|
|
5
5
|
import { numberToHex } from './encoding/toHex.js';
|
|
6
6
|
import { bytesRegex, integerRegex } from './regex.js';
|
|
7
7
|
import { hashDomain, } from './signature/hashTypedData.js';
|
|
8
|
+
import { stringify } from './stringify.js';
|
|
9
|
+
export function serializeTypedData(parameters) {
|
|
10
|
+
const { domain: domain_, message: message_, primaryType, types, } = parameters;
|
|
11
|
+
const normalizeData = (struct, data_) => {
|
|
12
|
+
const data = { ...data_ };
|
|
13
|
+
for (const param of struct) {
|
|
14
|
+
const { name, type } = param;
|
|
15
|
+
if (type === 'address')
|
|
16
|
+
data[name] = data[name].toLowerCase();
|
|
17
|
+
}
|
|
18
|
+
return data;
|
|
19
|
+
};
|
|
20
|
+
const domain = (() => {
|
|
21
|
+
if (!types.EIP712Domain)
|
|
22
|
+
return {};
|
|
23
|
+
if (!domain_)
|
|
24
|
+
return {};
|
|
25
|
+
return normalizeData(types.EIP712Domain, domain_);
|
|
26
|
+
})();
|
|
27
|
+
const message = (() => {
|
|
28
|
+
if (primaryType === 'EIP712Domain')
|
|
29
|
+
return undefined;
|
|
30
|
+
return normalizeData(types[primaryType], message_);
|
|
31
|
+
})();
|
|
32
|
+
console.log(message);
|
|
33
|
+
return stringify({ domain, message, primaryType, types });
|
|
34
|
+
}
|
|
8
35
|
export function validateTypedData(parameters) {
|
|
9
36
|
const { domain, message, primaryType, types } = parameters;
|
|
10
37
|
const validateData = (struct, data) => {
|
|
@@ -41,11 +68,9 @@ export function validateTypedData(parameters) {
|
|
|
41
68
|
// Validate domain types.
|
|
42
69
|
if (types.EIP712Domain && domain)
|
|
43
70
|
validateData(types.EIP712Domain, domain);
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
validateData(type, message);
|
|
48
|
-
}
|
|
71
|
+
// Validate message types.
|
|
72
|
+
if (primaryType !== 'EIP712Domain')
|
|
73
|
+
validateData(types[primaryType], message);
|
|
49
74
|
}
|
|
50
75
|
export function getTypesForEIP712Domain({ domain, }) {
|
|
51
76
|
return [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typedData.js","sourceRoot":"","sources":["../../utils/typedData.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAA;AACzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAK1D,OAAO,EAA2B,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAC3E,OAAO,EAAsB,IAAI,EAAE,MAAM,gBAAgB,CAAA;AACzD,OAAO,EAA6B,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAC5E,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AACrD,OAAO,EAEL,UAAU,GACX,MAAM,8BAA8B,CAAA;
|
|
1
|
+
{"version":3,"file":"typedData.js","sourceRoot":"","sources":["../../utils/typedData.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,7 +51,7 @@ export type GetEnsTextErrorType = GetChainContractAddressErrorType | ReadContrac
|
|
|
51
51
|
* name: normalize('wevm.eth'),
|
|
52
52
|
* key: 'com.twitter',
|
|
53
53
|
* })
|
|
54
|
-
* // '
|
|
54
|
+
* // 'wevm_dev'
|
|
55
55
|
*/
|
|
56
56
|
export declare function getEnsText<TChain extends Chain | undefined>(client: Client<Transport, TChain>, { blockNumber, blockTag, name, key, gatewayUrls, strict, universalResolverAddress: universalResolverAddress_, }: GetEnsTextParameters): Promise<GetEnsTextReturnType>;
|
|
57
57
|
//# sourceMappingURL=getEnsText.d.ts.map
|
|
@@ -11,8 +11,8 @@ import type { Chain } from '../../types/chain.js';
|
|
|
11
11
|
import type { Hex } from '../../types/misc.js';
|
|
12
12
|
import type { TypedDataDefinition } from '../../types/typedData.js';
|
|
13
13
|
import type { RequestErrorType } from '../../utils/buildRequest.js';
|
|
14
|
-
import {
|
|
15
|
-
import {
|
|
14
|
+
import type { IsHexErrorType } from '../../utils/data/isHex.js';
|
|
15
|
+
import type { StringifyErrorType } from '../../utils/stringify.js';
|
|
16
16
|
import { type GetTypesForEIP712DomainErrorType, type ValidateTypedDataErrorType } from '../../utils/typedData.js';
|
|
17
17
|
export type SignTypedDataParameters<typedData extends TypedData | Record<string, unknown> = TypedData, primaryType extends keyof typedData | 'EIP712Domain' = keyof typedData, account extends Account | undefined = undefined, primaryTypes = typedData extends TypedData ? keyof typedData : string> = TypedDataDefinition<typedData, primaryType, primaryTypes> & GetAccountParameter<account>;
|
|
18
18
|
export type SignTypedDataReturnType = Hex;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signTypedData.d.ts","sourceRoot":"","sources":["../../../actions/wallet/signTypedData.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAExC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAA;AACtD,OAAO,EACL,KAAK,qBAAqB,EAE3B,MAAM,sCAAsC,CAAA;AAC7C,OAAO,KAAK,EAAE,sBAAsB,IAAI,8BAA8B,EAAE,MAAM,uCAAuC,CAAA;AACrH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6CAA6C,CAAA;AAC5E,OAAO,EAEL,KAAK,wBAAwB,EAC9B,MAAM,yBAAyB,CAAA;AAChC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AACjE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAA;AAC9C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AACnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AACnE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"signTypedData.d.ts","sourceRoot":"","sources":["../../../actions/wallet/signTypedData.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAExC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAA;AACtD,OAAO,EACL,KAAK,qBAAqB,EAE3B,MAAM,sCAAsC,CAAA;AAC7C,OAAO,KAAK,EAAE,sBAAsB,IAAI,8BAA8B,EAAE,MAAM,uCAAuC,CAAA;AACrH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6CAA6C,CAAA;AAC5E,OAAO,EAEL,KAAK,wBAAwB,EAC9B,MAAM,yBAAyB,CAAA;AAChC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AACjE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAA;AAC9C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AACnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AACnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAClE,OAAO,EACL,KAAK,gCAAgC,EACrC,KAAK,0BAA0B,EAIhC,MAAM,0BAA0B,CAAA;AAEjC,MAAM,MAAM,uBAAuB,CACjC,SAAS,SAAS,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EACjE,WAAW,SAAS,MAAM,SAAS,GAAG,cAAc,GAAG,MAAM,SAAS,EACtE,OAAO,SAAS,OAAO,GAAG,SAAS,GAAG,SAAS,EAE/C,YAAY,GAAG,SAAS,SAAS,SAAS,GAAG,MAAM,SAAS,GAAG,MAAM,IACnE,mBAAmB,CAAC,SAAS,EAAE,WAAW,EAAE,YAAY,CAAC,GAC3D,mBAAmB,CAAC,OAAO,CAAC,CAAA;AAE9B,MAAM,MAAM,uBAAuB,GAAG,GAAG,CAAA;AAEzC,MAAM,MAAM,sBAAsB,GAC9B,wBAAwB,GACxB,qBAAqB,GACrB,gCAAgC,GAChC,0BAA0B,GAC1B,kBAAkB,GAClB,8BAA8B,GAC9B,cAAc,GACd,gBAAgB,GAChB,SAAS,CAAA;AAEb;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiGG;AACH,wBAAsB,aAAa,CACjC,KAAK,CAAC,SAAS,SAAS,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC3D,WAAW,SAAS,MAAM,SAAS,GAAG,cAAc,EACpD,KAAK,SAAS,KAAK,GAAG,SAAS,EAC/B,OAAO,SAAS,OAAO,GAAG,SAAS,EAEnC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,CAAC,EACzC,UAAU,EAAE,uBAAuB,CAAC,SAAS,EAAE,WAAW,EAAE,OAAO,CAAC,GACnE,OAAO,CAAC,uBAAuB,CAAC,CAkClC"}
|
|
@@ -2,7 +2,7 @@ export declare const polygonAmoy: {
|
|
|
2
2
|
blockExplorers: {
|
|
3
3
|
readonly default: {
|
|
4
4
|
readonly name: "PolygonScan";
|
|
5
|
-
readonly url: "https://amoy.polygonscan.com
|
|
5
|
+
readonly url: "https://amoy.polygonscan.com";
|
|
6
6
|
readonly apiUrl: "https://api-amoy.polygonscan.com/api";
|
|
7
7
|
};
|
|
8
8
|
};
|
|
@@ -545,7 +545,7 @@ export type PublicActions<TTransport extends Transport = Transport, TChain exten
|
|
|
545
545
|
* name: normalize('wevm.eth'),
|
|
546
546
|
* key: 'com.twitter',
|
|
547
547
|
* })
|
|
548
|
-
* // '
|
|
548
|
+
* // 'wevm_dev'
|
|
549
549
|
*/
|
|
550
550
|
getEnsText: (args: GetEnsTextParameters) => Promise<GetEnsTextReturnType>;
|
|
551
551
|
/**
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "2.12.
|
|
1
|
+
export declare const version = "2.12.4";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { Abi, AbiEvent, AbiFunction, AbiParameter, AbiParameterToPrimitiveType, AbiParametersToPrimitiveTypes, AbiStateMutability, Address, ExtractAbiError, ExtractAbiErrorNames, ExtractAbiEvent, ExtractAbiEventNames, ExtractAbiFunction, ExtractAbiFunctionNames, ResolvedRegister } from 'abitype';
|
|
2
2
|
import type { Hex, LogTopic } from './misc.js';
|
|
3
3
|
import type { TransactionRequest } from './transaction.js';
|
|
4
|
-
import type { Filter, IsNarrowable, IsUnion, MaybeRequired,
|
|
4
|
+
import type { Filter, IsNarrowable, IsUnion, MaybeRequired, NoInfer, Prettify, UnionToTuple } from './utils.js';
|
|
5
5
|
export type ContractFunctionName<abi extends Abi | readonly unknown[] = Abi, mutability extends AbiStateMutability = AbiStateMutability> = ExtractAbiFunctionNames<abi extends Abi ? abi : Abi, mutability> extends infer functionName extends string ? [functionName] extends [never] ? string : functionName : string;
|
|
6
6
|
export type ContractErrorName<abi extends Abi | readonly unknown[] = Abi> = ExtractAbiErrorNames<abi extends Abi ? abi : Abi> extends infer errorName extends string ? [errorName] extends [never] ? string : errorName : string;
|
|
7
7
|
export type ContractEventName<abi extends Abi | readonly unknown[] = Abi> = ExtractAbiEventNames<abi extends Abi ? abi : Abi> extends infer eventName extends string ? [eventName] extends [never] ? string : eventName : string;
|
|
@@ -55,13 +55,13 @@ export type ExtractAbiItemForArgs<abi extends Abi, name extends AbiItemName<abi>
|
|
|
55
55
|
}[number] : never : abiItem : never;
|
|
56
56
|
export type EventDefinition = `${string}(${string})`;
|
|
57
57
|
export type GetValue<TAbi extends Abi | readonly unknown[], TFunctionName extends string, TValueType = TransactionRequest['value'], TAbiFunction extends AbiFunction = TAbi extends Abi ? ExtractAbiFunction<TAbi, TFunctionName> : AbiFunction, _Narrowable extends boolean = IsNarrowable<TAbi, Abi>> = _Narrowable extends true ? TAbiFunction['stateMutability'] extends 'payable' ? {
|
|
58
|
-
value?:
|
|
58
|
+
value?: NoInfer<TValueType> | undefined;
|
|
59
59
|
} : TAbiFunction['payable'] extends true ? {
|
|
60
|
-
value?:
|
|
60
|
+
value?: NoInfer<TValueType> | undefined;
|
|
61
61
|
} : {
|
|
62
|
-
value?:
|
|
62
|
+
value?: undefined;
|
|
63
63
|
} : {
|
|
64
|
-
value?: TValueType | undefined;
|
|
64
|
+
value?: NoInfer<TValueType> | undefined;
|
|
65
65
|
};
|
|
66
66
|
export type MaybeAbiEventName<TAbiEvent extends AbiEvent | undefined> = TAbiEvent extends AbiEvent ? TAbiEvent['name'] : undefined;
|
|
67
67
|
export type MaybeExtractEventArgsFromAbi<TAbi extends Abi | readonly unknown[] | undefined, TEventName extends string | undefined> = TAbi extends Abi | readonly unknown[] ? TEventName extends string ? GetEventArgs<TAbi, TEventName> : undefined : undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../../types/contract.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../../types/contract.ts"],"names":[],"mappings":"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"}
|
package/_types/types/utils.d.ts
CHANGED
|
@@ -113,6 +113,7 @@ type Assign_<T, U> = {
|
|
|
113
113
|
export type NeverBy<T, K extends keyof T> = {
|
|
114
114
|
[U in keyof T]: U extends K ? never : T[U];
|
|
115
115
|
};
|
|
116
|
+
export type NoInfer<type> = [type][type extends any ? 0 : never];
|
|
116
117
|
/**
|
|
117
118
|
* @description Constructs a type by excluding `undefined` from `T`.
|
|
118
119
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../types/utils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../types/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,8 @@ import { type IsAddressErrorType } from './address/isAddress.js';
|
|
|
6
6
|
import { type SizeErrorType } from './data/size.js';
|
|
7
7
|
import { type NumberToHexErrorType } from './encoding/toHex.js';
|
|
8
8
|
import { type HashDomainErrorType } from './signature/hashTypedData.js';
|
|
9
|
+
export type SerializeTypedDataErrorType = HashDomainErrorType | IsAddressErrorType | NumberToHexErrorType | SizeErrorType | ErrorType;
|
|
10
|
+
export declare function serializeTypedData<const typedData extends TypedData | Record<string, unknown>, primaryType extends keyof typedData | 'EIP712Domain'>(parameters: TypedDataDefinition<typedData, primaryType>): string;
|
|
9
11
|
export type ValidateTypedDataErrorType = HashDomainErrorType | IsAddressErrorType | NumberToHexErrorType | SizeErrorType | ErrorType;
|
|
10
12
|
export declare function validateTypedData<const typedData extends TypedData | Record<string, unknown>, primaryType extends keyof typedData | 'EIP712Domain'>(parameters: TypedDataDefinition<typedData, primaryType>): void;
|
|
11
13
|
export type GetTypesForEIP712DomainErrorType = ErrorType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typedData.d.ts","sourceRoot":"","sources":["../../utils/typedData.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AAI7E,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAEhE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AACnD,OAAO,EAAE,KAAK,kBAAkB,EAAa,MAAM,wBAAwB,CAAA;AAC3E,OAAO,EAAE,KAAK,aAAa,EAAQ,MAAM,gBAAgB,CAAA;AACzD,OAAO,EAAE,KAAK,oBAAoB,EAAe,MAAM,qBAAqB,CAAA;AAE5E,OAAO,EACL,KAAK,mBAAmB,EAEzB,MAAM,8BAA8B,CAAA;
|
|
1
|
+
{"version":3,"file":"typedData.d.ts","sourceRoot":"","sources":["../../utils/typedData.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AAI7E,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAEhE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AACnD,OAAO,EAAE,KAAK,kBAAkB,EAAa,MAAM,wBAAwB,CAAA;AAC3E,OAAO,EAAE,KAAK,aAAa,EAAQ,MAAM,gBAAgB,CAAA;AACzD,OAAO,EAAE,KAAK,oBAAoB,EAAe,MAAM,qBAAqB,CAAA;AAE5E,OAAO,EACL,KAAK,mBAAmB,EAEzB,MAAM,8BAA8B,CAAA;AAGrC,MAAM,MAAM,2BAA2B,GACnC,mBAAmB,GACnB,kBAAkB,GAClB,oBAAoB,GACpB,aAAa,GACb,SAAS,CAAA;AAEb,wBAAgB,kBAAkB,CAChC,KAAK,CAAC,SAAS,SAAS,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC3D,WAAW,SAAS,MAAM,SAAS,GAAG,cAAc,EACpD,UAAU,EAAE,mBAAmB,CAAC,SAAS,EAAE,WAAW,CAAC,UAkCxD;AAED,MAAM,MAAM,0BAA0B,GAClC,mBAAmB,GACnB,kBAAkB,GAClB,oBAAoB,GACpB,aAAa,GACb,SAAS,CAAA;AAEb,wBAAgB,iBAAiB,CAC/B,KAAK,CAAC,SAAS,SAAS,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC3D,WAAW,SAAS,MAAM,SAAS,GAAG,cAAc,EACpD,UAAU,EAAE,mBAAmB,CAAC,SAAS,EAAE,WAAW,CAAC,QAiDxD;AAED,MAAM,MAAM,gCAAgC,GAAG,SAAS,CAAA;AAExD,wBAAgB,uBAAuB,CAAC,EACtC,MAAM,GACP,EAAE;IAAE,MAAM,CAAC,EAAE,eAAe,GAAG,SAAS,CAAA;CAAE,GAAG,kBAAkB,EAAE,CAcjE;AAED,MAAM,MAAM,wBAAwB,GAChC,gCAAgC,GAChC,mBAAmB,GACnB,SAAS,CAAA;AAEb,wBAAgB,eAAe,CAAC,EAAE,MAAM,EAAE,EAAE;IAAE,MAAM,EAAE,eAAe,CAAA;CAAE,GAAG,GAAG,CAO5E"}
|
|
@@ -18,12 +18,13 @@ import type { Chain } from '../../types/chain.js'
|
|
|
18
18
|
import type { Hex } from '../../types/misc.js'
|
|
19
19
|
import type { TypedDataDefinition } from '../../types/typedData.js'
|
|
20
20
|
import type { RequestErrorType } from '../../utils/buildRequest.js'
|
|
21
|
-
import {
|
|
22
|
-
import {
|
|
21
|
+
import type { IsHexErrorType } from '../../utils/data/isHex.js'
|
|
22
|
+
import type { StringifyErrorType } from '../../utils/stringify.js'
|
|
23
23
|
import {
|
|
24
24
|
type GetTypesForEIP712DomainErrorType,
|
|
25
25
|
type ValidateTypedDataErrorType,
|
|
26
26
|
getTypesForEIP712Domain,
|
|
27
|
+
serializeTypedData,
|
|
27
28
|
validateTypedData,
|
|
28
29
|
} from '../../utils/typedData.js'
|
|
29
30
|
|
|
@@ -181,10 +182,7 @@ export async function signTypedData<
|
|
|
181
182
|
if (account.type === 'local')
|
|
182
183
|
return account.signTypedData({ domain, message, primaryType, types })
|
|
183
184
|
|
|
184
|
-
const typedData =
|
|
185
|
-
{ domain: domain ?? {}, message, primaryType, types },
|
|
186
|
-
(_, value) => (isHex(value) ? value.toLowerCase() : value),
|
|
187
|
-
)
|
|
185
|
+
const typedData = serializeTypedData({ domain, message, primaryType, types })
|
|
188
186
|
return client.request(
|
|
189
187
|
{
|
|
190
188
|
method: 'eth_signTypedData_v4',
|
package/errors/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const version = '2.12.
|
|
1
|
+
export const version = '2.12.4'
|
package/package.json
CHANGED
package/types/contract.ts
CHANGED
|
@@ -23,7 +23,7 @@ import type {
|
|
|
23
23
|
IsNarrowable,
|
|
24
24
|
IsUnion,
|
|
25
25
|
MaybeRequired,
|
|
26
|
-
|
|
26
|
+
NoInfer,
|
|
27
27
|
Prettify,
|
|
28
28
|
UnionToTuple,
|
|
29
29
|
} from './utils.js'
|
|
@@ -210,6 +210,7 @@ export type ContractFunctionParameters<
|
|
|
210
210
|
| (functionName extends allFunctionNames ? functionName : never) // infer value
|
|
211
211
|
args?: (abi extends Abi ? UnionWiden<args> : never) | allArgs | undefined
|
|
212
212
|
} & (readonly [] extends allArgs ? {} : { args: Widen<args> }) &
|
|
213
|
+
// TODO: Remove `GetValue` from here (should be applied to top-level type as separate utility)
|
|
213
214
|
GetValue<abi, functionName>
|
|
214
215
|
|
|
215
216
|
export type ContractFunctionReturnType<
|
|
@@ -309,11 +310,11 @@ export type GetValue<
|
|
|
309
310
|
_Narrowable extends boolean = IsNarrowable<TAbi, Abi>,
|
|
310
311
|
> = _Narrowable extends true
|
|
311
312
|
? TAbiFunction['stateMutability'] extends 'payable'
|
|
312
|
-
? { value?:
|
|
313
|
+
? { value?: NoInfer<TValueType> | undefined }
|
|
313
314
|
: TAbiFunction['payable'] extends true
|
|
314
|
-
? { value?:
|
|
315
|
-
: { value?:
|
|
316
|
-
: { value?: TValueType | undefined }
|
|
315
|
+
? { value?: NoInfer<TValueType> | undefined }
|
|
316
|
+
: { value?: undefined }
|
|
317
|
+
: { value?: NoInfer<TValueType> | undefined }
|
|
317
318
|
|
|
318
319
|
//////////////////////////////////////////////////////////////////////////////////////////////////
|
|
319
320
|
|
package/types/utils.ts
CHANGED
|
@@ -145,6 +145,9 @@ export type NeverBy<T, K extends keyof T> = {
|
|
|
145
145
|
[U in keyof T]: U extends K ? never : T[U]
|
|
146
146
|
}
|
|
147
147
|
|
|
148
|
+
// TODO: Remove when peer dep `typescript@>=4.5` (NoInfer is native)
|
|
149
|
+
export type NoInfer<type> = [type][type extends any ? 0 : never]
|
|
150
|
+
|
|
148
151
|
/**
|
|
149
152
|
* @description Constructs a type by excluding `undefined` from `T`.
|
|
150
153
|
*
|
|
@@ -48,7 +48,7 @@ export function parseSiweMessage(
|
|
|
48
48
|
|
|
49
49
|
// https://regexr.com/80gdj
|
|
50
50
|
const prefixRegex =
|
|
51
|
-
/^(?:(?<scheme>[a-zA-Z][a-zA-Z0-9+-.]*):\/\/)?(?<domain>[a-zA-Z0-9+-.]*) (?:wants you to sign in with your Ethereum account:\n)(?<address>0x[a-fA-F0-9]{40})\n\n(?:(?<statement>.*)\n\n)?/
|
|
51
|
+
/^(?:(?<scheme>[a-zA-Z][a-zA-Z0-9+-.]*):\/\/)?(?<domain>[a-zA-Z0-9+-.]*(?::[0-9]{1,5})?) (?:wants you to sign in with your Ethereum account:\n)(?<address>0x[a-fA-F0-9]{40})\n\n(?:(?<statement>.*)\n\n)?/
|
|
52
52
|
|
|
53
53
|
// https://regexr.com/80gf9
|
|
54
54
|
const suffixRegex =
|
package/utils/typedData.ts
CHANGED
|
@@ -14,6 +14,53 @@ import {
|
|
|
14
14
|
type HashDomainErrorType,
|
|
15
15
|
hashDomain,
|
|
16
16
|
} from './signature/hashTypedData.js'
|
|
17
|
+
import { stringify } from './stringify.js'
|
|
18
|
+
|
|
19
|
+
export type SerializeTypedDataErrorType =
|
|
20
|
+
| HashDomainErrorType
|
|
21
|
+
| IsAddressErrorType
|
|
22
|
+
| NumberToHexErrorType
|
|
23
|
+
| SizeErrorType
|
|
24
|
+
| ErrorType
|
|
25
|
+
|
|
26
|
+
export function serializeTypedData<
|
|
27
|
+
const typedData extends TypedData | Record<string, unknown>,
|
|
28
|
+
primaryType extends keyof typedData | 'EIP712Domain',
|
|
29
|
+
>(parameters: TypedDataDefinition<typedData, primaryType>) {
|
|
30
|
+
const {
|
|
31
|
+
domain: domain_,
|
|
32
|
+
message: message_,
|
|
33
|
+
primaryType,
|
|
34
|
+
types,
|
|
35
|
+
} = parameters as unknown as TypedDataDefinition
|
|
36
|
+
|
|
37
|
+
const normalizeData = (
|
|
38
|
+
struct: readonly TypedDataParameter[],
|
|
39
|
+
data_: Record<string, unknown>,
|
|
40
|
+
) => {
|
|
41
|
+
const data = { ...data_ }
|
|
42
|
+
for (const param of struct) {
|
|
43
|
+
const { name, type } = param
|
|
44
|
+
if (type === 'address') data[name] = (data[name] as string).toLowerCase()
|
|
45
|
+
}
|
|
46
|
+
return data
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
const domain = (() => {
|
|
50
|
+
if (!types.EIP712Domain) return {}
|
|
51
|
+
if (!domain_) return {}
|
|
52
|
+
return normalizeData(types.EIP712Domain, domain_)
|
|
53
|
+
})()
|
|
54
|
+
|
|
55
|
+
const message = (() => {
|
|
56
|
+
if (primaryType === 'EIP712Domain') return undefined
|
|
57
|
+
return normalizeData(types[primaryType], message_)
|
|
58
|
+
})()
|
|
59
|
+
|
|
60
|
+
console.log(message)
|
|
61
|
+
|
|
62
|
+
return stringify({ domain, message, primaryType, types })
|
|
63
|
+
}
|
|
17
64
|
|
|
18
65
|
export type ValidateTypedDataErrorType =
|
|
19
66
|
| HashDomainErrorType
|
|
@@ -72,11 +119,8 @@ export function validateTypedData<
|
|
|
72
119
|
// Validate domain types.
|
|
73
120
|
if (types.EIP712Domain && domain) validateData(types.EIP712Domain, domain)
|
|
74
121
|
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
const type = types[primaryType]
|
|
78
|
-
validateData(type, message)
|
|
79
|
-
}
|
|
122
|
+
// Validate message types.
|
|
123
|
+
if (primaryType !== 'EIP712Domain') validateData(types[primaryType], message)
|
|
80
124
|
}
|
|
81
125
|
|
|
82
126
|
export type GetTypesForEIP712DomainErrorType = ErrorType
|