permissionless 0.2.25 → 0.2.27
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +12 -0
- package/_cjs/accounts/biconomy/toBiconomySmartAccount.js +27 -0
- package/_cjs/accounts/biconomy/toBiconomySmartAccount.js.map +1 -1
- package/_cjs/accounts/etherspot/toEtherspotSmartAccount.js +4 -0
- package/_cjs/accounts/etherspot/toEtherspotSmartAccount.js.map +1 -1
- package/_cjs/accounts/kernel/abi/KernelV3FactoryAbi.js +16 -0
- package/_cjs/accounts/kernel/abi/KernelV3FactoryAbi.js.map +1 -0
- package/_cjs/accounts/kernel/toKernelSmartAccount.js +17 -4
- package/_cjs/accounts/kernel/toKernelSmartAccount.js.map +1 -1
- package/_cjs/accounts/kernel/utils/decodeCallData.js +36 -0
- package/_cjs/accounts/kernel/utils/decodeCallData.js.map +1 -0
- package/_cjs/accounts/light/toLightSmartAccount.js +81 -0
- package/_cjs/accounts/light/toLightSmartAccount.js.map +1 -1
- package/_cjs/accounts/nexus/toNexusSmartAccount.js +4 -0
- package/_cjs/accounts/nexus/toNexusSmartAccount.js.map +1 -1
- package/_cjs/accounts/safe/toSafeSmartAccount.js +47 -0
- package/_cjs/accounts/safe/toSafeSmartAccount.js.map +1 -1
- package/_cjs/accounts/simple/toSimpleSmartAccount.js +114 -0
- package/_cjs/accounts/simple/toSimpleSmartAccount.js.map +1 -1
- package/_cjs/accounts/thirdweb/toThirdwebSmartAccount.js +4 -0
- package/_cjs/accounts/thirdweb/toThirdwebSmartAccount.js.map +1 -1
- package/_cjs/accounts/thirdweb/utils/decodeCallData.js +83 -0
- package/_cjs/accounts/thirdweb/utils/decodeCallData.js.map +1 -0
- package/_cjs/accounts/trust/toTrustSmartAccount.js +4 -0
- package/_cjs/accounts/trust/toTrustSmartAccount.js.map +1 -1
- package/_cjs/accounts/trust/utils/decodeCallData.js +83 -0
- package/_cjs/accounts/trust/utils/decodeCallData.js.map +1 -0
- package/_cjs/utils/decode7579Calls.js +100 -0
- package/_cjs/utils/decode7579Calls.js.map +1 -0
- package/_cjs/utils/getEstimationCallData.js +220 -0
- package/_cjs/utils/getEstimationCallData.js.map +1 -0
- package/_cjs/utils/index.js +3 -1
- package/_cjs/utils/index.js.map +1 -1
- package/_esm/accounts/biconomy/toBiconomySmartAccount.js +28 -1
- package/_esm/accounts/biconomy/toBiconomySmartAccount.js.map +1 -1
- package/_esm/accounts/etherspot/toEtherspotSmartAccount.js +4 -0
- package/_esm/accounts/etherspot/toEtherspotSmartAccount.js.map +1 -1
- package/_esm/accounts/kernel/abi/KernelV3FactoryAbi.js +13 -0
- package/_esm/accounts/kernel/abi/KernelV3FactoryAbi.js.map +1 -0
- package/_esm/accounts/kernel/toKernelSmartAccount.js +17 -4
- package/_esm/accounts/kernel/toKernelSmartAccount.js.map +1 -1
- package/_esm/accounts/kernel/utils/decodeCallData.js +32 -0
- package/_esm/accounts/kernel/utils/decodeCallData.js.map +1 -0
- package/_esm/accounts/light/toLightSmartAccount.js +82 -1
- package/_esm/accounts/light/toLightSmartAccount.js.map +1 -1
- package/_esm/accounts/nexus/toNexusSmartAccount.js +4 -0
- package/_esm/accounts/nexus/toNexusSmartAccount.js.map +1 -1
- package/_esm/accounts/safe/toSafeSmartAccount.js +56 -2
- package/_esm/accounts/safe/toSafeSmartAccount.js.map +1 -1
- package/_esm/accounts/simple/toSimpleSmartAccount.js +115 -1
- package/_esm/accounts/simple/toSimpleSmartAccount.js.map +1 -1
- package/_esm/accounts/thirdweb/toThirdwebSmartAccount.js +4 -0
- package/_esm/accounts/thirdweb/toThirdwebSmartAccount.js.map +1 -1
- package/_esm/accounts/thirdweb/utils/decodeCallData.js +79 -0
- package/_esm/accounts/thirdweb/utils/decodeCallData.js.map +1 -0
- package/_esm/accounts/trust/toTrustSmartAccount.js +4 -0
- package/_esm/accounts/trust/toTrustSmartAccount.js.map +1 -1
- package/_esm/accounts/trust/utils/decodeCallData.js +79 -0
- package/_esm/accounts/trust/utils/decodeCallData.js.map +1 -0
- package/_esm/utils/decode7579Calls.js +98 -0
- package/_esm/utils/decode7579Calls.js.map +1 -0
- package/_esm/utils/getEstimationCallData.js +217 -0
- package/_esm/utils/getEstimationCallData.js.map +1 -0
- package/_esm/utils/index.js +2 -1
- package/_esm/utils/index.js.map +1 -1
- package/_types/accounts/biconomy/toBiconomySmartAccount.d.ts.map +1 -1
- package/_types/accounts/etherspot/toEtherspotSmartAccount.d.ts.map +1 -1
- package/_types/accounts/kernel/abi/KernelV3FactoryAbi.d.ts +20 -0
- package/_types/accounts/kernel/abi/KernelV3FactoryAbi.d.ts.map +1 -0
- package/_types/accounts/kernel/toKernelSmartAccount.d.ts +1 -0
- package/_types/accounts/kernel/toKernelSmartAccount.d.ts.map +1 -1
- package/_types/accounts/kernel/utils/decodeCallData.d.ts +11 -0
- package/_types/accounts/kernel/utils/decodeCallData.d.ts.map +1 -0
- package/_types/accounts/light/toLightSmartAccount.d.ts.map +1 -1
- package/_types/accounts/nexus/toNexusSmartAccount.d.ts.map +1 -1
- package/_types/accounts/safe/toSafeSmartAccount.d.ts.map +1 -1
- package/_types/accounts/simple/toSimpleSmartAccount.d.ts.map +1 -1
- package/_types/accounts/thirdweb/toThirdwebSmartAccount.d.ts.map +1 -1
- package/_types/accounts/thirdweb/utils/decodeCallData.d.ts +7 -0
- package/_types/accounts/thirdweb/utils/decodeCallData.d.ts.map +1 -0
- package/_types/accounts/trust/toTrustSmartAccount.d.ts.map +1 -1
- package/_types/accounts/trust/utils/decodeCallData.d.ts +7 -0
- package/_types/accounts/trust/utils/decodeCallData.d.ts.map +1 -0
- package/_types/utils/decode7579Calls.d.ts +12 -0
- package/_types/utils/decode7579Calls.d.ts.map +1 -0
- package/_types/utils/getEstimationCallData.d.ts +18 -0
- package/_types/utils/getEstimationCallData.d.ts.map +1 -0
- package/_types/utils/index.d.ts +2 -1
- package/_types/utils/index.d.ts.map +1 -1
- package/accounts/biconomy/toBiconomySmartAccount.ts +30 -0
- package/accounts/decodeCalls.test.ts +340 -0
- package/accounts/etherspot/toEtherspotSmartAccount.ts +4 -0
- package/accounts/kernel/abi/KernelV3FactoryAbi.ts +12 -0
- package/accounts/kernel/toKernelSmartAccount.ts +22 -4
- package/accounts/kernel/utils/decodeCallData.ts +43 -0
- package/accounts/light/toLightSmartAccount.ts +90 -0
- package/accounts/nexus/toNexusSmartAccount.ts +4 -0
- package/accounts/safe/toSafeSmartAccount.ts +85 -0
- package/accounts/simple/toSimpleSmartAccount.ts +127 -0
- package/accounts/thirdweb/toThirdwebSmartAccount.ts +4 -0
- package/accounts/thirdweb/utils/decodeCallData.ts +87 -0
- package/accounts/trust/toTrustSmartAccount.ts +4 -0
- package/accounts/trust/utils/decodeCallData.ts +87 -0
- package/package.json +1 -1
- package/utils/decode7579Calls.ts +133 -0
- package/utils/getEstimationCallData.ts +279 -0
- package/utils/index.ts +8 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
# permissionless
|
|
2
2
|
|
|
3
|
+
## 0.2.27
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 0c2d20fa944ac00c9f9eda242d32dc04c9091fe8: Added decode calls function to all smart accounts
|
|
8
|
+
|
|
9
|
+
## 0.2.26
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- 86dc887aa1c3c5990751b5ed7d4237fc4ee0afbc: Added useMetaFactory flag for toEcdsaKernelSmartAccount
|
|
14
|
+
|
|
3
15
|
## 0.2.25
|
|
4
16
|
|
|
5
17
|
### Patch Changes
|
|
@@ -118,6 +118,33 @@ async function toBiconomySmartAccount(parameters) {
|
|
|
118
118
|
args: [call.to, call.value ?? 0n, call.data ?? "0x"]
|
|
119
119
|
});
|
|
120
120
|
},
|
|
121
|
+
decodeCalls: async (data) => {
|
|
122
|
+
const decoded = (0, viem_1.decodeFunctionData)({
|
|
123
|
+
abi: BiconomySmartAccountAbi_js_1.BiconomyAbi,
|
|
124
|
+
data
|
|
125
|
+
});
|
|
126
|
+
if (decoded.functionName === "execute_ncC") {
|
|
127
|
+
return [
|
|
128
|
+
{
|
|
129
|
+
to: decoded.args[0],
|
|
130
|
+
value: decoded.args[1],
|
|
131
|
+
data: decoded.args[2]
|
|
132
|
+
}
|
|
133
|
+
];
|
|
134
|
+
}
|
|
135
|
+
if (decoded.functionName === "executeBatch_y6U") {
|
|
136
|
+
const calls = [];
|
|
137
|
+
for (let i = 0; i < decoded.args[0].length; i++) {
|
|
138
|
+
calls.push({
|
|
139
|
+
to: decoded.args[0][i],
|
|
140
|
+
value: decoded.args[1][i],
|
|
141
|
+
data: decoded.args[2][i]
|
|
142
|
+
});
|
|
143
|
+
}
|
|
144
|
+
return calls;
|
|
145
|
+
}
|
|
146
|
+
throw new Error("Invalid function name");
|
|
147
|
+
},
|
|
121
148
|
async getStubSignature() {
|
|
122
149
|
const dynamicPart = ecdsaModuleAddress.substring(2).padEnd(40, "0");
|
|
123
150
|
return `0x0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000${dynamicPart}000000000000000000000000000000000000000000000000000000000000004181d4b4981670cb18f99f0b4a66446df1bf5b204d24cfcb659bf38ba27a4359b5711649ec2423c5e1247245eba2964679b6a1dbb85c992ae40b9b00c6935b02ff1b00000000000000000000000000000000000000000000000000000000000000`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toBiconomySmartAccount.js","sourceRoot":"","sources":["../../../accounts/biconomy/toBiconomySmartAccount.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"toBiconomySmartAccount.js","sourceRoot":"","sources":["../../../accounts/biconomy/toBiconomySmartAccount.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ const actions_1 = require("viem/actions");
|
|
|
7
7
|
const utils_1 = require("viem/utils");
|
|
8
8
|
const getAccountNonce_js_1 = require("../../actions/public/getAccountNonce.js");
|
|
9
9
|
const getSenderAddress_js_1 = require("../../actions/public/getSenderAddress.js");
|
|
10
|
+
const decode7579Calls_js_1 = require("../../utils/decode7579Calls.js");
|
|
10
11
|
const encode7579Calls_js_1 = require("../../utils/encode7579Calls.js");
|
|
11
12
|
const index_js_1 = require("../../utils/index.js");
|
|
12
13
|
const constants_js_1 = require("./constants.js");
|
|
@@ -129,6 +130,9 @@ async function toEtherspotSmartAccount(parameters) {
|
|
|
129
130
|
callData: calls
|
|
130
131
|
});
|
|
131
132
|
},
|
|
133
|
+
async decodeCalls(callData) {
|
|
134
|
+
return (0, decode7579Calls_js_1.decode7579Calls)(callData).callData;
|
|
135
|
+
},
|
|
132
136
|
async getNonce(_args) {
|
|
133
137
|
return (0, getAccountNonce_js_1.getAccountNonce)(client, {
|
|
134
138
|
address: await this.getAddress(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toEtherspotSmartAccount.js","sourceRoot":"","sources":["../../../accounts/etherspot/toEtherspotSmartAccount.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"toEtherspotSmartAccount.js","sourceRoot":"","sources":["../../../accounts/etherspot/toEtherspotSmartAccount.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.KernelV3FactoryAbi = void 0;
|
|
4
|
+
exports.KernelV3FactoryAbi = [
|
|
5
|
+
{
|
|
6
|
+
type: "function",
|
|
7
|
+
name: "createAccount",
|
|
8
|
+
inputs: [
|
|
9
|
+
{ name: "data", type: "bytes", internalType: "bytes" },
|
|
10
|
+
{ name: "salt", type: "bytes32", internalType: "bytes32" }
|
|
11
|
+
],
|
|
12
|
+
outputs: [{ name: "", type: "address", internalType: "address" }],
|
|
13
|
+
stateMutability: "payable"
|
|
14
|
+
}
|
|
15
|
+
];
|
|
16
|
+
//# sourceMappingURL=KernelV3FactoryAbi.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"KernelV3FactoryAbi.js","sourceRoot":"","sources":["../../../../accounts/kernel/abi/KernelV3FactoryAbi.ts"],"names":[],"mappings":";;;AAAa,QAAA,kBAAkB,GAAG;IAC9B;QACI,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,eAAe;QACrB,MAAM,EAAE;YACJ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE;YACtD,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE;SAC7D;QACD,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;QACjE,eAAe,EAAE,SAAS;KAC7B;CACK,CAAA"}
|
|
@@ -12,8 +12,10 @@ const getSenderAddress_js_1 = require("../../actions/public/getSenderAddress.js"
|
|
|
12
12
|
const toOwner_js_1 = require("../../utils/toOwner.js");
|
|
13
13
|
const KernelAccountAbi_js_1 = require("./abi/KernelAccountAbi.js");
|
|
14
14
|
const KernelV3AccountAbi_js_1 = require("./abi/KernelV3AccountAbi.js");
|
|
15
|
+
const KernelV3FactoryAbi_js_1 = require("./abi/KernelV3FactoryAbi.js");
|
|
15
16
|
const KernelV3MetaFactoryAbi_js_1 = require("./abi/KernelV3MetaFactoryAbi.js");
|
|
16
17
|
const constants_js_1 = require("./constants.js");
|
|
18
|
+
const decodeCallData_js_1 = require("./utils/decodeCallData.js");
|
|
17
19
|
const encodeCallData_js_1 = require("./utils/encodeCallData.js");
|
|
18
20
|
const getNonceKey_js_1 = require("./utils/getNonceKey.js");
|
|
19
21
|
const isKernelV2_js_1 = require("./utils/isKernelV2.js");
|
|
@@ -173,7 +175,7 @@ const getValidatorData = async (owner) => {
|
|
|
173
175
|
}
|
|
174
176
|
throw new Error("Invalid owner type");
|
|
175
177
|
};
|
|
176
|
-
const getAccountInitCode = async ({ entryPointVersion, kernelVersion, validatorData, index, factoryAddress, accountLogicAddress, validatorAddress }) => {
|
|
178
|
+
const getAccountInitCode = async ({ entryPointVersion, kernelVersion, validatorData, index, factoryAddress, accountLogicAddress, validatorAddress, useMetaFactory }) => {
|
|
177
179
|
const initializationData = getInitializationData({
|
|
178
180
|
entryPoint: { version: entryPointVersion },
|
|
179
181
|
kernelVersion,
|
|
@@ -187,6 +189,13 @@ const getAccountInitCode = async ({ entryPointVersion, kernelVersion, validatorD
|
|
|
187
189
|
args: [accountLogicAddress, initializationData, index]
|
|
188
190
|
});
|
|
189
191
|
}
|
|
192
|
+
if (!useMetaFactory) {
|
|
193
|
+
return (0, viem_1.encodeFunctionData)({
|
|
194
|
+
abi: KernelV3FactoryAbi_js_1.KernelV3FactoryAbi,
|
|
195
|
+
functionName: "createAccount",
|
|
196
|
+
args: [initializationData, (0, viem_1.toHex)(index, { size: 32 })]
|
|
197
|
+
});
|
|
198
|
+
}
|
|
190
199
|
return (0, viem_1.encodeFunctionData)({
|
|
191
200
|
abi: KernelV3MetaFactoryAbi_js_1.KernelV3MetaFactoryDeployWithFactoryAbi,
|
|
192
201
|
functionName: "deployWithFactory",
|
|
@@ -194,7 +203,7 @@ const getAccountInitCode = async ({ entryPointVersion, kernelVersion, validatorD
|
|
|
194
203
|
});
|
|
195
204
|
};
|
|
196
205
|
async function toKernelSmartAccount(parameters) {
|
|
197
|
-
const { client, address, index = 0n, owners, version, validatorAddress: _validatorAddress, factoryAddress: _factoryAddress, metaFactoryAddress: _metaFactoryAddress, accountLogicAddress: _accountLogicAddress } = parameters;
|
|
206
|
+
const { client, address, index = 0n, owners, version, validatorAddress: _validatorAddress, factoryAddress: _factoryAddress, metaFactoryAddress: _metaFactoryAddress, accountLogicAddress: _accountLogicAddress, useMetaFactory = true } = parameters;
|
|
198
207
|
const isWebAuthn = owners[0].type === "webAuthn";
|
|
199
208
|
const owner = isWebAuthn
|
|
200
209
|
? owners[0]
|
|
@@ -227,7 +236,8 @@ async function toKernelSmartAccount(parameters) {
|
|
|
227
236
|
index,
|
|
228
237
|
factoryAddress,
|
|
229
238
|
accountLogicAddress,
|
|
230
|
-
validatorAddress
|
|
239
|
+
validatorAddress,
|
|
240
|
+
useMetaFactory
|
|
231
241
|
});
|
|
232
242
|
let accountAddress = address;
|
|
233
243
|
let chainId;
|
|
@@ -241,7 +251,7 @@ async function toKernelSmartAccount(parameters) {
|
|
|
241
251
|
};
|
|
242
252
|
const getFactoryArgs = async () => {
|
|
243
253
|
return {
|
|
244
|
-
factory: entryPoint.version === "0.6"
|
|
254
|
+
factory: entryPoint.version === "0.6" || useMetaFactory === false
|
|
245
255
|
? factoryAddress
|
|
246
256
|
: metaFactoryAddress,
|
|
247
257
|
factoryData: await generateInitCode()
|
|
@@ -265,6 +275,9 @@ async function toKernelSmartAccount(parameters) {
|
|
|
265
275
|
async encodeCalls(calls) {
|
|
266
276
|
return (0, encodeCallData_js_1.encodeCallData)({ calls, kernelVersion });
|
|
267
277
|
},
|
|
278
|
+
async decodeCalls(callData) {
|
|
279
|
+
return (0, decodeCallData_js_1.decodeCallData)({ callData, kernelVersion });
|
|
280
|
+
},
|
|
268
281
|
async getNonce(_args) {
|
|
269
282
|
return (0, getAccountNonce_js_1.getAccountNonce)(client, {
|
|
270
283
|
address: await this.getAddress(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toKernelSmartAccount.js","sourceRoot":"","sources":["../../../accounts/kernel/toKernelSmartAccount.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"toKernelSmartAccount.js","sourceRoot":"","sources":["../../../accounts/kernel/toKernelSmartAccount.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.decodeCallData = void 0;
|
|
4
|
+
const viem_1 = require("viem");
|
|
5
|
+
const decode7579Calls_js_1 = require("../../../utils/decode7579Calls.js");
|
|
6
|
+
const KernelAccountAbi_js_1 = require("../abi/KernelAccountAbi.js");
|
|
7
|
+
const isKernelV2_js_1 = require("./isKernelV2.js");
|
|
8
|
+
const decodeCallData = ({ kernelVersion, callData }) => {
|
|
9
|
+
if ((0, isKernelV2_js_1.isKernelV2)(kernelVersion)) {
|
|
10
|
+
const decoded = (0, viem_1.decodeFunctionData)({
|
|
11
|
+
abi: KernelAccountAbi_js_1.KernelExecuteAbi,
|
|
12
|
+
data: callData
|
|
13
|
+
});
|
|
14
|
+
if (decoded.functionName === "executeBatch") {
|
|
15
|
+
return decoded.args[0].map((tx) => ({
|
|
16
|
+
to: tx.to,
|
|
17
|
+
value: tx.value,
|
|
18
|
+
data: tx.data
|
|
19
|
+
}));
|
|
20
|
+
}
|
|
21
|
+
if (decoded.functionName === "execute") {
|
|
22
|
+
const [to, value, data] = decoded.args;
|
|
23
|
+
return [
|
|
24
|
+
{
|
|
25
|
+
to,
|
|
26
|
+
value,
|
|
27
|
+
data
|
|
28
|
+
}
|
|
29
|
+
];
|
|
30
|
+
}
|
|
31
|
+
throw new Error("Invalid function name");
|
|
32
|
+
}
|
|
33
|
+
return (0, decode7579Calls_js_1.decode7579Calls)(callData).callData;
|
|
34
|
+
};
|
|
35
|
+
exports.decodeCallData = decodeCallData;
|
|
36
|
+
//# sourceMappingURL=decodeCallData.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"decodeCallData.js","sourceRoot":"","sources":["../../../../accounts/kernel/utils/decodeCallData.ts"],"names":[],"mappings":";;;AAAA,+BAAmD;AACnD,0EAAmE;AACnE,oEAA6D;AAE7D,mDAA4C;AAErC,MAAM,cAAc,GAAG,CAAC,EAC3B,aAAa,EACb,QAAQ,EAIX,EAAE,EAAE;IACD,IAAI,IAAA,0BAAU,EAAC,aAAa,CAAC,EAAE,CAAC;QAC5B,MAAM,OAAO,GAAG,IAAA,yBAAkB,EAAC;YAC/B,GAAG,EAAE,sCAAgB;YACrB,IAAI,EAAE,QAAQ;SACjB,CAAC,CAAA;QAEF,IAAI,OAAO,CAAC,YAAY,KAAK,cAAc,EAAE,CAAC;YAC1C,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;gBAChC,EAAE,EAAE,EAAE,CAAC,EAAE;gBACT,KAAK,EAAE,EAAE,CAAC,KAAK;gBACf,IAAI,EAAE,EAAE,CAAC,IAAI;aAChB,CAAC,CAAC,CAAA;QACP,CAAC;QAED,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YACrC,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAA;YACtC,OAAO;gBACH;oBACI,EAAE;oBACF,KAAK;oBACL,IAAI;iBACP;aACJ,CAAA;QACL,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAA;IAC5C,CAAC;IAED,OAAO,IAAA,oCAAe,EAAC,QAAQ,CAAC,CAAC,QAAQ,CAAA;AAC7C,CAAC,CAAA;AApCY,QAAA,cAAc,kBAoC1B"}
|
|
@@ -192,6 +192,87 @@ async function toLightSmartAccount(parameters) {
|
|
|
192
192
|
args: [call.to, call.value ?? 0n, call.data ?? "0x"]
|
|
193
193
|
});
|
|
194
194
|
},
|
|
195
|
+
async decodeCalls(callData) {
|
|
196
|
+
try {
|
|
197
|
+
const decoded = (0, viem_1.decodeFunctionData)({
|
|
198
|
+
abi: [
|
|
199
|
+
{
|
|
200
|
+
inputs: [
|
|
201
|
+
{
|
|
202
|
+
internalType: "address[]",
|
|
203
|
+
name: "dest",
|
|
204
|
+
type: "address[]"
|
|
205
|
+
},
|
|
206
|
+
{
|
|
207
|
+
internalType: "uint256[]",
|
|
208
|
+
name: "value",
|
|
209
|
+
type: "uint256[]"
|
|
210
|
+
},
|
|
211
|
+
{
|
|
212
|
+
internalType: "bytes[]",
|
|
213
|
+
name: "func",
|
|
214
|
+
type: "bytes[]"
|
|
215
|
+
}
|
|
216
|
+
],
|
|
217
|
+
name: "executeBatch",
|
|
218
|
+
outputs: [],
|
|
219
|
+
stateMutability: "nonpayable",
|
|
220
|
+
type: "function"
|
|
221
|
+
}
|
|
222
|
+
],
|
|
223
|
+
data: callData
|
|
224
|
+
});
|
|
225
|
+
if (decoded.functionName === "executeBatch") {
|
|
226
|
+
const calls = [];
|
|
227
|
+
for (let i = 0; i < decoded.args[0].length; i++) {
|
|
228
|
+
calls.push({
|
|
229
|
+
to: decoded.args[0][i],
|
|
230
|
+
value: decoded.args[1][i],
|
|
231
|
+
data: decoded.args[2][i]
|
|
232
|
+
});
|
|
233
|
+
}
|
|
234
|
+
return calls;
|
|
235
|
+
}
|
|
236
|
+
throw new Error("Invalid function name");
|
|
237
|
+
}
|
|
238
|
+
catch (_) {
|
|
239
|
+
const decoded = (0, viem_1.decodeFunctionData)({
|
|
240
|
+
abi: [
|
|
241
|
+
{
|
|
242
|
+
inputs: [
|
|
243
|
+
{
|
|
244
|
+
internalType: "address",
|
|
245
|
+
name: "dest",
|
|
246
|
+
type: "address"
|
|
247
|
+
},
|
|
248
|
+
{
|
|
249
|
+
internalType: "uint256",
|
|
250
|
+
name: "value",
|
|
251
|
+
type: "uint256"
|
|
252
|
+
},
|
|
253
|
+
{
|
|
254
|
+
internalType: "bytes",
|
|
255
|
+
name: "func",
|
|
256
|
+
type: "bytes"
|
|
257
|
+
}
|
|
258
|
+
],
|
|
259
|
+
name: "execute",
|
|
260
|
+
outputs: [],
|
|
261
|
+
stateMutability: "nonpayable",
|
|
262
|
+
type: "function"
|
|
263
|
+
}
|
|
264
|
+
],
|
|
265
|
+
data: callData
|
|
266
|
+
});
|
|
267
|
+
return [
|
|
268
|
+
{
|
|
269
|
+
to: decoded.args[0],
|
|
270
|
+
value: decoded.args[1],
|
|
271
|
+
data: decoded.args[2]
|
|
272
|
+
}
|
|
273
|
+
];
|
|
274
|
+
}
|
|
275
|
+
},
|
|
195
276
|
async getNonce(args) {
|
|
196
277
|
return (0, getAccountNonce_js_1.getAccountNonce)(client, {
|
|
197
278
|
address: await this.getAddress(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toLightSmartAccount.js","sourceRoot":"","sources":["../../../accounts/light/toLightSmartAccount.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"toLightSmartAccount.js","sourceRoot":"","sources":["../../../accounts/light/toLightSmartAccount.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ const account_abstraction_1 = require("viem/account-abstraction");
|
|
|
6
6
|
const actions_1 = require("viem/actions");
|
|
7
7
|
const utils_1 = require("viem/utils");
|
|
8
8
|
const getAccountNonce_js_1 = require("../../actions/public/getAccountNonce.js");
|
|
9
|
+
const decode7579Calls_js_1 = require("../../utils/decode7579Calls.js");
|
|
9
10
|
const encode7579Calls_js_1 = require("../../utils/encode7579Calls.js");
|
|
10
11
|
const toOwner_js_1 = require("../../utils/toOwner.js");
|
|
11
12
|
const wrapMessageHash = (messageHash, { accountAddress, version, chainId }) => {
|
|
@@ -123,6 +124,9 @@ async function toNexusSmartAccount(parameters) {
|
|
|
123
124
|
callData: calls
|
|
124
125
|
});
|
|
125
126
|
},
|
|
127
|
+
async decodeCalls(callData) {
|
|
128
|
+
return (0, decode7579Calls_js_1.decode7579Calls)(callData).callData;
|
|
129
|
+
},
|
|
126
130
|
async getStubSignature() {
|
|
127
131
|
const dynamicPart = validatorAddress.substring(2).padEnd(40, "0");
|
|
128
132
|
return `0x0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000${dynamicPart}000000000000000000000000000000000000000000000000000000000000004181d4b4981670cb18f99f0b4a66446df1bf5b204d24cfcb659bf38ba27a4359b5711649ec2423c5e1247245eba2964679b6a1dbb85c992ae40b9b00c6935b02ff1b00000000000000000000000000000000000000000000000000000000000000`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toNexusSmartAccount.js","sourceRoot":"","sources":["../../../accounts/nexus/toNexusSmartAccount.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"toNexusSmartAccount.js","sourceRoot":"","sources":["../../../accounts/nexus/toNexusSmartAccount.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ const account_abstraction_1 = require("viem/account-abstraction");
|
|
|
8
8
|
const actions_1 = require("viem/actions");
|
|
9
9
|
const utils_1 = require("viem/utils");
|
|
10
10
|
const getAccountNonce_js_1 = require("../../actions/public/getAccountNonce.js");
|
|
11
|
+
const decode7579Calls_js_1 = require("../../utils/decode7579Calls.js");
|
|
11
12
|
const encode7579Calls_js_1 = require("../../utils/encode7579Calls.js");
|
|
12
13
|
const isSmartAccountDeployed_js_1 = require("../../utils/isSmartAccountDeployed.js");
|
|
13
14
|
const toOwner_js_1 = require("../../utils/toOwner.js");
|
|
@@ -909,6 +910,52 @@ async function toSafeSmartAccount(parameters) {
|
|
|
909
910
|
args: [to, value, data, operationType]
|
|
910
911
|
});
|
|
911
912
|
},
|
|
913
|
+
async decodeCalls(callData) {
|
|
914
|
+
try {
|
|
915
|
+
const decoded = (0, viem_1.decodeFunctionData)({
|
|
916
|
+
abi: setupSafeAbi,
|
|
917
|
+
data: callData
|
|
918
|
+
});
|
|
919
|
+
return (0, decode7579Calls_js_1.decode7579Calls)(decoded.args[0].callData).callData;
|
|
920
|
+
}
|
|
921
|
+
catch (_) { }
|
|
922
|
+
try {
|
|
923
|
+
return (0, decode7579Calls_js_1.decode7579Calls)(callData).callData;
|
|
924
|
+
}
|
|
925
|
+
catch (_) { }
|
|
926
|
+
const decoded = (0, viem_1.decodeFunctionData)({
|
|
927
|
+
abi: executeUserOpWithErrorStringAbi,
|
|
928
|
+
data: callData
|
|
929
|
+
});
|
|
930
|
+
const to = decoded.args[0];
|
|
931
|
+
const value = decoded.args[1];
|
|
932
|
+
const data = decoded.args[2];
|
|
933
|
+
if (to === multiSendCallOnlyAddress) {
|
|
934
|
+
const decodedMultiSend = (0, viem_1.decodeFunctionData)({
|
|
935
|
+
abi: multiSendAbi,
|
|
936
|
+
data: data
|
|
937
|
+
});
|
|
938
|
+
const dataToDecode = decodedMultiSend.args[0];
|
|
939
|
+
const transactions = [];
|
|
940
|
+
let position = 0;
|
|
941
|
+
const dataLength = (0, viem_1.size)(dataToDecode);
|
|
942
|
+
while (position < dataLength) {
|
|
943
|
+
position += 1;
|
|
944
|
+
const to = (0, viem_1.getAddress)((0, viem_1.slice)(dataToDecode, position, position + 20));
|
|
945
|
+
position += 20;
|
|
946
|
+
const value = BigInt((0, viem_1.slice)(dataToDecode, position, position + 32));
|
|
947
|
+
position += 32;
|
|
948
|
+
const dataLength = Number(BigInt((0, viem_1.slice)(dataToDecode, position, position + 32)) *
|
|
949
|
+
BigInt(2));
|
|
950
|
+
position += 32;
|
|
951
|
+
const data = (0, viem_1.slice)(dataToDecode, position, position + dataLength);
|
|
952
|
+
position += dataLength;
|
|
953
|
+
transactions.push({ to, value, data });
|
|
954
|
+
}
|
|
955
|
+
return transactions;
|
|
956
|
+
}
|
|
957
|
+
return [{ to, value, data }];
|
|
958
|
+
},
|
|
912
959
|
async getNonce(args) {
|
|
913
960
|
return (0, getAccountNonce_js_1.getAccountNonce)(client, {
|
|
914
961
|
address: await this.getAddress(),
|