@zerodev/sdk 5.3.12 → 5.3.13
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/_cjs/accounts/kernel/createKernelAccount.js +7 -6
- package/_cjs/accounts/kernel/createKernelAccount.js.map +1 -1
- package/_cjs/accounts/kernel/utils/common/accountMetadata.js +5 -4
- package/_cjs/accounts/kernel/utils/common/accountMetadata.js.map +1 -1
- package/_cjs/accounts/utils/toKernelPluginManager.js +16 -6
- package/_cjs/accounts/utils/toKernelPluginManager.js.map +1 -1
- package/_cjs/types/kernel.js.map +1 -1
- package/_esm/accounts/kernel/createKernelAccount.js +7 -6
- package/_esm/accounts/kernel/createKernelAccount.js.map +1 -1
- package/_esm/accounts/kernel/utils/common/accountMetadata.js +5 -4
- package/_esm/accounts/kernel/utils/common/accountMetadata.js.map +1 -1
- package/_esm/accounts/utils/toKernelPluginManager.js +16 -6
- package/_esm/accounts/utils/toKernelPluginManager.js.map +1 -1
- package/_esm/types/kernel.js.map +1 -1
- package/_types/accounts/kernel/createKernelAccount.d.ts +2 -1
- package/_types/accounts/kernel/createKernelAccount.d.ts.map +1 -1
- package/_types/accounts/kernel/utils/common/accountMetadata.d.ts +2 -3
- package/_types/accounts/kernel/utils/common/accountMetadata.d.ts.map +1 -1
- package/_types/accounts/utils/toKernelPluginManager.d.ts +1 -1
- package/_types/accounts/utils/toKernelPluginManager.d.ts.map +1 -1
- package/_types/types/kernel.d.ts +1 -0
- package/_types/types/kernel.d.ts.map +1 -1
- package/accounts/kernel/createKernelAccount.ts +21 -8
- package/accounts/kernel/utils/common/accountMetadata.ts +9 -5
- package/accounts/utils/toKernelPluginManager.ts +16 -6
- package/package.json +10 -32
- package/types/kernel.ts +1 -0
|
@@ -170,7 +170,7 @@ const getDefaultAddresses = (entryPointAddress, kernelVersion, { accountImplemen
|
|
|
170
170
|
metaFactoryAddress: metaFactoryAddress ?? addresses.metaFactoryAddress
|
|
171
171
|
};
|
|
172
172
|
};
|
|
173
|
-
async function createKernelAccount(client, { plugins, entryPoint: entryPointAddress, index = 0n, factoryAddress: _factoryAddress, accountImplementationAddress: _accountImplementationAddress, metaFactoryAddress: _metaFactoryAddress, deployedAccountAddress, kernelVersion, initConfig, useMetaFactory = true }) {
|
|
173
|
+
async function createKernelAccount(client, { plugins, entryPoint: entryPointAddress, index = 0n, factoryAddress: _factoryAddress, accountImplementationAddress: _accountImplementationAddress, metaFactoryAddress: _metaFactoryAddress, deployedAccountAddress, kernelVersion, initConfig, useMetaFactory = true, chainId }) {
|
|
174
174
|
const entryPointVersion = (0, permissionless_1.getEntryPointVersion)(entryPointAddress);
|
|
175
175
|
const { accountImplementationAddress, factoryAddress, metaFactoryAddress } = getDefaultAddresses(entryPointAddress, kernelVersion, {
|
|
176
176
|
accountImplementationAddress: _accountImplementationAddress,
|
|
@@ -186,7 +186,8 @@ async function createKernelAccount(client, { plugins, entryPoint: entryPointAddr
|
|
|
186
186
|
action: plugins.action,
|
|
187
187
|
pluginEnableSignature: plugins.pluginEnableSignature,
|
|
188
188
|
entryPoint: entryPointAddress,
|
|
189
|
-
kernelVersion
|
|
189
|
+
kernelVersion,
|
|
190
|
+
chainId
|
|
190
191
|
});
|
|
191
192
|
const initHook = Boolean((0, toKernelPluginManager_js_1.isKernelPluginManager)(plugins)
|
|
192
193
|
? plugins.hook &&
|
|
@@ -277,10 +278,10 @@ async function createKernelAccount(client, { plugins, entryPoint: entryPointAddr
|
|
|
277
278
|
},
|
|
278
279
|
async signMessage({ message }) {
|
|
279
280
|
const messageHash = (0, viem_1.hashMessage)(message);
|
|
280
|
-
const { name, chainId, version } = await (0, accountMetadata_js_1.accountMetadata)(client, accountAddress, kernelVersion);
|
|
281
|
+
const { name, chainId: metadataChainId, version } = await (0, accountMetadata_js_1.accountMetadata)(client, accountAddress, kernelVersion, chainId);
|
|
281
282
|
const wrappedMessageHash = await (0, eip712WrapHash_js_1.eip712WrapHash)(messageHash, {
|
|
282
283
|
name,
|
|
283
|
-
chainId: Number(
|
|
284
|
+
chainId: Number(metadataChainId),
|
|
284
285
|
version,
|
|
285
286
|
verifyingContract: accountAddress
|
|
286
287
|
});
|
|
@@ -312,10 +313,10 @@ async function createKernelAccount(client, { plugins, entryPoint: entryPointAddr
|
|
|
312
313
|
types: types
|
|
313
314
|
});
|
|
314
315
|
const typedHash = (0, viem_1.hashTypedData)(typedData);
|
|
315
|
-
const { name, chainId, version } = await (0, accountMetadata_js_1.accountMetadata)(client, accountAddress, kernelVersion);
|
|
316
|
+
const { name, chainId: metadataChainId, version } = await (0, accountMetadata_js_1.accountMetadata)(client, accountAddress, kernelVersion, chainId);
|
|
316
317
|
const wrappedMessageHash = await (0, eip712WrapHash_js_1.eip712WrapHash)(typedHash, {
|
|
317
318
|
name,
|
|
318
|
-
chainId: Number(
|
|
319
|
+
chainId: Number(metadataChainId),
|
|
319
320
|
version,
|
|
320
321
|
verifyingContract: accountAddress
|
|
321
322
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createKernelAccount.js","sourceRoot":"","sources":["../../../accounts/kernel/createKernelAccount.ts"],"names":[],"mappings":";;;AAAA,mDAKuB;AACvB,sDAIgC;AAMhC,+BAea;AACb,qDAAgE;AAOhE,6CAAkE;AAClE,6CAAoE;AACpE,gDAAqF;AACrF,gFAG0C;AAC1C,mEAAyD;AACzD,kFAA0E;AAC1E,kFAA6E;AAC7E,8FAAuF;AACvF,gFAA6E;AAC7E,+EAA+F;AAC/F,2FAA+G;AAC/G,+EAA+F;AAC/F,2FAA+G;AAC/G,0EAAmE;AACnE,wEAAiE;
|
|
1
|
+
{"version":3,"file":"createKernelAccount.js","sourceRoot":"","sources":["../../../accounts/kernel/createKernelAccount.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ exports.accountMetadata = void 0;
|
|
|
4
4
|
const viem_1 = require("viem");
|
|
5
5
|
const constants_js_1 = require("../../../../constants.js");
|
|
6
6
|
const EIP1271Abi_js_1 = require("../../abi/EIP1271Abi.js");
|
|
7
|
-
const accountMetadata = async (client, accountAddress, kernelVersion) => {
|
|
7
|
+
const accountMetadata = async (client, accountAddress, kernelVersion, chainId) => {
|
|
8
8
|
try {
|
|
9
9
|
const domain = await client.request({
|
|
10
10
|
method: "eth_call",
|
|
@@ -36,9 +36,10 @@ const accountMetadata = async (client, accountAddress, kernelVersion) => {
|
|
|
36
36
|
return {
|
|
37
37
|
name: constants_js_1.KERNEL_NAME,
|
|
38
38
|
version: kernelVersion === "0.3.0" ? "0.3.0-beta" : kernelVersion,
|
|
39
|
-
chainId:
|
|
40
|
-
|
|
41
|
-
|
|
39
|
+
chainId: BigInt(chainId ??
|
|
40
|
+
(client.chain
|
|
41
|
+
? client.chain.id
|
|
42
|
+
: await client.extend(viem_1.publicActions).getChainId()))
|
|
42
43
|
};
|
|
43
44
|
};
|
|
44
45
|
exports.accountMetadata = accountMetadata;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accountMetadata.js","sourceRoot":"","sources":["../../../../../accounts/kernel/utils/common/accountMetadata.ts"],"names":[],"mappings":";;;AAAA,+BAQa;AACb,2DAAsD;AAEtD,2DAAoD;AAO7C,MAAM,eAAe,GAAG,KAAK,EAIhC,MAA6C,EAC7C,cAAuB,EACvB,aAAkC,
|
|
1
|
+
{"version":3,"file":"accountMetadata.js","sourceRoot":"","sources":["../../../../../accounts/kernel/utils/common/accountMetadata.ts"],"names":[],"mappings":";;;AAAA,+BAQa;AACb,2DAAsD;AAEtD,2DAAoD;AAO7C,MAAM,eAAe,GAAG,KAAK,EAIhC,MAA6C,EAC7C,cAAuB,EACvB,aAAkC,EAClC,OAAgB,EACQ,EAAE;IAC1B,IAAI,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;YAChC,MAAM,EAAE,UAAU;YAClB,MAAM,EAAE;gBACJ;oBACI,EAAE,EAAE,cAAc;oBAClB,IAAI,EAAE,IAAA,yBAAkB,EAAC;wBACrB,GAAG,EAAE,0BAAU;wBACf,YAAY,EAAE,cAAc;qBAC/B,CAAC;iBACL;gBACD,QAAQ;aACX;SACJ,CAAC,CAAA;QACF,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YAClB,MAAM,OAAO,GAAG,IAAA,2BAAoB,EAAC;gBACjC,GAAG,EAAE,CAAC,GAAG,0BAAU,CAAC;gBACpB,YAAY,EAAE,cAAc;gBAC5B,IAAI,EAAE,MAAM;aACf,CAAC,CAAA;YACF,OAAO;gBACH,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;gBAChB,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;gBACnB,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;aACtB,CAAA;QACL,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC,CAAA,CAAC;IAClB,OAAO;QACH,IAAI,EAAE,0BAAW;QACjB,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,aAAa;QACjE,OAAO,EAAE,MAAM,CACX,OAAO;YACH,CAAC,MAAM,CAAC,KAAK;gBACT,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;gBACjB,CAAC,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,oBAAa,CAAC,CAAC,UAAU,EAAE,CAAC,CAC7D;KACJ,CAAA;AACL,CAAC,CAAA;AA9CY,QAAA,eAAe,mBA8C3B"}
|
|
@@ -20,13 +20,13 @@ function isKernelPluginManager(plugin) {
|
|
|
20
20
|
return plugin.getPluginEnableSignature !== undefined;
|
|
21
21
|
}
|
|
22
22
|
exports.isKernelPluginManager = isKernelPluginManager;
|
|
23
|
-
async function toKernelPluginManager(client, { sudo, regular, hook, pluginEnableSignature, validatorInitData, action, validAfter = 0, validUntil = 0, entryPoint: entryPointAddress, kernelVersion }) {
|
|
23
|
+
async function toKernelPluginManager(client, { sudo, regular, hook, pluginEnableSignature, validatorInitData, action, validAfter = 0, validUntil = 0, entryPoint: entryPointAddress, kernelVersion, chainId }) {
|
|
24
24
|
if ((sudo && !(0, semver_1.satisfies)(kernelVersion, sudo?.supportedKernelVersions)) ||
|
|
25
25
|
(regular && !(0, semver_1.satisfies)(kernelVersion, regular?.supportedKernelVersions))) {
|
|
26
26
|
throw new Error("Either sudo or/and regular validator version mismatch. Update to latest plugin package and use the proper plugin version");
|
|
27
27
|
}
|
|
28
|
+
let pluginEnabled;
|
|
28
29
|
const entryPointVersion = (0, permissionless_1.getEntryPointVersion)(entryPointAddress);
|
|
29
|
-
let chainId;
|
|
30
30
|
const activeValidator = regular || sudo;
|
|
31
31
|
if (!activeValidator) {
|
|
32
32
|
throw new Error("One of `sudo` or `regular` validator must be set");
|
|
@@ -53,6 +53,9 @@ async function toKernelPluginManager(client, { sudo, regular, hook, pluginEnable
|
|
|
53
53
|
}
|
|
54
54
|
if (entryPointVersion === "v0.6") {
|
|
55
55
|
if (regular) {
|
|
56
|
+
if (pluginEnabled) {
|
|
57
|
+
return kernel_js_1.ValidatorMode.plugin;
|
|
58
|
+
}
|
|
56
59
|
if (await isPluginEnabled(accountAddress, selector)) {
|
|
57
60
|
return kernel_js_1.ValidatorMode.plugin;
|
|
58
61
|
}
|
|
@@ -77,6 +80,9 @@ async function toKernelPluginManager(client, { sudo, regular, hook, pluginEnable
|
|
|
77
80
|
}
|
|
78
81
|
}
|
|
79
82
|
if (regular) {
|
|
83
|
+
if (pluginEnabled) {
|
|
84
|
+
return userOpSignature;
|
|
85
|
+
}
|
|
80
86
|
if (await isPluginEnabled(accountAddress, action.selector)) {
|
|
81
87
|
return userOpSignature;
|
|
82
88
|
}
|
|
@@ -105,8 +111,12 @@ async function toKernelPluginManager(client, { sudo, regular, hook, pluginEnable
|
|
|
105
111
|
if (entryPointVersion === "v0.6") {
|
|
106
112
|
return regular.isEnabled(accountAddress, selector);
|
|
107
113
|
}
|
|
108
|
-
|
|
109
|
-
(await (0, isPluginInitialized_js_1.isPluginInitialized)(client, accountAddress, regular.address))
|
|
114
|
+
const isEnabled = (await regular.isEnabled(accountAddress, action.selector)) ||
|
|
115
|
+
(await (0, isPluginInitialized_js_1.isPluginInitialized)(client, accountAddress, regular.address));
|
|
116
|
+
if (isEnabled) {
|
|
117
|
+
pluginEnabled = true;
|
|
118
|
+
}
|
|
119
|
+
return isEnabled;
|
|
110
120
|
};
|
|
111
121
|
const getPluginEnableSignature = async (accountAddress) => {
|
|
112
122
|
if (!action) {
|
|
@@ -120,7 +130,7 @@ async function toKernelPluginManager(client, { sudo, regular, hook, pluginEnable
|
|
|
120
130
|
throw new Error("regular validator not set");
|
|
121
131
|
const { version } = await (0, accountMetadata_js_1.accountMetadata)(client, accountAddress, kernelVersion);
|
|
122
132
|
if (!chainId) {
|
|
123
|
-
chainId = await (0, actions_1.getChainId)(client);
|
|
133
|
+
chainId = client.chain?.id ?? (await (0, actions_1.getChainId)(client));
|
|
124
134
|
}
|
|
125
135
|
let ownerSig;
|
|
126
136
|
if (entryPointVersion === "v0.6") {
|
|
@@ -169,7 +179,7 @@ async function toKernelPluginManager(client, { sudo, regular, hook, pluginEnable
|
|
|
169
179
|
const { version } = await (0, accountMetadata_js_1.accountMetadata)(client, accountAddress, kernelVersion);
|
|
170
180
|
const validatorNonce = await (0, getKernelV3Nonce_js_1.getKernelV3Nonce)(client, accountAddress);
|
|
171
181
|
if (!chainId) {
|
|
172
|
-
chainId = await (0, actions_1.getChainId)(client);
|
|
182
|
+
chainId = client.chain?.id ?? (await (0, actions_1.getChainId)(client));
|
|
173
183
|
}
|
|
174
184
|
const typedData = await (0, getPluginsEnableTypedData_js_2.getPluginsEnableTypedData)({
|
|
175
185
|
accountAddress,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toKernelPluginManager.js","sourceRoot":"","sources":["../../../accounts/utils/toKernelPluginManager.ts"],"names":[],"mappings":";;;AAAA,mDAAqD;AAErD,mCAAkC;AAClC,+BAaa;AACb,0CAAyC;AACzC,6HAA0J;AAC1J,qDAI2B;AAC3B,qDAI8B;AAC9B,2FAAoF;AACpF,kFAA2E;AAC3E,sFAA+E;AAC/E,qGAAyH;AACzH,6GAAqI;AACrI,qGAAyH;AACzH,6GAAqI;AACrI,iGAA0F;AAE1F,SAAgB,qBAAqB,CAEjC,MAAW;IAEX,OAAO,MAAM,CAAC,wBAAwB,KAAK,SAAS,CAAA;AACxD,CAAC;AALD,sDAKC;AAEM,KAAK,UAAU,qBAAqB,CAKvC,MAA6C,EAC7C,EACI,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,qBAAqB,EACrB,iBAAiB,EACjB,MAAM,EACN,UAAU,GAAG,CAAC,EACd,UAAU,GAAG,CAAC,EACd,UAAU,EAAE,iBAAiB,EAC7B,aAAa,
|
|
1
|
+
{"version":3,"file":"toKernelPluginManager.js","sourceRoot":"","sources":["../../../accounts/utils/toKernelPluginManager.ts"],"names":[],"mappings":"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"}
|
package/_cjs/types/kernel.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kernel.js","sourceRoot":"","sources":["../../types/kernel.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"kernel.js","sourceRoot":"","sources":["../../types/kernel.ts"],"names":[],"mappings":";;;AAyNA,IAAY,aAIX;AAJD,WAAY,aAAa;IACrB,oCAAmB,CAAA;IACnB,sCAAqB,CAAA;IACrB,sCAAqB,CAAA;AACzB,CAAC,EAJW,aAAa,6BAAb,aAAa,QAIxB"}
|
|
@@ -201,7 +201,7 @@ const getDefaultAddresses = (entryPointAddress, kernelVersion, { accountImplemen
|
|
|
201
201
|
* @param ecdsaValidatorAddress
|
|
202
202
|
* @param deployedAccountAddress
|
|
203
203
|
*/
|
|
204
|
-
export async function createKernelAccount(client, { plugins, entryPoint: entryPointAddress, index = 0n, factoryAddress: _factoryAddress, accountImplementationAddress: _accountImplementationAddress, metaFactoryAddress: _metaFactoryAddress, deployedAccountAddress, kernelVersion, initConfig, useMetaFactory = true }) {
|
|
204
|
+
export async function createKernelAccount(client, { plugins, entryPoint: entryPointAddress, index = 0n, factoryAddress: _factoryAddress, accountImplementationAddress: _accountImplementationAddress, metaFactoryAddress: _metaFactoryAddress, deployedAccountAddress, kernelVersion, initConfig, useMetaFactory = true, chainId }) {
|
|
205
205
|
const entryPointVersion = getEntryPointVersion(entryPointAddress);
|
|
206
206
|
const { accountImplementationAddress, factoryAddress, metaFactoryAddress } = getDefaultAddresses(entryPointAddress, kernelVersion, {
|
|
207
207
|
accountImplementationAddress: _accountImplementationAddress,
|
|
@@ -217,7 +217,8 @@ export async function createKernelAccount(client, { plugins, entryPoint: entryPo
|
|
|
217
217
|
action: plugins.action,
|
|
218
218
|
pluginEnableSignature: plugins.pluginEnableSignature,
|
|
219
219
|
entryPoint: entryPointAddress,
|
|
220
|
-
kernelVersion
|
|
220
|
+
kernelVersion,
|
|
221
|
+
chainId
|
|
221
222
|
});
|
|
222
223
|
// initHook flag is activated only if both the hook and sudo validator are given
|
|
223
224
|
// if the hook is given with regular plugins, then consider it as a hook for regular plugins
|
|
@@ -313,10 +314,10 @@ export async function createKernelAccount(client, { plugins, entryPoint: entryPo
|
|
|
313
314
|
},
|
|
314
315
|
async signMessage({ message }) {
|
|
315
316
|
const messageHash = hashMessage(message);
|
|
316
|
-
const { name, chainId, version } = await accountMetadata(client, accountAddress, kernelVersion);
|
|
317
|
+
const { name, chainId: metadataChainId, version } = await accountMetadata(client, accountAddress, kernelVersion, chainId);
|
|
317
318
|
const wrappedMessageHash = await eip712WrapHash(messageHash, {
|
|
318
319
|
name,
|
|
319
|
-
chainId: Number(
|
|
320
|
+
chainId: Number(metadataChainId),
|
|
320
321
|
version,
|
|
321
322
|
verifyingContract: accountAddress
|
|
322
323
|
});
|
|
@@ -350,10 +351,10 @@ export async function createKernelAccount(client, { plugins, entryPoint: entryPo
|
|
|
350
351
|
types: types
|
|
351
352
|
});
|
|
352
353
|
const typedHash = hashTypedData(typedData);
|
|
353
|
-
const { name, chainId, version } = await accountMetadata(client, accountAddress, kernelVersion);
|
|
354
|
+
const { name, chainId: metadataChainId, version } = await accountMetadata(client, accountAddress, kernelVersion, chainId);
|
|
354
355
|
const wrappedMessageHash = await eip712WrapHash(typedHash, {
|
|
355
356
|
name,
|
|
356
|
-
chainId: Number(
|
|
357
|
+
chainId: Number(metadataChainId),
|
|
357
358
|
version,
|
|
358
359
|
verifyingContract: accountAddress
|
|
359
360
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createKernelAccount.js","sourceRoot":"","sources":["../../../accounts/kernel/createKernelAccount.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"createKernelAccount.js","sourceRoot":"","sources":["../../../accounts/kernel/createKernelAccount.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { decodeFunctionResult, encodeFunctionData, publicActions } from "viem";
|
|
2
2
|
import { KERNEL_NAME } from "../../../../constants.js";
|
|
3
3
|
import { EIP1271Abi } from "../../abi/EIP1271Abi.js";
|
|
4
|
-
export const accountMetadata = async (client, accountAddress, kernelVersion) => {
|
|
4
|
+
export const accountMetadata = async (client, accountAddress, kernelVersion, chainId) => {
|
|
5
5
|
try {
|
|
6
6
|
const domain = await client.request({
|
|
7
7
|
method: "eth_call",
|
|
@@ -33,9 +33,10 @@ export const accountMetadata = async (client, accountAddress, kernelVersion) =>
|
|
|
33
33
|
return {
|
|
34
34
|
name: KERNEL_NAME,
|
|
35
35
|
version: kernelVersion === "0.3.0" ? "0.3.0-beta" : kernelVersion,
|
|
36
|
-
chainId:
|
|
37
|
-
|
|
38
|
-
|
|
36
|
+
chainId: BigInt(chainId ??
|
|
37
|
+
(client.chain
|
|
38
|
+
? client.chain.id
|
|
39
|
+
: await client.extend(publicActions).getChainId()))
|
|
39
40
|
};
|
|
40
41
|
};
|
|
41
42
|
//# sourceMappingURL=accountMetadata.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accountMetadata.js","sourceRoot":"","sources":["../../../../../accounts/kernel/utils/common/accountMetadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAKH,oBAAoB,EACpB,kBAAkB,EAClB,aAAa,EAChB,MAAM,MAAM,CAAA;AACb,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAEtD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAOpD,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAIhC,MAA6C,EAC7C,cAAuB,EACvB,aAAkC,
|
|
1
|
+
{"version":3,"file":"accountMetadata.js","sourceRoot":"","sources":["../../../../../accounts/kernel/utils/common/accountMetadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAKH,oBAAoB,EACpB,kBAAkB,EAClB,aAAa,EAChB,MAAM,MAAM,CAAA;AACb,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAEtD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAOpD,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAIhC,MAA6C,EAC7C,cAAuB,EACvB,aAAkC,EAClC,OAAgB,EACQ,EAAE;IAC1B,IAAI,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;YAChC,MAAM,EAAE,UAAU;YAClB,MAAM,EAAE;gBACJ;oBACI,EAAE,EAAE,cAAc;oBAClB,IAAI,EAAE,kBAAkB,CAAC;wBACrB,GAAG,EAAE,UAAU;wBACf,YAAY,EAAE,cAAc;qBAC/B,CAAC;iBACL;gBACD,QAAQ;aACX;SACJ,CAAC,CAAA;QACF,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YAClB,MAAM,OAAO,GAAG,oBAAoB,CAAC;gBACjC,GAAG,EAAE,CAAC,GAAG,UAAU,CAAC;gBACpB,YAAY,EAAE,cAAc;gBAC5B,IAAI,EAAE,MAAM;aACf,CAAC,CAAA;YACF,OAAO;gBACH,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;gBAChB,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;gBACnB,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;aACtB,CAAA;QACL,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC,CAAA,CAAC;IAClB,OAAO;QACH,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,aAAa;QACjE,OAAO,EAAE,MAAM,CACX,OAAO;YACH,CAAC,MAAM,CAAC,KAAK;gBACT,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;gBACjB,CAAC,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,UAAU,EAAE,CAAC,CAC7D;KACJ,CAAA;AACL,CAAC,CAAA"}
|
|
@@ -18,13 +18,13 @@ export function isKernelPluginManager(
|
|
|
18
18
|
plugin) {
|
|
19
19
|
return plugin.getPluginEnableSignature !== undefined;
|
|
20
20
|
}
|
|
21
|
-
export async function toKernelPluginManager(client, { sudo, regular, hook, pluginEnableSignature, validatorInitData, action, validAfter = 0, validUntil = 0, entryPoint: entryPointAddress, kernelVersion }) {
|
|
21
|
+
export async function toKernelPluginManager(client, { sudo, regular, hook, pluginEnableSignature, validatorInitData, action, validAfter = 0, validUntil = 0, entryPoint: entryPointAddress, kernelVersion, chainId }) {
|
|
22
22
|
if ((sudo && !satisfies(kernelVersion, sudo?.supportedKernelVersions)) ||
|
|
23
23
|
(regular && !satisfies(kernelVersion, regular?.supportedKernelVersions))) {
|
|
24
24
|
throw new Error("Either sudo or/and regular validator version mismatch. Update to latest plugin package and use the proper plugin version");
|
|
25
25
|
}
|
|
26
|
+
let pluginEnabled;
|
|
26
27
|
const entryPointVersion = getEntryPointVersion(entryPointAddress);
|
|
27
|
-
let chainId;
|
|
28
28
|
const activeValidator = regular || sudo;
|
|
29
29
|
if (!activeValidator) {
|
|
30
30
|
throw new Error("One of `sudo` or `regular` validator must be set");
|
|
@@ -51,6 +51,9 @@ export async function toKernelPluginManager(client, { sudo, regular, hook, plugi
|
|
|
51
51
|
}
|
|
52
52
|
if (entryPointVersion === "v0.6") {
|
|
53
53
|
if (regular) {
|
|
54
|
+
if (pluginEnabled) {
|
|
55
|
+
return ValidatorMode.plugin;
|
|
56
|
+
}
|
|
54
57
|
if (await isPluginEnabled(accountAddress, selector)) {
|
|
55
58
|
return ValidatorMode.plugin;
|
|
56
59
|
}
|
|
@@ -75,6 +78,9 @@ export async function toKernelPluginManager(client, { sudo, regular, hook, plugi
|
|
|
75
78
|
}
|
|
76
79
|
}
|
|
77
80
|
if (regular) {
|
|
81
|
+
if (pluginEnabled) {
|
|
82
|
+
return userOpSignature;
|
|
83
|
+
}
|
|
78
84
|
if (await isPluginEnabled(accountAddress, action.selector)) {
|
|
79
85
|
return userOpSignature;
|
|
80
86
|
}
|
|
@@ -103,8 +109,12 @@ export async function toKernelPluginManager(client, { sudo, regular, hook, plugi
|
|
|
103
109
|
if (entryPointVersion === "v0.6") {
|
|
104
110
|
return regular.isEnabled(accountAddress, selector);
|
|
105
111
|
}
|
|
106
|
-
|
|
107
|
-
(await isPluginInitialized(client, accountAddress, regular.address))
|
|
112
|
+
const isEnabled = (await regular.isEnabled(accountAddress, action.selector)) ||
|
|
113
|
+
(await isPluginInitialized(client, accountAddress, regular.address));
|
|
114
|
+
if (isEnabled) {
|
|
115
|
+
pluginEnabled = true;
|
|
116
|
+
}
|
|
117
|
+
return isEnabled;
|
|
108
118
|
};
|
|
109
119
|
const getPluginEnableSignature = async (accountAddress) => {
|
|
110
120
|
if (!action) {
|
|
@@ -118,7 +128,7 @@ export async function toKernelPluginManager(client, { sudo, regular, hook, plugi
|
|
|
118
128
|
throw new Error("regular validator not set");
|
|
119
129
|
const { version } = await accountMetadata(client, accountAddress, kernelVersion);
|
|
120
130
|
if (!chainId) {
|
|
121
|
-
chainId = await getChainId(client);
|
|
131
|
+
chainId = client.chain?.id ?? (await getChainId(client));
|
|
122
132
|
}
|
|
123
133
|
let ownerSig;
|
|
124
134
|
if (entryPointVersion === "v0.6") {
|
|
@@ -167,7 +177,7 @@ export async function toKernelPluginManager(client, { sudo, regular, hook, plugi
|
|
|
167
177
|
const { version } = await accountMetadata(client, accountAddress, kernelVersion);
|
|
168
178
|
const validatorNonce = await getKernelV3Nonce(client, accountAddress);
|
|
169
179
|
if (!chainId) {
|
|
170
|
-
chainId = await getChainId(client);
|
|
180
|
+
chainId = client.chain?.id ?? (await getChainId(client));
|
|
171
181
|
}
|
|
172
182
|
const typedData = await getPluginsEnableTypedDataV2({
|
|
173
183
|
accountAddress,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toKernelPluginManager.js","sourceRoot":"","sources":["../../../accounts/utils/toKernelPluginManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AAErD,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAClC,OAAO,EAMH,MAAM,EACN,SAAS,EACT,SAAS,EACT,UAAU,EACV,GAAG,EACH,KAAK,EACL,WAAW,EACd,MAAM,MAAM,CAAA;AACb,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,2BAA2B,IAAI,gCAAgC,EAAE,MAAM,0EAA0E,CAAA;AAC1J,OAAO,EACH,4BAA4B,EAC5B,cAAc,EACd,cAAc,EACjB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAGH,aAAa,EAChB,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,gBAAgB,EAAE,MAAM,mDAAmD,CAAA;AACpF,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAA;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAA;AAC/E,OAAO,EAAE,qBAAqB,IAAI,uBAAuB,EAAE,MAAM,wDAAwD,CAAA;AACzH,OAAO,EAAE,yBAAyB,IAAI,2BAA2B,EAAE,MAAM,4DAA4D,CAAA;AACrI,OAAO,EAAE,qBAAqB,IAAI,uBAAuB,EAAE,MAAM,wDAAwD,CAAA;AACzH,OAAO,EAAE,yBAAyB,IAAI,2BAA2B,EAAE,MAAM,4DAA4D,CAAA;AACrI,OAAO,EAAE,mBAAmB,EAAE,MAAM,sDAAsD,CAAA;AAE1F,MAAM,UAAU,qBAAqB;AACjC,4DAA4D;AAC5D,MAAW;IAEX,OAAO,MAAM,CAAC,wBAAwB,KAAK,SAAS,CAAA;AACxD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAKvC,MAA6C,EAC7C,EACI,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,qBAAqB,EACrB,iBAAiB,EACjB,MAAM,EACN,UAAU,GAAG,CAAC,EACd,UAAU,GAAG,CAAC,EACd,UAAU,EAAE,iBAAiB,EAC7B,aAAa,
|
|
1
|
+
{"version":3,"file":"toKernelPluginManager.js","sourceRoot":"","sources":["../../../accounts/utils/toKernelPluginManager.ts"],"names":[],"mappings":"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"}
|
package/_esm/types/kernel.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kernel.js","sourceRoot":"","sources":["../../types/kernel.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"kernel.js","sourceRoot":"","sources":["../../types/kernel.ts"],"names":[],"mappings":"AAyNA,MAAM,CAAN,IAAY,aAIX;AAJD,WAAY,aAAa;IACrB,oCAAmB,CAAA;IACnB,sCAAqB,CAAA;IACrB,sCAAqB,CAAA;AACzB,CAAC,EAJW,aAAa,KAAb,aAAa,QAIxB"}
|
|
@@ -21,6 +21,7 @@ export type CreateKernelAccountParameters<entryPoint extends EntryPoint, KernelV
|
|
|
21
21
|
kernelVersion: GetKernelVersion<entryPoint>;
|
|
22
22
|
initConfig?: KernelVerion extends "0.3.1" ? Hex[] : never;
|
|
23
23
|
useMetaFactory?: boolean;
|
|
24
|
+
chainId?: number;
|
|
24
25
|
};
|
|
25
26
|
/**
|
|
26
27
|
* Default addresses for kernel smart account
|
|
@@ -43,5 +44,5 @@ export declare const KERNEL_ADDRESSES: {
|
|
|
43
44
|
* @param ecdsaValidatorAddress
|
|
44
45
|
* @param deployedAccountAddress
|
|
45
46
|
*/
|
|
46
|
-
export declare function createKernelAccount<entryPoint extends EntryPoint, KernelVersion extends GetKernelVersion<entryPoint>, TTransport extends Transport = Transport, TChain extends Chain | undefined = Chain | undefined>(client: Client<TTransport, TChain, undefined>, { plugins, entryPoint: entryPointAddress, index, factoryAddress: _factoryAddress, accountImplementationAddress: _accountImplementationAddress, metaFactoryAddress: _metaFactoryAddress, deployedAccountAddress, kernelVersion, initConfig, useMetaFactory }: CreateKernelAccountParameters<entryPoint, KernelVersion>): Promise<KernelSmartAccount<entryPoint, TTransport, TChain>>;
|
|
47
|
+
export declare function createKernelAccount<entryPoint extends EntryPoint, KernelVersion extends GetKernelVersion<entryPoint>, TTransport extends Transport = Transport, TChain extends Chain | undefined = Chain | undefined>(client: Client<TTransport, TChain, undefined>, { plugins, entryPoint: entryPointAddress, index, factoryAddress: _factoryAddress, accountImplementationAddress: _accountImplementationAddress, metaFactoryAddress: _metaFactoryAddress, deployedAccountAddress, kernelVersion, initConfig, useMetaFactory, chainId }: CreateKernelAccountParameters<entryPoint, KernelVersion>): Promise<KernelSmartAccount<entryPoint, TTransport, TChain>>;
|
|
47
48
|
//# sourceMappingURL=createKernelAccount.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createKernelAccount.d.ts","sourceRoot":"","sources":["../../../accounts/kernel/createKernelAccount.ts"],"names":[],"mappings":"AAMA,OAAO,EAEH,KAAK,YAAY,EAEpB,MAAM,yBAAyB,CAAA;AAChC,OAAO,KAAK,EAGR,UAAU,EACb,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,MAAM,EACX,KAAK,GAAG,EACR,KAAK,SAAS,EAUjB,MAAM,MAAM,CAAA;AAEb,OAAO,KAAK,EACR,gBAAgB,EAChB,wBAAwB,EACxB,mBAAmB,EACnB,yBAAyB,EAC5B,MAAM,uBAAuB,CAAA;AAoB9B,MAAM,MAAM,kBAAkB,CAC1B,UAAU,SAAS,UAAU,EAC7B,SAAS,SAAS,SAAS,GAAG,SAAS,EACvC,KAAK,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,IACnD,YAAY,CAAC,UAAU,EAAE,oBAAoB,EAAE,SAAS,EAAE,KAAK,CAAC,GAAG;IACnE,aAAa,EAAE,gBAAgB,CAAC,UAAU,CAAC,CAAA;IAC3C,mBAAmB,EAAE,mBAAmB,CAAC,UAAU,CAAC,CAAA;IACpD,QAAQ,EAAE,CAAC,cAAc,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;IACtD,gBAAgB,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,CAAA;IACpC,cAAc,EAAE,CAAC,IAAI,EAAE,wBAAwB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IAChE,2BAA2B,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,CAAA;CAClD,CAAA;AAED,MAAM,MAAM,6BAA6B,CACrC,UAAU,SAAS,UAAU,EAC7B,YAAY,SAAS,gBAAgB,CAAC,UAAU,CAAC,IACjD;IACA,OAAO,EACD,IAAI,CACA,yBAAyB,CAAC,UAAU,CAAC,EACrC,YAAY,GAAG,eAAe,CACjC,GACD,mBAAmB,CAAC,UAAU,CAAC,CAAA;IACrC,UAAU,EAAE,UAAU,CAAA;IACtB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,4BAA4B,CAAC,EAAE,OAAO,CAAA;IACtC,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAChC,aAAa,EAAE,gBAAgB,CAAC,UAAU,CAAC,CAAA;IAC3C,UAAU,CAAC,EAAE,YAAY,SAAS,OAAO,GAAG,GAAG,EAAE,GAAG,KAAK,CAAA;IACzD,cAAc,CAAC,EAAE,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"createKernelAccount.d.ts","sourceRoot":"","sources":["../../../accounts/kernel/createKernelAccount.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
import { type Address, type Chain, type Client, type Transport } from "viem";
|
|
2
2
|
import type { KERNEL_VERSION_TYPE } from "../../../../types/kernel.js";
|
|
3
|
-
type AccountMetadata = {
|
|
3
|
+
export type AccountMetadata = {
|
|
4
4
|
name: string;
|
|
5
5
|
version: string;
|
|
6
6
|
chainId: bigint;
|
|
7
7
|
};
|
|
8
|
-
export declare const accountMetadata: <TTransport extends Transport = Transport, TChain extends Chain | undefined = Chain | undefined>(client: Client<TTransport, TChain, undefined>, accountAddress: Address, kernelVersion: KERNEL_VERSION_TYPE) => Promise<AccountMetadata>;
|
|
9
|
-
export {};
|
|
8
|
+
export declare const accountMetadata: <TTransport extends Transport = Transport, TChain extends Chain | undefined = Chain | undefined>(client: Client<TTransport, TChain, undefined>, accountAddress: Address, kernelVersion: KERNEL_VERSION_TYPE, chainId?: number) => Promise<AccountMetadata>;
|
|
10
9
|
//# sourceMappingURL=accountMetadata.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accountMetadata.d.ts","sourceRoot":"","sources":["../../../../../accounts/kernel/utils/common/accountMetadata.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,MAAM,EACX,KAAK,SAAS,EAIjB,MAAM,MAAM,CAAA;AAEb,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AAGtE,
|
|
1
|
+
{"version":3,"file":"accountMetadata.d.ts","sourceRoot":"","sources":["../../../../../accounts/kernel/utils/common/accountMetadata.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,MAAM,EACX,KAAK,SAAS,EAIjB,MAAM,MAAM,CAAA;AAEb,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AAGtE,MAAM,MAAM,eAAe,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;CAClB,CAAA;AACD,eAAO,MAAM,eAAe,kKAKR,OAAO,iBACR,mBAAmB,YACxB,MAAM,KACjB,QAAQ,eAAe,CAsCzB,CAAA"}
|
|
@@ -2,5 +2,5 @@ import type { EntryPoint } from "permissionless/types/entrypoint";
|
|
|
2
2
|
import { type Chain, type Client, type Transport } from "viem";
|
|
3
3
|
import { type KernelPluginManager, type KernelPluginManagerParams } from "../../types/kernel.js";
|
|
4
4
|
export declare function isKernelPluginManager<entryPoint extends EntryPoint>(plugin: any): plugin is KernelPluginManager<entryPoint>;
|
|
5
|
-
export declare function toKernelPluginManager<entryPoint extends EntryPoint, TTransport extends Transport = Transport, TChain extends Chain | undefined = Chain | undefined>(client: Client<TTransport, TChain, undefined>, { sudo, regular, hook, pluginEnableSignature, validatorInitData, action, validAfter, validUntil, entryPoint: entryPointAddress, kernelVersion }: KernelPluginManagerParams<entryPoint>): Promise<KernelPluginManager<entryPoint>>;
|
|
5
|
+
export declare function toKernelPluginManager<entryPoint extends EntryPoint, TTransport extends Transport = Transport, TChain extends Chain | undefined = Chain | undefined>(client: Client<TTransport, TChain, undefined>, { sudo, regular, hook, pluginEnableSignature, validatorInitData, action, validAfter, validUntil, entryPoint: entryPointAddress, kernelVersion, chainId }: KernelPluginManagerParams<entryPoint>): Promise<KernelPluginManager<entryPoint>>;
|
|
6
6
|
//# sourceMappingURL=toKernelPluginManager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toKernelPluginManager.d.ts","sourceRoot":"","sources":["../../../accounts/utils/toKernelPluginManager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAEjE,OAAO,EAEH,KAAK,KAAK,EACV,KAAK,MAAM,EAEX,KAAK,SAAS,EAQjB,MAAM,MAAM,CAAA;AAQb,OAAO,EACH,KAAK,mBAAmB,EACxB,KAAK,yBAAyB,EAEjC,MAAM,uBAAuB,CAAA;AAU9B,wBAAgB,qBAAqB,CAAC,UAAU,SAAS,UAAU,EAE/D,MAAM,EAAE,GAAG,GACZ,MAAM,IAAI,mBAAmB,CAAC,UAAU,CAAC,CAE3C;AAED,wBAAsB,qBAAqB,CACvC,UAAU,SAAS,UAAU,EAC7B,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,MAAM,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,EAEpD,MAAM,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,EAC7C,EACI,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,qBAAqB,EACrB,iBAAiB,EACjB,MAAM,EACN,UAAc,EACd,UAAc,EACd,UAAU,EAAE,iBAAiB,EAC7B,aAAa,
|
|
1
|
+
{"version":3,"file":"toKernelPluginManager.d.ts","sourceRoot":"","sources":["../../../accounts/utils/toKernelPluginManager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAEjE,OAAO,EAEH,KAAK,KAAK,EACV,KAAK,MAAM,EAEX,KAAK,SAAS,EAQjB,MAAM,MAAM,CAAA;AAQb,OAAO,EACH,KAAK,mBAAmB,EACxB,KAAK,yBAAyB,EAEjC,MAAM,uBAAuB,CAAA;AAU9B,wBAAgB,qBAAqB,CAAC,UAAU,SAAS,UAAU,EAE/D,MAAM,EAAE,GAAG,GACZ,MAAM,IAAI,mBAAmB,CAAC,UAAU,CAAC,CAE3C;AAED,wBAAsB,qBAAqB,CACvC,UAAU,SAAS,UAAU,EAC7B,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,MAAM,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,EAEpD,MAAM,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,EAC7C,EACI,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,qBAAqB,EACrB,iBAAiB,EACjB,MAAM,EACN,UAAc,EACd,UAAc,EACd,UAAU,EAAE,iBAAiB,EAC7B,aAAa,EACb,OAAO,EACV,EAAE,yBAAyB,CAAC,UAAU,CAAC,GACzC,OAAO,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC,CA6V1C"}
|
package/_types/types/kernel.d.ts
CHANGED
|
@@ -142,6 +142,7 @@ export type KernelPluginManagerParams<entryPoint extends EntryPoint> = {
|
|
|
142
142
|
action?: Action;
|
|
143
143
|
entryPoint: entryPoint;
|
|
144
144
|
kernelVersion: KERNEL_VERSION_TYPE;
|
|
145
|
+
chainId?: number;
|
|
145
146
|
} & Partial<PluginValidityData>;
|
|
146
147
|
export type Hook = {
|
|
147
148
|
address: Address;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kernel.d.ts","sourceRoot":"","sources":["../../types/kernel.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"kernel.d.ts","sourceRoot":"","sources":["../../types/kernel.ts"],"names":[],"mappings":"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"}
|
|
@@ -88,6 +88,7 @@ export type CreateKernelAccountParameters<
|
|
|
88
88
|
kernelVersion: GetKernelVersion<entryPoint>
|
|
89
89
|
initConfig?: KernelVerion extends "0.3.1" ? Hex[] : never
|
|
90
90
|
useMetaFactory?: boolean
|
|
91
|
+
chainId?: number
|
|
91
92
|
}
|
|
92
93
|
|
|
93
94
|
/**
|
|
@@ -379,7 +380,8 @@ export async function createKernelAccount<
|
|
|
379
380
|
deployedAccountAddress,
|
|
380
381
|
kernelVersion,
|
|
381
382
|
initConfig,
|
|
382
|
-
useMetaFactory = true
|
|
383
|
+
useMetaFactory = true,
|
|
384
|
+
chainId
|
|
383
385
|
}: CreateKernelAccountParameters<entryPoint, KernelVersion>
|
|
384
386
|
): Promise<KernelSmartAccount<entryPoint, TTransport, TChain>> {
|
|
385
387
|
const entryPointVersion = getEntryPointVersion(entryPointAddress)
|
|
@@ -399,7 +401,8 @@ export async function createKernelAccount<
|
|
|
399
401
|
action: plugins.action,
|
|
400
402
|
pluginEnableSignature: plugins.pluginEnableSignature,
|
|
401
403
|
entryPoint: entryPointAddress,
|
|
402
|
-
kernelVersion
|
|
404
|
+
kernelVersion,
|
|
405
|
+
chainId
|
|
403
406
|
})
|
|
404
407
|
|
|
405
408
|
// initHook flag is activated only if both the hook and sudo validator are given
|
|
@@ -523,14 +526,19 @@ export async function createKernelAccount<
|
|
|
523
526
|
},
|
|
524
527
|
async signMessage({ message }) {
|
|
525
528
|
const messageHash = hashMessage(message)
|
|
526
|
-
const {
|
|
529
|
+
const {
|
|
530
|
+
name,
|
|
531
|
+
chainId: metadataChainId,
|
|
532
|
+
version
|
|
533
|
+
} = await accountMetadata(
|
|
527
534
|
client,
|
|
528
535
|
accountAddress,
|
|
529
|
-
kernelVersion
|
|
536
|
+
kernelVersion,
|
|
537
|
+
chainId
|
|
530
538
|
)
|
|
531
539
|
const wrappedMessageHash = await eip712WrapHash(messageHash, {
|
|
532
540
|
name,
|
|
533
|
-
chainId: Number(
|
|
541
|
+
chainId: Number(metadataChainId),
|
|
534
542
|
version,
|
|
535
543
|
verifyingContract: accountAddress
|
|
536
544
|
})
|
|
@@ -574,14 +582,19 @@ export async function createKernelAccount<
|
|
|
574
582
|
|
|
575
583
|
const typedHash = hashTypedData(typedData)
|
|
576
584
|
|
|
577
|
-
const {
|
|
585
|
+
const {
|
|
586
|
+
name,
|
|
587
|
+
chainId: metadataChainId,
|
|
588
|
+
version
|
|
589
|
+
} = await accountMetadata(
|
|
578
590
|
client,
|
|
579
591
|
accountAddress,
|
|
580
|
-
kernelVersion
|
|
592
|
+
kernelVersion,
|
|
593
|
+
chainId
|
|
581
594
|
)
|
|
582
595
|
const wrappedMessageHash = await eip712WrapHash(typedHash, {
|
|
583
596
|
name,
|
|
584
|
-
chainId: Number(
|
|
597
|
+
chainId: Number(metadataChainId),
|
|
585
598
|
version,
|
|
586
599
|
verifyingContract: accountAddress
|
|
587
600
|
})
|
|
@@ -11,7 +11,7 @@ import { KERNEL_NAME } from "../../../../constants.js"
|
|
|
11
11
|
import type { KERNEL_VERSION_TYPE } from "../../../../types/kernel.js"
|
|
12
12
|
import { EIP1271Abi } from "../../abi/EIP1271Abi.js"
|
|
13
13
|
|
|
14
|
-
type AccountMetadata = {
|
|
14
|
+
export type AccountMetadata = {
|
|
15
15
|
name: string
|
|
16
16
|
version: string
|
|
17
17
|
chainId: bigint
|
|
@@ -22,7 +22,8 @@ export const accountMetadata = async <
|
|
|
22
22
|
>(
|
|
23
23
|
client: Client<TTransport, TChain, undefined>,
|
|
24
24
|
accountAddress: Address,
|
|
25
|
-
kernelVersion: KERNEL_VERSION_TYPE
|
|
25
|
+
kernelVersion: KERNEL_VERSION_TYPE,
|
|
26
|
+
chainId?: number
|
|
26
27
|
): Promise<AccountMetadata> => {
|
|
27
28
|
try {
|
|
28
29
|
const domain = await client.request({
|
|
@@ -54,8 +55,11 @@ export const accountMetadata = async <
|
|
|
54
55
|
return {
|
|
55
56
|
name: KERNEL_NAME,
|
|
56
57
|
version: kernelVersion === "0.3.0" ? "0.3.0-beta" : kernelVersion,
|
|
57
|
-
chainId:
|
|
58
|
-
|
|
59
|
-
|
|
58
|
+
chainId: BigInt(
|
|
59
|
+
chainId ??
|
|
60
|
+
(client.chain
|
|
61
|
+
? client.chain.id
|
|
62
|
+
: await client.extend(publicActions).getChainId())
|
|
63
|
+
)
|
|
60
64
|
}
|
|
61
65
|
}
|
|
@@ -59,7 +59,8 @@ export async function toKernelPluginManager<
|
|
|
59
59
|
validAfter = 0,
|
|
60
60
|
validUntil = 0,
|
|
61
61
|
entryPoint: entryPointAddress,
|
|
62
|
-
kernelVersion
|
|
62
|
+
kernelVersion,
|
|
63
|
+
chainId
|
|
63
64
|
}: KernelPluginManagerParams<entryPoint>
|
|
64
65
|
): Promise<KernelPluginManager<entryPoint>> {
|
|
65
66
|
if (
|
|
@@ -70,8 +71,8 @@ export async function toKernelPluginManager<
|
|
|
70
71
|
"Either sudo or/and regular validator version mismatch. Update to latest plugin package and use the proper plugin version"
|
|
71
72
|
)
|
|
72
73
|
}
|
|
74
|
+
let pluginEnabled: boolean
|
|
73
75
|
const entryPointVersion = getEntryPointVersion(entryPointAddress)
|
|
74
|
-
let chainId: number
|
|
75
76
|
const activeValidator = regular || sudo
|
|
76
77
|
if (!activeValidator) {
|
|
77
78
|
throw new Error("One of `sudo` or `regular` validator must be set")
|
|
@@ -106,6 +107,9 @@ export async function toKernelPluginManager<
|
|
|
106
107
|
}
|
|
107
108
|
if (entryPointVersion === "v0.6") {
|
|
108
109
|
if (regular) {
|
|
110
|
+
if (pluginEnabled) {
|
|
111
|
+
return ValidatorMode.plugin
|
|
112
|
+
}
|
|
109
113
|
if (await isPluginEnabled(accountAddress, selector)) {
|
|
110
114
|
return ValidatorMode.plugin
|
|
111
115
|
}
|
|
@@ -132,6 +136,9 @@ export async function toKernelPluginManager<
|
|
|
132
136
|
}
|
|
133
137
|
}
|
|
134
138
|
if (regular) {
|
|
139
|
+
if (pluginEnabled) {
|
|
140
|
+
return userOpSignature
|
|
141
|
+
}
|
|
135
142
|
if (await isPluginEnabled(accountAddress, action.selector)) {
|
|
136
143
|
return userOpSignature
|
|
137
144
|
}
|
|
@@ -159,10 +166,13 @@ export async function toKernelPluginManager<
|
|
|
159
166
|
if (entryPointVersion === "v0.6") {
|
|
160
167
|
return regular.isEnabled(accountAddress, selector)
|
|
161
168
|
}
|
|
162
|
-
|
|
169
|
+
const isEnabled =
|
|
163
170
|
(await regular.isEnabled(accountAddress, action.selector)) ||
|
|
164
171
|
(await isPluginInitialized(client, accountAddress, regular.address))
|
|
165
|
-
)
|
|
172
|
+
if (isEnabled) {
|
|
173
|
+
pluginEnabled = true
|
|
174
|
+
}
|
|
175
|
+
return isEnabled
|
|
166
176
|
}
|
|
167
177
|
|
|
168
178
|
const getPluginEnableSignature = async (accountAddress: Address) => {
|
|
@@ -182,7 +192,7 @@ export async function toKernelPluginManager<
|
|
|
182
192
|
kernelVersion
|
|
183
193
|
)
|
|
184
194
|
if (!chainId) {
|
|
185
|
-
chainId = await getChainId(client)
|
|
195
|
+
chainId = client.chain?.id ?? (await getChainId(client))
|
|
186
196
|
}
|
|
187
197
|
let ownerSig: Hex
|
|
188
198
|
if (entryPointVersion === "v0.6") {
|
|
@@ -241,7 +251,7 @@ export async function toKernelPluginManager<
|
|
|
241
251
|
const validatorNonce = await getKernelV3Nonce(client, accountAddress)
|
|
242
252
|
|
|
243
253
|
if (!chainId) {
|
|
244
|
-
chainId = await getChainId(client)
|
|
254
|
+
chainId = client.chain?.id ?? (await getChainId(client))
|
|
245
255
|
}
|
|
246
256
|
const typedData = await getPluginsEnableTypedDataV2({
|
|
247
257
|
accountAddress,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zerodev/sdk",
|
|
3
|
-
"version": "5.3.
|
|
3
|
+
"version": "5.3.13",
|
|
4
4
|
"author": "ZeroDev",
|
|
5
5
|
"main": "./_cjs/index.js",
|
|
6
6
|
"module": "./_esm/index.js",
|
|
@@ -9,13 +9,7 @@
|
|
|
9
9
|
"type": "module",
|
|
10
10
|
"sideEffects": false,
|
|
11
11
|
"description": "A utility library for working with ERC-4337",
|
|
12
|
-
"keywords": [
|
|
13
|
-
"ethereum",
|
|
14
|
-
"erc-4337",
|
|
15
|
-
"eip-4337",
|
|
16
|
-
"paymaster",
|
|
17
|
-
"bundler"
|
|
18
|
-
],
|
|
12
|
+
"keywords": ["ethereum", "erc-4337", "eip-4337", "paymaster", "bundler"],
|
|
19
13
|
"license": "MIT",
|
|
20
14
|
"files": [
|
|
21
15
|
"_esm",
|
|
@@ -96,30 +90,14 @@
|
|
|
96
90
|
},
|
|
97
91
|
"typesVersions": {
|
|
98
92
|
"*": {
|
|
99
|
-
"accounts": [
|
|
100
|
-
|
|
101
|
-
],
|
|
102
|
-
"
|
|
103
|
-
|
|
104
|
-
],
|
|
105
|
-
"
|
|
106
|
-
|
|
107
|
-
],
|
|
108
|
-
"types": [
|
|
109
|
-
"./_types/types/index.d.ts"
|
|
110
|
-
],
|
|
111
|
-
"actions/kernel": [
|
|
112
|
-
"./_types/actions/kernel/index.d.ts"
|
|
113
|
-
],
|
|
114
|
-
"clients": [
|
|
115
|
-
"./_types/clients/index.d.ts"
|
|
116
|
-
],
|
|
117
|
-
"clients/kernel": [
|
|
118
|
-
"./_types/clients/kernel/index.d.ts"
|
|
119
|
-
],
|
|
120
|
-
"providers": [
|
|
121
|
-
"./_types/providers/index.d.ts"
|
|
122
|
-
]
|
|
93
|
+
"accounts": ["./_types/accounts/index.d.ts"],
|
|
94
|
+
"plugins": ["./_types/plugins/index.d.ts"],
|
|
95
|
+
"actions": ["./_types/actions/index.d.ts"],
|
|
96
|
+
"types": ["./_types/types/index.d.ts"],
|
|
97
|
+
"actions/kernel": ["./_types/actions/kernel/index.d.ts"],
|
|
98
|
+
"clients": ["./_types/clients/index.d.ts"],
|
|
99
|
+
"clients/kernel": ["./_types/clients/kernel/index.d.ts"],
|
|
100
|
+
"providers": ["./_types/providers/index.d.ts"]
|
|
123
101
|
}
|
|
124
102
|
},
|
|
125
103
|
"peerDependencies": {
|
package/types/kernel.ts
CHANGED