permissionless 0.1.29 → 0.1.30
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 +6 -0
- package/_cjs/actions/smartAccount/prepareUserOperationRequest.js +4 -12
- package/_cjs/actions/smartAccount/prepareUserOperationRequest.js.map +1 -1
- package/_esm/actions/smartAccount/prepareUserOperationRequest.js +4 -12
- package/_esm/actions/smartAccount/prepareUserOperationRequest.js.map +1 -1
- package/_types/actions/smartAccount/prepareUserOperationRequest.d.ts.map +1 -1
- package/actions/smartAccount/prepareUserOperationRequest.ts +9 -19
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -94,16 +94,12 @@ async function prepareUserOperationRequestEntryPointV07(client, args, stateOverr
|
|
|
94
94
|
if (!account_)
|
|
95
95
|
throw new utils_2.AccountOrClientNotFoundError();
|
|
96
96
|
const account = (0, utils_2.parseAccount)(account_);
|
|
97
|
-
const [sender, nonce, factory, factoryData, callData
|
|
97
|
+
const [sender, nonce, factory, factoryData, callData] = await Promise.all([
|
|
98
98
|
partialUserOperation.sender || account.address,
|
|
99
99
|
partialUserOperation.nonce || account.getNonce(),
|
|
100
100
|
partialUserOperation.factory || account.getFactory(),
|
|
101
101
|
partialUserOperation.factoryData || account.getFactoryData(),
|
|
102
|
-
partialUserOperation.callData
|
|
103
|
-
!partialUserOperation.maxFeePerGas ||
|
|
104
|
-
!partialUserOperation.maxPriorityFeePerGas
|
|
105
|
-
? (0, actions_1.estimateFeesPerGas)(account.client)
|
|
106
|
-
: undefined
|
|
102
|
+
partialUserOperation.callData
|
|
107
103
|
]);
|
|
108
104
|
const userOperation = {
|
|
109
105
|
sender,
|
|
@@ -114,12 +110,8 @@ async function prepareUserOperationRequestEntryPointV07(client, args, stateOverr
|
|
|
114
110
|
callGasLimit: partialUserOperation.callGasLimit || BigInt(0),
|
|
115
111
|
verificationGasLimit: partialUserOperation.verificationGasLimit || BigInt(0),
|
|
116
112
|
preVerificationGas: partialUserOperation.preVerificationGas || BigInt(0),
|
|
117
|
-
maxFeePerGas: partialUserOperation.maxFeePerGas ||
|
|
118
|
-
|
|
119
|
-
BigInt(0),
|
|
120
|
-
maxPriorityFeePerGas: partialUserOperation.maxPriorityFeePerGas ||
|
|
121
|
-
gasEstimation?.maxPriorityFeePerGas ||
|
|
122
|
-
BigInt(0),
|
|
113
|
+
maxFeePerGas: partialUserOperation.maxFeePerGas || BigInt(0),
|
|
114
|
+
maxPriorityFeePerGas: partialUserOperation.maxPriorityFeePerGas || BigInt(0),
|
|
123
115
|
signature: partialUserOperation.signature || "0x"
|
|
124
116
|
};
|
|
125
117
|
if (userOperation.signature === "0x") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareUserOperationRequest.js","sourceRoot":"","sources":["../../../actions/smartAccount/prepareUserOperationRequest.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"prepareUserOperationRequest.js","sourceRoot":"","sources":["../../../actions/smartAccount/prepareUserOperationRequest.ts"],"names":[],"mappings":"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"}
|
|
@@ -93,16 +93,12 @@ async function prepareUserOperationRequestEntryPointV07(client, args, stateOverr
|
|
|
93
93
|
if (!account_)
|
|
94
94
|
throw new AccountOrClientNotFoundError();
|
|
95
95
|
const account = parseAccount(account_);
|
|
96
|
-
const [sender, nonce, factory, factoryData, callData
|
|
96
|
+
const [sender, nonce, factory, factoryData, callData] = await Promise.all([
|
|
97
97
|
partialUserOperation.sender || account.address,
|
|
98
98
|
partialUserOperation.nonce || account.getNonce(),
|
|
99
99
|
partialUserOperation.factory || account.getFactory(),
|
|
100
100
|
partialUserOperation.factoryData || account.getFactoryData(),
|
|
101
|
-
partialUserOperation.callData
|
|
102
|
-
!partialUserOperation.maxFeePerGas ||
|
|
103
|
-
!partialUserOperation.maxPriorityFeePerGas
|
|
104
|
-
? estimateFeesPerGas(account.client)
|
|
105
|
-
: undefined
|
|
101
|
+
partialUserOperation.callData
|
|
106
102
|
]);
|
|
107
103
|
const userOperation = {
|
|
108
104
|
sender,
|
|
@@ -113,12 +109,8 @@ async function prepareUserOperationRequestEntryPointV07(client, args, stateOverr
|
|
|
113
109
|
callGasLimit: partialUserOperation.callGasLimit || BigInt(0),
|
|
114
110
|
verificationGasLimit: partialUserOperation.verificationGasLimit || BigInt(0),
|
|
115
111
|
preVerificationGas: partialUserOperation.preVerificationGas || BigInt(0),
|
|
116
|
-
maxFeePerGas: partialUserOperation.maxFeePerGas ||
|
|
117
|
-
|
|
118
|
-
BigInt(0),
|
|
119
|
-
maxPriorityFeePerGas: partialUserOperation.maxPriorityFeePerGas ||
|
|
120
|
-
gasEstimation?.maxPriorityFeePerGas ||
|
|
121
|
-
BigInt(0),
|
|
112
|
+
maxFeePerGas: partialUserOperation.maxFeePerGas || BigInt(0),
|
|
113
|
+
maxPriorityFeePerGas: partialUserOperation.maxPriorityFeePerGas || BigInt(0),
|
|
122
114
|
signature: partialUserOperation.signature || "0x"
|
|
123
115
|
};
|
|
124
116
|
if (userOperation.signature === "0x") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareUserOperationRequest.js","sourceRoot":"","sources":["../../../actions/smartAccount/prepareUserOperationRequest.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"prepareUserOperationRequest.js","sourceRoot":"","sources":["../../../actions/smartAccount/prepareUserOperationRequest.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareUserOperationRequest.d.ts","sourceRoot":"","sources":["../../../actions/smartAccount/prepareUserOperationRequest.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"prepareUserOperationRequest.d.ts","sourceRoot":"","sources":["../../../actions/smartAccount/prepareUserOperationRequest.ts"],"names":[],"mappings":"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"}
|
|
@@ -274,18 +274,13 @@ async function prepareUserOperationRequestEntryPointV07<
|
|
|
274
274
|
account_
|
|
275
275
|
) as SmartAccount<ENTRYPOINT_ADDRESS_V07_TYPE>
|
|
276
276
|
|
|
277
|
-
const [sender, nonce, factory, factoryData, callData
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
!partialUserOperation.maxFeePerGas ||
|
|
285
|
-
!partialUserOperation.maxPriorityFeePerGas
|
|
286
|
-
? estimateFeesPerGas(account.client)
|
|
287
|
-
: undefined
|
|
288
|
-
])
|
|
277
|
+
const [sender, nonce, factory, factoryData, callData] = await Promise.all([
|
|
278
|
+
partialUserOperation.sender || account.address,
|
|
279
|
+
partialUserOperation.nonce || account.getNonce(),
|
|
280
|
+
partialUserOperation.factory || account.getFactory(),
|
|
281
|
+
partialUserOperation.factoryData || account.getFactoryData(),
|
|
282
|
+
partialUserOperation.callData
|
|
283
|
+
])
|
|
289
284
|
|
|
290
285
|
const userOperation: UserOperation<"v0.7"> = {
|
|
291
286
|
sender,
|
|
@@ -298,14 +293,9 @@ async function prepareUserOperationRequestEntryPointV07<
|
|
|
298
293
|
partialUserOperation.verificationGasLimit || BigInt(0),
|
|
299
294
|
preVerificationGas:
|
|
300
295
|
partialUserOperation.preVerificationGas || BigInt(0),
|
|
301
|
-
maxFeePerGas:
|
|
302
|
-
partialUserOperation.maxFeePerGas ||
|
|
303
|
-
gasEstimation?.maxFeePerGas ||
|
|
304
|
-
BigInt(0),
|
|
296
|
+
maxFeePerGas: partialUserOperation.maxFeePerGas || BigInt(0),
|
|
305
297
|
maxPriorityFeePerGas:
|
|
306
|
-
partialUserOperation.maxPriorityFeePerGas ||
|
|
307
|
-
gasEstimation?.maxPriorityFeePerGas ||
|
|
308
|
-
BigInt(0),
|
|
298
|
+
partialUserOperation.maxPriorityFeePerGas || BigInt(0),
|
|
309
299
|
signature: partialUserOperation.signature || "0x"
|
|
310
300
|
}
|
|
311
301
|
|