permissionless 0.2.55 → 0.2.56
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 +6 -0
- package/_cjs/accounts/kernel/constants.js +2 -1
- package/_cjs/accounts/kernel/constants.js.map +1 -1
- package/_cjs/accounts/kernel/toKernelSmartAccount.js +21 -11
- package/_cjs/accounts/kernel/toKernelSmartAccount.js.map +1 -1
- package/_cjs/accounts/kernel/utils/signMessage.js +16 -1
- package/_cjs/accounts/kernel/utils/signMessage.js.map +1 -1
- package/_cjs/accounts/kernel/utils/signTypedData.js +18 -2
- package/_cjs/accounts/kernel/utils/signTypedData.js.map +1 -1
- package/_esm/accounts/kernel/constants.js +2 -1
- package/_esm/accounts/kernel/constants.js.map +1 -1
- package/_esm/accounts/kernel/toKernelSmartAccount.js +21 -11
- package/_esm/accounts/kernel/toKernelSmartAccount.js.map +1 -1
- package/_esm/accounts/kernel/utils/signMessage.js +16 -1
- package/_esm/accounts/kernel/utils/signMessage.js.map +1 -1
- package/_esm/accounts/kernel/utils/signTypedData.js +18 -2
- package/_esm/accounts/kernel/utils/signTypedData.js.map +1 -1
- package/_types/accounts/kernel/constants.d.ts +1 -0
- package/_types/accounts/kernel/constants.d.ts.map +1 -1
- package/_types/accounts/kernel/toKernelSmartAccount.d.ts +1 -1
- package/_types/accounts/kernel/toKernelSmartAccount.d.ts.map +1 -1
- package/_types/accounts/kernel/utils/signMessage.d.ts +2 -1
- package/_types/accounts/kernel/utils/signMessage.d.ts.map +1 -1
- package/_types/accounts/kernel/utils/signTypedData.d.ts +1 -0
- package/_types/accounts/kernel/utils/signTypedData.d.ts.map +1 -1
- package/accounts/kernel/constants.ts +2 -1
- package/accounts/kernel/toKernelSmartAccount.ts +30 -11
- package/accounts/kernel/utils/signMessage.ts +19 -1
- package/accounts/kernel/utils/signTypedData.ts +20 -1
- package/actions/smartAccount/signMessage.test.ts +27 -2
- package/actions/smartAccount/signTypedData.test.ts +28 -2
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../accounts/kernel/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,qBAAqB,GAC9B,sIAAsI,CAAA;AAC7H,QAAA,mBAAmB,GAAG,YAAY,CAAA;AAElC,QAAA,cAAc,GAAG;IAC1B,IAAI,EAAE,MAAM;IACZ,SAAS,EAAE,MAAM;IACjB,UAAU,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../accounts/kernel/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,qBAAqB,GAC9B,sIAAsI,CAAA;AAC7H,QAAA,mBAAmB,GAAG,YAAY,CAAA;AAElC,QAAA,cAAc,GAAG;IAC1B,IAAI,EAAE,MAAM;IACZ,SAAS,EAAE,MAAM;IACjB,UAAU,EAAE,MAAM;IAClB,OAAO,EAAE,MAAM;CACT,CAAA;AACV,IAAY,cAGX;AAHD,WAAY,cAAc;IACtB,kCAAgB,CAAA;IAChB,iCAAe,CAAA;AACnB,CAAC,EAHW,cAAc,8BAAd,cAAc,QAGzB"}
|
|
@@ -124,8 +124,11 @@ const getDefaultAddresses = ({ validatorAddress: _validatorAddress, accountLogic
|
|
|
124
124
|
metaFactoryAddress
|
|
125
125
|
};
|
|
126
126
|
};
|
|
127
|
-
const getEcdsaRootIdentifierForKernelV3 = (validatorAddress) => {
|
|
128
|
-
return (0, viem_1.concatHex)([
|
|
127
|
+
const getEcdsaRootIdentifierForKernelV3 = (validatorAddress, eip7702 = false) => {
|
|
128
|
+
return (0, viem_1.concatHex)([
|
|
129
|
+
eip7702 ? constants_js_1.VALIDATOR_TYPE.EIP7702 : constants_js_1.VALIDATOR_TYPE.VALIDATOR,
|
|
130
|
+
eip7702 ? "0x" : validatorAddress
|
|
131
|
+
]);
|
|
129
132
|
};
|
|
130
133
|
exports.getEcdsaRootIdentifierForKernelV3 = getEcdsaRootIdentifierForKernelV3;
|
|
131
134
|
const getInitializationData = ({ entryPoint: { version: entryPointVersion }, kernelVersion, validatorData, validatorAddress }) => {
|
|
@@ -383,40 +386,46 @@ async function toKernelSmartAccount(parameters) {
|
|
|
383
386
|
return this.signMessage({ message: hash });
|
|
384
387
|
},
|
|
385
388
|
async signMessage({ message }) {
|
|
386
|
-
if (
|
|
387
|
-
|
|
389
|
+
if ("isDeployed" in this &&
|
|
390
|
+
!(await this.isDeployed()) &&
|
|
391
|
+
eip7702) {
|
|
392
|
+
throw new Error("Kernel with EIP-7702 isn't 1271 compliant before delegation.");
|
|
388
393
|
}
|
|
389
394
|
const signature = await (0, signMessage_js_1.signMessage)({
|
|
390
395
|
owner,
|
|
391
396
|
message,
|
|
392
397
|
accountAddress: await this.getAddress(),
|
|
393
398
|
kernelVersion: kernelVersion,
|
|
394
|
-
chainId: await getMemoizedChainId()
|
|
399
|
+
chainId: await getMemoizedChainId(),
|
|
400
|
+
eip7702: eip7702
|
|
395
401
|
});
|
|
396
402
|
if ((0, isKernelV2_js_1.isKernelV2)(kernelVersion)) {
|
|
397
403
|
return signature;
|
|
398
404
|
}
|
|
399
405
|
return (0, viem_1.concatHex)([
|
|
400
|
-
(0, exports.getEcdsaRootIdentifierForKernelV3)(validatorAddress),
|
|
406
|
+
(0, exports.getEcdsaRootIdentifierForKernelV3)(validatorAddress, eip7702),
|
|
401
407
|
signature
|
|
402
408
|
]);
|
|
403
409
|
},
|
|
404
410
|
async signTypedData(typedData) {
|
|
405
|
-
if (
|
|
406
|
-
|
|
411
|
+
if ("isDeployed" in this &&
|
|
412
|
+
!(await this.isDeployed()) &&
|
|
413
|
+
eip7702) {
|
|
414
|
+
throw new Error("Kernel with EIP-7702 isn't 1271 compliant before delegation.");
|
|
407
415
|
}
|
|
408
416
|
const signature = await (0, signTypedData_js_1.signTypedData)({
|
|
409
417
|
owner: owner,
|
|
410
418
|
chainId: await getMemoizedChainId(),
|
|
411
419
|
...typedData,
|
|
412
420
|
accountAddress: await this.getAddress(),
|
|
413
|
-
kernelVersion: kernelVersion
|
|
421
|
+
kernelVersion: kernelVersion,
|
|
422
|
+
eip7702
|
|
414
423
|
});
|
|
415
424
|
if ((0, isKernelV2_js_1.isKernelV2)(kernelVersion)) {
|
|
416
425
|
return signature;
|
|
417
426
|
}
|
|
418
427
|
return (0, viem_1.concatHex)([
|
|
419
|
-
(0, exports.getEcdsaRootIdentifierForKernelV3)(validatorAddress),
|
|
428
|
+
(0, exports.getEcdsaRootIdentifierForKernelV3)(validatorAddress, eip7702),
|
|
420
429
|
signature
|
|
421
430
|
]);
|
|
422
431
|
},
|
|
@@ -438,7 +447,8 @@ async function toKernelSmartAccount(parameters) {
|
|
|
438
447
|
message: { raw: hash },
|
|
439
448
|
chainId,
|
|
440
449
|
accountAddress: await this.getAddress(),
|
|
441
|
-
kernelVersion
|
|
450
|
+
kernelVersion,
|
|
451
|
+
eip7702: false
|
|
442
452
|
})
|
|
443
453
|
: await owner.signMessage({
|
|
444
454
|
message: { raw: hash }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toKernelSmartAccount.js","sourceRoot":"","sources":["../../../accounts/kernel/toKernelSmartAccount.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"toKernelSmartAccount.js","sourceRoot":"","sources":["../../../accounts/kernel/toKernelSmartAccount.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ const ox_1 = require("ox");
|
|
|
5
5
|
const viem_1 = require("viem");
|
|
6
6
|
const isWebAuthnAccount_js_1 = require("./isWebAuthnAccount.js");
|
|
7
7
|
const wrapMessageHash_js_1 = require("./wrapMessageHash.js");
|
|
8
|
-
async function signMessage({ message, owner, accountAddress, kernelVersion: accountVersion, chainId }) {
|
|
8
|
+
async function signMessage({ message, owner, accountAddress, kernelVersion: accountVersion, chainId, eip7702 }) {
|
|
9
9
|
if ((0, isWebAuthnAccount_js_1.isWebAuthnAccount)(owner)) {
|
|
10
10
|
let messageContent;
|
|
11
11
|
if (typeof message === "string") {
|
|
@@ -45,6 +45,21 @@ async function signMessage({ message, owner, accountAddress, kernelVersion: acco
|
|
|
45
45
|
]);
|
|
46
46
|
return encodedSignature;
|
|
47
47
|
}
|
|
48
|
+
if (eip7702) {
|
|
49
|
+
return owner.signTypedData({
|
|
50
|
+
message: { hash: (0, viem_1.hashMessage)(message) },
|
|
51
|
+
primaryType: "Kernel",
|
|
52
|
+
types: {
|
|
53
|
+
Kernel: [{ name: "hash", type: "bytes32" }]
|
|
54
|
+
},
|
|
55
|
+
domain: {
|
|
56
|
+
name: "Kernel",
|
|
57
|
+
version: accountVersion,
|
|
58
|
+
chainId: chainId,
|
|
59
|
+
verifyingContract: accountAddress
|
|
60
|
+
}
|
|
61
|
+
});
|
|
62
|
+
}
|
|
48
63
|
if (accountVersion === "0.2.1" || accountVersion === "0.2.2") {
|
|
49
64
|
return owner.signMessage({
|
|
50
65
|
message
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signMessage.js","sourceRoot":"","sources":["../../../../accounts/kernel/utils/signMessage.ts"],"names":[],"mappings":";;AAiBA,
|
|
1
|
+
{"version":3,"file":"signMessage.js","sourceRoot":"","sources":["../../../../accounts/kernel/utils/signMessage.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ const isWebAuthnAccount_js_1 = require("./isWebAuthnAccount.js");
|
|
|
6
6
|
const signMessage_js_1 = require("./signMessage.js");
|
|
7
7
|
const wrapMessageHash_js_1 = require("./wrapMessageHash.js");
|
|
8
8
|
async function signTypedData(parameters) {
|
|
9
|
-
const { owner, accountAddress, kernelVersion: accountVersion, chainId, ...typedData } = parameters;
|
|
9
|
+
const { owner, accountAddress, kernelVersion: accountVersion, chainId, eip7702, ...typedData } = parameters;
|
|
10
10
|
if ((accountVersion === "0.2.1" || accountVersion === "0.2.2") &&
|
|
11
11
|
!(0, isWebAuthnAccount_js_1.isWebAuthnAccount)(owner)) {
|
|
12
12
|
return owner.signTypedData({
|
|
@@ -27,6 +27,21 @@ async function signTypedData(parameters) {
|
|
|
27
27
|
types
|
|
28
28
|
});
|
|
29
29
|
const typedHash = (0, viem_1.hashTypedData)({ message, primaryType, types, domain });
|
|
30
|
+
if (eip7702 && !(0, isWebAuthnAccount_js_1.isWebAuthnAccount)(owner)) {
|
|
31
|
+
return owner.signTypedData({
|
|
32
|
+
message: { hash: typedHash },
|
|
33
|
+
primaryType: "Kernel",
|
|
34
|
+
types: {
|
|
35
|
+
Kernel: [{ name: "hash", type: "bytes32" }]
|
|
36
|
+
},
|
|
37
|
+
domain: {
|
|
38
|
+
name: "Kernel",
|
|
39
|
+
version: accountVersion,
|
|
40
|
+
chainId: chainId,
|
|
41
|
+
verifyingContract: accountAddress
|
|
42
|
+
}
|
|
43
|
+
});
|
|
44
|
+
}
|
|
30
45
|
const wrappedMessageHash = (0, wrapMessageHash_js_1.wrapMessageHash)(typedHash, {
|
|
31
46
|
kernelVersion: accountVersion,
|
|
32
47
|
accountAddress,
|
|
@@ -38,7 +53,8 @@ async function signTypedData(parameters) {
|
|
|
38
53
|
owner,
|
|
39
54
|
accountAddress,
|
|
40
55
|
kernelVersion: accountVersion,
|
|
41
|
-
chainId
|
|
56
|
+
chainId,
|
|
57
|
+
eip7702: false
|
|
42
58
|
});
|
|
43
59
|
}
|
|
44
60
|
return owner.signMessage({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signTypedData.js","sourceRoot":"","sources":["../../../../accounts/kernel/utils/signTypedData.ts"],"names":[],"mappings":";;AAgBA,
|
|
1
|
+
{"version":3,"file":"signTypedData.js","sourceRoot":"","sources":["../../../../accounts/kernel/utils/signTypedData.ts"],"names":[],"mappings":";;AAgBA,sCAgFC;AAhGD,+BAOa;AAEb,iEAA0D;AAC1D,qDAA8C;AAC9C,6DAG6B;AAEtB,KAAK,UAAU,aAAa,CAC/B,UAIK;IAEL,MAAM,EACF,KAAK,EACL,cAAc,EACd,aAAa,EAAE,cAAc,EAC7B,OAAO,EACP,OAAO,EACP,GAAG,SAAS,EACf,GAAG,UAAU,CAAA;IAEd,IACI,CAAC,cAAc,KAAK,OAAO,IAAI,cAAc,KAAK,OAAO,CAAC;QAC1D,CAAC,IAAA,wCAAiB,EAAC,KAAK,CAAC,EAC3B,CAAC;QACC,OAAO,KAAK,CAAC,aAAa,CAAC;YACvB,GAAG,SAAS;SACf,CAAC,CAAA;IACN,CAAC;IAED,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;IACjE,MAAM,KAAK,GAAG;QACV,YAAY,EAAE,IAAA,8BAAuB,EAAC;YAClC,MAAM,EAAE,MAAM;SACjB,CAAC;QACF,GAAG,MAAM;KACZ,CAAA;IAID,IAAA,wBAAiB,EAAC;QACd,MAAM;QACN,OAAO;QACP,WAAW;QACX,KAAK;KACR,CAAC,CAAA;IAEF,MAAM,SAAS,GAAG,IAAA,oBAAa,EAAC,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;IAExE,IAAI,OAAO,IAAI,CAAC,IAAA,wCAAiB,EAAC,KAAK,CAAC,EAAE,CAAC;QACvC,OAAO,KAAK,CAAC,aAAa,CAAC;YACvB,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YAC5B,WAAW,EAAE,QAAQ;YACrB,KAAK,EAAE;gBACH,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;aAC9C;YACD,MAAM,EAAE;gBACJ,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,cAAc;gBACvB,OAAO,EAAE,OAAO;gBAChB,iBAAiB,EAAE,cAAc;aACpC;SACJ,CAAC,CAAA;IACN,CAAC;IAED,MAAM,kBAAkB,GAAG,IAAA,oCAAe,EAAC,SAAS,EAAE;QAClD,aAAa,EAAE,cAAc;QAC7B,cAAc;QACd,OAAO,EAAE,OAAO;KACnB,CAAC,CAAA;IAEF,IAAI,IAAA,wCAAiB,EAAC,KAAK,CAAC,EAAE,CAAC;QAC3B,OAAO,IAAA,4BAAW,EAAC;YACf,OAAO,EAAE,EAAE,GAAG,EAAE,kBAAkB,EAAE;YACpC,KAAK;YACL,cAAc;YACd,aAAa,EAAE,cAAc;YAC7B,OAAO;YACP,OAAO,EAAE,KAAK;SACjB,CAAC,CAAA;IACN,CAAC;IAED,OAAO,KAAK,CAAC,WAAW,CAAC;QACrB,OAAO,EAAE,EAAE,GAAG,EAAE,kBAAkB,EAAE;KACvC,CAAC,CAAA;AACN,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../accounts/kernel/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,qBAAqB,GAC9B,sIAAsI,CAAA;AAC1I,MAAM,CAAC,MAAM,mBAAmB,GAAG,YAAY,CAAA;AAE/C,MAAM,CAAC,MAAM,cAAc,GAAG;IAC1B,IAAI,EAAE,MAAM;IACZ,SAAS,EAAE,MAAM;IACjB,UAAU,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../accounts/kernel/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,qBAAqB,GAC9B,sIAAsI,CAAA;AAC1I,MAAM,CAAC,MAAM,mBAAmB,GAAG,YAAY,CAAA;AAE/C,MAAM,CAAC,MAAM,cAAc,GAAG;IAC1B,IAAI,EAAE,MAAM;IACZ,SAAS,EAAE,MAAM;IACjB,UAAU,EAAE,MAAM;IAClB,OAAO,EAAE,MAAM;CACT,CAAA;AACV,MAAM,CAAN,IAAY,cAGX;AAHD,WAAY,cAAc;IACtB,kCAAgB,CAAA;IAChB,iCAAe,CAAA;AACnB,CAAC,EAHW,cAAc,KAAd,cAAc,QAGzB"}
|
|
@@ -138,8 +138,11 @@ const getDefaultAddresses = ({ validatorAddress: _validatorAddress, accountLogic
|
|
|
138
138
|
metaFactoryAddress
|
|
139
139
|
};
|
|
140
140
|
};
|
|
141
|
-
export const getEcdsaRootIdentifierForKernelV3 = (validatorAddress) => {
|
|
142
|
-
return concatHex([
|
|
141
|
+
export const getEcdsaRootIdentifierForKernelV3 = (validatorAddress, eip7702 = false) => {
|
|
142
|
+
return concatHex([
|
|
143
|
+
eip7702 ? VALIDATOR_TYPE.EIP7702 : VALIDATOR_TYPE.VALIDATOR,
|
|
144
|
+
eip7702 ? "0x" : validatorAddress
|
|
145
|
+
]);
|
|
143
146
|
};
|
|
144
147
|
/**
|
|
145
148
|
* Get the initialization data for a kernel smart account
|
|
@@ -425,40 +428,46 @@ export async function toKernelSmartAccount(parameters) {
|
|
|
425
428
|
return this.signMessage({ message: hash });
|
|
426
429
|
},
|
|
427
430
|
async signMessage({ message }) {
|
|
428
|
-
if (
|
|
429
|
-
|
|
431
|
+
if ("isDeployed" in this &&
|
|
432
|
+
!(await this.isDeployed()) &&
|
|
433
|
+
eip7702) {
|
|
434
|
+
throw new Error("Kernel with EIP-7702 isn't 1271 compliant before delegation.");
|
|
430
435
|
}
|
|
431
436
|
const signature = await signMessage({
|
|
432
437
|
owner,
|
|
433
438
|
message,
|
|
434
439
|
accountAddress: await this.getAddress(),
|
|
435
440
|
kernelVersion: kernelVersion,
|
|
436
|
-
chainId: await getMemoizedChainId()
|
|
441
|
+
chainId: await getMemoizedChainId(),
|
|
442
|
+
eip7702: eip7702
|
|
437
443
|
});
|
|
438
444
|
if (isKernelV2(kernelVersion)) {
|
|
439
445
|
return signature;
|
|
440
446
|
}
|
|
441
447
|
return concatHex([
|
|
442
|
-
getEcdsaRootIdentifierForKernelV3(validatorAddress),
|
|
448
|
+
getEcdsaRootIdentifierForKernelV3(validatorAddress, eip7702),
|
|
443
449
|
signature
|
|
444
450
|
]);
|
|
445
451
|
},
|
|
446
452
|
async signTypedData(typedData) {
|
|
447
|
-
if (
|
|
448
|
-
|
|
453
|
+
if ("isDeployed" in this &&
|
|
454
|
+
!(await this.isDeployed()) &&
|
|
455
|
+
eip7702) {
|
|
456
|
+
throw new Error("Kernel with EIP-7702 isn't 1271 compliant before delegation.");
|
|
449
457
|
}
|
|
450
458
|
const signature = await signTypedData({
|
|
451
459
|
owner: owner,
|
|
452
460
|
chainId: await getMemoizedChainId(),
|
|
453
461
|
...typedData,
|
|
454
462
|
accountAddress: await this.getAddress(),
|
|
455
|
-
kernelVersion: kernelVersion
|
|
463
|
+
kernelVersion: kernelVersion,
|
|
464
|
+
eip7702
|
|
456
465
|
});
|
|
457
466
|
if (isKernelV2(kernelVersion)) {
|
|
458
467
|
return signature;
|
|
459
468
|
}
|
|
460
469
|
return concatHex([
|
|
461
|
-
getEcdsaRootIdentifierForKernelV3(validatorAddress),
|
|
470
|
+
getEcdsaRootIdentifierForKernelV3(validatorAddress, eip7702),
|
|
462
471
|
signature
|
|
463
472
|
]);
|
|
464
473
|
},
|
|
@@ -481,7 +490,8 @@ export async function toKernelSmartAccount(parameters) {
|
|
|
481
490
|
message: { raw: hash },
|
|
482
491
|
chainId,
|
|
483
492
|
accountAddress: await this.getAddress(),
|
|
484
|
-
kernelVersion
|
|
493
|
+
kernelVersion,
|
|
494
|
+
eip7702: false
|
|
485
495
|
})
|
|
486
496
|
: await owner.signMessage({
|
|
487
497
|
message: { raw: hash }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toKernelSmartAccount.js","sourceRoot":"","sources":["../../../accounts/kernel/toKernelSmartAccount.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"toKernelSmartAccount.js","sourceRoot":"","sources":["../../../accounts/kernel/toKernelSmartAccount.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { encodeAbiParameters, hashMessage } from "viem";
|
|
|
3
3
|
import { signMessage as _signMessage } from "viem/actions";
|
|
4
4
|
import { isWebAuthnAccount } from "./isWebAuthnAccount.js";
|
|
5
5
|
import { wrapMessageHash } from "./wrapMessageHash.js";
|
|
6
|
-
export async function signMessage({ message, owner, accountAddress, kernelVersion: accountVersion, chainId }) {
|
|
6
|
+
export async function signMessage({ message, owner, accountAddress, kernelVersion: accountVersion, chainId, eip7702 }) {
|
|
7
7
|
if (isWebAuthnAccount(owner)) {
|
|
8
8
|
let messageContent;
|
|
9
9
|
if (typeof message === "string") {
|
|
@@ -50,6 +50,21 @@ export async function signMessage({ message, owner, accountAddress, kernelVersio
|
|
|
50
50
|
]);
|
|
51
51
|
return encodedSignature;
|
|
52
52
|
}
|
|
53
|
+
if (eip7702) {
|
|
54
|
+
return owner.signTypedData({
|
|
55
|
+
message: { hash: hashMessage(message) },
|
|
56
|
+
primaryType: "Kernel",
|
|
57
|
+
types: {
|
|
58
|
+
Kernel: [{ name: "hash", type: "bytes32" }]
|
|
59
|
+
},
|
|
60
|
+
domain: {
|
|
61
|
+
name: "Kernel",
|
|
62
|
+
version: accountVersion,
|
|
63
|
+
chainId: chainId,
|
|
64
|
+
verifyingContract: accountAddress
|
|
65
|
+
}
|
|
66
|
+
});
|
|
67
|
+
}
|
|
53
68
|
if (accountVersion === "0.2.1" || accountVersion === "0.2.2") {
|
|
54
69
|
return owner.signMessage({
|
|
55
70
|
message
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signMessage.js","sourceRoot":"","sources":["../../../../accounts/kernel/utils/signMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAA;AAC9B,OAAO,EAKH,mBAAmB,EACnB,WAAW,EACd,MAAM,MAAM,CAAA;AAEb,OAAO,EAAE,WAAW,IAAI,YAAY,EAAE,MAAM,cAAc,CAAA;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAEH,eAAe,EAClB,MAAM,sBAAsB,CAAA;AAE7B,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,EAC9B,OAAO,EACP,KAAK,EACL,cAAc,EACd,aAAa,EAAE,cAAc,EAC7B,OAAO,
|
|
1
|
+
{"version":3,"file":"signMessage.js","sourceRoot":"","sources":["../../../../accounts/kernel/utils/signMessage.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { isWebAuthnAccount } from "./isWebAuthnAccount.js";
|
|
|
3
3
|
import { signMessage } from "./signMessage.js";
|
|
4
4
|
import { wrapMessageHash } from "./wrapMessageHash.js";
|
|
5
5
|
export async function signTypedData(parameters) {
|
|
6
|
-
const { owner, accountAddress, kernelVersion: accountVersion, chainId, ...typedData } = parameters;
|
|
6
|
+
const { owner, accountAddress, kernelVersion: accountVersion, chainId, eip7702, ...typedData } = parameters;
|
|
7
7
|
if ((accountVersion === "0.2.1" || accountVersion === "0.2.2") &&
|
|
8
8
|
!isWebAuthnAccount(owner)) {
|
|
9
9
|
return owner.signTypedData({
|
|
@@ -26,6 +26,21 @@ export async function signTypedData(parameters) {
|
|
|
26
26
|
types
|
|
27
27
|
});
|
|
28
28
|
const typedHash = hashTypedData({ message, primaryType, types, domain });
|
|
29
|
+
if (eip7702 && !isWebAuthnAccount(owner)) {
|
|
30
|
+
return owner.signTypedData({
|
|
31
|
+
message: { hash: typedHash },
|
|
32
|
+
primaryType: "Kernel",
|
|
33
|
+
types: {
|
|
34
|
+
Kernel: [{ name: "hash", type: "bytes32" }]
|
|
35
|
+
},
|
|
36
|
+
domain: {
|
|
37
|
+
name: "Kernel",
|
|
38
|
+
version: accountVersion,
|
|
39
|
+
chainId: chainId,
|
|
40
|
+
verifyingContract: accountAddress
|
|
41
|
+
}
|
|
42
|
+
});
|
|
43
|
+
}
|
|
29
44
|
const wrappedMessageHash = wrapMessageHash(typedHash, {
|
|
30
45
|
kernelVersion: accountVersion,
|
|
31
46
|
accountAddress,
|
|
@@ -37,7 +52,8 @@ export async function signTypedData(parameters) {
|
|
|
37
52
|
owner,
|
|
38
53
|
accountAddress,
|
|
39
54
|
kernelVersion: accountVersion,
|
|
40
|
-
chainId
|
|
55
|
+
chainId,
|
|
56
|
+
eip7702: false
|
|
41
57
|
});
|
|
42
58
|
}
|
|
43
59
|
return owner.signMessage({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signTypedData.js","sourceRoot":"","sources":["../../../../accounts/kernel/utils/signTypedData.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,uBAAuB,EACvB,aAAa,EACb,iBAAiB,EACpB,MAAM,MAAM,CAAA;AAEb,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAEH,eAAe,EAClB,MAAM,sBAAsB,CAAA;AAE7B,MAAM,CAAC,KAAK,UAAU,aAAa,CAC/B,
|
|
1
|
+
{"version":3,"file":"signTypedData.js","sourceRoot":"","sources":["../../../../accounts/kernel/utils/signTypedData.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,uBAAuB,EACvB,aAAa,EACb,iBAAiB,EACpB,MAAM,MAAM,CAAA;AAEb,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAEH,eAAe,EAClB,MAAM,sBAAsB,CAAA;AAE7B,MAAM,CAAC,KAAK,UAAU,aAAa,CAC/B,UAIK;IAEL,MAAM,EACF,KAAK,EACL,cAAc,EACd,aAAa,EAAE,cAAc,EAC7B,OAAO,EACP,OAAO,EACP,GAAG,SAAS,EACf,GAAG,UAAU,CAAA;IAEd,IACI,CAAC,cAAc,KAAK,OAAO,IAAI,cAAc,KAAK,OAAO,CAAC;QAC1D,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAC3B,CAAC;QACC,OAAO,KAAK,CAAC,aAAa,CAAC;YACvB,GAAG,SAAS;SACf,CAAC,CAAA;IACN,CAAC;IAED,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;IACjE,MAAM,KAAK,GAAG;QACV,YAAY,EAAE,uBAAuB,CAAC;YAClC,MAAM,EAAE,MAAM;SACjB,CAAC;QACF,GAAG,MAAM;KACZ,CAAA;IAED,uFAAuF;IACvF,qDAAqD;IACrD,iBAAiB,CAAC;QACd,MAAM;QACN,OAAO;QACP,WAAW;QACX,KAAK;KACR,CAAC,CAAA;IAEF,MAAM,SAAS,GAAG,aAAa,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;IAExE,IAAI,OAAO,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;QACvC,OAAO,KAAK,CAAC,aAAa,CAAC;YACvB,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YAC5B,WAAW,EAAE,QAAQ;YACrB,KAAK,EAAE;gBACH,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;aAC9C;YACD,MAAM,EAAE;gBACJ,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,cAAc;gBACvB,OAAO,EAAE,OAAO;gBAChB,iBAAiB,EAAE,cAAc;aACpC;SACJ,CAAC,CAAA;IACN,CAAC;IAED,MAAM,kBAAkB,GAAG,eAAe,CAAC,SAAS,EAAE;QAClD,aAAa,EAAE,cAAc;QAC7B,cAAc;QACd,OAAO,EAAE,OAAO;KACnB,CAAC,CAAA;IAEF,IAAI,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC3B,OAAO,WAAW,CAAC;YACf,OAAO,EAAE,EAAE,GAAG,EAAE,kBAAkB,EAAE;YACpC,KAAK;YACL,cAAc;YACd,aAAa,EAAE,cAAc;YAC7B,OAAO;YACP,OAAO,EAAE,KAAK;SACjB,CAAC,CAAA;IACN,CAAC;IAED,OAAO,KAAK,CAAC,WAAW,CAAC;QACrB,OAAO,EAAE,EAAE,GAAG,EAAE,kBAAkB,EAAE;KACvC,CAAC,CAAA;AACN,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../accounts/kernel/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,qBAAqB,yIACwG,CAAA;AAC1I,eAAO,MAAM,mBAAmB,eAAe,CAAA;AAE/C,eAAO,MAAM,cAAc
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../accounts/kernel/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,qBAAqB,yIACwG,CAAA;AAC1I,eAAO,MAAM,mBAAmB,eAAe,CAAA;AAE/C,eAAO,MAAM,cAAc;;;;;CAKjB,CAAA;AACV,oBAAY,cAAc;IACtB,OAAO,SAAS;IAChB,MAAM,SAAS;CAClB"}
|
|
@@ -16,7 +16,7 @@ export declare const KERNEL_VERSION_TO_ADDRESSES_MAP: {
|
|
|
16
16
|
META_FACTORY_ADDRESS?: Address;
|
|
17
17
|
};
|
|
18
18
|
};
|
|
19
|
-
export declare const getEcdsaRootIdentifierForKernelV3: (validatorAddress: Address) => `0x${string}`;
|
|
19
|
+
export declare const getEcdsaRootIdentifierForKernelV3: (validatorAddress: Address, eip7702?: boolean) => `0x${string}`;
|
|
20
20
|
export type ToKernelSmartAccountParameters<entryPointVersion extends EntryPointVersion, kernelVersion extends KernelVersion<entryPointVersion>, owner extends OneOf<EthereumProvider | WalletClient<Transport, Chain | undefined, Account> | LocalAccount | WebAuthnAccount>, eip7702 extends boolean = false> = {
|
|
21
21
|
client: Client<Transport, Chain | undefined, JsonRpcAccount | LocalAccount | undefined>;
|
|
22
22
|
version?: kernelVersion;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toKernelSmartAccount.d.ts","sourceRoot":"","sources":["../../../accounts/kernel/toKernelSmartAccount.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACR,OAAO,EACP,MAAM,EACN,KAAK,EACL,cAAc,EACd,KAAK,EAEL,SAAS,EACT,YAAY,EACf,MAAM,MAAM,CAAA;AACb,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,MAAM,EACX,KAAK,YAAY,EAQpB,MAAM,MAAM,CAAA;AACb,OAAO,EACH,KAAK,YAAY,EACjB,KAAK,0BAA0B,EAE/B,KAAK,eAAe,EACpB,eAAe,EACf,eAAe,EAIlB,MAAM,0BAA0B,CAAA;AAKjC,OAAO,EAAE,KAAK,gBAAgB,EAAW,MAAM,wBAAwB,CAAA;AAqBvE,KAAK,iBAAiB,GAAG,KAAK,GAAG,KAAK,CAAA;AAqCtC,MAAM,MAAM,aAAa,CAAC,iBAAiB,SAAS,iBAAiB,IACjE,iBAAiB,SAAS,KAAK,GACzB,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,GACrC,YAAY,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,CAAA;AAEpD;;GAEG;AACH,eAAO,MAAM,+BAA+B,EAAE;KACzC,GAAG,IAAI,aAAa,CAAC,iBAAiB,CAAC,GAAG;QACvC,eAAe,EAAE,OAAO,CAAA;QACxB,mBAAmB,CAAC,EAAE,OAAO,CAAA;QAC7B,aAAa,EAAE,OAAO,CAAA;QACtB,eAAe,EAAE,OAAO,CAAA;QACxB,oBAAoB,CAAC,EAAE,OAAO,CAAA;KACjC;CAgDJ,CAAA;AAkED,eAAO,MAAM,iCAAiC,GAC1C,kBAAkB,OAAO,
|
|
1
|
+
{"version":3,"file":"toKernelSmartAccount.d.ts","sourceRoot":"","sources":["../../../accounts/kernel/toKernelSmartAccount.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { type LocalAccount, type SignMessageReturnType, type SignableMessage } from "viem";
|
|
2
2
|
import type { WebAuthnAccount } from "viem/account-abstraction";
|
|
3
3
|
import { type WrapMessageHashParams } from "./wrapMessageHash.js";
|
|
4
|
-
export declare function signMessage({ message, owner, accountAddress, kernelVersion: accountVersion, chainId }: {
|
|
4
|
+
export declare function signMessage({ message, owner, accountAddress, kernelVersion: accountVersion, chainId, eip7702 }: {
|
|
5
5
|
chainId: number;
|
|
6
6
|
message: SignableMessage;
|
|
7
7
|
owner: LocalAccount | WebAuthnAccount;
|
|
8
|
+
eip7702: boolean;
|
|
8
9
|
} & WrapMessageHashParams): Promise<SignMessageReturnType>;
|
|
9
10
|
//# sourceMappingURL=signMessage.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signMessage.d.ts","sourceRoot":"","sources":["../../../../accounts/kernel/utils/signMessage.ts"],"names":[],"mappings":"AACA,OAAO,EAEH,KAAK,YAAY,EACjB,KAAK,qBAAqB,EAC1B,KAAK,eAAe,EAGvB,MAAM,MAAM,CAAA;AACb,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAG/D,OAAO,EACH,KAAK,qBAAqB,EAE7B,MAAM,sBAAsB,CAAA;AAE7B,wBAAsB,WAAW,CAAC,EAC9B,OAAO,EACP,KAAK,EACL,cAAc,EACd,aAAa,EAAE,cAAc,EAC7B,OAAO,EACV,EAAE;IACC,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,eAAe,CAAA;IACxB,KAAK,EAAE,YAAY,GAAG,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"signMessage.d.ts","sourceRoot":"","sources":["../../../../accounts/kernel/utils/signMessage.ts"],"names":[],"mappings":"AACA,OAAO,EAEH,KAAK,YAAY,EACjB,KAAK,qBAAqB,EAC1B,KAAK,eAAe,EAGvB,MAAM,MAAM,CAAA;AACb,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAG/D,OAAO,EACH,KAAK,qBAAqB,EAE7B,MAAM,sBAAsB,CAAA;AAE7B,wBAAsB,WAAW,CAAC,EAC9B,OAAO,EACP,KAAK,EACL,cAAc,EACd,aAAa,EAAE,cAAc,EAC7B,OAAO,EACP,OAAO,EACV,EAAE;IACC,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,eAAe,CAAA;IACxB,KAAK,EAAE,YAAY,GAAG,eAAe,CAAA;IACrC,OAAO,EAAE,OAAO,CAAA;CACnB,GAAG,qBAAqB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAoFzD"}
|
|
@@ -3,5 +3,6 @@ import type { WebAuthnAccount } from "viem/account-abstraction";
|
|
|
3
3
|
import { type WrapMessageHashParams } from "./wrapMessageHash.js";
|
|
4
4
|
export declare function signTypedData(parameters: TypedDataDefinition & WrapMessageHashParams & {
|
|
5
5
|
owner: LocalAccount | WebAuthnAccount;
|
|
6
|
+
eip7702: boolean;
|
|
6
7
|
}): Promise<SignTypedDataReturnType>;
|
|
7
8
|
//# sourceMappingURL=signTypedData.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signTypedData.d.ts","sourceRoot":"","sources":["../../../../accounts/kernel/utils/signTypedData.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,YAAY,EACjB,KAAK,uBAAuB,EAC5B,KAAK,mBAAmB,EAI3B,MAAM,MAAM,CAAA;AACb,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAG/D,OAAO,EACH,KAAK,qBAAqB,EAE7B,MAAM,sBAAsB,CAAA;AAE7B,wBAAsB,aAAa,CAC/B,UAAU,EAAE,mBAAmB,GAC3B,qBAAqB,GAAG;IACpB,KAAK,EAAE,YAAY,GAAG,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"signTypedData.d.ts","sourceRoot":"","sources":["../../../../accounts/kernel/utils/signTypedData.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,YAAY,EACjB,KAAK,uBAAuB,EAC5B,KAAK,mBAAmB,EAI3B,MAAM,MAAM,CAAA;AACb,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAG/D,OAAO,EACH,KAAK,qBAAqB,EAE7B,MAAM,sBAAsB,CAAA;AAE7B,wBAAsB,aAAa,CAC/B,UAAU,EAAE,mBAAmB,GAC3B,qBAAqB,GAAG;IACpB,KAAK,EAAE,YAAY,GAAG,eAAe,CAAA;IACrC,OAAO,EAAE,OAAO,CAAA;CACnB,GACN,OAAO,CAAC,uBAAuB,CAAC,CA0ElC"}
|
|
@@ -224,9 +224,13 @@ const getDefaultAddresses = ({
|
|
|
224
224
|
}
|
|
225
225
|
|
|
226
226
|
export const getEcdsaRootIdentifierForKernelV3 = (
|
|
227
|
-
validatorAddress: Address
|
|
227
|
+
validatorAddress: Address,
|
|
228
|
+
eip7702 = false
|
|
228
229
|
) => {
|
|
229
|
-
return concatHex([
|
|
230
|
+
return concatHex([
|
|
231
|
+
eip7702 ? VALIDATOR_TYPE.EIP7702 : VALIDATOR_TYPE.VALIDATOR,
|
|
232
|
+
eip7702 ? "0x" : validatorAddress
|
|
233
|
+
])
|
|
230
234
|
}
|
|
231
235
|
|
|
232
236
|
/**
|
|
@@ -723,8 +727,14 @@ export async function toKernelSmartAccount<
|
|
|
723
727
|
return this.signMessage({ message: hash })
|
|
724
728
|
},
|
|
725
729
|
async signMessage({ message }) {
|
|
726
|
-
if (
|
|
727
|
-
|
|
730
|
+
if (
|
|
731
|
+
"isDeployed" in this &&
|
|
732
|
+
!(await (this as any).isDeployed()) &&
|
|
733
|
+
eip7702
|
|
734
|
+
) {
|
|
735
|
+
throw new Error(
|
|
736
|
+
"Kernel with EIP-7702 isn't 1271 compliant before delegation."
|
|
737
|
+
)
|
|
728
738
|
}
|
|
729
739
|
|
|
730
740
|
const signature = await signMessage({
|
|
@@ -732,7 +742,8 @@ export async function toKernelSmartAccount<
|
|
|
732
742
|
message,
|
|
733
743
|
accountAddress: await this.getAddress(),
|
|
734
744
|
kernelVersion: kernelVersion,
|
|
735
|
-
chainId: await getMemoizedChainId()
|
|
745
|
+
chainId: await getMemoizedChainId(),
|
|
746
|
+
eip7702: eip7702
|
|
736
747
|
})
|
|
737
748
|
|
|
738
749
|
if (isKernelV2(kernelVersion)) {
|
|
@@ -740,13 +751,19 @@ export async function toKernelSmartAccount<
|
|
|
740
751
|
}
|
|
741
752
|
|
|
742
753
|
return concatHex([
|
|
743
|
-
getEcdsaRootIdentifierForKernelV3(validatorAddress),
|
|
754
|
+
getEcdsaRootIdentifierForKernelV3(validatorAddress, eip7702),
|
|
744
755
|
signature
|
|
745
756
|
])
|
|
746
757
|
},
|
|
747
758
|
async signTypedData(typedData) {
|
|
748
|
-
if (
|
|
749
|
-
|
|
759
|
+
if (
|
|
760
|
+
"isDeployed" in this &&
|
|
761
|
+
!(await (this as any).isDeployed()) &&
|
|
762
|
+
eip7702
|
|
763
|
+
) {
|
|
764
|
+
throw new Error(
|
|
765
|
+
"Kernel with EIP-7702 isn't 1271 compliant before delegation."
|
|
766
|
+
)
|
|
750
767
|
}
|
|
751
768
|
|
|
752
769
|
const signature = await signTypedData({
|
|
@@ -754,7 +771,8 @@ export async function toKernelSmartAccount<
|
|
|
754
771
|
chainId: await getMemoizedChainId(),
|
|
755
772
|
...(typedData as TypedDataDefinition),
|
|
756
773
|
accountAddress: await this.getAddress(),
|
|
757
|
-
kernelVersion: kernelVersion
|
|
774
|
+
kernelVersion: kernelVersion,
|
|
775
|
+
eip7702
|
|
758
776
|
})
|
|
759
777
|
|
|
760
778
|
if (isKernelV2(kernelVersion)) {
|
|
@@ -762,7 +780,7 @@ export async function toKernelSmartAccount<
|
|
|
762
780
|
}
|
|
763
781
|
|
|
764
782
|
return concatHex([
|
|
765
|
-
getEcdsaRootIdentifierForKernelV3(validatorAddress),
|
|
783
|
+
getEcdsaRootIdentifierForKernelV3(validatorAddress, eip7702),
|
|
766
784
|
signature
|
|
767
785
|
])
|
|
768
786
|
},
|
|
@@ -788,7 +806,8 @@ export async function toKernelSmartAccount<
|
|
|
788
806
|
message: { raw: hash },
|
|
789
807
|
chainId,
|
|
790
808
|
accountAddress: await this.getAddress(),
|
|
791
|
-
kernelVersion
|
|
809
|
+
kernelVersion,
|
|
810
|
+
eip7702: false
|
|
792
811
|
})
|
|
793
812
|
: await owner.signMessage({
|
|
794
813
|
message: { raw: hash }
|
|
@@ -20,11 +20,13 @@ export async function signMessage({
|
|
|
20
20
|
owner,
|
|
21
21
|
accountAddress,
|
|
22
22
|
kernelVersion: accountVersion,
|
|
23
|
-
chainId
|
|
23
|
+
chainId,
|
|
24
|
+
eip7702
|
|
24
25
|
}: {
|
|
25
26
|
chainId: number
|
|
26
27
|
message: SignableMessage
|
|
27
28
|
owner: LocalAccount | WebAuthnAccount
|
|
29
|
+
eip7702: boolean
|
|
28
30
|
} & WrapMessageHashParams): Promise<SignMessageReturnType> {
|
|
29
31
|
if (isWebAuthnAccount(owner)) {
|
|
30
32
|
let messageContent: string
|
|
@@ -75,6 +77,22 @@ export async function signMessage({
|
|
|
75
77
|
return encodedSignature
|
|
76
78
|
}
|
|
77
79
|
|
|
80
|
+
if (eip7702) {
|
|
81
|
+
return owner.signTypedData({
|
|
82
|
+
message: { hash: hashMessage(message) },
|
|
83
|
+
primaryType: "Kernel",
|
|
84
|
+
types: {
|
|
85
|
+
Kernel: [{ name: "hash", type: "bytes32" }]
|
|
86
|
+
},
|
|
87
|
+
domain: {
|
|
88
|
+
name: "Kernel",
|
|
89
|
+
version: accountVersion,
|
|
90
|
+
chainId: chainId,
|
|
91
|
+
verifyingContract: accountAddress
|
|
92
|
+
}
|
|
93
|
+
})
|
|
94
|
+
}
|
|
95
|
+
|
|
78
96
|
if (accountVersion === "0.2.1" || accountVersion === "0.2.2") {
|
|
79
97
|
return owner.signMessage({
|
|
80
98
|
message
|
|
@@ -18,6 +18,7 @@ export async function signTypedData(
|
|
|
18
18
|
parameters: TypedDataDefinition &
|
|
19
19
|
WrapMessageHashParams & {
|
|
20
20
|
owner: LocalAccount | WebAuthnAccount
|
|
21
|
+
eip7702: boolean
|
|
21
22
|
}
|
|
22
23
|
): Promise<SignTypedDataReturnType> {
|
|
23
24
|
const {
|
|
@@ -25,6 +26,7 @@ export async function signTypedData(
|
|
|
25
26
|
accountAddress,
|
|
26
27
|
kernelVersion: accountVersion,
|
|
27
28
|
chainId,
|
|
29
|
+
eip7702,
|
|
28
30
|
...typedData
|
|
29
31
|
} = parameters
|
|
30
32
|
|
|
@@ -56,6 +58,22 @@ export async function signTypedData(
|
|
|
56
58
|
|
|
57
59
|
const typedHash = hashTypedData({ message, primaryType, types, domain })
|
|
58
60
|
|
|
61
|
+
if (eip7702 && !isWebAuthnAccount(owner)) {
|
|
62
|
+
return owner.signTypedData({
|
|
63
|
+
message: { hash: typedHash },
|
|
64
|
+
primaryType: "Kernel",
|
|
65
|
+
types: {
|
|
66
|
+
Kernel: [{ name: "hash", type: "bytes32" }]
|
|
67
|
+
},
|
|
68
|
+
domain: {
|
|
69
|
+
name: "Kernel",
|
|
70
|
+
version: accountVersion,
|
|
71
|
+
chainId: chainId,
|
|
72
|
+
verifyingContract: accountAddress
|
|
73
|
+
}
|
|
74
|
+
})
|
|
75
|
+
}
|
|
76
|
+
|
|
59
77
|
const wrappedMessageHash = wrapMessageHash(typedHash, {
|
|
60
78
|
kernelVersion: accountVersion,
|
|
61
79
|
accountAddress,
|
|
@@ -68,7 +86,8 @@ export async function signTypedData(
|
|
|
68
86
|
owner,
|
|
69
87
|
accountAddress,
|
|
70
88
|
kernelVersion: accountVersion,
|
|
71
|
-
chainId
|
|
89
|
+
chainId,
|
|
90
|
+
eip7702: false
|
|
72
91
|
})
|
|
73
92
|
}
|
|
74
93
|
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { zeroAddress } from "viem"
|
|
2
|
+
import { privateKeyToAccount } from "viem/accounts"
|
|
2
3
|
import { describe, expect } from "vitest"
|
|
3
4
|
import { testWithRpc } from "../../../permissionless-test/src/testWithRpc"
|
|
4
5
|
import {
|
|
@@ -7,6 +8,9 @@ import {
|
|
|
7
8
|
} from "../../../permissionless-test/src/utils"
|
|
8
9
|
import { signMessage } from "./signMessage"
|
|
9
10
|
|
|
11
|
+
const privateKey =
|
|
12
|
+
"0x4bbbf85ce3377467afe5d46f804f221813b2bb87f24d81f60f1fcdbf7cbf4356"
|
|
13
|
+
|
|
10
14
|
describe.each(getCoreSmartAccounts())(
|
|
11
15
|
"signMessage $name",
|
|
12
16
|
({
|
|
@@ -15,6 +19,7 @@ describe.each(getCoreSmartAccounts())(
|
|
|
15
19
|
supportsEntryPointV06,
|
|
16
20
|
supportsEntryPointV07,
|
|
17
21
|
supportsEntryPointV08,
|
|
22
|
+
isEip7702Compliant,
|
|
18
23
|
name
|
|
19
24
|
}) => {
|
|
20
25
|
testWithRpc.skipIf(isEip1271Compliant || !supportsEntryPointV06)(
|
|
@@ -98,10 +103,13 @@ describe.each(getCoreSmartAccounts())(
|
|
|
98
103
|
async ({ rpc }) => {
|
|
99
104
|
const { anvilRpc } = rpc
|
|
100
105
|
|
|
106
|
+
const privateKeyAccount = privateKeyToAccount(privateKey)
|
|
107
|
+
|
|
101
108
|
const smartClient = await getSmartAccountClient({
|
|
102
109
|
entryPoint: {
|
|
103
110
|
version: "0.7"
|
|
104
111
|
},
|
|
112
|
+
privateKey, // anvil private key
|
|
105
113
|
...rpc
|
|
106
114
|
})
|
|
107
115
|
|
|
@@ -110,10 +118,27 @@ describe.each(getCoreSmartAccounts())(
|
|
|
110
118
|
return
|
|
111
119
|
}
|
|
112
120
|
|
|
113
|
-
if (
|
|
121
|
+
if (
|
|
122
|
+
name.includes("Safe 7579") ||
|
|
123
|
+
name.includes("Kernel 0.3.3 + EIP-7702")
|
|
124
|
+
) {
|
|
125
|
+
const publicClient = getPublicClient(anvilRpc)
|
|
126
|
+
|
|
114
127
|
// Due to 7579 launchpad, we can't verify the signature before deploying the account.
|
|
115
128
|
await smartClient.sendTransaction({
|
|
116
|
-
calls: [{ to: zeroAddress, value: 0n }]
|
|
129
|
+
calls: [{ to: zeroAddress, value: 0n }],
|
|
130
|
+
authorization: isEip7702Compliant
|
|
131
|
+
? await privateKeyAccount.signAuthorization({
|
|
132
|
+
address: (smartClient.account as any)
|
|
133
|
+
.implementation,
|
|
134
|
+
chainId: smartClient.chain.id,
|
|
135
|
+
nonce: await publicClient.getTransactionCount(
|
|
136
|
+
{
|
|
137
|
+
address: smartClient.account.address
|
|
138
|
+
}
|
|
139
|
+
)
|
|
140
|
+
})
|
|
141
|
+
: undefined
|
|
117
142
|
})
|
|
118
143
|
}
|
|
119
144
|
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { getAddress, zeroAddress } from "viem"
|
|
2
|
+
import { privateKeyToAccount } from "viem/accounts"
|
|
2
3
|
import { describe, expect } from "vitest"
|
|
3
4
|
import { testWithRpc } from "../../../permissionless-test/src/testWithRpc"
|
|
4
5
|
import {
|
|
@@ -7,6 +8,9 @@ import {
|
|
|
7
8
|
} from "../../../permissionless-test/src/utils"
|
|
8
9
|
import { signTypedData } from "./signTypedData"
|
|
9
10
|
|
|
11
|
+
const privateKey =
|
|
12
|
+
"0x4bbbf85ce3377467afe5d46f804f221813b2bb87f24d81f60f1fcdbf7cbf4356"
|
|
13
|
+
|
|
10
14
|
const typedData = {
|
|
11
15
|
domain: {
|
|
12
16
|
name: "Ether Mail",
|
|
@@ -49,6 +53,7 @@ describe.each(getCoreSmartAccounts())(
|
|
|
49
53
|
supportsEntryPointV06,
|
|
50
54
|
supportsEntryPointV07,
|
|
51
55
|
supportsEntryPointV08,
|
|
56
|
+
isEip7702Compliant,
|
|
52
57
|
name
|
|
53
58
|
}) => {
|
|
54
59
|
testWithRpc.skipIf(isEip1271Compliant || !supportsEntryPointV06)(
|
|
@@ -114,10 +119,13 @@ describe.each(getCoreSmartAccounts())(
|
|
|
114
119
|
async ({ rpc }) => {
|
|
115
120
|
const { anvilRpc } = rpc
|
|
116
121
|
|
|
122
|
+
const privateKeyAccount = privateKeyToAccount(privateKey)
|
|
123
|
+
|
|
117
124
|
const smartClient = await getSmartAccountClient({
|
|
118
125
|
entryPoint: {
|
|
119
126
|
version: "0.7"
|
|
120
127
|
},
|
|
128
|
+
privateKey, // anvil private key
|
|
121
129
|
...rpc
|
|
122
130
|
})
|
|
123
131
|
|
|
@@ -130,12 +138,30 @@ describe.each(getCoreSmartAccounts())(
|
|
|
130
138
|
return
|
|
131
139
|
}
|
|
132
140
|
|
|
133
|
-
if (
|
|
141
|
+
if (
|
|
142
|
+
name.includes("Safe 7579") ||
|
|
143
|
+
name.includes("Kernel 0.3.3 + EIP-7702")
|
|
144
|
+
) {
|
|
145
|
+
const publicClient = getPublicClient(anvilRpc)
|
|
146
|
+
|
|
134
147
|
// Due to 7579 launchpad, we can't verify the signature before deploying the account.
|
|
135
148
|
await smartClient.sendTransaction({
|
|
136
|
-
calls: [{ to: zeroAddress, value: 0n }]
|
|
149
|
+
calls: [{ to: zeroAddress, value: 0n }],
|
|
150
|
+
authorization: isEip7702Compliant
|
|
151
|
+
? await privateKeyAccount.signAuthorization({
|
|
152
|
+
address: (smartClient.account as any)
|
|
153
|
+
.implementation,
|
|
154
|
+
chainId: smartClient.chain.id,
|
|
155
|
+
nonce: await publicClient.getTransactionCount(
|
|
156
|
+
{
|
|
157
|
+
address: smartClient.account.address
|
|
158
|
+
}
|
|
159
|
+
)
|
|
160
|
+
})
|
|
161
|
+
: undefined
|
|
137
162
|
})
|
|
138
163
|
}
|
|
164
|
+
|
|
139
165
|
const isVerified = await publicClient.verifyTypedData({
|
|
140
166
|
...typedData,
|
|
141
167
|
address: smartClient.account.address,
|