viem 2.37.0-canary-20250902001118 → 2.37.1
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 +7 -1
- package/_cjs/account-abstraction/utils/userOperation/toUserOperation.js +2 -2
- package/_cjs/account-abstraction/utils/userOperation/toUserOperation.js.map +1 -1
- package/_cjs/actions/public/verifyHash.js +23 -17
- package/_cjs/actions/public/verifyHash.js.map +1 -1
- package/_cjs/errors/version.js +1 -1
- package/_cjs/errors/version.js.map +1 -1
- package/_cjs/utils/signature/isErc8010Signature.js +2 -2
- package/_cjs/utils/signature/isErc8010Signature.js.map +1 -1
- package/_cjs/utils/signature/parseErc8010Signature.js +2 -2
- package/_cjs/utils/signature/parseErc8010Signature.js.map +1 -1
- package/_cjs/utils/signature/serializeErc8010Signature.js +2 -2
- package/_cjs/utils/signature/serializeErc8010Signature.js.map +1 -1
- package/_esm/account-abstraction/utils/userOperation/toUserOperation.js +1 -1
- package/_esm/account-abstraction/utils/userOperation/toUserOperation.js.map +1 -1
- package/_esm/actions/public/verifyHash.js +20 -14
- package/_esm/actions/public/verifyHash.js.map +1 -1
- package/_esm/errors/version.js +1 -1
- package/_esm/errors/version.js.map +1 -1
- package/_esm/utils/signature/isErc8010Signature.js +1 -1
- package/_esm/utils/signature/isErc8010Signature.js.map +1 -1
- package/_esm/utils/signature/parseErc8010Signature.js +1 -1
- package/_esm/utils/signature/parseErc8010Signature.js.map +1 -1
- package/_esm/utils/signature/serializeErc8010Signature.js +1 -1
- package/_esm/utils/signature/serializeErc8010Signature.js.map +1 -1
- package/_types/account-abstraction/utils/userOperation/toUserOperation.d.ts +1 -1
- package/_types/account-abstraction/utils/userOperation/toUserOperation.d.ts.map +1 -1
- package/_types/actions/public/verifyHash.d.ts.map +1 -1
- package/_types/errors/version.d.ts +1 -1
- package/_types/errors/version.d.ts.map +1 -1
- package/account-abstraction/utils/userOperation/toUserOperation.ts +1 -1
- package/actions/public/verifyHash.ts +21 -14
- package/errors/version.ts +1 -1
- package/package.json +1 -1
- package/utils/signature/isErc8010Signature.ts +1 -1
- package/utils/signature/parseErc8010Signature.ts +1 -1
- package/utils/signature/serializeErc8010Signature.ts +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,6 +1,12 @@
|
|
|
1
1
|
# viem
|
|
2
2
|
|
|
3
|
-
## 2.37.
|
|
3
|
+
## 2.37.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`f3b2d7352d352be06e87d146ab6ac3008a21bca3`](https://github.com/wevm/viem/commit/f3b2d7352d352be06e87d146ab6ac3008a21bca3) Thanks [@jxom](https://github.com/jxom)! - Prefer named `ox` imports.
|
|
8
|
+
|
|
9
|
+
## 2.37.0
|
|
4
10
|
|
|
5
11
|
### Minor Changes
|
|
6
12
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.toUserOperation = void 0;
|
|
4
|
-
const
|
|
5
|
-
exports.toUserOperation = UserOperation.from;
|
|
4
|
+
const erc4337_1 = require("ox/erc4337");
|
|
5
|
+
exports.toUserOperation = erc4337_1.UserOperation.from;
|
|
6
6
|
//# sourceMappingURL=toUserOperation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toUserOperation.js","sourceRoot":"","sources":["../../../../account-abstraction/utils/userOperation/toUserOperation.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"toUserOperation.js","sourceRoot":"","sources":["../../../../account-abstraction/utils/userOperation/toUserOperation.ts"],"names":[],"mappings":";;;AAAA,wCAA0C;AAE7B,QAAA,eAAe,GAAG,uBAAa,CAAC,IAAI,CAAA"}
|
|
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.verifyHash = verifyHash;
|
|
4
4
|
exports.verifyErc8010 = verifyErc8010;
|
|
5
5
|
exports.verifyErc1271 = verifyErc1271;
|
|
6
|
-
const
|
|
7
|
-
const
|
|
6
|
+
const erc6492_1 = require("ox/erc6492");
|
|
7
|
+
const erc8010_1 = require("ox/erc8010");
|
|
8
8
|
const abis_js_1 = require("../../constants/abis.js");
|
|
9
9
|
const contracts_js_1 = require("../../constants/contracts.js");
|
|
10
10
|
const contract_js_1 = require("../../errors/contract.js");
|
|
@@ -12,6 +12,7 @@ const encodeDeployData_js_1 = require("../../utils/abi/encodeDeployData.js");
|
|
|
12
12
|
const encodeFunctionData_js_1 = require("../../utils/abi/encodeFunctionData.js");
|
|
13
13
|
const getAddress_js_1 = require("../../utils/address/getAddress.js");
|
|
14
14
|
const isAddressEqual_js_1 = require("../../utils/address/isAddressEqual.js");
|
|
15
|
+
const verifyAuthorization_js_1 = require("../../utils/authorization/verifyAuthorization.js");
|
|
15
16
|
const concat_js_1 = require("../../utils/data/concat.js");
|
|
16
17
|
const isHex_js_1 = require("../../utils/data/isHex.js");
|
|
17
18
|
const fromHex_js_1 = require("../../utils/encoding/fromHex.js");
|
|
@@ -35,7 +36,7 @@ async function verifyHash(client, parameters) {
|
|
|
35
36
|
return (0, toHex_js_1.bytesToHex)(signature);
|
|
36
37
|
})();
|
|
37
38
|
try {
|
|
38
|
-
if (SignatureErc8010.validate(signature))
|
|
39
|
+
if (erc8010_1.SignatureErc8010.validate(signature))
|
|
39
40
|
return await verifyErc8010(client, {
|
|
40
41
|
...parameters,
|
|
41
42
|
multicallAddress,
|
|
@@ -62,13 +63,13 @@ async function verifyHash(client, parameters) {
|
|
|
62
63
|
}
|
|
63
64
|
async function verifyErc8010(client, parameters) {
|
|
64
65
|
const { address, blockNumber, blockTag, hash, multicallAddress } = parameters;
|
|
65
|
-
const { authorization, data: initData, signature, to, } = SignatureErc8010.unwrap(parameters.signature);
|
|
66
|
+
const { authorization: authorization_ox, data: initData, signature, to, } = erc8010_1.SignatureErc8010.unwrap(parameters.signature);
|
|
66
67
|
const code = await (0, getCode_js_1.getCode)(client, {
|
|
67
68
|
address,
|
|
68
69
|
blockNumber,
|
|
69
70
|
blockTag,
|
|
70
71
|
});
|
|
71
|
-
if (code === (0, concat_js_1.concatHex)(['0xef0100',
|
|
72
|
+
if (code === (0, concat_js_1.concatHex)(['0xef0100', authorization_ox.address]))
|
|
72
73
|
return await verifyErc1271(client, {
|
|
73
74
|
address,
|
|
74
75
|
blockNumber,
|
|
@@ -76,20 +77,25 @@ async function verifyErc8010(client, parameters) {
|
|
|
76
77
|
hash,
|
|
77
78
|
signature,
|
|
78
79
|
});
|
|
80
|
+
const authorization = {
|
|
81
|
+
address: authorization_ox.address,
|
|
82
|
+
chainId: Number(authorization_ox.chainId),
|
|
83
|
+
nonce: Number(authorization_ox.nonce),
|
|
84
|
+
r: (0, toHex_js_1.numberToHex)(authorization_ox.r, { size: 32 }),
|
|
85
|
+
s: (0, toHex_js_1.numberToHex)(authorization_ox.s, { size: 32 }),
|
|
86
|
+
yParity: authorization_ox.yParity,
|
|
87
|
+
};
|
|
88
|
+
const valid = await (0, verifyAuthorization_js_1.verifyAuthorization)({
|
|
89
|
+
address,
|
|
90
|
+
authorization,
|
|
91
|
+
});
|
|
92
|
+
if (!valid)
|
|
93
|
+
throw new VerificationError();
|
|
79
94
|
const results = await (0, getAction_js_1.getAction)(client, readContract_js_1.readContract, 'readContract')({
|
|
80
95
|
...(multicallAddress
|
|
81
96
|
? { address: multicallAddress }
|
|
82
97
|
: { code: contracts_js_1.multicall3Bytecode }),
|
|
83
|
-
authorizationList: [
|
|
84
|
-
{
|
|
85
|
-
address: authorization.address,
|
|
86
|
-
chainId: Number(authorization.chainId),
|
|
87
|
-
nonce: Number(authorization.nonce),
|
|
88
|
-
r: (0, toHex_js_1.numberToHex)(authorization.r, { size: 32 }),
|
|
89
|
-
s: (0, toHex_js_1.numberToHex)(authorization.s, { size: 32 }),
|
|
90
|
-
yParity: authorization.yParity,
|
|
91
|
-
},
|
|
92
|
-
],
|
|
98
|
+
authorizationList: [authorization],
|
|
93
99
|
abi: abis_js_1.multicall3Abi,
|
|
94
100
|
blockNumber,
|
|
95
101
|
blockTag: 'pending',
|
|
@@ -127,9 +133,9 @@ async function verifyErc6492(client, parameters) {
|
|
|
127
133
|
const wrappedSignature = await (async () => {
|
|
128
134
|
if (!factory && !factoryData)
|
|
129
135
|
return signature;
|
|
130
|
-
if (SignatureErc6492.validate(signature))
|
|
136
|
+
if (erc6492_1.SignatureErc6492.validate(signature))
|
|
131
137
|
return signature;
|
|
132
|
-
return SignatureErc6492.wrap({
|
|
138
|
+
return erc6492_1.SignatureErc6492.wrap({
|
|
133
139
|
data: factoryData,
|
|
134
140
|
signature,
|
|
135
141
|
to: factory,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verifyHash.js","sourceRoot":"","sources":["../../../actions/public/verifyHash.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"verifyHash.js","sourceRoot":"","sources":["../../../actions/public/verifyHash.ts"],"names":[],"mappings":"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"}
|
package/_cjs/errors/version.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../errors/version.ts"],"names":[],"mappings":";;;AAAa,QAAA,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../errors/version.ts"],"names":[],"mappings":";;;AAAa,QAAA,OAAO,GAAG,QAAQ,CAAA"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.isErc8010Signature = isErc8010Signature;
|
|
4
|
-
const
|
|
4
|
+
const erc8010_1 = require("ox/erc8010");
|
|
5
5
|
function isErc8010Signature(signature) {
|
|
6
|
-
return SignatureErc8010.validate(signature);
|
|
6
|
+
return erc8010_1.SignatureErc8010.validate(signature);
|
|
7
7
|
}
|
|
8
8
|
//# sourceMappingURL=isErc8010Signature.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isErc8010Signature.js","sourceRoot":"","sources":["../../../utils/signature/isErc8010Signature.ts"],"names":[],"mappings":";;AASA,gDAIC;AAbD,
|
|
1
|
+
{"version":3,"file":"isErc8010Signature.js","sourceRoot":"","sources":["../../../utils/signature/isErc8010Signature.ts"],"names":[],"mappings":";;AASA,gDAIC;AAbD,wCAA6C;AAS7C,SAAgB,kBAAkB,CAChC,SAAuC;IAEvC,OAAO,0BAAgB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;AAC7C,CAAC"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.parseErc8010Signature = parseErc8010Signature;
|
|
4
|
-
const
|
|
4
|
+
const erc8010_1 = require("ox/erc8010");
|
|
5
5
|
const toHex_js_1 = require("../encoding/toHex.js");
|
|
6
6
|
const isErc8010Signature_js_1 = require("./isErc8010Signature.js");
|
|
7
7
|
function parseErc8010Signature(signature) {
|
|
8
8
|
if (!(0, isErc8010Signature_js_1.isErc8010Signature)(signature))
|
|
9
9
|
return { signature };
|
|
10
|
-
const { authorization: authorization_ox, to, ...rest } = SignatureErc8010.unwrap(signature);
|
|
10
|
+
const { authorization: authorization_ox, to, ...rest } = erc8010_1.SignatureErc8010.unwrap(signature);
|
|
11
11
|
return {
|
|
12
12
|
authorization: {
|
|
13
13
|
address: authorization_ox.address,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseErc8010Signature.js","sourceRoot":"","sources":["../../../utils/signature/parseErc8010Signature.ts"],"names":[],"mappings":";;AA4CA,sDAsBC;AAjED,
|
|
1
|
+
{"version":3,"file":"parseErc8010Signature.js","sourceRoot":"","sources":["../../../utils/signature/parseErc8010Signature.ts"],"names":[],"mappings":";;AA4CA,sDAsBC;AAjED,wCAA6C;AAK7C,mDAAkD;AAClD,mEAGgC;AAkChC,SAAgB,qBAAqB,CACnC,SAA0C;IAE1C,IAAI,CAAC,IAAA,0CAAkB,EAAC,SAAS,CAAC;QAAE,OAAO,EAAE,SAAS,EAAE,CAAA;IAExD,MAAM,EACJ,aAAa,EAAE,gBAAgB,EAC/B,EAAE,EACF,GAAG,IAAI,EACR,GAAG,0BAAgB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;IACtC,OAAO;QACL,aAAa,EAAE;YACb,OAAO,EAAE,gBAAgB,CAAC,OAAO;YACjC,OAAO,EAAE,gBAAgB,CAAC,OAAO;YACjC,KAAK,EAAE,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC;YACrC,CAAC,EAAE,IAAA,sBAAW,EAAC,gBAAgB,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;YAChD,CAAC,EAAE,IAAA,sBAAW,EAAC,gBAAgB,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;YAChD,OAAO,EAAE,gBAAgB,CAAC,OAAO;SAClC;QACD,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9B,GAAG,IAAI;KACR,CAAA;AACH,CAAC"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.serializeErc8010Signature = serializeErc8010Signature;
|
|
4
|
-
const
|
|
4
|
+
const erc8010_1 = require("ox/erc8010");
|
|
5
5
|
const toBytes_js_1 = require("../encoding/toBytes.js");
|
|
6
6
|
function serializeErc8010Signature(parameters) {
|
|
7
7
|
const { address, data, signature, to = 'hex' } = parameters;
|
|
8
|
-
const signature_ = SignatureErc8010.wrap({
|
|
8
|
+
const signature_ = erc8010_1.SignatureErc8010.wrap({
|
|
9
9
|
authorization: {
|
|
10
10
|
address: parameters.authorization.address,
|
|
11
11
|
chainId: parameters.authorization.chainId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serializeErc8010Signature.js","sourceRoot":"","sources":["../../../utils/signature/serializeErc8010Signature.ts"],"names":[],"mappings":";;AAiCA,8DAmBC;AAnDD,
|
|
1
|
+
{"version":3,"file":"serializeErc8010Signature.js","sourceRoot":"","sources":["../../../utils/signature/serializeErc8010Signature.ts"],"names":[],"mappings":";;AAiCA,8DAmBC;AAnDD,wCAA6C;AAI7C,uDAAmD;AA4BnD,SAAgB,yBAAyB,CACvC,UAAmD;IAEnD,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,GAAG,KAAK,EAAE,GAAG,UAAU,CAAA;IAC3D,MAAM,UAAU,GAAG,0BAAgB,CAAC,IAAI,CAAC;QACvC,aAAa,EAAE;YACb,OAAO,EAAE,UAAU,CAAC,aAAa,CAAC,OAAO;YACzC,OAAO,EAAE,UAAU,CAAC,aAAa,CAAC,OAAO;YACzC,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC;YAC7C,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC;YACrC,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC;YACrC,OAAO,EAAE,UAAU,CAAC,aAAa,CAAC,OAAQ;SAC3C;QACD,IAAI;QACJ,SAAS;QACT,EAAE,EAAE,OAAO;KACZ,CAAC,CAAA;IACF,IAAI,EAAE,KAAK,KAAK;QAAE,OAAO,UAAqD,CAAA;IAC9E,OAAO,IAAA,uBAAU,EAAC,UAAU,CAA4C,CAAA;AAC1E,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toUserOperation.js","sourceRoot":"","sources":["../../../../account-abstraction/utils/userOperation/toUserOperation.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"toUserOperation.js","sourceRoot":"","sources":["../../../../account-abstraction/utils/userOperation/toUserOperation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAE1C,MAAM,CAAC,MAAM,eAAe,GAAG,aAAa,CAAC,IAAI,CAAA"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import
|
|
2
|
-
import
|
|
1
|
+
import { SignatureErc6492 } from 'ox/erc6492';
|
|
2
|
+
import { SignatureErc8010 } from 'ox/erc8010';
|
|
3
3
|
import { erc1271Abi, erc6492SignatureValidatorAbi, multicall3Abi, } from '../../constants/abis.js';
|
|
4
4
|
import { erc6492SignatureValidatorByteCode, multicall3Bytecode, } from '../../constants/contracts.js';
|
|
5
5
|
import { CallExecutionError, ContractFunctionExecutionError, } from '../../errors/contract.js';
|
|
@@ -7,6 +7,7 @@ import { encodeDeployData, } from '../../utils/abi/encodeDeployData.js';
|
|
|
7
7
|
import { encodeFunctionData, } from '../../utils/abi/encodeFunctionData.js';
|
|
8
8
|
import { getAddress, } from '../../utils/address/getAddress.js';
|
|
9
9
|
import { isAddressEqual, } from '../../utils/address/isAddressEqual.js';
|
|
10
|
+
import { verifyAuthorization } from '../../utils/authorization/verifyAuthorization.js';
|
|
10
11
|
import { concatHex } from '../../utils/data/concat.js';
|
|
11
12
|
import { isHex } from '../../utils/data/isHex.js';
|
|
12
13
|
import { hexToBool } from '../../utils/encoding/fromHex.js';
|
|
@@ -69,7 +70,7 @@ export async function verifyHash(client, parameters) {
|
|
|
69
70
|
/** @internal */
|
|
70
71
|
export async function verifyErc8010(client, parameters) {
|
|
71
72
|
const { address, blockNumber, blockTag, hash, multicallAddress } = parameters;
|
|
72
|
-
const { authorization, data: initData, signature, to, } = SignatureErc8010.unwrap(parameters.signature);
|
|
73
|
+
const { authorization: authorization_ox, data: initData, signature, to, } = SignatureErc8010.unwrap(parameters.signature);
|
|
73
74
|
// Check if already delegated
|
|
74
75
|
const code = await getCode(client, {
|
|
75
76
|
address,
|
|
@@ -77,7 +78,7 @@ export async function verifyErc8010(client, parameters) {
|
|
|
77
78
|
blockTag,
|
|
78
79
|
});
|
|
79
80
|
// If already delegated, perform standard ERC-1271 verification.
|
|
80
|
-
if (code === concatHex(['0xef0100',
|
|
81
|
+
if (code === concatHex(['0xef0100', authorization_ox.address]))
|
|
81
82
|
return await verifyErc1271(client, {
|
|
82
83
|
address,
|
|
83
84
|
blockNumber,
|
|
@@ -85,21 +86,26 @@ export async function verifyErc8010(client, parameters) {
|
|
|
85
86
|
hash,
|
|
86
87
|
signature,
|
|
87
88
|
});
|
|
89
|
+
const authorization = {
|
|
90
|
+
address: authorization_ox.address,
|
|
91
|
+
chainId: Number(authorization_ox.chainId),
|
|
92
|
+
nonce: Number(authorization_ox.nonce),
|
|
93
|
+
r: numberToHex(authorization_ox.r, { size: 32 }),
|
|
94
|
+
s: numberToHex(authorization_ox.s, { size: 32 }),
|
|
95
|
+
yParity: authorization_ox.yParity,
|
|
96
|
+
};
|
|
97
|
+
const valid = await verifyAuthorization({
|
|
98
|
+
address,
|
|
99
|
+
authorization,
|
|
100
|
+
});
|
|
101
|
+
if (!valid)
|
|
102
|
+
throw new VerificationError();
|
|
88
103
|
// Deployless verification.
|
|
89
104
|
const results = await getAction(client, readContract, 'readContract')({
|
|
90
105
|
...(multicallAddress
|
|
91
106
|
? { address: multicallAddress }
|
|
92
107
|
: { code: multicall3Bytecode }),
|
|
93
|
-
authorizationList: [
|
|
94
|
-
{
|
|
95
|
-
address: authorization.address,
|
|
96
|
-
chainId: Number(authorization.chainId),
|
|
97
|
-
nonce: Number(authorization.nonce),
|
|
98
|
-
r: numberToHex(authorization.r, { size: 32 }),
|
|
99
|
-
s: numberToHex(authorization.s, { size: 32 }),
|
|
100
|
-
yParity: authorization.yParity,
|
|
101
|
-
},
|
|
102
|
-
],
|
|
108
|
+
authorizationList: [authorization],
|
|
103
109
|
abi: multicall3Abi,
|
|
104
110
|
blockNumber,
|
|
105
111
|
blockTag: 'pending',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verifyHash.js","sourceRoot":"","sources":["../../../actions/public/verifyHash.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"verifyHash.js","sourceRoot":"","sources":["../../../actions/public/verifyHash.ts"],"names":[],"mappings":"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"}
|
package/_esm/errors/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const version = '2.37.
|
|
1
|
+
export const version = '2.37.1';
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../errors/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../errors/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,QAAQ,CAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { SignatureErc8010 } from 'ox/erc8010';
|
|
2
2
|
/** Whether or not the signature is an ERC-8010 formatted signature. */
|
|
3
3
|
export function isErc8010Signature(signature) {
|
|
4
4
|
return SignatureErc8010.validate(signature);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isErc8010Signature.js","sourceRoot":"","sources":["../../../utils/signature/isErc8010Signature.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"isErc8010Signature.js","sourceRoot":"","sources":["../../../utils/signature/isErc8010Signature.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAQ7C,uEAAuE;AACvE,MAAM,UAAU,kBAAkB,CAChC,SAAuC;IAEvC,OAAO,gBAAgB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;AAC7C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseErc8010Signature.js","sourceRoot":"","sources":["../../../utils/signature/parseErc8010Signature.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"parseErc8010Signature.js","sourceRoot":"","sources":["../../../utils/signature/parseErc8010Signature.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAK7C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAEL,kBAAkB,GACnB,MAAM,yBAAyB,CAAA;AA2BhC;;;;;;GAMG;AACH,MAAM,UAAU,qBAAqB,CACnC,SAA0C;IAE1C,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC;QAAE,OAAO,EAAE,SAAS,EAAE,CAAA;IAExD,MAAM,EACJ,aAAa,EAAE,gBAAgB,EAC/B,EAAE,EACF,GAAG,IAAI,EACR,GAAG,gBAAgB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;IACtC,OAAO;QACL,aAAa,EAAE;YACb,OAAO,EAAE,gBAAgB,CAAC,OAAO;YACjC,OAAO,EAAE,gBAAgB,CAAC,OAAO;YACjC,KAAK,EAAE,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC;YACrC,CAAC,EAAE,WAAW,CAAC,gBAAgB,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;YAChD,CAAC,EAAE,WAAW,CAAC,gBAAgB,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;YAChD,OAAO,EAAE,gBAAgB,CAAC,OAAO;SAClC;QACD,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9B,GAAG,IAAI;KACR,CAAA;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serializeErc8010Signature.js","sourceRoot":"","sources":["../../../utils/signature/serializeErc8010Signature.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"serializeErc8010Signature.js","sourceRoot":"","sources":["../../../utils/signature/serializeErc8010Signature.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAI7C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAsBnD;;;;;GAKG;AACH,MAAM,UAAU,yBAAyB,CACvC,UAAmD;IAEnD,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,GAAG,KAAK,EAAE,GAAG,UAAU,CAAA;IAC3D,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CAAC;QACvC,aAAa,EAAE;YACb,OAAO,EAAE,UAAU,CAAC,aAAa,CAAC,OAAO;YACzC,OAAO,EAAE,UAAU,CAAC,aAAa,CAAC,OAAO;YACzC,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC;YAC7C,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC;YACrC,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC;YACrC,OAAO,EAAE,UAAU,CAAC,aAAa,CAAC,OAAQ;SAC3C;QACD,IAAI;QACJ,SAAS;QACT,EAAE,EAAE,OAAO;KACZ,CAAC,CAAA;IACF,IAAI,EAAE,KAAK,KAAK;QAAE,OAAO,UAAqD,CAAA;IAC9E,OAAO,UAAU,CAAC,UAAU,CAA4C,CAAA;AAC1E,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toUserOperation.d.ts","sourceRoot":"","sources":["../../../../account-abstraction/utils/userOperation/toUserOperation.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"toUserOperation.d.ts","sourceRoot":"","sources":["../../../../account-abstraction/utils/userOperation/toUserOperation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAE1C,eAAO,MAAM,eAAe,2BAAqB,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verifyHash.d.ts","sourceRoot":"","sources":["../../../actions/public/verifyHash.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAItC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6CAA6C,CAAA;AAc5E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACtE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AACpE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EACL,KAAK,yBAAyB,EAE/B,MAAM,qCAAqC,CAAA;AAC5C,OAAO,EACL,KAAK,2BAA2B,EAEjC,MAAM,uCAAuC,CAAA;AAC9C,OAAO,EACL,KAAK,mBAAmB,EAEzB,MAAM,mCAAmC,CAAA;AAC1C,OAAO,EACL,KAAK,uBAAuB,EAE7B,MAAM,uCAAuC,CAAA;
|
|
1
|
+
{"version":3,"file":"verifyHash.d.ts","sourceRoot":"","sources":["../../../actions/public/verifyHash.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "2.37.
|
|
1
|
+
export declare const version = "2.37.1";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../errors/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,
|
|
1
|
+
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../errors/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,WAAW,CAAA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { Address } from 'abitype'
|
|
2
|
-
import
|
|
3
|
-
import
|
|
2
|
+
import { SignatureErc6492 } from 'ox/erc6492'
|
|
3
|
+
import { SignatureErc8010 } from 'ox/erc8010'
|
|
4
4
|
|
|
5
5
|
import type { Client } from '../../clients/createClient.js'
|
|
6
6
|
import type { Transport } from '../../clients/transports/createTransport.js'
|
|
@@ -38,6 +38,7 @@ import {
|
|
|
38
38
|
type IsAddressEqualErrorType,
|
|
39
39
|
isAddressEqual,
|
|
40
40
|
} from '../../utils/address/isAddressEqual.js'
|
|
41
|
+
import { verifyAuthorization } from '../../utils/authorization/verifyAuthorization.js'
|
|
41
42
|
import { type ConcatHexErrorType, concatHex } from '../../utils/data/concat.js'
|
|
42
43
|
import { type IsHexErrorType, isHex } from '../../utils/data/isHex.js'
|
|
43
44
|
import { hexToBool } from '../../utils/encoding/fromHex.js'
|
|
@@ -167,7 +168,7 @@ export async function verifyErc8010(
|
|
|
167
168
|
const { address, blockNumber, blockTag, hash, multicallAddress } = parameters
|
|
168
169
|
|
|
169
170
|
const {
|
|
170
|
-
authorization,
|
|
171
|
+
authorization: authorization_ox,
|
|
171
172
|
data: initData,
|
|
172
173
|
signature,
|
|
173
174
|
to,
|
|
@@ -181,7 +182,7 @@ export async function verifyErc8010(
|
|
|
181
182
|
} as never)
|
|
182
183
|
|
|
183
184
|
// If already delegated, perform standard ERC-1271 verification.
|
|
184
|
-
if (code === concatHex(['0xef0100',
|
|
185
|
+
if (code === concatHex(['0xef0100', authorization_ox.address]))
|
|
185
186
|
return await verifyErc1271(client, {
|
|
186
187
|
address,
|
|
187
188
|
blockNumber,
|
|
@@ -190,6 +191,21 @@ export async function verifyErc8010(
|
|
|
190
191
|
signature,
|
|
191
192
|
})
|
|
192
193
|
|
|
194
|
+
const authorization = {
|
|
195
|
+
address: authorization_ox.address,
|
|
196
|
+
chainId: Number(authorization_ox.chainId),
|
|
197
|
+
nonce: Number(authorization_ox.nonce),
|
|
198
|
+
r: numberToHex(authorization_ox.r, { size: 32 }),
|
|
199
|
+
s: numberToHex(authorization_ox.s, { size: 32 }),
|
|
200
|
+
yParity: authorization_ox.yParity,
|
|
201
|
+
} as const
|
|
202
|
+
|
|
203
|
+
const valid = await verifyAuthorization({
|
|
204
|
+
address,
|
|
205
|
+
authorization,
|
|
206
|
+
})
|
|
207
|
+
if (!valid) throw new VerificationError()
|
|
208
|
+
|
|
193
209
|
// Deployless verification.
|
|
194
210
|
const results = await getAction(
|
|
195
211
|
client,
|
|
@@ -199,16 +215,7 @@ export async function verifyErc8010(
|
|
|
199
215
|
...(multicallAddress
|
|
200
216
|
? { address: multicallAddress }
|
|
201
217
|
: { code: multicall3Bytecode }),
|
|
202
|
-
authorizationList: [
|
|
203
|
-
{
|
|
204
|
-
address: authorization.address,
|
|
205
|
-
chainId: Number(authorization.chainId),
|
|
206
|
-
nonce: Number(authorization.nonce),
|
|
207
|
-
r: numberToHex(authorization.r, { size: 32 }),
|
|
208
|
-
s: numberToHex(authorization.s, { size: 32 }),
|
|
209
|
-
yParity: authorization.yParity,
|
|
210
|
-
},
|
|
211
|
-
],
|
|
218
|
+
authorizationList: [authorization],
|
|
212
219
|
abi: multicall3Abi,
|
|
213
220
|
blockNumber,
|
|
214
221
|
blockTag: 'pending',
|
package/errors/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const version = '2.37.
|
|
1
|
+
export const version = '2.37.1'
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Address } from 'abitype'
|
|
2
|
-
import
|
|
2
|
+
import { SignatureErc8010 } from 'ox/erc8010'
|
|
3
3
|
import type { ErrorType } from '../../errors/utils.js'
|
|
4
4
|
import type { SignedAuthorization } from '../../types/authorization.js'
|
|
5
5
|
import type { Hex } from '../../types/misc.js'
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Address } from 'abitype'
|
|
2
|
-
import
|
|
2
|
+
import { SignatureErc8010 } from 'ox/erc8010'
|
|
3
3
|
import type { ErrorType } from '../../errors/utils.js'
|
|
4
4
|
import type { SignedAuthorization } from '../../types/authorization.js'
|
|
5
5
|
import type { ByteArray, Hex } from '../../types/misc.js'
|