@pimlico/alto 0.0.0-main.20250307T203608 → 0.0.0-main.20250324T173449
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/alto.js +5 -3
- package/esm/cli/alto.js.map +1 -1
- package/esm/cli/config/bundler.d.ts +87 -36
- package/esm/cli/config/bundler.js +15 -3
- package/esm/cli/config/bundler.js.map +1 -1
- package/esm/cli/config/options.d.ts +2 -1
- package/esm/cli/config/options.js +59 -5
- package/esm/cli/config/options.js.map +1 -1
- package/esm/cli/handler.js +3 -4
- package/esm/cli/handler.js.map +1 -1
- package/esm/cli/setupServer.d.ts +1 -1
- package/esm/cli/setupServer.js +109 -49
- package/esm/cli/setupServer.js.map +1 -1
- package/esm/createConfig.d.ts +1 -0
- package/esm/createConfig.js +1 -0
- package/esm/createConfig.js.map +1 -1
- package/esm/executor/executor.d.ts +3 -3
- package/esm/executor/executor.js +7 -4
- package/esm/executor/executor.js.map +1 -1
- package/esm/executor/executorManager.d.ts +14 -12
- package/esm/executor/executorManager.js +131 -97
- package/esm/executor/executorManager.js.map +1 -1
- package/esm/executor/index.d.ts +1 -1
- package/esm/executor/index.js +1 -1
- package/esm/executor/senderManager/createMemorySenderManager.d.ts +8 -0
- package/esm/executor/senderManager/createMemorySenderManager.js +41 -0
- package/esm/executor/senderManager/createMemorySenderManager.js.map +1 -0
- package/esm/executor/senderManager/createRedisSenderManager.d.ts +8 -0
- package/esm/executor/senderManager/createRedisSenderManager.js +78 -0
- package/esm/executor/senderManager/createRedisSenderManager.js.map +1 -0
- package/esm/executor/senderManager/flushOnStartUp.d.ts +9 -0
- package/esm/executor/senderManager/flushOnStartUp.js +33 -0
- package/esm/executor/senderManager/flushOnStartUp.js.map +1 -0
- package/esm/executor/senderManager/index.d.ts +15 -0
- package/esm/executor/senderManager/index.js +20 -0
- package/esm/executor/senderManager/index.js.map +1 -0
- package/esm/executor/senderManager/validateAndRefill.d.ts +11 -0
- package/esm/executor/senderManager/validateAndRefill.js +111 -0
- package/esm/executor/senderManager/validateAndRefill.js.map +1 -0
- package/esm/executor/utils.d.ts +8 -2
- package/esm/executor/utils.js +12 -3
- package/esm/executor/utils.js.map +1 -1
- package/esm/handlers/arbitrumGasPriceManager.d.ts +7 -4
- package/esm/handlers/arbitrumGasPriceManager.js +19 -13
- package/esm/handlers/arbitrumGasPriceManager.js.map +1 -1
- package/esm/handlers/eventManager.js +5 -4
- package/esm/handlers/eventManager.js.map +1 -1
- package/esm/handlers/gasPriceManager.d.ts +1 -4
- package/esm/handlers/gasPriceManager.js +81 -48
- package/esm/handlers/gasPriceManager.js.map +1 -1
- package/esm/handlers/mantleGasPriceManager.d.ts +6 -3
- package/esm/handlers/mantleGasPriceManager.js +23 -11
- package/esm/handlers/mantleGasPriceManager.js.map +1 -1
- package/esm/handlers/optimismManager.d.ts +5 -2
- package/esm/handlers/optimismManager.js +8 -5
- package/esm/handlers/optimismManager.js.map +1 -1
- package/esm/mempool/index.d.ts +0 -1
- package/esm/mempool/index.js +0 -1
- package/esm/mempool/index.js.map +1 -1
- package/esm/mempool/mempool.d.ts +95 -27
- package/esm/mempool/mempool.js +132 -252
- package/esm/mempool/mempool.js.map +1 -1
- package/esm/mempool/monitoring.d.ts +8 -4
- package/esm/mempool/monitoring.js +72 -9
- package/esm/mempool/monitoring.js.map +1 -1
- package/esm/rpc/estimation/gasEstimationHandler.d.ts +10 -4
- package/esm/rpc/estimation/gasEstimationHandler.js +16 -19
- package/esm/rpc/estimation/gasEstimationHandler.js.map +1 -1
- package/esm/rpc/estimation/gasEstimationsV07.d.ts +7 -0
- package/esm/rpc/estimation/gasEstimationsV07.js +69 -4
- package/esm/rpc/estimation/gasEstimationsV07.js.map +1 -1
- package/esm/rpc/methods/debug_bundler_clearReputation.js.map +1 -1
- package/esm/rpc/methods/debug_bundler_dumpMempool.js +2 -2
- package/esm/rpc/methods/debug_bundler_dumpMempool.js.map +1 -1
- package/esm/rpc/methods/debug_bundler_setBundlingMode.js.map +1 -1
- package/esm/rpc/methods/eth_chainId.js +1 -1
- package/esm/rpc/methods/eth_chainId.js.map +1 -1
- package/esm/rpc/methods/eth_sendUserOperation.js +2 -2
- package/esm/rpc/methods/eth_sendUserOperation.js.map +1 -1
- package/esm/rpc/methods/index.js +0 -5
- package/esm/rpc/methods/index.js.map +1 -1
- package/esm/rpc/methods/pimlico_sendUserOperationNow.js +2 -3
- package/esm/rpc/methods/pimlico_sendUserOperationNow.js.map +1 -1
- package/esm/rpc/rpcHandler.d.ts +4 -7
- package/esm/rpc/rpcHandler.js +37 -37
- package/esm/rpc/rpcHandler.js.map +1 -1
- package/esm/rpc/validation/SafeValidator.js +2 -2
- package/esm/rpc/validation/SafeValidator.js.map +1 -1
- package/esm/rpc/validation/UnsafeValidator.d.ts +7 -2
- package/esm/rpc/validation/UnsafeValidator.js +20 -4
- package/esm/rpc/validation/UnsafeValidator.js.map +1 -1
- package/esm/store/createMemoryOutstandingStore.d.ts +28 -0
- package/esm/store/createMemoryOutstandingStore.js +221 -0
- package/esm/store/createMemoryOutstandingStore.js.map +1 -0
- package/esm/store/createMempoolStore.d.ts +8 -0
- package/esm/store/createMempoolStore.js +193 -0
- package/esm/store/createMempoolStore.js.map +1 -0
- package/esm/store/createRedisOutstandingStore.d.ts +27 -0
- package/esm/store/createRedisOutstandingStore.js +344 -0
- package/esm/store/createRedisOutstandingStore.js.map +1 -0
- package/esm/store/createRedisStore.d.ts +9 -0
- package/esm/store/createRedisStore.js +131 -0
- package/esm/store/createRedisStore.js.map +1 -0
- package/esm/store/createStore.d.ts +6 -0
- package/esm/store/createStore.js +66 -0
- package/esm/store/createStore.js.map +1 -0
- package/esm/store/index.d.ts +81 -0
- package/esm/store/index.js +2 -0
- package/esm/store/index.js.map +1 -0
- package/esm/types/interfaces.d.ts +7 -3
- package/esm/types/mempool.d.ts +2 -15
- package/esm/types/mempool.js.map +1 -1
- package/esm/types/schemas.d.ts +4617 -7632
- package/esm/types/schemas.js +19 -42
- package/esm/types/schemas.js.map +1 -1
- package/esm/utils/minMaxQueue/createMemoryMinMaxQueue.d.ts +6 -0
- package/esm/utils/minMaxQueue/createMemoryMinMaxQueue.js +53 -0
- package/esm/utils/minMaxQueue/createMemoryMinMaxQueue.js.map +1 -0
- package/esm/utils/minMaxQueue/createRedisMinMaxQueue.d.ts +7 -0
- package/esm/utils/minMaxQueue/createRedisMinMaxQueue.js +98 -0
- package/esm/utils/minMaxQueue/createRedisMinMaxQueue.js.map +1 -0
- package/esm/utils/minMaxQueue/index.d.ts +12 -0
- package/esm/utils/minMaxQueue/index.js +12 -0
- package/esm/utils/minMaxQueue/index.js.map +1 -0
- package/esm/utils/validation.js +8 -10
- package/esm/utils/validation.js.map +1 -1
- package/lib/cli/alto.js +3 -1
- package/lib/cli/alto.js.map +1 -1
- package/lib/cli/config/bundler.d.ts +87 -36
- package/lib/cli/config/bundler.js +16 -4
- package/lib/cli/config/bundler.js.map +1 -1
- package/lib/cli/config/options.d.ts +2 -1
- package/lib/cli/config/options.js +60 -6
- package/lib/cli/config/options.js.map +1 -1
- package/lib/cli/handler.js +3 -4
- package/lib/cli/handler.js.map +1 -1
- package/lib/cli/setupServer.d.ts +1 -1
- package/lib/cli/setupServer.js +108 -48
- package/lib/cli/setupServer.js.map +1 -1
- package/lib/createConfig.d.ts +1 -0
- package/lib/createConfig.js +1 -0
- package/lib/createConfig.js.map +1 -1
- package/lib/executor/executor.d.ts +3 -3
- package/lib/executor/executor.js +7 -4
- package/lib/executor/executor.js.map +1 -1
- package/lib/executor/executorManager.d.ts +14 -12
- package/lib/executor/executorManager.js +131 -97
- package/lib/executor/executorManager.js.map +1 -1
- package/lib/executor/index.d.ts +1 -1
- package/lib/executor/index.js +1 -1
- package/lib/executor/senderManager/createMemorySenderManager.d.ts +8 -0
- package/lib/executor/senderManager/createMemorySenderManager.js +45 -0
- package/lib/executor/senderManager/createMemorySenderManager.js.map +1 -0
- package/lib/executor/senderManager/createRedisSenderManager.d.ts +8 -0
- package/lib/executor/senderManager/createRedisSenderManager.js +85 -0
- package/lib/executor/senderManager/createRedisSenderManager.js.map +1 -0
- package/lib/executor/senderManager/flushOnStartUp.d.ts +9 -0
- package/lib/executor/senderManager/flushOnStartUp.js +37 -0
- package/lib/executor/senderManager/flushOnStartUp.js.map +1 -0
- package/lib/executor/senderManager/index.d.ts +15 -0
- package/lib/executor/senderManager/index.js +25 -0
- package/lib/executor/senderManager/index.js.map +1 -0
- package/lib/executor/senderManager/validateAndRefill.d.ts +11 -0
- package/lib/executor/senderManager/validateAndRefill.js +115 -0
- package/lib/executor/senderManager/validateAndRefill.js.map +1 -0
- package/lib/executor/utils.d.ts +8 -2
- package/lib/executor/utils.js +12 -3
- package/lib/executor/utils.js.map +1 -1
- package/lib/handlers/arbitrumGasPriceManager.d.ts +7 -4
- package/lib/handlers/arbitrumGasPriceManager.js +19 -13
- package/lib/handlers/arbitrumGasPriceManager.js.map +1 -1
- package/lib/handlers/eventManager.js +5 -4
- package/lib/handlers/eventManager.js.map +1 -1
- package/lib/handlers/gasPriceManager.d.ts +1 -4
- package/lib/handlers/gasPriceManager.js +81 -48
- package/lib/handlers/gasPriceManager.js.map +1 -1
- package/lib/handlers/mantleGasPriceManager.d.ts +6 -3
- package/lib/handlers/mantleGasPriceManager.js +23 -11
- package/lib/handlers/mantleGasPriceManager.js.map +1 -1
- package/lib/handlers/optimismManager.d.ts +5 -2
- package/lib/handlers/optimismManager.js +8 -5
- package/lib/handlers/optimismManager.js.map +1 -1
- package/lib/mempool/index.d.ts +0 -1
- package/lib/mempool/index.js +0 -1
- package/lib/mempool/index.js.map +1 -1
- package/lib/mempool/mempool.d.ts +95 -27
- package/lib/mempool/mempool.js +133 -253
- package/lib/mempool/mempool.js.map +1 -1
- package/lib/mempool/monitoring.d.ts +8 -4
- package/lib/mempool/monitoring.js +72 -9
- package/lib/mempool/monitoring.js.map +1 -1
- package/lib/rpc/estimation/gasEstimationHandler.d.ts +10 -4
- package/lib/rpc/estimation/gasEstimationHandler.js +15 -18
- package/lib/rpc/estimation/gasEstimationHandler.js.map +1 -1
- package/lib/rpc/estimation/gasEstimationsV07.d.ts +7 -0
- package/lib/rpc/estimation/gasEstimationsV07.js +69 -4
- package/lib/rpc/estimation/gasEstimationsV07.js.map +1 -1
- package/lib/rpc/methods/debug_bundler_clearReputation.js.map +1 -1
- package/lib/rpc/methods/debug_bundler_dumpMempool.js +2 -2
- package/lib/rpc/methods/debug_bundler_dumpMempool.js.map +1 -1
- package/lib/rpc/methods/debug_bundler_setBundlingMode.js.map +1 -1
- package/lib/rpc/methods/eth_chainId.js +1 -1
- package/lib/rpc/methods/eth_chainId.js.map +1 -1
- package/lib/rpc/methods/eth_sendUserOperation.js +2 -2
- package/lib/rpc/methods/eth_sendUserOperation.js.map +1 -1
- package/lib/rpc/methods/index.js +0 -5
- package/lib/rpc/methods/index.js.map +1 -1
- package/lib/rpc/methods/pimlico_sendUserOperationNow.js +2 -3
- package/lib/rpc/methods/pimlico_sendUserOperationNow.js.map +1 -1
- package/lib/rpc/rpcHandler.d.ts +4 -7
- package/lib/rpc/rpcHandler.js +37 -37
- package/lib/rpc/rpcHandler.js.map +1 -1
- package/lib/rpc/validation/SafeValidator.js +2 -2
- package/lib/rpc/validation/SafeValidator.js.map +1 -1
- package/lib/rpc/validation/UnsafeValidator.d.ts +7 -2
- package/lib/rpc/validation/UnsafeValidator.js +20 -4
- package/lib/rpc/validation/UnsafeValidator.js.map +1 -1
- package/lib/store/createMemoryOutstandingStore.d.ts +28 -0
- package/lib/store/createMemoryOutstandingStore.js +226 -0
- package/lib/store/createMemoryOutstandingStore.js.map +1 -0
- package/lib/store/createMempoolStore.d.ts +8 -0
- package/lib/store/createMempoolStore.js +197 -0
- package/lib/store/createMempoolStore.js.map +1 -0
- package/lib/store/createRedisOutstandingStore.d.ts +27 -0
- package/lib/store/createRedisOutstandingStore.js +349 -0
- package/lib/store/createRedisOutstandingStore.js.map +1 -0
- package/lib/store/createRedisStore.d.ts +9 -0
- package/lib/store/createRedisStore.js +138 -0
- package/lib/store/createRedisStore.js.map +1 -0
- package/lib/store/createStore.d.ts +6 -0
- package/lib/store/createStore.js +70 -0
- package/lib/store/createStore.js.map +1 -0
- package/lib/store/index.d.ts +81 -0
- package/lib/store/index.js +6 -0
- package/lib/store/index.js.map +1 -0
- package/lib/types/interfaces.d.ts +7 -3
- package/lib/types/mempool.d.ts +2 -15
- package/lib/types/mempool.js.map +1 -1
- package/lib/types/schemas.d.ts +4617 -7632
- package/lib/types/schemas.js +24 -47
- package/lib/types/schemas.js.map +1 -1
- package/lib/utils/minMaxQueue/createMemoryMinMaxQueue.d.ts +6 -0
- package/lib/utils/minMaxQueue/createMemoryMinMaxQueue.js +57 -0
- package/lib/utils/minMaxQueue/createMemoryMinMaxQueue.js.map +1 -0
- package/lib/utils/minMaxQueue/createRedisMinMaxQueue.d.ts +7 -0
- package/lib/utils/minMaxQueue/createRedisMinMaxQueue.js +105 -0
- package/lib/utils/minMaxQueue/createRedisMinMaxQueue.js.map +1 -0
- package/lib/utils/minMaxQueue/index.d.ts +12 -0
- package/lib/utils/minMaxQueue/index.js +16 -0
- package/lib/utils/minMaxQueue/index.js.map +1 -0
- package/lib/utils/validation.js +8 -10
- package/lib/utils/validation.js.map +1 -1
- package/package.json +2 -2
- package/esm/executor/senderManager.d.ts +0 -26
- package/esm/executor/senderManager.js +0 -216
- package/esm/executor/senderManager.js.map +0 -1
- package/esm/mempool/nonceQueuer.d.ts +0 -32
- package/esm/mempool/nonceQueuer.js +0 -143
- package/esm/mempool/nonceQueuer.js.map +0 -1
- package/esm/mempool/store.d.ts +0 -22
- package/esm/mempool/store.js +0 -124
- package/esm/mempool/store.js.map +0 -1
- package/esm/rpc/methods/pimlico_experimental_estimateUserOperationGas7702.d.ts +0 -979
- package/esm/rpc/methods/pimlico_experimental_estimateUserOperationGas7702.js +0 -22
- package/esm/rpc/methods/pimlico_experimental_estimateUserOperationGas7702.js.map +0 -1
- package/esm/rpc/methods/pimlico_experimental_sendUserOperation7702.d.ts +0 -422
- package/esm/rpc/methods/pimlico_experimental_sendUserOperation7702.js +0 -19
- package/esm/rpc/methods/pimlico_experimental_sendUserOperation7702.js.map +0 -1
- package/esm/utils/slidingWindowTimedQueue.d.ts +0 -12
- package/esm/utils/slidingWindowTimedQueue.js +0 -48
- package/esm/utils/slidingWindowTimedQueue.js.map +0 -1
- package/lib/executor/senderManager.d.ts +0 -26
- package/lib/executor/senderManager.js +0 -220
- package/lib/executor/senderManager.js.map +0 -1
- package/lib/mempool/nonceQueuer.d.ts +0 -32
- package/lib/mempool/nonceQueuer.js +0 -147
- package/lib/mempool/nonceQueuer.js.map +0 -1
- package/lib/mempool/store.d.ts +0 -22
- package/lib/mempool/store.js +0 -128
- package/lib/mempool/store.js.map +0 -1
- package/lib/rpc/methods/pimlico_experimental_estimateUserOperationGas7702.d.ts +0 -979
- package/lib/rpc/methods/pimlico_experimental_estimateUserOperationGas7702.js +0 -25
- package/lib/rpc/methods/pimlico_experimental_estimateUserOperationGas7702.js.map +0 -1
- package/lib/rpc/methods/pimlico_experimental_sendUserOperation7702.d.ts +0 -422
- package/lib/rpc/methods/pimlico_experimental_sendUserOperation7702.js +0 -22
- package/lib/rpc/methods/pimlico_experimental_sendUserOperation7702.js.map +0 -1
- package/lib/utils/slidingWindowTimedQueue.d.ts +0 -12
- package/lib/utils/slidingWindowTimedQueue.js +0 -52
- package/lib/utils/slidingWindowTimedQueue.js.map +0 -1
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
import { getAvailableWallets } from "./index.js";
|
|
2
|
+
import Redis from "ioredis";
|
|
3
|
+
async function createRedisQueue({ redis, name, entries }) {
|
|
4
|
+
const hasElements = await redis.llen(name);
|
|
5
|
+
// Ensure queue is populated on startup
|
|
6
|
+
// Avoids race case where queue is populated twice due to multi (atomic txs)
|
|
7
|
+
if (hasElements === 0) {
|
|
8
|
+
const multi = redis.multi();
|
|
9
|
+
multi.del(name);
|
|
10
|
+
multi.rpush(name, ...entries);
|
|
11
|
+
await multi.exec();
|
|
12
|
+
}
|
|
13
|
+
return {
|
|
14
|
+
llen: () => redis.llen(name),
|
|
15
|
+
pop: () => redis.rpop(name),
|
|
16
|
+
push: (entry) => redis.lpush(name, entry)
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
const delay = async (delay) => {
|
|
20
|
+
await new Promise((resolve) => setTimeout(resolve, delay));
|
|
21
|
+
};
|
|
22
|
+
export const createRedisSenderManager = async ({ config, metrics }) => {
|
|
23
|
+
if (!config.redisSenderManagerUrl) {
|
|
24
|
+
throw new Error("redisSenderManagerUrl is required");
|
|
25
|
+
}
|
|
26
|
+
const wallets = getAvailableWallets(config);
|
|
27
|
+
metrics.walletsTotal.set(wallets.length);
|
|
28
|
+
metrics.walletsAvailable.set(wallets.length);
|
|
29
|
+
const logger = config.getLogger({ module: "redis-sender-manager" }, {
|
|
30
|
+
level: config.executorLogLevel || config.logLevel
|
|
31
|
+
});
|
|
32
|
+
const redis = new Redis(config.redisSenderManagerUrl);
|
|
33
|
+
const redisQueueName = `${config.chainId}:${config.redisSenderManagerQueueName}`;
|
|
34
|
+
const redisQueue = await createRedisQueue({
|
|
35
|
+
redis,
|
|
36
|
+
name: redisQueueName,
|
|
37
|
+
entries: wallets.map((w) => w.address)
|
|
38
|
+
});
|
|
39
|
+
// Track active wallets for this instance
|
|
40
|
+
const activeWallets = new Set();
|
|
41
|
+
logger.info(`Created redis sender manager with queueName: ${redisQueueName}`);
|
|
42
|
+
return {
|
|
43
|
+
getAllWallets: () => [...wallets],
|
|
44
|
+
getWallet: async () => {
|
|
45
|
+
logger.trace("waiting for wallet ");
|
|
46
|
+
let walletAddress = null;
|
|
47
|
+
while (!walletAddress) {
|
|
48
|
+
walletAddress = await redisQueue.pop();
|
|
49
|
+
await delay(100);
|
|
50
|
+
}
|
|
51
|
+
const wallet = wallets.find((w) => w.address === walletAddress);
|
|
52
|
+
// should never happen
|
|
53
|
+
if (!wallet) {
|
|
54
|
+
throw new Error("wallet not found");
|
|
55
|
+
}
|
|
56
|
+
activeWallets.add(wallet);
|
|
57
|
+
logger.trace({ executor: wallet.address }, "got wallet from sender manager");
|
|
58
|
+
await redisQueue.llen().then((len) => {
|
|
59
|
+
metrics.walletsAvailable.set(len);
|
|
60
|
+
});
|
|
61
|
+
return wallet;
|
|
62
|
+
},
|
|
63
|
+
markWalletProcessed: async (wallet) => {
|
|
64
|
+
if (activeWallets.delete(wallet)) {
|
|
65
|
+
await redisQueue.push(wallet.address);
|
|
66
|
+
const len = await redisQueue.llen();
|
|
67
|
+
metrics.walletsAvailable.set(len);
|
|
68
|
+
}
|
|
69
|
+
else {
|
|
70
|
+
logger.warn({ executor: wallet.address }, "Attempted to mark a wallet as processed that wasn't active");
|
|
71
|
+
}
|
|
72
|
+
},
|
|
73
|
+
getActiveWallets: () => {
|
|
74
|
+
return [...activeWallets];
|
|
75
|
+
}
|
|
76
|
+
};
|
|
77
|
+
};
|
|
78
|
+
//# sourceMappingURL=createRedisSenderManager.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"createRedisSenderManager.js","sourceRoot":"","sources":["../../../executor/senderManager/createRedisSenderManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { SenderManager } from "./index.js";
|
|
2
|
+
import { AltoConfig } from "../../createConfig.js";
|
|
3
|
+
import { GasPriceManager } from "../../handlers/gasPriceManager.js";
|
|
4
|
+
export declare const flushOnStartUp: ({ senderManager, gasPriceManager, config }: {
|
|
5
|
+
senderManager: SenderManager;
|
|
6
|
+
config: AltoConfig;
|
|
7
|
+
gasPriceManager: GasPriceManager;
|
|
8
|
+
}) => Promise<void>;
|
|
9
|
+
//# sourceMappingURL=flushOnStartUp.d.ts.map
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { flushStuckTransaction } from "../utils.js";
|
|
2
|
+
export const flushOnStartUp = async ({ senderManager, gasPriceManager, config }) => {
|
|
3
|
+
const logger = config.getLogger({ module: "flush-on-start-up" }, { level: config.logLevel });
|
|
4
|
+
const allWallets = new Set(senderManager.getAllWallets());
|
|
5
|
+
const utilityWallet = config.utilityPrivateKey;
|
|
6
|
+
if (utilityWallet) {
|
|
7
|
+
allWallets.add(utilityWallet);
|
|
8
|
+
}
|
|
9
|
+
const wallets = Array.from(allWallets);
|
|
10
|
+
let gasPrice;
|
|
11
|
+
try {
|
|
12
|
+
gasPrice = await gasPriceManager.tryGetNetworkGasPrice();
|
|
13
|
+
}
|
|
14
|
+
catch (e) {
|
|
15
|
+
logger.error({ error: e }, "error flushing stuck transaction");
|
|
16
|
+
return;
|
|
17
|
+
}
|
|
18
|
+
const promises = wallets.map(async (wallet) => {
|
|
19
|
+
try {
|
|
20
|
+
await flushStuckTransaction({
|
|
21
|
+
config,
|
|
22
|
+
wallet,
|
|
23
|
+
gasPrice: gasPrice.maxFeePerGas * 5n,
|
|
24
|
+
logger
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
catch (e) {
|
|
28
|
+
logger.error({ error: e }, "error flushing stuck transaction");
|
|
29
|
+
}
|
|
30
|
+
});
|
|
31
|
+
await Promise.all(promises);
|
|
32
|
+
};
|
|
33
|
+
//# sourceMappingURL=flushOnStartUp.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"flushOnStartUp.js","sourceRoot":"","sources":["../../../executor/senderManager/flushOnStartUp.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAA;AAEhD,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAAE,EACjC,aAAa,EACb,eAAe,EACf,MAAM,EAKT,EAAE,EAAE;IACD,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAC3B,EAAE,MAAM,EAAE,mBAAmB,EAAE,EAC/B,EAAE,KAAK,EAAE,MAAM,CAAC,QAAQ,EAAE,CAC7B,CAAA;IAED,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,aAAa,EAAE,CAAC,CAAA;IAEzD,MAAM,aAAa,GAAG,MAAM,CAAC,iBAAiB,CAAA;IAC9C,IAAI,aAAa,EAAE,CAAC;QAChB,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;IACjC,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IAEtC,IAAI,QAGH,CAAA;IAED,IAAI,CAAC;QACD,QAAQ,GAAG,MAAM,eAAe,CAAC,qBAAqB,EAAE,CAAA;IAC5D,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,kCAAkC,CAAC,CAAA;QAC9D,OAAM;IACV,CAAC;IAED,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QAC1C,IAAI,CAAC;YACD,MAAM,qBAAqB,CAAC;gBACxB,MAAM;gBACN,MAAM;gBACN,QAAQ,EAAE,QAAQ,CAAC,YAAY,GAAG,EAAE;gBACpC,MAAM;aACT,CAAC,CAAA;QACN,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,kCAAkC,CAAC,CAAA;QAClE,CAAC;IACL,CAAC,CAAC,CAAA;IAEF,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;AAC/B,CAAC,CAAA"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { Account } from "viem";
|
|
2
|
+
import { AltoConfig } from "../../createConfig.js";
|
|
3
|
+
import { Metrics } from "../../utils/index.js";
|
|
4
|
+
export declare const getAvailableWallets: (config: AltoConfig) => Account[];
|
|
5
|
+
export type SenderManager = {
|
|
6
|
+
getAllWallets: () => Account[];
|
|
7
|
+
getWallet: () => Promise<Account>;
|
|
8
|
+
markWalletProcessed: (wallet: Account) => Promise<void>;
|
|
9
|
+
getActiveWallets: () => Account[];
|
|
10
|
+
};
|
|
11
|
+
export declare const getSenderManager: ({ config, metrics }: {
|
|
12
|
+
config: AltoConfig;
|
|
13
|
+
metrics: Metrics;
|
|
14
|
+
}) => Promise<SenderManager>;
|
|
15
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { createMemorySenderManager } from "./createMemorySenderManager.js";
|
|
2
|
+
import { createRedisSenderManager } from "./createRedisSenderManager.js";
|
|
3
|
+
export const getAvailableWallets = (config) => {
|
|
4
|
+
let availableWallets = [];
|
|
5
|
+
if (config.maxExecutors !== undefined &&
|
|
6
|
+
config.executorPrivateKeys.length > config.maxExecutors) {
|
|
7
|
+
availableWallets = config.executorPrivateKeys.slice(0, config.maxExecutors);
|
|
8
|
+
}
|
|
9
|
+
else {
|
|
10
|
+
availableWallets = config.executorPrivateKeys;
|
|
11
|
+
}
|
|
12
|
+
return availableWallets;
|
|
13
|
+
};
|
|
14
|
+
export const getSenderManager = async ({ config, metrics }) => {
|
|
15
|
+
if (config.redisSenderManagerUrl) {
|
|
16
|
+
return await createRedisSenderManager({ config, metrics });
|
|
17
|
+
}
|
|
18
|
+
return createMemorySenderManager({ config, metrics });
|
|
19
|
+
};
|
|
20
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../executor/senderManager/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAA;AAEvE,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAA;AAErE,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,MAAkB,EAAE,EAAE;IACtD,IAAI,gBAAgB,GAAc,EAAE,CAAA;IAEpC,IACI,MAAM,CAAC,YAAY,KAAK,SAAS;QACjC,MAAM,CAAC,mBAAmB,CAAC,MAAM,GAAG,MAAM,CAAC,YAAY,EACzD,CAAC;QACC,gBAAgB,GAAG,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAC/C,CAAC,EACD,MAAM,CAAC,YAAY,CACtB,CAAA;IACL,CAAC;SAAM,CAAC;QACJ,gBAAgB,GAAG,MAAM,CAAC,mBAAmB,CAAA;IACjD,CAAC;IAED,OAAO,gBAAgB,CAAA;AAC3B,CAAC,CAAA;AASD,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EAAE,EACnC,MAAM,EACN,OAAO,EACgC,EAA0B,EAAE;IACnE,IAAI,MAAM,CAAC,qBAAqB,EAAE,CAAC;QAC/B,OAAO,MAAM,wBAAwB,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAA;IAC9D,CAAC;IAED,OAAO,yBAAyB,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAA;AACzD,CAAC,CAAA"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { AltoConfig } from "../../createConfig.js";
|
|
2
|
+
import { Metrics } from "../../utils/index.js";
|
|
3
|
+
import { GasPriceManager } from "../../handlers/gasPriceManager.js";
|
|
4
|
+
import { SenderManager } from "./index.js";
|
|
5
|
+
export declare const validateAndRefillWallets: ({ metrics, config, senderManager, gasPriceManager }: {
|
|
6
|
+
config: AltoConfig;
|
|
7
|
+
senderManager: SenderManager;
|
|
8
|
+
metrics: Metrics;
|
|
9
|
+
gasPriceManager: GasPriceManager;
|
|
10
|
+
}) => Promise<void>;
|
|
11
|
+
//# sourceMappingURL=validateAndRefill.d.ts.map
|
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
import { formatEther, getContract } from "viem";
|
|
2
|
+
import { CallEngineAbi } from "../../types/index.js";
|
|
3
|
+
// biome-ignore lint/complexity/noExcessiveCognitiveComplexity: <explanation>
|
|
4
|
+
export const validateAndRefillWallets = async ({ metrics, config, senderManager, gasPriceManager }) => {
|
|
5
|
+
const logger = config.getLogger({ module: "validate-and-refill-wallets" }, { level: config.logLevel });
|
|
6
|
+
const minBalance = config.minExecutorBalance;
|
|
7
|
+
const utilityAccount = config.utilityPrivateKey;
|
|
8
|
+
if (!(minBalance && utilityAccount)) {
|
|
9
|
+
return;
|
|
10
|
+
}
|
|
11
|
+
const utilityWalletBalance = await config.publicClient.getBalance({
|
|
12
|
+
address: utilityAccount.address
|
|
13
|
+
});
|
|
14
|
+
const balancesMissing = {};
|
|
15
|
+
const allWallets = senderManager.getAllWallets();
|
|
16
|
+
const balanceRequestPromises = allWallets.map(async (wallet) => {
|
|
17
|
+
const balance = await config.publicClient.getBalance({
|
|
18
|
+
address: wallet.address
|
|
19
|
+
});
|
|
20
|
+
metrics.executorWalletsBalances.set({
|
|
21
|
+
wallet: wallet.address
|
|
22
|
+
}, Number.parseFloat(formatEther(balance)));
|
|
23
|
+
if (balance < minBalance) {
|
|
24
|
+
const missingBalance = (minBalance * 6n) / 5n - balance;
|
|
25
|
+
balancesMissing[wallet.address] = missingBalance;
|
|
26
|
+
}
|
|
27
|
+
});
|
|
28
|
+
await Promise.all(balanceRequestPromises);
|
|
29
|
+
const totalBalanceMissing = Object.values(balancesMissing).reduce((a, b) => a + b, 0n);
|
|
30
|
+
if (utilityWalletBalance < (totalBalanceMissing * 11n) / 10n) {
|
|
31
|
+
logger.info({ balancesMissing, totalBalanceMissing }, "balances missing");
|
|
32
|
+
metrics.utilityWalletInsufficientBalance.set(1);
|
|
33
|
+
logger.error({
|
|
34
|
+
minBalance: formatEther(minBalance),
|
|
35
|
+
utilityWalletBalance: formatEther(utilityWalletBalance),
|
|
36
|
+
totalBalanceMissing: formatEther(totalBalanceMissing),
|
|
37
|
+
minRefillAmount: formatEther(totalBalanceMissing - utilityWalletBalance),
|
|
38
|
+
utilityAccount: utilityAccount.address
|
|
39
|
+
}, "utility wallet has insufficient balance to refill wallets");
|
|
40
|
+
return;
|
|
41
|
+
}
|
|
42
|
+
metrics.utilityWalletInsufficientBalance.set(0);
|
|
43
|
+
if (Object.keys(balancesMissing).length > 0) {
|
|
44
|
+
let maxFeePerGas;
|
|
45
|
+
let maxPriorityFeePerGas;
|
|
46
|
+
try {
|
|
47
|
+
const gasPriceParameters = await gasPriceManager.tryGetNetworkGasPrice();
|
|
48
|
+
maxFeePerGas = gasPriceParameters.maxFeePerGas;
|
|
49
|
+
maxPriorityFeePerGas = gasPriceParameters.maxPriorityFeePerGas;
|
|
50
|
+
}
|
|
51
|
+
catch (e) {
|
|
52
|
+
logger.error(e, "No gas price available");
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
if (config.refillHelperContract) {
|
|
56
|
+
const instructions = [];
|
|
57
|
+
for (const [address, missingBalance] of Object.entries(balancesMissing)) {
|
|
58
|
+
instructions.push({
|
|
59
|
+
to: address,
|
|
60
|
+
value: missingBalance,
|
|
61
|
+
data: "0x"
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
const callEngine = getContract({
|
|
65
|
+
abi: CallEngineAbi,
|
|
66
|
+
address: config.refillHelperContract,
|
|
67
|
+
client: {
|
|
68
|
+
public: config.publicClient,
|
|
69
|
+
wallet: config.walletClient
|
|
70
|
+
}
|
|
71
|
+
});
|
|
72
|
+
const tx = await callEngine.write.execute([instructions], {
|
|
73
|
+
account: utilityAccount,
|
|
74
|
+
value: totalBalanceMissing,
|
|
75
|
+
maxFeePerGas: maxFeePerGas * 2n,
|
|
76
|
+
maxPriorityFeePerGas: maxPriorityFeePerGas * 2n
|
|
77
|
+
});
|
|
78
|
+
await config.publicClient.waitForTransactionReceipt({ hash: tx });
|
|
79
|
+
for (const [address, missingBalance] of Object.entries(balancesMissing)) {
|
|
80
|
+
logger.info({ tx, executor: address, missingBalance }, "refilled wallet");
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
else {
|
|
84
|
+
for (const [address, missingBalance] of Object.entries(balancesMissing)) {
|
|
85
|
+
const tx = await config.walletClient.sendTransaction({
|
|
86
|
+
account: utilityAccount,
|
|
87
|
+
// @ts-ignore
|
|
88
|
+
to: address,
|
|
89
|
+
value: missingBalance,
|
|
90
|
+
maxFeePerGas: config.legacyTransactions
|
|
91
|
+
? undefined
|
|
92
|
+
: maxFeePerGas,
|
|
93
|
+
maxPriorityFeePerGas: config.legacyTransactions
|
|
94
|
+
? undefined
|
|
95
|
+
: maxPriorityFeePerGas,
|
|
96
|
+
gasPrice: config.legacyTransactions
|
|
97
|
+
? maxFeePerGas
|
|
98
|
+
: undefined
|
|
99
|
+
});
|
|
100
|
+
await config.publicClient.waitForTransactionReceipt({
|
|
101
|
+
hash: tx
|
|
102
|
+
});
|
|
103
|
+
logger.info({ tx, executor: address, missingBalance }, "refilled wallet");
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
else {
|
|
108
|
+
logger.info("no wallets need to be refilled");
|
|
109
|
+
}
|
|
110
|
+
};
|
|
111
|
+
//# sourceMappingURL=validateAndRefill.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validateAndRefill.js","sourceRoot":"","sources":["../../../executor/senderManager/validateAndRefill.ts"],"names":[],"mappings":"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"}
|
package/esm/executor/utils.d.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { UserOpInfo } from "../types/index.js";
|
|
2
2
|
import { type Logger } from "../utils/index.js";
|
|
3
|
-
import { type Account,
|
|
3
|
+
import { type Account, BaseError, Address, Hex } from "viem";
|
|
4
4
|
import { SignedAuthorizationList } from "viem/experimental";
|
|
5
|
+
import { AltoConfig } from "../createConfig.js";
|
|
5
6
|
export declare const isTransactionUnderpricedError: (e: BaseError) => boolean;
|
|
6
7
|
export declare function calculateAA95GasFloor(userOps: UserOpInfo[]): bigint;
|
|
7
8
|
export declare const getUserOpHashes: (userOpInfos: UserOpInfo[]) => `0x${string}`[];
|
|
@@ -21,5 +22,10 @@ export declare const encodeHandleOpsCalldata: ({ userOps, beneficiary }: {
|
|
|
21
22
|
beneficiary: Address;
|
|
22
23
|
}) => Hex;
|
|
23
24
|
export declare const getAuthorizationList: (userOpInfos: UserOpInfo[]) => SignedAuthorizationList | undefined;
|
|
24
|
-
export declare function flushStuckTransaction(
|
|
25
|
+
export declare function flushStuckTransaction({ config, wallet, gasPrice, logger }: {
|
|
26
|
+
config: AltoConfig;
|
|
27
|
+
wallet: Account;
|
|
28
|
+
gasPrice: bigint;
|
|
29
|
+
logger: Logger;
|
|
30
|
+
}): Promise<void>;
|
|
25
31
|
//# sourceMappingURL=utils.d.ts.map
|
package/esm/executor/utils.js
CHANGED
|
@@ -4,9 +4,10 @@ import { isVersion06, toPackedUserOperation, isVersion07 } from "../utils/index.
|
|
|
4
4
|
import * as sentry from "@sentry/node";
|
|
5
5
|
import { encodeFunctionData } from "viem";
|
|
6
6
|
export const isTransactionUnderpricedError = (e) => {
|
|
7
|
-
|
|
7
|
+
const transactionUnderPriceError = e.walk((e) => e?.message
|
|
8
8
|
?.toLowerCase()
|
|
9
|
-
.includes("replacement transaction underpriced");
|
|
9
|
+
.includes("replacement transaction underpriced"));
|
|
10
|
+
return transactionUnderPriceError !== null;
|
|
10
11
|
};
|
|
11
12
|
// V7 source: https://github.com/eth-infinitism/account-abstraction/blob/releases/v0.7/contracts/core/EntryPoint.sol
|
|
12
13
|
// V6 source: https://github.com/eth-infinitism/account-abstraction/blob/fa61290d37d079e928d92d53a122efcc63822214/contracts/core/EntryPoint.sol#L236
|
|
@@ -19,10 +20,16 @@ export function calculateAA95GasFloor(userOps) {
|
|
|
19
20
|
(userOp.paymasterPostOpGasLimit || 0n) +
|
|
20
21
|
10000n;
|
|
21
22
|
gasFloor += (totalGas * 64n) / 63n;
|
|
23
|
+
// AA95 check happens after verification + paymaster verification
|
|
24
|
+
gasFloor +=
|
|
25
|
+
userOp.verificationGasLimit +
|
|
26
|
+
(userOp.paymasterVerificationGasLimit || 0n);
|
|
22
27
|
}
|
|
23
28
|
else {
|
|
24
29
|
gasFloor +=
|
|
25
30
|
userOp.callGasLimit + userOp.verificationGasLimit + 5000n;
|
|
31
|
+
// AA95 check happens after verification + paymaster verification
|
|
32
|
+
gasFloor += userOp.verificationGasLimit;
|
|
26
33
|
}
|
|
27
34
|
}
|
|
28
35
|
return gasFloor;
|
|
@@ -55,7 +62,9 @@ export const getAuthorizationList = (userOpInfos) => {
|
|
|
55
62
|
.filter(Boolean);
|
|
56
63
|
return authList.length ? authList : undefined;
|
|
57
64
|
};
|
|
58
|
-
export async function flushStuckTransaction(
|
|
65
|
+
export async function flushStuckTransaction({ config, wallet, gasPrice, logger }) {
|
|
66
|
+
const publicClient = config.publicClient;
|
|
67
|
+
const walletClient = config.walletClient;
|
|
59
68
|
const latestNonce = await publicClient.getTransactionCount({
|
|
60
69
|
address: wallet.address,
|
|
61
70
|
blockTag: "latest"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../executor/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,gBAAgB,EAChB,gBAAgB,EAInB,MAAM,aAAa,CAAA;AACpB,OAAO,EACH,WAAW,EACX,qBAAqB,EAErB,WAAW,EACd,MAAM,aAAa,CAAA;AACpB,0FAA0F;AAC1F,OAAO,KAAK,MAAM,MAAM,cAAc,CAAA;AACtC,OAAO,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../executor/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,14 @@
|
|
|
1
|
+
import { AltoConfig } from "../createConfig.js";
|
|
1
2
|
export declare class ArbitrumManager {
|
|
2
3
|
private l1BaseFeeQueue;
|
|
3
4
|
private l2BaseFeeQueue;
|
|
4
|
-
constructor(
|
|
5
|
+
constructor({ config }: {
|
|
6
|
+
config: AltoConfig;
|
|
7
|
+
});
|
|
5
8
|
saveL1BaseFee(baseFee: bigint): void;
|
|
6
9
|
saveL2BaseFee(baseFee: bigint): void;
|
|
7
|
-
getMinL1BaseFee(): bigint
|
|
8
|
-
getMaxL1BaseFee(): bigint
|
|
9
|
-
getMaxL2BaseFee(): bigint
|
|
10
|
+
getMinL1BaseFee(): Promise<bigint>;
|
|
11
|
+
getMaxL1BaseFee(): Promise<bigint>;
|
|
12
|
+
getMaxL2BaseFee(): Promise<bigint>;
|
|
10
13
|
}
|
|
11
14
|
//# sourceMappingURL=arbitrumGasPriceManager.d.ts.map
|
|
@@ -1,11 +1,17 @@
|
|
|
1
1
|
import { maxUint128 } from "viem";
|
|
2
|
-
import {
|
|
2
|
+
import { createMinMaxQueue } from "../utils/minMaxQueue/index.js";
|
|
3
3
|
export class ArbitrumManager {
|
|
4
4
|
l1BaseFeeQueue;
|
|
5
5
|
l2BaseFeeQueue;
|
|
6
|
-
constructor(
|
|
7
|
-
this.l1BaseFeeQueue =
|
|
8
|
-
|
|
6
|
+
constructor({ config }) {
|
|
7
|
+
this.l1BaseFeeQueue = createMinMaxQueue({
|
|
8
|
+
keyPrefix: "l1-base-fee-queue",
|
|
9
|
+
config
|
|
10
|
+
});
|
|
11
|
+
this.l2BaseFeeQueue = createMinMaxQueue({
|
|
12
|
+
keyPrefix: "l2-base-fee-queue",
|
|
13
|
+
config
|
|
14
|
+
});
|
|
9
15
|
}
|
|
10
16
|
saveL1BaseFee(baseFee) {
|
|
11
17
|
this.l1BaseFeeQueue.saveValue(baseFee);
|
|
@@ -13,17 +19,17 @@ export class ArbitrumManager {
|
|
|
13
19
|
saveL2BaseFee(baseFee) {
|
|
14
20
|
this.l2BaseFeeQueue.saveValue(baseFee);
|
|
15
21
|
}
|
|
16
|
-
getMinL1BaseFee() {
|
|
17
|
-
let minL1BaseFee = this.l1BaseFeeQueue.getMinValue()
|
|
18
|
-
return minL1BaseFee;
|
|
22
|
+
async getMinL1BaseFee() {
|
|
23
|
+
let minL1BaseFee = await this.l1BaseFeeQueue.getMinValue();
|
|
24
|
+
return minL1BaseFee || 1n;
|
|
19
25
|
}
|
|
20
|
-
getMaxL1BaseFee() {
|
|
21
|
-
let maxL1BaseFee = this.l1BaseFeeQueue.getMaxValue()
|
|
22
|
-
return maxL1BaseFee;
|
|
26
|
+
async getMaxL1BaseFee() {
|
|
27
|
+
let maxL1BaseFee = await this.l1BaseFeeQueue.getMaxValue();
|
|
28
|
+
return maxL1BaseFee || maxUint128;
|
|
23
29
|
}
|
|
24
|
-
getMaxL2BaseFee() {
|
|
25
|
-
let maxL2BaseFee = this.l2BaseFeeQueue.getMaxValue()
|
|
26
|
-
return maxL2BaseFee;
|
|
30
|
+
async getMaxL2BaseFee() {
|
|
31
|
+
let maxL2BaseFee = await this.l2BaseFeeQueue.getMaxValue();
|
|
32
|
+
return maxL2BaseFee || maxUint128;
|
|
27
33
|
}
|
|
28
34
|
}
|
|
29
35
|
//# sourceMappingURL=arbitrumGasPriceManager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"arbitrumGasPriceManager.js","sourceRoot":"","sources":["../../handlers/arbitrumGasPriceManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAA;AACjC,OAAO,
|
|
1
|
+
{"version":3,"file":"arbitrumGasPriceManager.js","sourceRoot":"","sources":["../../handlers/arbitrumGasPriceManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAA;AACjC,OAAO,EAAe,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAGrE,MAAM,OAAO,eAAe;IAChB,cAAc,CAAa;IAC3B,cAAc,CAAa;IAEnC,YAAY,EAAE,MAAM,EAA0B;QAC1C,IAAI,CAAC,cAAc,GAAG,iBAAiB,CAAC;YACpC,SAAS,EAAE,mBAAmB;YAC9B,MAAM;SACT,CAAC,CAAA;QACF,IAAI,CAAC,cAAc,GAAG,iBAAiB,CAAC;YACpC,SAAS,EAAE,mBAAmB;YAC9B,MAAM;SACT,CAAC,CAAA;IACN,CAAC;IAEM,aAAa,CAAC,OAAe;QAChC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;IAC1C,CAAC;IAEM,aAAa,CAAC,OAAe;QAChC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;IAC1C,CAAC;IAEM,KAAK,CAAC,eAAe;QACxB,IAAI,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,CAAA;QAC1D,OAAO,YAAY,IAAI,EAAE,CAAA;IAC7B,CAAC;IAEM,KAAK,CAAC,eAAe;QACxB,IAAI,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,CAAA;QAC1D,OAAO,YAAY,IAAI,UAAU,CAAA;IACrC,CAAC;IAEM,KAAK,CAAC,eAAe;QACxB,IAAI,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,CAAA;QAC1D,OAAO,YAAY,IAAI,UAAU,CAAA;IACrC,CAAC;CACJ"}
|
|
@@ -7,12 +7,13 @@ export class EventManager {
|
|
|
7
7
|
metrics;
|
|
8
8
|
redisEventManagerQueue;
|
|
9
9
|
constructor({ config, metrics }) {
|
|
10
|
-
this.chainId = config.
|
|
10
|
+
this.chainId = config.chainId;
|
|
11
11
|
this.logger = config.getLogger({ module: "event_manager" }, {
|
|
12
12
|
level: config.logLevel
|
|
13
13
|
});
|
|
14
14
|
this.metrics = metrics;
|
|
15
15
|
if (config.redisQueueEndpoint && config.redisEventManagerQueueName) {
|
|
16
|
+
this.logger.info(`Using redis with queue name ${config.redisEventManagerQueueName} for userOp event queue`);
|
|
16
17
|
const redis = new Redis(config.redisQueueEndpoint);
|
|
17
18
|
this.redisEventManagerQueue = new Queue(config.redisEventManagerQueueName, {
|
|
18
19
|
createClient: () => {
|
|
@@ -160,9 +161,9 @@ export class EventManager {
|
|
|
160
161
|
});
|
|
161
162
|
jobStatus = "success";
|
|
162
163
|
}
|
|
163
|
-
catch (
|
|
164
|
-
this.logger.error(
|
|
165
|
-
sentry.captureException(
|
|
164
|
+
catch (err) {
|
|
165
|
+
this.logger.error({ err }, "Failed to send userOperation status event");
|
|
166
|
+
sentry.captureException(err);
|
|
166
167
|
jobStatus = "failed";
|
|
167
168
|
}
|
|
168
169
|
this.metrics.emittedOpEvents
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eventManager.js","sourceRoot":"","sources":["../../handlers/eventManager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,cAAc,CAAA;AACtC,OAAO,KAAK,MAAM,SAAS,CAAA;AAI3B,OAAO,KAAkC,MAAM,MAAM,CAAA;AAQrD,MAAM,OAAO,YAAY;IACb,OAAO,CAAQ;IACf,MAAM,CAAQ;IACd,OAAO,CAAS;IAChB,sBAAsB,CAA0B;IAExD,YAAY,EACR,MAAM,EACN,OAAO,EAIV;QACG,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"eventManager.js","sourceRoot":"","sources":["../../handlers/eventManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,10 +13,7 @@ export declare class GasPriceManager {
|
|
|
13
13
|
mantleManager: MantleManager;
|
|
14
14
|
optimismManager: OptimismManager;
|
|
15
15
|
constructor(config: AltoConfig);
|
|
16
|
-
init(): Promise<
|
|
17
|
-
maxFeePerGas: bigint;
|
|
18
|
-
maxPriorityFeePerGas: bigint;
|
|
19
|
-
}, bigint | void]>;
|
|
16
|
+
init(): Promise<void>;
|
|
20
17
|
private getDefaultGasFee;
|
|
21
18
|
private getPolygonGasPriceParameters;
|
|
22
19
|
private bumpTheGasPrice;
|