fix: userOp builder

rhinestonewtf · Jun 27, 2024 · d968e45 · d968e45
1 parent b2a5074
commit d968e45
Show file tree

Hide file tree

Showing 4 changed files with 125 additions and 30 deletions.
diff --git a/broadcast/DeployBuilder.s.sol/11155111/run-1719417421.json b/broadcast/DeployBuilder.s.sol/11155111/run-1719417421.json
@@ -0,0 +1,49 @@
+{
+  "transactions": [
+    {
+      "hash": "0x47afcf6ba1bc3950a42c5cbfb276c17d43d76607a73165a1e2bb47c289836f77",
+      "transactionType": "CREATE2",
+      "contractName": "Safe7579UserOperationBuilder",
+      "contractAddress": "0x09075792aaf192fdbd0b65037c93d1dbccd6874e",
+      "function": null,
+      "arguments": [
+        "0x0000000071727De22E5E9d8BAf0edAc6f37da032"
+      ],
+      "transaction": {
+        "from": "0x8749313f626b100b822d573c71dfffdaca383032",
+        "to": "0x4e59b44847b379578588920ca78fbf26c0b4956c",
+        "gas": "0x161b57",
+        "value": "0x0",
+        "input": "0x000000000000000000000000000000000000000000000000000000000000000060a0604052348015600f57600080fd5b50604051611171380380611171833981016040819052602c91603c565b6001600160a01b0316608052606a565b600060208284031215604d57600080fd5b81516001600160a01b0381168114606357600080fd5b9392505050565b6080516110e661008b6000396000818160c601526102c201526110e66000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c806369020e1f1461005c578063929caeab14610085578063aa101657146100a6578063b0d691fe146100b9578063e8fa2eb8146100f0575b600080fd5b61006f61006a366004610876565b610103565b60405161007c9190610946565b60405180910390f35b610098610093366004610960565b610269565b60405190815260200161007c565b61006f6100b43660046109b2565b610339565b6040516001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016815260200161007c565b61006f6100fe3660046109b2565b6105a1565b60608282600081811061011857610118610a6a565b909101356001600160f81b031916600160f81b0390506101db576000808080610144866001818a610a80565b8101906101519190610b87565b93509350935093508686600081811061016c5761016c610a6a565b909101356001600160f81b03191690508484848461018e6101008e018e610c31565b6040516020016101a2959493929190610c77565b60408051601f19818403018152908290526101c1939291602001610ce7565b604051602081830303815290604052945050505050610261565b60006101eb602160018587610a80565b6101f491610d25565b9050600080610207610100880188610c31565b8101906102149190610d44565b915091508585838360405160200161022d929190610dab565b60408051601f198184030181529082905261024c939291602001610dd0565b60405160208183030381529060405293505050505b949350505050565b6000806102796014828587610a80565b61028291610df7565b60408051631aab3f0d60e11b81526001600160a01b0388811660048301529183901c640100000000600160c01b03166024820181905260609390931c93507f0000000000000000000000000000000000000000000000000000000000000000909116906335567e1a90604401602060405180830381865afa15801561030b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061032f9190610e3a565b9695505050505050565b606060006103478385610d25565b9050600060f81b84846040516020016105669060408082526041908201527fe8b94748580ca0b4993c9a1b86b5be851bfc076ff5ce3a1ff65bf16392acfcb860608201527ef9b4f1aef1555c7fce5599fffb17e7c635502154a0333ba21f3ae491839af56080820152600760fa1b60a082015260c0602082018190526102009082018190527f07855b46a623a8ecabac76ed697aa4e13631e3b6718c8a0d342860c13c30d2fc60e080840191909152610100830152600160f81b6101208301526101408083015260246101608301527f456b4f30bac4a8994b010d127650e6f22669f7f7aec4475f80f8c2a8d2ed02876101808301527f2b0aca713e929d8a28596b42f325fa9587a16a8eb2bc07e4b3a3e9c14a7b98816101a083015260256101c08301527f1584482fdf7a4d0b7eb9d45cf835288cb59e55b8249fff356e33be88ecc546d16101e0830152601d60f81b9082015260956102208201527f7b2274797065223a22776562617574686e2e676574222c226368616c6c656e676102408201527f65223a22307831383138356261383531633032383032323035366564396634326102608201527f62613134343965326131386637393239323262383839393639373139626166656102808201527f373861653563222c226f726967696e223a2268747470733a2f2f646576656c6f6102a082015274706d656e742e666f72756d64616f732e636f6d227d60581b6102c08201526102e00190565b60408051601f198184030181529082905261058694939291602001610e53565b60405160208183030381529060405291505095945050505050565b606060008490036105f15760405162461bcd60e51b8152602060048201526016602482015275139bc8195e1958dd5d1a5bdb9cc81c1c9bdd9a59195960521b604482015260640160405180910390fd5b600184900361071057610602610733565b6106ce8686600081811061061857610618610a6a565b905060200281019061062a9190610e96565b610638906020810190610eb6565b8787600081811061064b5761064b610a6a565b905060200281019061065d9190610e96565b602001358888600081811061067457610674610a6a565b90506020028101906106869190610e96565b610694906040810190610c31565b8080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061074692505050565b6040516024016106df929190610ed1565b60408051601f198184030181529190526020810180516001600160e01b031663e9ae5c5360e01b179052905061072a565b610718610775565b6106ce6107258688610eea565b610787565b95945050505050565b6000610741818080806107b0565b905090565b606083838360405160200161075d93929190610fc0565b60405160208183030381529060405290509392505050565b6000610741600160f81b8280806107b0565b60608160405160200161079a9190610ffa565b6040516020818303038152906040529050919050565b604080516001600160f81b03198087166020830152851660218201526000602282018190526001600160e01b03198516602683015269ffffffffffffffffffff198416602a830152910160405160208183030381529060405261072a90611089565b80356001600160a01b038116811461082957600080fd5b919050565b60008083601f84011261084057600080fd5b5081356001600160401b0381111561085757600080fd5b60208301915083602082850101111561086f57600080fd5b9250929050565b6000806000806060858703121561088c57600080fd5b61089585610812565b935060208501356001600160401b038111156108b057600080fd5b850161012081880312156108c357600080fd5b925060408501356001600160401b038111156108de57600080fd5b6108ea8782880161082e565b95989497509550505050565b60005b838110156109115781810151838201526020016108f9565b50506000910152565b600081518084526109328160208601602086016108f6565b601f01601f19169290920160200192915050565b602081526000610959602083018461091a565b9392505050565b60008060006040848603121561097557600080fd5b61097e84610812565b925060208401356001600160401b0381111561099957600080fd5b6109a58682870161082e565b9497909650939450505050565b6000806000806000606086880312156109ca57600080fd5b6109d386610812565b945060208601356001600160401b038111156109ee57600080fd5b8601601f810188136109ff57600080fd5b80356001600160401b03811115610a1557600080fd5b8860208260051b8401011115610a2a57600080fd5b6020919091019450925060408601356001600160401b03811115610a4d57600080fd5b610a598882890161082e565b969995985093965092949392505050565b634e487b7160e01b600052603260045260246000fd5b60008085851115610a9057600080fd5b83861115610a9d57600080fd5b5050820193919092039150565b634e487b7160e01b600052604160045260246000fd5b604051606081016001600160401b0381118282101715610ae257610ae2610aaa565b60405290565b604051601f8201601f191681016001600160401b0381118282101715610b1057610b10610aaa565b604052919050565b600082601f830112610b2957600080fd5b81356001600160401b03811115610b4257610b42610aaa565b610b55601f8201601f1916602001610ae8565b818152846020838601011115610b6a57600080fd5b816020850160208301376000918101602001919091529392505050565b60008060008060808587031215610b9d57600080fd5b843560ff81168114610bae57600080fd5b935060208501356001600160401b03811115610bc957600080fd5b610bd587828801610b18565b93505060408501356001600160401b03811115610bf157600080fd5b610bfd87828801610b18565b92505060608501356001600160401b03811115610c1957600080fd5b610c2587828801610b18565b91505092959194509250565b6000808335601e19843603018112610c4857600080fd5b8301803591506001600160401b03821115610c6257600080fd5b60200191503681900382131561086f57600080fd5b608081526000610c8a608083018861091a565b8281036020840152610c9c818861091a565b90508281036040840152610cb0818761091a565b90508281036060840152838152838560208301376000602085830101526020601f19601f8601168201019150509695505050505050565b6001600160f81b0319848116825260f884901b1660018201528151600090610d168160028501602087016108f6565b91909101600201949350505050565b80356020831015610d3e57600019602084900360031b1b165b92915050565b60008060408385031215610d5757600080fd5b82356001600160401b03811115610d6d57600080fd5b610d7985828601610b18565b92505060208301356001600160401b03811115610d9557600080fd5b610da185828601610b18565b9150509250929050565b604081526000610dbe604083018561091a565b828103602084015261072a818561091a565b828482376000838201600081528351610ded8183602088016108f6565b0195945050505050565b80356bffffffffffffffffffffffff198116906014841015610e33576001600160601b03196001600160601b03198560140360031b1b82161691505b5092915050565b600060208284031215610e4c57600080fd5b5051919050565b6001600160f81b03198516815282846001830137600083820160018101600081528451610e848183602089016108f6565b91909101600101979650505050505050565b60008235605e19833603018112610eac57600080fd5b9190910192915050565b600060208284031215610ec857600080fd5b61095982610812565b828152604060208201526000610261604083018461091a565b60006001600160401b03831115610f0357610f03610aaa565b8260051b610f1360208201610ae8565b84815290830190602081019036831115610f2c57600080fd5b845b83811015610fb65780356001600160401b03811115610f4c57600080fd5b86016060368290031215610f5f57600080fd5b610f67610ac0565b610f7082610812565b81526020820135602082015260408201356001600160401b03811115610f9557600080fd5b610fa136828501610b18565b60408301525084525060209283019201610f2e565b5095945050505050565b6001600160601b03198460601b16815282601482015260008251610feb8160348501602087016108f6565b91909101603401949350505050565b6000602082016020835280845180835260408501915060408160051b86010192506020860160005b8281101561107d57868503603f19018452815180516001600160a01b03168652602080820151908701526040908101516060918701829052906110679087018261091a565b9550506020938401939190910190600101611022565b50929695505050505050565b805160208083015191908110156110aa576000198160200360031b1b821691505b5091905056fea26469706673582212204299c2b241152400e080c3fe2ab916f9900d2745b7e6eacc470fb2033208e38f64736f6c634300081a00330000000000000000000000000000000071727de22e5e9d8baf0edac6f37da032",
+        "nonce": "0x4f",
+        "chainId": "0xaa36a7"
+      },
+      "additionalContracts": [],
+      "isFixedGasLimit": false
+    }
+  ],
+  "receipts": [
+    {
+      "status": "0x1",
+      "cumulativeGasUsed": "0xa3e825",
+      "logs": [],
+      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "type": "0x2",
+      "transactionHash": "0x47afcf6ba1bc3950a42c5cbfb276c17d43d76607a73165a1e2bb47c289836f77",
+      "transactionIndex": "0x3f",
+      "blockHash": "0x7f656c1cb0d380acc772df5c7afad8e583417eb925a1247b422ded4143df1441",
+      "blockNumber": "0x5e7a76",
+      "gasUsed": "0xf1ebd",
+      "effectiveGasPrice": "0xf7c2c3043",
+      "from": "0x8749313f626b100b822d573c71dfffdaca383032",
+      "to": "0x4e59b44847b379578588920ca78fbf26c0b4956c",
+      "contractAddress": "0x09075792aaf192fdbd0b65037c93d1dbccd6874e"
+    }
+  ],
+  "libraries": [],
+  "pending": [],
+  "returns": {},
+  "timestamp": 1719417421,
+  "chain": 11155111,
+  "commit": "b2a5074"
+}