@zerodev/sdk 5.2.0-alpha-4 → 5.2.0
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/abi/kernel_v_3_0_0/KernelAccountAbi.js +115 -58
- package/_cjs/accounts/kernel/abi/kernel_v_3_0_0/KernelAccountAbi.js.map +1 -1
- package/_cjs/accounts/kernel/abi/kernel_v_3_0_0/KernelFactoryAbi.js +39 -0
- package/_cjs/accounts/kernel/abi/kernel_v_3_0_0/KernelFactoryAbi.js.map +1 -0
- package/_cjs/accounts/kernel/abi/kernel_v_3_0_0/KernelFactoryStakerAbi.js +203 -0
- package/_cjs/accounts/kernel/abi/kernel_v_3_0_0/KernelFactoryStakerAbi.js.map +1 -0
- package/_cjs/accounts/kernel/createKernelAccount.js +42 -22
- package/_cjs/accounts/kernel/createKernelAccount.js.map +1 -1
- package/_cjs/accounts/kernel/utils/account/ep0_7/getKernelV3Nonce.js +22 -0
- package/_cjs/accounts/kernel/utils/account/ep0_7/getKernelV3Nonce.js.map +1 -0
- package/_cjs/accounts/kernel/utils/common/getActionSelector.js +19 -0
- package/_cjs/accounts/kernel/utils/common/getActionSelector.js.map +1 -0
- package/_cjs/accounts/kernel/utils/plugins/ep0_6/getEncodedPluginsData.js +22 -0
- package/_cjs/accounts/kernel/utils/plugins/ep0_6/getEncodedPluginsData.js.map +1 -0
- package/_cjs/accounts/kernel/utils/plugins/ep0_6/getPluginsEnableTypedData.js +39 -0
- package/_cjs/accounts/kernel/utils/plugins/ep0_6/getPluginsEnableTypedData.js.map +1 -0
- package/_cjs/accounts/kernel/utils/plugins/ep0_7/getEncodedPluginsData.js +21 -0
- package/_cjs/accounts/kernel/utils/plugins/ep0_7/getEncodedPluginsData.js.map +1 -0
- package/_cjs/accounts/kernel/utils/plugins/ep0_7/getPluginsEnableTypedData.js +41 -0
- package/_cjs/accounts/kernel/utils/plugins/ep0_7/getPluginsEnableTypedData.js.map +1 -0
- package/_cjs/accounts/kernel/utils/plugins/ep0_7/isPluginInitialized.js +20 -0
- package/_cjs/accounts/kernel/utils/plugins/ep0_7/isPluginInitialized.js.map +1 -0
- 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 +9 -4
- package/_cjs/accounts/kernel/v2/createKernelV2Account.js.map +1 -1
- package/_cjs/accounts/utils/getCustomNonceKeyFromString.js +19 -0
- package/_cjs/accounts/utils/getCustomNonceKeyFromString.js.map +1 -0
- package/_cjs/accounts/utils/index.js +3 -1
- package/_cjs/accounts/utils/index.js.map +1 -1
- package/_cjs/accounts/utils/toKernelPluginManager.js +120 -184
- package/_cjs/accounts/utils/toKernelPluginManager.js.map +1 -1
- package/_cjs/actions/account-client/getUserOperationGasPrice.js +15 -0
- package/_cjs/actions/account-client/getUserOperationGasPrice.js.map +1 -0
- package/_cjs/actions/index.js +3 -1
- package/_cjs/actions/index.js.map +1 -1
- package/_cjs/actions/paymaster/estimateGasInERC20.js +2 -2
- package/_cjs/actions/paymaster/estimateGasInERC20.js.map +1 -1
- package/_cjs/actions/paymaster/sponsorUserOperation.js +1 -2
- package/_cjs/actions/paymaster/sponsorUserOperation.js.map +1 -1
- package/_cjs/clients/decorators/kernel.js +3 -1
- package/_cjs/clients/decorators/kernel.js.map +1 -1
- package/_cjs/clients/kernelAccountClient.js +29 -3
- package/_cjs/clients/kernelAccountClient.js.map +1 -1
- package/_cjs/clients/paymasterClient.js +18 -1
- package/_cjs/clients/paymasterClient.js.map +1 -1
- package/_cjs/clients/utils.js +31 -0
- package/_cjs/clients/utils.js.map +1 -0
- package/_cjs/constants.js +5 -2
- package/_cjs/constants.js.map +1 -1
- package/_cjs/index.js +6 -1
- package/_cjs/index.js.map +1 -1
- package/_cjs/providers/KernelEIP1193Provider.js +37 -0
- package/_cjs/providers/KernelEIP1193Provider.js.map +1 -1
- package/_cjs/types/index.js.map +1 -1
- package/_cjs/types/kernel.js.map +1 -1
- package/_cjs/utils.js +1 -2
- package/_cjs/utils.js.map +1 -1
- package/_esm/accounts/kernel/abi/kernel_v_3_0_0/KernelAccountAbi.js +115 -58
- package/_esm/accounts/kernel/abi/kernel_v_3_0_0/KernelAccountAbi.js.map +1 -1
- package/_esm/accounts/kernel/abi/kernel_v_3_0_0/KernelFactoryAbi.js +36 -0
- package/_esm/accounts/kernel/abi/kernel_v_3_0_0/KernelFactoryAbi.js.map +1 -0
- package/_esm/accounts/kernel/abi/kernel_v_3_0_0/KernelFactoryStakerAbi.js +200 -0
- package/_esm/accounts/kernel/abi/kernel_v_3_0_0/KernelFactoryStakerAbi.js.map +1 -0
- package/_esm/accounts/kernel/createKernelAccount.js +43 -23
- package/_esm/accounts/kernel/createKernelAccount.js.map +1 -1
- package/_esm/accounts/kernel/utils/account/ep0_7/getKernelV3Nonce.js +18 -0
- package/_esm/accounts/kernel/utils/account/ep0_7/getKernelV3Nonce.js.map +1 -0
- package/_esm/accounts/kernel/utils/common/getActionSelector.js +15 -0
- package/_esm/accounts/kernel/utils/common/getActionSelector.js.map +1 -0
- package/_esm/accounts/kernel/utils/plugins/ep0_6/getEncodedPluginsData.js +18 -0
- package/_esm/accounts/kernel/utils/plugins/ep0_6/getEncodedPluginsData.js.map +1 -0
- package/_esm/accounts/kernel/utils/plugins/ep0_6/getPluginsEnableTypedData.js +35 -0
- package/_esm/accounts/kernel/utils/plugins/ep0_6/getPluginsEnableTypedData.js.map +1 -0
- package/_esm/accounts/kernel/utils/plugins/ep0_7/getEncodedPluginsData.js +18 -0
- package/_esm/accounts/kernel/utils/plugins/ep0_7/getEncodedPluginsData.js.map +1 -0
- package/_esm/accounts/kernel/utils/plugins/ep0_7/getPluginsEnableTypedData.js +42 -0
- package/_esm/accounts/kernel/utils/plugins/ep0_7/getPluginsEnableTypedData.js.map +1 -0
- package/_esm/accounts/kernel/utils/plugins/ep0_7/isPluginInitialized.js +16 -0
- package/_esm/accounts/kernel/utils/plugins/ep0_7/isPluginInitialized.js.map +1 -0
- 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 +10 -5
- package/_esm/accounts/kernel/v2/createKernelV2Account.js.map +1 -1
- package/_esm/accounts/utils/getCustomNonceKeyFromString.js +15 -0
- package/_esm/accounts/utils/getCustomNonceKeyFromString.js.map +1 -0
- package/_esm/accounts/utils/index.js +1 -0
- package/_esm/accounts/utils/index.js.map +1 -1
- package/_esm/accounts/utils/toKernelPluginManager.js +124 -188
- package/_esm/accounts/utils/toKernelPluginManager.js.map +1 -1
- package/_esm/actions/account-client/getUserOperationGasPrice.js +11 -0
- package/_esm/actions/account-client/getUserOperationGasPrice.js.map +1 -0
- package/_esm/actions/index.js +1 -0
- package/_esm/actions/index.js.map +1 -1
- package/_esm/actions/paymaster/estimateGasInERC20.js +2 -2
- package/_esm/actions/paymaster/estimateGasInERC20.js.map +1 -1
- package/_esm/actions/paymaster/sponsorUserOperation.js +1 -2
- package/_esm/actions/paymaster/sponsorUserOperation.js.map +1 -1
- package/_esm/clients/decorators/kernel.js +3 -1
- package/_esm/clients/decorators/kernel.js.map +1 -1
- package/_esm/clients/kernelAccountClient.js +30 -4
- package/_esm/clients/kernelAccountClient.js.map +1 -1
- package/_esm/clients/paymasterClient.js +19 -2
- package/_esm/clients/paymasterClient.js.map +1 -1
- package/_esm/clients/utils.js +26 -0
- package/_esm/clients/utils.js.map +1 -0
- package/_esm/constants.js +4 -1
- package/_esm/constants.js.map +1 -1
- package/_esm/index.js +3 -1
- package/_esm/index.js.map +1 -1
- package/_esm/providers/KernelEIP1193Provider.js +37 -0
- package/_esm/providers/KernelEIP1193Provider.js.map +1 -1
- package/_esm/types/index.js.map +1 -1
- package/_esm/types/kernel.js.map +1 -1
- package/_esm/utils.js +2 -3
- package/_esm/utils.js.map +1 -1
- package/_types/accounts/kernel/abi/kernel_v_3_0_0/KernelAccountAbi.d.ts +110 -20
- package/_types/accounts/kernel/abi/kernel_v_3_0_0/KernelAccountAbi.d.ts.map +1 -1
- package/_types/accounts/kernel/abi/kernel_v_3_0_0/KernelFactoryAbi.d.ts +60 -0
- package/_types/accounts/kernel/abi/kernel_v_3_0_0/KernelFactoryAbi.d.ts.map +1 -0
- package/_types/accounts/kernel/abi/kernel_v_3_0_0/KernelFactoryStakerAbi.d.ts +215 -0
- package/_types/accounts/kernel/abi/kernel_v_3_0_0/KernelFactoryStakerAbi.d.ts.map +1 -0
- package/_types/accounts/kernel/createKernelAccount.d.ts +7 -4
- package/_types/accounts/kernel/createKernelAccount.d.ts.map +1 -1
- package/_types/accounts/kernel/utils/account/ep0_7/getKernelV3Nonce.d.ts +3 -0
- package/_types/accounts/kernel/utils/account/ep0_7/getKernelV3Nonce.d.ts.map +1 -0
- package/_types/accounts/kernel/utils/common/getActionSelector.d.ts +4 -0
- package/_types/accounts/kernel/utils/common/getActionSelector.d.ts.map +1 -0
- package/_types/accounts/kernel/utils/plugins/ep0_6/getEncodedPluginsData.d.ts +9 -0
- package/_types/accounts/kernel/utils/plugins/ep0_6/getEncodedPluginsData.d.ts.map +1 -0
- package/_types/accounts/kernel/utils/plugins/ep0_6/getPluginsEnableTypedData.d.ts +13 -0
- package/_types/accounts/kernel/utils/plugins/ep0_6/getPluginsEnableTypedData.d.ts.map +1 -0
- package/_types/accounts/kernel/utils/plugins/ep0_7/getEncodedPluginsData.d.ts +9 -0
- package/_types/accounts/kernel/utils/plugins/ep0_7/getEncodedPluginsData.d.ts.map +1 -0
- package/_types/accounts/kernel/utils/plugins/ep0_7/getPluginsEnableTypedData.d.ts +10 -0
- package/_types/accounts/kernel/utils/plugins/ep0_7/getPluginsEnableTypedData.d.ts.map +1 -0
- package/_types/accounts/kernel/utils/plugins/ep0_7/isPluginInitialized.d.ts +3 -0
- package/_types/accounts/kernel/utils/plugins/ep0_7/isPluginInitialized.d.ts.map +1 -0
- 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 +3 -1
- package/_types/accounts/kernel/v2/createKernelV2Account.d.ts.map +1 -1
- package/_types/accounts/utils/getCustomNonceKeyFromString.d.ts +3 -0
- package/_types/accounts/utils/getCustomNonceKeyFromString.d.ts.map +1 -0
- package/_types/accounts/utils/index.d.ts +1 -0
- package/_types/accounts/utils/index.d.ts.map +1 -1
- package/_types/accounts/utils/toKernelPluginManager.d.ts +1 -1
- package/_types/accounts/utils/toKernelPluginManager.d.ts.map +1 -1
- package/_types/actions/account-client/getUserOperationGasPrice.d.ts +9 -0
- package/_types/actions/account-client/getUserOperationGasPrice.d.ts.map +1 -0
- package/_types/actions/index.d.ts +1 -0
- package/_types/actions/index.d.ts.map +1 -1
- package/_types/actions/paymaster/estimateGasInERC20.d.ts.map +1 -1
- package/_types/actions/paymaster/sponsorUserOperation.d.ts.map +1 -1
- package/_types/clients/decorators/kernel.d.ts +8 -1
- package/_types/clients/decorators/kernel.d.ts.map +1 -1
- package/_types/clients/kernelAccountClient.d.ts +12 -4
- package/_types/clients/kernelAccountClient.d.ts.map +1 -1
- package/_types/clients/paymasterClient.d.ts.map +1 -1
- package/_types/clients/utils.d.ts +3 -0
- package/_types/clients/utils.d.ts.map +1 -0
- package/_types/constants.d.ts +4 -1
- package/_types/constants.d.ts.map +1 -1
- package/_types/index.d.ts +3 -1
- package/_types/index.d.ts.map +1 -1
- package/_types/providers/KernelEIP1193Provider.d.ts +2 -0
- package/_types/providers/KernelEIP1193Provider.d.ts.map +1 -1
- package/_types/types/index.d.ts +1 -1
- package/_types/types/index.d.ts.map +1 -1
- package/_types/types/kernel.d.ts +32 -17
- package/_types/types/kernel.d.ts.map +1 -1
- package/_types/utils.d.ts.map +1 -1
- package/accounts/kernel/abi/kernel_v_3_0_0/KernelAccountAbi.ts +115 -58
- package/accounts/kernel/abi/kernel_v_3_0_0/KernelFactoryAbi.ts +35 -0
- package/accounts/kernel/abi/kernel_v_3_0_0/KernelFactoryStakerAbi.ts +199 -0
- package/accounts/kernel/createKernelAccount.ts +57 -26
- package/accounts/kernel/utils/account/ep0_7/getKernelV3Nonce.ts +24 -0
- package/accounts/kernel/utils/common/getActionSelector.ts +20 -0
- package/accounts/kernel/utils/plugins/ep0_6/getEncodedPluginsData.ts +39 -0
- package/accounts/kernel/utils/plugins/ep0_6/getPluginsEnableTypedData.ts +76 -0
- package/accounts/kernel/utils/plugins/ep0_7/getEncodedPluginsData.ts +47 -0
- package/accounts/kernel/utils/plugins/ep0_7/getPluginsEnableTypedData.ts +63 -0
- package/accounts/kernel/utils/plugins/ep0_7/isPluginInitialized.ts +23 -0
- package/accounts/kernel/v1/createKernelV1Account.ts +20 -8
- package/accounts/kernel/v2/createKernelV2Account.ts +17 -6
- package/accounts/utils/getCustomNonceKeyFromString.ts +21 -0
- package/accounts/utils/index.ts +2 -0
- package/accounts/utils/toKernelPluginManager.ts +155 -224
- package/actions/account-client/getUserOperationGasPrice.ts +26 -0
- package/actions/index.ts +5 -0
- package/actions/paymaster/estimateGasInERC20.ts +2 -3
- package/actions/paymaster/sponsorUserOperation.ts +1 -3
- package/clients/decorators/kernel.ts +22 -6
- package/clients/kernelAccountClient.ts +36 -3
- package/clients/paymasterClient.ts +24 -1
- package/clients/utils.ts +28 -0
- package/constants.ts +6 -2
- package/index.ts +6 -1
- package/package.json +4 -4
- package/providers/KernelEIP1193Provider.ts +51 -0
- package/types/index.ts +4 -2
- package/types/kernel.ts +52 -38
- package/utils.ts +2 -3
|
@@ -6,47 +6,53 @@ const viem_1 = require("viem");
|
|
|
6
6
|
const actions_1 = require("viem/actions");
|
|
7
7
|
const constants_js_1 = require("../../constants.js");
|
|
8
8
|
const kernel_js_1 = require("../../types/kernel.js");
|
|
9
|
-
const
|
|
10
|
-
const
|
|
11
|
-
const
|
|
12
|
-
const
|
|
9
|
+
const getKernelV3Nonce_js_1 = require("../kernel/utils/account/ep0_7/getKernelV3Nonce.js");
|
|
10
|
+
const accountMetadata_js_1 = require("../kernel/utils/common/accountMetadata.js");
|
|
11
|
+
const getActionSelector_js_1 = require("../kernel/utils/common/getActionSelector.js");
|
|
12
|
+
const getEncodedPluginsData_js_1 = require("../kernel/utils/plugins/ep0_6/getEncodedPluginsData.js");
|
|
13
|
+
const getPluginsEnableTypedData_js_1 = require("../kernel/utils/plugins/ep0_6/getPluginsEnableTypedData.js");
|
|
14
|
+
const getEncodedPluginsData_js_2 = require("../kernel/utils/plugins/ep0_7/getEncodedPluginsData.js");
|
|
15
|
+
const getPluginsEnableTypedData_js_2 = require("../kernel/utils/plugins/ep0_7/getPluginsEnableTypedData.js");
|
|
16
|
+
const isPluginInitialized_js_1 = require("../kernel/utils/plugins/ep0_7/isPluginInitialized.js");
|
|
13
17
|
function isKernelPluginManager(plugin) {
|
|
14
18
|
return plugin.getPluginEnableSignature !== undefined;
|
|
15
19
|
}
|
|
16
20
|
exports.isKernelPluginManager = isKernelPluginManager;
|
|
17
|
-
async function toKernelPluginManager(client, { sudo, regular, pluginEnableSignature, validatorInitData,
|
|
18
|
-
executor: viem_1.zeroAddress,
|
|
19
|
-
selector: (0, viem_1.toFunctionSelector)("execute(address, uint256, bytes, uint8)")
|
|
20
|
-
}, validAfter = 0, validUntil = 0, entryPoint: entryPointAddress, kernelVersion }) {
|
|
21
|
+
async function toKernelPluginManager(client, { sudo, regular, pluginEnableSignature, validatorInitData, action, validAfter = 0, validUntil = 0, entryPoint: entryPointAddress, kernelVersion }) {
|
|
21
22
|
const entryPointVersion = (0, permissionless_1.getEntryPointVersion)(entryPointAddress);
|
|
22
23
|
const chainId = await (0, actions_1.getChainId)(client);
|
|
23
24
|
const activeValidator = regular || sudo;
|
|
24
25
|
if (!activeValidator) {
|
|
25
26
|
throw new Error("One of `sudo` or `regular` validator must be set");
|
|
26
27
|
}
|
|
27
|
-
|
|
28
|
+
action = {
|
|
29
|
+
selector: action?.selector ?? (0, getActionSelector_js_1.getActionSelector)(entryPointVersion),
|
|
30
|
+
address: action?.address ?? viem_1.zeroAddress
|
|
31
|
+
};
|
|
32
|
+
if (!action) {
|
|
33
|
+
throw new Error("Action data must be set");
|
|
34
|
+
}
|
|
35
|
+
const getSignatureData = async (accountAddress, selector, userOpSignature = "0x") => {
|
|
36
|
+
if (!action) {
|
|
37
|
+
throw new Error("Action data must be set");
|
|
38
|
+
}
|
|
28
39
|
if (entryPointVersion === "v0.6") {
|
|
29
40
|
if (regular) {
|
|
30
|
-
if (await
|
|
41
|
+
if (await isPluginEnabled(accountAddress, selector)) {
|
|
31
42
|
return kernel_js_1.ValidatorMode.plugin;
|
|
32
43
|
}
|
|
33
44
|
const enableSignature = await getPluginEnableSignature(accountAddress);
|
|
34
|
-
const enableData = await regular.getEnableData(accountAddress);
|
|
35
|
-
const enableDataLength = enableData.length / 2 - 1;
|
|
36
45
|
if (!enableSignature) {
|
|
37
46
|
throw new Error("Enable signature not set");
|
|
38
47
|
}
|
|
39
|
-
return (0,
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
(0, viem_1.pad)((0, viem_1.toHex)(enableSignature.length / 2 - 1), { size: 32 }),
|
|
48
|
-
enableSignature
|
|
49
|
-
]);
|
|
48
|
+
return (0, getEncodedPluginsData_js_1.getEncodedPluginsData)({
|
|
49
|
+
accountAddress,
|
|
50
|
+
enableSignature,
|
|
51
|
+
action,
|
|
52
|
+
validator: regular,
|
|
53
|
+
validUntil,
|
|
54
|
+
validAfter
|
|
55
|
+
});
|
|
50
56
|
}
|
|
51
57
|
else if (sudo) {
|
|
52
58
|
return kernel_js_1.ValidatorMode.sudo;
|
|
@@ -56,179 +62,101 @@ async function toKernelPluginManager(client, { sudo, regular, pluginEnableSignat
|
|
|
56
62
|
}
|
|
57
63
|
}
|
|
58
64
|
if (regular) {
|
|
59
|
-
if (
|
|
60
|
-
|
|
61
|
-
return sig ?? "0x";
|
|
65
|
+
if (await isPluginEnabled(accountAddress, action.selector)) {
|
|
66
|
+
return userOpSignature;
|
|
62
67
|
}
|
|
63
|
-
const enableData = await regular.getEnableData(accountAddress);
|
|
64
68
|
const enableSignature = await getPluginEnableSignature(accountAddress);
|
|
65
|
-
return (0,
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
executorData.executor,
|
|
73
|
-
viem_1.zeroAddress,
|
|
74
|
-
"0x"
|
|
75
|
-
]),
|
|
76
|
-
enableSignature,
|
|
77
|
-
sig ?? "0x"
|
|
78
|
-
])
|
|
79
|
-
]);
|
|
69
|
+
return (0, getEncodedPluginsData_js_2.getEncodedPluginsData)({
|
|
70
|
+
accountAddress,
|
|
71
|
+
action,
|
|
72
|
+
enableSignature,
|
|
73
|
+
userOpSignature,
|
|
74
|
+
validator: regular
|
|
75
|
+
});
|
|
80
76
|
}
|
|
81
77
|
else if (sudo) {
|
|
82
|
-
return
|
|
78
|
+
return userOpSignature;
|
|
83
79
|
}
|
|
84
80
|
else {
|
|
85
81
|
throw new Error("One of `sudo` or `regular` validator must be set");
|
|
86
82
|
}
|
|
87
83
|
};
|
|
88
|
-
const
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
84
|
+
const isPluginEnabled = async (accountAddress, selector) => {
|
|
85
|
+
if (!action) {
|
|
86
|
+
throw new Error("Action data must be set");
|
|
87
|
+
}
|
|
88
|
+
if (!regular)
|
|
89
|
+
throw new Error("regular validator not set");
|
|
90
|
+
if (entryPointVersion === "v0.6") {
|
|
91
|
+
return regular.isEnabled(accountAddress, selector);
|
|
96
92
|
}
|
|
97
|
-
|
|
98
|
-
|
|
93
|
+
return ((await regular.isEnabled(accountAddress, action.selector)) ||
|
|
94
|
+
(await (0, isPluginInitialized_js_1.isPluginInitialized)(client, accountAddress, regular.address)));
|
|
99
95
|
};
|
|
100
96
|
const getPluginEnableSignature = async (accountAddress) => {
|
|
97
|
+
if (!action) {
|
|
98
|
+
throw new Error("Action data must be set");
|
|
99
|
+
}
|
|
101
100
|
if (pluginEnableSignature)
|
|
102
101
|
return pluginEnableSignature;
|
|
103
102
|
if (!sudo)
|
|
104
103
|
throw new Error("sudo validator not set -- need it to enable the validator");
|
|
105
104
|
if (!regular)
|
|
106
105
|
throw new Error("regular validator not set");
|
|
107
|
-
const
|
|
108
|
-
const _kernelVersion = kernelVersion ?? (0, utils_js_1.getKernelVersion)(entryPointAddress, kernelImplAddr);
|
|
106
|
+
const { version } = await (0, accountMetadata_js_1.accountMetadata)(client, accountAddress, entryPointAddress);
|
|
109
107
|
let ownerSig;
|
|
110
108
|
if (entryPointVersion === "v0.6") {
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
ValidatorApproved: [
|
|
120
|
-
{ name: "sig", type: "bytes4" },
|
|
121
|
-
{ name: "validatorData", type: "uint256" },
|
|
122
|
-
{ name: "executor", type: "address" },
|
|
123
|
-
{ name: "enableData", type: "bytes" }
|
|
124
|
-
]
|
|
125
|
-
},
|
|
126
|
-
message: {
|
|
127
|
-
sig: executorData.selector,
|
|
128
|
-
validatorData: (0, viem_1.hexToBigInt)((0, viem_1.concatHex)([
|
|
129
|
-
(0, viem_1.pad)((0, viem_1.toHex)(validUntil ?? 0), {
|
|
130
|
-
size: 6
|
|
131
|
-
}),
|
|
132
|
-
(0, viem_1.pad)((0, viem_1.toHex)(validAfter ?? 0), {
|
|
133
|
-
size: 6
|
|
134
|
-
}),
|
|
135
|
-
regular.address
|
|
136
|
-
]), { size: 32 }),
|
|
137
|
-
executor: executorData.executor,
|
|
138
|
-
enableData: await regular.getEnableData(accountAddress)
|
|
139
|
-
},
|
|
140
|
-
primaryType: "ValidatorApproved"
|
|
109
|
+
const typeData = await (0, getPluginsEnableTypedData_js_1.getPluginsEnableTypedData)({
|
|
110
|
+
accountAddress,
|
|
111
|
+
chainId,
|
|
112
|
+
kernelVersion: kernelVersion ?? version,
|
|
113
|
+
action,
|
|
114
|
+
validator: regular,
|
|
115
|
+
validUntil,
|
|
116
|
+
validAfter
|
|
141
117
|
});
|
|
118
|
+
ownerSig = await sudo.signTypedData(typeData);
|
|
142
119
|
pluginEnableSignature = ownerSig;
|
|
143
120
|
return ownerSig;
|
|
144
121
|
}
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
Enable: [
|
|
154
|
-
{ name: "validationId", type: "bytes21" },
|
|
155
|
-
{ name: "nonce", type: "uint32" },
|
|
156
|
-
{ name: "hook", type: "address" },
|
|
157
|
-
{ name: "validatorData", type: "bytes" },
|
|
158
|
-
{ name: "hookData", type: "bytes" },
|
|
159
|
-
{ name: "selectorData", type: "bytes" }
|
|
160
|
-
]
|
|
161
|
-
},
|
|
162
|
-
message: {
|
|
163
|
-
validationId: (0, viem_1.concat)([
|
|
164
|
-
activeValidator.isPermissionValidator
|
|
165
|
-
? constants_js_1.VALIDATOR_TYPE.PERMISSION
|
|
166
|
-
: constants_js_1.VALIDATOR_TYPE.SECONDARY,
|
|
167
|
-
activeValidator?.isPermissionValidator
|
|
168
|
-
?
|
|
169
|
-
(0, viem_1.pad)(regular.getPermissionId(), {
|
|
170
|
-
size: 20,
|
|
171
|
-
dir: "right"
|
|
172
|
-
})
|
|
173
|
-
: activeValidator.address
|
|
174
|
-
]),
|
|
175
|
-
nonce: await getKernelV3Nonce(accountAddress),
|
|
176
|
-
hook: viem_1.zeroAddress,
|
|
177
|
-
validatorData: await regular.getEnableData(accountAddress),
|
|
178
|
-
hookData: "0x",
|
|
179
|
-
selectorData: (0, viem_1.concat)([
|
|
180
|
-
executorData.selector,
|
|
181
|
-
executorData.executor,
|
|
182
|
-
viem_1.zeroAddress,
|
|
183
|
-
"0x"
|
|
184
|
-
])
|
|
185
|
-
},
|
|
186
|
-
primaryType: "Enable"
|
|
122
|
+
const validatorNonce = await (0, getKernelV3Nonce_js_1.getKernelV3Nonce)(client, accountAddress);
|
|
123
|
+
const typedData = await (0, getPluginsEnableTypedData_js_2.getPluginsEnableTypedData)({
|
|
124
|
+
accountAddress,
|
|
125
|
+
chainId,
|
|
126
|
+
kernelVersion: version,
|
|
127
|
+
action,
|
|
128
|
+
validator: regular,
|
|
129
|
+
validatorNonce
|
|
187
130
|
});
|
|
131
|
+
ownerSig = await sudo.signTypedData(typedData);
|
|
188
132
|
return ownerSig;
|
|
189
133
|
};
|
|
190
|
-
const
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
args: []
|
|
197
|
-
});
|
|
198
|
-
return nonce;
|
|
199
|
-
}
|
|
200
|
-
catch (error) {
|
|
201
|
-
return 2;
|
|
202
|
-
}
|
|
134
|
+
const getIdentifier = (isSudo = false) => {
|
|
135
|
+
const validator = (isSudo ? sudo : regular) ?? activeValidator;
|
|
136
|
+
return (0, viem_1.concat)([
|
|
137
|
+
constants_js_1.VALIDATOR_TYPE[validator.validatorType],
|
|
138
|
+
validator.getIdentifier()
|
|
139
|
+
]);
|
|
203
140
|
};
|
|
204
141
|
return {
|
|
205
142
|
...activeValidator,
|
|
206
|
-
|
|
207
|
-
const validator = (isSudo ? sudo : regular) ?? activeValidator;
|
|
208
|
-
return (0, viem_1.concat)([
|
|
209
|
-
validator.isPermissionValidator
|
|
210
|
-
? constants_js_1.VALIDATOR_TYPE.PERMISSION
|
|
211
|
-
: constants_js_1.VALIDATOR_TYPE.SECONDARY,
|
|
212
|
-
validator?.isPermissionValidator
|
|
213
|
-
?
|
|
214
|
-
(0, viem_1.pad)(validator.getPermissionId(), {
|
|
215
|
-
size: 20,
|
|
216
|
-
dir: "right"
|
|
217
|
-
})
|
|
218
|
-
: validator.address
|
|
219
|
-
]);
|
|
220
|
-
},
|
|
143
|
+
getIdentifier,
|
|
221
144
|
signUserOperation: async (userOperation) => {
|
|
222
145
|
const userOpSig = await activeValidator.signUserOperation(userOperation);
|
|
223
146
|
if (entryPointVersion === "v0.6") {
|
|
224
147
|
return (0, viem_1.concatHex)([
|
|
225
|
-
await
|
|
148
|
+
await getSignatureData(userOperation.sender, userOperation.callData.toString().slice(0, 10)),
|
|
226
149
|
userOpSig
|
|
227
150
|
]);
|
|
228
151
|
}
|
|
229
|
-
return await
|
|
152
|
+
return await getSignatureData(userOperation.sender, userOperation.callData.toString().slice(0, 10), userOpSig);
|
|
153
|
+
},
|
|
154
|
+
getAction: () => {
|
|
155
|
+
if (!action) {
|
|
156
|
+
throw new Error("Action data must be set");
|
|
157
|
+
}
|
|
158
|
+
return action;
|
|
230
159
|
},
|
|
231
|
-
getExecutorData: () => executorData,
|
|
232
160
|
getValidityData: () => ({
|
|
233
161
|
validAfter,
|
|
234
162
|
validUntil
|
|
@@ -237,37 +165,44 @@ async function toKernelPluginManager(client, { sudo, regular, pluginEnableSignat
|
|
|
237
165
|
const userOpSig = await activeValidator.getDummySignature(userOperation);
|
|
238
166
|
if (entryPointVersion === "v0.6") {
|
|
239
167
|
return (0, viem_1.concatHex)([
|
|
240
|
-
await
|
|
168
|
+
await getSignatureData(userOperation.sender, userOperation.callData.toString().slice(0, 10)),
|
|
241
169
|
userOpSig
|
|
242
170
|
]);
|
|
243
171
|
}
|
|
244
|
-
return await
|
|
172
|
+
return await getSignatureData(userOperation.sender, userOperation.callData.toString().slice(0, 10), userOpSig);
|
|
245
173
|
},
|
|
246
|
-
getNonceKey: async (accountAddress = viem_1.zeroAddress) => {
|
|
247
|
-
if (
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
(
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
174
|
+
getNonceKey: async (accountAddress = viem_1.zeroAddress, customNonceKey = 0n) => {
|
|
175
|
+
if (!action) {
|
|
176
|
+
throw new Error("Action data must be set");
|
|
177
|
+
}
|
|
178
|
+
if (entryPointVersion === "v0.6") {
|
|
179
|
+
if (customNonceKey > viem_1.maxUint192) {
|
|
180
|
+
throw new Error("Custom nonce key must be equal or less than maxUint192 for v0.6");
|
|
181
|
+
}
|
|
182
|
+
return await activeValidator.getNonceKey(accountAddress, customNonceKey);
|
|
183
|
+
}
|
|
184
|
+
if (customNonceKey > viem_1.maxUint16)
|
|
185
|
+
throw new Error("Custom nonce key must be equal or less than 2 bytes(maxUint16) for v0.7");
|
|
186
|
+
const validatorMode = !regular ||
|
|
187
|
+
(await isPluginEnabled(accountAddress, action.selector))
|
|
188
|
+
? constants_js_1.VALIDATOR_MODE.DEFAULT
|
|
189
|
+
: constants_js_1.VALIDATOR_MODE.ENABLE;
|
|
190
|
+
const validatorType = regular
|
|
191
|
+
? constants_js_1.VALIDATOR_TYPE[regular.validatorType]
|
|
192
|
+
: constants_js_1.VALIDATOR_TYPE.SUDO;
|
|
193
|
+
const encoding = (0, viem_1.pad)((0, viem_1.concatHex)([
|
|
194
|
+
validatorMode,
|
|
195
|
+
validatorType,
|
|
196
|
+
(0, viem_1.pad)(activeValidator.getIdentifier(), {
|
|
197
|
+
size: 20,
|
|
198
|
+
dir: "right"
|
|
199
|
+
}),
|
|
200
|
+
(0, viem_1.pad)((0, viem_1.toHex)(await activeValidator.getNonceKey(accountAddress, customNonceKey)), {
|
|
268
201
|
size: 2
|
|
269
202
|
})
|
|
270
|
-
]), { size: 24 })
|
|
203
|
+
]), { size: 24 });
|
|
204
|
+
const encodedNonceKey = BigInt(encoding);
|
|
205
|
+
return encodedNonceKey;
|
|
271
206
|
},
|
|
272
207
|
getPluginEnableSignature,
|
|
273
208
|
getValidatorInitData: async () => {
|
|
@@ -276,7 +211,8 @@ async function toKernelPluginManager(client, { sudo, regular, pluginEnableSignat
|
|
|
276
211
|
return {
|
|
277
212
|
validatorAddress: sudo?.address ?? activeValidator.address,
|
|
278
213
|
enableData: (await sudo?.getEnableData()) ??
|
|
279
|
-
(await activeValidator.getEnableData())
|
|
214
|
+
(await activeValidator.getEnableData()),
|
|
215
|
+
identifier: (0, viem_1.pad)(getIdentifier(true), { size: 21, dir: "right" })
|
|
280
216
|
};
|
|
281
217
|
}
|
|
282
218
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toKernelPluginManager.js","sourceRoot":"","sources":["../../../accounts/utils/toKernelPluginManager.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"toKernelPluginManager.js","sourceRoot":"","sources":["../../../accounts/utils/toKernelPluginManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getUserOperationGasPrice = void 0;
|
|
4
|
+
const getUserOperationGasPrice = async (client) => {
|
|
5
|
+
const gasPrice = await client.request({
|
|
6
|
+
method: "zd_getUserOperationGasPrice",
|
|
7
|
+
params: []
|
|
8
|
+
});
|
|
9
|
+
return {
|
|
10
|
+
maxFeePerGas: BigInt(gasPrice.standard.maxFeePerGas),
|
|
11
|
+
maxPriorityFeePerGas: BigInt(gasPrice.standard.maxPriorityFeePerGas)
|
|
12
|
+
};
|
|
13
|
+
};
|
|
14
|
+
exports.getUserOperationGasPrice = getUserOperationGasPrice;
|
|
15
|
+
//# sourceMappingURL=getUserOperationGasPrice.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getUserOperationGasPrice.js","sourceRoot":"","sources":["../../../actions/account-client/getUserOperationGasPrice.ts"],"names":[],"mappings":";;;AASO,MAAM,wBAAwB,GAAG,KAAK,EAKzC,MAA2E,EACtB,EAAE;IACvD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAClC,MAAM,EAAE,6BAA6B;QACrC,MAAM,EAAE,EAAE;KACb,CAAC,CAAA;IAEF,OAAO;QACH,YAAY,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC;QACpD,oBAAoB,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,oBAAoB,CAAC;KACvE,CAAA;AACL,CAAC,CAAA;AAhBY,QAAA,wBAAwB,4BAgBpC"}
|
package/_cjs/actions/index.js
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.estimateGasInERC20 = exports.signUserOperation = exports.sponsorUserOperation = void 0;
|
|
3
|
+
exports.estimateGasInERC20 = exports.getUserOperationGasPrice = exports.signUserOperation = exports.sponsorUserOperation = void 0;
|
|
4
4
|
var sponsorUserOperation_js_1 = require("./paymaster/sponsorUserOperation.js");
|
|
5
5
|
Object.defineProperty(exports, "sponsorUserOperation", { enumerable: true, get: function () { return sponsorUserOperation_js_1.sponsorUserOperation; } });
|
|
6
6
|
var signUserOperation_js_1 = require("./account-client/signUserOperation.js");
|
|
7
7
|
Object.defineProperty(exports, "signUserOperation", { enumerable: true, get: function () { return signUserOperation_js_1.signUserOperation; } });
|
|
8
|
+
var getUserOperationGasPrice_js_1 = require("./account-client/getUserOperationGasPrice.js");
|
|
9
|
+
Object.defineProperty(exports, "getUserOperationGasPrice", { enumerable: true, get: function () { return getUserOperationGasPrice_js_1.getUserOperationGasPrice; } });
|
|
8
10
|
var estimateGasInERC20_js_1 = require("./paymaster/estimateGasInERC20.js");
|
|
9
11
|
Object.defineProperty(exports, "estimateGasInERC20", { enumerable: true, get: function () { return estimateGasInERC20_js_1.estimateGasInERC20; } });
|
|
10
12
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../actions/index.ts"],"names":[],"mappings":";;;AAAA,+EAI4C;AAHxC,+HAAA,oBAAoB,OAAA;AAKxB,8EAI8C;AAH1C,yHAAA,iBAAiB,OAAA;AAKrB,2EAI0C;AAHtC,2HAAA,kBAAkB,OAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../actions/index.ts"],"names":[],"mappings":";;;AAAA,+EAI4C;AAHxC,+HAAA,oBAAoB,OAAA;AAKxB,8EAI8C;AAH1C,yHAAA,iBAAiB,OAAA;AAKrB,4FAGqD;AAFjD,uIAAA,wBAAwB,OAAA;AAI5B,2EAI0C;AAHtC,2HAAA,kBAAkB,OAAA"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.estimateGasInERC20 = void 0;
|
|
4
|
+
const permissionless_1 = require("permissionless");
|
|
4
5
|
const utils_1 = require("permissionless/utils");
|
|
5
|
-
const index_js_1 = require("../../accounts/index.js");
|
|
6
6
|
const estimateGasInERC20 = async (client, args) => {
|
|
7
7
|
const response = await client.request({
|
|
8
8
|
method: "stackup_getERC20TokenQuotes",
|
|
@@ -11,7 +11,7 @@ const estimateGasInERC20 = async (client, args) => {
|
|
|
11
11
|
chainId: client.chain?.id,
|
|
12
12
|
userOp: (0, utils_1.deepHexlify)(args.userOperation),
|
|
13
13
|
tokenAddress: args.gasTokenAddress,
|
|
14
|
-
entryPointAddress: args.entryPoint ??
|
|
14
|
+
entryPointAddress: args.entryPoint ?? permissionless_1.ENTRYPOINT_ADDRESS_V06
|
|
15
15
|
}
|
|
16
16
|
]
|
|
17
17
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"estimateGasInERC20.js","sourceRoot":"","sources":["../../../actions/paymaster/estimateGasInERC20.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"estimateGasInERC20.js","sourceRoot":"","sources":["../../../actions/paymaster/estimateGasInERC20.ts"],"names":[],"mappings":";;;AAAA,mDAAuD;AAMvD,gDAAkD;AAuB3C,MAAM,kBAAkB,GAAG,KAAK,EACnC,MAA0C,EAC1C,IAAkC,EACG,EAAE;IACvC,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAClC,MAAM,EAAE,6BAA6B;QACrC,MAAM,EAAE;YACJ;gBACI,OAAO,EAAE,MAAM,CAAC,KAAK,EAAE,EAAY;gBACnC,MAAM,EAAE,IAAA,mBAAW,EACf,IAAI,CAAC,aAAa,CACmB;gBACzC,YAAY,EAAE,IAAI,CAAC,eAAe;gBAClC,iBAAiB,EAAE,IAAI,CAAC,UAAU,IAAI,uCAAsB;aAC/D;SACJ;KACJ,CAAC,CAAA;IAEF,MAAM,MAAM,GAAkC;QAC1C,eAAe,EAAE,QAAQ,CAAC,eAAe;QACzC,aAAa,EAAE,QAAQ,CAAC,aAAa;KACxC,CAAA;IAED,MAAM,MAAM,GACR,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,IAAI,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;IAEvE,OAAO,EAAE,MAAM,EAAE,CAAA;AACrB,CAAC,CAAA;AA3BY,QAAA,kBAAkB,sBA2B9B"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.sponsorUserOperation = void 0;
|
|
4
4
|
const utils_1 = require("permissionless/utils");
|
|
5
|
-
const index_js_1 = require("../../accounts/index.js");
|
|
6
5
|
const sponsorUserOperation = async (client, args) => {
|
|
7
6
|
const response = await client.request({
|
|
8
7
|
method: "zd_sponsorUserOperation",
|
|
@@ -10,7 +9,7 @@ const sponsorUserOperation = async (client, args) => {
|
|
|
10
9
|
{
|
|
11
10
|
chainId: client.chain?.id,
|
|
12
11
|
userOp: (0, utils_1.deepHexlify)(args.userOperation),
|
|
13
|
-
entryPointAddress: args.entryPoint
|
|
12
|
+
entryPointAddress: args.entryPoint,
|
|
14
13
|
gasTokenData: args.gasToken && {
|
|
15
14
|
tokenAddress: args.gasToken
|
|
16
15
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sponsorUserOperation.js","sourceRoot":"","sources":["../../../actions/paymaster/sponsorUserOperation.ts"],"names":[],"mappings":";;;AASA,gDAA0E;
|
|
1
|
+
{"version":3,"file":"sponsorUserOperation.js","sourceRoot":"","sources":["../../../actions/paymaster/sponsorUserOperation.ts"],"names":[],"mappings":";;;AASA,gDAA0E;AAgDnE,MAAM,oBAAoB,GAAG,KAAK,EACrC,MAA0C,EAC1C,IAAgD,EACG,EAAE;IACrD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAClC,MAAM,EAAE,yBAAyB;QACjC,MAAM,EAAE;YACJ;gBACI,OAAO,EAAE,MAAM,CAAC,KAAK,EAAE,EAAY;gBACnC,MAAM,EAAE,IAAA,mBAAW,EACf,IAAI,CAAC,aAAa,CAGrB;gBACD,iBAAiB,EAAE,IAAI,CAAC,UAAU;gBAClC,YAAY,EAAE,IAAI,CAAC,QAAQ,IAAI;oBAC3B,YAAY,EAAE,IAAI,CAAC,QAAQ;iBAC9B;gBACD,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,IAAI,KAAK;gBAClD,aAAa,EAAE,IAAI,CAAC,aAAa,IAAI,IAAI;aAC5C;SACJ;KACJ,CAAC,CAAA;IACF,IAAI,IAAI,CAAC,UAAU,KAAK,8BAAsB,EAAE,CAAC;QAC7C,MAAM,WAAW,GAAG,QASnB,CAAA;QACD,OAAO;YACH,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;YAC9C,kBAAkB,EAAE,MAAM,CAAC,WAAW,CAAC,kBAAkB,CAAC;YAC1D,oBAAoB,EAAE,MAAM,CAAC,WAAW,CAAC,oBAAoB,CAAC;YAC9D,YAAY,EAAE,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC;SACH,CAAA;IACnD,CAAC;IACD,MAAM,WAAW,GAAG,QASnB,CAAA;IAED,OAAO;QACH,YAAY,EAAE,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC;QAC9C,oBAAoB,EAAE,MAAM,CAAC,WAAW,CAAC,oBAAoB,CAAC;QAC9D,kBAAkB,EAAE,MAAM,CAAC,WAAW,CAAC,kBAAkB,CAAC;QAC1D,SAAS,EAAE,WAAW,CAAC,SAAS;QAChC,6BAA6B,EAAE,MAAM,CACjC,WAAW,CAAC,6BAA6B,CAC5C;QACD,uBAAuB,EAAE,MAAM,CAAC,WAAW,CAAC,uBAAuB,CAAC;QACpE,aAAa,EAAE,WAAW,CAAC,aAAa;KACG,CAAA;AAqBnD,CAAC,CAAA;AAnFY,QAAA,oBAAoB,wBAmFhC"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.kernelAccountClientActions = exports.zerodevPaymasterActions = void 0;
|
|
4
4
|
const permissionless_1 = require("permissionless");
|
|
5
|
+
const getUserOperationGasPrice_js_1 = require("../../actions/account-client/getUserOperationGasPrice.js");
|
|
5
6
|
const index_js_1 = require("../../actions/index.js");
|
|
6
7
|
const estimateGasInERC20_js_1 = require("../../actions/paymaster/estimateGasInERC20.js");
|
|
7
8
|
const sponsorUserOperation_js_1 = require("../../actions/paymaster/sponsorUserOperation.js");
|
|
@@ -18,7 +19,8 @@ const kernelAccountClientActions = ({ middleware }) => (client) => ({
|
|
|
18
19
|
signUserOperation: (args) => (0, index_js_1.signUserOperation)(client, {
|
|
19
20
|
...args,
|
|
20
21
|
middleware
|
|
21
|
-
})
|
|
22
|
+
}),
|
|
23
|
+
getUserOperationGasPrice: async () => (0, getUserOperationGasPrice_js_1.getUserOperationGasPrice)(client)
|
|
22
24
|
});
|
|
23
25
|
exports.kernelAccountClientActions = kernelAccountClientActions;
|
|
24
26
|
//# sourceMappingURL=kernel.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kernel.js","sourceRoot":"","sources":["../../../clients/decorators/kernel.ts"],"names":[],"mappings":";;;AAAA,mDAA8E;
|
|
1
|
+
{"version":3,"file":"kernel.js","sourceRoot":"","sources":["../../../clients/decorators/kernel.ts"],"names":[],"mappings":";;;AAAA,mDAA8E;AAK9E,0GAGiE;AAKjE,qDAA0D;AAC1D,yFAIsD;AACtD,6FAIwD;AAejD,MAAM,uBAAuB,GAChC,CAAgC,iBAA6B,EAAE,EAAE,CACjE,CAAC,MAAc,EAA6C,EAAE,CAAC,CAAC;IAC5D,oBAAoB,EAAE,KAAK,EACvB,IAAoE,EACtE,EAAE,CACA,IAAA,8CAAoB,EAChB,MAA4C,EAC5C;QACI,GAAG,IAAI;QACP,UAAU,EAAE,iBAAiB;KAChC,CACJ;IACL,kBAAkB,EAAE,KAAK,EAAE,IAAkC,EAAE,EAAE,CAC7D,IAAA,0CAAkB,EACd,MAA4C,EAC5C,IAAI,CACP;CACR,CAAC,CAAA;AAlBO,QAAA,uBAAuB,2BAkB9B;AAmCC,MAAM,0BAA0B,GACnC,CAAgC,EAAE,UAAU,EAA0B,EAAE,EAAE,CAC1E,CAOI,MAAiD,EACY,EAAE,CAAC,CAAC;IACjE,GAAG,IAAA,oCAAmB,EAAC,EAAE,UAAU,EAAE,CAAC,CAAC,MAAM,CAAC;IAC9C,iBAAiB,EAAE,CAAC,IAAI,EAAE,EAAE,CACxB,IAAA,4BAAiB,EACb,MAAM,EACN;QACI,GAAG,IAAI;QACP,UAAU;KAC6C,CAC9D;IACL,wBAAwB,EAAE,KAAK,IAAI,EAAE,CAAC,IAAA,sDAAwB,EAAC,MAAM,CAAC;CACzE,CAAC,CAAA;AArBO,QAAA,0BAA0B,8BAqBjC"}
|
|
@@ -1,19 +1,45 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createKernelAccountClient = void 0;
|
|
4
|
+
const permissionless_1 = require("permissionless");
|
|
4
5
|
const viem_1 = require("viem");
|
|
6
|
+
const getUserOperationGasPrice_js_1 = require("../actions/account-client/getUserOperationGasPrice.js");
|
|
5
7
|
const kernel_js_1 = require("./decorators/kernel.js");
|
|
8
|
+
const utils_js_1 = require("./utils.js");
|
|
6
9
|
const createKernelAccountClient = (parameters) => {
|
|
7
|
-
const { key = "Account", name = "Kernel Account Client", bundlerTransport } = parameters;
|
|
10
|
+
const { key = "Account", name = "Kernel Account Client", bundlerTransport, entryPoint } = parameters;
|
|
11
|
+
const entryPointVersion = (0, permissionless_1.getEntryPointVersion)(entryPoint);
|
|
12
|
+
const shouldIncludePimlicoProvider = bundlerTransport({}).config.key === "http" &&
|
|
13
|
+
entryPointVersion === "v0.7";
|
|
8
14
|
const client = (0, viem_1.createClient)({
|
|
9
15
|
...parameters,
|
|
10
16
|
key,
|
|
11
17
|
name,
|
|
12
|
-
transport: (opts) =>
|
|
18
|
+
transport: (opts) => {
|
|
19
|
+
let _bundlerTransport = bundlerTransport({
|
|
20
|
+
...opts,
|
|
21
|
+
retryCount: 0
|
|
22
|
+
});
|
|
23
|
+
if (!shouldIncludePimlicoProvider)
|
|
24
|
+
return _bundlerTransport;
|
|
25
|
+
_bundlerTransport = (0, viem_1.http)((0, utils_js_1.setPimlicoAsProvider)(_bundlerTransport.value?.url))({ ...opts, retryCount: 0 });
|
|
26
|
+
return _bundlerTransport;
|
|
27
|
+
},
|
|
13
28
|
type: "kernelAccountClient"
|
|
14
29
|
});
|
|
30
|
+
let middleware = parameters.middleware;
|
|
31
|
+
if ((!middleware ||
|
|
32
|
+
(typeof middleware !== "function" && !middleware.gasPrice)) &&
|
|
33
|
+
client.transport?.url &&
|
|
34
|
+
(0, utils_js_1.hasPimlicoAsProvider)(client.transport.url)) {
|
|
35
|
+
const gasPrice = () => (0, getUserOperationGasPrice_js_1.getUserOperationGasPrice)(client);
|
|
36
|
+
middleware = {
|
|
37
|
+
...middleware,
|
|
38
|
+
gasPrice
|
|
39
|
+
};
|
|
40
|
+
}
|
|
15
41
|
return client.extend((0, kernel_js_1.kernelAccountClientActions)({
|
|
16
|
-
middleware
|
|
42
|
+
middleware
|
|
17
43
|
}));
|
|
18
44
|
};
|
|
19
45
|
exports.createKernelAccountClient = createKernelAccountClient;
|