@ensuro/account-abstraction 0.0.1

package/README.md

@@ -0,0 +1,13 @@
+# Sample Hardhat Project
+
+This project demonstrates a basic Hardhat use case. It comes with a sample contract, a test for that contract, and a Hardhat Ignition module that deploys that contract.
+
+Try running some of the following tasks:
+
+```shell
+npx hardhat help
+npx hardhat test
+REPORT_GAS=true npx hardhat test
+npx hardhat node
+npx hardhat ignition deploy ./ignition/modules/Lock.js
+```

package/build/contracts/AccessControlAccount.sol/AccessControlAccount.json

@@ -0,0 +1,516 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "AccessControlAccount",
+  "sourceName": "contracts/AccessControlAccount.sol",
+  "abi": [
+    {
+      "inputs": [
+        {
+          "internalType": "contract IEntryPoint",
+          "name": "anEntryPoint",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "admin",
+          "type": "address"
+        },
+        {
+          "internalType": "address[]",
+          "name": "executors",
+          "type": "address[]"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "constructor"
+    },
+    {
+      "inputs": [],
+      "name": "AccessControlBadConfirmation",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
+        },
+        {
+          "internalType": "bytes32",
+          "name": "neededRole",
+          "type": "bytes32"
+        }
+      ],
+      "name": "AccessControlUnauthorizedAccount",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "ECDSAInvalidSignature",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "uint256",
+          "name": "length",
+          "type": "uint256"
+        }
+      ],
+      "name": "ECDSAInvalidSignatureLength",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "bytes32",
+          "name": "s",
+          "type": "bytes32"
+        }
+      ],
+      "name": "ECDSAInvalidSignatureS",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "sender",
+          "type": "address"
+        }
+      ],
+      "name": "RequiredEntryPointOrExecutor",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "WrongArrayLength",
+      "type": "error"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "bytes32",
+          "name": "role",
+          "type": "bytes32"
+        },
+        {
+          "indexed": true,
+          "internalType": "bytes32",
+          "name": "previousAdminRole",
+          "type": "bytes32"
+        },
+        {
+          "indexed": true,
+          "internalType": "bytes32",
+          "name": "newAdminRole",
+          "type": "bytes32"
+        }
+      ],
+      "name": "RoleAdminChanged",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "bytes32",
+          "name": "role",
+          "type": "bytes32"
+        },
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "sender",
+          "type": "address"
+        }
+      ],
+      "name": "RoleGranted",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "bytes32",
+          "name": "role",
+          "type": "bytes32"
+        },
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "sender",
+          "type": "address"
+        }
+      ],
+      "name": "RoleRevoked",
+      "type": "event"
+    },
+    {
+      "inputs": [],
+      "name": "DEFAULT_ADMIN_ROLE",
+      "outputs": [
+        {
+          "internalType": "bytes32",
+          "name": "",
+          "type": "bytes32"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "EXECUTOR_ROLE",
+      "outputs": [
+        {
+          "internalType": "bytes32",
+          "name": "",
+          "type": "bytes32"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "WITHDRAW_ROLE",
+      "outputs": [
+        {
+          "internalType": "bytes32",
+          "name": "",
+          "type": "bytes32"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "addDeposit",
+      "outputs": [],
+      "stateMutability": "payable",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "entryPoint",
+      "outputs": [
+        {
+          "internalType": "contract IEntryPoint",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "dest",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "value",
+          "type": "uint256"
+        },
+        {
+          "internalType": "bytes",
+          "name": "func",
+          "type": "bytes"
+        }
+      ],
+      "name": "execute",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address[]",
+          "name": "dest",
+          "type": "address[]"
+        },
+        {
+          "internalType": "uint256[]",
+          "name": "value",
+          "type": "uint256[]"
+        },
+        {
+          "internalType": "bytes[]",
+          "name": "func",
+          "type": "bytes[]"
+        }
+      ],
+      "name": "executeBatch",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "getDeposit",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "getNonce",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "bytes32",
+          "name": "role",
+          "type": "bytes32"
+        }
+      ],
+      "name": "getRoleAdmin",
+      "outputs": [
+        {
+          "internalType": "bytes32",
+          "name": "",
+          "type": "bytes32"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "bytes32",
+          "name": "role",
+          "type": "bytes32"
+        },
+        {
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
+        }
+      ],
+      "name": "grantRole",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "bytes32",
+          "name": "role",
+          "type": "bytes32"
+        },
+        {
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
+        }
+      ],
+      "name": "hasRole",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "bytes32",
+          "name": "role",
+          "type": "bytes32"
+        },
+        {
+          "internalType": "address",
+          "name": "callerConfirmation",
+          "type": "address"
+        }
+      ],
+      "name": "renounceRole",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "bytes32",
+          "name": "role",
+          "type": "bytes32"
+        },
+        {
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
+        }
+      ],
+      "name": "revokeRole",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "bytes4",
+          "name": "interfaceId",
+          "type": "bytes4"
+        }
+      ],
+      "name": "supportsInterface",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "components": [
+            {
+              "internalType": "address",
+              "name": "sender",
+              "type": "address"
+            },
+            {
+              "internalType": "uint256",
+              "name": "nonce",
+              "type": "uint256"
+            },
+            {
+              "internalType": "bytes",
+              "name": "initCode",
+              "type": "bytes"
+            },
+            {
+              "internalType": "bytes",
+              "name": "callData",
+              "type": "bytes"
+            },
+            {
+              "internalType": "bytes32",
+              "name": "accountGasLimits",
+              "type": "bytes32"
+            },
+            {
+              "internalType": "uint256",
+              "name": "preVerificationGas",
+              "type": "uint256"
+            },
+            {
+              "internalType": "bytes32",
+              "name": "gasFees",
+              "type": "bytes32"
+            },
+            {
+              "internalType": "bytes",
+              "name": "paymasterAndData",
+              "type": "bytes"
+            },
+            {
+              "internalType": "bytes",
+              "name": "signature",
+              "type": "bytes"
+            }
+          ],
+          "internalType": "struct PackedUserOperation",
+          "name": "userOp",
+          "type": "tuple"
+        },
+        {
+          "internalType": "bytes32",
+          "name": "userOpHash",
+          "type": "bytes32"
+        },
+        {
+          "internalType": "uint256",
+          "name": "missingAccountFunds",
+          "type": "uint256"
+        }
+      ],
+      "name": "validateUserOp",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "validationData",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address payable",
+          "name": "withdrawAddress",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "amount",
+          "type": "uint256"
+        }
+      ],
+      "name": "withdrawDepositTo",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "stateMutability": "payable",
+      "type": "receive"
+    }
+  ],
+  "bytecode": "0x60a06040523480156200001157600080fd5b50604051620023c4380380620023c483398181016040528101906200003791906200049e565b8273ffffffffffffffffffffffffffffffffffffffff1660808173ffffffffffffffffffffffffffffffffffffffff1681525050620000806000801b83620000f660201b60201c565b5060005b8151811015620000ec57620000dd7fd8aa0f3194971a2a116679f7c2090f6939c8d4e01a2a8d7e41d55e5351469e63838381518110620000c957620000c862000519565b5b6020026020010151620000f660201b60201c565b50808060010191505062000084565b5050505062000548565b60006200010a8383620001f960201b60201c565b620001ee57600160008085815260200190815260200160002060000160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055506200018a6200026360201b60201c565b73ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16847f2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d60405160405180910390a460019050620001f3565b600090505b92915050565b600080600084815260200190815260200160002060000160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b600033905090565b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000620002ac826200027f565b9050919050565b6000620002c0826200029f565b9050919050565b620002d281620002b3565b8114620002de57600080fd5b50565b600081519050620002f281620002c7565b92915050565b62000303816200029f565b81146200030f57600080fd5b50565b6000815190506200032381620002f8565b92915050565b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b62000379826200032e565b810181811067ffffffffffffffff821117156200039b576200039a6200033f565b5b80604052505050565b6000620003b06200026b565b9050620003be82826200036e565b919050565b600067ffffffffffffffff821115620003e157620003e06200033f565b5b602082029050602081019050919050565b600080fd5b60006200040e6200040884620003c3565b620003a4565b90508083825260208201905060208402830185811115620004345762000433620003f2565b5b835b818110156200046157806200044c888262000312565b84526020840193505060208101905062000436565b5050509392505050565b600082601f83011262000483576200048262000329565b5b815162000495848260208601620003f7565b91505092915050565b600080600060608486031215620004ba57620004b962000275565b5b6000620004ca86828701620002e1565b9350506020620004dd8682870162000312565b925050604084015167ffffffffffffffff8111156200050157620005006200027a565b5b6200050f868287016200046b565b9150509250925092565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b608051611e606200056460003960006109250152611e606000f3fe6080604052600436106101025760003560e01c80634d44560d11610095578063b61d27f611610064578063b61d27f614610331578063c399ec881461035a578063d087d28814610385578063d547741f146103b0578063e02023a1146103d957610109565b80634d44560d1461027557806391d148541461029e578063a217fddf146102db578063b0d691fe1461030657610109565b80632f2ff15d116100d15780632f2ff15d146101f057806336568abe1461021957806347e1da2a146102425780634a58db191461026b57610109565b806301ffc9a71461010e57806307bd02651461014b57806319822f7c14610176578063248a9ca3146101b357610109565b3661010957005b600080fd5b34801561011a57600080fd5b506101356004803603810190610130919061142e565b610404565b6040516101429190611476565b60405180910390f35b34801561015757600080fd5b5061016061047e565b60405161016d91906114aa565b60405180910390f35b34801561018257600080fd5b5061019d6004803603810190610198919061154c565b6104a2565b6040516101aa91906115ca565b60405180910390f35b3480156101bf57600080fd5b506101da60048036038101906101d591906115e5565b6104d5565b6040516101e791906114aa565b60405180910390f35b3480156101fc57600080fd5b5061021760048036038101906102129190611670565b6104f4565b005b34801561022557600080fd5b50610240600480360381019061023b9190611670565b610516565b005b34801561024e57600080fd5b50610269600480360381019061026491906117c1565b610591565b005b610273610798565b005b34801561028157600080fd5b5061029c600480360381019061029791906118b3565b61080d565b005b3480156102aa57600080fd5b506102c560048036038101906102c09190611670565b6108b0565b6040516102d29190611476565b60405180910390f35b3480156102e757600080fd5b506102f061091a565b6040516102fd91906114aa565b60405180910390f35b34801561031257600080fd5b5061031b610921565b6040516103289190611952565b60405180910390f35b34801561033d57600080fd5b50610358600480360381019061035391906119c3565b610949565b005b34801561036657600080fd5b5061036f6109a6565b60405161037c91906115ca565b60405180910390f35b34801561039157600080fd5b5061039a610a2e565b6040516103a791906115ca565b60405180910390f35b3480156103bc57600080fd5b506103d760048036038101906103d29190611670565b610ab9565b005b3480156103e557600080fd5b506103ee610adb565b6040516103fb91906114aa565b60405180910390f35b60007f7965db0b000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19161480610477575061047682610aff565b5b9050919050565b7fd8aa0f3194971a2a116679f7c2090f6939c8d4e01a2a8d7e41d55e5351469e6381565b60006104ac610b69565b6104b68484610be0565b90506104c58460200135610c95565b6104ce82610c98565b9392505050565b6000806000838152602001908152602001600020600101549050919050565b6104fd826104d5565b61050681610d34565b6105108383610d48565b50505050565b61051e610e39565b73ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614610582576040517f6697b23200000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b61058c8282610e41565b505050565b610599610f33565b81819050868690501415806105c45750600084849050141580156105c35750818190508484905014155b5b156105fb576040517f2a00e5c600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600084849050036106c15760005b868690508110156106bb576106ae87878381811061062a57610629611a37565b5b905060200201602081019061063f9190611a66565b600085858581811061065457610653611a37565b5b90506020028101906106669190611aa2565b8080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f82011690508083019250505050505050610fe1565b8080600101915050610609565b50610790565b60005b8686905081101561078e576107818787838181106106e5576106e4611a37565b5b90506020020160208101906106fa9190611a66565b86868481811061070d5761070c611a37565b5b9050602002013585858581811061072757610726611a37565b5b90506020028101906107399190611aa2565b8080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f82011690508083019250505050505050610fe1565b80806001019150506106c4565b505b505050505050565b6107a0610921565b73ffffffffffffffffffffffffffffffffffffffff1663b760faf934306040518363ffffffff1660e01b81526004016107d99190611b14565b6000604051808303818588803b1580156107f257600080fd5b505af1158015610806573d6000803e3d6000fd5b5050505050565b7f5d8e12c39142ff96d79d04d15d1ba1269e4fe57bb9d26f43523628b34ba108ec61083781610d34565b61083f610921565b73ffffffffffffffffffffffffffffffffffffffff1663205c287884846040518363ffffffff1660e01b8152600401610879929190611b3e565b600060405180830381600087803b15801561089357600080fd5b505af11580156108a7573d6000803e3d6000fd5b50505050505050565b600080600084815260200190815260200160002060000160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b6000801b81565b60007f0000000000000000000000000000000000000000000000000000000000000000905090565b610951610f33565b6109a0848484848080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f82011690508083019250505050505050610fe1565b50505050565b60006109b0610921565b73ffffffffffffffffffffffffffffffffffffffff166370a08231306040518263ffffffff1660e01b81526004016109e89190611b14565b602060405180830381865afa158015610a05573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a299190611b7c565b905090565b6000610a38610921565b73ffffffffffffffffffffffffffffffffffffffff166335567e1a3060006040518363ffffffff1660e01b8152600401610a73929190611c08565b602060405180830381865afa158015610a90573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ab49190611b7c565b905090565b610ac2826104d5565b610acb81610d34565b610ad58383610e41565b50505050565b7f5d8e12c39142ff96d79d04d15d1ba1269e4fe57bb9d26f43523628b34ba108ec81565b60007f01ffc9a7000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916149050919050565b610b71610921565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610bde576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610bd590611c8e565b60405180910390fd5b565b600080610bec83611065565b90506000610c4d8286806101000190610c059190611aa2565b8080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f8201169050808301925050505050505061109b565b9050610c797fd8aa0f3194971a2a116679f7c2090f6939c8d4e01a2a8d7e41d55e5351469e63826108b0565b610c8857600192505050610c8f565b6000925050505b92915050565b50565b60008114610d315760003373ffffffffffffffffffffffffffffffffffffffff16827fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff90604051610ce890611cdf565b600060405180830381858888f193505050503d8060008114610d26576040519150601f19603f3d011682016040523d82523d6000602084013e610d2b565b606091505b50509050505b50565b610d4581610d40610e39565b6110c7565b50565b6000610d5483836108b0565b610e2e57600160008085815260200190815260200160002060000160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff021916908315150217905550610dcb610e39565b73ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16847f2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d60405160405180910390a460019050610e33565b600090505b92915050565b600033905090565b6000610e4d83836108b0565b15610f2857600080600085815260200190815260200160002060000160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff021916908315150217905550610ec5610e39565b73ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16847ff6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b60405160405180910390a460019050610f2d565b600090505b92915050565b610f3b610921565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614158015610f9d5750610f9b7fd8aa0f3194971a2a116679f7c2090f6939c8d4e01a2a8d7e41d55e5351469e63336108b0565b155b15610fdf57336040517ff1a1fdac000000000000000000000000000000000000000000000000000000008152600401610fd69190611b14565b60405180910390fd5b565b6000808473ffffffffffffffffffffffffffffffffffffffff16848460405161100a9190611d5a565b60006040518083038185875af1925050503d8060008114611047576040519150601f19603f3d011682016040523d82523d6000602084013e61104c565b606091505b50915091508161105e57805160208201fd5b5050505050565b60007f19457468657265756d205369676e6564204d6573736167653a0a33320000000060005281601c52603c6000209050919050565b6000806000806110ab8686611118565b9250925092506110bb8282611174565b82935050505092915050565b6110d182826108b0565b6111145780826040517fe2517d3f00000000000000000000000000000000000000000000000000000000815260040161110b929190611d71565b60405180910390fd5b5050565b6000806000604184510361115d5760008060006020870151925060408701519150606087015160001a905061114f888285856112d8565b95509550955050505061116d565b60006002855160001b9250925092505b9250925092565b6000600381111561118857611187611d9a565b5b82600381111561119b5761119a611d9a565b5b03156112d457600160038111156111b5576111b4611d9a565b5b8260038111156111c8576111c7611d9a565b5b036111ff576040517ff645eedf00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6002600381111561121357611212611d9a565b5b82600381111561122657611225611d9a565b5b0361126b578060001c6040517ffce698f700000000000000000000000000000000000000000000000000000000815260040161126291906115ca565b60405180910390fd5b60038081111561127e5761127d611d9a565b5b82600381111561129157611290611d9a565b5b036112d357806040517fd78bce0c0000000000000000000000000000000000000000000000000000000081526004016112ca91906114aa565b60405180910390fd5b5b5050565b60008060007f7fffffffffffffffffffffffffffffff5d576e7357a4501ddfe92f46681b20a08460001c11156113185760006003859250925092506113c2565b60006001888888886040516000815260200160405260405161133d9493929190611de5565b6020604051602081039080840390855afa15801561135f573d6000803e3d6000fd5b505050602060405103519050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff16036113b357600060016000801b935093509350506113c2565b8060008060001b935093509350505b9450945094915050565b600080fd5b600080fd5b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b61140b816113d6565b811461141657600080fd5b50565b60008135905061142881611402565b92915050565b600060208284031215611444576114436113cc565b5b600061145284828501611419565b91505092915050565b60008115159050919050565b6114708161145b565b82525050565b600060208201905061148b6000830184611467565b92915050565b6000819050919050565b6114a481611491565b82525050565b60006020820190506114bf600083018461149b565b92915050565b600080fd5b600061012082840312156114e1576114e06114c5565b5b81905092915050565b6114f381611491565b81146114fe57600080fd5b50565b600081359050611510816114ea565b92915050565b6000819050919050565b61152981611516565b811461153457600080fd5b50565b60008135905061154681611520565b92915050565b600080600060608486031215611565576115646113cc565b5b600084013567ffffffffffffffff811115611583576115826113d1565b5b61158f868287016114ca565b93505060206115a086828701611501565b92505060406115b186828701611537565b9150509250925092565b6115c481611516565b82525050565b60006020820190506115df60008301846115bb565b92915050565b6000602082840312156115fb576115fa6113cc565b5b600061160984828501611501565b91505092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061163d82611612565b9050919050565b61164d81611632565b811461165857600080fd5b50565b60008135905061166a81611644565b92915050565b60008060408385031215611687576116866113cc565b5b600061169585828601611501565b92505060206116a68582860161165b565b9150509250929050565b600080fd5b600080fd5b600080fd5b60008083601f8401126116d5576116d46116b0565b5b8235905067ffffffffffffffff8111156116f2576116f16116b5565b5b60208301915083602082028301111561170e5761170d6116ba565b5b9250929050565b60008083601f84011261172b5761172a6116b0565b5b8235905067ffffffffffffffff811115611748576117476116b5565b5b602083019150836020820283011115611764576117636116ba565b5b9250929050565b60008083601f840112611781576117806116b0565b5b8235905067ffffffffffffffff81111561179e5761179d6116b5565b5b6020830191508360208202830111156117ba576117b96116ba565b5b9250929050565b600080600080600080606087890312156117de576117dd6113cc565b5b600087013567ffffffffffffffff8111156117fc576117fb6113d1565b5b61180889828a016116bf565b9650965050602087013567ffffffffffffffff81111561182b5761182a6113d1565b5b61183789828a01611715565b9450945050604087013567ffffffffffffffff81111561185a576118596113d1565b5b61186689828a0161176b565b92509250509295509295509295565b600061188082611612565b9050919050565b61189081611875565b811461189b57600080fd5b50565b6000813590506118ad81611887565b92915050565b600080604083850312156118ca576118c96113cc565b5b60006118d88582860161189e565b92505060206118e985828601611537565b9150509250929050565b6000819050919050565b600061191861191361190e84611612565b6118f3565b611612565b9050919050565b600061192a826118fd565b9050919050565b600061193c8261191f565b9050919050565b61194c81611931565b82525050565b60006020820190506119676000830184611943565b92915050565b60008083601f840112611983576119826116b0565b5b8235905067ffffffffffffffff8111156119a05761199f6116b5565b5b6020830191508360018202830111156119bc576119bb6116ba565b5b9250929050565b600080600080606085870312156119dd576119dc6113cc565b5b60006119eb8782880161165b565b94505060206119fc87828801611537565b935050604085013567ffffffffffffffff811115611a1d57611a1c6113d1565b5b611a298782880161196d565b925092505092959194509250565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b600060208284031215611a7c57611a7b6113cc565b5b6000611a8a8482850161165b565b91505092915050565b600080fd5b600080fd5b600080fd5b60008083356001602003843603038112611abf57611abe611a93565b5b80840192508235915067ffffffffffffffff821115611ae157611ae0611a98565b5b602083019250600182023603831315611afd57611afc611a9d565b5b509250929050565b611b0e81611632565b82525050565b6000602082019050611b296000830184611b05565b92915050565b611b3881611875565b82525050565b6000604082019050611b536000830185611b2f565b611b6060208301846115bb565b9392505050565b600081519050611b7681611520565b92915050565b600060208284031215611b9257611b916113cc565b5b6000611ba084828501611b67565b91505092915050565b6000819050919050565b600077ffffffffffffffffffffffffffffffffffffffffffffffff82169050919050565b6000611bf2611bed611be884611ba9565b6118f3565b611bb3565b9050919050565b611c0281611bd7565b82525050565b6000604082019050611c1d6000830185611b05565b611c2a6020830184611bf9565b9392505050565b600082825260208201905092915050565b7f6163636f756e743a206e6f742066726f6d20456e747279506f696e7400000000600082015250565b6000611c78601c83611c31565b9150611c8382611c42565b602082019050919050565b60006020820190508181036000830152611ca781611c6b565b9050919050565b600081905092915050565b50565b6000611cc9600083611cae565b9150611cd482611cb9565b600082019050919050565b6000611cea82611cbc565b9150819050919050565b600081519050919050565b60005b83811015611d1d578082015181840152602081019050611d02565b60008484015250505050565b6000611d3482611cf4565b611d3e8185611cae565b9350611d4e818560208601611cff565b80840191505092915050565b6000611d668284611d29565b915081905092915050565b6000604082019050611d866000830185611b05565b611d93602083018461149b565b9392505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fd5b600060ff82169050919050565b611ddf81611dc9565b82525050565b6000608082019050611dfa600083018761149b565b611e076020830186611dd6565b611e14604083018561149b565b611e21606083018461149b565b9594505050505056fea26469706673582212200d807026ec1f8c046ed52e23b7d33106b05ee848e15ff2de1e9a2200fb783fd264736f6c63430008180033",
+  "deployedBytecode": "0x6080604052600436106101025760003560e01c80634d44560d11610095578063b61d27f611610064578063b61d27f614610331578063c399ec881461035a578063d087d28814610385578063d547741f146103b0578063e02023a1146103d957610109565b80634d44560d1461027557806391d148541461029e578063a217fddf146102db578063b0d691fe1461030657610109565b80632f2ff15d116100d15780632f2ff15d146101f057806336568abe1461021957806347e1da2a146102425780634a58db191461026b57610109565b806301ffc9a71461010e57806307bd02651461014b57806319822f7c14610176578063248a9ca3146101b357610109565b3661010957005b600080fd5b34801561011a57600080fd5b506101356004803603810190610130919061142e565b610404565b6040516101429190611476565b60405180910390f35b34801561015757600080fd5b5061016061047e565b60405161016d91906114aa565b60405180910390f35b34801561018257600080fd5b5061019d6004803603810190610198919061154c565b6104a2565b6040516101aa91906115ca565b60405180910390f35b3480156101bf57600080fd5b506101da60048036038101906101d591906115e5565b6104d5565b6040516101e791906114aa565b60405180910390f35b3480156101fc57600080fd5b5061021760048036038101906102129190611670565b6104f4565b005b34801561022557600080fd5b50610240600480360381019061023b9190611670565b610516565b005b34801561024e57600080fd5b50610269600480360381019061026491906117c1565b610591565b005b610273610798565b005b34801561028157600080fd5b5061029c600480360381019061029791906118b3565b61080d565b005b3480156102aa57600080fd5b506102c560048036038101906102c09190611670565b6108b0565b6040516102d29190611476565b60405180910390f35b3480156102e757600080fd5b506102f061091a565b6040516102fd91906114aa565b60405180910390f35b34801561031257600080fd5b5061031b610921565b6040516103289190611952565b60405180910390f35b34801561033d57600080fd5b50610358600480360381019061035391906119c3565b610949565b005b34801561036657600080fd5b5061036f6109a6565b60405161037c91906115ca565b60405180910390f35b34801561039157600080fd5b5061039a610a2e565b6040516103a791906115ca565b60405180910390f35b3480156103bc57600080fd5b506103d760048036038101906103d29190611670565b610ab9565b005b3480156103e557600080fd5b506103ee610adb565b6040516103fb91906114aa565b60405180910390f35b60007f7965db0b000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19161480610477575061047682610aff565b5b9050919050565b7fd8aa0f3194971a2a116679f7c2090f6939c8d4e01a2a8d7e41d55e5351469e6381565b60006104ac610b69565b6104b68484610be0565b90506104c58460200135610c95565b6104ce82610c98565b9392505050565b6000806000838152602001908152602001600020600101549050919050565b6104fd826104d5565b61050681610d34565b6105108383610d48565b50505050565b61051e610e39565b73ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614610582576040517f6697b23200000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b61058c8282610e41565b505050565b610599610f33565b81819050868690501415806105c45750600084849050141580156105c35750818190508484905014155b5b156105fb576040517f2a00e5c600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600084849050036106c15760005b868690508110156106bb576106ae87878381811061062a57610629611a37565b5b905060200201602081019061063f9190611a66565b600085858581811061065457610653611a37565b5b90506020028101906106669190611aa2565b8080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f82011690508083019250505050505050610fe1565b8080600101915050610609565b50610790565b60005b8686905081101561078e576107818787838181106106e5576106e4611a37565b5b90506020020160208101906106fa9190611a66565b86868481811061070d5761070c611a37565b5b9050602002013585858581811061072757610726611a37565b5b90506020028101906107399190611aa2565b8080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f82011690508083019250505050505050610fe1565b80806001019150506106c4565b505b505050505050565b6107a0610921565b73ffffffffffffffffffffffffffffffffffffffff1663b760faf934306040518363ffffffff1660e01b81526004016107d99190611b14565b6000604051808303818588803b1580156107f257600080fd5b505af1158015610806573d6000803e3d6000fd5b5050505050565b7f5d8e12c39142ff96d79d04d15d1ba1269e4fe57bb9d26f43523628b34ba108ec61083781610d34565b61083f610921565b73ffffffffffffffffffffffffffffffffffffffff1663205c287884846040518363ffffffff1660e01b8152600401610879929190611b3e565b600060405180830381600087803b15801561089357600080fd5b505af11580156108a7573d6000803e3d6000fd5b50505050505050565b600080600084815260200190815260200160002060000160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b6000801b81565b60007f0000000000000000000000000000000000000000000000000000000000000000905090565b610951610f33565b6109a0848484848080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f82011690508083019250505050505050610fe1565b50505050565b60006109b0610921565b73ffffffffffffffffffffffffffffffffffffffff166370a08231306040518263ffffffff1660e01b81526004016109e89190611b14565b602060405180830381865afa158015610a05573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a299190611b7c565b905090565b6000610a38610921565b73ffffffffffffffffffffffffffffffffffffffff166335567e1a3060006040518363ffffffff1660e01b8152600401610a73929190611c08565b602060405180830381865afa158015610a90573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ab49190611b7c565b905090565b610ac2826104d5565b610acb81610d34565b610ad58383610e41565b50505050565b7f5d8e12c39142ff96d79d04d15d1ba1269e4fe57bb9d26f43523628b34ba108ec81565b60007f01ffc9a7000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916149050919050565b610b71610921565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610bde576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610bd590611c8e565b60405180910390fd5b565b600080610bec83611065565b90506000610c4d8286806101000190610c059190611aa2565b8080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f8201169050808301925050505050505061109b565b9050610c797fd8aa0f3194971a2a116679f7c2090f6939c8d4e01a2a8d7e41d55e5351469e63826108b0565b610c8857600192505050610c8f565b6000925050505b92915050565b50565b60008114610d315760003373ffffffffffffffffffffffffffffffffffffffff16827fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff90604051610ce890611cdf565b600060405180830381858888f193505050503d8060008114610d26576040519150601f19603f3d011682016040523d82523d6000602084013e610d2b565b606091505b50509050505b50565b610d4581610d40610e39565b6110c7565b50565b6000610d5483836108b0565b610e2e57600160008085815260200190815260200160002060000160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff021916908315150217905550610dcb610e39565b73ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16847f2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d60405160405180910390a460019050610e33565b600090505b92915050565b600033905090565b6000610e4d83836108b0565b15610f2857600080600085815260200190815260200160002060000160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff021916908315150217905550610ec5610e39565b73ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16847ff6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b60405160405180910390a460019050610f2d565b600090505b92915050565b610f3b610921565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614158015610f9d5750610f9b7fd8aa0f3194971a2a116679f7c2090f6939c8d4e01a2a8d7e41d55e5351469e63336108b0565b155b15610fdf57336040517ff1a1fdac000000000000000000000000000000000000000000000000000000008152600401610fd69190611b14565b60405180910390fd5b565b6000808473ffffffffffffffffffffffffffffffffffffffff16848460405161100a9190611d5a565b60006040518083038185875af1925050503d8060008114611047576040519150601f19603f3d011682016040523d82523d6000602084013e61104c565b606091505b50915091508161105e57805160208201fd5b5050505050565b60007f19457468657265756d205369676e6564204d6573736167653a0a33320000000060005281601c52603c6000209050919050565b6000806000806110ab8686611118565b9250925092506110bb8282611174565b82935050505092915050565b6110d182826108b0565b6111145780826040517fe2517d3f00000000000000000000000000000000000000000000000000000000815260040161110b929190611d71565b60405180910390fd5b5050565b6000806000604184510361115d5760008060006020870151925060408701519150606087015160001a905061114f888285856112d8565b95509550955050505061116d565b60006002855160001b9250925092505b9250925092565b6000600381111561118857611187611d9a565b5b82600381111561119b5761119a611d9a565b5b03156112d457600160038111156111b5576111b4611d9a565b5b8260038111156111c8576111c7611d9a565b5b036111ff576040517ff645eedf00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6002600381111561121357611212611d9a565b5b82600381111561122657611225611d9a565b5b0361126b578060001c6040517ffce698f700000000000000000000000000000000000000000000000000000000815260040161126291906115ca565b60405180910390fd5b60038081111561127e5761127d611d9a565b5b82600381111561129157611290611d9a565b5b036112d357806040517fd78bce0c0000000000000000000000000000000000000000000000000000000081526004016112ca91906114aa565b60405180910390fd5b5b5050565b60008060007f7fffffffffffffffffffffffffffffff5d576e7357a4501ddfe92f46681b20a08460001c11156113185760006003859250925092506113c2565b60006001888888886040516000815260200160405260405161133d9493929190611de5565b6020604051602081039080840390855afa15801561135f573d6000803e3d6000fd5b505050602060405103519050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff16036113b357600060016000801b935093509350506113c2565b8060008060001b935093509350505b9450945094915050565b600080fd5b600080fd5b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b61140b816113d6565b811461141657600080fd5b50565b60008135905061142881611402565b92915050565b600060208284031215611444576114436113cc565b5b600061145284828501611419565b91505092915050565b60008115159050919050565b6114708161145b565b82525050565b600060208201905061148b6000830184611467565b92915050565b6000819050919050565b6114a481611491565b82525050565b60006020820190506114bf600083018461149b565b92915050565b600080fd5b600061012082840312156114e1576114e06114c5565b5b81905092915050565b6114f381611491565b81146114fe57600080fd5b50565b600081359050611510816114ea565b92915050565b6000819050919050565b61152981611516565b811461153457600080fd5b50565b60008135905061154681611520565b92915050565b600080600060608486031215611565576115646113cc565b5b600084013567ffffffffffffffff811115611583576115826113d1565b5b61158f868287016114ca565b93505060206115a086828701611501565b92505060406115b186828701611537565b9150509250925092565b6115c481611516565b82525050565b60006020820190506115df60008301846115bb565b92915050565b6000602082840312156115fb576115fa6113cc565b5b600061160984828501611501565b91505092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061163d82611612565b9050919050565b61164d81611632565b811461165857600080fd5b50565b60008135905061166a81611644565b92915050565b60008060408385031215611687576116866113cc565b5b600061169585828601611501565b92505060206116a68582860161165b565b9150509250929050565b600080fd5b600080fd5b600080fd5b60008083601f8401126116d5576116d46116b0565b5b8235905067ffffffffffffffff8111156116f2576116f16116b5565b5b60208301915083602082028301111561170e5761170d6116ba565b5b9250929050565b60008083601f84011261172b5761172a6116b0565b5b8235905067ffffffffffffffff811115611748576117476116b5565b5b602083019150836020820283011115611764576117636116ba565b5b9250929050565b60008083601f840112611781576117806116b0565b5b8235905067ffffffffffffffff81111561179e5761179d6116b5565b5b6020830191508360208202830111156117ba576117b96116ba565b5b9250929050565b600080600080600080606087890312156117de576117dd6113cc565b5b600087013567ffffffffffffffff8111156117fc576117fb6113d1565b5b61180889828a016116bf565b9650965050602087013567ffffffffffffffff81111561182b5761182a6113d1565b5b61183789828a01611715565b9450945050604087013567ffffffffffffffff81111561185a576118596113d1565b5b61186689828a0161176b565b92509250509295509295509295565b600061188082611612565b9050919050565b61189081611875565b811461189b57600080fd5b50565b6000813590506118ad81611887565b92915050565b600080604083850312156118ca576118c96113cc565b5b60006118d88582860161189e565b92505060206118e985828601611537565b9150509250929050565b6000819050919050565b600061191861191361190e84611612565b6118f3565b611612565b9050919050565b600061192a826118fd565b9050919050565b600061193c8261191f565b9050919050565b61194c81611931565b82525050565b60006020820190506119676000830184611943565b92915050565b60008083601f840112611983576119826116b0565b5b8235905067ffffffffffffffff8111156119a05761199f6116b5565b5b6020830191508360018202830111156119bc576119bb6116ba565b5b9250929050565b600080600080606085870312156119dd576119dc6113cc565b5b60006119eb8782880161165b565b94505060206119fc87828801611537565b935050604085013567ffffffffffffffff811115611a1d57611a1c6113d1565b5b611a298782880161196d565b925092505092959194509250565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b600060208284031215611a7c57611a7b6113cc565b5b6000611a8a8482850161165b565b91505092915050565b600080fd5b600080fd5b600080fd5b60008083356001602003843603038112611abf57611abe611a93565b5b80840192508235915067ffffffffffffffff821115611ae157611ae0611a98565b5b602083019250600182023603831315611afd57611afc611a9d565b5b509250929050565b611b0e81611632565b82525050565b6000602082019050611b296000830184611b05565b92915050565b611b3881611875565b82525050565b6000604082019050611b536000830185611b2f565b611b6060208301846115bb565b9392505050565b600081519050611b7681611520565b92915050565b600060208284031215611b9257611b916113cc565b5b6000611ba084828501611b67565b91505092915050565b6000819050919050565b600077ffffffffffffffffffffffffffffffffffffffffffffffff82169050919050565b6000611bf2611bed611be884611ba9565b6118f3565b611bb3565b9050919050565b611c0281611bd7565b82525050565b6000604082019050611c1d6000830185611b05565b611c2a6020830184611bf9565b9392505050565b600082825260208201905092915050565b7f6163636f756e743a206e6f742066726f6d20456e747279506f696e7400000000600082015250565b6000611c78601c83611c31565b9150611c8382611c42565b602082019050919050565b60006020820190508181036000830152611ca781611c6b565b9050919050565b600081905092915050565b50565b6000611cc9600083611cae565b9150611cd482611cb9565b600082019050919050565b6000611cea82611cbc565b9150819050919050565b600081519050919050565b60005b83811015611d1d578082015181840152602081019050611d02565b60008484015250505050565b6000611d3482611cf4565b611d3e8185611cae565b9350611d4e818560208601611cff565b80840191505092915050565b6000611d668284611d29565b915081905092915050565b6000604082019050611d866000830185611b05565b611d93602083018461149b565b9392505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fd5b600060ff82169050919050565b611ddf81611dc9565b82525050565b6000608082019050611dfa600083018761149b565b611e076020830186611dd6565b611e14604083018561149b565b611e21606083018461149b565b9594505050505056fea26469706673582212200d807026ec1f8c046ed52e23b7d33106b05ee848e15ff2de1e9a2200fb783fd264736f6c63430008180033",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

