@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
package/esm/types/validation.js
CHANGED
|
@@ -5,45 +5,37 @@ import { EntryPointV06Abi } from "./contracts/index.js";
|
|
|
5
5
|
import { addressSchema } from "./schemas.js";
|
|
6
6
|
// hexnum regex
|
|
7
7
|
const hexPattern = /^0x[0-9a-f]*$/;
|
|
8
|
-
|
|
8
|
+
const signatureValidationFailedSchema = z
|
|
9
9
|
.tuple([addressSchema])
|
|
10
10
|
.transform((val) => {
|
|
11
11
|
return { aggregator: val[0] };
|
|
12
12
|
});
|
|
13
|
-
|
|
13
|
+
const signatureValidationFailedErrorSchema = z.object({
|
|
14
14
|
args: signatureValidationFailedSchema,
|
|
15
15
|
errorName: z.literal("SignatureValidationFailed")
|
|
16
16
|
});
|
|
17
|
-
|
|
18
|
-
.tuple([addressSchema])
|
|
19
|
-
.transform((val) => {
|
|
17
|
+
const senderAddressResultSchema = z.tuple([addressSchema]).transform((val) => {
|
|
20
18
|
return {
|
|
21
19
|
sender: val[0]
|
|
22
20
|
};
|
|
23
21
|
});
|
|
24
|
-
|
|
22
|
+
const senderAddressResultErrorSchema = z.object({
|
|
25
23
|
args: senderAddressResultSchema,
|
|
26
24
|
errorName: z.literal("SenderAddressResult")
|
|
27
25
|
});
|
|
28
|
-
|
|
29
|
-
.tuple([z.bigint(), z.string()])
|
|
30
|
-
.transform((val) => {
|
|
26
|
+
const failedOpSchema = z.tuple([z.bigint(), z.string()]).transform((val) => {
|
|
31
27
|
return { opIndex: val[0], reason: val[1] };
|
|
32
28
|
});
|
|
33
|
-
|
|
29
|
+
const failedOpErrorSchema = z.object({
|
|
34
30
|
args: failedOpSchema,
|
|
35
31
|
errorName: z.literal("FailedOp")
|
|
36
32
|
});
|
|
37
|
-
|
|
33
|
+
const failedOpWithRevertSchema = z
|
|
38
34
|
.tuple([z.bigint(), z.string(), z.string()])
|
|
39
35
|
.transform((val) => {
|
|
40
36
|
return { opIndex: val[0], reason: val[1], inner: val[2] };
|
|
41
37
|
});
|
|
42
|
-
|
|
43
|
-
args: failedOpWithRevertSchema,
|
|
44
|
-
errorName: z.literal("FailedOpWithRevert")
|
|
45
|
-
});
|
|
46
|
-
export const executionResultSchemaV06 = z
|
|
38
|
+
const executionResultSchema06 = z
|
|
47
39
|
.tuple([
|
|
48
40
|
z.bigint(),
|
|
49
41
|
z.bigint(),
|
|
@@ -62,7 +54,7 @@ export const executionResultSchemaV06 = z
|
|
|
62
54
|
targetResult: val[5]
|
|
63
55
|
};
|
|
64
56
|
});
|
|
65
|
-
|
|
57
|
+
const executionResultSchema07 = z
|
|
66
58
|
.tuple([
|
|
67
59
|
z.bigint(),
|
|
68
60
|
z.bigint(),
|
|
@@ -86,10 +78,10 @@ export const executionResultSchemaV07 = z
|
|
|
86
78
|
};
|
|
87
79
|
});
|
|
88
80
|
export const executionResultSchema = z.union([
|
|
89
|
-
|
|
90
|
-
|
|
81
|
+
executionResultSchema06,
|
|
82
|
+
executionResultSchema07
|
|
91
83
|
]);
|
|
92
|
-
|
|
84
|
+
const executionResultErrorSchema = z.object({
|
|
93
85
|
args: executionResultSchema,
|
|
94
86
|
errorName: z.literal("ExecutionResult")
|
|
95
87
|
});
|
|
@@ -98,143 +90,121 @@ const stakeInfoSchema = z.object({
|
|
|
98
90
|
stake: z.bigint(),
|
|
99
91
|
unstakeDelaySec: z.bigint()
|
|
100
92
|
});
|
|
101
|
-
|
|
102
|
-
.
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
.
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
93
|
+
const validationResultSchema06 = z
|
|
94
|
+
.union([
|
|
95
|
+
// Without aggregation - 4 element tuple
|
|
96
|
+
z.tuple([
|
|
97
|
+
z.object({
|
|
98
|
+
preOpGas: z.bigint(),
|
|
99
|
+
prefund: z.bigint(),
|
|
100
|
+
sigFailed: z.boolean(),
|
|
101
|
+
validAfter: z.number(),
|
|
102
|
+
validUntil: z.number(),
|
|
103
|
+
paymasterContext: z
|
|
104
|
+
.string()
|
|
105
|
+
.regex(hexPattern)
|
|
106
|
+
.transform((val) => val)
|
|
107
|
+
}),
|
|
108
|
+
stakeInfoSchema,
|
|
109
|
+
stakeInfoSchema.optional(),
|
|
110
|
+
stakeInfoSchema.optional()
|
|
111
|
+
]),
|
|
112
|
+
// With aggregation - 5 element tuple
|
|
113
|
+
z.tuple([
|
|
114
|
+
z.object({
|
|
115
|
+
preOpGas: z.bigint(),
|
|
116
|
+
prefund: z.bigint(),
|
|
117
|
+
sigFailed: z.boolean(),
|
|
118
|
+
validAfter: z.number(),
|
|
119
|
+
validUntil: z.number(),
|
|
120
|
+
paymasterContext: z
|
|
121
|
+
.string()
|
|
122
|
+
.regex(hexPattern)
|
|
123
|
+
.transform((val) => val)
|
|
124
|
+
}),
|
|
125
|
+
stakeInfoSchema,
|
|
126
|
+
stakeInfoSchema.optional(),
|
|
127
|
+
stakeInfoSchema.optional(),
|
|
128
|
+
z.object({
|
|
129
|
+
aggregator: addressSchema,
|
|
130
|
+
stakeInfo: stakeInfoSchema
|
|
131
|
+
})
|
|
132
|
+
])
|
|
117
133
|
])
|
|
118
|
-
.transform((val) => {
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
z.
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
134
|
+
.transform((val) => ({
|
|
135
|
+
returnInfo: val[0],
|
|
136
|
+
senderInfo: val[1],
|
|
137
|
+
factoryInfo: val[2],
|
|
138
|
+
paymasterInfo: val[3],
|
|
139
|
+
aggregatorInfo: val[4]
|
|
140
|
+
}));
|
|
141
|
+
const validationResultSchema07 = z
|
|
142
|
+
.union([
|
|
143
|
+
// Without aggregation - 4 element tuple
|
|
144
|
+
z.tuple([
|
|
145
|
+
z.object({
|
|
146
|
+
preOpGas: z.bigint(),
|
|
147
|
+
prefund: z.bigint(),
|
|
148
|
+
accountValidationData: z.bigint(),
|
|
149
|
+
paymasterValidationData: z.bigint(),
|
|
150
|
+
accountSigFailed: z.boolean().optional(),
|
|
151
|
+
paymasterSigFailed: z.boolean().optional(),
|
|
152
|
+
validAfter: z.number().optional(),
|
|
153
|
+
validUntil: z.number().optional(),
|
|
154
|
+
paymasterContext: z
|
|
155
|
+
.string()
|
|
156
|
+
.regex(hexPattern)
|
|
157
|
+
.transform((val) => val)
|
|
158
|
+
}),
|
|
159
|
+
stakeInfoSchema,
|
|
160
|
+
stakeInfoSchema.optional(),
|
|
161
|
+
stakeInfoSchema.optional()
|
|
162
|
+
]),
|
|
163
|
+
// With aggregation - 5 element tuple
|
|
164
|
+
z.tuple([
|
|
165
|
+
z.object({
|
|
166
|
+
preOpGas: z.bigint(),
|
|
167
|
+
prefund: z.bigint(),
|
|
168
|
+
accountValidationData: z.bigint(),
|
|
169
|
+
paymasterValidationData: z.bigint(),
|
|
170
|
+
accountSigFailed: z.boolean().optional(),
|
|
171
|
+
paymasterSigFailed: z.boolean().optional(),
|
|
172
|
+
validAfter: z.number().optional(),
|
|
173
|
+
validUntil: z.number().optional(),
|
|
174
|
+
paymasterContext: z
|
|
175
|
+
.string()
|
|
176
|
+
.regex(hexPattern)
|
|
177
|
+
.transform((val) => val)
|
|
178
|
+
}),
|
|
179
|
+
stakeInfoSchema,
|
|
180
|
+
stakeInfoSchema.optional(),
|
|
181
|
+
stakeInfoSchema.optional(),
|
|
182
|
+
z.object({
|
|
183
|
+
aggregator: addressSchema,
|
|
184
|
+
stakeInfo: stakeInfoSchema
|
|
185
|
+
})
|
|
186
|
+
])
|
|
145
187
|
])
|
|
146
|
-
.transform((val) => {
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
});
|
|
188
|
+
.transform((val) => ({
|
|
189
|
+
returnInfo: val[0],
|
|
190
|
+
senderInfo: val[1],
|
|
191
|
+
factoryInfo: val[2],
|
|
192
|
+
paymasterInfo: val[3],
|
|
193
|
+
aggregatorInfo: val[4]
|
|
194
|
+
}));
|
|
154
195
|
export const validationResultSchema = z.union([
|
|
155
|
-
|
|
156
|
-
|
|
196
|
+
validationResultSchema06,
|
|
197
|
+
validationResultSchema07
|
|
157
198
|
]);
|
|
158
|
-
|
|
199
|
+
const validationResultErrorSchema = z.object({
|
|
159
200
|
args: validationResultSchema,
|
|
160
201
|
errorName: z.literal("ValidationResult")
|
|
161
202
|
});
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
z.object({
|
|
165
|
-
preOpGas: z.bigint(),
|
|
166
|
-
prefund: z.bigint(),
|
|
167
|
-
sigFailed: z.boolean(),
|
|
168
|
-
validAfter: z.number(),
|
|
169
|
-
validUntil: z.number(),
|
|
170
|
-
paymasterContext: z
|
|
171
|
-
.string()
|
|
172
|
-
.regex(hexPattern)
|
|
173
|
-
.transform((val) => val)
|
|
174
|
-
}),
|
|
175
|
-
stakeInfoSchema,
|
|
176
|
-
stakeInfoSchema.optional(),
|
|
177
|
-
stakeInfoSchema.optional(),
|
|
178
|
-
z
|
|
179
|
-
.object({
|
|
180
|
-
aggregator: addressSchema,
|
|
181
|
-
stakeInfo: stakeInfoSchema
|
|
182
|
-
})
|
|
183
|
-
.optional()
|
|
184
|
-
])
|
|
185
|
-
.transform((val) => {
|
|
186
|
-
return {
|
|
187
|
-
returnInfo: val[0],
|
|
188
|
-
senderInfo: val[1],
|
|
189
|
-
factoryInfo: val[2],
|
|
190
|
-
paymasterInfo: val[3],
|
|
191
|
-
aggregatorInfo: val[4]
|
|
192
|
-
};
|
|
193
|
-
});
|
|
194
|
-
export const validationResultWithAggregationSchemaV07 = z
|
|
195
|
-
.tuple([
|
|
196
|
-
z.object({
|
|
197
|
-
preOpGas: z.bigint(),
|
|
198
|
-
prefund: z.bigint(),
|
|
199
|
-
accountValidationData: z.bigint(),
|
|
200
|
-
paymasterValidationData: z.bigint(),
|
|
201
|
-
accountSigFailed: z.boolean().optional(),
|
|
202
|
-
paymasterSigFailed: z.boolean().optional(),
|
|
203
|
-
validAfter: z.number().optional(),
|
|
204
|
-
validUntil: z.number().optional(),
|
|
205
|
-
paymasterContext: z
|
|
206
|
-
.string()
|
|
207
|
-
.regex(hexPattern)
|
|
208
|
-
.transform((val) => val)
|
|
209
|
-
}),
|
|
210
|
-
stakeInfoSchema,
|
|
211
|
-
stakeInfoSchema.optional(),
|
|
212
|
-
stakeInfoSchema.optional(),
|
|
213
|
-
z
|
|
214
|
-
.object({
|
|
215
|
-
aggregator: addressSchema,
|
|
216
|
-
stakeInfo: stakeInfoSchema
|
|
217
|
-
})
|
|
218
|
-
.optional()
|
|
219
|
-
])
|
|
220
|
-
.transform((val) => {
|
|
221
|
-
return {
|
|
222
|
-
returnInfo: val[0],
|
|
223
|
-
senderInfo: val[1],
|
|
224
|
-
factoryInfo: val[2],
|
|
225
|
-
paymasterInfo: val[3],
|
|
226
|
-
aggregatorInfo: val[4]
|
|
227
|
-
};
|
|
228
|
-
});
|
|
229
|
-
export const validationResultWithAggregationSchema = z.union([
|
|
230
|
-
validationResultWithAggregationSchemaV06,
|
|
231
|
-
validationResultWithAggregationSchemaV07
|
|
232
|
-
]);
|
|
233
|
-
export const validationResultWithAggregationErrorSchema = z.object({
|
|
234
|
-
args: validationResultWithAggregationSchema,
|
|
203
|
+
const validationResultWithAggregationErrorSchema = z.object({
|
|
204
|
+
args: validationResultSchema,
|
|
235
205
|
errorName: z.literal("ValidationResultWithAggregation")
|
|
236
206
|
});
|
|
237
|
-
|
|
207
|
+
const entryPointErrorsSchema = z.discriminatedUnion("errorName", [
|
|
238
208
|
validationResultErrorSchema,
|
|
239
209
|
executionResultErrorSchema,
|
|
240
210
|
failedOpErrorSchema,
|
|
@@ -242,11 +212,11 @@ export const entryPointErrorsSchema = z.discriminatedUnion("errorName", [
|
|
|
242
212
|
signatureValidationFailedErrorSchema,
|
|
243
213
|
validationResultWithAggregationErrorSchema
|
|
244
214
|
]);
|
|
245
|
-
|
|
215
|
+
const errorCauseSchema = z.object({
|
|
246
216
|
name: z.literal("ContractFunctionRevertedError"),
|
|
247
217
|
data: entryPointErrorsSchema
|
|
248
218
|
});
|
|
249
|
-
|
|
219
|
+
const vmExecutionError = z.object({
|
|
250
220
|
name: z.literal("CallExecutionError"),
|
|
251
221
|
cause: z.object({
|
|
252
222
|
name: z.literal("RpcRequestError"),
|
|
@@ -270,7 +240,7 @@ export const vmExecutionError = z.object({
|
|
|
270
240
|
})
|
|
271
241
|
})
|
|
272
242
|
});
|
|
273
|
-
export const
|
|
243
|
+
export const entryPointExecutionErrorSchema06 = z
|
|
274
244
|
.object({
|
|
275
245
|
name: z.literal("ContractFunctionExecutionError"),
|
|
276
246
|
cause: z.discriminatedUnion("name", [
|
|
@@ -284,7 +254,7 @@ export const entryPointExecutionErrorSchemaV06 = z
|
|
|
284
254
|
}
|
|
285
255
|
return val.cause.data;
|
|
286
256
|
});
|
|
287
|
-
export const
|
|
257
|
+
export const entryPointExecutionErrorSchema07 = z
|
|
288
258
|
.object({
|
|
289
259
|
name: z.literal("ContractFunctionExecutionError"),
|
|
290
260
|
cause: z.discriminatedUnion("name", [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../types/validation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,iBAAiB,EAAE,MAAM,MAAM,CAAA;AAClD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAA;AAC5B,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,EAAgB,aAAa,EAAE,MAAM,WAAW,CAAA;AAgBvD,eAAe;AACf,MAAM,UAAU,GAAG,eAAe,CAAA;AAElC,MAAM
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../types/validation.ts"],"names":[],"mappings":"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"}
|
package/esm/utils/eip7702.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { type StateOverride } from "viem";
|
|
1
|
+
import { type Address, type StateOverride } from "viem";
|
|
2
2
|
import type { UserOperation } from "../types/schemas.js";
|
|
3
|
+
export declare const getEip7702AuthAddress: (eip7702Auth: NonNullable<UserOperation["eip7702Auth"]>) => Address;
|
|
3
4
|
export declare const getEip7702DelegationOverrides: (userOps: UserOperation[]) => StateOverride | undefined;
|
|
4
5
|
//# sourceMappingURL=eip7702.d.ts.map
|
package/esm/utils/eip7702.js
CHANGED
|
@@ -1,20 +1,26 @@
|
|
|
1
1
|
import { concat } from "viem";
|
|
2
|
+
export const getEip7702AuthAddress = (eip7702Auth) => {
|
|
3
|
+
return "address" in eip7702Auth
|
|
4
|
+
? eip7702Auth.address
|
|
5
|
+
: eip7702Auth.contractAddress;
|
|
6
|
+
};
|
|
2
7
|
export const getEip7702DelegationOverrides = (userOps) => {
|
|
3
|
-
|
|
8
|
+
// Use Map to deduplicate by sender address
|
|
9
|
+
const overrideMap = new Map();
|
|
4
10
|
for (const userOp of userOps) {
|
|
5
11
|
if (userOp.eip7702Auth) {
|
|
6
|
-
const delegate =
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
12
|
+
const delegate = getEip7702AuthAddress(userOp.eip7702Auth);
|
|
13
|
+
const code = concat(["0xef0100", delegate]);
|
|
14
|
+
// Only add if not already present, or update if present
|
|
15
|
+
overrideMap.set(userOp.sender, {
|
|
10
16
|
address: userOp.sender,
|
|
11
|
-
code
|
|
17
|
+
code
|
|
12
18
|
});
|
|
13
19
|
}
|
|
14
20
|
}
|
|
15
|
-
if (
|
|
21
|
+
if (overrideMap.size === 0) {
|
|
16
22
|
return undefined;
|
|
17
23
|
}
|
|
18
|
-
return
|
|
24
|
+
return Array.from(overrideMap.values());
|
|
19
25
|
};
|
|
20
26
|
//# sourceMappingURL=eip7702.js.map
|
package/esm/utils/eip7702.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eip7702.js","sourceRoot":"","sources":["../../utils/eip7702.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"eip7702.js","sourceRoot":"","sources":["../../utils/eip7702.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoC,MAAM,EAAE,MAAM,MAAM,CAAA;AAG/D,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACjC,WAAsD,EAC/C,EAAE;IACT,OAAO,SAAS,IAAI,WAAW;QAC3B,CAAC,CAAC,WAAW,CAAC,OAAO;QACrB,CAAC,CAAC,WAAW,CAAC,eAAe,CAAA;AACrC,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,6BAA6B,GAAG,CACzC,OAAwB,EACC,EAAE;IAC3B,2CAA2C;IAC3C,MAAM,WAAW,GAAG,IAAI,GAAG,EAAkC,CAAA;IAE7D,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC3B,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;YACrB,MAAM,QAAQ,GAAG,qBAAqB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;YAC1D,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAA;YAE3C,wDAAwD;YACxD,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE;gBAC3B,OAAO,EAAE,MAAM,CAAC,MAAM;gBACtB,IAAI;aACP,CAAC,CAAA;QACN,CAAC;IACL,CAAC;IAED,IAAI,WAAW,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,SAAS,CAAA;IACpB,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAA;AAC3C,CAAC,CAAA"}
|
|
@@ -8,6 +8,9 @@ import entryPointOverride07 from "../contracts/EntryPointFilterOpsOverride.sol/E
|
|
|
8
8
|
import entryPointOverride08 from "../contracts/EntryPointFilterOpsOverride.sol/EntryPointFilterOpsOverride08.json" with {
|
|
9
9
|
type: "json"
|
|
10
10
|
};
|
|
11
|
+
import entryPointOverride09 from "../contracts/EntryPointFilterOpsOverride.sol/EntryPointFilterOpsOverride09.json" with {
|
|
12
|
+
type: "json"
|
|
13
|
+
};
|
|
11
14
|
export const getSenderCreatorOverride = (entryPoint) => {
|
|
12
15
|
const slot = keccak256(toHex("SENDER_CREATOR"));
|
|
13
16
|
const value = pad(getCreateAddress({
|
|
@@ -21,10 +24,17 @@ export const getSenderCreatorOverride = (entryPoint) => {
|
|
|
21
24
|
};
|
|
22
25
|
export const getFilterOpsStateOverride = ({ version, entryPoint, baseFeePerGas }) => {
|
|
23
26
|
const senderCreatorOverride = getSenderCreatorOverride(entryPoint);
|
|
24
|
-
const
|
|
25
|
-
const
|
|
27
|
+
const baseFeeSlot = keccak256(toHex("BLOCK_BASE_FEE_PER_GAS"));
|
|
28
|
+
const baseFeeValue = toHex(baseFeePerGas, { size: 32 });
|
|
29
|
+
// Get current timestamp in seconds (block.timestamp is in seconds)
|
|
30
|
+
const timestampSlot = keccak256(toHex("BLOCK_TIMESTAMP"));
|
|
31
|
+
const timestampValue = toHex(Math.floor(Date.now() / 1000), { size: 32 });
|
|
26
32
|
let code;
|
|
27
33
|
switch (version) {
|
|
34
|
+
case "0.9": {
|
|
35
|
+
code = entryPointOverride09.deployedBytecode.object;
|
|
36
|
+
break;
|
|
37
|
+
}
|
|
28
38
|
case "0.8": {
|
|
29
39
|
code = entryPointOverride08.deployedBytecode.object;
|
|
30
40
|
break;
|
|
@@ -47,8 +57,12 @@ export const getFilterOpsStateOverride = ({ version, entryPoint, baseFeePerGas }
|
|
|
47
57
|
value: senderCreatorOverride.value
|
|
48
58
|
},
|
|
49
59
|
{
|
|
50
|
-
slot,
|
|
51
|
-
value
|
|
60
|
+
slot: baseFeeSlot,
|
|
61
|
+
value: baseFeeValue
|
|
62
|
+
},
|
|
63
|
+
{
|
|
64
|
+
slot: timestampSlot,
|
|
65
|
+
value: timestampValue
|
|
52
66
|
}
|
|
53
67
|
]
|
|
54
68
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entryPointOverrides.js","sourceRoot":"","sources":["../../utils/entryPointOverrides.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,gBAAgB,EAChB,SAAS,EACT,GAAG,EACH,KAAK,EACR,MAAM,MAAM,CAAA;AAGb,OAAO,oBAAoB,MAAM,iFAAiF,CAAC;IAC/G,IAAI,EAAE,MAAM;CACf,CAAA;AACD,OAAO,oBAAoB,MAAM,iFAAiF,CAAC;IAC/G,IAAI,EAAE,MAAM;CACf,CAAA;AACD,OAAO,oBAAoB,MAAM,iFAAiF,CAAC;IAC/G,IAAI,EAAE,MAAM;CACf,CAAA;AAED,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,UAAmB,EAAE,EAAE;IAC5D,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAA;IAC/C,MAAM,KAAK,GAAG,GAAG,CACb,gBAAgB,CAAC;QACb,IAAI,EAAE,UAAU;QAChB,KAAK,EAAE,EAAE;KACZ,CAAC,EACF,EAAE,IAAI,EAAE,EAAE,EAAE,CACf,CAAA;IAED,OAAO;QACH,IAAI;QACJ,KAAK;KACR,CAAA;AACL,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,EACtC,OAAO,EACP,UAAU,EACV,aAAa,EAKhB,EAAiB,EAAE;IAChB,MAAM,qBAAqB,GAAG,wBAAwB,CAAC,UAAU,CAAC,CAAA;IAClE,MAAM,
|
|
1
|
+
{"version":3,"file":"entryPointOverrides.js","sourceRoot":"","sources":["../../utils/entryPointOverrides.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,gBAAgB,EAChB,SAAS,EACT,GAAG,EACH,KAAK,EACR,MAAM,MAAM,CAAA;AAGb,OAAO,oBAAoB,MAAM,iFAAiF,CAAC;IAC/G,IAAI,EAAE,MAAM;CACf,CAAA;AACD,OAAO,oBAAoB,MAAM,iFAAiF,CAAC;IAC/G,IAAI,EAAE,MAAM;CACf,CAAA;AACD,OAAO,oBAAoB,MAAM,iFAAiF,CAAC;IAC/G,IAAI,EAAE,MAAM;CACf,CAAA;AACD,OAAO,oBAAoB,MAAM,iFAAiF,CAAC;IAC/G,IAAI,EAAE,MAAM;CACf,CAAA;AAED,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,UAAmB,EAAE,EAAE;IAC5D,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAA;IAC/C,MAAM,KAAK,GAAG,GAAG,CACb,gBAAgB,CAAC;QACb,IAAI,EAAE,UAAU;QAChB,KAAK,EAAE,EAAE;KACZ,CAAC,EACF,EAAE,IAAI,EAAE,EAAE,EAAE,CACf,CAAA;IAED,OAAO;QACH,IAAI;QACJ,KAAK;KACR,CAAA;AACL,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,EACtC,OAAO,EACP,UAAU,EACV,aAAa,EAKhB,EAAiB,EAAE;IAChB,MAAM,qBAAqB,GAAG,wBAAwB,CAAC,UAAU,CAAC,CAAA;IAClE,MAAM,WAAW,GAAG,SAAS,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC,CAAA;IAC9D,MAAM,YAAY,GAAG,KAAK,CAAC,aAAa,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAA;IAEvD,mEAAmE;IACnE,MAAM,aAAa,GAAG,SAAS,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAA;IACzD,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAA;IAEzE,IAAI,IAAS,CAAA;IACb,QAAQ,OAAO,EAAE,CAAC;QACd,KAAK,KAAK,CAAC,CAAC,CAAC;YACT,IAAI,GAAG,oBAAoB,CAAC,gBAAgB,CAAC,MAAa,CAAA;YAC1D,MAAK;QACT,CAAC;QACD,KAAK,KAAK,CAAC,CAAC,CAAC;YACT,IAAI,GAAG,oBAAoB,CAAC,gBAAgB,CAAC,MAAa,CAAA;YAC1D,MAAK;QACT,CAAC;QACD,KAAK,KAAK,CAAC,CAAC,CAAC;YACT,IAAI,GAAG,oBAAoB,CAAC,gBAAgB,CAAC,MAAa,CAAA;YAC1D,MAAK;QACT,CAAC;QACD,OAAO,CAAC,CAAC,CAAC;YACN,IAAI,GAAG,oBAAoB,CAAC,gBAAgB,CAAC,MAAa,CAAA;QAC9D,CAAC;IACL,CAAC;IAED,OAAO;QACH;YACI,OAAO,EAAE,UAAU;YACnB,IAAI;YACJ,SAAS,EAAE;gBACP;oBACI,IAAI,EAAE,qBAAqB,CAAC,IAAI;oBAChC,KAAK,EAAE,qBAAqB,CAAC,KAAK;iBACrC;gBACD;oBACI,IAAI,EAAE,WAAW;oBACjB,KAAK,EAAE,YAAY;iBACtB;gBACD;oBACI,IAAI,EAAE,aAAa;oBACnB,KAAK,EAAE,cAAc;iBACxB;aACJ;SACJ;KACJ,CAAA;AACL,CAAC,CAAA"}
|
package/esm/utils/helpers.d.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import type { StateOverrides, UserOperation } from "../types/index.js";
|
|
2
2
|
export declare const jsonStringifyWithBigint: (obj: unknown) => string;
|
|
3
|
+
export declare const recoverableJsonStringifyWithBigint: (obj: unknown) => string;
|
|
4
|
+
export declare const recoverableJsonParseWithBigint: (str: string) => any;
|
|
3
5
|
export declare const areAddressesEqual: (a: string, b: string) => boolean;
|
|
4
|
-
export declare function getRevertErrorData(err: unknown): `0x${string}` | undefined;
|
|
5
6
|
export declare function getAAError(errorMsg: string): string | undefined;
|
|
6
7
|
export declare function getAuthorizationStateOverrides({ userOps, stateOverrides }: {
|
|
7
8
|
userOps: UserOperation[];
|
package/esm/utils/helpers.js
CHANGED
|
@@ -1,8 +1,36 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { concat, getAddress } from "viem";
|
|
2
|
+
import { getEip7702AuthAddress } from "./eip7702.js";
|
|
2
3
|
/// Convert an object to JSON string, handling bigint values
|
|
3
4
|
export const jsonStringifyWithBigint = (obj) => {
|
|
4
5
|
return JSON.stringify(obj, (_key, value) => typeof value === "bigint" ? value.toString() : value);
|
|
5
6
|
};
|
|
7
|
+
/// Convert an object to JSON string, handling bigint values
|
|
8
|
+
export const recoverableJsonStringifyWithBigint = (obj) => {
|
|
9
|
+
return JSON.stringify(obj, (_key, value) => typeof value === "bigint"
|
|
10
|
+
? {
|
|
11
|
+
type: "bigint",
|
|
12
|
+
value: value.toString()
|
|
13
|
+
}
|
|
14
|
+
: value);
|
|
15
|
+
};
|
|
16
|
+
export const recoverableJsonParseWithBigint = (str) => {
|
|
17
|
+
return JSON.parse(str, (_key, value) => {
|
|
18
|
+
if (value !== null &&
|
|
19
|
+
typeof value === "object" &&
|
|
20
|
+
"type" in value &&
|
|
21
|
+
value.type === "bigint" &&
|
|
22
|
+
"value" in value &&
|
|
23
|
+
typeof value.value === "string") {
|
|
24
|
+
try {
|
|
25
|
+
return BigInt(value.value);
|
|
26
|
+
}
|
|
27
|
+
catch {
|
|
28
|
+
return value;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
return value;
|
|
32
|
+
});
|
|
33
|
+
};
|
|
6
34
|
/// Ensure proper equality by converting both addresses into their checksum type
|
|
7
35
|
export const areAddressesEqual = (a, b) => {
|
|
8
36
|
try {
|
|
@@ -12,13 +40,6 @@ export const areAddressesEqual = (a, b) => {
|
|
|
12
40
|
return false;
|
|
13
41
|
}
|
|
14
42
|
};
|
|
15
|
-
export function getRevertErrorData(err) {
|
|
16
|
-
if (!(err instanceof BaseError)) {
|
|
17
|
-
return undefined;
|
|
18
|
-
}
|
|
19
|
-
const error = err.walk();
|
|
20
|
-
return typeof error?.data === "object" ? error.data?.data : error.data;
|
|
21
|
-
}
|
|
22
43
|
export function getAAError(errorMsg) {
|
|
23
44
|
const uppercase = errorMsg.toUpperCase();
|
|
24
45
|
const match = uppercase.match(/AA\d{2}/);
|
|
@@ -37,9 +58,7 @@ export function getAuthorizationStateOverrides({ userOps, stateOverrides }) {
|
|
|
37
58
|
...(overrides[op.sender] || {}),
|
|
38
59
|
...getAuthorizationStateOverride({
|
|
39
60
|
authorization: {
|
|
40
|
-
address:
|
|
41
|
-
? op.eip7702Auth.address
|
|
42
|
-
: op.eip7702Auth.contractAddress,
|
|
61
|
+
address: getEip7702AuthAddress(op.eip7702Auth),
|
|
43
62
|
chainId: op.eip7702Auth.chainId,
|
|
44
63
|
nonce: op.eip7702Auth.nonce,
|
|
45
64
|
r: op.eip7702Auth.r,
|
package/esm/utils/helpers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../utils/helpers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../utils/helpers.ts"],"names":[],"mappings":"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"}
|
package/esm/utils/index.d.ts
CHANGED
package/esm/utils/index.js
CHANGED
package/esm/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,gBAAgB,CAAA"}
|
package/esm/utils/metrics.d.ts
CHANGED
|
@@ -18,12 +18,13 @@ export declare function createMetrics(registry: Registry, register?: boolean): {
|
|
|
18
18
|
verificationGasLimitEstimationCount: Histogram<never>;
|
|
19
19
|
replacedTransactions: Counter<"reason" | "status">;
|
|
20
20
|
userOpsResubmitted: Counter<never>;
|
|
21
|
+
userOpsDropped: Counter<"reason">;
|
|
21
22
|
utilityWalletBalance: Gauge<never>;
|
|
22
23
|
utilityWalletInsufficientBalance: Gauge<never>;
|
|
23
24
|
executorWalletsBalances: Gauge<"wallet">;
|
|
24
25
|
executorWalletsMinBalance: Gauge<never>;
|
|
25
|
-
emittedOpEvents: Counter<"status" | "event_type">;
|
|
26
26
|
walletsProcessingTime: Histogram<never>;
|
|
27
27
|
userOpsSubmissionAttempts: Histogram<never>;
|
|
28
|
+
altoSecondValidationFailed: Counter<never>;
|
|
28
29
|
};
|
|
29
30
|
//# sourceMappingURL=metrics.d.ts.map
|