permissionless 0.1.0 → 0.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/_cjs/actions/smartAccount/prepareUserOperationRequest.js +13 -13
- package/_cjs/actions/smartAccount/prepareUserOperationRequest.js.map +1 -1
- package/_esm/actions/smartAccount/prepareUserOperationRequest.js +13 -13
- package/_esm/actions/smartAccount/prepareUserOperationRequest.js.map +1 -1
- package/actions/smartAccount/prepareUserOperationRequest.ts +15 -15
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -129,6 +129,19 @@ async function prepareUserOperationRequestEntryPointV07(client, args, stateOverr
|
|
|
129
129
|
entryPoint: account.entryPoint
|
|
130
130
|
}));
|
|
131
131
|
}
|
|
132
|
+
if (middleware && typeof middleware !== "function" && middleware.gasPrice) {
|
|
133
|
+
const gasPrice = await middleware.gasPrice();
|
|
134
|
+
userOperation.maxFeePerGas = gasPrice.maxFeePerGas;
|
|
135
|
+
userOperation.maxPriorityFeePerGas = gasPrice.maxPriorityFeePerGas;
|
|
136
|
+
}
|
|
137
|
+
if (!userOperation.maxFeePerGas || !userOperation.maxPriorityFeePerGas) {
|
|
138
|
+
const estimateGas = await (0, actions_1.estimateFeesPerGas)(account.client);
|
|
139
|
+
userOperation.maxFeePerGas =
|
|
140
|
+
userOperation.maxFeePerGas || estimateGas.maxFeePerGas;
|
|
141
|
+
userOperation.maxPriorityFeePerGas =
|
|
142
|
+
userOperation.maxPriorityFeePerGas ||
|
|
143
|
+
estimateGas.maxPriorityFeePerGas;
|
|
144
|
+
}
|
|
132
145
|
if (middleware &&
|
|
133
146
|
typeof middleware !== "function" &&
|
|
134
147
|
middleware.sponsorUserOperation) {
|
|
@@ -148,19 +161,6 @@ async function prepareUserOperationRequestEntryPointV07(client, args, stateOverr
|
|
|
148
161
|
sponsorUserOperationData.paymasterPostOpGasLimit;
|
|
149
162
|
userOperation.paymasterData = sponsorUserOperationData.paymasterData;
|
|
150
163
|
}
|
|
151
|
-
if (middleware && typeof middleware !== "function" && middleware.gasPrice) {
|
|
152
|
-
const gasPrice = await middleware.gasPrice();
|
|
153
|
-
userOperation.maxFeePerGas = gasPrice.maxFeePerGas;
|
|
154
|
-
userOperation.maxPriorityFeePerGas = gasPrice.maxPriorityFeePerGas;
|
|
155
|
-
}
|
|
156
|
-
if (!userOperation.maxFeePerGas || !userOperation.maxPriorityFeePerGas) {
|
|
157
|
-
const estimateGas = await (0, actions_1.estimateFeesPerGas)(account.client);
|
|
158
|
-
userOperation.maxFeePerGas =
|
|
159
|
-
userOperation.maxFeePerGas || estimateGas.maxFeePerGas;
|
|
160
|
-
userOperation.maxPriorityFeePerGas =
|
|
161
|
-
userOperation.maxPriorityFeePerGas ||
|
|
162
|
-
estimateGas.maxPriorityFeePerGas;
|
|
163
|
-
}
|
|
164
164
|
if (!userOperation.callGasLimit ||
|
|
165
165
|
!userOperation.verificationGasLimit ||
|
|
166
166
|
!userOperation.preVerificationGas) {
|
|
@@ -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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"}
|
|
@@ -126,6 +126,19 @@ async function prepareUserOperationRequestEntryPointV07(client, args, stateOverr
|
|
|
126
126
|
entryPoint: account.entryPoint
|
|
127
127
|
}));
|
|
128
128
|
}
|
|
129
|
+
if (middleware && typeof middleware !== "function" && middleware.gasPrice) {
|
|
130
|
+
const gasPrice = await middleware.gasPrice();
|
|
131
|
+
userOperation.maxFeePerGas = gasPrice.maxFeePerGas;
|
|
132
|
+
userOperation.maxPriorityFeePerGas = gasPrice.maxPriorityFeePerGas;
|
|
133
|
+
}
|
|
134
|
+
if (!userOperation.maxFeePerGas || !userOperation.maxPriorityFeePerGas) {
|
|
135
|
+
const estimateGas = await estimateFeesPerGas(account.client);
|
|
136
|
+
userOperation.maxFeePerGas =
|
|
137
|
+
userOperation.maxFeePerGas || estimateGas.maxFeePerGas;
|
|
138
|
+
userOperation.maxPriorityFeePerGas =
|
|
139
|
+
userOperation.maxPriorityFeePerGas ||
|
|
140
|
+
estimateGas.maxPriorityFeePerGas;
|
|
141
|
+
}
|
|
129
142
|
if (middleware &&
|
|
130
143
|
typeof middleware !== "function" &&
|
|
131
144
|
middleware.sponsorUserOperation) {
|
|
@@ -145,19 +158,6 @@ async function prepareUserOperationRequestEntryPointV07(client, args, stateOverr
|
|
|
145
158
|
sponsorUserOperationData.paymasterPostOpGasLimit;
|
|
146
159
|
userOperation.paymasterData = sponsorUserOperationData.paymasterData;
|
|
147
160
|
}
|
|
148
|
-
if (middleware && typeof middleware !== "function" && middleware.gasPrice) {
|
|
149
|
-
const gasPrice = await middleware.gasPrice();
|
|
150
|
-
userOperation.maxFeePerGas = gasPrice.maxFeePerGas;
|
|
151
|
-
userOperation.maxPriorityFeePerGas = gasPrice.maxPriorityFeePerGas;
|
|
152
|
-
}
|
|
153
|
-
if (!userOperation.maxFeePerGas || !userOperation.maxPriorityFeePerGas) {
|
|
154
|
-
const estimateGas = await estimateFeesPerGas(account.client);
|
|
155
|
-
userOperation.maxFeePerGas =
|
|
156
|
-
userOperation.maxFeePerGas || estimateGas.maxFeePerGas;
|
|
157
|
-
userOperation.maxPriorityFeePerGas =
|
|
158
|
-
userOperation.maxPriorityFeePerGas ||
|
|
159
|
-
estimateGas.maxPriorityFeePerGas;
|
|
160
|
-
}
|
|
161
161
|
if (!userOperation.callGasLimit ||
|
|
162
162
|
!userOperation.verificationGasLimit ||
|
|
163
163
|
!userOperation.preVerificationGas) {
|
|
@@ -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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"}
|
|
@@ -304,6 +304,21 @@ async function prepareUserOperationRequestEntryPointV07<
|
|
|
304
304
|
})) as PrepareUserOperationRequestReturnType<entryPoint>
|
|
305
305
|
}
|
|
306
306
|
|
|
307
|
+
if (middleware && typeof middleware !== "function" && middleware.gasPrice) {
|
|
308
|
+
const gasPrice = await middleware.gasPrice()
|
|
309
|
+
userOperation.maxFeePerGas = gasPrice.maxFeePerGas
|
|
310
|
+
userOperation.maxPriorityFeePerGas = gasPrice.maxPriorityFeePerGas
|
|
311
|
+
}
|
|
312
|
+
|
|
313
|
+
if (!userOperation.maxFeePerGas || !userOperation.maxPriorityFeePerGas) {
|
|
314
|
+
const estimateGas = await estimateFeesPerGas(account.client)
|
|
315
|
+
userOperation.maxFeePerGas =
|
|
316
|
+
userOperation.maxFeePerGas || estimateGas.maxFeePerGas
|
|
317
|
+
userOperation.maxPriorityFeePerGas =
|
|
318
|
+
userOperation.maxPriorityFeePerGas ||
|
|
319
|
+
estimateGas.maxPriorityFeePerGas
|
|
320
|
+
}
|
|
321
|
+
|
|
307
322
|
if (
|
|
308
323
|
middleware &&
|
|
309
324
|
typeof middleware !== "function" &&
|
|
@@ -340,21 +355,6 @@ async function prepareUserOperationRequestEntryPointV07<
|
|
|
340
355
|
userOperation.paymasterData = sponsorUserOperationData.paymasterData
|
|
341
356
|
}
|
|
342
357
|
|
|
343
|
-
if (middleware && typeof middleware !== "function" && middleware.gasPrice) {
|
|
344
|
-
const gasPrice = await middleware.gasPrice()
|
|
345
|
-
userOperation.maxFeePerGas = gasPrice.maxFeePerGas
|
|
346
|
-
userOperation.maxPriorityFeePerGas = gasPrice.maxPriorityFeePerGas
|
|
347
|
-
}
|
|
348
|
-
|
|
349
|
-
if (!userOperation.maxFeePerGas || !userOperation.maxPriorityFeePerGas) {
|
|
350
|
-
const estimateGas = await estimateFeesPerGas(account.client)
|
|
351
|
-
userOperation.maxFeePerGas =
|
|
352
|
-
userOperation.maxFeePerGas || estimateGas.maxFeePerGas
|
|
353
|
-
userOperation.maxPriorityFeePerGas =
|
|
354
|
-
userOperation.maxPriorityFeePerGas ||
|
|
355
|
-
estimateGas.maxPriorityFeePerGas
|
|
356
|
-
}
|
|
357
|
-
|
|
358
358
|
if (
|
|
359
359
|
!userOperation.callGasLimit ||
|
|
360
360
|
!userOperation.verificationGasLimit ||
|