package/contracts/AccessControlAccount.sol

@@ -0,0 +1,118 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.23;
+
+import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";
+import {MessageHashUtils} from "@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol";
+import {BaseAccount} from "@account-abstraction/contracts/core/BaseAccount.sol";
+import {SIG_VALIDATION_SUCCESS, SIG_VALIDATION_FAILED} from "@account-abstraction/contracts/core/Helpers.sol";
+import {IEntryPoint} from "@account-abstraction/contracts/interfaces/IEntryPoint.sol";
+import {PackedUserOperation} from "@account-abstraction/contracts/interfaces/PackedUserOperation.sol";
+import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
+
+contract AccessControlAccount is AccessControl, BaseAccount {
+  bytes32 public constant WITHDRAW_ROLE = keccak256("WITHDRAW_ROLE");
+  bytes32 public constant EXECUTOR_ROLE = keccak256("EXECUTOR_ROLE");
+
+  IEntryPoint private immutable _entryPoint;
+
+  error RequiredEntryPointOrExecutor(address sender);
+  error WrongArrayLength();
+
+  /// @inheritdoc BaseAccount
+  function entryPoint() public view virtual override returns (IEntryPoint) {
+    return _entryPoint;
+  }
+
+  // solhint-disable-next-line no-empty-blocks
+  receive() external payable {}
+
+  constructor(IEntryPoint anEntryPoint, address admin, address[] memory executors) {
+    _entryPoint = anEntryPoint;
+    _grantRole(DEFAULT_ADMIN_ROLE, admin);
+    for (uint256 i; i < executors.length; i++) {
+      _grantRole(EXECUTOR_ROLE, executors[i]);
+    }
+  }
+
+  // Require the function call went through EntryPoint or owner
+  function _requireFromEntryPointOrExecutor() internal view {
+    if (msg.sender != address(entryPoint()) && !hasRole(EXECUTOR_ROLE, msg.sender))
+      revert RequiredEntryPointOrExecutor(msg.sender);
+  }
+
+  /**
+   * execute a transaction (called directly from owner, or by entryPoint)
+   * @param dest destination address to call
+   * @param value the value to pass in this call
+   * @param func the calldata to pass in this call
+   */
+  function execute(address dest, uint256 value, bytes calldata func) external {
+    _requireFromEntryPointOrExecutor();
+    _call(dest, value, func);
+  }
+
+  /**
+   * execute a sequence of transactions
+   * @dev to reduce gas consumption for trivial case (no value), use a zero-length array to mean zero value
+   * @param dest an array of destination addresses
+   * @param value an array of values to pass to each call. can be zero-length for no-value calls
+   * @param func an array of calldata to pass to each call
+   */
+  function executeBatch(address[] calldata dest, uint256[] calldata value, bytes[] calldata func) external {
+    _requireFromEntryPointOrExecutor();
+    if (dest.length != func.length || (value.length != 0 && value.length != func.length)) revert WrongArrayLength();
+    if (value.length == 0) {
+      for (uint256 i = 0; i < dest.length; i++) {
+        _call(dest[i], 0, func[i]);
+      }
+    } else {
+      for (uint256 i = 0; i < dest.length; i++) {
+        _call(dest[i], value[i], func[i]);
+      }
+    }
+  }
+
+  /// implement template method of BaseAccount
+  function _validateSignature(
+    PackedUserOperation calldata userOp,
+    bytes32 userOpHash
+  ) internal virtual override returns (uint256 validationData) {
+    bytes32 hash = MessageHashUtils.toEthSignedMessageHash(userOpHash);
+    address recovered = ECDSA.recover(hash, userOp.signature);
+    if (!hasRole(EXECUTOR_ROLE, recovered)) return SIG_VALIDATION_FAILED;
+    return SIG_VALIDATION_SUCCESS;
+  }
+
+  function _call(address target, uint256 value, bytes memory data) internal {
+    (bool success, bytes memory result) = target.call{value: value}(data);
+    if (!success) {
+      // solhint-disable-next-line no-inline-assembly
+      assembly {
+        revert(add(result, 32), mload(result))
+      }
+    }
+  }
+
+  /**
+   * check current account deposit in the entryPoint
+   */
+  function getDeposit() public view returns (uint256) {
+    return entryPoint().balanceOf(address(this));
+  }
+
+  /**
+   * deposit more funds for this account in the entryPoint
+   */
+  function addDeposit() public payable {
+    entryPoint().depositTo{value: msg.value}(address(this));
+  }
+
+  /**
+   * withdraw value from the account's deposit
+   * @param withdrawAddress target to send to
+   * @param amount to withdraw
+   */
+  function withdrawDepositTo(address payable withdrawAddress, uint256 amount) public onlyRole(WITHDRAW_ROLE) {
+    entryPoint().withdrawTo(withdrawAddress, amount);
+  }
+}

