@zerodev/sdk 5.2.1-alpha-0 → 5.2.1-alpha-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/_cjs/accounts/kernel/createKernelAccount.js +2 -2
- package/_cjs/accounts/kernel/createKernelAccount.js.map +1 -1
- package/_cjs/accounts/kernel/utils/plugins/ep0_7/getPluginsEnableTypedData.js +1 -1
- package/_cjs/accounts/kernel/utils/plugins/ep0_7/getPluginsEnableTypedData.js.map +1 -1
- package/_cjs/accounts/kernel/v1/createKernelV1Account.js +4 -2
- package/_cjs/accounts/kernel/v1/createKernelV1Account.js.map +1 -1
- package/_cjs/accounts/kernel/v2/createKernelV2Account.js +7 -3
- package/_cjs/accounts/kernel/v2/createKernelV2Account.js.map +1 -1
- package/_cjs/accounts/utils/toKernelPluginManager.js +14 -7
- package/_cjs/accounts/utils/toKernelPluginManager.js.map +1 -1
- package/_cjs/types/kernel.js.map +1 -1
- package/_esm/accounts/kernel/createKernelAccount.js +2 -2
- package/_esm/accounts/kernel/createKernelAccount.js.map +1 -1
- package/_esm/accounts/kernel/utils/plugins/ep0_7/getPluginsEnableTypedData.js +2 -2
- package/_esm/accounts/kernel/utils/plugins/ep0_7/getPluginsEnableTypedData.js.map +1 -1
- package/_esm/accounts/kernel/v1/createKernelV1Account.js +5 -3
- package/_esm/accounts/kernel/v1/createKernelV1Account.js.map +1 -1
- package/_esm/accounts/kernel/v2/createKernelV2Account.js +8 -4
- package/_esm/accounts/kernel/v2/createKernelV2Account.js.map +1 -1
- package/_esm/accounts/utils/toKernelPluginManager.js +15 -7
- 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/plugins/ep0_7/getPluginsEnableTypedData.d.ts.map +1 -1
- package/_types/accounts/kernel/v1/createKernelV1Account.d.ts +1 -1
- package/_types/accounts/kernel/v1/createKernelV1Account.d.ts.map +1 -1
- package/_types/accounts/kernel/v2/createKernelV2Account.d.ts +2 -1
- package/_types/accounts/kernel/v2/createKernelV2Account.d.ts.map +1 -1
- package/_types/accounts/utils/toKernelPluginManager.d.ts.map +1 -1
- package/_types/types/kernel.d.ts +1 -1
- package/_types/types/kernel.d.ts.map +1 -1
- package/accounts/kernel/createKernelAccount.ts +7 -4
- package/accounts/kernel/utils/plugins/ep0_7/getPluginsEnableTypedData.ts +2 -2
- package/accounts/kernel/v1/createKernelV1Account.ts +20 -8
- package/accounts/kernel/v2/createKernelV2Account.ts +14 -5
- package/accounts/utils/toKernelPluginManager.ts +35 -14
- package/package.json +1 -1
- package/types/kernel.ts +4 -1
|
@@ -228,8 +228,8 @@ async function createKernelAccount(client, { plugins, entryPoint: entryPointAddr
|
|
|
228
228
|
signature
|
|
229
229
|
]);
|
|
230
230
|
},
|
|
231
|
-
async getNonce() {
|
|
232
|
-
const key = await kernelPluginManager.getNonceKey(accountAddress);
|
|
231
|
+
async getNonce(customNonceKey) {
|
|
232
|
+
const key = await kernelPluginManager.getNonceKey(accountAddress, customNonceKey);
|
|
233
233
|
return (0, permissionless_1.getAccountNonce)(client, {
|
|
234
234
|
sender: accountAddress,
|
|
235
235
|
entryPoint: entryPointAddress,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createKernelAccount.js","sourceRoot":"","sources":["../../../accounts/kernel/createKernelAccount.ts"],"names":[],"mappings":";;;AAAA,mDAKuB;AACvB,sDAIgC;AAMhC,+BAca;AAMb,6CAAkE;AAClE,gDAAqF;AACrF,gFAG0C;AAC1C,mEAAyD;AACzD,kFAA0E;AAC1E,+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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"}
|
|
@@ -24,7 +24,7 @@ const getPluginsEnableTypedData = async ({ accountAddress, chainId, kernelVersio
|
|
|
24
24
|
message: {
|
|
25
25
|
validationId: (0, viem_1.concat)([
|
|
26
26
|
constants_js_1.VALIDATOR_TYPE[validator.validatorType],
|
|
27
|
-
validator.getIdentifier()
|
|
27
|
+
(0, viem_1.pad)(validator.getIdentifier(), { size: 20, dir: "right" })
|
|
28
28
|
]),
|
|
29
29
|
nonce: validatorNonce,
|
|
30
30
|
hook: viem_1.zeroAddress,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPluginsEnableTypedData.js","sourceRoot":"","sources":["../../../../../../accounts/kernel/utils/plugins/ep0_7/getPluginsEnableTypedData.ts"],"names":[],"mappings":";;;AAIA,+
|
|
1
|
+
{"version":3,"file":"getPluginsEnableTypedData.js","sourceRoot":"","sources":["../../../../../../accounts/kernel/utils/plugins/ep0_7/getPluginsEnableTypedData.ts"],"names":[],"mappings":";;;AAIA,+BAAgF;AAChF,8DAA4D;AAGrD,MAAM,yBAAyB,GAAG,KAAK,EAE5C,EACE,cAAc,EACd,OAAO,EACP,aAAa,EACb,MAAM,EACN,SAAS,EACT,cAAc,EAMe,EAE/B,EAAE;IACA,OAAO;QACH,MAAM,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,aAAa;YACtB,OAAO;YACP,iBAAiB,EAAE,cAAc;SACpC;QACD,KAAK,EAAE;YACH,MAAM,EAAE;gBACJ,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE;gBACzC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE;gBACjC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE;gBACjC,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,OAAO,EAAE;gBACxC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE;gBACnC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,EAAE;aAC1C;SACJ;QACD,OAAO,EAAE;YACL,YAAY,EAAE,IAAA,aAAM,EAAC;gBACjB,6BAAc,CAAC,SAAS,CAAC,aAAa,CAAC;gBACvC,IAAA,UAAG,EAAC,SAAS,CAAC,aAAa,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC;aAC7D,CAAC;YACF,KAAK,EAAE,cAAc;YACrB,IAAI,EAAE,kBAAW;YACjB,aAAa,EAAE,MAAM,SAAS,CAAC,aAAa,CAAC,cAAc,CAAC;YAC5D,QAAQ,EAAE,IAAI;YACd,YAAY,EAAE,IAAA,aAAM,EAAC;gBACjB,MAAM,CAAC,QAAQ;gBACf,MAAM,CAAC,OAAO;gBACd,kBAAW;gBACX,IAAI;aACP,CAAC;SACL;QACD,WAAW,EAAE,QAAQ;KACxB,CAAA;AACL,CAAC,CAAA;AApDY,QAAA,yBAAyB,6BAoDrC"}
|
|
@@ -45,8 +45,10 @@ const KERNEL_V1_ADDRESSES = {
|
|
|
45
45
|
FACTORY_ADDRESS: "0x4E4946298614FC299B50c947289F4aD0572CB9ce",
|
|
46
46
|
ENTRYPOINT_V0_6: "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789"
|
|
47
47
|
};
|
|
48
|
-
async function createKernelV1Account(client, { signer, entrypoint: entryPointAddress
|
|
49
|
-
|
|
48
|
+
async function createKernelV1Account(client, { signer, entrypoint: entryPointAddress, index = 0n }) {
|
|
49
|
+
const entryPointVersion = (0, permissionless_1.getEntryPointVersion)(entryPointAddress);
|
|
50
|
+
if (entryPointVersion !== "v0.6" ||
|
|
51
|
+
entryPointAddress !== permissionless_1.ENTRYPOINT_ADDRESS_V06) {
|
|
50
52
|
throw new Error("Only EntryPoint 0.6 is supported");
|
|
51
53
|
}
|
|
52
54
|
const viemSigner = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createKernelV1Account.js","sourceRoot":"","sources":["../../../../accounts/kernel/v1/createKernelV1Account.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"createKernelV1Account.js","sourceRoot":"","sources":["../../../../accounts/kernel/v1/createKernelV1Account.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,11 @@ const getAccountAddress = async ({ client, entryPoint: entryPointAddress, initCo
|
|
|
37
37
|
entryPoint: entryPointAddress
|
|
38
38
|
});
|
|
39
39
|
};
|
|
40
|
-
async function createKernelV2Account(client, { plugins, entryPoint: entryPointAddress
|
|
40
|
+
async function createKernelV2Account(client, { plugins, entryPoint: entryPointAddress, index = 0n, factoryAddress = exports.KERNEL_ADDRESSES.FACTORY_ADDRESS, deployedAccountAddress }) {
|
|
41
|
+
const entryPointVersion = (0, permissionless_1.getEntryPointVersion)(entryPointAddress);
|
|
42
|
+
if (entryPointVersion !== "v0.6") {
|
|
43
|
+
throw new Error("Only EntryPoint 0.6 is supported");
|
|
44
|
+
}
|
|
41
45
|
const kernelPluginManager = (0, toKernelPluginManager_js_1.isKernelPluginManager)(plugins)
|
|
42
46
|
? plugins
|
|
43
47
|
: await (0, toKernelPluginManager_js_1.toKernelPluginManager)(client, {
|
|
@@ -143,8 +147,8 @@ async function createKernelV2Account(client, { plugins, entryPoint: entryPointAd
|
|
|
143
147
|
return undefined;
|
|
144
148
|
return (0, index_js_1.parseFactoryAddressAndCallDataFromAccountInitCode)(await generateInitCode())[1];
|
|
145
149
|
},
|
|
146
|
-
async getNonce() {
|
|
147
|
-
const key = await kernelPluginManager.getNonceKey();
|
|
150
|
+
async getNonce(customNonceKey) {
|
|
151
|
+
const key = await kernelPluginManager.getNonceKey(accountAddress, customNonceKey);
|
|
148
152
|
return (0, permissionless_1.getAccountNonce)(client, {
|
|
149
153
|
sender: accountAddress,
|
|
150
154
|
entryPoint: entryPointAddress,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createKernelV2Account.js","sourceRoot":"","sources":["../../../../accounts/kernel/v2/createKernelV2Account.ts"],"names":[],"mappings":";;;AAAA,mDAKuB;AACvB,sDAGgC;AAKhC,+BAiBa;AACb,4CAAyC;AAMzC,kDAA2D;AAC3D,mDAAwF;AACxF,2DAIiC;AACjC,mFAG6C;AAC7C,uEAAgE;AAChE,uEAAgE;
|
|
1
|
+
{"version":3,"file":"createKernelV2Account.js","sourceRoot":"","sources":["../../../../accounts/kernel/v2/createKernelV2Account.ts"],"names":[],"mappings":"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"}
|
|
@@ -160,9 +160,11 @@ async function toKernelPluginManager(client, { sudo, regular, pluginEnableSignat
|
|
|
160
160
|
}
|
|
161
161
|
return await getSignatureData(userOperation.sender, userOperation.callData.toString().slice(0, 10), userOpSig);
|
|
162
162
|
},
|
|
163
|
-
getNonceKey: async (accountAddress = viem_1.zeroAddress) => {
|
|
163
|
+
getNonceKey: async (accountAddress = viem_1.zeroAddress, customNonceKey = 0n) => {
|
|
164
164
|
if (entryPointVersion === "v0.6")
|
|
165
|
-
return await activeValidator.getNonceKey();
|
|
165
|
+
return await activeValidator.getNonceKey(accountAddress, customNonceKey);
|
|
166
|
+
if (customNonceKey > 0xffffn)
|
|
167
|
+
throw new Error("Custom nonce key must be less than 2 bytes");
|
|
166
168
|
const validatorMode = !regular ||
|
|
167
169
|
(await isPluginEnabled(accountAddress, action.selector))
|
|
168
170
|
? constants_js_1.VALIDATOR_MODE.DEFAULT
|
|
@@ -170,14 +172,19 @@ async function toKernelPluginManager(client, { sudo, regular, pluginEnableSignat
|
|
|
170
172
|
const validatorType = regular
|
|
171
173
|
? constants_js_1.VALIDATOR_TYPE[regular.validatorType]
|
|
172
174
|
: constants_js_1.VALIDATOR_TYPE.SUDO;
|
|
173
|
-
|
|
175
|
+
const encoding = (0, viem_1.pad)((0, viem_1.concatHex)([
|
|
174
176
|
validatorMode,
|
|
175
177
|
validatorType,
|
|
176
|
-
activeValidator.getIdentifier(),
|
|
177
|
-
|
|
178
|
+
(0, viem_1.pad)(activeValidator.getIdentifier(), {
|
|
179
|
+
size: 20,
|
|
180
|
+
dir: "right"
|
|
181
|
+
}),
|
|
182
|
+
(0, viem_1.pad)((0, viem_1.toHex)(await activeValidator.getNonceKey(accountAddress, customNonceKey)), {
|
|
178
183
|
size: 2
|
|
179
184
|
})
|
|
180
|
-
]), { size: 24 })
|
|
185
|
+
]), { size: 24 });
|
|
186
|
+
const encodedNonceKey = BigInt(encoding);
|
|
187
|
+
return encodedNonceKey;
|
|
181
188
|
},
|
|
182
189
|
getPluginEnableSignature,
|
|
183
190
|
getValidatorInitData: async () => {
|
|
@@ -187,7 +194,7 @@ async function toKernelPluginManager(client, { sudo, regular, pluginEnableSignat
|
|
|
187
194
|
validatorAddress: sudo?.address ?? activeValidator.address,
|
|
188
195
|
enableData: (await sudo?.getEnableData()) ??
|
|
189
196
|
(await activeValidator.getEnableData()),
|
|
190
|
-
identifier: getIdentifier(true)
|
|
197
|
+
identifier: (0, viem_1.pad)(getIdentifier(true), { size: 21, dir: "right" })
|
|
191
198
|
};
|
|
192
199
|
}
|
|
193
200
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toKernelPluginManager.js","sourceRoot":"","sources":["../../../accounts/utils/toKernelPluginManager.ts"],"names":[],"mappings":"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
|
|
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":";;;AAwJA,IAAY,aAIX;AAJD,WAAY,aAAa;IACrB,oCAAmB,CAAA;IACnB,sCAAqB,CAAA;IACrB,sCAAqB,CAAA;AACzB,CAAC,EAJW,aAAa,6BAAb,aAAa,QAIxB"}
|
|
@@ -265,8 +265,8 @@ export async function createKernelAccount(client, { plugins, entryPoint: entryPo
|
|
|
265
265
|
]);
|
|
266
266
|
},
|
|
267
267
|
// Get the nonce of the smart account
|
|
268
|
-
async getNonce() {
|
|
269
|
-
const key = await kernelPluginManager.getNonceKey(accountAddress);
|
|
268
|
+
async getNonce(customNonceKey) {
|
|
269
|
+
const key = await kernelPluginManager.getNonceKey(accountAddress, customNonceKey);
|
|
270
270
|
return getAccountNonce(client, {
|
|
271
271
|
sender: accountAddress,
|
|
272
272
|
entryPoint: entryPointAddress,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createKernelAccount.js","sourceRoot":"","sources":["../../../accounts/kernel/createKernelAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,eAAe,EACf,oBAAoB,EACpB,gBAAgB,EAChB,sBAAsB,EACzB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EACH,yCAAyC,EAEzC,cAAc,EACjB,MAAM,yBAAyB,CAAA;AAMhC,OAAO,EAOH,SAAS,EACT,kBAAkB,EAClB,uBAAuB,EACvB,WAAW,EACX,aAAa,EACb,iBAAiB,EACjB,WAAW,EACd,MAAM,MAAM,CAAA;AAMb,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAClE,OAAO,EAAE,iDAAiD,EAAE,MAAM,mBAAmB,CAAA;AACrF,OAAO,EACH,qBAAqB,EACrB,qBAAqB,EACxB,MAAM,mCAAmC,CAAA;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAA;AAC1E,OAAO,EAAE,cAAc,IAAI,mBAAmB,EAAE,MAAM,yCAAyC,CAAA;AAC/F,OAAO,EAAE,oBAAoB,IAAI,uBAAuB,EAAE,MAAM,+CAA+C,CAAA;AAC/G,OAAO,EAAE,cAAc,IAAI,mBAAmB,EAAE,MAAM,yCAAyC,CAAA;AAC/F,OAAO,EAAE,oBAAoB,IAAI,uBAAuB,EAAE,MAAM,+CAA+C,CAAA;AAC/G,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAA;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;
|
|
1
|
+
{"version":3,"file":"createKernelAccount.js","sourceRoot":"","sources":["../../../accounts/kernel/createKernelAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,eAAe,EACf,oBAAoB,EACpB,gBAAgB,EAChB,sBAAsB,EACzB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EACH,yCAAyC,EAEzC,cAAc,EACjB,MAAM,yBAAyB,CAAA;AAMhC,OAAO,EAOH,SAAS,EACT,kBAAkB,EAClB,uBAAuB,EACvB,WAAW,EACX,aAAa,EACb,iBAAiB,EACjB,WAAW,EACd,MAAM,MAAM,CAAA;AAMb,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAClE,OAAO,EAAE,iDAAiD,EAAE,MAAM,mBAAmB,CAAA;AACrF,OAAO,EACH,qBAAqB,EACrB,qBAAqB,EACxB,MAAM,mCAAmC,CAAA;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAA;AAC1E,OAAO,EAAE,cAAc,IAAI,mBAAmB,EAAE,MAAM,yCAAyC,CAAA;AAC/F,OAAO,EAAE,oBAAoB,IAAI,uBAAuB,EAAE,MAAM,+CAA+C,CAAA;AAC/G,OAAO,EAAE,cAAc,IAAI,mBAAmB,EAAE,MAAM,yCAAyC,CAAA;AAC/F,OAAO,EAAE,oBAAoB,IAAI,uBAAuB,EAAE,MAAM,+CAA+C,CAAA;AAC/G,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAA;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AAwBjE;;GAEG;AACH,MAAM,gBAAgB,GAAG;IACrB;QACI,MAAM,EAAE;YACJ;gBACI,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,iBAAiB;gBACvB,IAAI,EAAE,SAAS;aAClB;YACD;gBACI,YAAY,EAAE,OAAO;gBACrB,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,OAAO;aAChB;YACD;gBACI,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,SAAS;aAClB;SACJ;QACD,IAAI,EAAE,eAAe;QACrB,OAAO,EAAE;YACL;gBACI,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,SAAS;aAClB;SACJ;QACD,eAAe,EAAE,SAAS;QAC1B,IAAI,EAAE,UAAU;KACnB;CACK,CAAA;AAEV;;GAEG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAKzB;IACA,kBAAkB,EAAE,4CAA4C;IAChE,kBAAkB,EAAE,4CAA4C;IAChE,eAAe,EAAE,4CAA4C;IAC7D,eAAe,EAAE,4CAA4C;CAChE,CAAA;AAED,MAAM,iBAAiB,GAAG,KAAK,EAAiC,EAC5D,UAAU,EAAE,iBAAiB,EAC7B,mBAAmB,EAItB,EAAE,EAAE;IACD,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,iBAAiB,CAAC,CAAA;IACjE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,gBAAgB,EAAE,GAC9C,MAAM,mBAAmB,CAAC,oBAAoB,EAAE,CAAA;IAEpD,IAAI,iBAAiB,KAAK,MAAM,EAAE,CAAC;QAC/B,OAAO,kBAAkB,CAAC;YACtB,GAAG,EAAE,aAAa;YAClB,YAAY,EAAE,YAAY;YAC1B,IAAI,EAAE,CAAC,gBAAgB,EAAE,UAAU,CAAC;SACvC,CAAC,CAAA;IACN,CAAC;IAED,OAAO,kBAAkB,CAAC;QACtB,GAAG,EAAE,eAAe;QACpB,YAAY,EAAE,YAAY;QAC1B,IAAI,EAAE,CAAC,UAAU,EAAE,WAAW,EAAE,UAAU,EAAE,IAAI,CAAC;KACpD,CAAC,CAAA;AACN,CAAC,CAAA;AAED;;;;;;GAMG;AACH,MAAM,kBAAkB,GAAG,KAAK,EAAiC,EAC7D,KAAK,EACL,cAAc,EACd,mBAAmB,EACnB,UAAU,EAAE,iBAAiB,EAC7B,mBAAmB,EAOtB,EAAgB,EAAE;IACf,wCAAwC;IACxC,MAAM,kBAAkB,GAAG,MAAM,iBAAiB,CAAa;QAC3D,UAAU,EAAE,iBAAiB;QAC7B,mBAAmB;KACtB,CAAC,CAAA;IAEF,8BAA8B;IAC9B,OAAO,SAAS,CAAC;QACb,cAAc;QACd,kBAAkB,CAAC;YACf,GAAG,EAAE,gBAAgB;YACrB,YAAY,EAAE,eAAe;YAC7B,IAAI,EAAE,CAAC,mBAAmB,EAAE,kBAAkB,EAAE,KAAK,CAAC;SACzD,CAAQ;KACZ,CAAC,CAAA;AACN,CAAC,CAAA;AAED;;;;;GAKG;AACH,MAAM,iBAAiB,GAAG,KAAK,EAI7B,EACE,MAAM,EACN,UAAU,EAAE,iBAAiB,EAC7B,gBAAgB,EAKnB,EAAoB,EAAE;IACnB,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,iBAAiB,CAAC,CAAA;IAEjE,sCAAsC;IACtC,MAAM,QAAQ,GAAG,MAAM,gBAAgB,EAAE,CAAA;IACzC,IAAI,iBAAiB,KAAK,MAAM,EAAE,CAAC;QAC/B,OAAO,gBAAgB,CAA8B,MAAM,EAAE;YACzD,QAAQ;YACR,UAAU,EAAE,iBAAgD;SAC/D,CAAC,CAAA;IACN,CAAC;IAED,gDAAgD;IAChD,OAAO,gBAAgB,CAA8B,MAAM,EAAE;QACzD,OAAO,EAAE,iDAAiD,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACvE,WAAW,EACP,iDAAiD,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAClE,UAAU,EAAE,iBAAgD;KAC/D,CAAC,CAAA;AACN,CAAC,CAAA;AAED;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAKrC,MAA6C,EAC7C,EACI,OAAO,EACP,UAAU,EAAE,iBAAiB,EAC7B,KAAK,GAAG,EAAE,EACV,cAAc,GAAG,gBAAgB,CAAC,eAAe,EACjD,mBAAmB,GAAG,gBAAgB,CAAC,kBAAkB,EACzD,sBAAsB,EACkB;IAE5C,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,iBAAiB,CAAC,CAAA;IACjE,mBAAmB;QACf,iBAAiB,KAAK,MAAM;YACxB,CAAC,CAAC,gBAAgB,CAAC,kBAAkB;YACrC,CAAC,CAAC,gBAAgB,CAAC,kBAAkB,CAAA;IAE7C,MAAM,mBAAmB,GAAG,qBAAqB,CAAa,OAAO,CAAC;QAClE,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,MAAM,qBAAqB,CAAa,MAAM,EAAE;YAC5C,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,qBAAqB,EAAE,OAAO,CAAC,qBAAqB;YACpD,UAAU,EAAE,iBAAiB;SAChC,CAAC,CAAA;IACR,yDAAyD;IACzD,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE;QAChC,OAAO,kBAAkB,CAAa;YAClC,KAAK;YACL,cAAc;YACd,mBAAmB;YACnB,UAAU,EAAE,iBAAiB;YAC7B,mBAAmB;SACtB,CAAC,CAAA;IACN,CAAC,CAAA;IAED,qCAAqC;IACrC,MAAM,cAAc,GAChB,sBAAsB;QACtB,CAAC,MAAM,iBAAiB,CAAiC;YACrD,MAAM;YACN,UAAU,EAAE,iBAAiB;YAC7B,gBAAgB,EAAE,gBAAgB;SACrC,CAAC,CAAC,CAAA;IAEP,IAAI,CAAC,cAAc;QAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAA;IAEjE,IAAI,oBAAoB,GAAG,MAAM,sBAAsB,CACnD,MAAM,EACN,cAAc,CACjB,CAAA;IAED,OAAO;QACH,mBAAmB;QACnB,gBAAgB;QAChB,GAAG,cAAc,CAAC;YACd,OAAO,EAAE,cAAc;YACvB,SAAS,EAAE,cAAc;YACzB,MAAM,EAAE,oBAAoB;YAC5B,MAAM;YACN,UAAU,EAAE,iBAAiB;YAC7B,8BAA8B;YAC9B,KAAK,CAAC,oBAAoB,CAAC,GAAG;gBAC1B,IAAI,iBAAiB,KAAK,MAAM,EAAE,CAAC;oBAC/B,OAAO,uBAAuB,CAAC,GAAG,CAAC,CAAA;gBACvC,CAAC;gBACD,OAAO,uBAAuB,CAAC,GAAG,CAAC,CAAA;YACvC,CAAC;YACD,KAAK,CAAC,cAAc,CAAC,GAAG;gBACpB,MAAM,EAAE,GAAG,GAA+B,CAAA;gBAC1C,IACI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;oBAClB,EAAE,CAAC,QAAQ,KAAK,MAAM;oBACtB,EAAE,CAAC,EAAE,CAAC,WAAW,EAAE,KAAK,cAAc,CAAC,WAAW,EAAE,EACtD,CAAC;oBACC,OAAO,EAAE,CAAC,IAAI,CAAA;gBAClB,CAAC;gBACD,IAAI,iBAAiB,KAAK,MAAM,EAAE,CAAC;oBAC/B,OAAO,mBAAmB,CAAC,EAAE,CAAC,CAAA;gBAClC,CAAC;gBACD,OAAO,mBAAmB,CAAC,EAAE,CAAC,CAAA;YAClC,CAAC;YACD,KAAK,CAAC,UAAU;gBACZ,IAAI,oBAAoB;oBAAE,OAAO,SAAS,CAAA;gBAE1C,oBAAoB,GAAG,MAAM,sBAAsB,CAC/C,MAAM,EACN,cAAc,CACjB,CAAA;gBAED,IAAI,oBAAoB;oBAAE,OAAO,SAAS,CAAA;gBAE1C,OAAO,cAAc,CAAA;YACzB,CAAC;YAED,KAAK,CAAC,cAAc;gBAChB,IAAI,oBAAoB;oBAAE,OAAO,SAAS,CAAA;gBAE1C,oBAAoB,GAAG,MAAM,sBAAsB,CAC/C,MAAM,EACN,cAAc,CACjB,CAAA;gBAED,IAAI,oBAAoB;oBAAE,OAAO,SAAS,CAAA;gBAE1C,OAAO,iDAAiD,CACpD,MAAM,gBAAgB,EAAE,CAC3B,CAAC,CAAC,CAAC,CAAA;YACR,CAAC;YACD,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE;gBACzB,MAAM,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,CAAA;gBACxC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,MAAM,eAAe,CACpD,MAAM,EACN,cAAc,EACd,iBAAiB,CACpB,CAAA;gBACD,MAAM,kBAAkB,GAAG,MAAM,cAAc,CAAC,WAAW,EAAE;oBACzD,IAAI;oBACJ,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC;oBACxB,OAAO;oBACP,iBAAiB,EAAE,cAAc;iBACpC,CAAC,CAAA;gBACF,MAAM,SAAS,GAAG,MAAM,mBAAmB,CAAC,WAAW,CAAC;oBACpD,OAAO,EAAE,EAAE,GAAG,EAAE,kBAAkB,EAAE;iBACvC,CAAC,CAAA;gBAEF,IACI,CAAC,gBAAgB,CACb,eAAe,CAAC,sBAAsB,EACtC,OAAO,CACV,EACH,CAAC;oBACC,OAAO,SAAS,CAAA;gBACpB,CAAC;gBAED,OAAO,SAAS,CAAC;oBACb,mBAAmB,CAAC,aAAa,EAAE;oBACnC,SAAS;iBACZ,CAAC,CAAA;YACN,CAAC;YACD,KAAK,CAAC,eAAe,CAAC,CAAC,EAAE,EAAE;gBACvB,MAAM,IAAI,yCAAyC,EAAE,CAAA;YACzD,CAAC;YACD,KAAK,CAAC,aAAa,CAAC,SAAS;gBACzB,MAAM,KAAK,GAAG;oBACV,YAAY,EAAE,uBAAuB,CAAC;wBAClC,MAAM,EAAE,SAAS,CAAC,MAAM;qBAC3B,CAAC;oBACF,GAAG,SAAS,CAAC,KAAK;iBACrB,CAAA;gBAED,uFAAuF;gBACvF,qDAAqD;gBACrD,iBAAiB,CAAC;oBACd,MAAM,EAAE,SAAS,CAAC,MAAM;oBACxB,OAAO,EAAE,SAAS,CAAC,OAAO;oBAC1B,WAAW,EAAE,SAAS,CAAC,WAAW;oBAClC,KAAK,EAAE,KAAK;iBACQ,CAAC,CAAA;gBAEzB,MAAM,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC,CAAA;gBAE1C,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,MAAM,eAAe,CACpD,MAAM,EACN,cAAc,EACd,iBAAiB,CACpB,CAAA;gBACD,MAAM,kBAAkB,GAAG,MAAM,cAAc,CAAC,SAAS,EAAE;oBACvD,IAAI;oBACJ,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC;oBACxB,OAAO;oBACP,iBAAiB,EAAE,cAAc;iBACpC,CAAC,CAAA;gBACF,MAAM,SAAS,GAAG,MAAM,mBAAmB,CAAC,WAAW,CAAC;oBACpD,OAAO,EAAE,EAAE,GAAG,EAAE,kBAAkB,EAAE;iBACvC,CAAC,CAAA;gBACF,IACI,CAAC,gBAAgB,CACb,eAAe,CAAC,sBAAsB,EACtC,OAAO,CACV,EACH,CAAC;oBACC,OAAO,SAAS,CAAA;gBACpB,CAAC;gBACD,OAAO,SAAS,CAAC;oBACb,mBAAmB,CAAC,aAAa,EAAE;oBACnC,SAAS;iBACZ,CAAC,CAAA;YACN,CAAC;YACD,qCAAqC;YACrC,KAAK,CAAC,QAAQ,CAAC,cAAuB;gBAClC,MAAM,GAAG,GAAG,MAAM,mBAAmB,CAAC,WAAW,CAC7C,cAAc,EACd,cAAc,CACjB,CAAA;gBACD,OAAO,eAAe,CAAC,MAAM,EAAE;oBAC3B,MAAM,EAAE,cAAc;oBACtB,UAAU,EAAE,iBAAiB;oBAC7B,GAAG;iBACN,CAAC,CAAA;YACN,CAAC;YAED,wBAAwB;YACxB,KAAK,CAAC,iBAAiB,CAAC,aAAa;gBACjC,OAAO,mBAAmB,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAA;YAC/D,CAAC;YAED,6BAA6B;YAC7B,KAAK,CAAC,iBAAiB,CAAC,aAAa;gBACjC,OAAO,mBAAmB,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAA;YAC/D,CAAC;YAED,uBAAuB;YACvB,KAAK,CAAC,WAAW;gBACb,IAAI,oBAAoB;oBAAE,OAAO,IAAI,CAAA;gBAErC,oBAAoB,GAAG,MAAM,sBAAsB,CAC/C,MAAM,EACN,cAAc,CACjB,CAAA;gBAED,IAAI,oBAAoB;oBAAE,OAAO,IAAI,CAAA;gBACrC,OAAO,gBAAgB,EAAE,CAAA;YAC7B,CAAC;SACJ,CAAC;KACL,CAAA;AACL,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { concat, zeroAddress } from "viem";
|
|
1
|
+
import { concat, pad, zeroAddress } from "viem";
|
|
2
2
|
import { VALIDATOR_TYPE } from "../../../../../constants.js";
|
|
3
3
|
export const getPluginsEnableTypedData = async ({ accountAddress, chainId, kernelVersion, action, validator, validatorNonce }) => {
|
|
4
4
|
return {
|
|
@@ -21,7 +21,7 @@ export const getPluginsEnableTypedData = async ({ accountAddress, chainId, kerne
|
|
|
21
21
|
message: {
|
|
22
22
|
validationId: concat([
|
|
23
23
|
VALIDATOR_TYPE[validator.validatorType],
|
|
24
|
-
validator.getIdentifier()
|
|
24
|
+
pad(validator.getIdentifier(), { size: 20, dir: "right" })
|
|
25
25
|
]),
|
|
26
26
|
nonce: validatorNonce,
|
|
27
27
|
hook: zeroAddress,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPluginsEnableTypedData.js","sourceRoot":"","sources":["../../../../../../accounts/kernel/utils/plugins/ep0_7/getPluginsEnableTypedData.ts"],"names":[],"mappings":"AAIA,OAAO,EAAmC,MAAM,EAAE,WAAW,EAAE,MAAM,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"getPluginsEnableTypedData.js","sourceRoot":"","sources":["../../../../../../accounts/kernel/utils/plugins/ep0_7/getPluginsEnableTypedData.ts"],"names":[],"mappings":"AAIA,OAAO,EAAmC,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,MAAM,CAAA;AAChF,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAG5D,MAAM,CAAC,MAAM,yBAAyB,GAAG,KAAK,EAE5C,EACE,cAAc,EACd,OAAO,EACP,aAAa,EACb,MAAM,EACN,SAAS,EACT,cAAc,EAMe,EAE/B,EAAE;IACA,OAAO;QACH,MAAM,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,aAAa;YACtB,OAAO;YACP,iBAAiB,EAAE,cAAc;SACpC;QACD,KAAK,EAAE;YACH,MAAM,EAAE;gBACJ,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE;gBACzC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE;gBACjC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE;gBACjC,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,OAAO,EAAE;gBACxC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE;gBACnC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,EAAE;aAC1C;SACJ;QACD,OAAO,EAAE;YACL,YAAY,EAAE,MAAM,CAAC;gBACjB,cAAc,CAAC,SAAS,CAAC,aAAa,CAAC;gBACvC,GAAG,CAAC,SAAS,CAAC,aAAa,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC;aAC7D,CAAC;YACF,KAAK,EAAE,cAAc;YACrB,IAAI,EAAE,WAAW;YACjB,aAAa,EAAE,MAAM,SAAS,CAAC,aAAa,CAAC,cAAc,CAAC;YAC5D,QAAQ,EAAE,IAAI;YACd,YAAY,EAAE,MAAM,CAAC;gBACjB,MAAM,CAAC,QAAQ;gBACf,MAAM,CAAC,OAAO;gBACd,WAAW;gBACX,IAAI;aACP,CAAC;SACL;QACD,WAAW,EAAE,QAAQ;KACxB,CAAA;AACL,CAAC,CAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ENTRYPOINT_ADDRESS_V06, getAccountNonce, getSenderAddress, getUserOperationHash, isSmartAccountDeployed } from "permissionless";
|
|
1
|
+
import { ENTRYPOINT_ADDRESS_V06, getAccountNonce, getEntryPointVersion, getSenderAddress, getUserOperationHash, isSmartAccountDeployed } from "permissionless";
|
|
2
2
|
import { SignTransactionNotSupportedBySmartAccount } from "permissionless/accounts";
|
|
3
3
|
import { concatHex, encodeFunctionData } from "viem";
|
|
4
4
|
import { toAccount } from "viem/accounts";
|
|
@@ -44,8 +44,10 @@ const KERNEL_V1_ADDRESSES = {
|
|
|
44
44
|
FACTORY_ADDRESS: "0x4E4946298614FC299B50c947289F4aD0572CB9ce",
|
|
45
45
|
ENTRYPOINT_V0_6: "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789"
|
|
46
46
|
};
|
|
47
|
-
export async function createKernelV1Account(client, { signer, entrypoint: entryPointAddress
|
|
48
|
-
|
|
47
|
+
export async function createKernelV1Account(client, { signer, entrypoint: entryPointAddress, index = 0n }) {
|
|
48
|
+
const entryPointVersion = getEntryPointVersion(entryPointAddress);
|
|
49
|
+
if (entryPointVersion !== "v0.6" ||
|
|
50
|
+
entryPointAddress !== ENTRYPOINT_ADDRESS_V06) {
|
|
49
51
|
throw new Error("Only EntryPoint 0.6 is supported");
|
|
50
52
|
}
|
|
51
53
|
const viemSigner = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createKernelV1Account.js","sourceRoot":"","sources":["../../../../accounts/kernel/v1/createKernelV1Account.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,sBAAsB,EACtB,eAAe,EACf,gBAAgB,EAChB,oBAAoB,EACpB,sBAAsB,EACzB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EACH,yCAAyC,EAE5C,MAAM,yBAAyB,CAAA;
|
|
1
|
+
{"version":3,"file":"createKernelV1Account.js","sourceRoot":"","sources":["../../../../accounts/kernel/v1/createKernelV1Account.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { getAccountNonce, getEntryPointVersion, getSenderAddress, isSmartAccountDeployed } from "permissionless";
|
|
2
2
|
import { SignTransactionNotSupportedBySmartAccount } from "permissionless/accounts";
|
|
3
3
|
import { concatHex, encodeDeployData, encodeFunctionData, getTypesForEIP712Domain, hashMessage, hashTypedData, parseAbi, validateTypedData } from "viem";
|
|
4
4
|
import { toAccount } from "viem/accounts";
|
|
@@ -64,7 +64,11 @@ const getAccountAddress = async ({ client, entryPoint: entryPointAddress, initCo
|
|
|
64
64
|
* @param ecdsaValidatorAddress
|
|
65
65
|
* @param deployedAccountAddress
|
|
66
66
|
*/
|
|
67
|
-
export async function createKernelV2Account(client, { plugins, entryPoint: entryPointAddress
|
|
67
|
+
export async function createKernelV2Account(client, { plugins, entryPoint: entryPointAddress, index = 0n, factoryAddress = KERNEL_ADDRESSES.FACTORY_ADDRESS, deployedAccountAddress }) {
|
|
68
|
+
const entryPointVersion = getEntryPointVersion(entryPointAddress);
|
|
69
|
+
if (entryPointVersion !== "v0.6") {
|
|
70
|
+
throw new Error("Only EntryPoint 0.6 is supported");
|
|
71
|
+
}
|
|
68
72
|
const kernelPluginManager = isKernelPluginManager(plugins)
|
|
69
73
|
? plugins
|
|
70
74
|
: await toKernelPluginManager(client, {
|
|
@@ -176,8 +180,8 @@ export async function createKernelV2Account(client, { plugins, entryPoint: entry
|
|
|
176
180
|
return parseFactoryAddressAndCallDataFromAccountInitCode(await generateInitCode())[1];
|
|
177
181
|
},
|
|
178
182
|
// Get the nonce of the smart account
|
|
179
|
-
async getNonce() {
|
|
180
|
-
const key = await kernelPluginManager.getNonceKey();
|
|
183
|
+
async getNonce(customNonceKey) {
|
|
184
|
+
const key = await kernelPluginManager.getNonceKey(accountAddress, customNonceKey);
|
|
181
185
|
return getAccountNonce(client, {
|
|
182
186
|
sender: accountAddress,
|
|
183
187
|
entryPoint: entryPointAddress,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createKernelV2Account.js","sourceRoot":"","sources":["../../../../accounts/kernel/v2/createKernelV2Account.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,
|
|
1
|
+
{"version":3,"file":"createKernelV2Account.js","sourceRoot":"","sources":["../../../../accounts/kernel/v2/createKernelV2Account.ts"],"names":[],"mappings":"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"}
|
|
@@ -158,9 +158,12 @@ export async function toKernelPluginManager(client, { sudo, regular, pluginEnabl
|
|
|
158
158
|
}
|
|
159
159
|
return await getSignatureData(userOperation.sender, userOperation.callData.toString().slice(0, 10), userOpSig);
|
|
160
160
|
},
|
|
161
|
-
getNonceKey: async (accountAddress = zeroAddress) => {
|
|
161
|
+
getNonceKey: async (accountAddress = zeroAddress, customNonceKey = 0n) => {
|
|
162
162
|
if (entryPointVersion === "v0.6")
|
|
163
|
-
return await activeValidator.getNonceKey();
|
|
163
|
+
return await activeValidator.getNonceKey(accountAddress, customNonceKey);
|
|
164
|
+
// when using v0.7 if customNonceKey is greater than 2 bytes, throw error
|
|
165
|
+
if (customNonceKey > 0xffffn)
|
|
166
|
+
throw new Error("Custom nonce key must be less than 2 bytes");
|
|
164
167
|
const validatorMode = !regular ||
|
|
165
168
|
(await isPluginEnabled(accountAddress, action.selector))
|
|
166
169
|
? VALIDATOR_MODE.DEFAULT
|
|
@@ -168,14 +171,19 @@ export async function toKernelPluginManager(client, { sudo, regular, pluginEnabl
|
|
|
168
171
|
const validatorType = regular
|
|
169
172
|
? VALIDATOR_TYPE[regular.validatorType]
|
|
170
173
|
: VALIDATOR_TYPE.SUDO;
|
|
171
|
-
|
|
174
|
+
const encoding = pad(concatHex([
|
|
172
175
|
validatorMode, // 1 byte
|
|
173
176
|
validatorType, // 1 byte
|
|
174
|
-
activeValidator.getIdentifier(),
|
|
175
|
-
|
|
177
|
+
pad(activeValidator.getIdentifier(), {
|
|
178
|
+
size: 20,
|
|
179
|
+
dir: "right"
|
|
180
|
+
}), // 20 bytes
|
|
181
|
+
pad(toHex(await activeValidator.getNonceKey(accountAddress, customNonceKey)), {
|
|
176
182
|
size: 2
|
|
177
183
|
}) // 2 byte
|
|
178
|
-
]), { size: 24 })
|
|
184
|
+
]), { size: 24 });
|
|
185
|
+
const encodedNonceKey = BigInt(encoding);
|
|
186
|
+
return encodedNonceKey;
|
|
179
187
|
},
|
|
180
188
|
getPluginEnableSignature,
|
|
181
189
|
getValidatorInitData: async () => {
|
|
@@ -185,7 +193,7 @@ export async function toKernelPluginManager(client, { sudo, regular, pluginEnabl
|
|
|
185
193
|
validatorAddress: sudo?.address ?? activeValidator.address,
|
|
186
194
|
enableData: (await sudo?.getEnableData()) ??
|
|
187
195
|
(await activeValidator.getEnableData()),
|
|
188
|
-
identifier: getIdentifier(true)
|
|
196
|
+
identifier: pad(getIdentifier(true), { size: 21, dir: "right" })
|
|
189
197
|
};
|
|
190
198
|
}
|
|
191
199
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toKernelPluginManager.js","sourceRoot":"","sources":["../../../accounts/utils/toKernelPluginManager.ts"],"names":[],"mappings":"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
|
|
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":"AAMA,OAAO,EAA6C,MAAM,MAAM,CAAA;AAEhE,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"kernel.js","sourceRoot":"","sources":["../../types/kernel.ts"],"names":[],"mappings":"AAMA,OAAO,EAA6C,MAAM,MAAM,CAAA;AAEhE,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAgJhD,MAAM,CAAN,IAAY,aAIX;AAJD,WAAY,aAAa;IACrB,oCAAmB,CAAA;IACnB,sCAAqB,CAAA;IACrB,sCAAqB,CAAA;AACzB,CAAC,EAJW,aAAa,KAAb,aAAa,QAIxB"}
|
|
@@ -4,11 +4,12 @@ import { type Address, type Chain, type Client, type Hex, type Transport } from
|
|
|
4
4
|
import type { KernelEncodeCallDataArgs, KernelPluginManager, KernelPluginManagerParams } from "../../types/kernel.js";
|
|
5
5
|
export type KernelSmartAccount<entryPoint extends EntryPoint, transport extends Transport = Transport, chain extends Chain | undefined = Chain | undefined> = SmartAccount<entryPoint, "kernelSmartAccount", transport, chain> & {
|
|
6
6
|
kernelPluginManager: KernelPluginManager<entryPoint>;
|
|
7
|
+
getNonce: (customNonceKey?: bigint) => Promise<bigint>;
|
|
7
8
|
generateInitCode: () => Promise<Hex>;
|
|
8
9
|
encodeCallData: (args: KernelEncodeCallDataArgs) => Promise<Hex>;
|
|
9
10
|
};
|
|
10
11
|
export type CreateKernelAccountParameters<entryPoint extends EntryPoint> = {
|
|
11
|
-
plugins: KernelPluginManagerParams<entryPoint> | KernelPluginManager<entryPoint>;
|
|
12
|
+
plugins: Omit<KernelPluginManagerParams<entryPoint>, "entryPoint"> | KernelPluginManager<entryPoint>;
|
|
12
13
|
entryPoint: entryPoint;
|
|
13
14
|
index?: bigint;
|
|
14
15
|
factoryAddress?: Address;
|
|
@@ -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,EASjB,MAAM,MAAM,CAAA;AACb,OAAO,KAAK,EACR,wBAAwB,EACxB,mBAAmB,EACnB,yBAAyB,EAC5B,MAAM,uBAAuB,CAAA;AAgB9B,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,mBAAmB,EAAE,mBAAmB,CAAC,UAAU,CAAC,CAAA;IACpD,gBAAgB,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,CAAA;IACpC,cAAc,EAAE,CAAC,IAAI,EAAE,wBAAwB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;CACnE,CAAA;AAED,MAAM,MAAM,6BAA6B,CAAC,UAAU,SAAS,UAAU,IAAI;IACvE,OAAO,EACD,yBAAyB,CAAC,UAAU,CAAC,
|
|
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,EASjB,MAAM,MAAM,CAAA;AACb,OAAO,KAAK,EACR,wBAAwB,EACxB,mBAAmB,EACnB,yBAAyB,EAC5B,MAAM,uBAAuB,CAAA;AAgB9B,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,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;CACnE,CAAA;AAED,MAAM,MAAM,6BAA6B,CAAC,UAAU,SAAS,UAAU,IAAI;IACvE,OAAO,EACD,IAAI,CAAC,yBAAyB,CAAC,UAAU,CAAC,EAAE,YAAY,CAAC,GACzD,mBAAmB,CAAC,UAAU,CAAC,CAAA;IACrC,UAAU,EAAE,UAAU,CAAA;IACtB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,sBAAsB,CAAC,EAAE,OAAO,CAAA;CACnC,CAAA;AAqCD;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE;IAC3B,kBAAkB,EAAE,OAAO,CAAA;IAC3B,kBAAkB,EAAE,OAAO,CAAA;IAC3B,eAAe,EAAE,OAAO,CAAA;IACxB,eAAe,EAAE,OAAO,CAAA;CAM3B,CAAA;AAwGD;;;;;;;;;;GAUG;AACH,wBAAsB,mBAAmB,CACrC,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,OAAO,EACP,UAAU,EAAE,iBAAiB,EAC7B,KAAU,EACV,cAAiD,EACjD,mBAAyD,EACzD,sBAAsB,EACzB,EAAE,6BAA6B,CAAC,UAAU,CAAC,GAC7C,OAAO,CAAC,kBAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,CAyN7D"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPluginsEnableTypedData.d.ts","sourceRoot":"","sources":["../../../../../../accounts/kernel/utils/plugins/ep0_7/getPluginsEnableTypedData.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAER,UAAU,EACb,MAAM,iCAAiC,CAAA;AACxC,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,YAAY,
|
|
1
|
+
{"version":3,"file":"getPluginsEnableTypedData.d.ts","sourceRoot":"","sources":["../../../../../../accounts/kernel/utils/plugins/ep0_7/getPluginsEnableTypedData.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAER,UAAU,EACb,MAAM,iCAAiC,CAAA;AACxC,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,YAAY,EAA4B,MAAM,MAAM,CAAA;AAEhF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAA;AAE9E,eAAO,MAAM,yBAAyB;oBAUlB,OAAO;aACd,MAAM;mBACA,MAAM;oBACL,MAAM;sCACU,QAChC,WAAW,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAqC/C,CAAA"}
|
|
@@ -5,7 +5,7 @@ import { type KernelSmartAccount } from "../createKernelAccount.js";
|
|
|
5
5
|
export type KernelV1SmartAccount<entryPoint extends EntryPoint, transport extends Transport = Transport, chain extends Chain | undefined = Chain | undefined> = Omit<KernelSmartAccount<entryPoint, transport, chain>, "kernelPluginManager">;
|
|
6
6
|
export declare function createKernelV1Account<entryPoint extends EntryPoint, TTransport extends Transport = Transport, TChain extends Chain | undefined = Chain | undefined, TSource extends string = string, TAddress extends Address = Address>(client: Client<TTransport, TChain, undefined>, { signer, entrypoint: entryPointAddress, index }: {
|
|
7
7
|
signer: SmartAccountSigner<TSource, TAddress>;
|
|
8
|
-
entrypoint
|
|
8
|
+
entrypoint: entryPoint;
|
|
9
9
|
index?: bigint;
|
|
10
10
|
}): Promise<KernelV1SmartAccount<entryPoint, TTransport, TChain>>;
|
|
11
11
|
//# sourceMappingURL=createKernelV1Account.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createKernelV1Account.d.ts","sourceRoot":"","sources":["../../../../accounts/kernel/v1/createKernelV1Account.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createKernelV1Account.d.ts","sourceRoot":"","sources":["../../../../accounts/kernel/v1/createKernelV1Account.ts"],"names":[],"mappings":"AAQA,OAAO,EAEH,KAAK,kBAAkB,EAC1B,MAAM,yBAAyB,CAAA;AAChC,OAAO,KAAK,EAER,UAAU,EACb,MAAM,oCAAoC,CAAA;AAC3C,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,MAAM,EAIX,KAAK,SAAS,EAKjB,MAAM,MAAM,CAAA;AAWb,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAEnE,MAAM,MAAM,oBAAoB,CAC5B,UAAU,SAAS,UAAU,EAC7B,SAAS,SAAS,SAAS,GAAG,SAAS,EACvC,KAAK,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,IACnD,IAAI,CACJ,kBAAkB,CAAC,UAAU,EAAE,SAAS,EAAE,KAAK,CAAC,EAChD,qBAAqB,CACxB,CAAA;AA4CD,wBAAsB,qBAAqB,CACvC,UAAU,SAAS,UAAU,EAC7B,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,MAAM,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,EACpD,OAAO,SAAS,MAAM,GAAG,MAAM,EAC/B,QAAQ,SAAS,OAAO,GAAG,OAAO,EAElC,MAAM,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,EAC7C,EACI,MAAM,EACN,UAAU,EAAE,iBAAiB,EAC7B,KAAU,EACb,EAAE;IACC,MAAM,EAAE,kBAAkB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IAC7C,UAAU,EAAE,UAAU,CAAA;IACtB,KAAK,CAAC,EAAE,MAAM,CAAA;CACjB,GACF,OAAO,CAAC,oBAAoB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,CAyN/D"}
|
|
@@ -4,6 +4,7 @@ import { type Address, type Chain, type Client, type Hex, type Transport } from
|
|
|
4
4
|
import type { KernelEncodeCallDataArgs, KernelPluginManager, KernelPluginManagerParams } from "../../../types/kernel.js";
|
|
5
5
|
export type KernelSmartAccount<entryPoint extends EntryPoint, transport extends Transport = Transport, chain extends Chain | undefined = Chain | undefined> = SmartAccount<entryPoint, "kernelSmartAccount", transport, chain> & {
|
|
6
6
|
kernelPluginManager: KernelPluginManager<entryPoint>;
|
|
7
|
+
getNonce: (customNonceKey?: bigint) => Promise<bigint>;
|
|
7
8
|
generateInitCode: () => Promise<Hex>;
|
|
8
9
|
encodeCallData: (args: KernelEncodeCallDataArgs) => Promise<Hex>;
|
|
9
10
|
};
|
|
@@ -26,7 +27,7 @@ export declare const KERNEL_ADDRESSES: {
|
|
|
26
27
|
*/
|
|
27
28
|
export declare function createKernelV2Account<entryPoint extends EntryPoint, TTransport extends Transport = Transport, TChain extends Chain | undefined = Chain | undefined>(client: Client<TTransport, TChain, undefined>, { plugins, entryPoint: entryPointAddress, index, factoryAddress, deployedAccountAddress }: {
|
|
28
29
|
plugins: KernelPluginManagerParams<entryPoint> | KernelPluginManager<entryPoint>;
|
|
29
|
-
entryPoint
|
|
30
|
+
entryPoint: entryPoint;
|
|
30
31
|
index?: bigint;
|
|
31
32
|
factoryAddress?: Address;
|
|
32
33
|
deployedAccountAddress?: Address;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createKernelV2Account.d.ts","sourceRoot":"","sources":["../../../../accounts/kernel/v2/createKernelV2Account.ts"],"names":[],"mappings":"AAMA,OAAO,EAEH,KAAK,YAAY,EACpB,MAAM,yBAAyB,CAAA;AAChC,OAAO,KAAK,EAER,UAAU,EACb,MAAM,oCAAoC,CAAA;AAC3C,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,MAAM,EAGX,KAAK,GAAG,EACR,KAAK,SAAS,EAUjB,MAAM,MAAM,CAAA;AAEb,OAAO,KAAK,EACR,wBAAwB,EACxB,mBAAmB,EACnB,yBAAyB,EAC5B,MAAM,0BAA0B,CAAA;AAejC,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,mBAAmB,EAAE,mBAAmB,CAAC,UAAU,CAAC,CAAA;IACpD,gBAAgB,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,CAAA;IACpC,cAAc,EAAE,CAAC,IAAI,EAAE,wBAAwB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;CACnE,CAAA;AAWD;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE;IAC3B,eAAe,EAAE,OAAO,CAAA;IACxB,eAAe,EAAE,OAAO,CAAA;CAI3B,CAAA;AA2DD;;;;;;;;;GASG;AACH,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,OAAO,EACP,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"createKernelV2Account.d.ts","sourceRoot":"","sources":["../../../../accounts/kernel/v2/createKernelV2Account.ts"],"names":[],"mappings":"AAMA,OAAO,EAEH,KAAK,YAAY,EACpB,MAAM,yBAAyB,CAAA;AAChC,OAAO,KAAK,EAER,UAAU,EACb,MAAM,oCAAoC,CAAA;AAC3C,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,MAAM,EAGX,KAAK,GAAG,EACR,KAAK,SAAS,EAUjB,MAAM,MAAM,CAAA;AAEb,OAAO,KAAK,EACR,wBAAwB,EACxB,mBAAmB,EACnB,yBAAyB,EAC5B,MAAM,0BAA0B,CAAA;AAejC,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,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;CACnE,CAAA;AAWD;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE;IAC3B,eAAe,EAAE,OAAO,CAAA;IACxB,eAAe,EAAE,OAAO,CAAA;CAI3B,CAAA;AA2DD;;;;;;;;;GASG;AACH,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,OAAO,EACP,UAAU,EAAE,iBAAiB,EAC7B,KAAU,EACV,cAAiD,EACjD,sBAAsB,EACzB,EAAE;IACC,OAAO,EACD,yBAAyB,CAAC,UAAU,CAAC,GACrC,mBAAmB,CAAC,UAAU,CAAC,CAAA;IACrC,UAAU,EAAE,UAAU,CAAA;IACtB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,sBAAsB,CAAC,EAAE,OAAO,CAAA;CACnC,GACF,OAAO,CAAC,kBAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,CAwP7D"}
|
|
@@ -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;AACjE,OAAO,EAEH,KAAK,KAAK,EACV,KAAK,MAAM,EAEX,KAAK,SAAS,EAMjB,MAAM,MAAM,CAAA;AAGb,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,qBAAqB,EACrB,iBAAiB,EACjB,MAGC,EACD,UAAc,EACd,UAAc,EACd,UAAU,EAAE,iBAAiB,EAC7B,aAAa,EAChB,EAAE,yBAAyB,CAAC,UAAU,CAAC,GACzC,OAAO,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"toKernelPluginManager.d.ts","sourceRoot":"","sources":["../../../accounts/utils/toKernelPluginManager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AACjE,OAAO,EAEH,KAAK,KAAK,EACV,KAAK,MAAM,EAEX,KAAK,SAAS,EAMjB,MAAM,MAAM,CAAA;AAGb,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,qBAAqB,EACrB,iBAAiB,EACjB,MAGC,EACD,UAAc,EACd,UAAc,EACd,UAAU,EAAE,iBAAiB,EAC7B,aAAa,EAChB,EAAE,yBAAyB,CAAC,UAAU,CAAC,GACzC,OAAO,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC,CAwO1C"}
|
package/_types/types/kernel.d.ts
CHANGED
|
@@ -71,7 +71,7 @@ export type ZeroDevPaymasterRpcSchema<entryPoint extends EntryPoint> = [
|
|
|
71
71
|
export type ValidatorType = Extract<keyof typeof VALIDATOR_TYPE, "PERMISSION" | "SECONDARY">;
|
|
72
72
|
export type KernelValidator<entryPoint extends EntryPoint, Name extends string = string> = LocalAccount<Name> & {
|
|
73
73
|
validatorType: ValidatorType;
|
|
74
|
-
getNonceKey: (accountAddress?: Address) => Promise<bigint>;
|
|
74
|
+
getNonceKey: (accountAddress?: Address, customNonceKey?: bigint) => Promise<bigint>;
|
|
75
75
|
getDummySignature(userOperation: UserOperation<GetEntryPointVersion<entryPoint>>, pluginEnableSignature?: Hex): Promise<Hex>;
|
|
76
76
|
signUserOperation: (userOperation: UserOperation<GetEntryPointVersion<entryPoint>>, pluginEnableSignature?: Hex) => Promise<Hex>;
|
|
77
77
|
getEnableData(accountAddress?: Address): Promise<Hex>;
|
|
@@ -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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"}
|
|
@@ -55,13 +55,14 @@ export type KernelSmartAccount<
|
|
|
55
55
|
chain extends Chain | undefined = Chain | undefined
|
|
56
56
|
> = SmartAccount<entryPoint, "kernelSmartAccount", transport, chain> & {
|
|
57
57
|
kernelPluginManager: KernelPluginManager<entryPoint>
|
|
58
|
+
getNonce: (customNonceKey?: bigint) => Promise<bigint>
|
|
58
59
|
generateInitCode: () => Promise<Hex>
|
|
59
60
|
encodeCallData: (args: KernelEncodeCallDataArgs) => Promise<Hex>
|
|
60
61
|
}
|
|
61
62
|
|
|
62
63
|
export type CreateKernelAccountParameters<entryPoint extends EntryPoint> = {
|
|
63
64
|
plugins:
|
|
64
|
-
| KernelPluginManagerParams<entryPoint>
|
|
65
|
+
| Omit<KernelPluginManagerParams<entryPoint>, "entryPoint">
|
|
65
66
|
| KernelPluginManager<entryPoint>
|
|
66
67
|
entryPoint: entryPoint
|
|
67
68
|
index?: bigint
|
|
@@ -428,9 +429,11 @@ export async function createKernelAccount<
|
|
|
428
429
|
])
|
|
429
430
|
},
|
|
430
431
|
// Get the nonce of the smart account
|
|
431
|
-
async getNonce() {
|
|
432
|
-
const key =
|
|
433
|
-
|
|
432
|
+
async getNonce(customNonceKey?: bigint) {
|
|
433
|
+
const key = await kernelPluginManager.getNonceKey(
|
|
434
|
+
accountAddress,
|
|
435
|
+
customNonceKey
|
|
436
|
+
)
|
|
434
437
|
return getAccountNonce(client, {
|
|
435
438
|
sender: accountAddress,
|
|
436
439
|
entryPoint: entryPointAddress,
|
|
@@ -2,7 +2,7 @@ import type {
|
|
|
2
2
|
ENTRYPOINT_ADDRESS_V07_TYPE,
|
|
3
3
|
EntryPoint
|
|
4
4
|
} from "permissionless/types/entrypoint"
|
|
5
|
-
import { type Address, type CustomSource, concat, zeroAddress } from "viem"
|
|
5
|
+
import { type Address, type CustomSource, concat, pad, zeroAddress } from "viem"
|
|
6
6
|
import { VALIDATOR_TYPE } from "../../../../../constants.js"
|
|
7
7
|
import type { Kernel2_0_plugins } from "../ep0_6/getPluginsEnableTypedData.js"
|
|
8
8
|
|
|
@@ -43,7 +43,7 @@ export const getPluginsEnableTypedData = async <
|
|
|
43
43
|
message: {
|
|
44
44
|
validationId: concat([
|
|
45
45
|
VALIDATOR_TYPE[validator.validatorType],
|
|
46
|
-
validator.getIdentifier()
|
|
46
|
+
pad(validator.getIdentifier(), { size: 20, dir: "right" })
|
|
47
47
|
]),
|
|
48
48
|
nonce: validatorNonce,
|
|
49
49
|
hook: zeroAddress,
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import {
|
|
2
2
|
ENTRYPOINT_ADDRESS_V06,
|
|
3
3
|
getAccountNonce,
|
|
4
|
+
getEntryPointVersion,
|
|
4
5
|
getSenderAddress,
|
|
5
6
|
getUserOperationHash,
|
|
6
7
|
isSmartAccountDeployed
|
|
@@ -9,7 +10,10 @@ import {
|
|
|
9
10
|
SignTransactionNotSupportedBySmartAccount,
|
|
10
11
|
type SmartAccountSigner
|
|
11
12
|
} from "permissionless/accounts"
|
|
12
|
-
import type {
|
|
13
|
+
import type {
|
|
14
|
+
ENTRYPOINT_ADDRESS_V06_TYPE,
|
|
15
|
+
EntryPoint
|
|
16
|
+
} from "permissionless/types/entrypoint.js"
|
|
13
17
|
import {
|
|
14
18
|
type Address,
|
|
15
19
|
type Chain,
|
|
@@ -96,15 +100,20 @@ export async function createKernelV1Account<
|
|
|
96
100
|
client: Client<TTransport, TChain, undefined>,
|
|
97
101
|
{
|
|
98
102
|
signer,
|
|
99
|
-
entrypoint: entryPointAddress
|
|
103
|
+
entrypoint: entryPointAddress,
|
|
100
104
|
index = 0n
|
|
101
105
|
}: {
|
|
102
106
|
signer: SmartAccountSigner<TSource, TAddress>
|
|
103
|
-
entrypoint
|
|
107
|
+
entrypoint: entryPoint
|
|
104
108
|
index?: bigint
|
|
105
109
|
}
|
|
106
110
|
): Promise<KernelV1SmartAccount<entryPoint, TTransport, TChain>> {
|
|
107
|
-
|
|
111
|
+
const entryPointVersion = getEntryPointVersion(entryPointAddress)
|
|
112
|
+
|
|
113
|
+
if (
|
|
114
|
+
entryPointVersion !== "v0.6" ||
|
|
115
|
+
entryPointAddress !== ENTRYPOINT_ADDRESS_V06
|
|
116
|
+
) {
|
|
108
117
|
throw new Error("Only EntryPoint 0.6 is supported")
|
|
109
118
|
}
|
|
110
119
|
|
|
@@ -130,10 +139,13 @@ export async function createKernelV1Account<
|
|
|
130
139
|
}
|
|
131
140
|
|
|
132
141
|
const initCode = await generateInitCode()
|
|
133
|
-
const accountAddress = await getSenderAddress(
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
142
|
+
const accountAddress = await getSenderAddress<ENTRYPOINT_ADDRESS_V06_TYPE>(
|
|
143
|
+
client,
|
|
144
|
+
{
|
|
145
|
+
initCode,
|
|
146
|
+
entryPoint: entryPointAddress
|
|
147
|
+
}
|
|
148
|
+
)
|
|
137
149
|
|
|
138
150
|
if (!accountAddress) throw new Error("Account address not found")
|
|
139
151
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import {
|
|
2
|
-
ENTRYPOINT_ADDRESS_V06,
|
|
3
2
|
getAccountNonce,
|
|
3
|
+
getEntryPointVersion,
|
|
4
4
|
getSenderAddress,
|
|
5
5
|
isSmartAccountDeployed
|
|
6
6
|
} from "permissionless"
|
|
@@ -56,6 +56,7 @@ export type KernelSmartAccount<
|
|
|
56
56
|
chain extends Chain | undefined = Chain | undefined
|
|
57
57
|
> = SmartAccount<entryPoint, "kernelSmartAccount", transport, chain> & {
|
|
58
58
|
kernelPluginManager: KernelPluginManager<entryPoint>
|
|
59
|
+
getNonce: (customNonceKey?: bigint) => Promise<bigint>
|
|
59
60
|
generateInitCode: () => Promise<Hex>
|
|
60
61
|
encodeCallData: (args: KernelEncodeCallDataArgs) => Promise<Hex>
|
|
61
62
|
}
|
|
@@ -155,7 +156,7 @@ export async function createKernelV2Account<
|
|
|
155
156
|
client: Client<TTransport, TChain, undefined>,
|
|
156
157
|
{
|
|
157
158
|
plugins,
|
|
158
|
-
entryPoint: entryPointAddress
|
|
159
|
+
entryPoint: entryPointAddress,
|
|
159
160
|
index = 0n,
|
|
160
161
|
factoryAddress = KERNEL_ADDRESSES.FACTORY_ADDRESS,
|
|
161
162
|
deployedAccountAddress
|
|
@@ -163,12 +164,17 @@ export async function createKernelV2Account<
|
|
|
163
164
|
plugins:
|
|
164
165
|
| KernelPluginManagerParams<entryPoint>
|
|
165
166
|
| KernelPluginManager<entryPoint>
|
|
166
|
-
entryPoint
|
|
167
|
+
entryPoint: entryPoint
|
|
167
168
|
index?: bigint
|
|
168
169
|
factoryAddress?: Address
|
|
169
170
|
deployedAccountAddress?: Address
|
|
170
171
|
}
|
|
171
172
|
): Promise<KernelSmartAccount<entryPoint, TTransport, TChain>> {
|
|
173
|
+
const entryPointVersion = getEntryPointVersion(entryPointAddress)
|
|
174
|
+
|
|
175
|
+
if (entryPointVersion !== "v0.6") {
|
|
176
|
+
throw new Error("Only EntryPoint 0.6 is supported")
|
|
177
|
+
}
|
|
172
178
|
const kernelPluginManager = isKernelPluginManager<entryPoint>(plugins)
|
|
173
179
|
? plugins
|
|
174
180
|
: await toKernelPluginManager(client, {
|
|
@@ -312,8 +318,11 @@ export async function createKernelV2Account<
|
|
|
312
318
|
},
|
|
313
319
|
|
|
314
320
|
// Get the nonce of the smart account
|
|
315
|
-
async getNonce() {
|
|
316
|
-
const key = await kernelPluginManager.getNonceKey(
|
|
321
|
+
async getNonce(customNonceKey?: bigint) {
|
|
322
|
+
const key = await kernelPluginManager.getNonceKey(
|
|
323
|
+
accountAddress,
|
|
324
|
+
customNonceKey
|
|
325
|
+
)
|
|
317
326
|
return getAccountNonce(client, {
|
|
318
327
|
sender: accountAddress,
|
|
319
328
|
entryPoint: entryPointAddress,
|
|
@@ -226,9 +226,19 @@ export async function toKernelPluginManager<
|
|
|
226
226
|
userOpSig
|
|
227
227
|
)
|
|
228
228
|
},
|
|
229
|
-
getNonceKey: async (
|
|
229
|
+
getNonceKey: async (
|
|
230
|
+
accountAddress = zeroAddress,
|
|
231
|
+
customNonceKey = 0n
|
|
232
|
+
) => {
|
|
230
233
|
if (entryPointVersion === "v0.6")
|
|
231
|
-
return await activeValidator.getNonceKey(
|
|
234
|
+
return await activeValidator.getNonceKey(
|
|
235
|
+
accountAddress,
|
|
236
|
+
customNonceKey
|
|
237
|
+
)
|
|
238
|
+
|
|
239
|
+
// when using v0.7 if customNonceKey is greater than 2 bytes, throw error
|
|
240
|
+
if (customNonceKey > 0xffffn)
|
|
241
|
+
throw new Error("Custom nonce key must be less than 2 bytes")
|
|
232
242
|
|
|
233
243
|
const validatorMode =
|
|
234
244
|
!regular ||
|
|
@@ -238,19 +248,30 @@ export async function toKernelPluginManager<
|
|
|
238
248
|
const validatorType = regular
|
|
239
249
|
? VALIDATOR_TYPE[regular.validatorType]
|
|
240
250
|
: VALIDATOR_TYPE.SUDO
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
251
|
+
const encoding = pad(
|
|
252
|
+
concatHex([
|
|
253
|
+
validatorMode, // 1 byte
|
|
254
|
+
validatorType, // 1 byte
|
|
255
|
+
pad(activeValidator.getIdentifier(), {
|
|
256
|
+
size: 20,
|
|
257
|
+
dir: "right"
|
|
258
|
+
}), // 20 bytes
|
|
259
|
+
pad(
|
|
260
|
+
toHex(
|
|
261
|
+
await activeValidator.getNonceKey(
|
|
262
|
+
accountAddress,
|
|
263
|
+
customNonceKey
|
|
264
|
+
)
|
|
265
|
+
),
|
|
266
|
+
{
|
|
248
267
|
size: 2
|
|
249
|
-
}
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
268
|
+
}
|
|
269
|
+
) // 2 byte
|
|
270
|
+
]),
|
|
271
|
+
{ size: 24 }
|
|
253
272
|
)
|
|
273
|
+
const encodedNonceKey = BigInt(encoding)
|
|
274
|
+
return encodedNonceKey
|
|
254
275
|
},
|
|
255
276
|
getPluginEnableSignature,
|
|
256
277
|
getValidatorInitData: async () => {
|
|
@@ -262,7 +283,7 @@ export async function toKernelPluginManager<
|
|
|
262
283
|
(await sudo?.getEnableData()) ??
|
|
263
284
|
(await activeValidator.getEnableData()),
|
|
264
285
|
|
|
265
|
-
identifier: getIdentifier(true)
|
|
286
|
+
identifier: pad(getIdentifier(true), { size: 21, dir: "right" })
|
|
266
287
|
}
|
|
267
288
|
}
|
|
268
289
|
}
|
package/package.json
CHANGED
package/types/kernel.ts
CHANGED
|
@@ -98,7 +98,10 @@ export type KernelValidator<
|
|
|
98
98
|
Name extends string = string
|
|
99
99
|
> = LocalAccount<Name> & {
|
|
100
100
|
validatorType: ValidatorType
|
|
101
|
-
getNonceKey: (
|
|
101
|
+
getNonceKey: (
|
|
102
|
+
accountAddress?: Address,
|
|
103
|
+
customNonceKey?: bigint
|
|
104
|
+
) => Promise<bigint>
|
|
102
105
|
getDummySignature(
|
|
103
106
|
userOperation: UserOperation<GetEntryPointVersion<entryPoint>>,
|
|
104
107
|
pluginEnableSignature?: Hex
|