Skip to content

Commit

Permalink
some more refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
Haxry committed Oct 19, 2024
1 parent b5ad848 commit bdd1eed
Show file tree
Hide file tree
Showing 20 changed files with 199 additions and 28 deletions.
48 changes: 48 additions & 0 deletions broadcast/ZapAccountFactory.s.sol/11155111/run-1729326631.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"transactions": [
{
"hash": "0x11bd5e90f2bfbc92e6ef55b0e16b05eec4c4a337a47d37c0d346e9a294ba146c",
"transactionType": "CREATE",
"contractName": "ZapAccountFactory",
"contractAddress": "0xe2d818a039eb7922944b713af08ea966d13bd79c",
"function": null,
"arguments": [
"0xEdf47C7E665bEb76b216205573935236f89ae83A"
],
"transaction": {
"from": "0x372610bdcfa0531b40c8b27bb22a4e198ef04604",
"gas": "0xc4f5b",
"value": "0x0",
"input": "0x60a060405234801561001057600080fd5b50604051610acd380380610acd83398101604081905261002f91610040565b6001600160a01b0316608052610070565b60006020828403121561005257600080fd5b81516001600160a01b038116811461006957600080fd5b9392505050565b608051610a4561008860003960005050610a456000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80635fbfb9cf1461003b5780638cb84e181461006a575b600080fd5b61004e6100493660046101c7565b61007d565b6040516001600160a01b03909116815260200160405180910390f35b61004e6100783660046101c7565b6100f2565b60008061008a84846100f2565b90506001600160a01b0381163b80156100a5575090506100ec565b8360001b856040516100b6906101ba565b6001600160a01b0390911681526020018190604051809103906000f59050801580156100e6573d6000803e3d6000fd5b50925050505b92915050565b60405160009082908290610108602082016101ba565b601f1982820381018352601f9091011660408181526001600160a01b03881660208301520160408051601f198184030181529082905261014b929160200161022f565b60408051808303601f1901815282825280516020918201206001600160f81b0319828501523060601b6bffffffffffffffffffffffff19166021850152603584019590955260558084019590955281518084039095018552607590920190528251920191909120949350505050565b6107c38061024d83390190565b600080604083850312156101da57600080fd5b82356001600160a01b03811681146101f157600080fd5b946020939093013593505050565b6000815160005b818110156102205760208185018101518683015201610206565b50600093019283525090919050565b600061024461023e83866101ff565b846101ff565b94935050505056fe60c060405273edf47c7e665beb76b216205573935236f89ae83a60a05234801561002857600080fd5b506040516107c33803806107c383398101604081905261004791610058565b6001600160a01b0316608052610088565b60006020828403121561006a57600080fd5b81516001600160a01b038116811461008157600080fd5b9392505050565b60805160a0516107036100c06000396000818160b80152610142015260008181607c01528181610110015261024d01526107036000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c806319822f7c146100515780638da5cb5b14610077578063b0d691fe146100b6578063b61d27f6146100dc575b600080fd5b61006461005f366004610521565b6100f1565b6040519081526020015b60405180910390f35b61009e7f000000000000000000000000000000000000000000000000000000000000000081565b6040516001600160a01b03909116815260200161006e565b7f000000000000000000000000000000000000000000000000000000000000000061009e565b6100ef6100ea366004610575565b610105565b005b60006100fd84846101c7565b949350505050565b336001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614806101645750336001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016145b6101b55760405162461bcd60e51b815260206004820152601960248201527f6f6e6c79206f776e6572206f7220656e74727920706f696e740000000000000060448201526064015b60405180910390fd5b6101c184848484610290565b50505050565b7f19457468657265756d205369676e6564204d6573736167653a0a3332000000006000908152601c829052603c81206102428161020861010087018761060a565b8080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061031e92505050565b6001600160a01b03167f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03161461028457600191505061028a565b60009150505b92915050565b600080856001600160a01b03168585856040516102ae929190610658565b60006040518083038185875af1925050503d80600081146102eb576040519150601f19603f3d011682016040523d82523d6000602084013e6102f0565b606091505b50915091508181906103155760405162461bcd60e51b81526004016101ac9190610668565b50505050505050565b60008060008061032e8686610348565b92509250925061033e8282610395565b5090949350505050565b600080600083516041036103825760208401516040850151606086015160001a61037488828585610452565b95509550955050505061038e565b50508151600091506002905b9250925092565b60008260038111156103a9576103a96106b7565b036103b2575050565b60018260038111156103c6576103c66106b7565b036103e45760405163f645eedf60e01b815260040160405180910390fd5b60028260038111156103f8576103f86106b7565b036104195760405163fce698f760e01b8152600481018290526024016101ac565b600382600381111561042d5761042d6106b7565b0361044e576040516335e2f38360e21b8152600481018290526024016101ac565b5050565b600080807f7fffffffffffffffffffffffffffffff5d576e7357a4501ddfe92f46681b20a084111561048d5750600091506003905082610517565b604080516000808252602082018084528a905260ff891692820192909252606081018790526080810186905260019060a0016020604051602081039080840390855afa1580156104e1573d6000803e3d6000fd5b5050604051601f1901519150506001600160a01b03811661050d57506000925060019150829050610517565b9250600091508190505b9450945094915050565b60008060006060848603121561053657600080fd5b833567ffffffffffffffff81111561054d57600080fd5b8401610120818703121561056057600080fd5b95602085013595506040909401359392505050565b6000806000806060858703121561058b57600080fd5b84356001600160a01b03811681146105a257600080fd5b935060208501359250604085013567ffffffffffffffff808211156105c657600080fd5b818701915087601f8301126105da57600080fd5b8135818111156105e957600080fd5b8860208285010111156105fb57600080fd5b95989497505060200194505050565b6000808335601e1984360301811261062157600080fd5b83018035915067ffffffffffffffff82111561063c57600080fd5b60200191503681900382131561065157600080fd5b9250929050565b8183823760009101908152919050565b60006020808352835180602085015260005b818110156106965785810183015185820160400152820161067a565b506000604082860101526040601f19601f8301168501019250505092915050565b634e487b7160e01b600052602160045260246000fdfea264697066735822122075f383414445cb4c769cf5e40d1a2d78239abdb9a6872ac93a37ff3f0609796d64736f6c63430008170033a26469706673582212204c1c055030bbc1b6c9fd4a3da2dda0fee2196dcff76f3127132a51bef07d56f764736f6c63430008170033000000000000000000000000edf47c7e665beb76b216205573935236f89ae83a",
"nonce": "0x9",
"chainId": "0xaa36a7"
},
"additionalContracts": [],
"isFixedGasLimit": false
}
],
"receipts": [
{
"status": "0x1",
"cumulativeGasUsed": "0xe9ca64",
"logs": [],
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"type": "0x2",
"transactionHash": "0x11bd5e90f2bfbc92e6ef55b0e16b05eec4c4a337a47d37c0d346e9a294ba146c",
"transactionIndex": "0x69",
"blockHash": "0x295959785eead09bc6770fcb9be383e22a93710e15a8f02308d669652f27b344",
"blockNumber": "0x6955a4",
"gasUsed": "0x978cf",
"effectiveGasPrice": "0x2393dce15",
"from": "0x372610bdcfa0531b40c8b27bb22a4e198ef04604",
"to": null,
"contractAddress": "0xe2d818a039eb7922944b713af08ea966d13bd79c"
}
],
"libraries": [],
"pending": [],
"returns": {},
"timestamp": 1729326631,
"chain": 11155111,
"commit": "b5ad848"
}
48 changes: 48 additions & 0 deletions broadcast/ZapAccountFactory.s.sol/11155111/run-1729327674.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"transactions": [
{
"hash": "0x4f71857f38032bdbbfef3fc4011274aaf3c91d88a2685d15ccab8a7c4d8a4201",
"transactionType": "CREATE",
"contractName": "ZapAccountFactory",
"contractAddress": "0x3d0919fd0f22cf53302c3bbd4567fc661c8bf6a1",
"function": null,
"arguments": [
"0xEdf47C7E665bEb76b216205573935236f89ae83A"
],
"transaction": {
"from": "0x372610bdcfa0531b40c8b27bb22a4e198ef04604",
"gas": "0xc5296",
"value": "0x0",
"input": "0x60a060405234801561001057600080fd5b50604051610ad0380380610ad083398101604081905261002f91610040565b6001600160a01b0316608052610070565b60006020828403121561005257600080fd5b81516001600160a01b038116811461006957600080fd5b9392505050565b608051610a4861008860003960005050610a486000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80635fbfb9cf1461003b5780638cb84e181461006a575b600080fd5b61004e6100493660046101ca565b61007d565b6040516001600160a01b03909116815260200160405180910390f35b61004e6100783660046101ca565b6100f5565b60008061008a84846100f5565b90506001600160a01b0381163b80156100a5575090506100ef565b60008460001b866040516100b8906101bd565b6001600160a01b0390911681526020018190604051809103906000f59050801580156100e8573d6000803e3d6000fd5b5093505050505b92915050565b6040516000908290829061010b602082016101bd565b601f1982820381018352601f9091011660408181526001600160a01b03881660208301520160408051601f198184030181529082905261014e9291602001610232565b60408051808303601f1901815282825280516020918201206001600160f81b0319828501523060601b6bffffffffffffffffffffffff19166021850152603584019590955260558084019590955281518084039095018552607590920190528251920191909120949350505050565b6107c38061025083390190565b600080604083850312156101dd57600080fd5b82356001600160a01b03811681146101f457600080fd5b946020939093013593505050565b6000815160005b818110156102235760208185018101518683015201610209565b50600093019283525090919050565b60006102476102418386610202565b84610202565b94935050505056fe60c060405273edf47c7e665beb76b216205573935236f89ae83a60a05234801561002857600080fd5b506040516107c33803806107c383398101604081905261004791610058565b6001600160a01b0316608052610088565b60006020828403121561006a57600080fd5b81516001600160a01b038116811461008157600080fd5b9392505050565b60805160a0516107036100c06000396000818160b80152610142015260008181607c01528181610110015261024d01526107036000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c806319822f7c146100515780638da5cb5b14610077578063b0d691fe146100b6578063b61d27f6146100dc575b600080fd5b61006461005f366004610521565b6100f1565b6040519081526020015b60405180910390f35b61009e7f000000000000000000000000000000000000000000000000000000000000000081565b6040516001600160a01b03909116815260200161006e565b7f000000000000000000000000000000000000000000000000000000000000000061009e565b6100ef6100ea366004610575565b610105565b005b60006100fd84846101c7565b949350505050565b336001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614806101645750336001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016145b6101b55760405162461bcd60e51b815260206004820152601960248201527f6f6e6c79206f776e6572206f7220656e74727920706f696e740000000000000060448201526064015b60405180910390fd5b6101c184848484610290565b50505050565b7f19457468657265756d205369676e6564204d6573736167653a0a3332000000006000908152601c829052603c81206102428161020861010087018761060a565b8080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061031e92505050565b6001600160a01b03167f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03161461028457600191505061028a565b60009150505b92915050565b600080856001600160a01b03168585856040516102ae929190610658565b60006040518083038185875af1925050503d80600081146102eb576040519150601f19603f3d011682016040523d82523d6000602084013e6102f0565b606091505b50915091508181906103155760405162461bcd60e51b81526004016101ac9190610668565b50505050505050565b60008060008061032e8686610348565b92509250925061033e8282610395565b5090949350505050565b600080600083516041036103825760208401516040850151606086015160001a61037488828585610452565b95509550955050505061038e565b50508151600091506002905b9250925092565b60008260038111156103a9576103a96106b7565b036103b2575050565b60018260038111156103c6576103c66106b7565b036103e45760405163f645eedf60e01b815260040160405180910390fd5b60028260038111156103f8576103f86106b7565b036104195760405163fce698f760e01b8152600481018290526024016101ac565b600382600381111561042d5761042d6106b7565b0361044e576040516335e2f38360e21b8152600481018290526024016101ac565b5050565b600080807f7fffffffffffffffffffffffffffffff5d576e7357a4501ddfe92f46681b20a084111561048d5750600091506003905082610517565b604080516000808252602082018084528a905260ff891692820192909252606081018790526080810186905260019060a0016020604051602081039080840390855afa1580156104e1573d6000803e3d6000fd5b5050604051601f1901519150506001600160a01b03811661050d57506000925060019150829050610517565b9250600091508190505b9450945094915050565b60008060006060848603121561053657600080fd5b833567ffffffffffffffff81111561054d57600080fd5b8401610120818703121561056057600080fd5b95602085013595506040909401359392505050565b6000806000806060858703121561058b57600080fd5b84356001600160a01b03811681146105a257600080fd5b935060208501359250604085013567ffffffffffffffff808211156105c657600080fd5b818701915087601f8301126105da57600080fd5b8135818111156105e957600080fd5b8860208285010111156105fb57600080fd5b95989497505060200194505050565b6000808335601e1984360301811261062157600080fd5b83018035915067ffffffffffffffff82111561063c57600080fd5b60200191503681900382131561065157600080fd5b9250929050565b8183823760009101908152919050565b60006020808352835180602085015260005b818110156106965785810183015185820160400152820161067a565b506000604082860101526040601f19601f8301168501019250505092915050565b634e487b7160e01b600052602160045260246000fdfea264697066735822122075f383414445cb4c769cf5e40d1a2d78239abdb9a6872ac93a37ff3f0609796d64736f6c63430008170033a264697066735822122099131d352ccfc66352974c7a2b39a090ac0ec391b20da56fdeaf278e46105da064736f6c63430008170033000000000000000000000000edf47c7e665beb76b216205573935236f89ae83a",
"nonce": "0xa",
"chainId": "0xaa36a7"
},
"additionalContracts": [],
"isFixedGasLimit": false
}
],
"receipts": [
{
"status": "0x1",
"cumulativeGasUsed": "0x11700b7",
"logs": [],
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"type": "0x2",
"transactionHash": "0x4f71857f38032bdbbfef3fc4011274aaf3c91d88a2685d15ccab8a7c4d8a4201",
"transactionIndex": "0x66",
"blockHash": "0xb8deb12a22194e7567c6a7f9c54c282f812ae69be8e430a2e75e8dbe37a59c81",
"blockNumber": "0x6955f2",
"gasUsed": "0x97b4b",
"effectiveGasPrice": "0x14e3fd657",
"from": "0x372610bdcfa0531b40c8b27bb22a4e198ef04604",
"to": null,
"contractAddress": "0x3d0919fd0f22cf53302c3bbd4567fc661c8bf6a1"
}
],
"libraries": [],
"pending": [],
"returns": {},
"timestamp": 1729327674,
"chain": 11155111,
"commit": "b5ad848"
}
Loading

0 comments on commit bdd1eed

Please sign in to comment.