package/js/userOp.js

@@ -0,0 +1,160 @@
+const ethers = require("ethers");
+const { ZeroAddress } = ethers;
+
+const defaultAbiCoder = ethers.AbiCoder.defaultAbiCoder();
+
+function packAccountGasLimits(verificationGasLimit, callGasLimit) {
+  return ethers.toBeHex(verificationGasLimit, 16) + ethers.toBeHex(callGasLimit, 16).slice(2);
+}
+
+function packUserOp(userOp) {
+  const accountGasLimits = packAccountGasLimits(userOp.verificationGasLimit, userOp.callGasLimit);
+  const gasFees = packAccountGasLimits(userOp.maxPriorityFeePerGas, userOp.maxFeePerGas);
+  let paymasterAndData = "0x";
+  if (userOp.paymaster?.length >= 20 && userOp.paymaster !== ZeroAddress) {
+    paymasterAndData = packPaymasterData(
+      userOp.paymaster,
+      userOp.paymasterVerificationGasLimit,
+      userOp.paymasterPostOpGasLimit,
+      userOp.paymasterData
+    );
+  }
+  return {
+    sender: userOp.sender,
+    nonce: userOp.nonce,
+    callData: userOp.callData,
+    accountGasLimits,
+    initCode: userOp.initCode,
+    preVerificationGas: userOp.preVerificationGas,
+    gasFees,
+    paymasterAndData,
+    signature: userOp.signature,
+  };
+}
+
+function packedUserOpAsArray(packedUserOp, includeSignature = true) {
+  if (includeSignature) {
+    return [
+      packedUserOp.sender,
+      packedUserOp.nonce,
+      packedUserOp.initCode,
+      packedUserOp.callData,
+      packedUserOp.accountGasLimits,
+      packedUserOp.preVerificationGas,
+      packedUserOp.gasFees,
+      packedUserOp.paymasterAndData,
+      packedUserOp.signature,
+    ];
+  } else {
+    return [
+      packedUserOp.sender,
+      packedUserOp.nonce,
+      packedUserOp.initCode,
+      packedUserOp.callData,
+      packedUserOp.accountGasLimits,
+      packedUserOp.preVerificationGas,
+      packedUserOp.gasFees,
+      packedUserOp.paymasterAndData,
+    ];
+  }
+}
+
+function encodeUserOp(userOp, forSignature = true) {
+  const packedUserOp = packUserOp(userOp);
+  if (forSignature) {
+    return defaultAbiCoder.encode(
+      ["address", "uint256", "bytes32", "bytes32", "bytes32", "uint256", "bytes32", "bytes32"],
+      [
+        packedUserOp.sender,
+        packedUserOp.nonce,
+        ethers.keccak256(packedUserOp.initCode),
+        ethers.keccak256(packedUserOp.callData),
+        packedUserOp.accountGasLimits,
+        packedUserOp.preVerificationGas,
+        packedUserOp.gasFees,
+        ethers.keccak256(packedUserOp.paymasterAndData),
+      ]
+    );
+  } else {
+    // for the purpose of calculating gas cost encode also signature (and no keccak of bytes)
+    return defaultAbiCoder.encode(
+      ["address", "uint256", "bytes", "bytes", "bytes32", "uint256", "bytes32", "bytes", "bytes"],
+      [
+        packedUserOp.sender,
+        packedUserOp.nonce,
+        packedUserOp.initCode,
+        packedUserOp.callData,
+        packedUserOp.accountGasLimits,
+        packedUserOp.preVerificationGas,
+        packedUserOp.gasFees,
+        packedUserOp.paymasterAndData,
+        packedUserOp.signature,
+      ]
+    );
+  }
+}
+
+function getUserOpHash(op, entryPoint, chainId) {
+  const userOpHash = ethers.keccak256(encodeUserOp(op, true));
+  const enc = defaultAbiCoder.encode(["bytes32", "address", "uint256"], [userOpHash, entryPoint, chainId]);
+  return ethers.keccak256(enc);
+}
+
+const DefaultsForUserOp = {
+  sender: ZeroAddress,
+  nonce: 0,
+  initCode: "0x",
+  callData: "0x",
+  callGasLimit: 0,
+  verificationGasLimit: 150000, // default verification gas. will add create2 cost (3200+200*length) if initCode exists
+  preVerificationGas: 21000, // should also cover calldata cost.
+  maxFeePerGas: 0,
+  maxPriorityFeePerGas: 1e9,
+  paymaster: ZeroAddress,
+  paymasterData: "0x",
+  paymasterVerificationGasLimit: 3e5,
+  paymasterPostOpGasLimit: 0,
+  signature: "0x",
+};
+
+function signUserOp(op, signer, entryPoint, chainId) {
+  const message = getUserOpHash(op, entryPoint, chainId);
+  const msg1 = Buffer.concat([
+    Buffer.from("\x19Ethereum Signed Message:\n32", "ascii"),
+    Buffer.from(arrayify(message)),
+  ]);
+
+  const sig = ecsign(keccak256_buffer(msg1), Buffer.from(arrayify(signer.privateKey)));
+  // that's equivalent of:  await signer.signMessage(message);
+  // (but without "async"
+  const signedMessage1 = toRpcSig(sig.v, sig.r, sig.s);
+  return {
+    ...op,
+    signature: signedMessage1,
+  };
+}
+
+function fillUserOpDefaults(op, defaults = DefaultsForUserOp) {
+  const partial = { ...op };
+  // we want "item:undefined" to be used from defaults, and not override defaults, so we must explicitly
+  // remove those so "merge" will succeed.
+  for (const key in partial) {
+    if (partial[key] == null) {
+      // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+      delete partial[key];
+    }
+  }
+  const filled = { ...defaults, ...partial };
+  return filled;
+}
+
+module.exports = {
+  packAccountGasLimits,
+  packUserOp,
+  packedUserOpAsArray,
+  encodeUserOp,
+  getUserOpHash,
+  DefaultsForUserOp,
+  signUserOp,
+  fillUserOpDefaults,
+};

package/package.json

@@ -0,0 +1,30 @@
+{
+  "name": "@ensuro/account-abstraction",
+  "description": "ERC-4337 related contracts by the Ensuro Team",
+  "version": "0.0.1",
+  "files": [
+    "**/*.sol",
+    "/build",
+    "/js/*.js"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:ensuro/account-abstraction.git"
+  },
+  "keywords": [
+    "solidity",
+    "ethereum",
+    "smart",
+    "contracts",
+    "decentralized",
+    "insurance",
+    "ensuro",
+    "erc4337"
+  ],
+  "author": "Ensuro <guillermo@ensuro.co>",
+  "license": "Apache-2.0",
+  "bugs": {
+    "url": "https://github.com/ensuro/account-abstraction/issues"
+  },
+  "homepage": "https://github.com/ensuro/account-abstraction#readme"
+}