@pimlico/alto 0.0.0-main.20250616T145517 → 0.0.0-main.20250617T153448
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 +1 -9
- package/esm/cli/setupServer.js.map +1 -1
- package/esm/executor/executor.d.ts +4 -14
- package/esm/executor/executor.js +2 -13
- package/esm/executor/executor.js.map +1 -1
- package/esm/executor/filterOpsAndEstimateGas.d.ts +2 -3
- package/esm/executor/filterOpsAndEstimateGas.js +5 -7
- package/esm/executor/filterOpsAndEstimateGas.js.map +1 -1
- package/package.json +1 -1
package/esm/cli/setupServer.js
CHANGED
|
@@ -42,13 +42,9 @@ const getMempool = ({ config, monitor, reputationManager, validator, metrics, ev
|
|
|
42
42
|
const getEventManager = ({ config, metrics }) => {
|
|
43
43
|
return new EventManager({ config, metrics });
|
|
44
44
|
};
|
|
45
|
-
const getExecutor = ({
|
|
45
|
+
const getExecutor = ({ config, eventManager }) => {
|
|
46
46
|
return new Executor({
|
|
47
|
-
mempool,
|
|
48
47
|
config,
|
|
49
|
-
reputationManager,
|
|
50
|
-
metrics,
|
|
51
|
-
gasPriceManager,
|
|
52
48
|
eventManager
|
|
53
49
|
});
|
|
54
50
|
};
|
|
@@ -138,11 +134,7 @@ export const setupServer = async ({ config, registry, metrics, senderManager, ga
|
|
|
138
134
|
eventManager
|
|
139
135
|
});
|
|
140
136
|
const executor = getExecutor({
|
|
141
|
-
mempool,
|
|
142
137
|
config,
|
|
143
|
-
reputationManager,
|
|
144
|
-
metrics,
|
|
145
|
-
gasPriceManager,
|
|
146
138
|
eventManager
|
|
147
139
|
});
|
|
148
140
|
const executorManager = getExecutorManager({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupServer.js","sourceRoot":"","sources":["../../cli/setupServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAsB,MAAM,gBAAgB,CAAA;AAC9E,OAAO,EAAE,YAAY,EAAwB,MAAM,gBAAgB,CAAA;AACnE,OAAO,EAEH,OAAO,EACP,OAAO,EACP,qBAAqB,EACrB,iBAAiB,EACpB,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAK9E,OAAO,EAAE,wBAAwB,EAAE,MAAM,6CAA6C,CAAA;AACtF,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAA;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAEhE,MAAM,oBAAoB,GAAG,CACzB,MAAkB,EACQ,EAAE;IAC5B,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QAClB,OAAO,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAA;IACxC,CAAC;IACD,OAAO,IAAI,qBAAqB,EAAE,CAAA;AACtC,CAAC,CAAA;AAED,MAAM,YAAY,GAAG,CAAC,EAClB,MAAM,EACN,aAAa,EACb,OAAO,EACP,eAAe,EAMlB,EAAsB,EAAE;IACrB,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QAClB,OAAO,IAAI,aAAa,CAAC;YACrB,MAAM;YACN,aAAa;YACb,OAAO;YACP,eAAe;SAClB,CAAC,CAAA;IACN,CAAC;IACD,OAAO,IAAI,eAAe,CAAC;QACvB,MAAM;QACN,OAAO;QACP,eAAe;KAClB,CAAC,CAAA;AACN,CAAC,CAAA;AAED,MAAM,UAAU,GAAG,CAAC,EAAE,MAAM,EAA0B,EAAW,EAAE;IAC/D,OAAO,IAAI,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;AAClC,CAAC,CAAA;AAED,MAAM,UAAU,GAAG,CAAC,EAChB,MAAM,EACN,OAAO,EACP,iBAAiB,EACjB,SAAS,EACT,OAAO,EACP,YAAY,EAQf,EAAW,EAAE;IACV,OAAO,IAAI,OAAO,CAAC;QACf,MAAM;QACN,OAAO;QACP,KAAK,EAAE,kBAAkB,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;QAC9C,iBAAiB;QACjB,SAAS;QACT,YAAY;KACf,CAAC,CAAA;AACN,CAAC,CAAA;AAED,MAAM,eAAe,GAAG,CAAC,EACrB,MAAM,EACN,OAAO,EAIV,EAAE,EAAE;IACD,OAAO,IAAI,YAAY,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAA;AAChD,CAAC,CAAA;AAED,MAAM,WAAW,GAAG,CAAC,EACjB,
|
|
1
|
+
{"version":3,"file":"setupServer.js","sourceRoot":"","sources":["../../cli/setupServer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import type { EventManager
|
|
2
|
-
import type {
|
|
3
|
-
import type {
|
|
4
|
-
import type { Logger, Metrics } from "../utils/index.js";
|
|
1
|
+
import type { EventManager } from "../handlers/index.js";
|
|
2
|
+
import type { Address, BundleResult, GasPriceParameters, UserOperationBundle, UserOpInfo } from "../types/index.js";
|
|
3
|
+
import type { Logger } from "../utils/index.js";
|
|
5
4
|
import { type Account } from "viem";
|
|
6
5
|
import type { AltoConfig } from "../createConfig.js";
|
|
7
6
|
import type { SignedAuthorizationList } from "viem";
|
|
@@ -32,20 +31,11 @@ type HandleOpsGasParams = {
|
|
|
32
31
|
export declare class Executor {
|
|
33
32
|
config: AltoConfig;
|
|
34
33
|
logger: Logger;
|
|
35
|
-
metrics: Metrics;
|
|
36
|
-
reputationManager: InterfaceReputationManager;
|
|
37
|
-
gasPriceManager: GasPriceManager;
|
|
38
|
-
mempool: Mempool;
|
|
39
34
|
eventManager: EventManager;
|
|
40
|
-
constructor({ config,
|
|
35
|
+
constructor({ config, eventManager }: {
|
|
41
36
|
config: AltoConfig;
|
|
42
|
-
mempool: Mempool;
|
|
43
|
-
reputationManager: InterfaceReputationManager;
|
|
44
|
-
metrics: Metrics;
|
|
45
|
-
gasPriceManager: GasPriceManager;
|
|
46
37
|
eventManager: EventManager;
|
|
47
38
|
});
|
|
48
|
-
cancelOps(_entryPoint: Address, _ops: UserOperation[]): Promise<void>;
|
|
49
39
|
getBundleGasPrice({ bundle, networkGasPrice, networkBaseFee, totalBeneficiaryFees, bundleGasUsed }: {
|
|
50
40
|
bundle: UserOperationBundle;
|
|
51
41
|
networkGasPrice: GasPriceParameters;
|
package/esm/executor/executor.js
CHANGED
|
@@ -6,25 +6,14 @@ import { filterOpsAndEstimateGas } from "./filterOpsAndEstimateGas.js";
|
|
|
6
6
|
export class Executor {
|
|
7
7
|
config;
|
|
8
8
|
logger;
|
|
9
|
-
metrics;
|
|
10
|
-
reputationManager;
|
|
11
|
-
gasPriceManager;
|
|
12
|
-
mempool;
|
|
13
9
|
eventManager;
|
|
14
|
-
constructor({ config,
|
|
10
|
+
constructor({ config, eventManager }) {
|
|
15
11
|
this.config = config;
|
|
16
|
-
this.mempool = mempool;
|
|
17
|
-
this.reputationManager = reputationManager;
|
|
18
12
|
this.logger = config.getLogger({ module: "executor" }, {
|
|
19
13
|
level: config.executorLogLevel || config.logLevel
|
|
20
14
|
});
|
|
21
|
-
this.metrics = metrics;
|
|
22
|
-
this.gasPriceManager = gasPriceManager;
|
|
23
15
|
this.eventManager = eventManager;
|
|
24
16
|
}
|
|
25
|
-
cancelOps(_entryPoint, _ops) {
|
|
26
|
-
throw new Error("Method not implemented.");
|
|
27
|
-
}
|
|
28
17
|
async getBundleGasPrice({ bundle, networkGasPrice, networkBaseFee, totalBeneficiaryFees, bundleGasUsed }) {
|
|
29
18
|
const { bundlerInitialCommission, resubmitMultiplierCeiling, legacyTransactions, chainType, arbitrumGasBidMultiplier } = this.config;
|
|
30
19
|
// Arbtirum's sequencer orders based on first come first serve.
|
|
@@ -180,7 +169,7 @@ export class Executor {
|
|
|
180
169
|
entryPoint
|
|
181
170
|
});
|
|
182
171
|
let filterOpsResult = await filterOpsAndEstimateGas({
|
|
183
|
-
|
|
172
|
+
networkBaseFee,
|
|
184
173
|
userOpBundle,
|
|
185
174
|
config: this.config,
|
|
186
175
|
logger: childLogger
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../executor/executor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../executor/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { RejectedUserOp, UserOpInfo, UserOperationBundle } from "../types/index.js";
|
|
2
2
|
import { AltoConfig } from "../createConfig.js";
|
|
3
3
|
import { Logger } from "../utils/index.js";
|
|
4
|
-
import { GasPriceManager } from "../handlers/gasPriceManager.js";
|
|
5
4
|
export type FilterOpsResult = {
|
|
6
5
|
status: "success";
|
|
7
6
|
userOpsToBundle: UserOpInfo[];
|
|
@@ -16,10 +15,10 @@ export type FilterOpsResult = {
|
|
|
16
15
|
status: "all_ops_rejected";
|
|
17
16
|
rejectedUserOps: RejectedUserOp[];
|
|
18
17
|
};
|
|
19
|
-
export declare function filterOpsAndEstimateGas({ userOpBundle, config, logger,
|
|
18
|
+
export declare function filterOpsAndEstimateGas({ userOpBundle, config, logger, networkBaseFee }: {
|
|
20
19
|
userOpBundle: UserOperationBundle;
|
|
21
20
|
config: AltoConfig;
|
|
22
21
|
logger: Logger;
|
|
23
|
-
|
|
22
|
+
networkBaseFee: bigint;
|
|
24
23
|
}): Promise<FilterOpsResult>;
|
|
25
24
|
//# sourceMappingURL=filterOpsAndEstimateGas.d.ts.map
|
|
@@ -79,8 +79,8 @@ const getBundleGasLimit = async ({ config, userOpBundle, entryPoint, executorAdd
|
|
|
79
79
|
}
|
|
80
80
|
return gasLimit;
|
|
81
81
|
};
|
|
82
|
-
const getFilterOpsResult = async ({ config, userOpBundle,
|
|
83
|
-
let { publicClient, pimlicoSimulationContract,
|
|
82
|
+
const getFilterOpsResult = async ({ config, userOpBundle, networkBaseFee, beneficiary }) => {
|
|
83
|
+
let { publicClient, pimlicoSimulationContract, codeOverrideSupport } = config;
|
|
84
84
|
if (!pimlicoSimulationContract) {
|
|
85
85
|
throw new Error("pimlicoSimulationContract not set");
|
|
86
86
|
}
|
|
@@ -92,9 +92,7 @@ const getFilterOpsResult = async ({ config, userOpBundle, gasPriceManager, benef
|
|
|
92
92
|
simulationOverrides = getFilterOpsStateOverride({
|
|
93
93
|
version,
|
|
94
94
|
entryPoint,
|
|
95
|
-
baseFeePerGas:
|
|
96
|
-
? 0n
|
|
97
|
-
: await gasPriceManager.getBaseFee()
|
|
95
|
+
baseFeePerGas: networkBaseFee
|
|
98
96
|
});
|
|
99
97
|
}
|
|
100
98
|
// Create promises for parallel execution
|
|
@@ -171,7 +169,7 @@ const getFilterOpsResult = async ({ config, userOpBundle, gasPriceManager, benef
|
|
|
171
169
|
return filterOpsResult[0];
|
|
172
170
|
};
|
|
173
171
|
// Attempt to create a handleOps bundle + estimate bundling tx gas.
|
|
174
|
-
export async function filterOpsAndEstimateGas({ userOpBundle, config, logger,
|
|
172
|
+
export async function filterOpsAndEstimateGas({ userOpBundle, config, logger, networkBaseFee }) {
|
|
175
173
|
let { utilityWalletAddress: beneficiary } = config;
|
|
176
174
|
const { userOps, entryPoint } = userOpBundle;
|
|
177
175
|
let filterOpsResult;
|
|
@@ -181,7 +179,7 @@ export async function filterOpsAndEstimateGas({ userOpBundle, config, logger, ga
|
|
|
181
179
|
const filterOpsPromise = getFilterOpsResult({
|
|
182
180
|
userOpBundle,
|
|
183
181
|
config,
|
|
184
|
-
|
|
182
|
+
networkBaseFee,
|
|
185
183
|
beneficiary
|
|
186
184
|
});
|
|
187
185
|
// Start chain-specific overhead calculation in parallel
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filterOpsAndEstimateGas.js","sourceRoot":"","sources":["../../executor/filterOpsAndEstimateGas.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,gBAAgB,EAOnB,MAAM,aAAa,CAAA;AACpB,OAAO,EAGH,WAAW,EACX,SAAS,EACT,oBAAoB,EACpB,kBAAkB,EAElB,mBAAmB,EACtB,MAAM,MAAM,CAAA;AAEb,OAAO,EAEH,oBAAoB,EACpB,oBAAoB,EACpB,qBAAqB,EACxB,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAA;AAC7E,OAAO,KAAK,MAAM,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAA;AAChE,OAAO,EAAE,uBAAuB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"filterOpsAndEstimateGas.js","sourceRoot":"","sources":["../../executor/filterOpsAndEstimateGas.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,gBAAgB,EAOnB,MAAM,aAAa,CAAA;AACpB,OAAO,EAGH,WAAW,EACX,SAAS,EACT,oBAAoB,EACpB,kBAAkB,EAElB,mBAAmB,EACtB,MAAM,MAAM,CAAA;AAEb,OAAO,EAEH,oBAAoB,EACpB,oBAAoB,EACpB,qBAAqB,EACxB,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAA;AAC7E,OAAO,KAAK,MAAM,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAA;AAChE,OAAO,EAAE,uBAAuB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AACxE,OAAO,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAA;AAoBxE,uEAAuE;AACvE,MAAM,wBAAwB,GAAG,KAAK,EAAE,EACpC,MAAM,EACN,UAAU,EACV,OAAO,EAC6D,EAAE,EAAE;IACxE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,GAAG,MAAM,CAAA;IAE1C,QAAQ,SAAS,EAAE,CAAC;QAChB,KAAK,UAAU,CAAC,CAAC,CAAC;YACd,MAAM,IAAI,GAAG,oBAAoB,CAAC;gBAC9B,OAAO;gBACP,UAAU;gBACV,WAAW,EAAE,KAAK;aACrB,CAAC,CAAA;YAEF,MAAM,iBAAiB,GACnB,4CAA4C,CAAA;YAEhD,MAAM,YAAY,GAAG,oBAAoB,CACrC;gBACI,EAAE,EAAE,UAAU;gBACd,OAAO,EAAE,YAAY,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE;gBACrC,KAAK,EAAE,MAAM;gBACb,QAAQ,EAAE,SAAS;gBACnB,QAAQ,EAAE,SAAS;gBACnB,IAAI;aACP,EACD;gBACI,CAAC,EAAE,gEAAgE;gBACnE,CAAC,EAAE,gEAAgE;gBACnE,CAAC,EAAE,GAAG;aACT,CACJ,CAAA;YAED,MAAM,iBAAiB,GAAG,WAAW,CAAC;gBAClC,GAAG,EAAE,gBAAgB;gBACrB,OAAO,EAAE,iBAAiB;gBAC1B,MAAM,EAAE;oBACJ,MAAM,EAAE,YAAY;iBACvB;aACJ,CAAC,CAAA;YAEF,MAAM,EAAE,MAAM,EAAE,GACZ,MAAM,iBAAiB,CAAC,QAAQ,CAAC,sBAAsB,CAAC;gBACpD,UAAU;gBACV,KAAK;gBACL,YAAY;aACf,CAAC,CAAA;YAEN,IAAI,CAAC,gBAAgB,EAAE,AAAD,EAAG,GAAG,MAAM,CAAA;YAElC,OAAO;gBACH,OAAO,EAAE,gBAAgB;gBACzB,yCAAyC;gBACzC,0IAA0I;gBAC1I,QAAQ,EAAE,oBAAoB,CAAC,gBAAgB,EAAE,IAAI,CAAC;aACzD,CAAA;QACL,CAAC;QACD;YACI,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAA;IAC5C,CAAC;AACL,CAAC,CAAA;AAED,MAAM,iBAAiB,GAAG,KAAK,EAAE,EAC7B,MAAM,EACN,YAAY,EACZ,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,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC;gBACjD,WAAW,EAAE,eAAe;aAC/B,CAAC;SACL,CAAC,CAAA;IACN,CAAC;SAAM,CAAC;QACJ,MAAM,YAAY,GAAG,qBAAqB,CAAC;YACvC,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC;YACjD,WAAW,EAAE,eAAe;SAC/B,CAAC,CAAA;QAEF,MAAM,kBAAkB,GAAG,YAAY,CAAC,MAAM,CAC1C,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,CACrC,CAAC,MAAM,CAAA;QACR,MAAM,eAAe,GAAG,MAAM,CAAC,kBAAkB,CAAC,GAAG,MAAO,CAAA;QAE5D,2CAA2C;QAC3C,QAAQ,GAAG,oBAAoB,CAAC,YAAY,GAAG,eAAe,EAAE,IAAI,CAAC,CAAA;IACzE,CAAC;IAED,OAAO,QAAQ,CAAA;AACnB,CAAC,CAAA;AAED,MAAM,kBAAkB,GAAG,KAAK,EAAE,EAC9B,MAAM,EACN,YAAY,EACZ,cAAc,EACd,WAAW,EAMd,EAOE,EAAE;IACD,IAAI,EAAE,YAAY,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,GAChE,MAAM,CAAA;IAEV,IAAI,CAAC,yBAAyB,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAA;IACxD,CAAC;IAED,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,YAAY,CAAA;IAErD,+BAA+B;IAC/B,MAAM,eAAe,GACjB,6BAA6B,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAA;IAEtE,IAAI,mBAA8C,CAAA;IAClD,IAAI,mBAAmB,EAAE,CAAC;QACtB,mBAAmB,GAAG,yBAAyB,CAAC;YAC5C,OAAO;YACP,UAAU;YACV,aAAa,EAAE,cAAc;SAChC,CAAC,CAAA;IACN,CAAC;IAED,yCAAyC;IACzC,IAAI,IAAS,CAAA;IACb,QAAQ,OAAO,EAAE,CAAC;QACd,KAAK,KAAK,CAAC,CAAC,CAAC;YACT,IAAI,GAAG,kBAAkB,CAAC;gBACtB,GAAG,EAAE,qBAAqB;gBAC1B,YAAY,EAAE,aAAa;gBAC3B,IAAI,EAAE;oBACF,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CACvB,qBAAqB,CAAC,MAA0B,CAAC,CACpD;oBACD,WAAW;oBACX,UAAU;iBACb;aACJ,CAAC,CAAA;YACF,MAAK;QACT,CAAC;QACD,KAAK,KAAK,CAAC,CAAC,CAAC;YACT,IAAI,GAAG,kBAAkB,CAAC;gBACtB,GAAG,EAAE,qBAAqB;gBAC1B,YAAY,EAAE,aAAa;gBAC3B,IAAI,EAAE;oBACF,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CACvB,qBAAqB,CAAC,MAA0B,CAAC,CACpD;oBACD,WAAW;oBACX,UAAU;iBACb;aACJ,CAAC,CAAA;YACF,MAAK;QACT,CAAC;QACD,OAAO,CAAC,CAAC,CAAC;YACN,IAAI,GAAG,kBAAkB,CAAC;gBACtB,GAAG,EAAE,qBAAqB;gBAC1B,YAAY,EAAE,aAAa;gBAC3B,IAAI,EAAE;oBACF,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAuB;oBACzD,WAAW;oBACX,UAAU;iBACb;aACJ,CAAC,CAAA;QACN,CAAC;IACL,CAAC;IAED,MAAM,aAAa,GAAG;QAClB,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3C,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC;KACtD,CAAA;IAED,IAAI,MAAW,CAAA;IACf,MAAM,UAAU,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC;QACvC,EAAE,EAAE,yBAAyB;QAC7B,IAAI;QACJ,GAAG,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACzD,CAAC,CAAA;IAEF,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CACX,4DAA4D,CAC/D,CAAA;IACL,CAAC;IACD,MAAM,GAAG,UAAU,CAAC,IAAI,CAAA;IAExB,MAAM,eAAe,GAAG,mBAAmB,CACvC;QACI;YACI,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,OAAO;YACb,UAAU,EAAE;gBACR,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE;gBACpC,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE;gBAC1C;oBACI,IAAI,EAAE,iBAAiB;oBACvB,IAAI,EAAE,SAAS;oBACf,UAAU,EAAE;wBACR,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,SAAS,EAAE;wBACvC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,EAAE;qBAC1C;iBACJ;aACJ;SACJ;KACJ,EACD,MAAM,CACT,CAAA;IAED,OAAO,eAAe,CAAC,CAAC,CAAC,CAAA;AAC7B,CAAC,CAAA;AAED,mEAAmE;AACnE,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,EAC1C,YAAY,EACZ,MAAM,EACN,MAAM,EACN,cAAc,EAMjB;IACG,IAAI,EAAE,oBAAoB,EAAE,WAAW,EAAE,GAAG,MAAM,CAAA;IAClD,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,YAAY,CAAA;IAE5C,IAAI,eAAe,CAAA;IACnB,IAAI,gBAAgB,CAAA;IACpB,IAAI,CAAC;QACD,yCAAyC;QACzC,MAAM,gBAAgB,GAAG,kBAAkB,CAAC;YACxC,YAAY;YACZ,MAAM;YACN,cAAc;YACd,WAAW;SACd,CAAC,CAAA;QAEF,wDAAwD;QACxD,MAAM,4BAA4B,GAAG,wBAAwB,CAAC;YAC1D,MAAM;YACN,UAAU;YACV,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC;SAC/C,CAAC,CAAA;QAEF,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC9B,gBAAgB;YAChB,4BAA4B;SAC/B,CAAC,CAAA;QACF,eAAe,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;QAC5B,gBAAgB,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;QAE7B,sCAAsC;QACtC,MAAM,oBAAoB,GAAG,eAAe,CAAC,eAAe,CAAC,GAAG,CAC5D,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,UAAU,CACjC,CAAA;QACD,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAClC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC,oBAAoB,CAAC,QAAQ,CAAC,UAAU,CAAC,CACjE,CAAA;QACD,MAAM,eAAe,GAAG,eAAe,CAAC,eAAe,CAAC,GAAG,CACvD,CAAC,EAAE,UAAU,EAAE,YAAY,EAAE,EAAE,EAAE;YAC7B,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAC3B,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,KAAK,UAAU,CACvC,CAAA;YAED,IAAI,CAAC,UAAU,EAAE,CAAC;gBACd,MAAM,CAAC,KAAK,CACR,oBAAoB,UAAU,sBAAsB,CACvD,CAAA;gBACD,MAAM,CAAC,gBAAgB,CACnB,oBAAoB,UAAU,sBAAsB,CACvD,CAAA;gBACD,MAAM,IAAI,KAAK,CAAC,oBAAoB,UAAU,YAAY,CAAC,CAAA;YAC/D,CAAC;YAED,OAAO;gBACH,GAAG,UAAU;gBACb,MAAM,EAAE,YAAY;aACvB,CAAA;QACL,CAAC,CACJ,CAAA;QAED,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO;gBACH,MAAM,EAAE,kBAAkB;gBAC1B,eAAe;aAClB,CAAA;QACL,CAAC;QAED,iDAAiD;QACjD,MAAM,aAAa,GACf,eAAe,CAAC,OAAO,GAAG,MAAO,GAAG,gBAAgB,CAAC,OAAO,CAAA;QAEhE,uCAAuC;QACvC,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAAC;YAC3C,MAAM;YACN,YAAY,EAAE,eAAe;YAC7B,UAAU;YACV,eAAe,EAAE,WAAW;SAC/B,CAAC,CAAA;QAEF,OAAO;YACH,MAAM,EAAE,SAAS;YACjB,eAAe;YACf,eAAe;YACf,aAAa;YACb,cAAc,EAAE,cAAc,GAAG,gBAAgB,CAAC,QAAQ;YAC1D,oBAAoB,EAAE,eAAe,CAAC,aAAa;SACtD,CAAA;IACL,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,8CAA8C,CAAC,CAAA;QACrE,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAA;QAC5B,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAC7C,GAAG,MAAM;YACT,MAAM,EAAE,4BAA4B;SACvC,CAAC,CAAC,CAAA;QACH,OAAO;YACH,MAAM,EAAE,iBAAiB;YACzB,eAAe;SAClB,CAAA;IACL,CAAC;AACL,CAAC"}
|
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.20250617T153448",
|
|
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",
|