@zerodev/permissions 5.6.0 → 5.6.2
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/deserializePermissionAccount.js +2 -1
- package/_cjs/deserializePermissionAccount.js.map +1 -1
- package/_cjs/index.js +5 -1
- package/_cjs/index.js.map +1 -1
- package/_cjs/migration/isPermissionMigrated.js +22 -0
- package/_cjs/migration/isPermissionMigrated.js.map +1 -0
- package/_cjs/migration/migrationSessionKeyAccount.js +91 -0
- package/_cjs/migration/migrationSessionKeyAccount.js.map +1 -0
- package/_cjs/toPermissionValidator.js +6 -2
- package/_cjs/toPermissionValidator.js.map +1 -1
- package/_esm/deserializePermissionAccount.js +2 -1
- package/_esm/deserializePermissionAccount.js.map +1 -1
- package/_esm/index.js +2 -0
- package/_esm/index.js.map +1 -1
- package/_esm/migration/isPermissionMigrated.js +18 -0
- package/_esm/migration/isPermissionMigrated.js.map +1 -0
- package/_esm/migration/migrationSessionKeyAccount.js +87 -0
- package/_esm/migration/migrationSessionKeyAccount.js.map +1 -0
- package/_esm/toPermissionValidator.js +6 -2
- package/_esm/toPermissionValidator.js.map +1 -1
- package/_types/deserializePermissionAccount.d.ts.map +1 -1
- package/_types/index.d.ts +2 -0
- package/_types/index.d.ts.map +1 -1
- package/_types/migration/isPermissionMigrated.d.ts +6 -0
- package/_types/migration/isPermissionMigrated.d.ts.map +1 -0
- package/_types/migration/migrationSessionKeyAccount.d.ts +7 -0
- package/_types/migration/migrationSessionKeyAccount.d.ts.map +1 -0
- package/_types/toPermissionValidator.d.ts +1 -1
- package/_types/toPermissionValidator.d.ts.map +1 -1
- package/_types/types.d.ts +2 -0
- package/_types/types.d.ts.map +1 -1
- package/deserializePermissionAccount.ts +2 -1
- package/index.ts +2 -0
- package/migration/isPermissionMigrated.ts +40 -0
- package/migration/migrationSessionKeyAccount.ts +120 -0
- package/package.json +1 -1
- package/toPermissionValidator.ts +7 -2
- package/types.ts +2 -0
|
@@ -28,7 +28,8 @@ const deserializePermissionAccount = async (client, entryPoint, kernelVersion, m
|
|
|
28
28
|
signer,
|
|
29
29
|
policies: await Promise.all(params.permissionParams.policies?.map((policy) => (0, exports.createPolicyFromParams)(policy)) || []),
|
|
30
30
|
entryPoint,
|
|
31
|
-
kernelVersion
|
|
31
|
+
kernelVersion,
|
|
32
|
+
permissionId: params.permissionParams.permissionId
|
|
32
33
|
});
|
|
33
34
|
const { index, validatorInitData, useMetaFactory } = (0, exports.decodeParamsFromInitCode)(params.accountParams.initCode, kernelVersion);
|
|
34
35
|
const kernelPluginManager = await (0, accounts_1.toKernelPluginManager)(client, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deserializePermissionAccount.js","sourceRoot":"","sources":["../deserializePermissionAccount.ts"],"names":[],"mappings":";;;AAAA,sCAMqB;AACrB,oDAG8B;AAQ9B,+BAAyC;AAEzC,4CAAmD;AAEnD,kDAO4B;AAC5B,iEAA0D;AAC1D,yEAAkE;AAGlE,yCAA+D;AAC/D,yCAAiD;AAE1C,MAAM,4BAA4B,GAAG,KAAK,EAG7C,MAAkD,EAClD,UAA6C,EAC7C,aAAkD,EAClD,8BAAsC,EACtC,aAA6B,EAC/B,EAAE;IACA,IAAI,UAAU,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;IACvD,CAAC;IACD,MAAM,MAAM,GAAG,IAAA,6CAAkC,EAC7C,8BAA8B,CACjC,CAAA;IACD,IAAI,MAAqB,CAAA;IACzB,IAAI,MAAM,CAAC,UAAU;QACjB,MAAM,GAAG,MAAM,IAAA,gCAAa,EAAC;YACzB,MAAM,EAAE,IAAA,8BAAmB,EAAC,MAAM,CAAC,UAAU,CAAC;SACjD,CAAC,CAAA;SACD,IAAI,aAAa;QAAE,MAAM,GAAG,aAAa,CAAA;;QACzC,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAA;IAEnE,MAAM,uBAAuB,GAAG,MAAM,IAAA,gDAAqB,EAAC,MAAM,EAAE;QAChE,MAAM;QACN,QAAQ,EAAE,MAAM,OAAO,CAAC,GAAG,CACvB,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAC7C,IAAA,8BAAsB,EAAC,MAAM,CAAC,CACjC,IAAI,EAAE,CACV;QACD,UAAU;QACV,aAAa;
|
|
1
|
+
{"version":3,"file":"deserializePermissionAccount.js","sourceRoot":"","sources":["../deserializePermissionAccount.ts"],"names":[],"mappings":"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"}
|
package/_cjs/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.toInitConfig = exports.decodeParamsFromInitCode = exports.deserializePermissionAccount = exports.serializeMultiChainPermissionAccounts = exports.serializePermissionAccount = exports.toPermissionValidator = void 0;
|
|
3
|
+
exports.isPermissionMigrated = exports.migrationSessionKeyAccount = exports.toInitConfig = exports.decodeParamsFromInitCode = exports.deserializePermissionAccount = exports.serializeMultiChainPermissionAccounts = exports.serializePermissionAccount = exports.toPermissionValidator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
var toPermissionValidator_js_1 = require("./toPermissionValidator.js");
|
|
6
6
|
Object.defineProperty(exports, "toPermissionValidator", { enumerable: true, get: function () { return toPermissionValidator_js_1.toPermissionValidator; } });
|
|
@@ -14,4 +14,8 @@ Object.defineProperty(exports, "decodeParamsFromInitCode", { enumerable: true, g
|
|
|
14
14
|
tslib_1.__exportStar(require("./constants.js"), exports);
|
|
15
15
|
var toInitConfig_js_1 = require("./toInitConfig.js");
|
|
16
16
|
Object.defineProperty(exports, "toInitConfig", { enumerable: true, get: function () { return toInitConfig_js_1.toInitConfig; } });
|
|
17
|
+
var migrationSessionKeyAccount_js_1 = require("./migration/migrationSessionKeyAccount.js");
|
|
18
|
+
Object.defineProperty(exports, "migrationSessionKeyAccount", { enumerable: true, get: function () { return migrationSessionKeyAccount_js_1.migrationSessionKeyAccount; } });
|
|
19
|
+
var isPermissionMigrated_js_1 = require("./migration/isPermissionMigrated.js");
|
|
20
|
+
Object.defineProperty(exports, "isPermissionMigrated", { enumerable: true, get: function () { return isPermissionMigrated_js_1.isPermissionMigrated; } });
|
|
17
21
|
//# sourceMappingURL=index.js.map
|
package/_cjs/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;;AACA,uEAAkE;AAAzD,iIAAA,qBAAqB,OAAA;AAC9B,iFAA4E;AAAnE,2IAAA,0BAA0B,OAAA;AACnC,uGAGmD;AAD/C,iKAAA,qCAAqC,OAAA;AAEzC,qFAG0C;AAFtC,+IAAA,4BAA4B,OAAA;AAC5B,2IAAA,wBAAwB,OAAA;AAE5B,yDAA8B;AAC9B,qDAAgD;AAAvC,+GAAA,YAAY,OAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;;AACA,uEAAkE;AAAzD,iIAAA,qBAAqB,OAAA;AAC9B,iFAA4E;AAAnE,2IAAA,0BAA0B,OAAA;AACnC,uGAGmD;AAD/C,iKAAA,qCAAqC,OAAA;AAEzC,qFAG0C;AAFtC,+IAAA,4BAA4B,OAAA;AAC5B,2IAAA,wBAAwB,OAAA;AAE5B,yDAA8B;AAC9B,qDAAgD;AAAvC,+GAAA,YAAY,OAAA;AACrB,2FAAsF;AAA7E,2IAAA,0BAA0B,OAAA;AACnC,+EAA0E;AAAjE,+HAAA,oBAAoB,OAAA"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.isPermissionMigrated = void 0;
|
|
4
|
+
const accounts_1 = require("@zerodev/sdk/accounts");
|
|
5
|
+
const actions_1 = require("viem/actions");
|
|
6
|
+
const utils_1 = require("viem/utils");
|
|
7
|
+
const isPermissionMigrated = async (client, params) => {
|
|
8
|
+
try {
|
|
9
|
+
const [, , p] = await (0, utils_1.getAction)(client, actions_1.readContract, "readContract")({
|
|
10
|
+
address: accounts_1.MIGRATION_HELPER_ADDRESS,
|
|
11
|
+
abi: accounts_1.MigrationHelperAbi,
|
|
12
|
+
functionName: "isMigrated",
|
|
13
|
+
args: [params.account, [], [params.permissionId]]
|
|
14
|
+
});
|
|
15
|
+
return p[0];
|
|
16
|
+
}
|
|
17
|
+
catch {
|
|
18
|
+
return false;
|
|
19
|
+
}
|
|
20
|
+
};
|
|
21
|
+
exports.isPermissionMigrated = isPermissionMigrated;
|
|
22
|
+
//# sourceMappingURL=isPermissionMigrated.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"isPermissionMigrated.js","sourceRoot":"","sources":["../../migration/isPermissionMigrated.ts"],"names":[],"mappings":";;;AAAA,oDAG8B;AAU9B,0CAA2C;AAC3C,sCAAsC;AAE/B,MAAM,oBAAoB,GAAG,KAAK,EACrC,MAIC,EACD,MAA+C,EAC/B,EAAE;IAClB,IAAI,CAAC;QACD,MAAM,CAAC,EAAE,AAAD,EAAG,CAAC,CAAC,GAAG,MAAM,IAAA,iBAAS,EAC3B,MAAM,EACN,sBAAY,EACZ,cAAc,CACjB,CAAC;YACE,OAAO,EAAE,mCAAwB;YACjC,GAAG,EAAE,6BAAkB;YACvB,YAAY,EAAE,YAAY;YAC1B,IAAI,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;SACpD,CAAC,CAAA;QACF,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;IACf,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,KAAK,CAAA;IAChB,CAAC;AACL,CAAC,CAAA;AAvBY,QAAA,oBAAoB,wBAuBhC"}
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.migrationSessionKeyAccount = void 0;
|
|
4
|
+
const sdk_1 = require("@zerodev/sdk");
|
|
5
|
+
const accounts_1 = require("@zerodev/sdk/accounts");
|
|
6
|
+
const constants_1 = require("@zerodev/sdk/constants");
|
|
7
|
+
const viem_1 = require("viem");
|
|
8
|
+
const isPermissionMigrated_js_1 = require("./isPermissionMigrated.js");
|
|
9
|
+
const migrationSessionKeyAccount = async (params) => {
|
|
10
|
+
const account = params.account;
|
|
11
|
+
const installFallbackCallData = (0, viem_1.encodeFunctionData)({
|
|
12
|
+
abi: sdk_1.KernelV3AccountAbi,
|
|
13
|
+
functionName: "installModule",
|
|
14
|
+
args: [
|
|
15
|
+
3n,
|
|
16
|
+
accounts_1.MIGRATION_HELPER_ADDRESS,
|
|
17
|
+
(0, viem_1.concat)([
|
|
18
|
+
(0, viem_1.toFunctionSelector)((0, viem_1.getAbiItem)({
|
|
19
|
+
abi: accounts_1.MigrationHelperAbi,
|
|
20
|
+
name: "migrateWithCall"
|
|
21
|
+
})),
|
|
22
|
+
viem_1.zeroAddress,
|
|
23
|
+
(0, viem_1.encodeAbiParameters)((0, viem_1.parseAbiParameters)("bytes selectorInitData, bytes hookInitData"), [constants_1.CALL_TYPE.DELEGATE_CALL, "0x0000"])
|
|
24
|
+
])
|
|
25
|
+
]
|
|
26
|
+
});
|
|
27
|
+
const installFallbackCall = {
|
|
28
|
+
to: account.address,
|
|
29
|
+
data: installFallbackCallData,
|
|
30
|
+
value: 0n
|
|
31
|
+
};
|
|
32
|
+
const uninstallFallbackCallData = (0, viem_1.encodeFunctionData)({
|
|
33
|
+
abi: sdk_1.KernelV3AccountAbi,
|
|
34
|
+
functionName: "uninstallModule",
|
|
35
|
+
args: [
|
|
36
|
+
3n,
|
|
37
|
+
accounts_1.MIGRATION_HELPER_ADDRESS,
|
|
38
|
+
(0, viem_1.concat)([
|
|
39
|
+
(0, viem_1.toFunctionSelector)((0, viem_1.getAbiItem)({
|
|
40
|
+
abi: accounts_1.MigrationHelperAbi,
|
|
41
|
+
name: "migrateWithCall"
|
|
42
|
+
})),
|
|
43
|
+
"0x"
|
|
44
|
+
])
|
|
45
|
+
]
|
|
46
|
+
});
|
|
47
|
+
const uninstallFallbackCall = {
|
|
48
|
+
to: account.address,
|
|
49
|
+
data: uninstallFallbackCallData,
|
|
50
|
+
value: 0n
|
|
51
|
+
};
|
|
52
|
+
return {
|
|
53
|
+
...params.account,
|
|
54
|
+
async encodeCalls(calls, callType) {
|
|
55
|
+
const isMigrated = await (0, isPermissionMigrated_js_1.isPermissionMigrated)(account.client, {
|
|
56
|
+
account: account.address,
|
|
57
|
+
permissionId: params.permissionId
|
|
58
|
+
});
|
|
59
|
+
const executeCallData = await account.encodeCalls(calls, callType);
|
|
60
|
+
if (isMigrated) {
|
|
61
|
+
return executeCallData;
|
|
62
|
+
}
|
|
63
|
+
const { args: [execMode, executionCalldata] } = (0, viem_1.decodeFunctionData)({
|
|
64
|
+
abi: [(0, viem_1.getAbiItem)({ abi: sdk_1.KernelV3ExecuteAbi, name: "execute" })],
|
|
65
|
+
data: executeCallData
|
|
66
|
+
});
|
|
67
|
+
const migrationCallData = (0, viem_1.encodeFunctionData)({
|
|
68
|
+
abi: accounts_1.MigrationHelperAbi,
|
|
69
|
+
functionName: "migrateWithCall",
|
|
70
|
+
args: [[], [params.permissionId], execMode, executionCalldata]
|
|
71
|
+
});
|
|
72
|
+
const migrationCall = {
|
|
73
|
+
to: accounts_1.MIGRATION_HELPER_ADDRESS,
|
|
74
|
+
data: migrationCallData,
|
|
75
|
+
value: 0n
|
|
76
|
+
};
|
|
77
|
+
if (account.kernelVersion !== "0.3.0") {
|
|
78
|
+
return account.encodeCalls([migrationCall], "delegatecall");
|
|
79
|
+
}
|
|
80
|
+
migrationCall.to = account.address;
|
|
81
|
+
const finalCalls = [
|
|
82
|
+
installFallbackCall,
|
|
83
|
+
migrationCall,
|
|
84
|
+
uninstallFallbackCall
|
|
85
|
+
];
|
|
86
|
+
return account.encodeCalls(finalCalls, "call");
|
|
87
|
+
}
|
|
88
|
+
};
|
|
89
|
+
};
|
|
90
|
+
exports.migrationSessionKeyAccount = migrationSessionKeyAccount;
|
|
91
|
+
//# sourceMappingURL=migrationSessionKeyAccount.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"migrationSessionKeyAccount.js","sourceRoot":"","sources":["../../migration/migrationSessionKeyAccount.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ const utils_1 = require("viem/utils");
|
|
|
9
9
|
const constants_js_1 = require("./constants.js");
|
|
10
10
|
const index_js_1 = require("./policies/index.js");
|
|
11
11
|
const index_js_2 = require("./signers/index.js");
|
|
12
|
-
async function toPermissionValidator(client, { signer, policies, entryPoint, kernelVersion: _, flag = constants_js_1.PolicyFlags.FOR_ALL_VALIDATION }) {
|
|
12
|
+
async function toPermissionValidator(client, { signer, policies, entryPoint, kernelVersion: _, flag = constants_js_1.PolicyFlags.FOR_ALL_VALIDATION, permissionId }) {
|
|
13
13
|
const chainId = client.chain ? client.chain.id : await (0, actions_1.getChainId)(client);
|
|
14
14
|
if (entryPoint.version !== "0.7") {
|
|
15
15
|
throw new Error("Only EntryPoint 0.7 is supported");
|
|
@@ -31,6 +31,9 @@ async function toPermissionValidator(client, { signer, policies, entryPoint, ker
|
|
|
31
31
|
return enableData;
|
|
32
32
|
};
|
|
33
33
|
const getPermissionId = () => {
|
|
34
|
+
if (permissionId) {
|
|
35
|
+
return permissionId;
|
|
36
|
+
}
|
|
34
37
|
const pIdData = (0, viem_1.encodeAbiParameters)([{ name: "policyAndSignerData", type: "bytes[]" }], [[(0, index_js_1.toPolicyId)(policies), flag, (0, index_js_2.toSignerId)(signer)]]);
|
|
35
38
|
return (0, viem_1.slice)((0, viem_1.keccak256)(pIdData), 0, 4);
|
|
36
39
|
};
|
|
@@ -80,7 +83,8 @@ async function toPermissionValidator(client, { signer, policies, entryPoint, ker
|
|
|
80
83
|
},
|
|
81
84
|
getPluginSerializationParams: () => {
|
|
82
85
|
return {
|
|
83
|
-
policies
|
|
86
|
+
policies,
|
|
87
|
+
permissionId: getPermissionId()
|
|
84
88
|
};
|
|
85
89
|
},
|
|
86
90
|
isEnabled: async (kernelAccountAddress, _selector) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toPermissionValidator.js","sourceRoot":"","sources":["../toPermissionValidator.ts"],"names":[],"mappings":";;;AAAA,sCAAiD;AACjD,+BASa;AACb,kEAIiC;AACjC,0CAAuD;AACvD,sCAAsC;AACtC,iDAA4C;AAC5C,kDAAgD;AAChD,iDAA+C;AAOxC,KAAK,UAAU,qBAAqB,CAGvC,MAAc,EACd,EACI,MAAM,EACN,QAAQ,EACR,UAAU,EACV,aAAa,EAAE,CAAC,EAChB,IAAI,GAAG,0BAAW,CAAC,kBAAkB,
|
|
1
|
+
{"version":3,"file":"toPermissionValidator.js","sourceRoot":"","sources":["../toPermissionValidator.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,8 @@ export const deserializePermissionAccount = async (client, entryPoint, kernelVer
|
|
|
25
25
|
signer,
|
|
26
26
|
policies: await Promise.all(params.permissionParams.policies?.map((policy) => createPolicyFromParams(policy)) || []),
|
|
27
27
|
entryPoint,
|
|
28
|
-
kernelVersion
|
|
28
|
+
kernelVersion,
|
|
29
|
+
permissionId: params.permissionParams.permissionId
|
|
29
30
|
});
|
|
30
31
|
const { index, validatorInitData, useMetaFactory } = decodeParamsFromInitCode(params.accountParams.initCode, kernelVersion);
|
|
31
32
|
const kernelPluginManager = await toKernelPluginManager(client, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deserializePermissionAccount.js","sourceRoot":"","sources":["../deserializePermissionAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,sBAAsB,EACtB,kBAAkB,EAClB,kBAAkB,EAClB,oBAAoB,EACpB,mBAAmB,EACtB,MAAM,cAAc,CAAA;AACrB,OAAO,EAEH,qBAAqB,EACxB,MAAM,uBAAuB,CAAA;AAQ9B,OAAO,EAAE,kBAAkB,EAAE,MAAM,MAAM,CAAA;AAEzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAA;AAEnD,OAAO,EACH,YAAY,EACZ,WAAW,EACX,iBAAiB,EACjB,uBAAuB,EACvB,YAAY,EACZ,iBAAiB,EACpB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAGlE,OAAO,EAAE,kCAAkC,EAAE,MAAM,YAAY,CAAA;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAEjD,MAAM,CAAC,MAAM,4BAA4B,GAAG,KAAK,EAG7C,MAAkD,EAClD,UAA6C,EAC7C,aAAkD,EAClD,8BAAsC,EACtC,aAA6B,EAC/B,EAAE;IACA,IAAI,UAAU,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;IACvD,CAAC;IACD,MAAM,MAAM,GAAG,kCAAkC,CAC7C,8BAA8B,CACjC,CAAA;IACD,IAAI,MAAqB,CAAA;IACzB,IAAI,MAAM,CAAC,UAAU;QACjB,MAAM,GAAG,MAAM,aAAa,CAAC;YACzB,MAAM,EAAE,mBAAmB,CAAC,MAAM,CAAC,UAAU,CAAC;SACjD,CAAC,CAAA;SACD,IAAI,aAAa;QAAE,MAAM,GAAG,aAAa,CAAA;;QACzC,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAA;IAEnE,MAAM,uBAAuB,GAAG,MAAM,qBAAqB,CAAC,MAAM,EAAE;QAChE,MAAM;QACN,QAAQ,EAAE,MAAM,OAAO,CAAC,GAAG,CACvB,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAC7C,sBAAsB,CAAC,MAAM,CAAC,CACjC,IAAI,EAAE,CACV;QACD,UAAU;QACV,aAAa;
|
|
1
|
+
{"version":3,"file":"deserializePermissionAccount.js","sourceRoot":"","sources":["../deserializePermissionAccount.ts"],"names":[],"mappings":"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"}
|
package/_esm/index.js
CHANGED
|
@@ -4,4 +4,6 @@ export { serializeMultiChainPermissionAccounts } from "./serializeMultiChainPerm
|
|
|
4
4
|
export { deserializePermissionAccount, decodeParamsFromInitCode } from "./deserializePermissionAccount.js";
|
|
5
5
|
export * from "./constants.js";
|
|
6
6
|
export { toInitConfig } from "./toInitConfig.js";
|
|
7
|
+
export { migrationSessionKeyAccount } from "./migration/migrationSessionKeyAccount.js";
|
|
8
|
+
export { isPermissionMigrated } from "./migration/isPermissionMigrated.js";
|
|
7
9
|
//# sourceMappingURL=index.js.map
|
package/_esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAClE,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAA;AAC5E,OAAO,EAEH,qCAAqC,EACxC,MAAM,4CAA4C,CAAA;AACnD,OAAO,EACH,4BAA4B,EAC5B,wBAAwB,EAC3B,MAAM,mCAAmC,CAAA;AAC1C,cAAc,gBAAgB,CAAA;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAClE,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAA;AAC5E,OAAO,EAEH,qCAAqC,EACxC,MAAM,4CAA4C,CAAA;AACnD,OAAO,EACH,4BAA4B,EAC5B,wBAAwB,EAC3B,MAAM,mCAAmC,CAAA;AAC1C,cAAc,gBAAgB,CAAA;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAA;AACtF,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAA"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { MIGRATION_HELPER_ADDRESS, MigrationHelperAbi } from "@zerodev/sdk/accounts";
|
|
2
|
+
import { readContract } from "viem/actions";
|
|
3
|
+
import { getAction } from "viem/utils";
|
|
4
|
+
export const isPermissionMigrated = async (client, params) => {
|
|
5
|
+
try {
|
|
6
|
+
const [, , p] = await getAction(client, readContract, "readContract")({
|
|
7
|
+
address: MIGRATION_HELPER_ADDRESS,
|
|
8
|
+
abi: MigrationHelperAbi,
|
|
9
|
+
functionName: "isMigrated",
|
|
10
|
+
args: [params.account, [], [params.permissionId]]
|
|
11
|
+
});
|
|
12
|
+
return p[0];
|
|
13
|
+
}
|
|
14
|
+
catch {
|
|
15
|
+
return false;
|
|
16
|
+
}
|
|
17
|
+
};
|
|
18
|
+
//# sourceMappingURL=isPermissionMigrated.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"isPermissionMigrated.js","sourceRoot":"","sources":["../../migration/isPermissionMigrated.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,wBAAwB,EACxB,kBAAkB,EACrB,MAAM,uBAAuB,CAAA;AAU9B,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAEtC,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,EACrC,MAIC,EACD,MAA+C,EAC/B,EAAE;IAClB,IAAI,CAAC;QACD,MAAM,CAAC,EAAE,AAAD,EAAG,CAAC,CAAC,GAAG,MAAM,SAAS,CAC3B,MAAM,EACN,YAAY,EACZ,cAAc,CACjB,CAAC;YACE,OAAO,EAAE,wBAAwB;YACjC,GAAG,EAAE,kBAAkB;YACvB,YAAY,EAAE,YAAY;YAC1B,IAAI,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;SACpD,CAAC,CAAA;QACF,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;IACf,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,KAAK,CAAA;IAChB,CAAC;AACL,CAAC,CAAA"}
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
import { KernelV3AccountAbi, KernelV3ExecuteAbi } from "@zerodev/sdk";
|
|
2
|
+
import { MIGRATION_HELPER_ADDRESS, MigrationHelperAbi } from "@zerodev/sdk/accounts";
|
|
3
|
+
import { CALL_TYPE } from "@zerodev/sdk/constants";
|
|
4
|
+
import { concat, decodeFunctionData, encodeAbiParameters, encodeFunctionData, getAbiItem, parseAbiParameters, toFunctionSelector, zeroAddress } from "viem";
|
|
5
|
+
import { isPermissionMigrated } from "./isPermissionMigrated.js";
|
|
6
|
+
export const migrationSessionKeyAccount = async (params) => {
|
|
7
|
+
const account = params.account;
|
|
8
|
+
const installFallbackCallData = encodeFunctionData({
|
|
9
|
+
abi: KernelV3AccountAbi,
|
|
10
|
+
functionName: "installModule",
|
|
11
|
+
args: [
|
|
12
|
+
3n,
|
|
13
|
+
MIGRATION_HELPER_ADDRESS,
|
|
14
|
+
concat([
|
|
15
|
+
toFunctionSelector(getAbiItem({
|
|
16
|
+
abi: MigrationHelperAbi,
|
|
17
|
+
name: "migrateWithCall"
|
|
18
|
+
})),
|
|
19
|
+
zeroAddress,
|
|
20
|
+
encodeAbiParameters(parseAbiParameters("bytes selectorInitData, bytes hookInitData"), [CALL_TYPE.DELEGATE_CALL, "0x0000"])
|
|
21
|
+
])
|
|
22
|
+
]
|
|
23
|
+
});
|
|
24
|
+
const installFallbackCall = {
|
|
25
|
+
to: account.address,
|
|
26
|
+
data: installFallbackCallData,
|
|
27
|
+
value: 0n
|
|
28
|
+
};
|
|
29
|
+
const uninstallFallbackCallData = encodeFunctionData({
|
|
30
|
+
abi: KernelV3AccountAbi,
|
|
31
|
+
functionName: "uninstallModule",
|
|
32
|
+
args: [
|
|
33
|
+
3n,
|
|
34
|
+
MIGRATION_HELPER_ADDRESS,
|
|
35
|
+
concat([
|
|
36
|
+
toFunctionSelector(getAbiItem({
|
|
37
|
+
abi: MigrationHelperAbi,
|
|
38
|
+
name: "migrateWithCall"
|
|
39
|
+
})),
|
|
40
|
+
"0x"
|
|
41
|
+
])
|
|
42
|
+
]
|
|
43
|
+
});
|
|
44
|
+
const uninstallFallbackCall = {
|
|
45
|
+
to: account.address,
|
|
46
|
+
data: uninstallFallbackCallData,
|
|
47
|
+
value: 0n
|
|
48
|
+
};
|
|
49
|
+
return {
|
|
50
|
+
...params.account,
|
|
51
|
+
async encodeCalls(calls, callType) {
|
|
52
|
+
const isMigrated = await isPermissionMigrated(account.client, {
|
|
53
|
+
account: account.address,
|
|
54
|
+
permissionId: params.permissionId
|
|
55
|
+
});
|
|
56
|
+
const executeCallData = await account.encodeCalls(calls, callType);
|
|
57
|
+
if (isMigrated) {
|
|
58
|
+
return executeCallData;
|
|
59
|
+
}
|
|
60
|
+
const { args: [execMode, executionCalldata] } = decodeFunctionData({
|
|
61
|
+
abi: [getAbiItem({ abi: KernelV3ExecuteAbi, name: "execute" })],
|
|
62
|
+
data: executeCallData
|
|
63
|
+
});
|
|
64
|
+
const migrationCallData = encodeFunctionData({
|
|
65
|
+
abi: MigrationHelperAbi,
|
|
66
|
+
functionName: "migrateWithCall",
|
|
67
|
+
args: [[], [params.permissionId], execMode, executionCalldata]
|
|
68
|
+
});
|
|
69
|
+
const migrationCall = {
|
|
70
|
+
to: MIGRATION_HELPER_ADDRESS,
|
|
71
|
+
data: migrationCallData,
|
|
72
|
+
value: 0n
|
|
73
|
+
};
|
|
74
|
+
if (account.kernelVersion !== "0.3.0") {
|
|
75
|
+
return account.encodeCalls([migrationCall], "delegatecall");
|
|
76
|
+
}
|
|
77
|
+
migrationCall.to = account.address;
|
|
78
|
+
const finalCalls = [
|
|
79
|
+
installFallbackCall,
|
|
80
|
+
migrationCall,
|
|
81
|
+
uninstallFallbackCall
|
|
82
|
+
];
|
|
83
|
+
return account.encodeCalls(finalCalls, "call");
|
|
84
|
+
}
|
|
85
|
+
};
|
|
86
|
+
};
|
|
87
|
+
//# sourceMappingURL=migrationSessionKeyAccount.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"migrationSessionKeyAccount.js","sourceRoot":"","sources":["../../migration/migrationSessionKeyAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AACrE,OAAO,EAEH,wBAAwB,EACxB,kBAAkB,EACrB,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAGH,MAAM,EACN,kBAAkB,EAClB,mBAAmB,EACnB,kBAAkB,EAClB,UAAU,EACV,kBAAkB,EAClB,kBAAkB,EAClB,WAAW,EACd,MAAM,MAAM,CAAA;AACb,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAEhE,MAAM,CAAC,MAAM,0BAA0B,GAAG,KAAK,EAAE,MAGhD,EAAiD,EAAE;IAChD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAA;IAC9B,MAAM,uBAAuB,GAAG,kBAAkB,CAAC;QAC/C,GAAG,EAAE,kBAAkB;QACvB,YAAY,EAAE,eAAe;QAC7B,IAAI,EAAE;YACF,EAAE;YACF,wBAAwB;YACxB,MAAM,CAAC;gBACH,kBAAkB,CACd,UAAU,CAAC;oBACP,GAAG,EAAE,kBAAkB;oBACvB,IAAI,EAAE,iBAAiB;iBAC1B,CAAC,CACL;gBACD,WAAW;gBACX,mBAAmB,CACf,kBAAkB,CACd,4CAA4C,CAC/C,EACD,CAAC,SAAS,CAAC,aAAa,EAAE,QAAQ,CAAC,CACtC;aACJ,CAAC;SACL;KACJ,CAAC,CAAA;IACF,MAAM,mBAAmB,GAAG;QACxB,EAAE,EAAE,OAAO,CAAC,OAAO;QACnB,IAAI,EAAE,uBAAuB;QAC7B,KAAK,EAAE,EAAE;KACZ,CAAA;IACD,MAAM,yBAAyB,GAAG,kBAAkB,CAAC;QACjD,GAAG,EAAE,kBAAkB;QACvB,YAAY,EAAE,iBAAiB;QAC/B,IAAI,EAAE;YACF,EAAE;YACF,wBAAwB;YACxB,MAAM,CAAC;gBACH,kBAAkB,CACd,UAAU,CAAC;oBACP,GAAG,EAAE,kBAAkB;oBACvB,IAAI,EAAE,iBAAiB;iBAC1B,CAAC,CACL;gBACD,IAAI;aACP,CAAC;SACL;KACJ,CAAC,CAAA;IACF,MAAM,qBAAqB,GAAG;QAC1B,EAAE,EAAE,OAAO,CAAC,OAAO;QACnB,IAAI,EAAE,yBAAyB;QAC/B,KAAK,EAAE,EAAE;KACZ,CAAA;IACD,OAAO;QACH,GAAG,MAAM,CAAC,OAAO;QACjB,KAAK,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ;YAC7B,MAAM,UAAU,GAAG,MAAM,oBAAoB,CAAC,OAAO,CAAC,MAAM,EAAE;gBAC1D,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,YAAY,EAAE,MAAM,CAAC,YAAY;aACpC,CAAC,CAAA;YACF,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;YAClE,IAAI,UAAU,EAAE,CAAC;gBACb,OAAO,eAAe,CAAA;YAC1B,CAAC;YACD,MAAM,EACF,IAAI,EAAE,CAAC,QAAQ,EAAE,iBAAiB,CAAC,EACtC,GAAG,kBAAkB,CAAC;gBACnB,GAAG,EAAE,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,kBAAkB,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;gBAC/D,IAAI,EAAE,eAAe;aACxB,CAAC,CAAA;YACF,MAAM,iBAAiB,GAAG,kBAAkB,CAAC;gBACzC,GAAG,EAAE,kBAAkB;gBACvB,YAAY,EAAE,iBAAiB;gBAC/B,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,QAAQ,EAAE,iBAAiB,CAAC;aACjE,CAAC,CAAA;YAEF,MAAM,aAAa,GAAG;gBAClB,EAAE,EAAE,wBAAwB;gBAC5B,IAAI,EAAE,iBAAiB;gBACvB,KAAK,EAAE,EAAE;aACJ,CAAA;YAET,IAAI,OAAO,CAAC,aAAa,KAAK,OAAO,EAAE,CAAC;gBACpC,OAAO,OAAO,CAAC,WAAW,CAAC,CAAC,aAAa,CAAC,EAAE,cAAc,CAAC,CAAA;YAC/D,CAAC;YAED,aAAa,CAAC,EAAE,GAAG,OAAO,CAAC,OAAO,CAAA;YAClC,MAAM,UAAU,GAAG;gBACf,mBAAmB;gBACnB,aAAa;gBACb,qBAAqB;aACxB,CAAA;YAED,OAAO,OAAO,CAAC,WAAW,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;QAClD,CAAC;KACJ,CAAA;AACL,CAAC,CAAA"}
|
|
@@ -6,7 +6,7 @@ import { getAction } from "viem/utils";
|
|
|
6
6
|
import { PolicyFlags } from "./constants.js";
|
|
7
7
|
import { toPolicyId } from "./policies/index.js";
|
|
8
8
|
import { toSignerId } from "./signers/index.js";
|
|
9
|
-
export async function toPermissionValidator(client, { signer, policies, entryPoint, kernelVersion: _, flag = PolicyFlags.FOR_ALL_VALIDATION }) {
|
|
9
|
+
export async function toPermissionValidator(client, { signer, policies, entryPoint, kernelVersion: _, flag = PolicyFlags.FOR_ALL_VALIDATION, permissionId }) {
|
|
10
10
|
const chainId = client.chain ? client.chain.id : await getChainId(client);
|
|
11
11
|
if (entryPoint.version !== "0.7") {
|
|
12
12
|
throw new Error("Only EntryPoint 0.7 is supported");
|
|
@@ -28,6 +28,9 @@ export async function toPermissionValidator(client, { signer, policies, entryPoi
|
|
|
28
28
|
return enableData;
|
|
29
29
|
};
|
|
30
30
|
const getPermissionId = () => {
|
|
31
|
+
if (permissionId) {
|
|
32
|
+
return permissionId;
|
|
33
|
+
}
|
|
31
34
|
const pIdData = encodeAbiParameters([{ name: "policyAndSignerData", type: "bytes[]" }], [[toPolicyId(policies), flag, toSignerId(signer)]]);
|
|
32
35
|
return slice(keccak256(pIdData), 0, 4);
|
|
33
36
|
};
|
|
@@ -77,7 +80,8 @@ export async function toPermissionValidator(client, { signer, policies, entryPoi
|
|
|
77
80
|
},
|
|
78
81
|
getPluginSerializationParams: () => {
|
|
79
82
|
return {
|
|
80
|
-
policies
|
|
83
|
+
policies,
|
|
84
|
+
permissionId: getPermissionId()
|
|
81
85
|
};
|
|
82
86
|
},
|
|
83
87
|
isEnabled: async (kernelAccountAddress, _selector) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toPermissionValidator.js","sourceRoot":"","sources":["../toPermissionValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AACjD,OAAO,EAIH,MAAM,EACN,mBAAmB,EACnB,SAAS,EACT,KAAK,EACL,WAAW,EACd,MAAM,MAAM,CAAA;AACb,OAAO,EAGH,oBAAoB,EACvB,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAO/C,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAGvC,MAAc,EACd,EACI,MAAM,EACN,QAAQ,EACR,UAAU,EACV,aAAa,EAAE,CAAC,EAChB,IAAI,GAAG,WAAW,CAAC,kBAAkB,
|
|
1
|
+
{"version":3,"file":"toPermissionValidator.js","sourceRoot":"","sources":["../toPermissionValidator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deserializePermissionAccount.d.ts","sourceRoot":"","sources":["../deserializePermissionAccount.ts"],"names":[],"mappings":"AAOA,OAAO,EACH,KAAK,gCAAgC,EAExC,MAAM,uBAAuB,CAAA;AAC9B,OAAO,KAAK,EACR,cAAc,EACd,gBAAgB,EAChB,mBAAmB,EACnB,iBAAiB,EACpB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAA;AAE/B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAajE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAI/C,eAAO,MAAM,4BAA4B,wDAG7B,gCAAgC,CAAC,QAAQ,CAAC,qIAGlB,MAAM,kBACtB,aAAa,
|
|
1
|
+
{"version":3,"file":"deserializePermissionAccount.d.ts","sourceRoot":"","sources":["../deserializePermissionAccount.ts"],"names":[],"mappings":"AAOA,OAAO,EACH,KAAK,gCAAgC,EAExC,MAAM,uBAAuB,CAAA;AAC9B,OAAO,KAAK,EACR,cAAc,EACd,gBAAgB,EAChB,mBAAmB,EACnB,iBAAiB,EACpB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAA;AAE/B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAajE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAI/C,eAAO,MAAM,4BAA4B,wDAG7B,gCAAgC,CAAC,QAAQ,CAAC,qIAGlB,MAAM,kBACtB,aAAa,qFAqDhC,CAAA;AAED,eAAO,MAAM,sBAAsB,WAAkB,MAAM,oBAiB1D,CAAA;AAED,eAAO,MAAM,wBAAwB,aACvB,GAAG,iBACE,mBAAmB;;;;;;;;CA0FrC,CAAA"}
|
package/_types/index.d.ts
CHANGED
|
@@ -5,4 +5,6 @@ export { type MultiChainPermissionAccountsParams, serializeMultiChainPermissionA
|
|
|
5
5
|
export { deserializePermissionAccount, decodeParamsFromInitCode } from "./deserializePermissionAccount.js";
|
|
6
6
|
export * from "./constants.js";
|
|
7
7
|
export { toInitConfig } from "./toInitConfig.js";
|
|
8
|
+
export { migrationSessionKeyAccount } from "./migration/migrationSessionKeyAccount.js";
|
|
9
|
+
export { isPermissionMigrated } from "./migration/isPermissionMigrated.js";
|
|
8
10
|
//# sourceMappingURL=index.d.ts.map
|
package/_types/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,mBAAmB,YAAY,CAAA;AAC/B,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAClE,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAA;AAC5E,OAAO,EACH,KAAK,kCAAkC,EACvC,qCAAqC,EACxC,MAAM,4CAA4C,CAAA;AACnD,OAAO,EACH,4BAA4B,EAC5B,wBAAwB,EAC3B,MAAM,mCAAmC,CAAA;AAC1C,cAAc,gBAAgB,CAAA;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,mBAAmB,YAAY,CAAA;AAC/B,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAClE,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAA;AAC5E,OAAO,EACH,KAAK,kCAAkC,EACvC,qCAAqC,EACxC,MAAM,4CAA4C,CAAA;AACnD,OAAO,EACH,4BAA4B,EAC5B,wBAAwB,EAC3B,MAAM,mCAAmC,CAAA;AAC1C,cAAc,gBAAgB,CAAA;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAA;AACtF,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAA"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import type { Address, Chain, Client, Hex, JsonRpcAccount, LocalAccount, Transport } from "viem";
|
|
2
|
+
export declare const isPermissionMigrated: (client: Client<Transport, Chain | undefined, JsonRpcAccount | LocalAccount | undefined>, params: {
|
|
3
|
+
account: Address;
|
|
4
|
+
permissionId: Hex;
|
|
5
|
+
}) => Promise<boolean>;
|
|
6
|
+
//# sourceMappingURL=isPermissionMigrated.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"isPermissionMigrated.d.ts","sourceRoot":"","sources":["../../migration/isPermissionMigrated.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACR,OAAO,EACP,KAAK,EACL,MAAM,EACN,GAAG,EACH,cAAc,EACd,YAAY,EACZ,SAAS,EACZ,MAAM,MAAM,CAAA;AAIb,eAAO,MAAM,oBAAoB,WACrB,OACJ,SAAS,EACT,KAAK,GAAG,SAAS,EACjB,cAAc,GAAG,YAAY,GAAG,SAAS,CAC5C,UACO;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,GAAG,CAAA;CAAE,KAChD,QAAQ,OAAO,CAgBjB,CAAA"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { type CreateKernelAccountReturnType } from "@zerodev/sdk/accounts";
|
|
2
|
+
import { type Hex } from "viem";
|
|
3
|
+
export declare const migrationSessionKeyAccount: (params: {
|
|
4
|
+
account: CreateKernelAccountReturnType<"0.7">;
|
|
5
|
+
permissionId: Hex;
|
|
6
|
+
}) => Promise<CreateKernelAccountReturnType<"0.7">>;
|
|
7
|
+
//# sourceMappingURL=migrationSessionKeyAccount.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"migrationSessionKeyAccount.d.ts","sourceRoot":"","sources":["../../migration/migrationSessionKeyAccount.ts"],"names":[],"mappings":"AACA,OAAO,EACH,KAAK,6BAA6B,EAGrC,MAAM,uBAAuB,CAAA;AAE9B,OAAO,EAEH,KAAK,GAAG,EASX,MAAM,MAAM,CAAA;AAGb,eAAO,MAAM,0BAA0B,WAAkB;IACrD,OAAO,EAAE,8BAA8B,KAAK,CAAC,CAAA;IAC7C,YAAY,EAAE,GAAG,CAAA;CACpB,KAAG,QAAQ,8BAA8B,KAAK,CAAC,CA+F/C,CAAA"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type Client } from "viem";
|
|
2
2
|
import { type EntryPointVersion } from "viem/account-abstraction";
|
|
3
3
|
import type { PermissionPlugin, PermissionPluginParams } from "./types.js";
|
|
4
|
-
export declare function toPermissionValidator<entryPointVersion extends EntryPointVersion>(client: Client, { signer, policies, entryPoint, kernelVersion, flag }: PermissionPluginParams<entryPointVersion>): Promise<PermissionPlugin>;
|
|
4
|
+
export declare function toPermissionValidator<entryPointVersion extends EntryPointVersion>(client: Client, { signer, policies, entryPoint, kernelVersion, flag, permissionId }: PermissionPluginParams<entryPointVersion>): Promise<PermissionPlugin>;
|
|
5
5
|
//# sourceMappingURL=toPermissionValidator.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toPermissionValidator.d.ts","sourceRoot":"","sources":["../toPermissionValidator.ts"],"names":[],"mappings":"AACA,OAAO,EAEH,KAAK,MAAM,EAOd,MAAM,MAAM,CAAA;AACb,OAAO,EACH,KAAK,iBAAiB,EAGzB,MAAM,0BAA0B,CAAA;AAMjC,OAAO,KAAK,EAER,gBAAgB,EAChB,sBAAsB,EACzB,MAAM,YAAY,CAAA;AAEnB,wBAAsB,qBAAqB,CACvC,iBAAiB,SAAS,iBAAiB,EAE3C,MAAM,EAAE,MAAM,EACd,EACI,MAAM,EACN,QAAQ,EACR,UAAU,EACV,aAAgB,EAChB,IAAqC,
|
|
1
|
+
{"version":3,"file":"toPermissionValidator.d.ts","sourceRoot":"","sources":["../toPermissionValidator.ts"],"names":[],"mappings":"AACA,OAAO,EAEH,KAAK,MAAM,EAOd,MAAM,MAAM,CAAA;AACb,OAAO,EACH,KAAK,iBAAiB,EAGzB,MAAM,0BAA0B,CAAA;AAMjC,OAAO,KAAK,EAER,gBAAgB,EAChB,sBAAsB,EACzB,MAAM,YAAY,CAAA;AAEnB,wBAAsB,qBAAqB,CACvC,iBAAiB,SAAS,iBAAiB,EAE3C,MAAM,EAAE,MAAM,EACd,EACI,MAAM,EACN,QAAQ,EACR,UAAU,EACV,aAAgB,EAChB,IAAqC,EACrC,YAAY,EACf,EAAE,sBAAsB,CAAC,iBAAiB,CAAC,GAC7C,OAAO,CAAC,gBAAgB,CAAC,CAsH3B"}
|
package/_types/types.d.ts
CHANGED
|
@@ -44,9 +44,11 @@ export type PermissionPluginParams<entryPointVersion extends EntryPointVersion>
|
|
|
44
44
|
entryPoint: EntryPointType<entryPointVersion>;
|
|
45
45
|
kernelVersion: GetKernelVersion<entryPointVersion>;
|
|
46
46
|
flag?: PolicyFlags;
|
|
47
|
+
permissionId?: Hex;
|
|
47
48
|
};
|
|
48
49
|
export interface PermissionData {
|
|
49
50
|
policies?: Policy[];
|
|
51
|
+
permissionId?: Hex;
|
|
50
52
|
}
|
|
51
53
|
export type ExportPermissionAccountParams = {
|
|
52
54
|
initCode: Hex;
|
package/_types/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AACnD,OAAO,KAAK,EACR,MAAM,EACN,cAAc,EACd,gBAAgB,EAChB,kBAAkB,EACrB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AACjE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,eAAe,CAAA;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AACjD,OAAO,KAAK,EACR,gBAAgB,EAChB,eAAe,EACf,qBAAqB,EACrB,2BAA2B,EAC3B,gBAAgB,EAChB,qBAAqB,EACxB,MAAM,qBAAqB,CAAA;AAE5B,MAAM,MAAM,gBAAgB,GAAG,eAAe,CAAC,qBAAqB,CAAC,GAAG;IACpE,4BAA4B,EAAE,MAAM,cAAc,CAAA;CACrD,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAC9B,qBAAqB,CAAC,EAAE,OAAO,CAAA;CAClC,CAAA;AACD,MAAM,MAAM,YAAY,GAAG;IACvB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,UAAU,CAAC,EAAE,WAAW,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IACxB,OAAO,EAAE,YAAY,CAAA;IACrB,qBAAqB,EAAE,OAAO,CAAA;IAC9B,aAAa,EAAE,MAAM,GAAG,CAAA;IACxB,iBAAiB,EAAE,MAAM,GAAG,CAAA;CAC/B,CAAA;AAED,MAAM,MAAM,MAAM,GAAG;IACjB,aAAa,EAAE,MAAM,GAAG,CAAA;IACxB,oBAAoB,EAAE,MAAM,GAAG,CAAA;IAE/B,YAAY,EACN,CAAC,gBAAgB,CAAC,GAAG,GAAG,SAAS,OAAO,EAAE,EAAE,MAAM,CAAC,GAAG;QAClD,IAAI,EAAE,MAAM,CAAA;KACf,CAAC,GACF,CAAC,eAAe,GAAG;QAAE,IAAI,EAAE,KAAK,CAAA;KAAE,CAAC,GACnC,CAAC,qBAAqB,GAAG;QAAE,IAAI,EAAE,YAAY,CAAA;KAAE,CAAC,GAChD,CAAC,2BAA2B,GAAG;QAAE,IAAI,EAAE,kBAAkB,CAAA;KAAE,CAAC,GAC5D,CAAC,gBAAgB,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,GACrC,CAAC,qBAAqB,GAAG;QAAE,IAAI,EAAE,WAAW,CAAA;KAAE,CAAC,CAAA;CACxD,CAAA;AAED,MAAM,MAAM,sBAAsB,CAC9B,iBAAiB,SAAS,iBAAiB,IAC3C;IACA,MAAM,EAAE,aAAa,CAAA;IACrB,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,UAAU,EAAE,cAAc,CAAC,iBAAiB,CAAC,CAAA;IAC7C,aAAa,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,CAAA;IAClD,IAAI,CAAC,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,MAAM,WAAW,cAAc;IAC3B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../types.ts"],"names":[],"mappings":"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"}
|
package/index.ts
CHANGED
|
@@ -11,3 +11,5 @@ export {
|
|
|
11
11
|
} from "./deserializePermissionAccount.js"
|
|
12
12
|
export * from "./constants.js"
|
|
13
13
|
export { toInitConfig } from "./toInitConfig.js"
|
|
14
|
+
export { migrationSessionKeyAccount } from "./migration/migrationSessionKeyAccount.js"
|
|
15
|
+
export { isPermissionMigrated } from "./migration/isPermissionMigrated.js"
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import {
|
|
2
|
+
MIGRATION_HELPER_ADDRESS,
|
|
3
|
+
MigrationHelperAbi
|
|
4
|
+
} from "@zerodev/sdk/accounts"
|
|
5
|
+
import type {
|
|
6
|
+
Address,
|
|
7
|
+
Chain,
|
|
8
|
+
Client,
|
|
9
|
+
Hex,
|
|
10
|
+
JsonRpcAccount,
|
|
11
|
+
LocalAccount,
|
|
12
|
+
Transport
|
|
13
|
+
} from "viem"
|
|
14
|
+
import { readContract } from "viem/actions"
|
|
15
|
+
import { getAction } from "viem/utils"
|
|
16
|
+
|
|
17
|
+
export const isPermissionMigrated = async (
|
|
18
|
+
client: Client<
|
|
19
|
+
Transport,
|
|
20
|
+
Chain | undefined,
|
|
21
|
+
JsonRpcAccount | LocalAccount | undefined
|
|
22
|
+
>,
|
|
23
|
+
params: { account: Address; permissionId: Hex }
|
|
24
|
+
): Promise<boolean> => {
|
|
25
|
+
try {
|
|
26
|
+
const [, , p] = await getAction(
|
|
27
|
+
client,
|
|
28
|
+
readContract,
|
|
29
|
+
"readContract"
|
|
30
|
+
)({
|
|
31
|
+
address: MIGRATION_HELPER_ADDRESS,
|
|
32
|
+
abi: MigrationHelperAbi,
|
|
33
|
+
functionName: "isMigrated",
|
|
34
|
+
args: [params.account, [], [params.permissionId]]
|
|
35
|
+
})
|
|
36
|
+
return p[0]
|
|
37
|
+
} catch {
|
|
38
|
+
return false
|
|
39
|
+
}
|
|
40
|
+
}
|
|
@@ -0,0 +1,120 @@
|
|
|
1
|
+
import { KernelV3AccountAbi, KernelV3ExecuteAbi } from "@zerodev/sdk"
|
|
2
|
+
import {
|
|
3
|
+
type CreateKernelAccountReturnType,
|
|
4
|
+
MIGRATION_HELPER_ADDRESS,
|
|
5
|
+
MigrationHelperAbi
|
|
6
|
+
} from "@zerodev/sdk/accounts"
|
|
7
|
+
import { CALL_TYPE } from "@zerodev/sdk/constants"
|
|
8
|
+
import {
|
|
9
|
+
type Call,
|
|
10
|
+
type Hex,
|
|
11
|
+
concat,
|
|
12
|
+
decodeFunctionData,
|
|
13
|
+
encodeAbiParameters,
|
|
14
|
+
encodeFunctionData,
|
|
15
|
+
getAbiItem,
|
|
16
|
+
parseAbiParameters,
|
|
17
|
+
toFunctionSelector,
|
|
18
|
+
zeroAddress
|
|
19
|
+
} from "viem"
|
|
20
|
+
import { isPermissionMigrated } from "./isPermissionMigrated.js"
|
|
21
|
+
|
|
22
|
+
export const migrationSessionKeyAccount = async (params: {
|
|
23
|
+
account: CreateKernelAccountReturnType<"0.7">
|
|
24
|
+
permissionId: Hex
|
|
25
|
+
}): Promise<CreateKernelAccountReturnType<"0.7">> => {
|
|
26
|
+
const account = params.account
|
|
27
|
+
const installFallbackCallData = encodeFunctionData({
|
|
28
|
+
abi: KernelV3AccountAbi,
|
|
29
|
+
functionName: "installModule",
|
|
30
|
+
args: [
|
|
31
|
+
3n,
|
|
32
|
+
MIGRATION_HELPER_ADDRESS,
|
|
33
|
+
concat([
|
|
34
|
+
toFunctionSelector(
|
|
35
|
+
getAbiItem({
|
|
36
|
+
abi: MigrationHelperAbi,
|
|
37
|
+
name: "migrateWithCall"
|
|
38
|
+
})
|
|
39
|
+
),
|
|
40
|
+
zeroAddress,
|
|
41
|
+
encodeAbiParameters(
|
|
42
|
+
parseAbiParameters(
|
|
43
|
+
"bytes selectorInitData, bytes hookInitData"
|
|
44
|
+
),
|
|
45
|
+
[CALL_TYPE.DELEGATE_CALL, "0x0000"]
|
|
46
|
+
)
|
|
47
|
+
])
|
|
48
|
+
]
|
|
49
|
+
})
|
|
50
|
+
const installFallbackCall = {
|
|
51
|
+
to: account.address,
|
|
52
|
+
data: installFallbackCallData,
|
|
53
|
+
value: 0n
|
|
54
|
+
}
|
|
55
|
+
const uninstallFallbackCallData = encodeFunctionData({
|
|
56
|
+
abi: KernelV3AccountAbi,
|
|
57
|
+
functionName: "uninstallModule",
|
|
58
|
+
args: [
|
|
59
|
+
3n,
|
|
60
|
+
MIGRATION_HELPER_ADDRESS,
|
|
61
|
+
concat([
|
|
62
|
+
toFunctionSelector(
|
|
63
|
+
getAbiItem({
|
|
64
|
+
abi: MigrationHelperAbi,
|
|
65
|
+
name: "migrateWithCall"
|
|
66
|
+
})
|
|
67
|
+
),
|
|
68
|
+
"0x"
|
|
69
|
+
])
|
|
70
|
+
]
|
|
71
|
+
})
|
|
72
|
+
const uninstallFallbackCall = {
|
|
73
|
+
to: account.address,
|
|
74
|
+
data: uninstallFallbackCallData,
|
|
75
|
+
value: 0n
|
|
76
|
+
}
|
|
77
|
+
return {
|
|
78
|
+
...params.account,
|
|
79
|
+
async encodeCalls(calls, callType) {
|
|
80
|
+
const isMigrated = await isPermissionMigrated(account.client, {
|
|
81
|
+
account: account.address,
|
|
82
|
+
permissionId: params.permissionId
|
|
83
|
+
})
|
|
84
|
+
const executeCallData = await account.encodeCalls(calls, callType)
|
|
85
|
+
if (isMigrated) {
|
|
86
|
+
return executeCallData
|
|
87
|
+
}
|
|
88
|
+
const {
|
|
89
|
+
args: [execMode, executionCalldata]
|
|
90
|
+
} = decodeFunctionData({
|
|
91
|
+
abi: [getAbiItem({ abi: KernelV3ExecuteAbi, name: "execute" })],
|
|
92
|
+
data: executeCallData
|
|
93
|
+
})
|
|
94
|
+
const migrationCallData = encodeFunctionData({
|
|
95
|
+
abi: MigrationHelperAbi,
|
|
96
|
+
functionName: "migrateWithCall",
|
|
97
|
+
args: [[], [params.permissionId], execMode, executionCalldata]
|
|
98
|
+
})
|
|
99
|
+
|
|
100
|
+
const migrationCall = {
|
|
101
|
+
to: MIGRATION_HELPER_ADDRESS,
|
|
102
|
+
data: migrationCallData,
|
|
103
|
+
value: 0n
|
|
104
|
+
} as Call
|
|
105
|
+
|
|
106
|
+
if (account.kernelVersion !== "0.3.0") {
|
|
107
|
+
return account.encodeCalls([migrationCall], "delegatecall")
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
migrationCall.to = account.address
|
|
111
|
+
const finalCalls = [
|
|
112
|
+
installFallbackCall,
|
|
113
|
+
migrationCall,
|
|
114
|
+
uninstallFallbackCall
|
|
115
|
+
]
|
|
116
|
+
|
|
117
|
+
return account.encodeCalls(finalCalls, "call")
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
}
|
package/package.json
CHANGED
package/toPermissionValidator.ts
CHANGED
|
@@ -34,7 +34,8 @@ export async function toPermissionValidator<
|
|
|
34
34
|
policies,
|
|
35
35
|
entryPoint,
|
|
36
36
|
kernelVersion: _,
|
|
37
|
-
flag = PolicyFlags.FOR_ALL_VALIDATION
|
|
37
|
+
flag = PolicyFlags.FOR_ALL_VALIDATION,
|
|
38
|
+
permissionId
|
|
38
39
|
}: PermissionPluginParams<entryPointVersion>
|
|
39
40
|
): Promise<PermissionPlugin> {
|
|
40
41
|
const chainId = client.chain ? client.chain.id : await getChainId(client)
|
|
@@ -68,6 +69,9 @@ export async function toPermissionValidator<
|
|
|
68
69
|
}
|
|
69
70
|
|
|
70
71
|
const getPermissionId = (): Hex => {
|
|
72
|
+
if (permissionId) {
|
|
73
|
+
return permissionId
|
|
74
|
+
}
|
|
71
75
|
const pIdData = encodeAbiParameters(
|
|
72
76
|
[{ name: "policyAndSignerData", type: "bytes[]" }],
|
|
73
77
|
[[toPolicyId(policies), flag, toSignerId(signer)]]
|
|
@@ -126,7 +130,8 @@ export async function toPermissionValidator<
|
|
|
126
130
|
},
|
|
127
131
|
getPluginSerializationParams: (): PermissionData => {
|
|
128
132
|
return {
|
|
129
|
-
policies
|
|
133
|
+
policies,
|
|
134
|
+
permissionId: getPermissionId()
|
|
130
135
|
}
|
|
131
136
|
},
|
|
132
137
|
isEnabled: async (
|
package/types.ts
CHANGED
|
@@ -60,10 +60,12 @@ export type PermissionPluginParams<
|
|
|
60
60
|
entryPoint: EntryPointType<entryPointVersion>
|
|
61
61
|
kernelVersion: GetKernelVersion<entryPointVersion>
|
|
62
62
|
flag?: PolicyFlags
|
|
63
|
+
permissionId?: Hex
|
|
63
64
|
}
|
|
64
65
|
|
|
65
66
|
export interface PermissionData {
|
|
66
67
|
policies?: Policy[]
|
|
68
|
+
permissionId?: Hex
|
|
67
69
|
}
|
|
68
70
|
|
|
69
71
|
export type ExportPermissionAccountParams = {
|