@pimlico/alto 0.0.0-main.20260121T150514 → 0.0.0-main.20260121T185540
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/esm/cli/setupServer.js +4 -1
- package/esm/cli/setupServer.js.map +1 -1
- package/esm/executor/executor.js +2 -2
- package/esm/executor/executor.js.map +1 -1
- package/esm/executor/utils.d.ts +1 -1
- package/esm/executor/utils.js +5 -3
- package/esm/executor/utils.js.map +1 -1
- package/package.json +1 -1
package/esm/cli/setupServer.js
CHANGED
|
@@ -170,7 +170,10 @@ export const setupServer = async ({ config, registry, metrics, senderManager, ga
|
|
|
170
170
|
gasPriceManager,
|
|
171
171
|
eventManager
|
|
172
172
|
});
|
|
173
|
-
|
|
173
|
+
// we disable flushing for hs because it tries to flush transactions
|
|
174
|
+
// of wallets that are in use by other servers
|
|
175
|
+
if (config.flushStuckTransactionsDuringStartup &&
|
|
176
|
+
!config.enableHorizontalScaling) {
|
|
174
177
|
flushOnStartUp({
|
|
175
178
|
senderManager,
|
|
176
179
|
gasPriceManager,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupServer.js","sourceRoot":"","sources":["../../cli/setupServer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"setupServer.js","sourceRoot":"","sources":["../../cli/setupServer.ts"],"names":[],"mappings":"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"}
|
package/esm/executor/executor.js
CHANGED
|
@@ -2,7 +2,7 @@ import { jsonStringifyWithBigint, maxBigInt, minBigInt, roundUpBigInt, scaleBigI
|
|
|
2
2
|
import * as sentry from "@sentry/node";
|
|
3
3
|
import { BaseError, ContractFunctionExecutionError, FeeCapTooLowError, InsufficientFundsError, IntrinsicGasTooLowError, NonceTooHighError, NonceTooLowError, TransactionExecutionError } from "viem";
|
|
4
4
|
import { filterOpsAndEstimateGas } from "./filterOpsAndEstimateGas.js";
|
|
5
|
-
import { encodeHandleOpsCalldata,
|
|
5
|
+
import { encodeHandleOpsCalldata, getAuthorizationListFromUserOps, getUserOpHashes, isTransactionUnderpricedError } from "./utils.js";
|
|
6
6
|
export class Executor {
|
|
7
7
|
config;
|
|
8
8
|
logger;
|
|
@@ -225,7 +225,7 @@ export class Executor {
|
|
|
225
225
|
let transactionHash;
|
|
226
226
|
try {
|
|
227
227
|
const isLegacyTransaction = this.config.legacyTransactions;
|
|
228
|
-
const authorizationList =
|
|
228
|
+
const authorizationList = getAuthorizationListFromUserOps(userOpsToBundle.map(({ userOp }) => userOp));
|
|
229
229
|
let gasOpts;
|
|
230
230
|
if (isLegacyTransaction) {
|
|
231
231
|
gasOpts = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../executor/executor.ts"],"names":[],"mappings":"AAUA,OAAO,EACH,uBAAuB,EACvB,SAAS,EACT,SAAS,EACT,aAAa,EACb,oBAAoB,EACvB,MAAM,aAAa,CAAA;AACpB,OAAO,KAAK,MAAM,MAAM,cAAc,CAAA;AACtC,OAAO,EAEH,SAAS,EACT,8BAA8B,EAC9B,iBAAiB,EAEjB,sBAAsB,EACtB,uBAAuB,EACvB,iBAAiB,EACjB,gBAAgB,EAGhB,yBAAyB,EAC5B,MAAM,MAAM,CAAA;AAEb,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AACnE,OAAO,EACH,uBAAuB,EACvB,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../executor/executor.ts"],"names":[],"mappings":"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"}
|
package/esm/executor/utils.d.ts
CHANGED
|
@@ -29,7 +29,7 @@ export declare const encodeHandleOpsCalldata: ({ userOps, beneficiary }: {
|
|
|
29
29
|
userOps: UserOperation[];
|
|
30
30
|
beneficiary: Address;
|
|
31
31
|
}) => Hex;
|
|
32
|
-
export declare const
|
|
32
|
+
export declare const getAuthorizationListFromUserOps: (userOps: UserOperation[]) => SignedAuthorizationList | undefined;
|
|
33
33
|
export declare function flushStuckTransaction({ config, wallet, gasPrice, logger }: {
|
|
34
34
|
config: AltoConfig;
|
|
35
35
|
wallet: Account;
|
package/esm/executor/utils.js
CHANGED
|
@@ -8,13 +8,15 @@ export const getBundleGasLimit = async ({ config, userOps, entryPoint, executorA
|
|
|
8
8
|
let gasLimit;
|
|
9
9
|
// On some chains we can't rely on local calculations and have to estimate the gasLimit from RPC
|
|
10
10
|
if (rpcGasEstimate) {
|
|
11
|
+
const authorizationList = getAuthorizationListFromUserOps(userOps);
|
|
11
12
|
gasLimit = await publicClient.estimateGas({
|
|
12
13
|
to: entryPoint,
|
|
13
14
|
account: executorAddress,
|
|
14
15
|
data: encodeHandleOpsCalldata({
|
|
15
16
|
userOps: userOps,
|
|
16
17
|
beneficiary: executorAddress
|
|
17
|
-
})
|
|
18
|
+
}),
|
|
19
|
+
authorizationList
|
|
18
20
|
});
|
|
19
21
|
}
|
|
20
22
|
else {
|
|
@@ -106,10 +108,10 @@ export const encodeHandleOpsCalldata = ({ userOps, beneficiary }) => {
|
|
|
106
108
|
args: [packedUserOps, beneficiary]
|
|
107
109
|
});
|
|
108
110
|
};
|
|
109
|
-
export const
|
|
111
|
+
export const getAuthorizationListFromUserOps = (userOps) => {
|
|
110
112
|
const authMap = new Map();
|
|
111
113
|
// Deduplicate EIP-7702 auths if userOp.sender has multiple same eip7702Auth fields.
|
|
112
|
-
for (const
|
|
114
|
+
for (const userOp of userOps) {
|
|
113
115
|
const { eip7702Auth, sender } = userOp;
|
|
114
116
|
if (eip7702Auth && !authMap.has(sender)) {
|
|
115
117
|
authMap.set(sender, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../executor/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,gBAAgB,EAChB,gBAAgB,EAKnB,MAAM,aAAa,CAAA;AACpB,OAAO,EAEH,WAAW,EACX,WAAW,EACX,oBAAoB,EACpB,cAAc,EACjB,MAAM,aAAa,CAAA;AACpB,OAAO,KAAK,MAAM,MAAM,cAAc,CAAA;AACtC,OAAO,EAMH,kBAAkB,EAClB,OAAO,EACV,MAAM,MAAM,CAAA;AAEb,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAA;AAExD,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EAAE,EACpC,MAAM,EACN,OAAO,EACP,UAAU,EACV,eAAe,EAMlB,EAAmB,EAAE;IAClB,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,MAAM,CAAA;IAE/C,IAAI,QAAgB,CAAA;IAEpB,gGAAgG;IAChG,IAAI,cAAc,EAAE,CAAC;QACjB,QAAQ,GAAG,MAAM,YAAY,CAAC,WAAW,CAAC;YACtC,EAAE,EAAE,UAAU;YACd,OAAO,EAAE,eAAe;YACxB,IAAI,EAAE,uBAAuB,CAAC;gBAC1B,OAAO,EAAE,OAAO;gBAChB,WAAW,EAAE,eAAe;aAC/B,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../executor/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pimlico/alto",
|
|
3
|
-
"version": "0.0.0-main.
|
|
3
|
+
"version": "0.0.0-main.20260121T185540",
|
|
4
4
|
"description": "A performant and modular ERC-4337 Bundler written in Typescript",
|
|
5
5
|
"repository": "https://github.com/pimlicolabs/alto.git",
|
|
6
6
|
"author": "Pimlico",
|