@pimlico/alto 0.0.0-main.20250716T135636 → 0.0.0-main.20250717T214626
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/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/EntryPointGasEstimationOverride.sol/EntryPointGasEstimationOverride06.json +1 -1
- package/contracts/EntryPointSimulations.sol/EntryPointSimulations07.json +1 -1
- package/contracts/EntryPointSimulations.sol/EntryPointSimulations08.json +1 -1
- package/contracts/IERC5267.sol/IERC5267.json +1 -1
- package/contracts/IEntryPointSimulations.sol/IEntryPointSimulations.json +1 -1
- package/contracts/Math.sol/Math.json +1 -1
- package/contracts/MessageHashUtils.sol/MessageHashUtils.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/UserOperationLib.sol/UserOperationLib.json +1 -1
- package/contracts/build-info/006aa55b425148d5.json +1 -0
- package/contracts/build-info/{880955d5786bfdae.json → 7112d1913b854416.json} +1 -1
- package/contracts/utils/StorageSlot.sol/StorageSlot.json +1 -0
- package/esm/cli/setupServer.js +17 -1
- package/esm/cli/setupServer.js.map +1 -1
- package/esm/cli/shutDown.d.ts +18 -0
- package/esm/cli/shutDown.js +247 -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/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/PimlicoSimulations.sol/PimlicoSimulations.json +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 +12 -0
- package/esm/executor/senderManager/createMemorySenderManager.js.map +1 -1
- package/esm/executor/senderManager/index.d.ts +1 -0
- package/esm/executor/senderManager/index.js.map +1 -1
- package/esm/mempool/mempool.d.ts +0 -8
- package/esm/mempool/mempool.js +1 -232
- package/esm/mempool/mempool.js.map +1 -1
- package/esm/utils/entryPointOverrides.js +11 -4
- package/esm/utils/entryPointOverrides.js.map +1 -1
- package/package.json +1 -1
- package/contracts/build-info/7710b5a048396e70.json +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"abi":[{"type":"error","name":"StringsInsufficientHexLength","inputs":[{"name":"value","type":"uint256","internalType":"uint256"},{"name":"length","type":"uint256","internalType":"uint256"}]}],"bytecode":{"object":"0x6080806040523460175760399081601c823930815050f35b5f80fdfe5f80fdfea2646970667358221220c214925984e08f3f88a71ce52088a9863820d0cb7e1855767ea25bbe70871cba64736f6c634300081c0033","sourceMap":"251:3680:
|
|
1
|
+
{"abi":[{"type":"error","name":"StringsInsufficientHexLength","inputs":[{"name":"value","type":"uint256","internalType":"uint256"},{"name":"length","type":"uint256","internalType":"uint256"}]}],"bytecode":{"object":"0x6080806040523460175760399081601c823930815050f35b5f80fdfe5f80fdfea2646970667358221220c214925984e08f3f88a71ce52088a9863820d0cb7e1855767ea25bbe70871cba64736f6c634300081c0033","sourceMap":"251:3680:18:-:0;;;;;;;;;;;;;;;;;;;;;","linkReferences":{}},"deployedBytecode":{"object":"0x5f80fdfea2646970667358221220c214925984e08f3f88a71ce52088a9863820d0cb7e1855767ea25bbe70871cba64736f6c634300081c0033","sourceMap":"251:3680:18:-:0;;","linkReferences":{}},"methodIdentifiers":{},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.28+commit.7893614a\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"length\",\"type\":\"uint256\"}],\"name\":\"StringsInsufficientHexLength\",\"type\":\"error\"}],\"devdoc\":{\"details\":\"String operations.\",\"errors\":{\"StringsInsufficientHexLength(uint256,uint256)\":[{\"details\":\"The `value` string doesn't fit in the specified `length`.\"}]},\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"lib/openzeppelin-contracts-v5.1.0/contracts/utils/Strings.sol\":\"Strings\"},\"evmVersion\":\"cancun\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":true,\"runs\":1000},\"remappings\":[\":@account-abstraction-v6/=lib/account-abstraction-v6/contracts/\",\":@account-abstraction-v7/=lib/account-abstraction-v7/contracts/\",\":@account-abstraction-v8/=lib/account-abstraction-v8/contracts/\",\":@openzeppelin-v4.8.3/=lib/openzeppelin-contracts-v4.8.3/\",\":@openzeppelin-v5.0.2/=lib/openzeppelin-contracts-v5.0.2/\",\":@openzeppelin-v5.1.0/=lib/openzeppelin-contracts-v5.1.0/\",\":@openzeppelin/contracts/=lib/openzeppelin-contracts-v5.0.2/contracts/\",\":@test-aa-utils/=lib/singleton-paymaster/test/utils/account-abstraction/\",\":@test-utils/=lib/singleton-paymaster/test/utils/\",\":account-abstraction-v6/=lib/account-abstraction-v6/contracts/\",\":account-abstraction-v7/=lib/account-abstraction-v7/contracts/\",\":account-abstraction-v8/=lib/account-abstraction-v8/contracts/\",\":ds-test/=lib/forge-std/lib/ds-test/src/\",\":erc4626-tests/=lib/openzeppelin-contracts-v5.0.0/lib/erc4626-tests/\",\":forge-std/=lib/forge-std/src/\",\":halmos-cheatcodes/=lib/openzeppelin-contracts-v5.1.0/lib/halmos-cheatcodes/src/\",\":openzeppelin-contracts-v4.8.3/=lib/openzeppelin-contracts-v4.8.3/\",\":openzeppelin-contracts-v5.0.2/=lib/openzeppelin-contracts-v5.0.2/\",\":openzeppelin-contracts-v5.1.0/=lib/openzeppelin-contracts-v5.1.0/\",\":singleton-paymaster/=lib/singleton-paymaster/src/\",\":solady/=lib/solady/src/\"],\"viaIR\":true},\"sources\":{\"lib/openzeppelin-contracts-v5.1.0/contracts/utils/Panic.sol\":{\"keccak256\":\"0xf7fe324703a64fc51702311dc51562d5cb1497734f074e4f483bfb6717572d7a\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://c6a5ff4f9fd8649b7ee20800b7fa387d3465bd77cf20c2d1068cd5c98e1ed57a\",\"dweb:/ipfs/QmVSaVJf9FXFhdYEYeCEfjMVHrxDh5qL4CGkxdMWpQCrqG\"]},\"lib/openzeppelin-contracts-v5.1.0/contracts/utils/Strings.sol\":{\"keccak256\":\"0x725209b582291bb83058e3078624b53d15a133f7401c30295e7f3704181d2aed\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://0564ddb19c6d870e27b789d8f985283d815267ad7224883c2d5243c8bacc7dc0\",\"dweb:/ipfs/QmeC953H4sj88ZRFdJNFdmpf7J9SksP1wK4jyMHLo66z49\"]},\"lib/openzeppelin-contracts-v5.1.0/contracts/utils/math/Math.sol\":{\"keccak256\":\"0xa00be322d7db5786750ce0ac7e2f5b633ac30a5ed5fa1ced1e74acfc19acecea\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://6c84e822f87cbdc4082533b626667b6928715bb2b1e8e7eb96954cebb9e38c8d\",\"dweb:/ipfs/QmZmy9dgxLTerBAQDuuHqbL6EpgRxddqgv5KmwpXYVbKz1\"]},\"lib/openzeppelin-contracts-v5.1.0/contracts/utils/math/SafeCast.sol\":{\"keccak256\":\"0x195533c86d0ef72bcc06456a4f66a9b941f38eb403739b00f21fd7c1abd1ae54\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://b1d578337048cad08c1c03041cca5978eff5428aa130c781b271ad9e5566e1f8\",\"dweb:/ipfs/QmPFKL2r9CBsMwmUqqdcFPfHZB2qcs9g1HDrPxzWSxomvy\"]},\"lib/openzeppelin-contracts-v5.1.0/contracts/utils/math/SignedMath.sol\":{\"keccak256\":\"0xb1970fac7b64e6c09611e6691791e848d5e3fe410fa5899e7df2e0afd77a99e3\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://db5fbb3dddd8b7047465b62575d96231ba8a2774d37fb4737fbf23340fabbb03\",\"dweb:/ipfs/QmVUSvooZKEdEdap619tcJjTLcAuH6QBdZqAzWwnAXZAWJ\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.28+commit.7893614a"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"uint256","name":"value","type":"uint256"},{"internalType":"uint256","name":"length","type":"uint256"}],"type":"error","name":"StringsInsufficientHexLength"}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"remappings":["@account-abstraction-v6/=lib/account-abstraction-v6/contracts/","@account-abstraction-v7/=lib/account-abstraction-v7/contracts/","@account-abstraction-v8/=lib/account-abstraction-v8/contracts/","@openzeppelin-v4.8.3/=lib/openzeppelin-contracts-v4.8.3/","@openzeppelin-v5.0.2/=lib/openzeppelin-contracts-v5.0.2/","@openzeppelin-v5.1.0/=lib/openzeppelin-contracts-v5.1.0/","@openzeppelin/contracts/=lib/openzeppelin-contracts-v5.0.2/contracts/","@test-aa-utils/=lib/singleton-paymaster/test/utils/account-abstraction/","@test-utils/=lib/singleton-paymaster/test/utils/","account-abstraction-v6/=lib/account-abstraction-v6/contracts/","account-abstraction-v7/=lib/account-abstraction-v7/contracts/","account-abstraction-v8/=lib/account-abstraction-v8/contracts/","ds-test/=lib/forge-std/lib/ds-test/src/","erc4626-tests/=lib/openzeppelin-contracts-v5.0.0/lib/erc4626-tests/","forge-std/=lib/forge-std/src/","halmos-cheatcodes/=lib/openzeppelin-contracts-v5.1.0/lib/halmos-cheatcodes/src/","openzeppelin-contracts-v4.8.3/=lib/openzeppelin-contracts-v4.8.3/","openzeppelin-contracts-v5.0.2/=lib/openzeppelin-contracts-v5.0.2/","openzeppelin-contracts-v5.1.0/=lib/openzeppelin-contracts-v5.1.0/","singleton-paymaster/=lib/singleton-paymaster/src/","solady/=lib/solady/src/"],"optimizer":{"enabled":true,"runs":1000},"metadata":{"bytecodeHash":"ipfs"},"compilationTarget":{"lib/openzeppelin-contracts-v5.1.0/contracts/utils/Strings.sol":"Strings"},"evmVersion":"cancun","libraries":{},"viaIR":true},"sources":{"lib/openzeppelin-contracts-v5.1.0/contracts/utils/Panic.sol":{"keccak256":"0xf7fe324703a64fc51702311dc51562d5cb1497734f074e4f483bfb6717572d7a","urls":["bzz-raw://c6a5ff4f9fd8649b7ee20800b7fa387d3465bd77cf20c2d1068cd5c98e1ed57a","dweb:/ipfs/QmVSaVJf9FXFhdYEYeCEfjMVHrxDh5qL4CGkxdMWpQCrqG"],"license":"MIT"},"lib/openzeppelin-contracts-v5.1.0/contracts/utils/Strings.sol":{"keccak256":"0x725209b582291bb83058e3078624b53d15a133f7401c30295e7f3704181d2aed","urls":["bzz-raw://0564ddb19c6d870e27b789d8f985283d815267ad7224883c2d5243c8bacc7dc0","dweb:/ipfs/QmeC953H4sj88ZRFdJNFdmpf7J9SksP1wK4jyMHLo66z49"],"license":"MIT"},"lib/openzeppelin-contracts-v5.1.0/contracts/utils/math/Math.sol":{"keccak256":"0xa00be322d7db5786750ce0ac7e2f5b633ac30a5ed5fa1ced1e74acfc19acecea","urls":["bzz-raw://6c84e822f87cbdc4082533b626667b6928715bb2b1e8e7eb96954cebb9e38c8d","dweb:/ipfs/QmZmy9dgxLTerBAQDuuHqbL6EpgRxddqgv5KmwpXYVbKz1"],"license":"MIT"},"lib/openzeppelin-contracts-v5.1.0/contracts/utils/math/SafeCast.sol":{"keccak256":"0x195533c86d0ef72bcc06456a4f66a9b941f38eb403739b00f21fd7c1abd1ae54","urls":["bzz-raw://b1d578337048cad08c1c03041cca5978eff5428aa130c781b271ad9e5566e1f8","dweb:/ipfs/QmPFKL2r9CBsMwmUqqdcFPfHZB2qcs9g1HDrPxzWSxomvy"],"license":"MIT"},"lib/openzeppelin-contracts-v5.1.0/contracts/utils/math/SignedMath.sol":{"keccak256":"0xb1970fac7b64e6c09611e6691791e848d5e3fe410fa5899e7df2e0afd77a99e3","urls":["bzz-raw://db5fbb3dddd8b7047465b62575d96231ba8a2774d37fb4737fbf23340fabbb03","dweb:/ipfs/QmVUSvooZKEdEdap619tcJjTLcAuH6QBdZqAzWwnAXZAWJ"],"license":"MIT"}},"version":1},"id":18}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"abi":[],"bytecode":{"object":"0x6080806040523460175760399081601c823930815050f35b5f80fdfe5f80fdfea2646970667358221220512a640c6968d9abda2d82ac7780d925e65396cb56f07d94a8a19a94450d5eed64736f6c634300081c0033","sourceMap":"1163:3905:
|
|
1
|
+
{"abi":[],"bytecode":{"object":"0x6080806040523460175760399081601c823930815050f35b5f80fdfe5f80fdfea2646970667358221220512a640c6968d9abda2d82ac7780d925e65396cb56f07d94a8a19a94450d5eed64736f6c634300081c0033","sourceMap":"1163:3905:19:-:0;;;;;;;;;;;;;;;;;;;;;","linkReferences":{}},"deployedBytecode":{"object":"0x5f80fdfea2646970667358221220512a640c6968d9abda2d82ac7780d925e65396cb56f07d94a8a19a94450d5eed64736f6c634300081c0033","sourceMap":"1163:3905:19:-:0;;","linkReferences":{}},"methodIdentifiers":{},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.28+commit.7893614a\"},\"language\":\"Solidity\",\"output\":{\"abi\":[],\"devdoc\":{\"details\":\"Library for reading and writing value-types to specific transient storage slots. Transient slots are often used to store temporary values that are removed after the current transaction. This library helps with reading and writing to such slots without the need for inline assembly. * Example reading and writing values using transient storage: ```solidity contract Lock { using TransientSlot for *; // Define the slot. Alternatively, use the SlotDerivation library to derive the slot. bytes32 internal constant _LOCK_SLOT = 0xf4678858b2b588224636b8522b729e7722d32fc491da849ed75b3fdf3c84f542; modifier locked() { require(!_LOCK_SLOT.asBoolean().tload()); _LOCK_SLOT.asBoolean().tstore(true); _; _LOCK_SLOT.asBoolean().tstore(false); } } ``` TIP: Consider using this library along with {SlotDerivation}.\",\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"lib/openzeppelin-contracts-v5.1.0/contracts/utils/TransientSlot.sol\":\"TransientSlot\"},\"evmVersion\":\"cancun\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":true,\"runs\":1000},\"remappings\":[\":@account-abstraction-v6/=lib/account-abstraction-v6/contracts/\",\":@account-abstraction-v7/=lib/account-abstraction-v7/contracts/\",\":@account-abstraction-v8/=lib/account-abstraction-v8/contracts/\",\":@openzeppelin-v4.8.3/=lib/openzeppelin-contracts-v4.8.3/\",\":@openzeppelin-v5.0.2/=lib/openzeppelin-contracts-v5.0.2/\",\":@openzeppelin-v5.1.0/=lib/openzeppelin-contracts-v5.1.0/\",\":@openzeppelin/contracts/=lib/openzeppelin-contracts-v5.0.2/contracts/\",\":@test-aa-utils/=lib/singleton-paymaster/test/utils/account-abstraction/\",\":@test-utils/=lib/singleton-paymaster/test/utils/\",\":account-abstraction-v6/=lib/account-abstraction-v6/contracts/\",\":account-abstraction-v7/=lib/account-abstraction-v7/contracts/\",\":account-abstraction-v8/=lib/account-abstraction-v8/contracts/\",\":ds-test/=lib/forge-std/lib/ds-test/src/\",\":erc4626-tests/=lib/openzeppelin-contracts-v5.0.0/lib/erc4626-tests/\",\":forge-std/=lib/forge-std/src/\",\":halmos-cheatcodes/=lib/openzeppelin-contracts-v5.1.0/lib/halmos-cheatcodes/src/\",\":openzeppelin-contracts-v4.8.3/=lib/openzeppelin-contracts-v4.8.3/\",\":openzeppelin-contracts-v5.0.2/=lib/openzeppelin-contracts-v5.0.2/\",\":openzeppelin-contracts-v5.1.0/=lib/openzeppelin-contracts-v5.1.0/\",\":singleton-paymaster/=lib/singleton-paymaster/src/\",\":solady/=lib/solady/src/\"],\"viaIR\":true},\"sources\":{\"lib/openzeppelin-contracts-v5.1.0/contracts/utils/TransientSlot.sol\":{\"keccak256\":\"0x9303ef5a2beb555e52ce56598de205ce07ca8988fc67d073687c06cb8fc973d1\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://8b2e48fb42844c25e6cb38e7cfa1d91dcdc054613fd10f608833dbc677acf889\",\"dweb:/ipfs/QmT4HQxbgpWA3fZnK4dY3eXHNCoyBvpvzNq5k7eSt5mR5t\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.28+commit.7893614a"},"language":"Solidity","output":{"abi":[],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"remappings":["@account-abstraction-v6/=lib/account-abstraction-v6/contracts/","@account-abstraction-v7/=lib/account-abstraction-v7/contracts/","@account-abstraction-v8/=lib/account-abstraction-v8/contracts/","@openzeppelin-v4.8.3/=lib/openzeppelin-contracts-v4.8.3/","@openzeppelin-v5.0.2/=lib/openzeppelin-contracts-v5.0.2/","@openzeppelin-v5.1.0/=lib/openzeppelin-contracts-v5.1.0/","@openzeppelin/contracts/=lib/openzeppelin-contracts-v5.0.2/contracts/","@test-aa-utils/=lib/singleton-paymaster/test/utils/account-abstraction/","@test-utils/=lib/singleton-paymaster/test/utils/","account-abstraction-v6/=lib/account-abstraction-v6/contracts/","account-abstraction-v7/=lib/account-abstraction-v7/contracts/","account-abstraction-v8/=lib/account-abstraction-v8/contracts/","ds-test/=lib/forge-std/lib/ds-test/src/","erc4626-tests/=lib/openzeppelin-contracts-v5.0.0/lib/erc4626-tests/","forge-std/=lib/forge-std/src/","halmos-cheatcodes/=lib/openzeppelin-contracts-v5.1.0/lib/halmos-cheatcodes/src/","openzeppelin-contracts-v4.8.3/=lib/openzeppelin-contracts-v4.8.3/","openzeppelin-contracts-v5.0.2/=lib/openzeppelin-contracts-v5.0.2/","openzeppelin-contracts-v5.1.0/=lib/openzeppelin-contracts-v5.1.0/","singleton-paymaster/=lib/singleton-paymaster/src/","solady/=lib/solady/src/"],"optimizer":{"enabled":true,"runs":1000},"metadata":{"bytecodeHash":"ipfs"},"compilationTarget":{"lib/openzeppelin-contracts-v5.1.0/contracts/utils/TransientSlot.sol":"TransientSlot"},"evmVersion":"cancun","libraries":{},"viaIR":true},"sources":{"lib/openzeppelin-contracts-v5.1.0/contracts/utils/TransientSlot.sol":{"keccak256":"0x9303ef5a2beb555e52ce56598de205ce07ca8988fc67d073687c06cb8fc973d1","urls":["bzz-raw://8b2e48fb42844c25e6cb38e7cfa1d91dcdc054613fd10f608833dbc677acf889","dweb:/ipfs/QmT4HQxbgpWA3fZnK4dY3eXHNCoyBvpvzNq5k7eSt5mR5t"],"license":"MIT"}},"version":1},"id":19}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"abi":[{"type":"function","name":"PAYMASTER_DATA_OFFSET","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"PAYMASTER_POSTOP_GAS_OFFSET","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"PAYMASTER_VALIDATION_GAS_OFFSET","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"}],"bytecode":{"object":"0x6080806040523460175760b09081601c823930815050f35b5f80fdfe60808060405260043610156011575f80fd5b5f3560e01c90816325093e1b14606757508063b29a8ff41460525763ede31502146039575f80fd5b5f366003190112604e57602060405160348152f35b5f80fd5b5f366003190112604e57602060405160148152f35b5f366003190112604e5780602460209252f3fea2646970667358221220491a7106fd27102bcbc5f077adfa567f08abab1fe5ebb7df5f779e2e1a787cb764736f6c634300081c0033","sourceMap":"324:4746:
|
|
1
|
+
{"abi":[{"type":"function","name":"PAYMASTER_DATA_OFFSET","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"PAYMASTER_POSTOP_GAS_OFFSET","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"PAYMASTER_VALIDATION_GAS_OFFSET","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"}],"bytecode":{"object":"0x6080806040523460175760b09081601c823930815050f35b5f80fdfe60808060405260043610156011575f80fd5b5f3560e01c90816325093e1b14606757508063b29a8ff41460525763ede31502146039575f80fd5b5f366003190112604e57602060405160348152f35b5f80fd5b5f366003190112604e57602060405160148152f35b5f366003190112604e5780602460209252f3fea2646970667358221220491a7106fd27102bcbc5f077adfa567f08abab1fe5ebb7df5f779e2e1a787cb764736f6c634300081c0033","sourceMap":"324:4746:32:-:0;;;;;;;;;;;;;;;;;;;;;","linkReferences":{}},"deployedBytecode":{"object":"0x60808060405260043610156011575f80fd5b5f3560e01c90816325093e1b14606757508063b29a8ff41460525763ede31502146039575f80fd5b5f366003190112604e57602060405160348152f35b5f80fd5b5f366003190112604e57602060405160148152f35b5f366003190112604e5780602460209252f3fea2646970667358221220491a7106fd27102bcbc5f077adfa567f08abab1fe5ebb7df5f779e2e1a787cb764736f6c634300081c0033","sourceMap":"324:4746:32:-:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;324:4746:32;;;;;;;531:2;324:4746;;;;;;;;;;-1:-1:-1;;324:4746:32;;;;;;;413:2;324:4746;;;;;;-1:-1:-1;;324:4746:32;;;;;475:2;324:4746;;;","linkReferences":{}},"methodIdentifiers":{"PAYMASTER_DATA_OFFSET()":"ede31502","PAYMASTER_POSTOP_GAS_OFFSET()":"25093e1b","PAYMASTER_VALIDATION_GAS_OFFSET()":"b29a8ff4"},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.28+commit.7893614a\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[],\"name\":\"PAYMASTER_DATA_OFFSET\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"PAYMASTER_POSTOP_GAS_OFFSET\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"PAYMASTER_VALIDATION_GAS_OFFSET\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"}],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"notice\":\"Utility functions helpful when working with UserOperation structs.\",\"version\":1}},\"settings\":{\"compilationTarget\":{\"src/v08/overrides/UserOperationLib.sol\":\"UserOperationLib\"},\"evmVersion\":\"cancun\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":true,\"runs\":1000},\"remappings\":[\":@account-abstraction-v6/=lib/account-abstraction-v6/contracts/\",\":@account-abstraction-v7/=lib/account-abstraction-v7/contracts/\",\":@account-abstraction-v8/=lib/account-abstraction-v8/contracts/\",\":@openzeppelin-v4.8.3/=lib/openzeppelin-contracts-v4.8.3/\",\":@openzeppelin-v5.0.2/=lib/openzeppelin-contracts-v5.0.2/\",\":@openzeppelin-v5.1.0/=lib/openzeppelin-contracts-v5.1.0/\",\":@openzeppelin/contracts/=lib/openzeppelin-contracts-v5.0.2/contracts/\",\":@test-aa-utils/=lib/singleton-paymaster/test/utils/account-abstraction/\",\":@test-utils/=lib/singleton-paymaster/test/utils/\",\":account-abstraction-v6/=lib/account-abstraction-v6/contracts/\",\":account-abstraction-v7/=lib/account-abstraction-v7/contracts/\",\":account-abstraction-v8/=lib/account-abstraction-v8/contracts/\",\":ds-test/=lib/forge-std/lib/ds-test/src/\",\":erc4626-tests/=lib/openzeppelin-contracts-v5.0.0/lib/erc4626-tests/\",\":forge-std/=lib/forge-std/src/\",\":halmos-cheatcodes/=lib/openzeppelin-contracts-v5.1.0/lib/halmos-cheatcodes/src/\",\":openzeppelin-contracts-v4.8.3/=lib/openzeppelin-contracts-v4.8.3/\",\":openzeppelin-contracts-v5.0.2/=lib/openzeppelin-contracts-v5.0.2/\",\":openzeppelin-contracts-v5.1.0/=lib/openzeppelin-contracts-v5.1.0/\",\":singleton-paymaster/=lib/singleton-paymaster/src/\",\":solady/=lib/solady/src/\"],\"viaIR\":true},\"sources\":{\"lib/account-abstraction-v7/contracts/interfaces/PackedUserOperation.sol\":{\"keccak256\":\"0x1129b46381db68eddbc5cb49e50664667b66b03c480453858e7b25eabe444359\",\"license\":\"GPL-3.0\",\"urls\":[\"bzz-raw://499a948aba60480dba6e25c763b8d918f1c246eb7a3302e04f493e080f3295be\",\"dweb:/ipfs/QmeRhhswf4NACcBKam2PyjpTP2ddSm648kah5kkQJsvwz3\"]},\"lib/account-abstraction-v8/contracts/core/Helpers.sol\":{\"keccak256\":\"0x42b948af5fa14a96149611595df1186800c7558b2de8762e4b45a7c45c16f65e\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://737a7908131ece48a5df1faaa3d0be79c42792379c27f5615dae6aa14cd68c2f\",\"dweb:/ipfs/QmPAxGMDxuek7XWSUVfZpvYE8bustfsjTDVDK8hmE88e1f\"]},\"src/v08/overrides/UserOperationLib.sol\":{\"keccak256\":\"0xf5512d40f62d36dba06a127832ad33ae9db28225632abcb46f4d41ba0fceca17\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://afa1670de9e4d240258aed3613426663690931b313701f9af5edb1600b3071c3\",\"dweb:/ipfs/QmeoQgTwpEQhyACQAqtUBRTEVpzzckLpKg1y5tS6FBpdcu\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.28+commit.7893614a"},"language":"Solidity","output":{"abi":[{"inputs":[],"stateMutability":"view","type":"function","name":"PAYMASTER_DATA_OFFSET","outputs":[{"internalType":"uint256","name":"","type":"uint256"}]},{"inputs":[],"stateMutability":"view","type":"function","name":"PAYMASTER_POSTOP_GAS_OFFSET","outputs":[{"internalType":"uint256","name":"","type":"uint256"}]},{"inputs":[],"stateMutability":"view","type":"function","name":"PAYMASTER_VALIDATION_GAS_OFFSET","outputs":[{"internalType":"uint256","name":"","type":"uint256"}]}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"remappings":["@account-abstraction-v6/=lib/account-abstraction-v6/contracts/","@account-abstraction-v7/=lib/account-abstraction-v7/contracts/","@account-abstraction-v8/=lib/account-abstraction-v8/contracts/","@openzeppelin-v4.8.3/=lib/openzeppelin-contracts-v4.8.3/","@openzeppelin-v5.0.2/=lib/openzeppelin-contracts-v5.0.2/","@openzeppelin-v5.1.0/=lib/openzeppelin-contracts-v5.1.0/","@openzeppelin/contracts/=lib/openzeppelin-contracts-v5.0.2/contracts/","@test-aa-utils/=lib/singleton-paymaster/test/utils/account-abstraction/","@test-utils/=lib/singleton-paymaster/test/utils/","account-abstraction-v6/=lib/account-abstraction-v6/contracts/","account-abstraction-v7/=lib/account-abstraction-v7/contracts/","account-abstraction-v8/=lib/account-abstraction-v8/contracts/","ds-test/=lib/forge-std/lib/ds-test/src/","erc4626-tests/=lib/openzeppelin-contracts-v5.0.0/lib/erc4626-tests/","forge-std/=lib/forge-std/src/","halmos-cheatcodes/=lib/openzeppelin-contracts-v5.1.0/lib/halmos-cheatcodes/src/","openzeppelin-contracts-v4.8.3/=lib/openzeppelin-contracts-v4.8.3/","openzeppelin-contracts-v5.0.2/=lib/openzeppelin-contracts-v5.0.2/","openzeppelin-contracts-v5.1.0/=lib/openzeppelin-contracts-v5.1.0/","singleton-paymaster/=lib/singleton-paymaster/src/","solady/=lib/solady/src/"],"optimizer":{"enabled":true,"runs":1000},"metadata":{"bytecodeHash":"ipfs"},"compilationTarget":{"src/v08/overrides/UserOperationLib.sol":"UserOperationLib"},"evmVersion":"cancun","libraries":{},"viaIR":true},"sources":{"lib/account-abstraction-v7/contracts/interfaces/PackedUserOperation.sol":{"keccak256":"0x1129b46381db68eddbc5cb49e50664667b66b03c480453858e7b25eabe444359","urls":["bzz-raw://499a948aba60480dba6e25c763b8d918f1c246eb7a3302e04f493e080f3295be","dweb:/ipfs/QmeRhhswf4NACcBKam2PyjpTP2ddSm648kah5kkQJsvwz3"],"license":"GPL-3.0"},"lib/account-abstraction-v8/contracts/core/Helpers.sol":{"keccak256":"0x42b948af5fa14a96149611595df1186800c7558b2de8762e4b45a7c45c16f65e","urls":["bzz-raw://737a7908131ece48a5df1faaa3d0be79c42792379c27f5615dae6aa14cd68c2f","dweb:/ipfs/QmPAxGMDxuek7XWSUVfZpvYE8bustfsjTDVDK8hmE88e1f"],"license":"MIT"},"src/v08/overrides/UserOperationLib.sol":{"keccak256":"0xf5512d40f62d36dba06a127832ad33ae9db28225632abcb46f4d41ba0fceca17","urls":["bzz-raw://afa1670de9e4d240258aed3613426663690931b313701f9af5edb1600b3071c3","dweb:/ipfs/QmeoQgTwpEQhyACQAqtUBRTEVpzzckLpKg1y5tS6FBpdcu"],"license":"MIT"}},"version":1},"id":32}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"id":"006aa55b425148d5","source_id_to_path":{"0":"lib/account-abstraction-v7/contracts/core/NonceManager.sol","1":"lib/account-abstraction-v7/contracts/interfaces/IAccount.sol","2":"lib/account-abstraction-v7/contracts/interfaces/IAccountExecute.sol","3":"lib/account-abstraction-v7/contracts/interfaces/IAggregator.sol","4":"lib/account-abstraction-v7/contracts/interfaces/IEntryPoint.sol","5":"lib/account-abstraction-v7/contracts/interfaces/INonceManager.sol","6":"lib/account-abstraction-v7/contracts/interfaces/IPaymaster.sol","7":"lib/account-abstraction-v7/contracts/interfaces/IStakeManager.sol","8":"lib/account-abstraction-v7/contracts/interfaces/PackedUserOperation.sol","9":"lib/account-abstraction-v7/contracts/utils/Exec.sol","10":"lib/account-abstraction-v8/contracts/core/Helpers.sol","11":"lib/account-abstraction-v8/contracts/interfaces/ISenderCreator.sol","12":"lib/openzeppelin-contracts-v4.8.3/contracts/utils/StorageSlot.sol","13":"lib/openzeppelin-contracts-v5.1.0/contracts/interfaces/IERC5267.sol","14":"lib/openzeppelin-contracts-v5.1.0/contracts/utils/Panic.sol","15":"lib/openzeppelin-contracts-v5.1.0/contracts/utils/ReentrancyGuardTransient.sol","16":"lib/openzeppelin-contracts-v5.1.0/contracts/utils/ShortStrings.sol","17":"lib/openzeppelin-contracts-v5.1.0/contracts/utils/StorageSlot.sol","18":"lib/openzeppelin-contracts-v5.1.0/contracts/utils/Strings.sol","19":"lib/openzeppelin-contracts-v5.1.0/contracts/utils/TransientSlot.sol","20":"lib/openzeppelin-contracts-v5.1.0/contracts/utils/cryptography/EIP712.sol","21":"lib/openzeppelin-contracts-v5.1.0/contracts/utils/cryptography/MessageHashUtils.sol","22":"lib/openzeppelin-contracts-v5.1.0/contracts/utils/math/Math.sol","23":"lib/openzeppelin-contracts-v5.1.0/contracts/utils/math/SafeCast.sol","24":"lib/openzeppelin-contracts-v5.1.0/contracts/utils/math/SignedMath.sol","25":"src/IEntryPointSimulations.sol","26":"src/SimulationOverrideHelper.sol","27":"src/v08/EntryPoint.sol","28":"src/v08/EntryPointSimulations.sol","29":"src/v08/overrides/Eip7702Support.sol","30":"src/v08/overrides/SenderCreator.sol","31":"src/v08/overrides/StakeManager.sol","32":"src/v08/overrides/UserOperationLib.sol"},"language":"Solidity"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"id":"
|
|
1
|
+
{"id":"7112d1913b854416","source_id_to_path":{"0":"lib/account-abstraction-v6/contracts/core/Helpers.sol","1":"lib/account-abstraction-v6/contracts/core/NonceManager.sol","2":"lib/account-abstraction-v6/contracts/core/SenderCreator.sol","3":"lib/account-abstraction-v6/contracts/core/StakeManager.sol","4":"lib/account-abstraction-v6/contracts/interfaces/IAccount.sol","5":"lib/account-abstraction-v6/contracts/interfaces/IAggregator.sol","6":"lib/account-abstraction-v6/contracts/interfaces/IEntryPoint.sol","7":"lib/account-abstraction-v6/contracts/interfaces/INonceManager.sol","8":"lib/account-abstraction-v6/contracts/interfaces/IPaymaster.sol","9":"lib/account-abstraction-v6/contracts/interfaces/IStakeManager.sol","10":"lib/account-abstraction-v6/contracts/interfaces/UserOperation.sol","11":"lib/account-abstraction-v6/contracts/utils/Exec.sol","12":"lib/account-abstraction-v7/contracts/interfaces/IAggregator.sol","13":"lib/account-abstraction-v7/contracts/interfaces/IEntryPoint.sol","14":"lib/account-abstraction-v7/contracts/interfaces/INonceManager.sol","15":"lib/account-abstraction-v7/contracts/interfaces/IStakeManager.sol","16":"lib/account-abstraction-v7/contracts/interfaces/PackedUserOperation.sol","17":"lib/account-abstraction-v7/contracts/utils/Exec.sol","18":"lib/account-abstraction-v8/contracts/interfaces/IAggregator.sol","19":"lib/account-abstraction-v8/contracts/interfaces/IEntryPoint.sol","20":"lib/account-abstraction-v8/contracts/interfaces/INonceManager.sol","21":"lib/account-abstraction-v8/contracts/interfaces/ISenderCreator.sol","22":"lib/account-abstraction-v8/contracts/interfaces/IStakeManager.sol","23":"lib/account-abstraction-v8/contracts/interfaces/PackedUserOperation.sol","24":"lib/openzeppelin-contracts-v4.8.3/contracts/security/ReentrancyGuard.sol","25":"lib/openzeppelin-contracts-v4.8.3/contracts/utils/StorageSlot.sol","26":"lib/openzeppelin-contracts-v4.8.3/contracts/utils/introspection/ERC165.sol","27":"lib/openzeppelin-contracts-v4.8.3/contracts/utils/introspection/IERC165.sol","28":"lib/solady/src/tokens/ERC20.sol","29":"lib/solady/src/utils/LibBytes.sol","30":"src/IEntryPointSimulations.sol","31":"src/PimlicoSimulations.sol","32":"src/SimulationOverrideHelper.sol","33":"src/v06/EntryPointGasEstimationOverride.sol"},"language":"Solidity"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"abi":[],"bytecode":{"object":"0x6080806040523460175760399081601c823930815050f35b5f80fdfe5f80fdfea2646970667358221220d311f5c2d4f25577f29a0e615a3ca10ecc3f0c61a9bfd6c1ba372c0d0e4085e064736f6c634300081c0033","sourceMap":"1407:2774:17:-:0;;;;;;;;;;;;;;;;;;;;;","linkReferences":{}},"deployedBytecode":{"object":"0x5f80fdfea2646970667358221220d311f5c2d4f25577f29a0e615a3ca10ecc3f0c61a9bfd6c1ba372c0d0e4085e064736f6c634300081c0033","sourceMap":"1407:2774:17:-:0;;","linkReferences":{}},"methodIdentifiers":{},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.28+commit.7893614a\"},\"language\":\"Solidity\",\"output\":{\"abi\":[],\"devdoc\":{\"details\":\"Library for reading and writing primitive types to specific storage slots. Storage slots are often used to avoid storage conflict when dealing with upgradeable contracts. This library helps with reading and writing to such slots without the need for inline assembly. The functions in this library return Slot structs that contain a `value` member that can be used to read or write. Example usage to set ERC-1967 implementation slot: ```solidity contract ERC1967 { // Define the slot. Alternatively, use the SlotDerivation library to derive the slot. bytes32 internal constant _IMPLEMENTATION_SLOT = 0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc; function _getImplementation() internal view returns (address) { return StorageSlot.getAddressSlot(_IMPLEMENTATION_SLOT).value; } function _setImplementation(address newImplementation) internal { require(newImplementation.code.length > 0); StorageSlot.getAddressSlot(_IMPLEMENTATION_SLOT).value = newImplementation; } } ``` TIP: Consider using this library along with {SlotDerivation}.\",\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"lib/openzeppelin-contracts-v5.1.0/contracts/utils/StorageSlot.sol\":\"StorageSlot\"},\"evmVersion\":\"cancun\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":true,\"runs\":1000},\"remappings\":[\":@account-abstraction-v6/=lib/account-abstraction-v6/contracts/\",\":@account-abstraction-v7/=lib/account-abstraction-v7/contracts/\",\":@account-abstraction-v8/=lib/account-abstraction-v8/contracts/\",\":@openzeppelin-v4.8.3/=lib/openzeppelin-contracts-v4.8.3/\",\":@openzeppelin-v5.0.2/=lib/openzeppelin-contracts-v5.0.2/\",\":@openzeppelin-v5.1.0/=lib/openzeppelin-contracts-v5.1.0/\",\":@openzeppelin/contracts/=lib/openzeppelin-contracts-v5.0.2/contracts/\",\":@test-aa-utils/=lib/singleton-paymaster/test/utils/account-abstraction/\",\":@test-utils/=lib/singleton-paymaster/test/utils/\",\":account-abstraction-v6/=lib/account-abstraction-v6/contracts/\",\":account-abstraction-v7/=lib/account-abstraction-v7/contracts/\",\":account-abstraction-v8/=lib/account-abstraction-v8/contracts/\",\":ds-test/=lib/forge-std/lib/ds-test/src/\",\":erc4626-tests/=lib/openzeppelin-contracts-v5.0.0/lib/erc4626-tests/\",\":forge-std/=lib/forge-std/src/\",\":halmos-cheatcodes/=lib/openzeppelin-contracts-v5.1.0/lib/halmos-cheatcodes/src/\",\":openzeppelin-contracts-v4.8.3/=lib/openzeppelin-contracts-v4.8.3/\",\":openzeppelin-contracts-v5.0.2/=lib/openzeppelin-contracts-v5.0.2/\",\":openzeppelin-contracts-v5.1.0/=lib/openzeppelin-contracts-v5.1.0/\",\":singleton-paymaster/=lib/singleton-paymaster/src/\",\":solady/=lib/solady/src/\"],\"viaIR\":true},\"sources\":{\"lib/openzeppelin-contracts-v5.1.0/contracts/utils/StorageSlot.sol\":{\"keccak256\":\"0xcf74f855663ce2ae00ed8352666b7935f6cddea2932fdf2c3ecd30a9b1cd0e97\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://9f660b1f351b757dfe01438e59888f31f33ded3afcf5cb5b0d9bf9aa6f320a8b\",\"dweb:/ipfs/QmarDJ5hZEgBtCmmrVzEZWjub9769eD686jmzb2XpSU1cM\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.28+commit.7893614a"},"language":"Solidity","output":{"abi":[],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"remappings":["@account-abstraction-v6/=lib/account-abstraction-v6/contracts/","@account-abstraction-v7/=lib/account-abstraction-v7/contracts/","@account-abstraction-v8/=lib/account-abstraction-v8/contracts/","@openzeppelin-v4.8.3/=lib/openzeppelin-contracts-v4.8.3/","@openzeppelin-v5.0.2/=lib/openzeppelin-contracts-v5.0.2/","@openzeppelin-v5.1.0/=lib/openzeppelin-contracts-v5.1.0/","@openzeppelin/contracts/=lib/openzeppelin-contracts-v5.0.2/contracts/","@test-aa-utils/=lib/singleton-paymaster/test/utils/account-abstraction/","@test-utils/=lib/singleton-paymaster/test/utils/","account-abstraction-v6/=lib/account-abstraction-v6/contracts/","account-abstraction-v7/=lib/account-abstraction-v7/contracts/","account-abstraction-v8/=lib/account-abstraction-v8/contracts/","ds-test/=lib/forge-std/lib/ds-test/src/","erc4626-tests/=lib/openzeppelin-contracts-v5.0.0/lib/erc4626-tests/","forge-std/=lib/forge-std/src/","halmos-cheatcodes/=lib/openzeppelin-contracts-v5.1.0/lib/halmos-cheatcodes/src/","openzeppelin-contracts-v4.8.3/=lib/openzeppelin-contracts-v4.8.3/","openzeppelin-contracts-v5.0.2/=lib/openzeppelin-contracts-v5.0.2/","openzeppelin-contracts-v5.1.0/=lib/openzeppelin-contracts-v5.1.0/","singleton-paymaster/=lib/singleton-paymaster/src/","solady/=lib/solady/src/"],"optimizer":{"enabled":true,"runs":1000},"metadata":{"bytecodeHash":"ipfs"},"compilationTarget":{"lib/openzeppelin-contracts-v5.1.0/contracts/utils/StorageSlot.sol":"StorageSlot"},"evmVersion":"cancun","libraries":{},"viaIR":true},"sources":{"lib/openzeppelin-contracts-v5.1.0/contracts/utils/StorageSlot.sol":{"keccak256":"0xcf74f855663ce2ae00ed8352666b7935f6cddea2932fdf2c3ecd30a9b1cd0e97","urls":["bzz-raw://9f660b1f351b757dfe01438e59888f31f33ded3afcf5cb5b0d9bf9aa6f320a8b","dweb:/ipfs/QmarDJ5hZEgBtCmmrVzEZWjub9769eD686jmzb2XpSU1cM"],"license":"MIT"}},"version":1},"id":17}
|
package/esm/cli/setupServer.js
CHANGED
|
@@ -6,6 +6,7 @@ import { flushOnStartUp } from "../executor/senderManager/flushOnStartUp.js";
|
|
|
6
6
|
import { validateAndRefillWallets } from "../executor/senderManager/validateAndRefill.js";
|
|
7
7
|
import { UserOpMonitor } from "../executor/userOpMonitor.js";
|
|
8
8
|
import { createMempoolStore } from "../store/createMempoolStore.js";
|
|
9
|
+
import { persistShutdownState, restoreShutdownState } from "./shutDown.js";
|
|
9
10
|
const getReputationManager = (config) => {
|
|
10
11
|
if (config.safeMode) {
|
|
11
12
|
return new ReputationManager(config);
|
|
@@ -185,12 +186,27 @@ export const setupServer = async ({ config, registry, metrics, senderManager, ga
|
|
|
185
186
|
registry,
|
|
186
187
|
metrics
|
|
187
188
|
});
|
|
189
|
+
const shutdownLogger = rootLogger.child({ module: "shutdown" }, {
|
|
190
|
+
level: config.logLevel
|
|
191
|
+
});
|
|
192
|
+
restoreShutdownState({
|
|
193
|
+
mempool,
|
|
194
|
+
userOpMonitor,
|
|
195
|
+
config,
|
|
196
|
+
logger: shutdownLogger,
|
|
197
|
+
senderManager
|
|
198
|
+
});
|
|
188
199
|
server.start();
|
|
189
200
|
const gracefulShutdown = async (signal) => {
|
|
190
201
|
rootLogger.info(`${signal} received, shutting down`);
|
|
191
202
|
await server.stop();
|
|
192
203
|
rootLogger.info("server stopped");
|
|
193
|
-
await
|
|
204
|
+
await persistShutdownState({
|
|
205
|
+
mempool,
|
|
206
|
+
config,
|
|
207
|
+
userOpMonitor,
|
|
208
|
+
logger: shutdownLogger
|
|
209
|
+
});
|
|
194
210
|
// mark all executors as processed
|
|
195
211
|
for (const account of senderManager.getActiveWallets()) {
|
|
196
212
|
await senderManager.markWalletProcessed(account);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupServer.js","sourceRoot":"","sources":["../../cli/setupServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAsB,MAAM,gBAAgB,CAAA;AAC9E,OAAO,EAAE,YAAY,EAAwB,MAAM,gBAAgB,CAAA;AACnE,OAAO,EAEH,OAAO,EACP,OAAO,EACP,qBAAqB,EACrB,iBAAiB,EACpB,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAK9E,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAA;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,6CAA6C,CAAA;AACtF,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;
|
|
1
|
+
{"version":3,"file":"setupServer.js","sourceRoot":"","sources":["../../cli/setupServer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import type { SenderManager, UserOpMonitor } from "../executor/index.js";
|
|
2
|
+
import type { Mempool } from "../mempool/index.js";
|
|
3
|
+
import type { Logger } from "pino";
|
|
4
|
+
import type { AltoConfig } from "../createConfig.js";
|
|
5
|
+
export declare function persistShutdownState({ mempool, userOpMonitor, config, logger }: {
|
|
6
|
+
mempool: Mempool;
|
|
7
|
+
userOpMonitor: UserOpMonitor;
|
|
8
|
+
config: AltoConfig;
|
|
9
|
+
logger: Logger;
|
|
10
|
+
}): Promise<void>;
|
|
11
|
+
export declare function restoreShutdownState({ mempool, userOpMonitor, config, logger, senderManager }: {
|
|
12
|
+
mempool: Mempool;
|
|
13
|
+
userOpMonitor: UserOpMonitor;
|
|
14
|
+
config: AltoConfig;
|
|
15
|
+
logger: Logger;
|
|
16
|
+
senderManager: SenderManager;
|
|
17
|
+
}): Promise<void>;
|
|
18
|
+
//# sourceMappingURL=shutDown.d.ts.map
|
|
@@ -0,0 +1,247 @@
|
|
|
1
|
+
import { recoverableJsonParseWithBigint, recoverableJsonStringifyWithBigint } from "../utils/index.js";
|
|
2
|
+
import Queue from "bull";
|
|
3
|
+
import Redis from "ioredis";
|
|
4
|
+
const getQueueName = (chainId) => `alto:mempool:restoration:${chainId}`;
|
|
5
|
+
async function dropAllOperationsOnShutdown({ config, mempool, logger }) {
|
|
6
|
+
await Promise.all(config.entrypoints.map(async (entryPoint) => {
|
|
7
|
+
try {
|
|
8
|
+
const [outstanding, submitted, processing] = await Promise.all([
|
|
9
|
+
mempool.dumpOutstanding(entryPoint),
|
|
10
|
+
mempool.dumpSubmittedOps(entryPoint),
|
|
11
|
+
mempool.dumpProcessing(entryPoint)
|
|
12
|
+
]);
|
|
13
|
+
const rejectedUserOps = [
|
|
14
|
+
...outstanding.map((userOp) => ({
|
|
15
|
+
...userOp,
|
|
16
|
+
reason: "shutdown"
|
|
17
|
+
})),
|
|
18
|
+
...submitted.map((userOp) => ({
|
|
19
|
+
...userOp,
|
|
20
|
+
reason: "shutdown"
|
|
21
|
+
})),
|
|
22
|
+
...processing.map((userOp) => ({
|
|
23
|
+
...userOp,
|
|
24
|
+
reason: "shutdown"
|
|
25
|
+
}))
|
|
26
|
+
];
|
|
27
|
+
if (rejectedUserOps.length > 0) {
|
|
28
|
+
await mempool.dropUserOps(entryPoint, rejectedUserOps);
|
|
29
|
+
}
|
|
30
|
+
logger.info({
|
|
31
|
+
outstanding: outstanding.length,
|
|
32
|
+
submitted: submitted.length,
|
|
33
|
+
processing: processing.length
|
|
34
|
+
}, "[MEMPOOL-RESTORATION] Dropping mempool operations");
|
|
35
|
+
}
|
|
36
|
+
catch (err) {
|
|
37
|
+
logger.error({ err, entryPoint }, "[MEMPOOL-RESTORATION] Failed to drop operations for entrypoint during shutdown");
|
|
38
|
+
// Continue with other entrypoints
|
|
39
|
+
}
|
|
40
|
+
}));
|
|
41
|
+
}
|
|
42
|
+
async function queueOperationsOnShutdownToRedis({ mempool, userOpMonitor, config, logger }) {
|
|
43
|
+
if (!config.redisShutdownMempoolUrl) {
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
46
|
+
try {
|
|
47
|
+
const redis = new Redis(config.redisShutdownMempoolUrl);
|
|
48
|
+
const queueName = getQueueName(config.publicClient.chain.id);
|
|
49
|
+
const restorationQueue = new Queue(queueName, {
|
|
50
|
+
createClient: () => {
|
|
51
|
+
return redis;
|
|
52
|
+
}
|
|
53
|
+
});
|
|
54
|
+
logger.info({
|
|
55
|
+
queueName,
|
|
56
|
+
chainId: config.publicClient.chain.id
|
|
57
|
+
}, "[MEMPOOL-RESTORATION] Publishing to restoration queue during shutdown");
|
|
58
|
+
// Publish mempool data to the queue
|
|
59
|
+
await Promise.all(config.entrypoints.map(async (entryPoint) => {
|
|
60
|
+
try {
|
|
61
|
+
const [outstanding, submitted, processing, pendingBundles] = await Promise.all([
|
|
62
|
+
mempool.dumpOutstanding(entryPoint),
|
|
63
|
+
mempool.dumpSubmittedOps(entryPoint),
|
|
64
|
+
mempool.dumpProcessing(entryPoint),
|
|
65
|
+
userOpMonitor.getPendingBundles()
|
|
66
|
+
]);
|
|
67
|
+
if (outstanding.length > 0 ||
|
|
68
|
+
submitted.length > 0 ||
|
|
69
|
+
processing.length > 0 ||
|
|
70
|
+
pendingBundles.length > 0) {
|
|
71
|
+
await restorationQueue.add({
|
|
72
|
+
type: "MEMPOOL_DATA",
|
|
73
|
+
chainId: config.publicClient.chain.id,
|
|
74
|
+
entryPoint,
|
|
75
|
+
data: recoverableJsonStringifyWithBigint({
|
|
76
|
+
outstanding,
|
|
77
|
+
submitted,
|
|
78
|
+
processing,
|
|
79
|
+
pendingBundles
|
|
80
|
+
}),
|
|
81
|
+
timestamp: Date.now()
|
|
82
|
+
});
|
|
83
|
+
}
|
|
84
|
+
logger.info({
|
|
85
|
+
entryPoint,
|
|
86
|
+
outstanding: outstanding.length,
|
|
87
|
+
submitted: submitted.length,
|
|
88
|
+
processing: processing.length
|
|
89
|
+
}, "[MEMPOOL-RESTORATION] Published mempool data to restoration queue");
|
|
90
|
+
}
|
|
91
|
+
catch (err) {
|
|
92
|
+
logger.error({ err, entryPoint }, "[MEMPOOL-RESTORATION] Failed to publish mempool data for entrypoint, continuing");
|
|
93
|
+
// Continue with other entrypoints
|
|
94
|
+
}
|
|
95
|
+
}));
|
|
96
|
+
await restorationQueue.add({
|
|
97
|
+
type: "END_RESTORATION",
|
|
98
|
+
chainId: config.publicClient.chain.id,
|
|
99
|
+
timestamp: Date.now()
|
|
100
|
+
});
|
|
101
|
+
logger.info("[MEMPOOL-RESTORATION] Published END_RESTORATION message");
|
|
102
|
+
await redis.quit();
|
|
103
|
+
}
|
|
104
|
+
catch (err) {
|
|
105
|
+
logger.error({ err }, "[MEMPOOL-RESTORATION] Unexpected error during queue-based shutdown, falling back to dropping operations");
|
|
106
|
+
// Fall back to dropping operations
|
|
107
|
+
await dropAllOperationsOnShutdown({ mempool, logger, config });
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
export function persistShutdownState({ mempool, userOpMonitor, config, logger }) {
|
|
111
|
+
if (config.redisShutdownMempoolUrl) {
|
|
112
|
+
return queueOperationsOnShutdownToRedis({
|
|
113
|
+
mempool,
|
|
114
|
+
userOpMonitor,
|
|
115
|
+
config,
|
|
116
|
+
logger
|
|
117
|
+
});
|
|
118
|
+
}
|
|
119
|
+
// No queue configured, drop all operations
|
|
120
|
+
return dropAllOperationsOnShutdown({ mempool, logger, config });
|
|
121
|
+
}
|
|
122
|
+
export async function restoreShutdownState({ mempool, userOpMonitor, config, logger, senderManager }) {
|
|
123
|
+
const redisShutdownMempoolUrl = config.redisShutdownMempoolUrl;
|
|
124
|
+
if (!redisShutdownMempoolUrl) {
|
|
125
|
+
return;
|
|
126
|
+
}
|
|
127
|
+
let restorationTimeout = null;
|
|
128
|
+
try {
|
|
129
|
+
const queueName = getQueueName(config.publicClient.chain.id);
|
|
130
|
+
let client;
|
|
131
|
+
let subscriber;
|
|
132
|
+
const restorationQueue = new Queue(queueName, {
|
|
133
|
+
createClient: (type, redisOpts) => {
|
|
134
|
+
switch (type) {
|
|
135
|
+
case "client": {
|
|
136
|
+
if (!client) {
|
|
137
|
+
client = new Redis(redisShutdownMempoolUrl, {
|
|
138
|
+
...redisOpts,
|
|
139
|
+
enableReadyCheck: false,
|
|
140
|
+
maxRetriesPerRequest: null
|
|
141
|
+
});
|
|
142
|
+
}
|
|
143
|
+
return client;
|
|
144
|
+
}
|
|
145
|
+
case "subscriber": {
|
|
146
|
+
if (!subscriber) {
|
|
147
|
+
subscriber = new Redis(redisShutdownMempoolUrl, {
|
|
148
|
+
...redisOpts,
|
|
149
|
+
enableReadyCheck: false,
|
|
150
|
+
maxRetriesPerRequest: null
|
|
151
|
+
});
|
|
152
|
+
}
|
|
153
|
+
return subscriber;
|
|
154
|
+
}
|
|
155
|
+
case "bclient":
|
|
156
|
+
return new Redis(redisShutdownMempoolUrl, {
|
|
157
|
+
...redisOpts,
|
|
158
|
+
enableReadyCheck: false,
|
|
159
|
+
maxRetriesPerRequest: null
|
|
160
|
+
});
|
|
161
|
+
default:
|
|
162
|
+
throw new Error(`Unexpected connection type: ${type}`);
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
});
|
|
166
|
+
if (await restorationQueue.isPaused()) {
|
|
167
|
+
await restorationQueue.resume();
|
|
168
|
+
}
|
|
169
|
+
const timeoutMs = config.restorationQueueTimeout || 30 * 60 * 1000;
|
|
170
|
+
restorationTimeout = setTimeout(async () => {
|
|
171
|
+
logger.warn({ timeoutMs }, "[MEMPOOL-RESTORATION] Mempool restoration timeout reached, stopping listener");
|
|
172
|
+
if (restorationTimeout) {
|
|
173
|
+
clearTimeout(restorationTimeout);
|
|
174
|
+
}
|
|
175
|
+
await restorationQueue.close();
|
|
176
|
+
await client.quit();
|
|
177
|
+
await subscriber.quit();
|
|
178
|
+
}, timeoutMs);
|
|
179
|
+
await restorationQueue.process(1, async (job, done) => {
|
|
180
|
+
try {
|
|
181
|
+
logger.info({
|
|
182
|
+
jobId: job.id,
|
|
183
|
+
messageType: job.data.type,
|
|
184
|
+
timestamp: job.data.timestamp
|
|
185
|
+
}, "[MEMPOOL-RESTORATION] Processing restoration message");
|
|
186
|
+
const message = job.data;
|
|
187
|
+
if (message.type === "END_RESTORATION") {
|
|
188
|
+
logger.info("[MEMPOOL-RESTORATION] Received END_RESTORATION message, stopping listener");
|
|
189
|
+
if (restorationTimeout) {
|
|
190
|
+
clearTimeout(restorationTimeout);
|
|
191
|
+
}
|
|
192
|
+
await restorationQueue.close();
|
|
193
|
+
await client.quit();
|
|
194
|
+
await subscriber.quit();
|
|
195
|
+
return done();
|
|
196
|
+
}
|
|
197
|
+
if (message.type === "MEMPOOL_DATA") {
|
|
198
|
+
const { entryPoint } = message;
|
|
199
|
+
const data = recoverableJsonParseWithBigint(message.data);
|
|
200
|
+
logger.info({
|
|
201
|
+
entryPoint,
|
|
202
|
+
outstanding: data.outstanding.length,
|
|
203
|
+
submitted: data.submitted.length,
|
|
204
|
+
processing: data.processing.length,
|
|
205
|
+
pendingBundles: data.pendingBundles.length
|
|
206
|
+
}, "[MEMPOOL-RESTORATION] Received mempool restoration data");
|
|
207
|
+
for (const userOpInfo of data.outstanding) {
|
|
208
|
+
await mempool.store.addOutstanding({
|
|
209
|
+
entryPoint,
|
|
210
|
+
userOpInfo
|
|
211
|
+
});
|
|
212
|
+
}
|
|
213
|
+
for (const userOpInfo of data.processing) {
|
|
214
|
+
await mempool.store.addOutstanding({
|
|
215
|
+
entryPoint,
|
|
216
|
+
userOpInfo
|
|
217
|
+
});
|
|
218
|
+
}
|
|
219
|
+
for (const userOpInfo of data.submitted) {
|
|
220
|
+
await mempool.store.addSubmitted({
|
|
221
|
+
entryPoint,
|
|
222
|
+
userOpInfo
|
|
223
|
+
});
|
|
224
|
+
}
|
|
225
|
+
for (const submittedBundle of data.pendingBundles) {
|
|
226
|
+
userOpMonitor.trackBundle(submittedBundle);
|
|
227
|
+
if (senderManager.lockWallet) {
|
|
228
|
+
senderManager.lockWallet(submittedBundle.executor);
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
}
|
|
232
|
+
return done();
|
|
233
|
+
}
|
|
234
|
+
catch (err) {
|
|
235
|
+
done();
|
|
236
|
+
logger.error({ err }, "[MEMPOOL-RESTORATION] Error processing restoration message, continuing");
|
|
237
|
+
}
|
|
238
|
+
});
|
|
239
|
+
}
|
|
240
|
+
catch (err) {
|
|
241
|
+
logger.warn({ err }, "[MEMPOOL-RESTORATION] Failed to start restoration listener, continuing without restoration");
|
|
242
|
+
if (restorationTimeout) {
|
|
243
|
+
clearTimeout(restorationTimeout);
|
|
244
|
+
}
|
|
245
|
+
}
|
|
246
|
+
}
|
|
247
|
+
//# sourceMappingURL=shutDown.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"shutDown.js","sourceRoot":"","sources":["../../cli/shutDown.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,8BAA8B,EAC9B,kCAAkC,EACrC,MAAM,aAAa,CAAA;AACpB,OAAO,KAAK,MAAM,MAAM,CAAA;AACxB,OAAO,KAAK,MAAM,SAAS,CAAA;AAI3B,MAAM,YAAY,GAAG,CAAC,OAAe,EAAE,EAAE,CAAC,4BAA4B,OAAO,EAAE,CAAA;AAE/E,KAAK,UAAU,2BAA2B,CAAC,EACvC,MAAM,EACN,OAAO,EACP,MAAM,EACiD;IACvD,MAAM,OAAO,CAAC,GAAG,CACb,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;QACxC,IAAI,CAAC;YACD,MAAM,CAAC,WAAW,EAAE,SAAS,EAAE,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBAC3D,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC;gBACnC,OAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC;gBACpC,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC;aACrC,CAAC,CAAA;YAEF,MAAM,eAAe,GAAG;gBACpB,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;oBAC5B,GAAG,MAAM;oBACT,MAAM,EAAE,UAAU;iBACrB,CAAC,CAAC;gBACH,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;oBAC1B,GAAG,MAAM;oBACT,MAAM,EAAE,UAAU;iBACrB,CAAC,CAAC;gBACH,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;oBAC3B,GAAG,MAAM;oBACT,MAAM,EAAE,UAAU;iBACrB,CAAC,CAAC;aACN,CAAA;YAED,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC7B,MAAM,OAAO,CAAC,WAAW,CAAC,UAAU,EAAE,eAAe,CAAC,CAAA;YAC1D,CAAC;YAED,MAAM,CAAC,IAAI,CACP;gBACI,WAAW,EAAE,WAAW,CAAC,MAAM;gBAC/B,SAAS,EAAE,SAAS,CAAC,MAAM;gBAC3B,UAAU,EAAE,UAAU,CAAC,MAAM;aAChC,EACD,mDAAmD,CACtD,CAAA;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,CAAC,KAAK,CACR,EAAE,GAAG,EAAE,UAAU,EAAE,EACnB,gFAAgF,CACnF,CAAA;YACD,kCAAkC;QACtC,CAAC;IACL,CAAC,CAAC,CACL,CAAA;AACL,CAAC;AAED,KAAK,UAAU,gCAAgC,CAAC,EAC5C,OAAO,EACP,aAAa,EACb,MAAM,EACN,MAAM,EAMT;IACG,IAAI,CAAC,MAAM,CAAC,uBAAuB,EAAE,CAAC;QAClC,OAAM;IACV,CAAC;IACD,IAAI,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAA;QACvD,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QAC5D,MAAM,gBAAgB,GAAG,IAAI,KAAK,CAAC,SAAS,EAAE;YAC1C,YAAY,EAAE,GAAG,EAAE;gBACf,OAAO,KAAK,CAAA;YAChB,CAAC;SACJ,CAAC,CAAA;QAEF,MAAM,CAAC,IAAI,CACP;YACI,SAAS;YACT,OAAO,EAAE,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;SACxC,EACD,uEAAuE,CAC1E,CAAA;QACD,oCAAoC;QACpC,MAAM,OAAO,CAAC,GAAG,CACb,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;YACxC,IAAI,CAAC;gBACD,MAAM,CAAC,WAAW,EAAE,SAAS,EAAE,UAAU,EAAE,cAAc,CAAC,GACtD,MAAM,OAAO,CAAC,GAAG,CAAC;oBACd,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC;oBACnC,OAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC;oBACpC,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC;oBAClC,aAAa,CAAC,iBAAiB,EAAE;iBACpC,CAAC,CAAA;gBAEN,IACI,WAAW,CAAC,MAAM,GAAG,CAAC;oBACtB,SAAS,CAAC,MAAM,GAAG,CAAC;oBACpB,UAAU,CAAC,MAAM,GAAG,CAAC;oBACrB,cAAc,CAAC,MAAM,GAAG,CAAC,EAC3B,CAAC;oBACC,MAAM,gBAAgB,CAAC,GAAG,CAAC;wBACvB,IAAI,EAAE,cAAc;wBACpB,OAAO,EAAE,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;wBACrC,UAAU;wBACV,IAAI,EAAE,kCAAkC,CAAC;4BACrC,WAAW;4BACX,SAAS;4BACT,UAAU;4BACV,cAAc;yBACjB,CAAC;wBACF,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;qBACxB,CAAC,CAAA;gBACN,CAAC;gBACD,MAAM,CAAC,IAAI,CACP;oBACI,UAAU;oBACV,WAAW,EAAE,WAAW,CAAC,MAAM;oBAC/B,SAAS,EAAE,SAAS,CAAC,MAAM;oBAC3B,UAAU,EAAE,UAAU,CAAC,MAAM;iBAChC,EACD,mEAAmE,CACtE,CAAA;YACL,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,MAAM,CAAC,KAAK,CACR,EAAE,GAAG,EAAE,UAAU,EAAE,EACnB,iFAAiF,CACpF,CAAA;gBACD,kCAAkC;YACtC,CAAC;QACL,CAAC,CAAC,CACL,CAAA;QAED,MAAM,gBAAgB,CAAC,GAAG,CAAC;YACvB,IAAI,EAAE,iBAAiB;YACvB,OAAO,EAAE,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;YACrC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;SACxB,CAAC,CAAA;QACF,MAAM,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAA;QAEtE,MAAM,KAAK,CAAC,IAAI,EAAE,CAAA;IACtB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,MAAM,CAAC,KAAK,CACR,EAAE,GAAG,EAAE,EACP,yGAAyG,CAC5G,CAAA;QACD,mCAAmC;QACnC,MAAM,2BAA2B,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;IAClE,CAAC;AACL,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,EACjC,OAAO,EACP,aAAa,EACb,MAAM,EACN,MAAM,EAMT;IACG,IAAI,MAAM,CAAC,uBAAuB,EAAE,CAAC;QACjC,OAAO,gCAAgC,CAAC;YACpC,OAAO;YACP,aAAa;YACb,MAAM;YACN,MAAM;SACT,CAAC,CAAA;IACN,CAAC;IAED,2CAA2C;IAC3C,OAAO,2BAA2B,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;AACnE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,EACvC,OAAO,EACP,aAAa,EACb,MAAM,EACN,MAAM,EACN,aAAa,EAOhB;IACG,MAAM,uBAAuB,GAAG,MAAM,CAAC,uBAAuB,CAAA;IAC9D,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC3B,OAAM;IACV,CAAC;IACD,IAAI,kBAAkB,GAA0B,IAAI,CAAA;IAEpD,IAAI,CAAC;QACD,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QAE5D,IAAI,MAAa,CAAA;QACjB,IAAI,UAAiB,CAAA;QAErB,MAAM,gBAAgB,GAAG,IAAI,KAAK,CAAC,SAAS,EAAE;YAC1C,YAAY,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE;gBAC9B,QAAQ,IAAI,EAAE,CAAC;oBACX,KAAK,QAAQ,CAAC,CAAC,CAAC;wBACZ,IAAI,CAAC,MAAM,EAAE,CAAC;4BACV,MAAM,GAAG,IAAI,KAAK,CAAC,uBAAuB,EAAE;gCACxC,GAAG,SAAS;gCACZ,gBAAgB,EAAE,KAAK;gCACvB,oBAAoB,EAAE,IAAI;6BAC7B,CAAC,CAAA;wBACN,CAAC;wBACD,OAAO,MAAM,CAAA;oBACjB,CAAC;oBACD,KAAK,YAAY,CAAC,CAAC,CAAC;wBAChB,IAAI,CAAC,UAAU,EAAE,CAAC;4BACd,UAAU,GAAG,IAAI,KAAK,CAAC,uBAAuB,EAAE;gCAC5C,GAAG,SAAS;gCACZ,gBAAgB,EAAE,KAAK;gCACvB,oBAAoB,EAAE,IAAI;6BAC7B,CAAC,CAAA;wBACN,CAAC;wBACD,OAAO,UAAU,CAAA;oBACrB,CAAC;oBACD,KAAK,SAAS;wBACV,OAAO,IAAI,KAAK,CAAC,uBAAuB,EAAE;4BACtC,GAAG,SAAS;4BACZ,gBAAgB,EAAE,KAAK;4BACvB,oBAAoB,EAAE,IAAI;yBAC7B,CAAC,CAAA;oBACN;wBACI,MAAM,IAAI,KAAK,CAAC,+BAA+B,IAAI,EAAE,CAAC,CAAA;gBAC9D,CAAC;YACL,CAAC;SACJ,CAAC,CAAA;QAEF,IAAI,MAAM,gBAAgB,CAAC,QAAQ,EAAE,EAAE,CAAC;YACpC,MAAM,gBAAgB,CAAC,MAAM,EAAE,CAAA;QACnC,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,CAAC,uBAAuB,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;QAClE,kBAAkB,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;YACvC,MAAM,CAAC,IAAI,CACP,EAAE,SAAS,EAAE,EACb,8EAA8E,CACjF,CAAA;YACD,IAAI,kBAAkB,EAAE,CAAC;gBACrB,YAAY,CAAC,kBAAkB,CAAC,CAAA;YACpC,CAAC;YACD,MAAM,gBAAgB,CAAC,KAAK,EAAE,CAAA;YAC9B,MAAM,MAAM,CAAC,IAAI,EAAE,CAAA;YACnB,MAAM,UAAU,CAAC,IAAI,EAAE,CAAA;QAC3B,CAAC,EAAE,SAAS,CAAC,CAAA;QAEb,MAAM,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YAClD,IAAI,CAAC;gBACD,MAAM,CAAC,IAAI,CACP;oBACI,KAAK,EAAE,GAAG,CAAC,EAAE;oBACb,WAAW,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI;oBAC1B,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,SAAS;iBAChC,EACD,sDAAsD,CACzD,CAAA;gBAED,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAA;gBAExB,IAAI,OAAO,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;oBACrC,MAAM,CAAC,IAAI,CACP,2EAA2E,CAC9E,CAAA;oBACD,IAAI,kBAAkB,EAAE,CAAC;wBACrB,YAAY,CAAC,kBAAkB,CAAC,CAAA;oBACpC,CAAC;oBACD,MAAM,gBAAgB,CAAC,KAAK,EAAE,CAAA;oBAC9B,MAAM,MAAM,CAAC,IAAI,EAAE,CAAA;oBACnB,MAAM,UAAU,CAAC,IAAI,EAAE,CAAA;oBACvB,OAAO,IAAI,EAAE,CAAA;gBACjB,CAAC;gBAED,IAAI,OAAO,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;oBAClC,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAA;oBAC9B,MAAM,IAAI,GAAG,8BAA8B,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;oBACzD,MAAM,CAAC,IAAI,CACP;wBACI,UAAU;wBACV,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM;wBACpC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM;wBAChC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM;wBAClC,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,MAAM;qBAC7C,EACD,yDAAyD,CAC5D,CAAA;oBAED,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;wBACxC,MAAM,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC;4BAC/B,UAAU;4BACV,UAAU;yBACb,CAAC,CAAA;oBACN,CAAC;oBAED,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;wBACvC,MAAM,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC;4BAC/B,UAAU;4BACV,UAAU;yBACb,CAAC,CAAA;oBACN,CAAC;oBAED,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;wBACtC,MAAM,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC;4BAC7B,UAAU;4BACV,UAAU;yBACb,CAAC,CAAA;oBACN,CAAC;oBAED,KAAK,MAAM,eAAe,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;wBAChD,aAAa,CAAC,WAAW,CAAC,eAAe,CAAC,CAAA;wBAC1C,IAAI,aAAa,CAAC,UAAU,EAAE,CAAC;4BAC3B,aAAa,CAAC,UAAU,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;wBACtD,CAAC;oBACL,CAAC;gBACL,CAAC;gBACD,OAAO,IAAI,EAAE,CAAA;YACjB,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,IAAI,EAAE,CAAA;gBACN,MAAM,CAAC,KAAK,CACR,EAAE,GAAG,EAAE,EACP,wEAAwE,CAC3E,CAAA;YACL,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,MAAM,CAAC,IAAI,CACP,EAAE,GAAG,EAAE,EACP,4FAA4F,CAC/F,CAAA;QACD,IAAI,kBAAkB,EAAE,CAAC;YACrB,YAAY,CAAC,kBAAkB,CAAC,CAAA;QACpC,CAAC;IACL,CAAC;AACL,CAAC"}
|