@pimlico/alto 0.0.19 → 0.0.20
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/contracts/EIP712.sol/EIP712.json +1 -1
- package/contracts/ERC165.sol/ERC165.json +1 -1
- package/contracts/ERC20.sol/ERC20.json +1 -1
- package/contracts/Eip7702Support.sol/Eip7702Support.json +1 -1
- package/contracts/EntryPoint.sol/EntryPoint.json +1 -1
- package/contracts/EntryPointFilterOpsOverride.sol/EntryPointFilterOpsOverride06.json +1 -1
- package/contracts/EntryPointFilterOpsOverride.sol/EntryPointFilterOpsOverride07.json +1 -1
- package/contracts/EntryPointFilterOpsOverride.sol/EntryPointFilterOpsOverride08.json +1 -1
- package/contracts/EntryPointFilterOpsOverride.sol/EntryPointFilterOpsOverride09.json +1 -0
- package/contracts/EntryPointGasEstimationOverride.sol/EntryPointGasEstimationOverride06.json +1 -1
- package/contracts/EntryPointSimulations.sol/EntryPointSimulations07.json +1 -1
- package/contracts/EntryPointSimulations.sol/EntryPointSimulations08.json +1 -1
- package/contracts/EntryPointSimulations.sol/EntryPointSimulations09.json +1 -0
- package/contracts/Exec.sol/Exec.json +1 -1
- package/contracts/IAccount.sol/IAccount.json +1 -1
- package/contracts/IAccountExecute.sol/IAccountExecute.json +1 -1
- package/contracts/IAggregator.sol/IAggregator.json +1 -1
- package/contracts/IERC165.sol/IERC165.json +1 -1
- package/contracts/IERC5267.sol/IERC5267.json +1 -1
- package/contracts/IEntryPoint.sol/IEntryPoint.json +1 -1
- package/contracts/IEntryPointFilterOpsOverride.sol/IEntryPointFilterOpsOverride08.json +1 -0
- package/contracts/IEntryPointFilterOpsOverride.sol/IEntryPointFilterOpsOverride09.json +1 -0
- package/contracts/IEntryPointSimulations.sol/IEntryPointSimulations.json +1 -1
- package/contracts/INonceManager.sol/INonceManager.json +1 -1
- package/contracts/IPaymaster.sol/IPaymaster.json +1 -1
- package/contracts/ISenderCreator.sol/ISenderCreator.json +1 -1
- package/contracts/IStakeManager.sol/IStakeManager.json +1 -1
- package/contracts/LibBytes.sol/LibBytes.json +1 -1
- package/contracts/Math.sol/Math.json +1 -1
- package/contracts/MessageHashUtils.sol/MessageHashUtils.json +1 -1
- package/contracts/NonceManager.sol/NonceManager.json +1 -1
- package/contracts/Panic.sol/Panic.json +1 -1
- package/contracts/PimlicoSimulations.sol/PimlicoSimulations.json +1 -1
- package/contracts/ReentrancyGuard.sol/ReentrancyGuard.json +1 -1
- package/contracts/ReentrancyGuardTransient.sol/ReentrancyGuardTransient.json +1 -1
- package/contracts/SafeCast.sol/SafeCast.json +1 -1
- package/contracts/SenderCreator.sol/SenderCreator.json +1 -1
- package/contracts/ShortStrings.sol/ShortStrings.json +1 -1
- package/contracts/SignedMath.sol/SignedMath.json +1 -1
- package/contracts/SimulationOverrideHelper.sol/SimulationOverrideHelper.json +1 -0
- package/contracts/StakeManager.sol/StakeManager.json +1 -1
- package/contracts/StorageSlot.sol/StorageSlot.json +1 -1
- package/contracts/Strings.sol/Strings.json +1 -1
- package/contracts/TransientSlot.sol/TransientSlot.json +1 -1
- package/contracts/UserOperation.sol/UserOperationLib.json +1 -1
- package/contracts/UserOperationLib.sol/UserOperationLib.json +1 -1
- package/contracts/account-abstraction-v9/contracts/interfaces/IAggregator.sol/IAggregator.json +1 -0
- package/contracts/account-abstraction-v9/contracts/interfaces/IEntryPoint.sol/IEntryPoint.json +1 -0
- package/contracts/account-abstraction-v9/contracts/interfaces/INonceManager.sol/INonceManager.json +1 -0
- package/contracts/account-abstraction-v9/contracts/interfaces/IStakeManager.sol/IStakeManager.json +1 -0
- package/contracts/build-info/338795fc743ca612.json +1 -0
- package/contracts/build-info/44a9648cfe32a468.json +1 -0
- package/contracts/build-info/{880955d5786bfdae.json → 8dbf8a4ad39019b5.json} +1 -1
- package/contracts/contracts/interfaces/IAggregator.sol/IAggregator.json +1 -1
- package/contracts/contracts/interfaces/IEntryPoint.sol/IEntryPoint.json +1 -1
- package/contracts/contracts/interfaces/INonceManager.sol/INonceManager.json +1 -1
- package/contracts/contracts/interfaces/IStakeManager.sol/IStakeManager.json +1 -1
- package/contracts/core/Eip7702Support.sol/Eip7702Support.json +1 -0
- package/contracts/core/NonceManager.sol/NonceManager.json +1 -0
- package/contracts/core/SenderCreator.sol/SenderCreator.json +1 -0
- package/contracts/core/StakeManager.sol/StakeManager.json +1 -0
- package/contracts/core/UserOperationLib.sol/UserOperationLib.json +1 -0
- package/contracts/interfaces/IAccount.sol/IAccount.json +1 -0
- package/contracts/interfaces/IAccountExecute.sol/IAccountExecute.json +1 -0
- package/contracts/interfaces/IAggregator.sol/IAggregator.json +1 -1
- package/contracts/interfaces/IEntryPoint.sol/IEntryPoint.json +1 -1
- package/contracts/interfaces/INonceManager.sol/INonceManager.json +1 -1
- package/contracts/interfaces/IPaymaster.sol/IPaymaster.json +1 -0
- package/contracts/interfaces/ISenderCreator.sol/ISenderCreator.json +1 -0
- package/contracts/interfaces/IStakeManager.sol/IStakeManager.json +1 -1
- package/contracts/overrides/Eip7702Support.sol/Eip7702Support.json +1 -0
- package/contracts/overrides/NonceManager.sol/NonceManager.json +1 -0
- package/contracts/overrides/SenderCreator.sol/SenderCreator.json +1 -0
- package/contracts/overrides/StakeManager.sol/StakeManager.json +1 -0
- package/contracts/overrides/UserOperationLib.sol/UserOperationLib.json +1 -0
- package/contracts/utils/Exec.sol/Exec.json +1 -1
- package/contracts/utils/StorageSlot.sol/StorageSlot.json +1 -0
- package/contracts/v09/EntryPoint.sol/EntryPoint.json +1 -0
- package/esm/cli/alto.js +13 -6
- package/esm/cli/alto.js.map +1 -1
- package/esm/cli/config/bundler.d.ts +190 -148
- package/esm/cli/config/bundler.js +72 -83
- package/esm/cli/config/bundler.js.map +1 -1
- package/esm/cli/config/options.d.ts +2 -1
- package/esm/cli/config/options.js +105 -68
- package/esm/cli/config/options.js.map +1 -1
- package/esm/cli/customTransport.d.ts +3 -3
- package/esm/cli/deploySimulationsContract.d.ts +1 -0
- package/esm/cli/deploySimulationsContract.js +41 -5
- package/esm/cli/deploySimulationsContract.js.map +1 -1
- package/esm/cli/handler.js +48 -52
- package/esm/cli/handler.js.map +1 -1
- package/esm/cli/setupServer.js +46 -47
- package/esm/cli/setupServer.js.map +1 -1
- package/esm/cli/shutDown.d.ts +20 -0
- package/esm/cli/shutDown.js +260 -0
- package/esm/cli/shutDown.js.map +1 -0
- package/esm/contracts/EntryPointFilterOpsOverride.sol/EntryPointFilterOpsOverride06.json +1 -1
- package/esm/contracts/EntryPointFilterOpsOverride.sol/EntryPointFilterOpsOverride07.json +1 -1
- package/esm/contracts/EntryPointFilterOpsOverride.sol/EntryPointFilterOpsOverride08.json +1 -1
- package/esm/contracts/EntryPointFilterOpsOverride.sol/EntryPointFilterOpsOverride09.json +1 -0
- package/esm/contracts/EntryPointGasEstimationOverride.sol/EntryPointGasEstimationOverride06.json +1 -1
- package/esm/contracts/EntryPointSimulations.sol/EntryPointSimulations07.json +1 -1
- package/esm/contracts/EntryPointSimulations.sol/EntryPointSimulations08.json +1 -1
- package/esm/contracts/EntryPointSimulations.sol/EntryPointSimulations09.json +1 -0
- package/esm/contracts/PimlicoSimulations.sol/PimlicoSimulations.json +1 -1
- package/esm/createConfig.d.ts +9 -2
- package/esm/createConfig.js.map +1 -1
- package/esm/executor/{userOpMonitor.d.ts → bundleManager.d.ts} +38 -32
- package/esm/executor/{userOpMonitor.js → bundleManager.js} +127 -99
- package/esm/executor/bundleManager.js.map +1 -0
- package/esm/executor/executor.d.ts +4 -3
- package/esm/executor/executor.js +33 -20
- package/esm/executor/executor.js.map +1 -1
- package/esm/executor/executorManager.d.ts +17 -15
- package/esm/executor/executorManager.js +130 -55
- package/esm/executor/executorManager.js.map +1 -1
- package/esm/executor/filterOpsAndEstimateGas.d.ts +17 -2
- package/esm/executor/filterOpsAndEstimateGas.js +100 -77
- package/esm/executor/filterOpsAndEstimateGas.js.map +1 -1
- package/esm/executor/index.d.ts +1 -0
- package/esm/executor/index.js +1 -0
- package/esm/executor/index.js.map +1 -1
- package/esm/executor/senderManager/createMemorySenderManager.js +13 -0
- package/esm/executor/senderManager/createMemorySenderManager.js.map +1 -1
- package/esm/executor/senderManager/createRedisSenderManager.d.ts +2 -1
- package/esm/executor/senderManager/createRedisSenderManager.js +3 -6
- package/esm/executor/senderManager/createRedisSenderManager.js.map +1 -1
- package/esm/executor/senderManager/flushOnStartUp.js +4 -4
- package/esm/executor/senderManager/flushOnStartUp.js.map +1 -1
- package/esm/executor/senderManager/index.d.ts +1 -0
- package/esm/executor/senderManager/index.js +6 -2
- package/esm/executor/senderManager/index.js.map +1 -1
- package/esm/executor/senderManager/validateAndRefill.js +2 -2
- package/esm/executor/senderManager/validateAndRefill.js.map +1 -1
- package/esm/executor/utilityWalletMonitor.d.ts +4 -4
- package/esm/executor/utilityWalletMonitor.js +1 -1
- package/esm/executor/utilityWalletMonitor.js.map +1 -1
- package/esm/executor/utils.d.ts +7 -2
- package/esm/executor/utils.js +57 -26
- package/esm/executor/utils.js.map +1 -1
- package/esm/handlers/arbitrumGasPriceManager.d.ts +3 -2
- package/esm/handlers/arbitrumGasPriceManager.js +6 -2
- package/esm/handlers/arbitrumGasPriceManager.js.map +1 -1
- package/esm/handlers/eventManager.d.ts +9 -9
- package/esm/handlers/eventManager.js +59 -60
- package/esm/handlers/eventManager.js.map +1 -1
- package/esm/handlers/gasPriceManager.d.ts +8 -9
- package/esm/handlers/gasPriceManager.js +68 -80
- package/esm/handlers/gasPriceManager.js.map +1 -1
- package/esm/handlers/mantleGasPriceManager.d.ts +4 -4
- package/esm/handlers/mantleGasPriceManager.js +4 -4
- package/esm/handlers/mantleGasPriceManager.js.map +1 -1
- package/esm/handlers/optimismManager.d.ts +1 -1
- package/esm/handlers/optimismManager.js +1 -1
- package/esm/handlers/optimismManager.js.map +1 -1
- package/esm/mempool/index.d.ts +1 -1
- package/esm/mempool/index.js +1 -1
- package/esm/mempool/index.js.map +1 -1
- package/esm/mempool/mempool.d.ts +57 -22
- package/esm/mempool/mempool.js +180 -134
- package/esm/mempool/mempool.js.map +1 -1
- package/esm/mempool/reputationManager.d.ts +14 -14
- package/esm/mempool/reputationManager.js +36 -39
- package/esm/mempool/reputationManager.js.map +1 -1
- package/esm/mempool/statusManager.d.ts +20 -0
- package/esm/mempool/statusManager.js +143 -0
- package/esm/mempool/statusManager.js.map +1 -0
- package/esm/receiptCache/createMemoryReceiptCache.d.ts +3 -0
- package/esm/receiptCache/createMemoryReceiptCache.js +30 -0
- package/esm/receiptCache/createMemoryReceiptCache.js.map +1 -0
- package/esm/receiptCache/createRedisReceiptCache.d.ts +10 -0
- package/esm/receiptCache/createRedisReceiptCache.js +56 -0
- package/esm/receiptCache/createRedisReceiptCache.js.map +1 -0
- package/esm/receiptCache/index.d.ts +11 -0
- package/esm/receiptCache/index.js +21 -0
- package/esm/receiptCache/index.js.map +1 -0
- package/esm/rpc/createMethodHandler.js.map +1 -1
- package/esm/rpc/estimation/gasEstimationHandler.d.ts +2 -4
- package/esm/rpc/estimation/gasEstimationHandler.js.map +1 -1
- package/esm/rpc/estimation/gasEstimations06.d.ts +6 -7
- package/esm/rpc/estimation/gasEstimations06.js +1 -5
- package/esm/rpc/estimation/gasEstimations06.js.map +1 -1
- package/esm/rpc/estimation/gasEstimations07.d.ts +13 -41
- package/esm/rpc/estimation/gasEstimations07.js +27 -34
- package/esm/rpc/estimation/gasEstimations07.js.map +1 -1
- package/esm/{utils/preVerificationGasCalulator.d.ts → rpc/estimation/preVerificationGasCalculator.d.ts} +20 -6
- package/esm/{utils/preVerificationGasCalulator.js → rpc/estimation/preVerificationGasCalculator.js} +95 -47
- package/esm/rpc/estimation/preVerificationGasCalculator.js.map +1 -0
- package/esm/rpc/estimation/types.d.ts +4 -2
- package/esm/rpc/estimation/utils.d.ts +10 -8
- package/esm/rpc/estimation/utils.js +54 -48
- package/esm/rpc/estimation/utils.js.map +1 -1
- package/esm/rpc/methods/boost_sendUserOperation.d.ts +304 -0
- package/esm/rpc/methods/debug_bundler_clearReputation.js +1 -1
- package/esm/rpc/methods/debug_bundler_clearReputation.js.map +1 -1
- package/esm/rpc/methods/debug_bundler_clearState.js +1 -1
- package/esm/rpc/methods/debug_bundler_clearState.js.map +1 -1
- package/esm/rpc/methods/debug_bundler_dumpMempool.d.ts +338 -0
- package/esm/rpc/methods/debug_bundler_dumpReputation.js +1 -1
- package/esm/rpc/methods/debug_bundler_dumpReputation.js.map +1 -1
- package/esm/rpc/methods/eth_estimateUserOperationGas.d.ts +622 -14
- package/esm/rpc/methods/eth_estimateUserOperationGas.js +50 -29
- package/esm/rpc/methods/eth_estimateUserOperationGas.js.map +1 -1
- package/esm/rpc/methods/eth_getUserOperationByHash.d.ts +621 -11
- package/esm/rpc/methods/eth_getUserOperationByHash.js.map +1 -1
- package/esm/rpc/methods/eth_getUserOperationReceipt.d.ts +26 -26
- package/esm/rpc/methods/eth_getUserOperationReceipt.js +1 -1
- package/esm/rpc/methods/eth_sendUserOperation.d.ts +305 -1
- package/esm/rpc/methods/eth_sendUserOperation.js +132 -36
- package/esm/rpc/methods/eth_sendUserOperation.js.map +1 -1
- package/esm/rpc/methods/pimlico_getUserOperationStatus.js +1 -1
- package/esm/rpc/methods/pimlico_getUserOperationStatus.js.map +1 -1
- package/esm/rpc/methods/pimlico_sendUserOperationNow.d.ts +330 -26
- package/esm/rpc/methods/pimlico_sendUserOperationNow.js +15 -27
- package/esm/rpc/methods/pimlico_sendUserOperationNow.js.map +1 -1
- package/esm/rpc/methods/pimlico_simulateAssetChange.d.ts +620 -12
- package/esm/rpc/methods/pimlico_simulateAssetChange.js +14 -19
- package/esm/rpc/methods/pimlico_simulateAssetChange.js.map +1 -1
- package/esm/rpc/rpcHandler.d.ts +21 -22
- package/esm/rpc/rpcHandler.js +15 -17
- package/esm/rpc/rpcHandler.js.map +1 -1
- package/esm/rpc/server.d.ts +5 -5
- package/esm/rpc/server.js +15 -11
- package/esm/rpc/server.js.map +1 -1
- package/esm/rpc/validation/BundlerCollectorTracerV06.js +1 -1
- package/esm/rpc/validation/BundlerCollectorTracerV06.js.map +1 -1
- package/esm/rpc/validation/BundlerCollectorTracerV07.js +1 -1
- package/esm/rpc/validation/BundlerCollectorTracerV07.js.map +1 -1
- package/esm/rpc/validation/SafeValidator.d.ts +13 -14
- package/esm/rpc/validation/SafeValidator.js +24 -24
- package/esm/rpc/validation/SafeValidator.js.map +1 -1
- package/esm/rpc/validation/TracerResultParserV06.d.ts +2 -2
- package/esm/rpc/validation/TracerResultParserV06.js +11 -11
- package/esm/rpc/validation/TracerResultParserV06.js.map +1 -1
- package/esm/rpc/validation/TracerResultParserV07.d.ts +2 -2
- package/esm/rpc/validation/TracerResultParserV07.js +13 -13
- package/esm/rpc/validation/TracerResultParserV07.js.map +1 -1
- package/esm/rpc/validation/UnsafeValidator.d.ts +18 -14
- package/esm/rpc/validation/UnsafeValidator.js +71 -40
- package/esm/rpc/validation/UnsafeValidator.js.map +1 -1
- package/esm/store/createMempoolStore.d.ts +1 -1
- package/esm/store/createMempoolStore.js +63 -139
- package/esm/store/createMempoolStore.js.map +1 -1
- package/esm/store/index.d.ts +4 -75
- package/esm/store/index.js +4 -1
- package/esm/store/index.js.map +1 -1
- package/esm/store/outstanding/index.d.ts +13 -0
- package/esm/store/outstanding/index.js +16 -0
- package/esm/store/outstanding/index.js.map +1 -0
- package/esm/store/{createMemoryOutstandingStore.d.ts → outstanding/memory.d.ts} +14 -13
- package/esm/store/outstanding/memory.js +263 -0
- package/esm/store/outstanding/memory.js.map +1 -0
- package/esm/store/outstanding/redis.d.ts +11 -0
- package/esm/store/outstanding/redis.js +229 -0
- package/esm/store/outstanding/redis.js.map +1 -0
- package/esm/store/outstanding/types.d.ts +19 -0
- package/esm/store/outstanding/types.js +2 -0
- package/esm/store/outstanding/types.js.map +1 -0
- package/esm/store/processing/index.d.ts +11 -0
- package/esm/store/processing/index.js +17 -0
- package/esm/store/processing/index.js.map +1 -0
- package/esm/store/processing/memory.d.ts +16 -0
- package/esm/store/processing/memory.js +58 -0
- package/esm/store/processing/memory.js.map +1 -0
- package/esm/store/processing/redis.d.ts +23 -0
- package/esm/store/processing/redis.js +85 -0
- package/esm/store/processing/redis.js.map +1 -0
- package/esm/store/processing/types.d.ts +10 -0
- package/esm/store/processing/types.js +2 -0
- package/esm/store/processing/types.js.map +1 -0
- package/esm/store/types.d.ts +50 -0
- package/esm/store/types.js +2 -0
- package/esm/store/types.js.map +1 -0
- package/esm/types/contracts/PimlicoSimulations.d.ts +81 -0
- package/esm/types/contracts/PimlicoSimulations.js +105 -0
- package/esm/types/contracts/PimlicoSimulations.js.map +1 -1
- package/esm/types/gasPrice.js +0 -18
- package/esm/types/gasPrice.js.map +1 -1
- package/esm/types/interfaces.d.ts +15 -10
- package/esm/types/mempool.d.ts +3 -0
- package/esm/types/schemas.d.ts +13174 -4732
- package/esm/types/schemas.js +113 -25
- package/esm/types/schemas.js.map +1 -1
- package/esm/types/utils.d.ts +2 -5
- package/esm/types/utils.js +16 -18
- package/esm/types/utils.js.map +1 -1
- package/esm/types/validation.d.ts +7646 -6912
- package/esm/types/validation.js +122 -152
- package/esm/types/validation.js.map +1 -1
- package/esm/utils/eip7702.d.ts +2 -1
- package/esm/utils/eip7702.js +14 -8
- package/esm/utils/eip7702.js.map +1 -1
- package/esm/utils/entryPointOverrides.js +18 -4
- package/esm/utils/entryPointOverrides.js.map +1 -1
- package/esm/utils/helpers.d.ts +2 -1
- package/esm/utils/helpers.js +30 -11
- package/esm/utils/helpers.js.map +1 -1
- package/esm/utils/index.d.ts +0 -1
- package/esm/utils/index.js +0 -1
- package/esm/utils/index.js.map +1 -1
- package/esm/utils/metrics.d.ts +2 -1
- package/esm/utils/metrics.js +15 -8
- package/esm/utils/metrics.js.map +1 -1
- package/esm/utils/minMaxQueue/createMemoryMinMaxQueue.js +8 -9
- package/esm/utils/minMaxQueue/createMemoryMinMaxQueue.js.map +1 -1
- package/esm/utils/minMaxQueue/createRedisMinMaxQueue.d.ts +24 -2
- package/esm/utils/minMaxQueue/createRedisMinMaxQueue.js +85 -64
- package/esm/utils/minMaxQueue/createRedisMinMaxQueue.js.map +1 -1
- package/esm/utils/minMaxQueue/index.d.ts +2 -2
- package/esm/utils/minMaxQueue/index.js +4 -3
- package/esm/utils/minMaxQueue/index.js.map +1 -1
- package/esm/utils/rpc-reply.d.ts +3 -3
- package/esm/utils/rpc-reply.js.map +1 -1
- package/esm/utils/toViemStateOverrides.js +7 -7
- package/esm/utils/toViemStateOverrides.js.map +1 -1
- package/esm/utils/userop.d.ts +87 -55
- package/esm/utils/userop.js +138 -248
- package/esm/utils/userop.js.map +1 -1
- package/package.json +4 -2
- package/contracts/build-info/7710b5a048396e70.json +0 -1
- package/esm/executor/userOpMonitor.js.map +0 -1
- package/esm/mempool/monitoring.d.ts +0 -15
- package/esm/mempool/monitoring.js +0 -118
- package/esm/mempool/monitoring.js.map +0 -1
- package/esm/store/createMemoryOutstandingStore.js +0 -240
- package/esm/store/createMemoryOutstandingStore.js.map +0 -1
- package/esm/store/createRedisOutstandingStore.d.ts +0 -27
- package/esm/store/createRedisOutstandingStore.js +0 -344
- package/esm/store/createRedisOutstandingStore.js.map +0 -1
- package/esm/store/createRedisStore.d.ts +0 -9
- package/esm/store/createRedisStore.js +0 -131
- package/esm/store/createRedisStore.js.map +0 -1
- package/esm/store/createStore.d.ts +0 -6
- package/esm/store/createStore.js +0 -66
- package/esm/store/createStore.js.map +0 -1
- package/esm/utils/preVerificationGasCalulator.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executorManager.js","sourceRoot":"","sources":["../../executor/executorManager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"executorManager.js","sourceRoot":"","sources":["../../executor/executorManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { RejectedUserOp, UserOpInfo, UserOperationBundle } from "../types/index.js";
|
|
2
2
|
import { type Logger } from "../utils/index.js";
|
|
3
|
+
import { type Address, type Hex } from "viem";
|
|
3
4
|
import type { AltoConfig } from "../createConfig.js";
|
|
4
5
|
export type FilterOpsResult = {
|
|
5
6
|
status: "success";
|
|
@@ -15,7 +16,21 @@ export type FilterOpsResult = {
|
|
|
15
16
|
status: "all_ops_rejected";
|
|
16
17
|
rejectedUserOps: RejectedUserOp[];
|
|
17
18
|
};
|
|
18
|
-
export declare
|
|
19
|
+
export declare const getFilterOpsResult: ({ config, userOpBundle, networkBaseFee, beneficiary }: {
|
|
20
|
+
userOpBundle: UserOperationBundle;
|
|
21
|
+
config: AltoConfig;
|
|
22
|
+
networkBaseFee: bigint;
|
|
23
|
+
beneficiary: Address;
|
|
24
|
+
}) => Promise<{
|
|
25
|
+
gasUsed: bigint;
|
|
26
|
+
balanceChange: bigint;
|
|
27
|
+
rejectedUserOps: readonly {
|
|
28
|
+
userOpHash: Hex;
|
|
29
|
+
revertReason: Hex;
|
|
30
|
+
}[];
|
|
31
|
+
}>;
|
|
32
|
+
export declare function filterOpsAndEstimateGas({ checkEip7702AuthNonces, userOpBundle, config, logger, networkBaseFee }: {
|
|
33
|
+
checkEip7702AuthNonces: boolean;
|
|
19
34
|
userOpBundle: UserOperationBundle;
|
|
20
35
|
config: AltoConfig;
|
|
21
36
|
logger: Logger;
|
|
@@ -1,76 +1,32 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { getSerializedHandleOpsTx, scaleBigIntByPercent, toPackedUserOp } from "../utils/index.js";
|
|
1
|
+
import { scaleBigIntByPercent, toPackedUserOp } from "../utils/index.js";
|
|
3
2
|
import * as sentry from "@sentry/node";
|
|
4
|
-
import { decodeAbiParameters, decodeErrorResult, encodeFunctionData
|
|
3
|
+
import { decodeAbiParameters, decodeErrorResult, encodeFunctionData } from "viem";
|
|
5
4
|
import { entryPoint07Abi } from "viem/account-abstraction";
|
|
6
5
|
import { formatAbiItemWithArgs } from "viem/utils";
|
|
6
|
+
import { getArbitrumL1GasEstimate } from "../rpc/estimation/preVerificationGasCalculator.js";
|
|
7
7
|
import { pimlicoSimulationsAbi } from "../types/contracts/PimlicoSimulations.js";
|
|
8
8
|
import { getEip7702DelegationOverrides } from "../utils/eip7702.js";
|
|
9
9
|
import { getFilterOpsStateOverride } from "../utils/entryPointOverrides.js";
|
|
10
|
-
import {
|
|
10
|
+
import { getBundleGasLimit } from "./utils.js";
|
|
11
11
|
// Returns the chain specfic overhead that can't be calculated onchain.
|
|
12
12
|
const getChainSpecificOverhead = async ({ config, entryPoint, userOps }) => {
|
|
13
13
|
const { publicClient, chainType } = config;
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
entryPoint,
|
|
20
|
-
chainId: publicClient.chain?.id ?? 10,
|
|
21
|
-
removeZeros: false
|
|
22
|
-
});
|
|
23
|
-
const arbGasPriceOracle = getContract({
|
|
24
|
-
abi: ArbitrumL1FeeAbi,
|
|
25
|
-
address: precompileAddress,
|
|
26
|
-
client: {
|
|
27
|
-
public: publicClient
|
|
28
|
-
}
|
|
29
|
-
});
|
|
30
|
-
const { result } = await arbGasPriceOracle.simulate.gasEstimateL1Component([
|
|
31
|
-
entryPoint,
|
|
32
|
-
false,
|
|
33
|
-
serializedTx
|
|
34
|
-
]);
|
|
35
|
-
const [gasEstimateForL1, ,] = result;
|
|
36
|
-
return {
|
|
37
|
-
gasUsed: gasEstimateForL1,
|
|
38
|
-
// scaling by 10% as recommended by docs.
|
|
39
|
-
// https://github.com/OffchainLabs/nitro-contracts/blob/bdb8f8c68b2229fe9309fe9c03b37017abd1a2cd/src/node-interface/NodeInterface.sol#L105
|
|
40
|
-
gasLimit: scaleBigIntByPercent(gasEstimateForL1, 110n)
|
|
41
|
-
};
|
|
42
|
-
}
|
|
43
|
-
default:
|
|
44
|
-
return { gasUsed: 0n, gasLimit: 0n };
|
|
45
|
-
}
|
|
46
|
-
};
|
|
47
|
-
const getBundleGasLimit = async ({ config, userOpBundle, entryPoint, executorAddress }) => {
|
|
48
|
-
const { rpcGasEstimate, publicClient } = config;
|
|
49
|
-
let gasLimit;
|
|
50
|
-
// On some chains we can't rely on local calculations and have to estimate the gasLimit from RPC
|
|
51
|
-
if (rpcGasEstimate) {
|
|
52
|
-
gasLimit = await publicClient.estimateGas({
|
|
53
|
-
to: entryPoint,
|
|
54
|
-
account: executorAddress,
|
|
55
|
-
data: encodeHandleOpsCalldata({
|
|
56
|
-
userOps: userOpBundle.map(({ userOp }) => userOp),
|
|
57
|
-
beneficiary: executorAddress
|
|
58
|
-
})
|
|
14
|
+
if (chainType === "arbitrum") {
|
|
15
|
+
const { gasForL1 } = await getArbitrumL1GasEstimate({
|
|
16
|
+
publicClient,
|
|
17
|
+
userOps,
|
|
18
|
+
entryPoint
|
|
59
19
|
});
|
|
20
|
+
return {
|
|
21
|
+
gasUsed: gasForL1,
|
|
22
|
+
// scaling by 10% as recommended by docs.
|
|
23
|
+
// https://github.com/OffchainLabs/nitro-contracts/blob/bdb8f8c68b2229fe9309fe9c03b37017abd1a2cd/src/node-interface/NodeInterface.sol#L105
|
|
24
|
+
gasLimit: scaleBigIntByPercent(gasForL1, 110n)
|
|
25
|
+
};
|
|
60
26
|
}
|
|
61
|
-
|
|
62
|
-
const aa95GasFloor = calculateAA95GasFloor({
|
|
63
|
-
userOps: userOpBundle.map(({ userOp }) => userOp),
|
|
64
|
-
beneficiary: executorAddress
|
|
65
|
-
});
|
|
66
|
-
const eip7702UserOpCount = userOpBundle.filter(({ userOp }) => userOp.eip7702Auth).length;
|
|
67
|
-
const eip7702Overhead = BigInt(eip7702UserOpCount) * 40000n;
|
|
68
|
-
// Add 5% safety margin to local estimates.
|
|
69
|
-
gasLimit = scaleBigIntByPercent(aa95GasFloor + eip7702Overhead, 105n);
|
|
70
|
-
}
|
|
71
|
-
return gasLimit;
|
|
27
|
+
return { gasUsed: 0n, gasLimit: 0n };
|
|
72
28
|
};
|
|
73
|
-
const getFilterOpsResult = async ({ config, userOpBundle, networkBaseFee, beneficiary }) => {
|
|
29
|
+
export const getFilterOpsResult = async ({ config, userOpBundle, networkBaseFee, beneficiary }) => {
|
|
74
30
|
const { publicClient, pimlicoSimulationContract, codeOverrideSupport, fixedGasLimitForEstimation } = config;
|
|
75
31
|
if (!pimlicoSimulationContract) {
|
|
76
32
|
throw new Error("pimlicoSimulationContract not set");
|
|
@@ -89,6 +45,18 @@ const getFilterOpsResult = async ({ config, userOpBundle, networkBaseFee, benefi
|
|
|
89
45
|
// Create promises for parallel execution
|
|
90
46
|
let data;
|
|
91
47
|
switch (version) {
|
|
48
|
+
case "0.9": {
|
|
49
|
+
data = encodeFunctionData({
|
|
50
|
+
abi: pimlicoSimulationsAbi,
|
|
51
|
+
functionName: "filterOps09",
|
|
52
|
+
args: [
|
|
53
|
+
userOps.map(({ userOp }) => toPackedUserOp(userOp)),
|
|
54
|
+
beneficiary,
|
|
55
|
+
entryPoint
|
|
56
|
+
]
|
|
57
|
+
});
|
|
58
|
+
break;
|
|
59
|
+
}
|
|
92
60
|
case "0.8": {
|
|
93
61
|
data = encodeFunctionData({
|
|
94
62
|
abi: pimlicoSimulationsAbi,
|
|
@@ -126,8 +94,8 @@ const getFilterOpsResult = async ({ config, userOpBundle, networkBaseFee, benefi
|
|
|
126
94
|
}
|
|
127
95
|
}
|
|
128
96
|
const stateOverride = [
|
|
129
|
-
...(eip7702Override
|
|
130
|
-
...(simulationOverrides
|
|
97
|
+
...(eip7702Override ?? []),
|
|
98
|
+
...(simulationOverrides ?? [])
|
|
131
99
|
];
|
|
132
100
|
const callResult = await publicClient.call({
|
|
133
101
|
to: pimlicoSimulationContract,
|
|
@@ -159,14 +127,57 @@ const getFilterOpsResult = async ({ config, userOpBundle, networkBaseFee, benefi
|
|
|
159
127
|
], result);
|
|
160
128
|
return filterOpsResult[0];
|
|
161
129
|
};
|
|
130
|
+
const validateEip7702AuthNonces = async ({ userOps, publicClient }) => {
|
|
131
|
+
const eip7702UserOps = userOps.filter((userOpInfo) => userOpInfo.userOp.eip7702Auth !== null &&
|
|
132
|
+
userOpInfo.userOp.eip7702Auth !== undefined);
|
|
133
|
+
const nonEip7702UserOps = userOps.filter(({ userOp }) => !userOp.eip7702Auth);
|
|
134
|
+
const onchainNonces = await Promise.all(eip7702UserOps.map(({ userOp }) => publicClient.getTransactionCount({ address: userOp.sender })));
|
|
135
|
+
const rejectedUserOps = [];
|
|
136
|
+
const validEip7702UserOps = [];
|
|
137
|
+
for (let i = 0; i < eip7702UserOps.length; i++) {
|
|
138
|
+
const userOpInfo = eip7702UserOps[i];
|
|
139
|
+
const expectedNonce = onchainNonces[i];
|
|
140
|
+
const authNonce = userOpInfo.userOp.eip7702Auth.nonce;
|
|
141
|
+
if (authNonce === expectedNonce) {
|
|
142
|
+
validEip7702UserOps.push(userOpInfo);
|
|
143
|
+
}
|
|
144
|
+
else {
|
|
145
|
+
rejectedUserOps.push({
|
|
146
|
+
...userOpInfo,
|
|
147
|
+
reason: `EIP-7702 auth nonce mismatch: expected ${expectedNonce}, got ${authNonce}`
|
|
148
|
+
});
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
return {
|
|
152
|
+
rejectedUserOps,
|
|
153
|
+
validUserOps: [...nonEip7702UserOps, ...validEip7702UserOps]
|
|
154
|
+
};
|
|
155
|
+
};
|
|
162
156
|
// Attempt to create a handleOps bundle + estimate bundling tx gas.
|
|
163
|
-
export async function filterOpsAndEstimateGas({ userOpBundle, config, logger, networkBaseFee }) {
|
|
164
|
-
const { utilityWalletAddress: beneficiary } = config;
|
|
157
|
+
export async function filterOpsAndEstimateGas({ checkEip7702AuthNonces, userOpBundle, config, logger, networkBaseFee }) {
|
|
158
|
+
const { utilityWalletAddress: beneficiary, publicClient } = config;
|
|
165
159
|
const { userOps, entryPoint } = userOpBundle;
|
|
166
160
|
try {
|
|
161
|
+
let rejectedByEip7702Nonce = [];
|
|
162
|
+
let validUserOps = userOps;
|
|
163
|
+
if (checkEip7702AuthNonces) {
|
|
164
|
+
const result = await validateEip7702AuthNonces({
|
|
165
|
+
userOps,
|
|
166
|
+
publicClient
|
|
167
|
+
});
|
|
168
|
+
// Update validUserOps after eip7702 nonce check.
|
|
169
|
+
validUserOps = result.validUserOps;
|
|
170
|
+
rejectedByEip7702Nonce = result.rejectedUserOps;
|
|
171
|
+
if (validUserOps.length === 0) {
|
|
172
|
+
return {
|
|
173
|
+
status: "all_ops_rejected",
|
|
174
|
+
rejectedUserOps: rejectedByEip7702Nonce
|
|
175
|
+
};
|
|
176
|
+
}
|
|
177
|
+
}
|
|
167
178
|
// Create promises for parallel execution
|
|
168
179
|
const filterOpsPromise = getFilterOpsResult({
|
|
169
|
-
userOpBundle,
|
|
180
|
+
userOpBundle: { ...userOpBundle, userOps: validUserOps },
|
|
170
181
|
config,
|
|
171
182
|
networkBaseFee,
|
|
172
183
|
beneficiary
|
|
@@ -175,7 +186,7 @@ export async function filterOpsAndEstimateGas({ userOpBundle, config, logger, ne
|
|
|
175
186
|
const chainSpecificOverheadPromise = getChainSpecificOverhead({
|
|
176
187
|
config,
|
|
177
188
|
entryPoint,
|
|
178
|
-
userOps:
|
|
189
|
+
userOps: validUserOps.map(({ userOp }) => userOp)
|
|
179
190
|
});
|
|
180
191
|
const results = await Promise.all([
|
|
181
192
|
filterOpsPromise,
|
|
@@ -185,16 +196,16 @@ export async function filterOpsAndEstimateGas({ userOpBundle, config, logger, ne
|
|
|
185
196
|
const offChainOverhead = results[1];
|
|
186
197
|
// Keep track of invalid and valid ops
|
|
187
198
|
const rejectedUserOpHashes = filterOpsResult.rejectedUserOps.map(({ userOpHash }) => userOpHash);
|
|
188
|
-
const userOpsToBundle =
|
|
189
|
-
const
|
|
190
|
-
const userOpInfo =
|
|
199
|
+
const userOpsToBundle = validUserOps.filter(({ userOpHash }) => !rejectedUserOpHashes.includes(userOpHash));
|
|
200
|
+
const rejectedBySimulation = filterOpsResult.rejectedUserOps.map(({ userOpHash, revertReason }) => {
|
|
201
|
+
const userOpInfo = validUserOps.find((op) => op.userOpHash === userOpHash);
|
|
191
202
|
if (!userOpInfo) {
|
|
192
203
|
logger.error(`UserOp with hash ${userOpHash} not found in bundle`);
|
|
193
204
|
sentry.captureException(`UserOp with hash ${userOpHash} not found in bundle`);
|
|
194
205
|
throw new Error(`UserOp with hash ${userOpHash} not found`);
|
|
195
206
|
}
|
|
196
207
|
// Try to decode the revert reason
|
|
197
|
-
let decodedReason
|
|
208
|
+
let decodedReason;
|
|
198
209
|
try {
|
|
199
210
|
const errorResult = decodeErrorResult({
|
|
200
211
|
abi: entryPoint07Abi,
|
|
@@ -208,7 +219,7 @@ export async function filterOpsAndEstimateGas({ userOpBundle, config, logger, ne
|
|
|
208
219
|
});
|
|
209
220
|
decodedReason = formattedError || revertReason;
|
|
210
221
|
}
|
|
211
|
-
catch
|
|
222
|
+
catch {
|
|
212
223
|
// If decoding fails, keep the raw hex
|
|
213
224
|
decodedReason = revertReason;
|
|
214
225
|
}
|
|
@@ -217,25 +228,37 @@ export async function filterOpsAndEstimateGas({ userOpBundle, config, logger, ne
|
|
|
217
228
|
reason: decodedReason
|
|
218
229
|
};
|
|
219
230
|
});
|
|
231
|
+
const allRejectedUserOps = [
|
|
232
|
+
...rejectedByEip7702Nonce,
|
|
233
|
+
...rejectedBySimulation
|
|
234
|
+
];
|
|
220
235
|
if (userOpsToBundle.length === 0) {
|
|
221
236
|
return {
|
|
222
237
|
status: "all_ops_rejected",
|
|
223
|
-
rejectedUserOps
|
|
238
|
+
rejectedUserOps: allRejectedUserOps
|
|
224
239
|
};
|
|
225
240
|
}
|
|
226
|
-
// find overhead that can't be calculated onchain
|
|
227
|
-
const bundleGasUsed = filterOpsResult.gasUsed + 21000n + offChainOverhead.gasUsed;
|
|
228
241
|
// Find gasLimit needed for this bundle
|
|
229
242
|
const bundleGasLimit = await getBundleGasLimit({
|
|
230
243
|
config,
|
|
231
|
-
|
|
244
|
+
userOps: userOpsToBundle.map(({ userOp }) => userOp),
|
|
232
245
|
entryPoint,
|
|
233
246
|
executorAddress: beneficiary
|
|
234
247
|
});
|
|
248
|
+
let bundleGasUsed;
|
|
249
|
+
if (config.chainType === "monad") {
|
|
250
|
+
// Monad uses the entire tx.gasLimit.
|
|
251
|
+
bundleGasUsed = bundleGasLimit;
|
|
252
|
+
}
|
|
253
|
+
else {
|
|
254
|
+
// Find overhead that can't be calculated onchain.
|
|
255
|
+
bundleGasUsed =
|
|
256
|
+
filterOpsResult.gasUsed + 21000n + offChainOverhead.gasUsed;
|
|
257
|
+
}
|
|
235
258
|
return {
|
|
236
259
|
status: "success",
|
|
237
260
|
userOpsToBundle,
|
|
238
|
-
rejectedUserOps,
|
|
261
|
+
rejectedUserOps: allRejectedUserOps,
|
|
239
262
|
bundleGasUsed,
|
|
240
263
|
bundleGasLimit: bundleGasLimit + offChainOverhead.gasLimit,
|
|
241
264
|
totalBeneficiaryFees: filterOpsResult.balanceChange
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filterOpsAndEstimateGas.js","sourceRoot":"","sources":["../../executor/filterOpsAndEstimateGas.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"filterOpsAndEstimateGas.js","sourceRoot":"","sources":["../../executor/filterOpsAndEstimateGas.ts"],"names":[],"mappings":"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"}
|
package/esm/executor/index.d.ts
CHANGED
package/esm/executor/index.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../executor/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,YAAY,CAAA;AAC1B,cAAc,mBAAmB,CAAA;AACjC,cAAc,SAAS,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../executor/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,YAAY,CAAA;AAC1B,cAAc,mBAAmB,CAAA;AACjC,cAAc,SAAS,CAAA;AACvB,cAAc,iBAAiB,CAAA"}
|
|
@@ -24,6 +24,19 @@ export const createMemorySenderManager = ({ config, metrics }) => {
|
|
|
24
24
|
metrics.walletsAvailable.set(availableWallets.length);
|
|
25
25
|
return wallet;
|
|
26
26
|
},
|
|
27
|
+
lockWallet: async (wallet) => {
|
|
28
|
+
logger.trace("waiting for semaphore ");
|
|
29
|
+
await semaphore.acquire();
|
|
30
|
+
const walletIndex = availableWallets.findIndex((w) => w.address === wallet.address);
|
|
31
|
+
if (walletIndex === -1) {
|
|
32
|
+
semaphore.release();
|
|
33
|
+
logger.error("wallet not found in available wallets or is already been used up");
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
36
|
+
availableWallets.splice(walletIndex, 1);
|
|
37
|
+
logger.trace({ executor: wallet.address }, "locked wallet in sender manager");
|
|
38
|
+
metrics.walletsAvailable.set(availableWallets.length);
|
|
39
|
+
},
|
|
27
40
|
markWalletProcessed: async (wallet) => {
|
|
28
41
|
if (!availableWallets.some((w) => w.address === wallet.address)) {
|
|
29
42
|
availableWallets.push(wallet);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createMemorySenderManager.js","sourceRoot":"","sources":["../../../executor/senderManager/createMemorySenderManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEvC,OAAO,EAAsB,mBAAmB,EAAE,MAAM,GAAG,CAAA;AAG3D,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,EACtC,MAAM,EACN,OAAO,EACgC,EAAiB,EAAE;IAC1D,MAAM,OAAO,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAA;IAC3C,MAAM,gBAAgB,GAAG,CAAC,GAAG,OAAO,CAAC,CAAA;IAErC,MAAM,SAAS,GAAc,IAAI,SAAS,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAA;IACnE,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAC3B,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAC5B,EAAE,KAAK,EAAE,MAAM,CAAC,gBAAgB,IAAI,MAAM,CAAC,QAAQ,EAAE,CACxD,CAAA;IAED,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACxC,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IAE5C,MAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAA;IAC5C,OAAO;QACH,aAAa,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC;QACjC,SAAS,EAAE,KAAK,IAAI,EAAE;YAClB,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAA;YACtC,MAAM,SAAS,CAAC,OAAO,EAAE,CAAA;YAEzB,MAAM,MAAM,GAAG,gBAAgB,CAAC,KAAK,EAAE,CAAA;YAEvC,2CAA2C;YAC3C,IAAI,CAAC,MAAM,EAAE,CAAC;gBACV,SAAS,CAAC,OAAO,EAAE,CAAA;gBACnB,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAA;gBAC/B,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAA;YACtC,CAAC;YAED,MAAM,CAAC,KAAK,CACR,EAAE,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,EAC5B,gCAAgC,CACnC,CAAA;YAED,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAA;YAErD,OAAO,MAAM,CAAA;QACjB,CAAC;QACD,mBAAmB,EAAE,KAAK,EAAE,MAAe,EAAE,EAAE;YAC3C,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC9D,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;gBAC7B,SAAS,CAAC,OAAO,EAAE,CAAA;gBACnB,MAAM,CAAC,KAAK,CACR,EAAE,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,EAC5B,iCAAiC,CACpC,CAAA;YACL,CAAC;YAED,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAA;QACzD,CAAC;QACD,gBAAgB,EAAE,GAAG,EAAE;YACnB,oFAAoF;YACpF,OAAO,OAAO,CAAC,MAAM,CACjB,CAAC,MAAM,EAAE,EAAE,CACP,CAAC,gBAAgB,CAAC,IAAI,CAClB,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,KAAK,MAAM,CAAC,OAAO,CACtD,CACR,CAAA;QACL,CAAC;KACJ,CAAA;AACL,CAAC,CAAA"}
|
|
1
|
+
{"version":3,"file":"createMemorySenderManager.js","sourceRoot":"","sources":["../../../executor/senderManager/createMemorySenderManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import type { Metrics } from "../../utils/index.js";
|
|
2
2
|
import type { AltoConfig } from "../../createConfig.js";
|
|
3
3
|
import type { SenderManager } from "../senderManager/index.js";
|
|
4
|
-
export declare const createRedisSenderManager: ({ config, metrics }: {
|
|
4
|
+
export declare const createRedisSenderManager: ({ config, metrics, redisEndpoint }: {
|
|
5
5
|
config: AltoConfig;
|
|
6
6
|
metrics: Metrics;
|
|
7
|
+
redisEndpoint: string;
|
|
7
8
|
}) => Promise<SenderManager>;
|
|
8
9
|
//# sourceMappingURL=createRedisSenderManager.d.ts.map
|
|
@@ -19,18 +19,15 @@ async function createRedisQueue({ redis, name, entries }) {
|
|
|
19
19
|
const delay = async (delay) => {
|
|
20
20
|
await new Promise((resolve) => setTimeout(resolve, delay));
|
|
21
21
|
};
|
|
22
|
-
export const createRedisSenderManager = async ({ config, metrics }) => {
|
|
23
|
-
if (!config.redisSenderManagerUrl) {
|
|
24
|
-
throw new Error("redisSenderManagerUrl is required");
|
|
25
|
-
}
|
|
22
|
+
export const createRedisSenderManager = async ({ config, metrics, redisEndpoint }) => {
|
|
26
23
|
const wallets = getAvailableWallets(config);
|
|
27
24
|
metrics.walletsTotal.set(wallets.length);
|
|
28
25
|
metrics.walletsAvailable.set(wallets.length);
|
|
29
26
|
const logger = config.getLogger({ module: "redis-sender-manager" }, {
|
|
30
27
|
level: config.executorLogLevel || config.logLevel
|
|
31
28
|
});
|
|
32
|
-
const redis = new Redis(
|
|
33
|
-
const redisQueueName = `${config.
|
|
29
|
+
const redis = new Redis(redisEndpoint);
|
|
30
|
+
const redisQueueName = `${config.redisKeyPrefix}:${config.chainId}:sender-manager`;
|
|
34
31
|
const redisQueue = await createRedisQueue({
|
|
35
32
|
redis,
|
|
36
33
|
name: redisQueueName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createRedisSenderManager.js","sourceRoot":"","sources":["../../../executor/senderManager/createRedisSenderManager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,SAAS,CAAA;AAE3B,OAAO,EAAE,mBAAmB,EAAE,MAAM,GAAG,CAAA;AAIvC,KAAK,UAAU,gBAAgB,CAAC,EAC5B,KAAK,EACL,IAAI,EACJ,OAAO,EAKV;IACG,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAE1C,uCAAuC;IACvC,4EAA4E;IAC5E,IAAI,WAAW,KAAK,CAAC,EAAE,CAAC;QACpB,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE,CAAA;QAC3B,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACf,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,CAAA;QAC7B,MAAM,KAAK,CAAC,IAAI,EAAE,CAAA;IACtB,CAAC;IAED,OAAO;QACH,IAAI,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;QAC5B,GAAG,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;QAC3B,IAAI,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC;KACpD,CAAA;AACL,CAAC;AAED,MAAM,KAAK,GAAG,KAAK,EAAE,KAAa,EAAE,EAAE;IAClC,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAA;AAC9D,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,EAAE,EAC3C,MAAM,EACN,OAAO,
|
|
1
|
+
{"version":3,"file":"createRedisSenderManager.js","sourceRoot":"","sources":["../../../executor/senderManager/createRedisSenderManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,8 +11,8 @@ export const flushOnStartUp = async ({ senderManager, gasPriceManager, config })
|
|
|
11
11
|
try {
|
|
12
12
|
gasPrice = await gasPriceManager.tryGetNetworkGasPrice();
|
|
13
13
|
}
|
|
14
|
-
catch (
|
|
15
|
-
logger.error({
|
|
14
|
+
catch (err) {
|
|
15
|
+
logger.error({ err }, "error flushing stuck transaction");
|
|
16
16
|
return;
|
|
17
17
|
}
|
|
18
18
|
const promises = wallets.map(async (wallet) => {
|
|
@@ -24,8 +24,8 @@ export const flushOnStartUp = async ({ senderManager, gasPriceManager, config })
|
|
|
24
24
|
logger
|
|
25
25
|
});
|
|
26
26
|
}
|
|
27
|
-
catch (
|
|
28
|
-
logger.error({
|
|
27
|
+
catch (err) {
|
|
28
|
+
logger.error({ err }, "error flushing stuck transaction");
|
|
29
29
|
}
|
|
30
30
|
});
|
|
31
31
|
await Promise.all(promises);
|
|
@@ -1 +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,
|
|
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,GAAG,EAAE,CAAC;QACX,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,kCAAkC,CAAC,CAAA;QACzD,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,GAAG,EAAE,CAAC;YACX,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,kCAAkC,CAAC,CAAA;QAC7D,CAAC;IACL,CAAC,CAAC,CAAA;IAEF,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;AAC/B,CAAC,CAAA"}
|
|
@@ -5,6 +5,7 @@ export declare const getAvailableWallets: (config: AltoConfig) => Account[];
|
|
|
5
5
|
export type SenderManager = {
|
|
6
6
|
getAllWallets: () => Account[];
|
|
7
7
|
getWallet: () => Promise<Account>;
|
|
8
|
+
lockWallet?: (wallet: Account) => Promise<void>;
|
|
8
9
|
markWalletProcessed: (wallet: Account) => Promise<void>;
|
|
9
10
|
getActiveWallets: () => Account[];
|
|
10
11
|
};
|
|
@@ -12,8 +12,12 @@ export const getAvailableWallets = (config) => {
|
|
|
12
12
|
return availableWallets;
|
|
13
13
|
};
|
|
14
14
|
export const getSenderManager = async ({ config, metrics }) => {
|
|
15
|
-
if (config.
|
|
16
|
-
return await createRedisSenderManager({
|
|
15
|
+
if (config.enableHorizontalScaling && config.redisEndpoint) {
|
|
16
|
+
return await createRedisSenderManager({
|
|
17
|
+
config,
|
|
18
|
+
metrics,
|
|
19
|
+
redisEndpoint: config.redisEndpoint
|
|
20
|
+
});
|
|
17
21
|
}
|
|
18
22
|
return createMemorySenderManager({ config, metrics });
|
|
19
23
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../executor/senderManager/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAA;AACvE,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;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../executor/senderManager/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAA;AACvE,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;AAUD,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EAAE,EACnC,MAAM,EACN,OAAO,EACgC,EAA0B,EAAE;IACnE,IAAI,MAAM,CAAC,uBAAuB,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;QACzD,OAAO,MAAM,wBAAwB,CAAC;YAClC,MAAM;YACN,OAAO;YACP,aAAa,EAAE,MAAM,CAAC,aAAa;SACtC,CAAC,CAAA;IACN,CAAC;IAED,OAAO,yBAAyB,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAA;AACzD,CAAC,CAAA"}
|
|
@@ -66,7 +66,7 @@ export const validateAndRefillWallets = async ({ metrics, config, senderManager,
|
|
|
66
66
|
address: config.refillHelperContract,
|
|
67
67
|
client: {
|
|
68
68
|
public: config.publicClient,
|
|
69
|
-
wallet: config.
|
|
69
|
+
wallet: config.walletClients.public
|
|
70
70
|
}
|
|
71
71
|
});
|
|
72
72
|
const tx = await callEngine.write.execute([instructions], {
|
|
@@ -82,7 +82,7 @@ export const validateAndRefillWallets = async ({ metrics, config, senderManager,
|
|
|
82
82
|
}
|
|
83
83
|
else {
|
|
84
84
|
for (const [address, missingBalance] of Object.entries(balancesMissing)) {
|
|
85
|
-
const tx = await config.
|
|
85
|
+
const tx = await config.walletClients.public.sendTransaction({
|
|
86
86
|
account: utilityAccount,
|
|
87
87
|
// @ts-ignore
|
|
88
88
|
to: address,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateAndRefill.js","sourceRoot":"","sources":["../../../executor/senderManager/validateAndRefill.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"validateAndRefill.js","sourceRoot":"","sources":["../../../executor/senderManager/validateAndRefill.ts"],"names":[],"mappings":"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"}
|