diff --git a/scripts/config.local.json b/scripts/config.local.json index b67780ea..16914544 100644 --- a/scripts/config.local.json +++ b/scripts/config.local.json @@ -12,6 +12,7 @@ "entrypoints": "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789,0x0000000071727De22E5E9d8BAf0edAc6f37da032", "entrypoint-simulation-contract": "0xBbe8A301FbDb2a4CD58c4A37c262ecef8f889c47", "enable-debug-endpoints": true, + "code-override-support": true, "expiration-check": false, "safe-mode": false, "api-version": "v1,v2", diff --git a/src/cli/config/bundler.ts b/src/cli/config/bundler.ts index 79271b50..87780231 100644 --- a/src/cli/config/bundler.ts +++ b/src/cli/config/bundler.ts @@ -162,7 +162,8 @@ export const rpcArgsSchema = z.object({ "send-transaction-rpc-url": z.string().url().optional(), "polling-interval": z.number().int().min(0), "max-block-range": z.number().int().min(0).optional(), - "block-tag-support": z.boolean().optional().default(true) + "block-tag-support": z.boolean().optional().default(true), + "code-override-support": z.boolean().optional().default(false) }) export const bundleCopmressionArgsSchema = z.object({ diff --git a/src/cli/config/options.ts b/src/cli/config/options.ts index 6895d5c0..94c14626 100644 --- a/src/cli/config/options.ts +++ b/src/cli/config/options.ts @@ -326,6 +326,12 @@ export const rpcOptions: CliCommandOptions = { type: "boolean", require: false, default: true + }, + "code-override-support": { + description: "Does the RPC support code overrides", + type: "boolean", + require: false, + default: false } } diff --git a/src/cli/setupServer.ts b/src/cli/setupServer.ts index aaaf6c1b..1af49315 100644 --- a/src/cli/setupServer.ts +++ b/src/cli/setupServer.ts @@ -91,6 +91,7 @@ const getValidator = ({ utilityWalletAddress, parsedArgs["binary-search-tolerance-delta"], parsedArgs["binary-search-gas-allowance"], + parsedArgs["code-override-support"], parsedArgs["entrypoint-simulation-contract"], parsedArgs["fixed-gas-limit-for-estimation"], parsedArgs.tenderly, @@ -110,6 +111,7 @@ const getValidator = ({ utilityWalletAddress, parsedArgs["binary-search-tolerance-delta"], parsedArgs["binary-search-gas-allowance"], + parsedArgs["code-override-support"], parsedArgs["entrypoint-simulation-contract"], parsedArgs["fixed-gas-limit-for-estimation"], parsedArgs.tenderly, diff --git a/src/rpc/estimation/gasEstimationHandler.ts b/src/rpc/estimation/gasEstimationHandler.ts index 09041b5f..0206b601 100644 --- a/src/rpc/estimation/gasEstimationHandler.ts +++ b/src/rpc/estimation/gasEstimationHandler.ts @@ -7,19 +7,12 @@ import { GasEstimatorV06 } from "./gasEstimationsV06" import { GasEstimatorV07 } from "./gasEstimationsV07" import type { SimulateHandleOpResult } from "./types" -export const EXECUTE_SIMULATOR_BYTECODE = - "0x60806040526004361061012e5760003560e01c806372b37bca116100ab578063b760faf91161006f578063b760faf914610452578063bb9fe6bf14610465578063c23a5cea1461047a578063d6383f941461049a578063ee219423146104ba578063fc7e286d146104da57600080fd5b806372b37bca146103bd5780638f41ec5a146103dd578063957122ab146103f25780639b249f6914610412578063a61935311461043257600080fd5b8063205c2878116100f2578063205c28781461020157806335567e1a146102215780634b1d7cf5146102415780635287ce121461026157806370a082311461037e57600080fd5b80630396cb60146101435780630bd28e3b146101565780631b2e01b8146101765780631d732756146101c15780631fad948c146101e157600080fd5b3661013e5761013c3361058f565b005b600080fd5b61013c6101513660046131c9565b6105f6565b34801561016257600080fd5b5061013c61017136600461320b565b610885565b34801561018257600080fd5b506101ae610191366004613246565b600160209081526000928352604080842090915290825290205481565b6040519081526020015b60405180910390f35b3480156101cd57600080fd5b506101ae6101dc366004613440565b6108bc565b3480156101ed57600080fd5b5061013c6101fc366004613549565b610a2f565b34801561020d57600080fd5b5061013c61021c36600461359f565b610bab565b34801561022d57600080fd5b506101ae61023c366004613246565b610d27565b34801561024d57600080fd5b5061013c61025c366004613549565b610d6d565b34801561026d57600080fd5b5061032661027c3660046135cb565b6040805160a081018252600080825260208201819052918101829052606081018290526080810191909152506001600160a01b031660009081526020818152604091829020825160a08101845281546001600160701b038082168352600160701b820460ff16151594830194909452600160781b90049092169282019290925260019091015463ffffffff81166060830152640100000000900465ffffffffffff16608082015290565b6040805182516001600160701b03908116825260208085015115159083015283830151169181019190915260608083015163ffffffff169082015260809182015165ffffffffffff169181019190915260a0016101b8565b34801561038a57600080fd5b506101ae6103993660046135cb565b6001600160a01b03166000908152602081905260409020546001600160701b031690565b3480156103c957600080fd5b5061013c6103d83660046135e8565b6111b0565b3480156103e957600080fd5b506101ae600181565b3480156103fe57600080fd5b5061013c61040d366004613643565b611289565b34801561041e57600080fd5b5061013c61042d3660046136c7565b611386565b34801561043e57600080fd5b506101ae61044d366004613721565b611441565b61013c6104603660046135cb565b61058f565b34801561047157600080fd5b5061013c611483565b34801561048657600080fd5b5061013c6104953660046135cb565b6115ac565b3480156104a657600080fd5b5061013c6104b5366004613755565b6117e4565b3480156104c657600080fd5b5061013c6104d5366004613721565b6118df565b3480156104e657600080fd5b506105496104f53660046135cb565b600060208190529081526040902080546001909101546001600160701b0380831692600160701b810460ff1692600160781b9091049091169063ffffffff811690640100000000900465ffffffffffff1685565b604080516001600160701b0396871681529415156020860152929094169183019190915263ffffffff16606082015265ffffffffffff909116608082015260a0016101b8565b6105998134611abb565b6001600160a01b03811660008181526020818152604091829020805492516001600160701b03909316835292917f2da466a7b24304f47e87fa2e1e5a81b9831ce54fec19055ce277ca2f39ba42c491015b60405180910390a25050565b33600090815260208190526040902063ffffffff821661065d5760405162461bcd60e51b815260206004820152601a60248201527f6d757374207370656369667920756e7374616b652064656c617900000000000060448201526064015b60405180910390fd5b600181015463ffffffff90811690831610156106bb5760405162461bcd60e51b815260206004820152601c60248201527f63616e6e6f7420646563726561736520756e7374616b652074696d65000000006044820152606401610654565b80546000906106db903490600160781b90046001600160701b03166137cc565b9050600081116107225760405162461bcd60e51b81526020600482015260126024820152711b9bc81cdd185ad9481cdc1958da599a595960721b6044820152606401610654565b6001600160701b0381111561076a5760405162461bcd60e51b815260206004820152600e60248201526d7374616b65206f766572666c6f7760901b6044820152606401610654565b6040805160a08101825283546001600160701b0390811682526001602080840182815286841685870190815263ffffffff808b16606088019081526000608089018181523380835296829052908a902098518954955194518916600160781b02600160781b600160e81b0319951515600160701b026effffffffffffffffffffffffffffff199097169190991617949094179290921695909517865551949092018054925165ffffffffffff166401000000000269ffffffffffffffffffff19909316949093169390931717905590517fa5ae833d0bb1dcd632d98a8b70973e8516812898e19bf27b70071ebc8dc52c0190610878908490879091825263ffffffff16602082015260400190565b60405180910390a2505050565b3360009081526001602090815260408083206001600160c01b038516845290915281208054916108b4836137df565b919050555050565b6000805a90503330146109115760405162461bcd60e51b815260206004820152601760248201527f4141393220696e7465726e616c2063616c6c206f6e6c790000000000000000006044820152606401610654565b8451604081015160608201518101611388015a101561093b5763deaddead60e01b60005260206000fd5b8751600090156109cf576000610958846000015160008c86611b57565b9050806109cd57600061096c610800611b6f565b8051909150156109c75784600001516001600160a01b03168a602001517f1c4fada7374c0a9ee8841fc38afe82932dc0f8e69012e927f061a8bae611a2018760200151846040516109be929190613848565b60405180910390a35b60019250505b505b600088608001515a8603019050610a216000838b8b8b8080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250889250611b9b915050565b9a9950505050505050505050565b610a37611e92565b816000816001600160401b03811115610a5257610a5261327b565b604051908082528060200260200182016040528015610a8b57816020015b610a7861313f565b815260200190600190039081610a705790505b50905060005b82811015610b04576000828281518110610aad57610aad613861565b60200260200101519050600080610ae8848a8a87818110610ad057610ad0613861565b9050602002810190610ae29190613877565b85611ee9565b91509150610af984838360006120d4565b505050600101610a91565b506040516000907fbb47ee3e183a558b1a2ff0874b079f3fc5478b7454eacf2bfc5af2ff5878f972908290a160005b83811015610b8e57610b8281888884818110610b5157610b51613861565b9050602002810190610b639190613877565b858481518110610b7557610b75613861565b6020026020010151612270565b90910190600101610b33565b50610b998482612397565b505050610ba66001600255565b505050565b33600090815260208190526040902080546001600160701b0316821115610c145760405162461bcd60e51b815260206004820152601960248201527f576974686472617720616d6f756e7420746f6f206c61726765000000000000006044820152606401610654565b8054610c2a9083906001600160701b0316613898565b81546001600160701b0319166001600160701b0391909116178155604080516001600160a01b03851681526020810184905233917fd1c19fbcd4551a5edfb66d43d2e337c04837afda3482b42bdf569a8fccdae5fb910160405180910390a26000836001600160a01b03168360405160006040518083038185875af1925050503d8060008114610cd6576040519150601f19603f3d011682016040523d82523d6000602084013e610cdb565b606091505b5050905080610d215760405162461bcd60e51b81526020600482015260126024820152716661696c656420746f20776974686472617760701b6044820152606401610654565b50505050565b6001600160a01b03821660009081526001602090815260408083206001600160c01b038516845290915290819020549082901b67ffffffffffffffff1916175b92915050565b610d75611e92565b816000805b82811015610ee95736868683818110610d9557610d95613861565b9050602002810190610da791906138ab565b9050366000610db683806138c1565b90925090506000610dcd60408501602086016135cb565b90506000196001600160a01b03821601610e295760405162461bcd60e51b815260206004820152601760248201527f4141393620696e76616c69642061676772656761746f720000000000000000006044820152606401610654565b6001600160a01b03811615610ec6576001600160a01b03811663e3563a4f8484610e56604089018961390a565b6040518563ffffffff1660e01b8152600401610e759493929190613ab5565b60006040518083038186803b158015610e8d57600080fd5b505afa925050508015610e9e575060015b610ec65760405163086a9f7560e41b81526001600160a01b0382166004820152602401610654565b610ed082876137cc565b9550505050508080610ee1906137df565b915050610d7a565b506000816001600160401b03811115610f0457610f0461327b565b604051908082528060200260200182016040528015610f3d57816020015b610f2a61313f565b815260200190600190039081610f225790505b506040519091507fbb47ee3e183a558b1a2ff0874b079f3fc5478b7454eacf2bfc5af2ff5878f97290600090a16000805b848110156110525736888883818110610f8957610f89613861565b9050602002810190610f9b91906138ab565b9050366000610faa83806138c1565b90925090506000610fc160408501602086016135cb565b90508160005b81811015611039576000898981518110610fe357610fe3613861565b602002602001015190506000806110068b898987818110610ad057610ad0613861565b91509150611016848383896120d4565b8a611020816137df565b9b50505050508080611031906137df565b915050610fc7565b505050505050808061104a906137df565b915050610f6e565b50600080915060005b8581101561116b573689898381811061107657611076613861565b905060200281019061108891906138ab565b905061109a60408201602083016135cb565b6001600160a01b03167f575ff3acadd5ab348fe1855e217e0f3678f8d767d7494c9f9fefbee2e17cca4d60405160405180910390a23660006110dc83806138c1565b90925090508060005b81811015611153576111278885858481811061110357611103613861565b90506020028101906111159190613877565b8b8b81518110610b7557610b75613861565b61113190886137cc565b96508761113d816137df565b985050808061114b906137df565b9150506110e5565b50505050508080611163906137df565b91505061105b565b506040516000907f575ff3acadd5ab348fe1855e217e0f3678f8d767d7494c9f9fefbee2e17cca4d908290a26111a18682612397565b5050505050610ba66001600255565b735ff137d4b0fdcd49dca30c7cf57e578a026d278933146111d057600080fd5b60005a9050600080866001600160a01b03168487876040516111f3929190613b32565b60006040518083038160008787f1925050503d8060008114611231576040519150601f19603f3d011682016040523d82523d6000602084013e611236565b606091505b509150915060005a6112489085613898565b90506000836112575782611268565b604051806020016040528060008152505b9050838183604051636c6238f160e01b815260040161065493929190613b42565b8315801561129f57506001600160a01b0383163b155b156112ec5760405162461bcd60e51b815260206004820152601960248201527f41413230206163636f756e74206e6f74206465706c6f796564000000000000006044820152606401610654565b601481106113645760006113036014828486613b6d565b61130c91613b97565b60601c9050803b6000036113625760405162461bcd60e51b815260206004820152601b60248201527f41413330207061796d6173746572206e6f74206465706c6f79656400000000006044820152606401610654565b505b60405162461bcd60e51b81526020600482015260006024820152604401610654565b604051632b870d1b60e11b81526000906001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169063570e1a36906113d79086908690600401613bcc565b6020604051808303816000875af11580156113f6573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061141a9190613be0565b604051633653dc0360e11b81526001600160a01b0382166004820152909150602401610654565b600061144c82612490565b6040805160208101929092523090820152466060820152608001604051602081830303815290604052805190602001209050919050565b3360009081526020819052604081206001810154909163ffffffff90911690036114dc5760405162461bcd60e51b815260206004820152600a6024820152691b9bdd081cdd185ad95960b21b6044820152606401610654565b8054600160701b900460ff166115285760405162461bcd60e51b8152602060048201526011602482015270616c726561647920756e7374616b696e6760781b6044820152606401610654565b60018101546000906115409063ffffffff1642613bfd565b60018301805469ffffffffffff00000000191664010000000065ffffffffffff841690810291909117909155835460ff60701b1916845560405190815290915033907ffa9b3c14cc825c412c9ed81b3ba365a5b459439403f18829e572ed53a4180f0a906020016105ea565b3360009081526020819052604090208054600160781b90046001600160701b0316806116115760405162461bcd60e51b81526020600482015260146024820152734e6f207374616b6520746f20776974686472617760601b6044820152606401610654565b6001820154640100000000900465ffffffffffff166116725760405162461bcd60e51b815260206004820152601d60248201527f6d7573742063616c6c20756e6c6f636b5374616b6528292066697273740000006044820152606401610654565b60018201544264010000000090910465ffffffffffff1611156116d75760405162461bcd60e51b815260206004820152601b60248201527f5374616b65207769746864726177616c206973206e6f742064756500000000006044820152606401610654565b60018201805469ffffffffffffffffffff191690558154600160781b600160e81b0319168255604080516001600160a01b03851681526020810183905233917fb7c918e0e249f999e965cafeb6c664271b3f4317d296461500e71da39f0cbda3910160405180910390a26000836001600160a01b03168260405160006040518083038185875af1925050503d806000811461178e576040519150601f19603f3d011682016040523d82523d6000602084013e611793565b606091505b5050905080610d215760405162461bcd60e51b815260206004820152601860248201527f6661696c656420746f207769746864726177207374616b6500000000000000006044820152606401610654565b6117ec61313f565b6117f5856124a9565b60008061180460008885611ee9565b9150915060006118148383612583565b905061181f43600052565b600061182d60008a87612270565b905061183843600052565b600060606001600160a01b038a16156118ae57896001600160a01b03168989604051611865929190613b32565b6000604051808303816000865af19150503d80600081146118a2576040519150601f19603f3d011682016040523d82523d6000602084013e6118a7565b606091505b5090925090505b866080015183856020015186604001518585604051630116f59360e71b815260040161065496959493929190613c23565b6118e761313f565b6118f0826124a9565b6000806118ff60008585611ee9565b915091506000611916846000015160a0015161264f565b8451519091506000906119289061264f565b9050611947604051806040016040528060008152602001600081525090565b36600061195760408a018a61390a565b90925090506000601482101561196e576000611989565b61197c601460008486613b6d565b61198591613b97565b60601c5b90506119948161264f565b935050505060006119a58686612583565b9050600081600001519050600060016001600160a01b0316826001600160a01b031614905060006040518060c001604052808b6080015181526020018b6040015181526020018315158152602001856020015165ffffffffffff168152602001856040015165ffffffffffff168152602001611a228c6060015190565b905290506001600160a01b03831615801590611a4857506001600160a01b038316600114155b15611a9a5760006040518060400160405280856001600160a01b03168152602001611a728661264f565b81525090508187878a84604051633ebb2d3960e21b8152600401610654959493929190613cc5565b8086868960405163e0cff05f60e01b81526004016106549493929190613d45565b6001600160a01b03821660009081526020819052604081208054909190611aec9084906001600160701b03166137cc565b90506001600160701b03811115611b385760405162461bcd60e51b815260206004820152601060248201526f6465706f736974206f766572666c6f7760801b6044820152606401610654565b81546001600160701b0319166001600160701b03919091161790555050565b6000806000845160208601878987f195945050505050565b60603d82811115611b7d5750815b604051602082018101604052818152816000602083013e9392505050565b6000805a855190915060009081611bb18261269e565b60a08301519091506001600160a01b038116611bd05782519350611d77565b809350600088511115611d7757868202955060028a6002811115611bf657611bf6613d9c565b14611c6857606083015160405163a9a2340960e01b81526001600160a01b0383169163a9a2340991611c30908e908d908c90600401613db2565b600060405180830381600088803b158015611c4a57600080fd5b5087f1158015611c5e573d6000803e3d6000fd5b5050505050611d77565b606083015160405163a9a2340960e01b81526001600160a01b0383169163a9a2340991611c9d908e908d908c90600401613db2565b600060405180830381600088803b158015611cb757600080fd5b5087f193505050508015611cc9575060015b611d7757611cd5613de9565b806308c379a003611d2e5750611ce9613e05565b80611cf45750611d30565b8b81604051602001611d069190613e8e565b60408051601f1981840301815290829052631101335b60e11b82526106549291600401613848565b505b8a604051631101335b60e11b81526004016106549181526040602082018190526012908201527110504d4c081c1bdcdd13dc081c995d995c9d60721b606082015260800190565b5a85038701965081870295508589604001511015611de0578a604051631101335b60e11b815260040161065491815260406020808301829052908201527f414135312070726566756e642062656c6f772061637475616c476173436f7374606082015260800190565b6040890151869003611df28582611abb565b6000808c6002811115611e0757611e07613d9c565b1490508460a001516001600160a01b031685600001516001600160a01b03168c602001517f49628fd1471006c1482da88028e9ce4dbb080b815c9b0344d39e5a8e6ec1419f8860200151858d8f604051611e7a949392919093845291151560208401526040830152606082015260800190565b60405180910390a45050505050505095945050505050565b6002805403611ee35760405162461bcd60e51b815260206004820152601f60248201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c006044820152606401610654565b60028055565b60008060005a8451909150611efe86826126ce565b611f0786611441565b6020860152604081015160608201516080830151171760e087013517610100870135176effffffffffffffffffffffffffffff811115611f895760405162461bcd60e51b815260206004820152601860248201527f41413934206761732076616c756573206f766572666c6f7700000000000000006044820152606401610654565b600080611f95846127c7565b9050611fa38a8a8a84612814565b85516020870151919950919350611fba9190612a4c565b6120105789604051631101335b60e11b8152600401610654918152604060208201819052601a908201527f4141323520696e76616c6964206163636f756e74206e6f6e6365000000000000606082015260800190565b61201943600052565b60a08401516060906001600160a01b0316156120415761203c8b8b8b8587612a99565b975090505b60005a87039050808b60a0013510156120a6578b604051631101335b60e11b8152600401610654918152604060208201819052601e908201527f41413430206f76657220766572696669636174696f6e4761734c696d69740000606082015260800190565b60408a018390528160608b015260c08b01355a8803018a608001818152505050505050505050935093915050565b6000806120e085612cbc565b91509150816001600160a01b0316836001600160a01b0316146121465785604051631101335b60e11b81526004016106549181526040602082018190526014908201527320a0991a1039b4b3b730ba3ab9329032b93937b960611b606082015260800190565b801561219e5785604051631101335b60e11b81526004016106549181526040602082018190526017908201527f414132322065787069726564206f72206e6f7420647565000000000000000000606082015260800190565b60006121a985612cbc565b925090506001600160a01b038116156122055786604051631101335b60e11b81526004016106549181526040602082018190526014908201527320a0999a1039b4b3b730ba3ab9329032b93937b960611b606082015260800190565b81156122675786604051631101335b60e11b81526004016106549181526040602082018190526021908201527f41413332207061796d61737465722065787069726564206f72206e6f742064756060820152606560f81b608082015260a00190565b50505050505050565b6000805a90506000612283846060015190565b905030631d732756612298606088018861390a565b87856040518563ffffffff1660e01b81526004016122b99493929190613ecc565b6020604051808303816000875af19250505080156122f4575060408051601f3d908101601f191682019092526122f191810190613f7f565b60015b61238b57600060206000803e50600051632152215360e01b81016123565786604051631101335b60e11b8152600401610654918152604060208201819052600f908201526e41413935206f7574206f662067617360881b606082015260800190565b600085608001515a6123689086613898565b61237291906137cc565b9050612382886002888685611b9b565b9450505061238e565b92505b50509392505050565b6001600160a01b0382166123ed5760405162461bcd60e51b815260206004820152601860248201527f4141393020696e76616c69642062656e656669636961727900000000000000006044820152606401610654565b6000826001600160a01b03168260405160006040518083038185875af1925050503d806000811461243a576040519150601f19603f3d011682016040523d82523d6000602084013e61243f565b606091505b5050905080610ba65760405162461bcd60e51b815260206004820152601f60248201527f41413931206661696c65642073656e6420746f2062656e6566696369617279006044820152606401610654565b600061249b82612d0f565b805190602001209050919050565b3063957122ab6124bc604084018461390a565b6124c960208601866135cb565b6124d761012087018761390a565b6040518663ffffffff1660e01b81526004016124f7959493929190613f98565b60006040518083038186803b15801561250f57600080fd5b505afa925050508015612520575060015b6125805761252c613de9565b806308c379a0036125745750612540613e05565b8061254b5750612576565b80511561257057600081604051631101335b60e11b8152600401610654929190613848565b5050565b505b3d6000803e3d6000fd5b50565b60408051606081018252600080825260208201819052918101829052906125a984612de2565b905060006125b684612de2565b82519091506001600160a01b0381166125cd575080515b602080840151604080860151928501519085015191929165ffffffffffff80831690851610156125fb578193505b8065ffffffffffff168365ffffffffffff161115612617578092505b5050604080516060810182526001600160a01b03909416845265ffffffffffff92831660208501529116908201529250505092915050565b604080518082018252600080825260208083018281526001600160a01b03959095168252819052919091208054600160781b90046001600160701b031682526001015463ffffffff1690915290565b60c081015160e0820151600091908082036126ba575092915050565b6126c682488301612e53565b949350505050565b6126db60208301836135cb565b6001600160a01b0316815260208083013590820152608080830135604083015260a0830135606083015260c0808401359183019190915260e080840135918301919091526101008301359082015236600061273a61012085018561390a565b909250905080156127ba5760148110156127965760405162461bcd60e51b815260206004820152601d60248201527f4141393320696e76616c6964207061796d6173746572416e64446174610000006044820152606401610654565b6127a4601460008385613b6d565b6127ad91613b97565b60601c60a0840152610d21565b600060a084015250505050565b60a081015160009081906001600160a01b03166127e55760016127e8565b60035b60ff16905060008360800151828560600151028560400151010190508360c00151810292505050919050565b60008060005a8551805191925090612839898861283460408c018c61390a565b612e6b565b60a082015161284743600052565b60006001600160a01b03821661288f576001600160a01b0383166000908152602081905260409020546001600160701b03168881116128885780890361288b565b60005b9150505b606084015160208a0151604051633a871cdd60e01b81526001600160a01b03861692633a871cdd9290916128c9918f918790600401613fce565b60206040518083038160008887f193505050508015612905575060408051601f3d908101601f1916820190925261290291810190613f7f565b60015b61298f57612911613de9565b806308c379a0036129425750612925613e05565b806129305750612944565b8b81604051602001611d069190613ff3565b505b8a604051631101335b60e11b8152600401610654918152604060208201819052601690820152754141323320726576657274656420286f72204f4f472960501b606082015260800190565b95506001600160a01b038216612a39576001600160a01b038316600090815260208190526040902080546001600160701b0316808a1115612a1c578c604051631101335b60e11b81526004016106549181526040602082018190526017908201527f41413231206469646e2774207061792070726566756e64000000000000000000606082015260800190565b81546001600160701b031916908a90036001600160701b03161790555b5a85039650505050505094509492505050565b6001600160a01b038216600090815260016020908152604080832084821c80855292528220805484916001600160401b038316919085612a8b836137df565b909155501495945050505050565b82516060818101519091600091848111612af55760405162461bcd60e51b815260206004820152601f60248201527f4141343120746f6f206c6974746c6520766572696669636174696f6e476173006044820152606401610654565b60a08201516001600160a01b038116600090815260208190526040902080548784039291906001600160701b031689811015612b7d578c604051631101335b60e11b8152600401610654918152604060208201819052601e908201527f41413331207061796d6173746572206465706f73697420746f6f206c6f770000606082015260800190565b8981038260000160006101000a8154816001600160701b0302191690836001600160701b03160217905550826001600160a01b031663f465c77e858e8e602001518e6040518563ffffffff1660e01b8152600401612bdd93929190613fce565b60006040518083038160008887f193505050508015612c1e57506040513d6000823e601f3d908101601f19168201604052612c1b919081019061402a565b60015b612ca857612c2a613de9565b806308c379a003612c5b5750612c3e613e05565b80612c495750612c5d565b8d81604051602001611d0691906140b5565b505b8c604051631101335b60e11b8152600401610654918152604060208201819052601690820152754141333320726576657274656420286f72204f4f472960501b606082015260800190565b909e909d509b505050505050505050505050565b60008082600003612cd257506000928392509050565b6000612cdd84612de2565b9050806040015165ffffffffffff16421180612d045750806020015165ffffffffffff1642105b905194909350915050565b6060813560208301356000612d2f612d2a604087018761390a565b61312c565b90506000612d43612d2a606088018861390a565b9050608086013560a087013560c088013560e08901356101008a01356000612d72612d2a6101208e018e61390a565b604080516001600160a01b039c909c1660208d01528b81019a909a5260608b019890985250608089019590955260a088019390935260c087019190915260e08601526101008501526101208401526101408084019190915281518084039091018152610160909201905292915050565b60408051606081018252600080825260208201819052918101919091528160a081901c65ffffffffffff8116600003612e1e575065ffffffffffff5b604080516060810182526001600160a01b03909316835260d09490941c602083015265ffffffffffff16928101929092525090565b6000818310612e625781612e64565b825b9392505050565b8015610d21578251516001600160a01b0381163b15612ed65784604051631101335b60e11b8152600401610654918152604060208201819052601f908201527f414131302073656e64657220616c726561647920636f6e737472756374656400606082015260800190565b835160600151604051632b870d1b60e11b81526000916001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169163570e1a369190612f2e9088908890600401613bcc565b60206040518083038160008887f1158015612f4d573d6000803e3d6000fd5b50505050506040513d601f19601f82011682018060405250810190612f729190613be0565b90506001600160a01b038116612fd45785604051631101335b60e11b8152600401610654918152604060208201819052601b908201527f4141313320696e6974436f6465206661696c6564206f72204f4f470000000000606082015260800190565b816001600160a01b0316816001600160a01b03161461303e5785604051631101335b60e11b815260040161065491815260406020808301829052908201527f4141313420696e6974436f6465206d7573742072657475726e2073656e646572606082015260800190565b806001600160a01b03163b6000036130a15785604051631101335b60e11b815260040161065491815260406020808301829052908201527f4141313520696e6974436f6465206d757374206372656174652073656e646572606082015260800190565b60006130b06014828688613b6d565b6130b991613b97565b60601c9050826001600160a01b031686602001517fd51a9c61267aa6196961883ecf5ff2da6619c37dac0fa92122513fb32c032d2d83896000015160a0015160405161311b9291906001600160a01b0392831681529116602082015260400190565b60405180910390a350505050505050565b6000604051828085833790209392505050565b6040518060a001604052806131a460405180610100016040528060006001600160a01b031681526020016000815260200160008152602001600081526020016000815260200160006001600160a01b0316815260200160008152602001600081525090565b8152602001600080191681526020016000815260200160008152602001600081525090565b6000602082840312156131db57600080fd5b813563ffffffff81168114612e6457600080fd5b80356001600160c01b038116811461320657600080fd5b919050565b60006020828403121561321d57600080fd5b612e64826131ef565b6001600160a01b038116811461258057600080fd5b803561320681613226565b6000806040838503121561325957600080fd5b823561326481613226565b9150613272602084016131ef565b90509250929050565b634e487b7160e01b600052604160045260246000fd5b60a081018181106001600160401b03821117156132b0576132b061327b565b60405250565b61010081018181106001600160401b03821117156132b0576132b061327b565b601f8201601f191681016001600160401b03811182821017156132fb576132fb61327b565b6040525050565b60006001600160401b0382111561331b5761331b61327b565b50601f01601f191660200190565b600081830361018081121561333d57600080fd5b60405161334981613291565b8092506101008083121561335c57600080fd5b604051925061336a836132b6565b6133738561323b565b8352602085013560208401526040850135604084015260608501356060840152608085013560808401526133a960a0860161323b565b60a084015260c085013560c084015260e085013560e084015282825280850135602083015250610120840135604082015261014084013560608201526101608401356080820152505092915050565b60008083601f84011261340a57600080fd5b5081356001600160401b0381111561342157600080fd5b60208301915083602082850101111561343957600080fd5b9250929050565b6000806000806101c0858703121561345757600080fd5b84356001600160401b038082111561346e57600080fd5b818701915087601f83011261348257600080fd5b813561348d81613302565b60405161349a82826132d6565b8281528a60208487010111156134af57600080fd5b826020860160208301376000602084830101528098505050506134d58860208901613329565b94506101a08701359150808211156134ec57600080fd5b506134f9878288016133f8565b95989497509550505050565b60008083601f84011261351757600080fd5b5081356001600160401b0381111561352e57600080fd5b6020830191508360208260051b850101111561343957600080fd5b60008060006040848603121561355e57600080fd5b83356001600160401b0381111561357457600080fd5b61358086828701613505565b909450925050602084013561359481613226565b809150509250925092565b600080604083850312156135b257600080fd5b82356135bd81613226565b946020939093013593505050565b6000602082840312156135dd57600080fd5b8135612e6481613226565b600080600080606085870312156135fe57600080fd5b843561360981613226565b935060208501356001600160401b0381111561362457600080fd5b613630878288016133f8565b9598909750949560400135949350505050565b60008060008060006060868803121561365b57600080fd5b85356001600160401b038082111561367257600080fd5b61367e89838a016133f8565b90975095506020880135915061369382613226565b909350604087013590808211156136a957600080fd5b506136b6888289016133f8565b969995985093965092949392505050565b600080602083850312156136da57600080fd5b82356001600160401b038111156136f057600080fd5b6136fc858286016133f8565b90969095509350505050565b6000610160828403121561371b57600080fd5b50919050565b60006020828403121561373357600080fd5b81356001600160401b0381111561374957600080fd5b6126c684828501613708565b6000806000806060858703121561376b57600080fd5b84356001600160401b038082111561378257600080fd5b61378e88838901613708565b9550602087013591506137a082613226565b909350604086013590808211156134ec57600080fd5b634e487b7160e01b600052601160045260246000fd5b80820180821115610d6757610d676137b6565b6000600182016137f1576137f16137b6565b5060010190565b60005b838110156138135781810151838201526020016137fb565b50506000910152565b600081518084526138348160208601602086016137f8565b601f01601f19169290920160200192915050565b8281526040602082015260006126c6604083018461381c565b634e487b7160e01b600052603260045260246000fd5b6000823561015e1983360301811261388e57600080fd5b9190910192915050565b81810381811115610d6757610d676137b6565b60008235605e1983360301811261388e57600080fd5b6000808335601e198436030181126138d857600080fd5b8301803591506001600160401b038211156138f257600080fd5b6020019150600581901b360382131561343957600080fd5b6000808335601e1984360301811261392157600080fd5b8301803591506001600160401b0382111561393b57600080fd5b60200191503681900382131561343957600080fd5b6000808335601e1984360301811261396757600080fd5b83016020810192503590506001600160401b0381111561398657600080fd5b80360382131561343957600080fd5b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b60006101606139dd846139d08561323b565b6001600160a01b03169052565b602083013560208501526139f46040840184613950565b826040870152613a078387018284613995565b92505050613a186060840184613950565b8583036060870152613a2b838284613995565b925050506080830135608085015260a083013560a085015260c083013560c085015260e083013560e0850152610100808401358186015250610120613a7281850185613950565b86840383880152613a84848284613995565b9350505050610140613a9881850185613950565b86840383880152613aaa848284613995565b979650505050505050565b6040808252810184905260006060600586901b830181019083018783805b89811015613b1b57868503605f190184528235368c900361015e19018112613af9578283fd5b613b05868d83016139be565b9550506020938401939290920191600101613ad3565b505050508281036020840152613aaa818587613995565b8183823760009101908152919050565b8315158152606060208201526000613b5d606083018561381c565b9050826040830152949350505050565b60008085851115613b7d57600080fd5b83861115613b8a57600080fd5b5050820193919092039150565b6bffffffffffffffffffffffff198135818116916014851015613bc45780818660140360031b1b83161692505b505092915050565b6020815260006126c6602083018486613995565b600060208284031215613bf257600080fd5b8151612e6481613226565b65ffffffffffff818116838216019080821115613c1c57613c1c6137b6565b5092915050565b868152856020820152600065ffffffffffff8087166040840152808616606084015250831515608083015260c060a0830152613c6260c083018461381c565b98975050505050505050565b80518252602081015160208301526040810151151560408301526000606082015165ffffffffffff8082166060860152806080850151166080860152505060a082015160c060a08501526126c660c085018261381c565b6000610140808352613cd981840189613c6e565b915050613cf3602083018780518252602090810151910152565b845160608301526020948501516080830152835160a08301529284015160c082015281516001600160a01b031660e0820152908301518051610100830152909201516101209092019190915292915050565b60e081526000613d5860e0830187613c6e565b9050613d71602083018680518252602090810151910152565b8351606083015260208401516080830152825160a0830152602083015160c083015295945050505050565b634e487b7160e01b600052602160045260246000fd5b600060038510613dd257634e487b7160e01b600052602160045260246000fd5b84825260606020830152613b5d606083018561381c565b600060033d1115613e025760046000803e5060005160e01c5b90565b600060443d1015613e135790565b6040516003193d81016004833e81513d6001600160401b038160248401118184111715613e4257505050505090565b8285019150815181811115613e5a5750505050505090565b843d8701016020828501011115613e745750505050505090565b613e83602082860101876132d6565b509095945050505050565b75020a09a98103837b9ba27b8103932bb32b93a32b21d160551b815260008251613ebf8160168501602087016137f8565b9190910160160192915050565b60006101c0808352613ee18184018789613995565b9050845160018060a01b03808251166020860152602082015160408601526040820151606086015260608201516080860152608082015160a08601528060a08301511660c08601525060c081015160e085015260e08101516101008501525060208501516101208401526040850151610140840152606085015161016084015260808501516101808401528281036101a0840152613aaa818561381c565b600060208284031215613f9157600080fd5b5051919050565b606081526000613fac606083018789613995565b6001600160a01b03861660208401528281036040840152613c62818587613995565b606081526000613fe160608301866139be565b60208301949094525060400152919050565b6e020a09919903932bb32b93a32b21d1608d1b81526000825161401d81600f8501602087016137f8565b91909101600f0192915050565b6000806040838503121561403d57600080fd5b82516001600160401b0381111561405357600080fd5b8301601f8101851361406457600080fd5b805161406f81613302565b60405161407c82826132d6565b82815287602084860101111561409157600080fd5b6140a28360208301602087016137f8565b6020969096015195979596505050505050565b6e020a09999903932bb32b93a32b21d1608d1b81526000825161401d81600f8501602087016137f856fea26469706673582212201892e38d1eac5b99b119bf1333f8e39f72ad5274c5da6bb916f97bef4e7e0afc64736f6c63430008140033" - function getStateOverrides({ addSenderBalanceOverride, userOperation, - entryPoint, - replacedEntryPoint, stateOverride = {} }: { addSenderBalanceOverride: boolean - entryPoint: Address - replacedEntryPoint: boolean stateOverride: StateOverrides userOperation: UserOperation }) { @@ -32,13 +25,6 @@ function getStateOverrides({ } } - if (replacedEntryPoint) { - result[entryPoint] = { - ...deepHexlify(stateOverride?.[entryPoint] || {}), - code: EXECUTE_SIMULATOR_BYTECODE - } - } - return result } @@ -54,6 +40,7 @@ export class GasEstimationHandler { blockTagSupport: boolean, utilityWalletAddress: Address, chainType: ChainType, + codeOverrideSupport: boolean, entryPointSimulationsAddress?: Address, fixedGasLimitForEstimation?: bigint ) { @@ -61,6 +48,7 @@ export class GasEstimationHandler { publicClient, blockTagSupport, utilityWalletAddress, + codeOverrideSupport, fixedGasLimitForEstimation ) @@ -82,7 +70,6 @@ export class GasEstimationHandler { queuedUserOperations, addSenderBalanceOverride, entryPoint, - replacedEntryPoint, targetAddress, targetCallData, balanceOverrideEnabled, @@ -92,7 +79,6 @@ export class GasEstimationHandler { queuedUserOperations: UserOperation[] addSenderBalanceOverride: boolean entryPoint: Address - replacedEntryPoint: boolean targetAddress: Address targetCallData: Hex balanceOverrideEnabled: boolean @@ -103,8 +89,6 @@ export class GasEstimationHandler { if (balanceOverrideEnabled) { finalStateOverride = getStateOverrides({ userOperation, - entryPoint, - replacedEntryPoint, addSenderBalanceOverride, stateOverride: stateOverrides }) diff --git a/src/rpc/estimation/gasEstimationsV06.ts b/src/rpc/estimation/gasEstimationsV06.ts index e4323005..2449c363 100644 --- a/src/rpc/estimation/gasEstimationsV06.ts +++ b/src/rpc/estimation/gasEstimationsV06.ts @@ -1,4 +1,5 @@ import { + ENTRYPOINT_V06_SIMULATION_OVERRIDE, EntryPointV06Abi, EntryPointV06SimulationsAbi, RpcError, @@ -17,23 +18,92 @@ import { } from "viem" import { z } from "zod" import type { SimulateHandleOpResult } from "./types" +import { deepHexlify } from "../../utils/userop" export class GasEstimatorV06 { publicClient: PublicClient blockTagSupport: boolean utilityWalletAddress: Address fixedGasLimitForEstimation?: bigint + codeOverrideSupport: boolean constructor( publicClient: PublicClient, blockTagSupport: boolean, utilityWalletAddress: Address, + codeOverrideSupport: boolean, fixedGasLimitForEstimation?: bigint ) { this.publicClient = publicClient this.blockTagSupport = blockTagSupport this.utilityWalletAddress = utilityWalletAddress this.fixedGasLimitForEstimation = fixedGasLimitForEstimation + this.codeOverrideSupport = codeOverrideSupport + } + + decodeSimulateHandleOpResult(data: Hex): SimulateHandleOpResult { + if (data === "0x") { + throw new RpcError( + "AA23 reverted: UserOperation called non-existant contract, or reverted with 0x", + ValidationErrors.SimulateValidation + ) + } + + const decodedError = decodeErrorResult({ + abi: [...EntryPointV06Abi, ...EntryPointV06SimulationsAbi], + data + }) + + if ( + decodedError && + decodedError.errorName === "FailedOp" && + decodedError.args + ) { + return { + result: "failed", + data: decodedError.args[1] as string + } as const + } + + // custom error thrown by entryPoint if code override is used + if ( + decodedError && + decodedError.errorName === "CallPhaseReverted" && + decodedError.args + ) { + return { + result: "failed", + data: decodedError.args[0] + } as const + } + + if ( + decodedError && + decodedError.errorName === "Error" && + decodedError.args + ) { + return { + result: "failed", + data: decodedError.args[0] + } as const + } + + if (decodedError.errorName === "ExecutionResult") { + const parsedExecutionResult = executionResultSchema.parse( + decodedError.args + ) + + return { + result: "execution", + data: { + executionResult: parsedExecutionResult + } as const + } + } + + throw new Error( + "Unexpected error whilst decoding simulateHandleOp result" + ) } async simulateHandleOpV06({ @@ -49,14 +119,25 @@ export class GasEstimatorV06 { entryPoint: Address stateOverrides?: StateOverrides | undefined }): Promise { - const { - publicClient, - blockTagSupport, - utilityWalletAddress, - fixedGasLimitForEstimation - } = this - try { + const { + publicClient, + blockTagSupport, + utilityWalletAddress, + fixedGasLimitForEstimation + } = this + + if (this.codeOverrideSupport) { + if (stateOverrides === undefined) { + stateOverrides = {} + } + + stateOverrides[entryPoint] = { + ...deepHexlify(stateOverrides?.[entryPoint] || {}), + code: ENTRYPOINT_V06_SIMULATION_OVERRIDE + } + } + await publicClient.request({ method: "eth_call", params: [ @@ -126,55 +207,11 @@ export class GasEstimatorV06 { throw new Error(JSON.stringify(err.cause)) } - const cause = causeParseResult.data + const data = causeParseResult.data.data - if (cause.data === "0x") { - throw new RpcError( - "AA23 reverted: UserOperation called non-existant contract, or reverted with 0x", - ValidationErrors.SimulateValidation - ) - } - - const decodedError = decodeErrorResult({ - abi: [...EntryPointV06Abi, ...EntryPointV06SimulationsAbi], - data: cause.data - }) - - if ( - decodedError && - decodedError.errorName === "FailedOp" && - decodedError.args - ) { - return { - result: "failed", - data: decodedError.args[1] as string - } as const - } - - if ( - decodedError && - decodedError.errorName === "Error" && - decodedError.args - ) { - return { - result: "failed", - data: decodedError.args[0] - } as const - } - - if (decodedError.errorName === "ExecutionResult") { - const parsedExecutionResult = executionResultSchema.parse( - decodedError.args - ) - - return { - result: "execution", - data: { - executionResult: parsedExecutionResult - } as const - } - } + return this.decodeSimulateHandleOpResult(data) } + throw new Error("Unexpected error") } } diff --git a/src/rpc/validation/SafeValidator.ts b/src/rpc/validation/SafeValidator.ts index d64c7b68..00f96b14 100644 --- a/src/rpc/validation/SafeValidator.ts +++ b/src/rpc/validation/SafeValidator.ts @@ -73,6 +73,7 @@ export class SafeValidator utilityWalletAddress: Address, binarySearchToleranceDelta: bigint, binarySearchGasAllowance: bigint, + codeOverrideSupport: boolean, entryPointSimulationsAddress?: Address, fixedGasLimitForEstimation?: bigint, usingTenderly = false, @@ -88,6 +89,7 @@ export class SafeValidator utilityWalletAddress, binarySearchToleranceDelta, binarySearchGasAllowance, + codeOverrideSupport, entryPointSimulationsAddress, fixedGasLimitForEstimation, usingTenderly, diff --git a/src/rpc/validation/UnsafeValidator.ts b/src/rpc/validation/UnsafeValidator.ts index 7493d62f..0abef168 100644 --- a/src/rpc/validation/UnsafeValidator.ts +++ b/src/rpc/validation/UnsafeValidator.ts @@ -73,6 +73,7 @@ export class UnsafeValidator implements InterfaceValidator { utilityWalletAddress: Address, binarySearchToleranceDelta: bigint, binarySearchGasAllowance: bigint, + codeOverrideSupport: boolean, entryPointSimulationsAddress?: Address, fixedGasLimitForEstimation?: bigint, usingTenderly = false, @@ -97,6 +98,7 @@ export class UnsafeValidator implements InterfaceValidator { blockTagSupport, utilityWalletAddress, chainType, + codeOverrideSupport, entryPointSimulationsAddress, fixedGasLimitForEstimation ) @@ -194,7 +196,6 @@ export class UnsafeValidator implements InterfaceValidator { addSenderBalanceOverride, balanceOverrideEnabled: this.balanceOverrideEnabled, entryPoint, - replacedEntryPoint: false, targetAddress: zeroAddress, targetCallData: "0x", stateOverrides diff --git a/src/types/contracts/EntryPointSimulations06.ts b/src/types/contracts/EntryPointSimulations06.ts new file mode 100644 index 00000000..64e2c696 --- /dev/null +++ b/src/types/contracts/EntryPointSimulations06.ts @@ -0,0 +1,28 @@ +export const EntryPointV06SimulationsAbi = [ + { + inputs: [ + { + name: "reason", + type: "string" + } + ], + name: "Error", + type: "error" + }, + // source: https://github.com/pimlicolabs/entrypoint-estimations/blob/6f6f343/src/v06/ModifiedEntryPoint.sol#L46 + { + type: "error", + name: "CallPhaseReverted", + inputs: [ + { + name: "reason", + type: "bytes", + internalType: "bytes" + } + ] + } +] as const + +// source: https://github.com/pimlicolabs/entrypoint-estimations/blob/6f6f343/src/v06/EntryPointCodeOverride.sol +export const ENTRYPOINT_V06_SIMULATION_OVERRIDE = + "0x60806040526004361015610023575b361561001957600080fd5b610021612369565b005b60003560e01c80630396cb60146101635780630bd28e3b1461015e5780631b2e01b8146101595780631d732756146101545780631fad948c1461014f578063205c28781461014a57806335567e1a146101455780634b1d7cf5146101405780635287ce121461013b57806370a08231146101365780638f41ec5a14610131578063957122ab1461012c5780639b249f6914610127578063a619353114610122578063b760faf91461011d578063bb9fe6bf14610118578063c23a5cea14610113578063d6383f941461010e578063ee219423146101095763fc7e286d0361000e5761163d565b611487565b611363565b61124c565b611142565b611122565b611102565b610ff8565b610ea5565b610e89565b610e38565b610d08565b610a40565b6109d7565b6108b5565b61068d565b610500565b610354565b6102c7565b60203660031901126102ac5760043563ffffffff81168082036102ac573360009081526020819052604090207fa5ae833d0bb1dcd632d98a8b70973e8516812898e19bf27b70071ebc8dc52c01916102a7916101e990916101c58115156116c9565b6101e26101d9600185015463ffffffff1690565b63ffffffff1690565b1115611715565b5492610289610233610208346001600160701b03607889901c16611777565b95610214871515611789565b6102276001600160701b038811156117ca565b6001600160701b031690565b61024d61023e610445565b6001600160701b039092168252565b600160208201526001600160701b038616604082015263ffffffff83166060820152600060808201819052338152602081905260409020611807565b6040805194855263ffffffff90911660208501523393918291820190565b0390a2005b600080fd5b602435906001600160c01b03821682036102ac57565b346102ac5760203660031901126102ac576004356001600160c01b03811681036102ac573360009081526001602090815260408083206001600160c01b0390941683529290522061031881546118d7565b9055005b6001600160a01b038116036102ac57565b6024359061033a8261031c565b565b60c4359061033a8261031c565b359061033a8261031c565b346102ac5760403660031901126102ac5760206103ae6004356103768161031c565b61037e6102b1565b6001600160a01b0390911660009081526001845260408082206001600160c01b0390931682526020929092522090565b54604051908152f35b634e487b7160e01b600052604160045260246000fd5b60a081019081106001600160401b038211176103e857604052565b6103b7565b61010081019081106001600160401b038211176103e857604052565b606081019081106001600160401b038211176103e857604052565b90601f801991011681019081106001600160401b038211176103e857604052565b6040519061033a60a083610424565b6040519061033a60c083610424565b6040519061033a604083610424565b6040519061033a606083610424565b6001600160401b0381116103e857601f01601f191660200190565b9291926104a882610481565b916104b66040519384610424565b8294818452818301116102ac578281602093846000960137010152565b9181601f840112156102ac578235916001600160401b0383116102ac57602083818601950101116102ac57565b346102ac576101c03660031901126102ac576004356001600160401b0381116102ac57366023820112156102ac5761054290369060248160040135910161049c565b366023190161018081126102ac5761010060405191610560836103cd565b126102ac57604051610571816103ed565b61057961032d565b815260443560208201526064356040820152608435606082015260a43560808201526105a361033c565b60a082015260e43560c08201526101043560e082015281526101243560208201526101443560408201526101643560608201526101843560808201526101a435906001600160401b0382116102ac5761061f9261060761060f9336906004016104d3565b92909161198b565b6040519081529081906020820190565b0390f35b9060406003198301126102ac576004356001600160401b0381116102ac5760040160009280601f83011215610689578135936001600160401b03851161068657506020808301928560051b0101116102ac5791906024356106838161031c565b90565b80fd5b8380fd5b346102ac5761069b36610623565b6106a6829392611ab5565b60005b84811061071c57506000927fbb47ee3e183a558b1a2ff0874b079f3fc5478b7454eacf2bfc5af2ff5878f9728480a183915b8583106106ec576100218585612ca8565b909193600190610712610700878987611b34565b61070a8886611b1b565b519088612be3565b01940191906106db565b61074761074061072e83859795611b1b565b5161073a848987611b34565b84612847565b9190613797565b906001600160a01b031661086f576108205761076290613797565b906001600160a01b03166107da5761077f576001019290926106a9565b60408051631101335b60e11b815260048101929092526024820152602160448201527f41413332207061796d61737465722065787069726564206f72206e6f742064756064820152606560f81b608482015260a490fd5b0390fd5b60408051631101335b60e11b8152600481018490526024810191909152601460448201527320a0999a1039b4b3b730ba3ab9329032b93937b960611b6064820152608490fd5b60408051631101335b60e11b8152600481018490526024810191909152601760448201527f414132322065787069726564206f72206e6f74206475650000000000000000006064820152608490fd5b60408051631101335b60e11b8152600481018590526024810191909152601460448201527320a0991a1039b4b3b730ba3ab9329032b93937b960611b6064820152608490fd5b346102ac5760403660031901126102ac576004356108d28161031c565b60243533600052600060205260406000209182546001600160701b03811683116109925760008084819461093d886109236102276100219a61091e610227899b6001600160701b031690565b611b57565b6001600160701b03166001600160701b0319825416179055565b604080516001600160a01b03831681526020810184905233917fd1c19fbcd4551a5edfb66d43d2e337c04837afda3482b42bdf569a8fccdae5fb91a26001600160a01b03165af161098c611b64565b50611b94565b60405162461bcd60e51b815260206004820152601960248201527f576974686472617720616d6f756e7420746f6f206c61726765000000000000006044820152606490fd5b346102ac5760403660031901126102ac5760206004356109f68161031c565b6109fe6102b1565b6001600160a01b0390911660009081526001835260408082206001600160c01b03841683526020529020546040805192901b67ffffffffffffffff1916178152f35b346102ac57610a4e36610623565b9060009160005b828110610c135750610a678493611ab5565b7fbb47ee3e183a558b1a2ff0874b079f3fc5478b7454eacf2bfc5af2ff5878f972600080a16000805b848110610b8a57505060009260009060005b818110610ad957610021868660007f575ff3acadd5ab348fe1855e217e0f3678f8d767d7494c9f9fefbee2e17cca4d8180a2612ca8565b610b30610ae782848a611bd5565b610b05610af9610af960208401611c2c565b6001600160a01b031690565b7f575ff3acadd5ab348fe1855e217e0f3678f8d767d7494c9f9fefbee2e17cca4d600080a280611bf7565b906000915b808310610b4757505050600101610aa2565b90919497610b81610b7b600192610b758c8b610b6e82610b688e8b8d611b34565b92611b1b565b5191612be3565b90611777565b996118d7565b95019190610b35565b610b95818688611bd5565b6020610bad610ba48380611bf7565b92909301611c2c565b6000926001600160a01b03909116905b828410610bd05750505050600101610a90565b90919294610c0981610c0485610bfd610beb6001968d611b1b565b51610bf78c8b8a611b34565b85612847565b908b6129d9565b6118d7565b9501929190610bbd565b610c1e818487611bd5565b93610c298580611bf7565b9190610c3a610af960208901611c2c565b966001600160a01b038816610c526001821415611c36565b610c73575b50506001929394955090610c6a91611777565b93929101610a55565b806040610c81920190611c82565b889291923b156102ac5760405163e3563a4f60e01b81529260009284928392610caf92899060048601611de1565b03818a5afa9081610ced575b50610cde5763086a9f7560e41b6000526001600160a01b03861660045260246000fd5b9394508493610c6a6001610c57565b80610cfc6000610d0293610424565b80610e7e565b38610cbb565b346102ac5760203660031901126102ac57600435610d258161031c565b60006080604051610d35816103cd565b828152826020820152826040820152826060820152015260018060a01b0316600052600060205261061f6040600020610ddb610dcc600160405193610d79856103cd565b6001600160701b038154818116875260ff8160701c161515602088015260781c1660408601520154610dbe610db18263ffffffff1690565b63ffffffff166060860152565b60201c65ffffffffffff1690565b65ffffffffffff166080830152565b60405191829182919091608065ffffffffffff8160a08401956001600160701b0381511685526020810151151560208601526001600160701b03604082015116604086015263ffffffff6060820151166060860152015116910152565b346102ac5760203660031901126102ac57600435610e558161031c565b60018060a01b0316600052600060205260206001600160701b0360406000205416604051908152f35b60009103126102ac57565b346102ac5760003660031901126102ac57602060405160018152f35b346102ac5760603660031901126102ac576004356001600160401b0381116102ac57610ed59036906004016104d3565b9050602435610ee38161031c565b6044356001600160401b0381116102ac57610f029036906004016104d3565b919092159081610fee575b50610fa9576014811015610f3b575b60405162461bcd60e51b81526020600482015260006024820152604490fd5b610f4b610f5191610f5793611e71565b90611e7f565b60601c90565b3b15610f64573880610f1c565b60405162461bcd60e51b815260206004820152601b60248201527f41413330207061796d6173746572206e6f74206465706c6f79656400000000006044820152606490fd5b60405162461bcd60e51b815260206004820152601960248201527f41413230206163636f756e74206e6f74206465706c6f796564000000000000006044820152606490fd5b90503b1538610f0d565b346102ac5760203660031901126102ac576004356001600160401b0381116102ac57602061102d6110499236906004016104d3565b604051632b870d1b60e11b815293849283929060048401611ed4565b03816000737fc98430eaedbb6070b35b39d7987250490883485af19081156110c457600091611095575b50633653dc0360e11b60009081526001600160a01b0391909116600452602490fd5b6110b7915060203d6020116110bd575b6110af8183610424565b810190611ebf565b38611073565b503d6110a5565b611e65565b90816101609103126102ac5790565b60206003198201126102ac57600435906001600160401b0382116102ac57610683916004016110c9565b346102ac57602061111a611115366110d8565b611ee5565b604051908152f35b60203660031901126102ac5761002160043561113d8161031c565b611fe2565b346102ac5760003660031901126102ac573360005260006020526040600020600181019081549063ffffffff82161561121a576111d06111aa61119c6101d96111dd956101d9611197875460ff9060701c1690565b612038565b65ffffffffffff4216612078565b845469ffffffffffff000000001916602082901b69ffffffffffff000000001617909455565b805460ff60701b19169055565b60405165ffffffffffff909116815233907ffa9b3c14cc825c412c9ed81b3ba365a5b459439403f18829e572ed53a4180f0a9080602081016102a7565b60405162461bcd60e51b815260206004820152600a6024820152691b9bdd081cdd185ad95960b21b6044820152606490fd5b346102ac5760203660031901126102ac5761002160008080806004356112718161031c565b3360009081526020819052604090209061130e61129c61022784546001600160701b039060781c1690565b926112a8841515612096565b6112f4600182016112e165ffffffffffff6112cd835465ffffffffffff9060201c1690565b166112d98115156120d9565b421015612125565b805469ffffffffffffffffffff19169055565b80546dffffffffffffffffffffffffffff60781b19169055565b604080516001600160a01b03831681526020810184905233917fb7c918e0e249f999e965cafeb6c664271b3f4317d296461500e71da39f0cbda391a26001600160a01b03165af161135d611b64565b50612171565b346102ac5760603660031901126102ac576004356001600160401b0381116102ac576113939036906004016110c9565b602435906113a08261031c565b6044356001600160401b0381116102ac576113c26107d69136906004016104d3565b6113ca611a53565b6113d385612e41565b6113f4816113ea6113e482896126b3565b90612f2d565b9643600052612ad8565b954360005260009260609460018060a01b038316611455575b505050608001519361143b604061142d602084015165ffffffffffff1690565b92015165ffffffffffff1690565b90604051968796630116f59360e71b8852600488016121cb565b6000945084939550839061146e604051809481936121bd565b03925af190608061147d611b64565b929190388061140d565b346102ac57611495366110d8565b61149d611a53565b6114a682612e41565b6114b081836126b3565b825160a00151611523906114d1906001600160a01b0316613024565b613024565b845151909290611501906114ed906001600160a01b0316613024565b966114f6612206565b506040810190611c82565b906014821061163157610f51610f4b61151d936114cc93611e71565b93612f2d565b80516001600160a01b03169060018060a01b03821660018114916115b16080880151976115a260408201519360606115776040611569602085015165ffffffffffff1690565b93015165ffffffffffff1690565b93015194611583610454565b9b8c5260208c015286151560408c015265ffffffffffff1660608b0152565b65ffffffffffff166080890152565b60a087015215159081611628575b506115e257506107d69160405194859463e0cff05f60e01b86526004860161230f565b906107d6926115f083613024565b61160a6115fb610463565b6001600160a01b039095168552565b6020840152604051633ebb2d3960e21b815295869560048701612286565b905015386115bf565b505061151d6000613024565b346102ac5760203660031901126102ac5760043561165a8161031c565b6001600160a01b031660009081526020818152604091829020805460019091015483516001600160701b038084168252607084901c60ff1615158286015260789390931c9092169382019390935263ffffffff8316606082015291901c65ffffffffffff16608082015260a090f35b156116d057565b60405162461bcd60e51b815260206004820152601a60248201527f6d757374207370656369667920756e7374616b652064656c61790000000000006044820152606490fd5b1561171c57565b60405162461bcd60e51b815260206004820152601c60248201527f63616e6e6f7420646563726561736520756e7374616b652074696d65000000006044820152606490fd5b634e487b7160e01b600052601160045260246000fd5b9190820180921161178457565b611761565b1561179057565b60405162461bcd60e51b81526020600482015260126024820152711b9bc81cdd185ad9481cdc1958da599a595960721b6044820152606490fd5b156117d157565b60405162461bcd60e51b815260206004820152600e60248201526d7374616b65206f766572666c6f7760901b6044820152606490fd5b9065ffffffffffff6080600161033a946118416001600160701b0386511682906001600160701b03166001600160701b0319825416179055565b6020850151815460408701516effffffffffffffffffffffffffffff60701b1990911691151560701b60ff60701b169190911760789190911b6dffffffffffffffffffffffffffff60781b1617815560608501519101805463ffffffff191663ffffffff92909216919091178155920151825469ffffffffffff000000001916911660201b69ffffffffffff0000000016179055565b60001981146117845760010190565b156118ed57565b60405162461bcd60e51b815260206004820152601760248201527f4141393220696e7465726e616c2063616c6c206f6e6c790000000000000000006044820152606490fd5b60005b8381106119455750506000910152565b8181015183820152602001611935565b9060209161196e81518092818552858086019101611932565b601f01601f1916010190565b906020610683928181520190611955565b9291925a9061199b3033146118e6565b8251906040820151915a611388606083015185010111611a2b5781516119de575b505050610683936119d8915a900360808401510193369161049c565b906124a6565b516119fb926119f79290916001600160a01b0316612372565b1590565b611a07573880806119bc565b6107d6611a12612384565b60405163231638d960e11b81529182916004830161197a565b63deaddead60e01b60005260206000fd5b6001600160401b0381116103e85760051b60200190565b60405190611a60826103cd565b6000608083604051611a71816103ed565b83815283602082015283604082015283606082015283838201528360a08201528360c08201528360e082015281528260208201528260408201528260608201520152565b90611abf82611a3c565b611acc6040519182610424565b8281528092611add601f1991611a3c565b019060005b828110611aee57505050565b602090611af9611a53565b82828501015201611ae2565b634e487b7160e01b600052603260045260246000fd5b8051821015611b2f5760209160051b010190565b611b05565b9190811015611b2f5760051b8101359061015e19813603018212156102ac570190565b9190820391821161178457565b3d15611b8f573d90611b7582610481565b91611b836040519384610424565b82523d6000602084013e565b606090565b15611b9b57565b60405162461bcd60e51b81526020600482015260126024820152716661696c656420746f20776974686472617760701b6044820152606490fd5b9190811015611b2f5760051b81013590605e19813603018212156102ac570190565b903590601e19813603018212156102ac57018035906001600160401b0382116102ac57602001918160051b360383136102ac57565b356106838161031c565b15611c3d57565b60405162461bcd60e51b815260206004820152601760248201527f4141393620696e76616c69642061676772656761746f720000000000000000006044820152606490fd5b903590601e19813603018212156102ac57018035906001600160401b0382116102ac576020019181360383136102ac57565b9035601e19823603018112156102ac5701602081359101916001600160401b0382116102ac5781360383136102ac57565b908060209392818452848401376000828201840152601f01601f1916010190565b61068391611d2481611d1784610349565b6001600160a01b03169052565b60208201356020820152611dd2611dc6611d75611d5a611d476040870187611cb4565b6101606040880152610160870191611ce5565b611d676060870187611cb4565b908683036060880152611ce5565b6080850135608085015260a085013560a085015260c085013560c085015260e085013560e0850152610100850135610100850152611db7610120860186611cb4565b90858303610120870152611ce5565b92610140810190611cb4565b91610140818503910152611ce5565b94939192909483604082016040835252606081019560608560051b830101948160009061015e1981360301995b838310611e2d5750505050506106839495506020818503910152611ce5565b9091929397605f1986820301825288358b8112156102ac576020611e5660019386839401611d06565b9a019201930191909392611e0e565b6040513d6000823e3d90fd5b906014116102ac5790601490565b356bffffffffffffffffffffffff19811692919060148210611e9f575050565b6bffffffffffffffffffffffff1960149290920360031b82901b16169150565b908160209103126102ac57516106838161031c565b916020610683938181520191611ce5565b6020810135611fb3611f03611efd6040850185611c82565b90613a9a565b91611fa5611f17611efd6060870187611c82565b61010086013560e087013560c088013560a089013560808a0135611f42611efd6101208d018d611c82565b956040519a8b9960208b01809e60018060a01b03903516909693909a9998959261012098959261014089019c60018060a01b03168952602089015260408801526060870152608086015260a085015260c084015260e08301526101008201520152565b03601f198101835282610424565b51902060408051602081019283523091810191909152466060820152611fdc8160808101611fa5565b51902090565b611fec3482612d5a565b60018060a01b03168060005260006020527f2da466a7b24304f47e87fa2e1e5a81b9831ce54fec19055ce277ca2f39ba42c460206001600160701b0360406000205416604051908152a2565b1561203f57565b60405162461bcd60e51b8152602060048201526011602482015270616c726561647920756e7374616b696e6760781b6044820152606490fd5b9065ffffffffffff8091169116019065ffffffffffff821161178457565b1561209d57565b60405162461bcd60e51b81526020600482015260146024820152734e6f207374616b6520746f20776974686472617760601b6044820152606490fd5b156120e057565b60405162461bcd60e51b815260206004820152601d60248201527f6d7573742063616c6c20756e6c6f636b5374616b6528292066697273740000006044820152606490fd5b1561212c57565b60405162461bcd60e51b815260206004820152601b60248201527f5374616b65207769746864726177616c206973206e6f742064756500000000006044820152606490fd5b1561217857565b60405162461bcd60e51b815260206004820152601860248201527f6661696c656420746f207769746864726177207374616b6500000000000000006044820152606490fd5b908092918237016000815290565b929365ffffffffffff60c095610683989794829487526020870152166040850152166060830152151560808201528160a08201520190611955565b60405190604082018281106001600160401b038211176103e85760405260006020838281520152565b9060c060a061068393805184526020810151602085015260408101511515604085015265ffffffffffff606082015116606085015265ffffffffffff60808201511660808501520151918160a08201520190611955565b92946122e961033a956122d76101009599986122c56122b16020976101408b526101408b019061222f565b9b878a019060208091805184520151910152565b80516060890152602001516080880152565b805160a08701526020015160c0860152565b80516001600160a01b031660e08501520151805191909201908152602091820151910152565b61235861033a9461234661233160a0959998969960e0865260e086019061222f565b98602085019060208091805184520151910152565b80516060840152602001516080830152565b019060208091805184520151910152565b61033a33611fe2565b9060009283809360208451940192f190565b3d61080081116123a9575b604051906020818301016040528082526000602083013e90565b5061080061238f565b600311156123bc57565b634e487b7160e01b600052602160045260246000fd5b9392919060038110156123bc576040916123f9918652606060208701526060860190611955565b930152565b60009060033d1161240b57565b905060046000803e60005160e01c90565b600060443d10610683576040513d600319016004823e8051913d60248401116001600160401b0384111761248957828201928351916001600160401b038311612481573d84016003190185840160200111612481575061068392910160200190610424565b949350505050565b92915050565b604090610683939281528160208201520190611955565b92915a938051906124b682613064565b60a08301805190959194916001600160a01b039091169081806125ee57505083516001600160a01b03169050965b5a9003019283029560408201908782511061259f577f49628fd1471006c1482da88028e9ce4dbb080b815c9b0344d39e5a8e6ec1419f9261252d6020928a600195510390612d5a565b61253760006123b2565b01519261259a6020612560612552845160018060a01b031690565b98516001600160a01b031690565b9201519589604051948594818060a01b031699818060a01b0316988590949392606092608083019683521515602083015260408201520152565b0390a4565b60408051631101335b60e11b8152600060048201526024810191909152602060448201527f414135312070726566756e642062656c6f772061637475616c476173436f73746064820152608490fd5b989181516125fe575b50506124e4565b61260860006123b2565b606086015191813b156102ac5761263e92886000809460405180978196829563a9a2340960e01b84528c029085600485016123d2565b0393f180156110c457612652575b806125f7565b80610cfc600061266193610424565b3861264c565b1561266e57565b60405162461bcd60e51b815260206004820152601860248201527f41413934206761732076616c756573206f766572666c6f7700000000000000006044820152606490fd5b916000915a938151906126c682826130d8565b6126cf81611ee5565b60208401526127056001600160781b03608084015160608501511760408501511760e08401356101008501359117171115612667565b61270e82613180565b61271b8185846000613227565b84519098919061273d906119f7906001600160a01b031660208801519061349e565b6127f85761274a43600052565b60a09490940151606094906001600160a01b03166127dc575b505a810360a08401351061278d5760809360c092604087015260608601525a900391013501910152565b60408051631101335b60e11b8152600060048201526024810191909152601e60448201527f41413430206f76657220766572696669636174696f6e4761734c696d697400006064820152608490fd5b909350816127ef929750858460006135ca565b95909238612763565b60408051631101335b60e11b8152600060048201526024810191909152601a60448201527f4141323520696e76616c6964206163636f756e74206e6f6e63650000000000006064820152608490fd5b9290916000925a825161285a81846130d8565b61286383611ee5565b60208501526128996001600160781b03608083015160608401511760408401511760e08601356101008701359117171115612667565b6128a281613180565b6128ae8186868b613227565b8351909991906128d0906119f7906001600160a01b031660208701519061349e565b61298a576128dd43600052565b60a09390930151606093906001600160a01b031661296f575b505a840360a0860135106129225750604085015260608401526080919060c0905a900391013501910152565b60408051631101335b60e11b815260048101929092526024820152601e60448201527f41413430206f76657220766572696669636174696f6e4761734c696d697400006064820152608490fd5b909250816129819298508686856135ca565b969091386128f6565b60408051631101335b60e11b8152600481018490526024810191909152601a60448201527f4141323520696e76616c6964206163636f756e74206e6f6e63650000000000006064820152608490fd5b92906129e490613797565b916001600160a01b0391821691160361086f5761082057612a0490613797565b906001600160a01b03166107da5761077f5750565b908160209103126102ac575190565b90612a4460809161068396946101c085526101c0850191611ce5565b9360e0815160018060a01b03815116602086015260208101516040860152604081015160608601526060810151848601528381015160a086015260018060a01b0360a08201511660c086015260c081015182860152015161010084015260208101516101208401526040810151610140840152606081015161016084015201516101808201526101a0818403910152611955565b612b0f602091612af16060850151916060810190611c82565b9290916040519586948594630eb993ab60e11b865260048601612a28565b03816000305af160009181612bb2575b5061068357612b2c611b64565b60206000803e60005163deaddead60e01b14612b7157805115612b5157805190602001fd5b60405163231638d960e11b81526020600482015260006024820152604490fd5b60408051631101335b60e11b8152600060048201526024810191909152600f60448201526e41413935206f7574206f662067617360881b6064820152608490fd5b612bd591925060203d602011612bdc575b612bcd8183610424565b810190612a19565b9038612b1f565b503d612bc3565b929190612bff602091612af16060850151916060810190611c82565b03816000305af160009181612c87575b50612c835782612c1d611b64565b9060206000803e60005163deaddead60e01b14612c445750805115612b5157805190602001fd5b60408051631101335b60e11b815260048101929092526024820152600f60448201526e41413935206f7574206f662067617360881b6064820152608490fd5b9150565b612ca191925060203d602011612bdc57612bcd8183610424565b9038612c0f565b6001600160a01b03168015612d1557600080809381935af1612cc8611b64565b5015612cd057565b60405162461bcd60e51b815260206004820152601f60248201527f41413931206661696c65642073656e6420746f2062656e6566696369617279006044820152606490fd5b60405162461bcd60e51b815260206004820152601860248201527f4141393020696e76616c69642062656e656669636961727900000000000000006044820152606490fd5b60018060a01b0316600052600060205260406000206001600160701b03815416918201809211611784576001600160701b038211612db9576001600160701b0361033a92166001600160701b03166001600160701b0319825416179055565b60405162461bcd60e51b815260206004820152601060248201526f6465706f736974206f766572666c6f7760801b6044820152606490fd5b90612e0b9061068396949593606084526060840191611ce5565b6001600160a01b039094166020820152808403604090910152611ce5565b90604061068392600081528160208201520190611955565b612e4e6040820182611c82565b612e66612e5a84611c2c565b93610120810190611c82565b9290303b156102ac57600093612e9191604051968795869563957122ab60e01b875260048701612df1565b0381305afa9081612ef9575b5061033a576001612eac6123fe565b6308c379a014612ebd575b6110c457565b612ec561241c565b80612ed1575b50612eb7565b80516000925015612ecb57604051631101335b60e11b81529081906107d69060048301612e29565b80610cfc6000612f0893610424565b38612e9d565b60405190612f1b82610409565b60006040838281528260208201520152565b612f42612f4891612f3c612f0e565b506137e8565b916137e8565b81516001600160a01b0316908115613012575b82612f78604061142d60206106839697015165ffffffffffff1690565b91612f91604061142d602084015165ffffffffffff1690565b9065ffffffffffff811665ffffffffffff84161061300a575b5065ffffffffffff811665ffffffffffff841611613000575b50612ff190612fe2612fd3610472565b6001600160a01b039096168652565b65ffffffffffff166020850152565b65ffffffffffff166040830152565b9150612ff1612fc3565b915038612faa565b80516001600160a01b03169150612f5b565b9061302d612206565b9160018060a01b0316600052600060205263ffffffff600160406000206001600160701b03815460781c1685520154166020830152565b60e060c082015191015180821461308857480180821015613083575090565b905090565b5090565b1561309357565b60405162461bcd60e51b815260206004820152601d60248201527f4141393320696e76616c6964207061796d6173746572416e64446174610000006044820152606490fd5b61313d906130f56130e882611c2c565b6001600160a01b03168452565b602081013560208401526080810135604084015260a0810135606084015260c0810135608084015260e081013560c084015261010081013560e0840152610120810190611c82565b90811561317557613167610f51610f4b8460a094613162601461033a9998101561308c565b611e71565b6001600160a01b0316910152565b505060a06000910152565b60a08101516001600160a01b0316156131b55760c060035b60ff60408401519116606084015102016080830151019101510290565b60c06001613198565b6131d660409295949395606083526060830190611d06565b9460208201520152565b9061033a602f60405180946e020a09919903932bb32b93a32b21d1608d1b60208301526132168151809260208686019101611932565b81010301601f198101845283610424565b93929190915a916132b86020825195613246875160018060a01b031690565b9361325f6132576040840184611c82565b90838d613843565b60a08801516001600160a01b03169161327743600052565b6001600160a01b0390921615976000929089613446575b6060015191840151604051633a871cdd60e01b8152958694859360009385939291600485016131be565b03926001600160a01b03881690f160009181613425575b5061336757866132dd6123fe565b6308c379a01461332e575b60408051631101335b60e11b81526004810192909252602482015260166044820152754141323320726576657274656420286f72204f4f472960501b6064820152608490fd5b61333661241c565b8061334157506132e8565b61334a906131e0565b604051631101335b60e11b81529182916107d6916004840161248f565b94959293613379575b5050505a900391565b6001600160a01b03166000908152602081905260409020916133a561022784546001600160701b031690565b908183116133d8575082546dffffffffffffffffffffffffffff19169190036001600160701b0316179055388080613370565b60408051631101335b60e11b815260048101929092526024820152601760448201527f41413231206469646e2774207061792070726566756e640000000000000000006064820152608490fd5b61343f91925060203d602011612bdc57612bcd8183610424565b90386132cf565b925061347761022761346a8860018060a01b03166000526000602052604060002090565b546001600160701b031690565b8781111561349157506000846060825b959250505061328e565b8460606000928a03613487565b6001600160a01b0316600090815260016020908152604080832084821c845290915290208054916001600160401b03916134d7846118d7565b9055161490565b156134e557565b60405162461bcd60e51b815260206004820152601f60248201527f4141343120746f6f206c6974746c6520766572696669636174696f6e476173006044820152606490fd5b91906040838203126102ac5782516001600160401b0381116102ac5783019080601f830112156102ac5781519161356083610481565b9161356e6040519384610424565b838352602084830101116102ac5760209261358e91848085019101611932565b92015190565b9061033a602f60405180946e020a09999903932bb32b93a32b21d1608d1b60208301526132168151809260208686019101611932565b93909492919485516135f660a06060830151926135e88685116134de565b01516001600160a01b031690565b926136138460018060a01b03166000526000602052604060002090565b61362761022782546001600160701b031690565b86811061374857916020613687999a61366789989796946001600160701b0360009b8c9803166001600160701b03166001600160701b0319825416179055565b0151604051637a32e3bf60e11b8152998a978896879390600485016131be565b03946001600160a01b03169103f19182600091600094613721575b5061371d57836136b06123fe565b6308c379a014613701575b60408051631101335b60e11b81526004810192909252602482015260166044820152754141333320726576657274656420286f72204f4f472960501b6064820152608490fd5b61370961241c565b8061371457506136bb565b61334a90613594565b9250565b90935061374191503d806000833e6137398183610424565b81019061352a565b92386136a2565b60408051631101335b60e11b8152600481018b90526024810191909152601e60448201527f41413331207061796d6173746572206465706f73697420746f6f206c6f7700006064820152608490fd5b80156137df576137a6906137e8565b65ffffffffffff604082015116421180156137ca575b90516001600160a01b031691565b5065ffffffffffff60208201511642106137bc565b50600090600090565b6137f0612f0e565b5065ffffffffffff8160a01c168015613836575b65ffffffffffff906040519261381984610409565b6001600160a01b038116845260d01c602084015216604082015290565b5065ffffffffffff613804565b92909181613852575b50505050565b8251516001600160a01b031693843b613a4d5760608451015160206040518092632b870d1b60e11b8252816000737fc98430eaedbb6070b35b39d798725049088348826138a38b8b60048401611ed4565b0393f19081156110c457600091613a2e575b506001600160a01b0381169586156139df576001600160a01b031695869003613990573b156139435750610f51610f4b7fd51a9c61267aa6196961883ecf5ff2da6619c37dac0fa92122513fb32c032d2d9361391093611e71565b602083810151935160a00151604080516001600160a01b039485168152939091169183019190915290a33880808061384c565b60408051631101335b60e11b815260048101929092526024820152602060448201527f4141313520696e6974436f6465206d757374206372656174652073656e6465726064820152608490fd5b60408051631101335b60e11b8152600481018490526024810191909152602060448201527f4141313420696e6974436f6465206d7573742072657475726e2073656e6465726064820152608490fd5b60408051631101335b60e11b8152600481018590526024810191909152601b60448201527f4141313320696e6974436f6465206661696c6564206f72204f4f4700000000006064820152608490fd5b613a47915060203d6020116110bd576110af8183610424565b386138b5565b60408051631101335b60e11b815260048101929092526024820152601f60448201527f414131302073656e64657220616c726561647920636f6e7374727563746564006064820152608490fd5b81604051918237209056fea2646970667358221220505462e80d748f8efad6e9367e0bdf7b6af4cca47efb1cae9b3ebca529d6981b64736f6c634300081a0033" diff --git a/src/types/contracts/EntryPointSimulations.ts b/src/types/contracts/EntryPointSimulations07.ts similarity index 99% rename from src/types/contracts/EntryPointSimulations.ts rename to src/types/contracts/EntryPointSimulations07.ts index 5f4756af..19feea1e 100644 --- a/src/types/contracts/EntryPointSimulations.ts +++ b/src/types/contracts/EntryPointSimulations07.ts @@ -1,16 +1,3 @@ -export const EntryPointV06SimulationsAbi = [ - { - inputs: [ - { - name: "reason", - type: "string" - } - ], - name: "Error", - type: "error" - } -] as const - export const EntryPointV07SimulationsAbi = [ { type: "constructor", diff --git a/src/types/contracts/index.ts b/src/types/contracts/index.ts index 3cb433a2..2eab1a33 100644 --- a/src/types/contracts/index.ts +++ b/src/types/contracts/index.ts @@ -12,5 +12,6 @@ export * from "./TestOpcodesAccountFactory" export * from "./TestStorageAccount" export * from "./SimpleAccountFactory" export * from "./CodeHashGetter" -export * from "./EntryPointSimulations" +export * from "./EntryPointSimulations07" +export * from "./EntryPointSimulations06" export * from "./PimlicoEntryPointSimulations" diff --git a/test/e2e/alto-config.json b/test/e2e/alto-config.json index 77d8d105..19f6de9d 100644 --- a/test/e2e/alto-config.json +++ b/test/e2e/alto-config.json @@ -22,5 +22,6 @@ "mempool-max-parallel-ops": 10, "mempool-max-queued-ops": 10, "enforce-unique-senders-per-bundle": false, + "code-override-support": true, "enable-instant-bundling-endpoint": true } diff --git a/test/e2e/tests/eth_estimateUserOperationGas.test.ts b/test/e2e/tests/eth_estimateUserOperationGas.test.ts index 71a45fed..0e91bbe3 100644 --- a/test/e2e/tests/eth_estimateUserOperationGas.test.ts +++ b/test/e2e/tests/eth_estimateUserOperationGas.test.ts @@ -1,6 +1,11 @@ import type { EntryPointVersion } from "viem/account-abstraction" import { beforeEach, describe, expect, test } from "vitest" import { beforeEachCleanUp, getSmartAccountClient } from "../src/utils" +import { + getRevertCall, + deployRevertingContract +} from "../src/revertingContract" +import { Address, BaseError } from "viem" describe.each([ { @@ -12,7 +17,10 @@ describe.each([ ])( "$entryPointVersion supports eth_estimateUserOperationGas", ({ entryPointVersion }) => { + let revertingContract: Address + beforeEach(async () => { + revertingContract = await deployRevertingContract() await beforeEachCleanUp() }) @@ -113,5 +121,27 @@ describe.each([ expect(estimation.paymasterPostOpGasLimit).toBe(0n) expect(estimation.paymasterVerificationGasLimit).toBe(0n) }) + + test("Should throw revert reason if simulation reverted during callphase", async () => { + const smartAccountClient = await getSmartAccountClient({ + entryPointVersion + }) + + try { + await smartAccountClient.estimateUserOperationGas({ + calls: [ + { + to: revertingContract, + data: getRevertCall("foobar"), + value: 0n + } + ] + }) + } catch (e: any) { + expect(e).toBeInstanceOf(BaseError) + const err = e.walk() + expect(err.reason).toEqual("foobar") + } + }) } ) diff --git a/test/e2e/tests/eth_getUserOperationReceipt.test.ts b/test/e2e/tests/eth_getUserOperationReceipt.test.ts index 3a1e99cd..01723981 100644 --- a/test/e2e/tests/eth_getUserOperationReceipt.test.ts +++ b/test/e2e/tests/eth_getUserOperationReceipt.test.ts @@ -1,8 +1,17 @@ -import type { Address, Hex } from "viem" +import { + parseGwei, + type Address, + type Hex, + getContract, + parseEther, + concat +} from "viem" import { type EntryPointVersion, entryPoint06Address, - entryPoint07Address + entryPoint07Address, + UserOperation, + getUserOperationHash } from "viem/account-abstraction" import { beforeAll, beforeEach, describe, expect, test } from "vitest" import { @@ -12,6 +21,8 @@ import { } from "../src/revertingContract" import { deployPaymaster } from "../src/testPaymaster" import { beforeEachCleanUp, getSmartAccountClient } from "../src/utils" +import { deepHexlify } from "permissionless" +import { foundry } from "viem/chains" describe.each([ { @@ -37,28 +48,77 @@ describe.each([ await beforeEachCleanUp() }) + // uses pimlico_sendUserOperationNow to force send a reverting op (because it skips validation) test("Returns revert bytes when UserOperation reverts", async () => { const smartAccountClient = await getSmartAccountClient({ entryPointVersion }) - const hash = await smartAccountClient.sendUserOperation({ - calls: [ - { - to: revertingContract, - data: getRevertCall("foobar"), - value: 0n - } - ], - callGasLimit: 500_000n, - verificationGasLimit: 500_000n, - preVerificationGas: 500_000n + const { factory, factoryData } = + await smartAccountClient.account.getFactoryArgs() + + let op: UserOperation + if (entryPointVersion === "0.6") { + op = { + callData: await smartAccountClient.account.encodeCalls([ + { + to: revertingContract, + data: getRevertCall("foobar"), + value: 0n + } + ]), + initCode: concat([factory as Hex, factoryData as Hex]), + paymasterAndData: paymaster, + callGasLimit: 500_000n, + verificationGasLimit: 500_000n, + preVerificationGas: 500_000n, + sender: smartAccountClient.account.address, + nonce: 0n, + maxFeePerGas: parseGwei("10"), + maxPriorityFeePerGas: parseGwei("10") + } as UserOperation + } else { + op = { + sender: smartAccountClient.account.address, + nonce: 0n, + factory, + factoryData, + callData: await smartAccountClient.account.encodeCalls([ + { + to: revertingContract, + data: getRevertCall("foobar"), + value: 0n + } + ]), + callGasLimit: 500_000n, + verificationGasLimit: 500_000n, + preVerificationGas: 500_000n, + maxFeePerGas: parseGwei("10"), + maxPriorityFeePerGas: parseGwei("10"), + paymaster, + paymasterVerificationGasLimit: 100_000n, + paymasterPostOpGasLimit: 50_000n + } as UserOperation + } + + op.signature = + await smartAccountClient.account.signUserOperation(op) + + await smartAccountClient.request({ + // @ts-ignore + method: "pimlico_sendUserOperationNow", + params: [deepHexlify(op), entryPoint] }) await new Promise((resolve) => setTimeout(resolve, 1500)) const receipt = await smartAccountClient.getUserOperationReceipt({ - hash + hash: getUserOperationHash({ + userOperation: op, + chainId: foundry.id, + entryPointAddress: entryPoint, + entryPointVersion + }) }) expect(receipt).not.toBeNull()