From 90bfaa51048396278707f0904455704351a719f2 Mon Sep 17 00:00:00 2001 From: Ramon Recuero Date: Thu, 5 Dec 2024 07:42:38 +0900 Subject: [PATCH 1/4] automatic wallet fund --- src/paymasters/SponsorPaymaster.sol | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/paymasters/SponsorPaymaster.sol b/src/paymasters/SponsorPaymaster.sol index 4ebc7ca3..300030de 100644 --- a/src/paymasters/SponsorPaymaster.sol +++ b/src/paymasters/SponsorPaymaster.sol @@ -344,9 +344,17 @@ contract SponsorPaymaster is Initializable, BasePaymaster, UUPSUpgradeable, Reen uint256 ethMaxCost = (maxCost + COST_OF_POST * gasPriceUserOp); if (ethMaxCost > userOpMaxCost) revert GasTooHighForUserOp(); - address sponsor = appRegistry.getApp(_decodeCallData(userOp.callData)); + address targetContract = _decodeCallData(userOp.callData); + address sponsor = appRegistry.getApp(targetContract); if (unlockBlock[sponsor] != 0) revert DepositNotLocked(); - if (balances[sponsor] < ethMaxCost) revert DepositTooLow(); + if (balances[sponsor] < ethMaxCost) { + // Apps need to pay + if (sponsor != targetContract) { + revert DepositTooLow(); + } + // Wallets get automatically funded by kinto core app + sponsor = appRegistry.getApp(address(walletFactory)); + } return (abi.encode(sponsor, userOp.sender, userOp.maxFeePerGas, userOp.maxPriorityFeePerGas), 0); } From 88604413bbf07b598403d39dd8c61bd2806216aa Mon Sep 17 00:00:00 2001 From: Ramon Recuero Date: Thu, 5 Dec 2024 07:48:14 +0900 Subject: [PATCH 2/4] Update --- src/paymasters/SponsorPaymaster.sol | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/paymasters/SponsorPaymaster.sol b/src/paymasters/SponsorPaymaster.sol index 300030de..9fe316f9 100644 --- a/src/paymasters/SponsorPaymaster.sol +++ b/src/paymasters/SponsorPaymaster.sol @@ -344,15 +344,14 @@ contract SponsorPaymaster is Initializable, BasePaymaster, UUPSUpgradeable, Reen uint256 ethMaxCost = (maxCost + COST_OF_POST * gasPriceUserOp); if (ethMaxCost > userOpMaxCost) revert GasTooHighForUserOp(); - address targetContract = _decodeCallData(userOp.callData); - address sponsor = appRegistry.getApp(targetContract); + address sponsor = appRegistry.getApp(_decodeCallData(userOp.callData)); if (unlockBlock[sponsor] != 0) revert DepositNotLocked(); if (balances[sponsor] < ethMaxCost) { // Apps need to pay - if (sponsor != targetContract) { + if (sponsor != userOp.sender) { revert DepositTooLow(); } - // Wallets get automatically funded by kinto core app + // Wallets get automfunded by kinto core app sponsor = appRegistry.getApp(address(walletFactory)); } return (abi.encode(sponsor, userOp.sender, userOp.maxFeePerGas, userOp.maxPriorityFeePerGas), 0); From c220c7b702933bf7f12d17047430038766ce5631 Mon Sep 17 00:00:00 2001 From: Igor Yalovoy Date: Wed, 4 Dec 2024 18:20:22 -0600 Subject: [PATCH 3/4] Fix typo in SponsorPaymaster.sol comment and add unit test for validating paymaster user operation when wallet is an app in SponsorPaymaster.t.sol. --- src/paymasters/SponsorPaymaster.sol | 2 +- test/unit/SponsorPaymaster.t.sol | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/paymasters/SponsorPaymaster.sol b/src/paymasters/SponsorPaymaster.sol index 9fe316f9..4c9fee5b 100644 --- a/src/paymasters/SponsorPaymaster.sol +++ b/src/paymasters/SponsorPaymaster.sol @@ -351,7 +351,7 @@ contract SponsorPaymaster is Initializable, BasePaymaster, UUPSUpgradeable, Reen if (sponsor != userOp.sender) { revert DepositTooLow(); } - // Wallets get automfunded by kinto core app + // Wallets get auto funded by kinto core app sponsor = appRegistry.getApp(address(walletFactory)); } return (abi.encode(sponsor, userOp.sender, userOp.maxFeePerGas, userOp.maxPriorityFeePerGas), 0); diff --git a/test/unit/SponsorPaymaster.t.sol b/test/unit/SponsorPaymaster.t.sol index f60e3379..1c2ac157 100644 --- a/test/unit/SponsorPaymaster.t.sol +++ b/test/unit/SponsorPaymaster.t.sol @@ -15,6 +15,8 @@ import {IKintoWalletFactory} from "@kinto-core/interfaces/IKintoWalletFactory.so import "@kinto-core-test/SharedSetup.t.sol"; +import "forge-std/console2.sol"; + contract SponsorPaymasterUpgrade is SponsorPaymaster { constructor(IEntryPoint __entryPoint, IKintoWalletFactory factory, address _owner) SponsorPaymaster(__entryPoint, factory) @@ -253,6 +255,23 @@ contract SponsorPaymasterTest is SharedSetup { _paymaster.validatePaymasterUserOp(userOp, "", 0); } + function testValidatePaymasterUserOp_WhenWalletIsApp() public { + address wallet = address(alice); + UserOperation memory userOp = _createUserOperation( + wallet, wallet, 0, privateKeys, abi.encodeWithSignature("increment()"), address(_paymaster) + ); + + address kintoCoreApp = _paymaster.appRegistry().getApp(address(_walletFactory)); + + vm.prank(address(_entryPoint)); + (bytes memory context, uint256 validationData) = _paymaster.validatePaymasterUserOp(userOp, "", 0.01 ether); + + assertEq(validationData, 0); + (address sponsor, address sender,,) = abi.decode(context, (address, address, uint256, uint256)); + assertEq(sponsor, kintoCoreApp, "Sponsor for the wallet has to be a Kinto App"); + assertEq(sender, wallet, "Sender has to be a wallet"); + } + function testValidatePaymasterUserOp_RevertWhen_GasLimitIsLessThanCostOfPost() public { UserOperation memory userOp = _createUserOperation( address(_kintoWallet), From 921eab0329b4c4a8aef12c4e23d8377ab430a975 Mon Sep 17 00:00:00 2001 From: Igor Yalovoy Date: Wed, 4 Dec 2024 19:09:37 -0600 Subject: [PATCH 4/4] Upgrade SponsorPaymaster to V15, update deployment scripts and addresses, and replace contract addresses in transaction logs and test artifacts for chain 7887. --- .../7887/run-1733360951.json | 163 ++++++++++++++++++ .../7887/run-latest.json | 92 +++++----- script/migrations/134-upgrade-paymaster.s.sol | 4 +- src/paymasters/SponsorPaymaster.sol | 2 +- test/artifacts/7887/addresses.json | 5 +- 5 files changed, 215 insertions(+), 51 deletions(-) create mode 100644 broadcast/134-upgrade-paymaster.s.sol/7887/run-1733360951.json diff --git a/broadcast/134-upgrade-paymaster.s.sol/7887/run-1733360951.json b/broadcast/134-upgrade-paymaster.s.sol/7887/run-1733360951.json new file mode 100644 index 00000000..d352bf7a --- /dev/null +++ b/broadcast/134-upgrade-paymaster.s.sol/7887/run-1733360951.json @@ -0,0 +1,163 @@ +{ + "transactions": [ + { + "hash": "0x5c5abeae5779f6907140f8bc55638da7cca8ecf84a76a783e4b74f4382672289", + "transactionType": "CREATE2", + "contractName": "SponsorPaymaster", + "contractAddress": "0x2a10b80be8ee546c52fde9b58d65d089c6b929bb", + "function": null, + "arguments": [ + "0x2843C269D2a64eCfA63548E8B3Fc0FD23B7F70cb", + "0x8a4720488CA32f1223ccFE5A087e250fE3BC5D75" + ], + "transaction": { + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": "0x4e59b44847b379578588920ca78fbf26c0b4956c", + "value": "0x0", + "input": "0x000000000000000000000000000000000000000000000000000000000000000060e06040523060a0523480156200001557600080fd5b5060405162002e6438038062002e648339810160408190526200003891620001a9565b81620000443362000072565b6001600160a01b031660805260016065556200005f620000c2565b6001600160a01b031660c05250620001e8565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b600054600160a81b900460ff1615620001315760405162461bcd60e51b815260206004820152602760248201527f496e697469616c697a61626c653a20636f6e747261637420697320696e697469604482015266616c697a696e6760c81b606482015260840160405180910390fd5b600054600160a01b900460ff908116146200018e576000805460ff60a01b191660ff60a01b17905560405160ff81527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b565b6001600160a01b0381168114620001a657600080fd5b50565b60008060408385031215620001bd57600080fd5b8251620001ca8162000190565b6020840151909250620001dd8162000190565b809150509250929050565b60805160a05160c051612bf1620002736000396000818161069f015281816108e50152611c42015260008181610ac301528181610b0c01528181610bab01528181610beb0152610c7e01526000818161058c015281816107ba01528181610a8001528181610e6c01528181611155015281816111cc015281816113cf01526116850152612bf16000f3fe60806040526004361061021a5760003560e01c8063970eb3a811610123578063c0c53b8b116100ab578063c6e891131161006f578063c6e89113146106c1578063cd8f80c214610708578063f2fde38b1461072a578063f465c77e1461074a578063f5bf3fcf1461077857600080fd5b8063c0c53b8b146105f8578063c0c73aed14610618578063c23a5cea14610658578063c399ec8814610678578063c5c036991461068d57600080fd5b8063a9a23409116100f2578063a9a234091461055a578063b0d691fe1461057a578063b7b188d1146105ae578063bb4fceb9146105c3578063bb9fe6bf146105e357600080fd5b8063970eb3a8146104c957806399a6cddd146104e95780639ed0fb6814610509578063a1a3f5b91461052d57600080fd5b806363445989116101a6578063796d437111610175578063796d43711461040e5780637eae838a14610425578063802bfd1b1461043b578063828212561461045b5780638da5cb5b1461049757600080fd5b806363445989146103735780636e2fe00d146103cb578063715018a6146103e257806376fdd149146103f757600080fd5b80633659cfe6116101ed5780633659cfe61461029c5780634a6f84cf146102bc5780634ce5f9c2146102e95780634f1ef2861461034b57806352d1902d1461035e57600080fd5b80630396cb601461021f5780630993969a146102345780631aa2b92e1461024757806327e235e31461026f575b600080fd5b61023261022d3660046122b4565b610798565b005b6102326102423660046122f6565b610824565b34801561025357600080fd5b5061025c603281565b6040519081526020015b60405180910390f35b34801561027b57600080fd5b5061025c61028a3660046122f6565b60666020526000908152604090205481565b3480156102a857600080fd5b506102326102b73660046122f6565b610ab9565b3480156102c857600080fd5b5061025c6102d73660046122f6565b60686020526000908152604090205481565b3480156102f557600080fd5b50610330610304366004612313565b606960209081526000928352604080842090915290825290208054600182015460029092015490919083565b60408051938452602084019290925290820152606001610266565b610232610359366004612403565b610ba1565b34801561036a57600080fd5b5061025c610c71565b34801561037f57600080fd5b506103b661038e3660046122f6565b6001600160a01b03166000908152606660209081526040808320546068909252909120549091565b60408051928352602083019190915201610266565b3480156103d757600080fd5b5061025c623d090081565b3480156103ee57600080fd5b50610232610d24565b34801561040357600080fd5b5061025c6208165081565b34801561041a57600080fd5b5061025c62030d4081565b34801561043157600080fd5b5061025c606e5481565b34801561044757600080fd5b506102326104563660046122f6565b610d38565b34801561046757600080fd5b506103306104763660046122f6565b606b6020526000908152604090208054600182015460029092015490919083565b3480156104a357600080fd5b506000546001600160a01b03165b6040516001600160a01b039091168152602001610266565b3480156104d557600080fd5b506102326104e4366004612453565b610dff565b3480156104f557600080fd5b50606d546104b1906001600160a01b031681565b34801561051557600080fd5b50610232336000908152606860205260409020439055565b34801561053957600080fd5b5061025c6105483660046122f6565b60676020526000908152604090205481565b34801561056657600080fd5b5061023261057536600461246c565b610e48565b34801561058657600080fd5b506104b17f000000000000000000000000000000000000000000000000000000000000000081565b3480156105ba57600080fd5b5061025c603c81565b3480156105cf57600080fd5b50606c546104b1906001600160a01b031681565b3480156105ef57600080fd5b50610232610e62565b34801561060457600080fd5b506102326106133660046124fb565b610ed9565b34801561062457600080fd5b50610638610633366004612313565b61105c565b604080519485526020850193909352918301526060820152608001610266565b34801561066457600080fd5b506102326106733660046122f6565b61112e565b34801561068457600080fd5b5061025c6111b4565b34801561069957600080fd5b506104b17f000000000000000000000000000000000000000000000000000000000000000081565b3480156106cd57600080fd5b506103306106dc366004612313565b606a60209081526000928352604080842090915290825290208054600182015460029092015490919083565b34801561071457600080fd5b5061023233600090815260686020526040812055565b34801561073657600080fd5b506102326107453660046122f6565b611244565b34801561075657600080fd5b5061076a610765366004612546565b6112ba565b6040516102669291906125ea565b34801561078457600080fd5b5061023261079336600461260c565b6112dd565b6107a0611435565b604051621cb65b60e51b815263ffffffff821660048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690630396cb609034906024015b6000604051808303818588803b15801561080857600080fd5b505af115801561081c573d6000803e3d6000fd5b505050505050565b346000036108455760405163162908e360e11b815260040160405180910390fd5b606d546040516313289ea360e31b81523360048201526001600160a01b0390911690639944f51890602401602060405180830381865afa15801561088d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108b19190612638565b1580156108c957506000546001600160a01b03163314155b801561095a57506040516304131fc960e31b81523360048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690632098fe4890602401602060405180830381865afa158015610934573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610958919061265a565b155b1561097857604051631e74ff5560e21b815260040160405180910390fd5b6001600160a01b0381163b1580156109fb5750606d546040516313289ea360e31b81526001600160a01b03838116600483015290911690639944f51890602401602060405180830381865afa1580156109d5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109f99190612638565b155b15610a19576040516357206d6b60e01b815260040160405180910390fd5b6001600160a01b03811660009081526066602052604081208054349290610a41908490612689565b90915550506001600160a01b0381163303610a6b57610a6b33600090815260686020526040812055565b60405163b760faf960e01b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063b760faf99034906024016107ef565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000163003610b0a5760405162461bcd60e51b8152600401610b019061269c565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610b53600080516020612b75833981519152546001600160a01b031690565b6001600160a01b031614610b795760405162461bcd60e51b8152600401610b01906126e8565b610b828161148f565b60408051600080825260208201909252610b9e918391906114ba565b50565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000163003610be95760405162461bcd60e51b8152600401610b019061269c565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610c32600080516020612b75833981519152546001600160a01b031690565b6001600160a01b031614610c585760405162461bcd60e51b8152600401610b01906126e8565b610c618261148f565b610c6d828260016114ba565b5050565b6000306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614610d115760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c60448201527f6c6564207468726f7567682064656c656761746563616c6c00000000000000006064820152608401610b01565b50600080516020612b7583398151915290565b610d2c611435565b610d36600061162a565b565b610d40611435565b6001600160a01b038116610d67576040516311a1e69760e01b815260040160405180910390fd5b606c546001600160a01b0390811690821603610d96576040516311a1e69760e01b815260040160405180910390fd5b606c54604080516001600160a01b03928316815291831660208301527f08044c8203cd564e6e5f99394e0a9c59972fa37135216bf7711da6599786a592910160405180910390a1606c80546001600160a01b0319166001600160a01b0392909216919091179055565b610e07611435565b606e5460408051918252602082018390527f89a2d77d4d68a0e9825ef16b56eed9617b01d2e593f658dc54a4f13c8e0b7699910160405180910390a1606e55565b610e5061167a565b610e5c848484846116ea565b50505050565b610e6a611435565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663bb9fe6bf6040518163ffffffff1660e01b8152600401600060405180830381600087803b158015610ec557600080fd5b505af1158015610e5c573d6000803e3d6000fd5b600054600160a81b900460ff1615808015610f0157506000546001600160a01b90910460ff16105b80610f225750303b158015610f225750600054600160a01b900460ff166001145b610f855760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610b01565b6000805460ff60a01b1916600160a01b1790558015610fb2576000805460ff60a81b1916600160a81b1790555b610fba6119ba565b610fc38461162a565b606d80546001600160a01b038085166001600160a01b031992831617909255606c80548684169216919091179055666a94d74f430000606e55841660009081526068602052604090204390558015610e5c576000805460ff60a81b19169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a150505050565b6000806000806000866001600160a01b031663025e7c2760006040518263ffffffff1660e01b815260040161109391815260200190565b602060405180830381865afa1580156110b0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110d49190612734565b6001600160a01b0390811660008181526069602090815260408083209a90941680835299815283822060018101549054938352606a82528483209a8352999052919091206002810154905497999198509695509350505050565b611136611435565b60405163611d2e7560e11b81526001600160a01b0382811660048301527f0000000000000000000000000000000000000000000000000000000000000000169063c23a5cea90602401600060405180830381600087803b15801561119957600080fd5b505af11580156111ad573d6000803e3d6000fd5b5050505050565b6040516370a0823160e01b81523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316906370a0823190602401602060405180830381865afa15801561121b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061123f919061265a565b905090565b61124c611435565b6001600160a01b0381166112b15760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201526564647265737360d01b6064820152608401610b01565b610b9e8161162a565b606060006112c661167a565b6112d1858585611a27565b91509150935093915050565b6112e5611d1a565b3360009081526066602052604090205481118061130f575033600090815260686020526040902054155b806113295750336000908152606860205260409020544311155b156113475760405163202e89bb60e21b815260040160405180910390fd5b6001600160a01b038216158061136757506000826001600160a01b03163b115b156113855760405163416aebb560e11b815260040160405180910390fd5b33600090815260666020526040812080548392906113a4908490612751565b909155505060405163040b850f60e31b81526001600160a01b038381166004830152602482018390527f0000000000000000000000000000000000000000000000000000000000000000169063205c287890604401600060405180830381600087803b15801561141357600080fd5b505af1158015611427573d6000803e3d6000fd5b50505050610c6d6001606555565b6000546001600160a01b03163314610d365760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610b01565b6000546001600160a01b03163314610b9e57604051635fc483c560e01b815260040160405180910390fd5b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156114f2576114ed83611d73565b505050565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa92505050801561154c575060408051601f3d908101601f191682019092526115499181019061265a565b60015b6115af5760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b6064820152608401610b01565b600080516020612b75833981519152811461161e5760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b6064820152608401610b01565b506114ed838383611e0f565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b336001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614610d365760405162461bcd60e51b815260206004820152601560248201527414d95b99195c881b9bdd08115b9d1c9e541bda5b9d605a1b6044820152606401610b01565b60008080806116fb86880188612764565b93509350935093506000836001600160a01b031663025e7c2760006040518263ffffffff1660e01b815260040161173491815260200190565b602060405180830381865afa158015611751573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117759190612734565b6001600160a01b0381166000908152606b6020526040902080549192509061179f90603c90612689565b4211156117b4574281556001808201556117cf565b60018160010160008282546117c99190612689565b90915550505b606c54604051630b17025b60e41b81526001600160a01b038881166004830152600092169063b17025b090602401608060405180830381865afa15801561181a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061183e91906127aa565b6001600160a01b038481166000908152606960209081526040808320938c168352929052208151815492935090916118769190612689565b42111561188b574281556001808201556118a6565b60018160010160008282546118a09190612689565b90915550505b60006118bb876118b64889612689565b611e34565b905060006118cc8262030d4061283e565b6118d6908c612689565b6001600160a01b038b16600090815260666020526040812080549293508392909190611903908490612751565b90915550506001600160a01b038a1660009081526067602052604081208054839290611930908490612689565b90915550506001600160a01b038087166000908152606a60209081526040808320938e168352929052208460026020020151815461196e9190612689565b421115611984574281556002810182905561199e565b818160020160008282546119989190612689565b90915550505b6119a9878c84611e4e565b505050505050505050505050505050565b600054600160a81b900460ff16610d365760405162461bcd60e51b815260206004820152602b60248201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960448201526a6e697469616c697a696e6760a81b6064820152608401610b01565b6060600062030d408560a001351080611a465750620816508560a00135115b15611a64576040516325d8553160e21b815260040160405180910390fd5b623d09008560c001351115611a8c57604051634d1de76760e01b815260040160405180910390fd5b611a9a610120860186612855565b9050601414611abc576040516366190c9f60e11b815260040160405180910390fd5b60e08501356000611ad08262030d4061283e565b611ada9086612689565b9050606e54811115611aff57604051633e1173f560e11b815260040160405180910390fd5b606c546000906001600160a01b031663dc3acebe611b28611b2360608c018c612855565b61205c565b6040516001600160e01b031960e084901b1681526001600160a01b039091166004820152602401602060405180830381865afa158015611b6c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611b909190612734565b6001600160a01b03811660009081526068602052604090205490915015611bca5760405163732e4f3f60e11b815260040160405180910390fd5b6001600160a01b038116600090815260666020526040902054821115611cb957611bf760208901896122f6565b6001600160a01b0316816001600160a01b031614611c2857604051632b7786bd60e21b815260040160405180910390fd5b606c54604051636e1d675f60e11b81526001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000811660048301529091169063dc3acebe90602401602060405180830381865afa158015611c92573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611cb69190612734565b90505b80611cc760208a018a6122f6565b604080516001600160a01b039384166020820152929091169082015260e08901356060820152610100890135608082015260a00160408051601f1981840301815291905298600098509650505050505050565b600260655403611d6c5760405162461bcd60e51b815260206004820152601f60248201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c006044820152606401610b01565b6002606555565b6001600160a01b0381163b611de05760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610b01565b600080516020612b7583398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b611e1883612131565b600082511180611e255750805b156114ed57610e5c8383612171565b6000818310611e435781611e45565b825b90505b92915050565b6001600160a01b0383166000908152606b60209081526040918290208251606081018452815480825260018301549382019390935260029091015492810192909252611e9c90603c90612689565b42108015611eae575060328160200151115b15611ecc5760405163a58f6e4b60e01b815260040160405180910390fd5b606c54604051630b17025b60e41b81526001600160a01b038581166004830152600092169063b17025b090602401608060405180830381865afa158015611f17573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611f3b91906127aa565b6001600160a01b03868116600090815260696020908152604080832093891683529281529082902082516060810184528154808252600183015493820193909352600290910154928101929092528251919450919250611f9a91612689565b42108015611faf575060208082015190830151115b15611fcd576040516313f6f48b60e21b815260040160405180910390fd5b6001600160a01b038581166000908152606a602090815260408083209388168352928152908290208251606081018452815480825260018301549382019390935260029091015481840152918301519193506120299190612689565b4210801561203e575060608101516040830151115b156111ad576040516352846cb560e01b815260040160405180910390fd5b60008061206c60048285876128a3565b612075916128cd565b9050635c0f12eb60e11b6001600160e01b03198216016120f257600061209e84600481886128a3565b8101906120ab9190612a10565b5050905080516000036120c357600092505050611e48565b80600182516120d29190612751565b815181106120e2576120e2612828565b602002602001015192505061212a565b6324f16c0560e11b6001600160e01b031982160161212a5761211783600481876128a3565b8101906121249190612af6565b50909250505b5092915050565b61213a81611d73565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b6060611e458383604051806060016040528060278152602001612b95602791396060600080856001600160a01b0316856040516121ae9190612b45565b600060405180830381855af49150503d80600081146121e9576040519150601f19603f3d011682016040523d82523d6000602084013e6121ee565b606091505b50915091506121ff86838387612209565b9695505050505050565b60608315612278578251600003612271576001600160a01b0385163b6122715760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606401610b01565b5081612282565b612282838361228a565b949350505050565b81511561229a5781518083602001fd5b8060405162461bcd60e51b8152600401610b019190612b61565b6000602082840312156122c657600080fd5b813563ffffffff811681146122da57600080fd5b9392505050565b6001600160a01b0381168114610b9e57600080fd5b60006020828403121561230857600080fd5b81356122da816122e1565b6000806040838503121561232657600080fd5b8235612331816122e1565b91506020830135612341816122e1565b809150509250929050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff8111828210171561238b5761238b61234c565b604052919050565b600082601f8301126123a457600080fd5b813567ffffffffffffffff8111156123be576123be61234c565b6123d1601f8201601f1916602001612362565b8181528460208386010111156123e657600080fd5b816020850160208301376000918101602001919091529392505050565b6000806040838503121561241657600080fd5b8235612421816122e1565b9150602083013567ffffffffffffffff81111561243d57600080fd5b61244985828601612393565b9150509250929050565b60006020828403121561246557600080fd5b5035919050565b6000806000806060858703121561248257600080fd5b84356003811061249157600080fd5b9350602085013567ffffffffffffffff808211156124ae57600080fd5b818701915087601f8301126124c257600080fd5b8135818111156124d157600080fd5b8860208285010111156124e357600080fd5b95986020929092019750949560400135945092505050565b60008060006060848603121561251057600080fd5b833561251b816122e1565b9250602084013561252b816122e1565b9150604084013561253b816122e1565b809150509250925092565b60008060006060848603121561255b57600080fd5b833567ffffffffffffffff81111561257257600080fd5b8401610160818703121561258557600080fd5b95602085013595506040909401359392505050565b60005b838110156125b557818101518382015260200161259d565b50506000910152565b600081518084526125d681602086016020860161259a565b601f01601f19169290920160200192915050565b6040815260006125fd60408301856125be565b90508260208301529392505050565b6000806040838503121561261f57600080fd5b823561262a816122e1565b946020939093013593505050565b60006020828403121561264a57600080fd5b815180151581146122da57600080fd5b60006020828403121561266c57600080fd5b5051919050565b634e487b7160e01b600052601160045260246000fd5b80820180821115611e4857611e48612673565b6020808252602c908201527f46756e6374696f6e206d7573742062652063616c6c6564207468726f7567682060408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c908201527f46756e6374696f6e206d7573742062652063616c6c6564207468726f7567682060408201526b6163746976652070726f787960a01b606082015260800190565b60006020828403121561274657600080fd5b81516122da816122e1565b81810381811115611e4857611e48612673565b6000806000806080858703121561277a57600080fd5b8435612785816122e1565b93506020850135612795816122e1565b93969395505050506040820135916060013590565b6000608082840312156127bc57600080fd5b82601f8301126127cb57600080fd5b6040516080810181811067ffffffffffffffff821117156127ee576127ee61234c565b60405280608084018581111561280357600080fd5b845b8181101561281d578051835260209283019201612805565b509195945050505050565b634e487b7160e01b600052603260045260246000fd5b8082028115828204841417611e4857611e48612673565b6000808335601e1984360301811261286c57600080fd5b83018035915067ffffffffffffffff82111561288757600080fd5b60200191503681900382131561289c57600080fd5b9250929050565b600080858511156128b357600080fd5b838611156128c057600080fd5b5050820193919092039150565b6001600160e01b031981358181169160048510156128f55780818660040360031b1b83161692505b505092915050565b600067ffffffffffffffff8211156129175761291761234c565b5060051b60200190565b600082601f83011261293257600080fd5b81356020612947612942836128fd565b612362565b8083825260208201915060208460051b87010193508684111561296957600080fd5b602086015b84811015612985578035835291830191830161296e565b509695505050505050565b600082601f8301126129a157600080fd5b813560206129b1612942836128fd565b82815260059290921b840181019181810190868411156129d057600080fd5b8286015b8481101561298557803567ffffffffffffffff8111156129f45760008081fd5b612a028986838b0101612393565b8452509183019183016129d4565b600080600060608486031215612a2557600080fd5b833567ffffffffffffffff80821115612a3d57600080fd5b818601915086601f830112612a5157600080fd5b81356020612a61612942836128fd565b82815260059290921b8401810191818101908a841115612a8057600080fd5b948201945b83861015612aa7578535612a98816122e1565b82529482019490820190612a85565b97505087013592505080821115612abd57600080fd5b612ac987838801612921565b93506040860135915080821115612adf57600080fd5b50612aec86828701612990565b9150509250925092565b600080600060608486031215612b0b57600080fd5b8335612b16816122e1565b925060208401359150604084013567ffffffffffffffff811115612b3957600080fd5b612aec86828701612393565b60008251612b5781846020870161259a565b9190910192915050565b602081526000611e4560208301846125be56fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a26469706673582212207d7b422efd4e15f68c723a00bd060a1a81a5bf5a3391a8e01864ad4a3f93b47864736f6c634300081800330000000000000000000000002843c269d2a64ecfa63548e8b3fc0fd23b7f70cb0000000000000000000000008a4720488ca32f1223ccfe5a087e250fe3bc5d75", + "nonce": "0x4b85c", + "chainId": "0x1ecf" + }, + "additionalContracts": [], + "isFixedGasLimit": false + }, + { + "hash": "0x1a916af8dd468332c79abaf6546f4e990c99908a26ac4d0775c63b8eaf295603", + "transactionType": "CALL", + "contractName": null, + "contractAddress": "0x2843c269d2a64ecfa63548e8b3fc0fd23b7f70cb", + "function": "handleOps((address,uint256,bytes,bytes,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],address)", + "arguments": [ + "[(0x2e2B1c42E38f5af81771e65D87729E57ABD1337a, 3853, 0x, 0xb61d27f60000000000000000000000001842a4eff3efd24c50b63c3cf89cecee245fc2bd0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000243659cfe60000000000000000000000002a10b80be8ee546c52fde9b58d65d089c6b929bb00000000000000000000000000000000000000000000000000000000, 4000000, 210000, 21000, 1, 1000000000, 0x0000000000000000000000000000000000000000, 0xdeec9637c6376665629d32cc2846bb4be7d7cb3c95e921c528dfaf1902a34f9a2a784977129185a88ded587efbc6f1519733a07f339701d3b1d4b2a83666bbac1baad657e37f5bcb9171dc9d7ca63a0cfee68bdabbc6c30cfc470ddb9132756c1c7daf51024db6e207ce890c625e238684745f45ec93c8507018f4ac7c06845db71b)]", + "0x660ad4B5A74130a4796B4d54BC6750Ae93C86e6c" + ], + "transaction": { + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": "0x2843c269d2a64ecfa63548e8b3fc0fd23b7f70cb", + "value": "0x0", + "input": "0x1fad948c0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000660ad4b5a74130a4796b4d54bc6750ae93c86e6c000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000002e2b1c42e38f5af81771e65d87729e57abd1337a0000000000000000000000000000000000000000000000000000000000000f0d0000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000003d0900000000000000000000000000000000000000000000000000000000000003345000000000000000000000000000000000000000000000000000000000000052080000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000003b9aca00000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c4b61d27f60000000000000000000000001842a4eff3efd24c50b63c3cf89cecee245fc2bd0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000243659cfe60000000000000000000000002a10b80be8ee546c52fde9b58d65d089c6b929bb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000082deec9637c6376665629d32cc2846bb4be7d7cb3c95e921c528dfaf1902a34f9a2a784977129185a88ded587efbc6f1519733a07f339701d3b1d4b2a83666bbac1baad657e37f5bcb9171dc9d7ca63a0cfee68bdabbc6c30cfc470ddb9132756c1c7daf51024db6e207ce890c625e238684745f45ec93c8507018f4ac7c06845db71b000000000000000000000000000000000000000000000000000000000000", + "nonce": "0x4b85d", + "chainId": "0x1ecf" + }, + "additionalContracts": [], + "isFixedGasLimit": false + } + ], + "receipts": [ + { + "status": "0x1", + "cumulativeGasUsed": "0x361820", + "logs": [ + { + "address": "0x2a10b80be8ee546c52fde9b58d65d089c6b929bb", + "topics": [ + "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0", + "0x0000000000000000000000000000000000000000000000000000000000000000", + "0x0000000000000000000000004e59b44847b379578588920ca78fbf26c0b4956c" + ], + "data": "0x", + "blockHash": "0x3263f72586ac217437940d79206631eb9458d94c6774967b0610d033a6eae1f2", + "blockNumber": "0x8e300", + "transactionHash": "0x5c5abeae5779f6907140f8bc55638da7cca8ecf84a76a783e4b74f4382672289", + "transactionIndex": "0x1", + "logIndex": "0x0", + "removed": false + }, + { + "address": "0x2a10b80be8ee546c52fde9b58d65d089c6b929bb", + "topics": [ + "0x7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498" + ], + "data": "0x00000000000000000000000000000000000000000000000000000000000000ff", + "blockHash": "0x3263f72586ac217437940d79206631eb9458d94c6774967b0610d033a6eae1f2", + "blockNumber": "0x8e300", + "transactionHash": "0x5c5abeae5779f6907140f8bc55638da7cca8ecf84a76a783e4b74f4382672289", + "transactionIndex": "0x1", + "logIndex": "0x1", + "removed": false + } + ], + "logsBloom": "0x00000040000000000000000000000000000000000000000000800000000400000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000020000000000000000000800000000000000000000000000000000400000000000000000000000000000000000000000001080000000000000000000000000000001000000000000000400000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000020000000000000000000000000000000000080000000000000000000000000000000", + "type": "0x2", + "transactionHash": "0x5c5abeae5779f6907140f8bc55638da7cca8ecf84a76a783e4b74f4382672289", + "transactionIndex": "0x1", + "blockHash": "0x3263f72586ac217437940d79206631eb9458d94c6774967b0610d033a6eae1f2", + "blockNumber": "0x8e300", + "gasUsed": "0x361820", + "effectiveGasPrice": "0x5f5e100", + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": "0x4e59b44847b379578588920ca78fbf26c0b4956c", + "contractAddress": null, + "gasUsedForL1": "0xf56e1", + "l1BlockNumber": "0x14583b6" + }, + { + "status": "0x1", + "cumulativeGasUsed": "0x40e88", + "logs": [ + { + "address": "0x2843c269d2a64ecfa63548e8b3fc0fd23b7f70cb", + "topics": [ + "0xbb47ee3e183a558b1a2ff0874b079f3fc5478b7454eacf2bfc5af2ff5878f972" + ], + "data": "0x", + "blockHash": "0x69596ef4986dfbd74822c19a6d00391679a30fcfc247f65e1d4a48e620d19275", + "blockNumber": "0x8e301", + "transactionHash": "0x1a916af8dd468332c79abaf6546f4e990c99908a26ac4d0775c63b8eaf295603", + "transactionIndex": "0x1", + "logIndex": "0x0", + "removed": false + }, + { + "address": "0x1842a4eff3efd24c50b63c3cf89cecee245fc2bd", + "topics": [ + "0xbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b", + "0x0000000000000000000000002a10b80be8ee546c52fde9b58d65d089c6b929bb" + ], + "data": "0x", + "blockHash": "0x69596ef4986dfbd74822c19a6d00391679a30fcfc247f65e1d4a48e620d19275", + "blockNumber": "0x8e301", + "transactionHash": "0x1a916af8dd468332c79abaf6546f4e990c99908a26ac4d0775c63b8eaf295603", + "transactionIndex": "0x1", + "logIndex": "0x1", + "removed": false + }, + { + "address": "0x2843c269d2a64ecfa63548e8b3fc0fd23b7f70cb", + "topics": [ + "0x49628fd1471006c1482da88028e9ce4dbb080b815c9b0344d39e5a8e6ec1419f", + "0xfdc9da8f9529cd4dd537b3d9118e577a6fd50779cabf63568f8556df6443dafe", + "0x0000000000000000000000002e2b1c42e38f5af81771e65d87729e57abd1337a", + "0x0000000000000000000000000000000000000000000000000000000000000000" + ], + "data": "0x0000000000000000000000000000000000000000000000000000000000000f0d0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000008534a000000000000000000000000000000000000000000000000000000000008534a", + "blockHash": "0x69596ef4986dfbd74822c19a6d00391679a30fcfc247f65e1d4a48e620d19275", + "blockNumber": "0x8e301", + "transactionHash": "0x1a916af8dd468332c79abaf6546f4e990c99908a26ac4d0775c63b8eaf295603", + "transactionIndex": "0x1", + "logIndex": "0x2", + "removed": false + } + ], + "logsBloom": "0x0000000000000000000000000000000040000000000000000000000010000000000800000000000000000001000000000000000400000100000002000000000000000000000000000000000000000200000000000000000000000000000000080000000002000000000000000200280000200000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000040000000000000040000000000000000000000000000020000200000000000000002000000010000100000080000000000000000000000000000000002000000000000001000000000000000000000000c000000000000000000000000000", + "type": "0x2", + "transactionHash": "0x1a916af8dd468332c79abaf6546f4e990c99908a26ac4d0775c63b8eaf295603", + "transactionIndex": "0x1", + "blockHash": "0x69596ef4986dfbd74822c19a6d00391679a30fcfc247f65e1d4a48e620d19275", + "blockNumber": "0x8e301", + "gasUsed": "0x40e88", + "effectiveGasPrice": "0x5f5e100", + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": "0x2843c269d2a64ecfa63548e8b3fc0fd23b7f70cb", + "contractAddress": null, + "gasUsedForL1": "0x15f76", + "l1BlockNumber": "0x14583b6" + } + ], + "libraries": [], + "pending": [], + "returns": {}, + "timestamp": 1733360951, + "chain": 7887, + "commit": "c220c7b" +} \ No newline at end of file diff --git a/broadcast/134-upgrade-paymaster.s.sol/7887/run-latest.json b/broadcast/134-upgrade-paymaster.s.sol/7887/run-latest.json index 7974464f..d352bf7a 100644 --- a/broadcast/134-upgrade-paymaster.s.sol/7887/run-latest.json +++ b/broadcast/134-upgrade-paymaster.s.sol/7887/run-latest.json @@ -1,10 +1,10 @@ { "transactions": [ { - "hash": "0xdee3915b9e84b4693151b28d7e0263e42d7dd535c21c508e96ebf4e1c162814e", + "hash": "0x5c5abeae5779f6907140f8bc55638da7cca8ecf84a76a783e4b74f4382672289", "transactionType": "CREATE2", "contractName": "SponsorPaymaster", - "contractAddress": "0xcbb3ba88bfd944860463585a557022fcee3cc280", + "contractAddress": "0x2a10b80be8ee546c52fde9b58d65d089c6b929bb", "function": null, "arguments": [ "0x2843C269D2a64eCfA63548E8B3Fc0FD23B7F70cb", @@ -14,29 +14,29 @@ "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", "to": "0x4e59b44847b379578588920ca78fbf26c0b4956c", "value": "0x0", - "input": "0x000000000000000000000000000000000000000000000000000000000000000060e06040523060a0523480156200001557600080fd5b5060405162002da738038062002da78339810160408190526200003891620001a9565b81620000443362000072565b6001600160a01b031660805260016065556200005f620000c2565b6001600160a01b031660c05250620001e8565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b600054600160a81b900460ff1615620001315760405162461bcd60e51b815260206004820152602760248201527f496e697469616c697a61626c653a20636f6e747261637420697320696e697469604482015266616c697a696e6760c81b606482015260840160405180910390fd5b600054600160a01b900460ff908116146200018e576000805460ff60a01b191660ff60a01b17905560405160ff81527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b565b6001600160a01b0381168114620001a657600080fd5b50565b60008060408385031215620001bd57600080fd5b8251620001ca8162000190565b6020840151909250620001dd8162000190565b809150509250929050565b60805160a05160c051612b3b6200026c6000396000818161069f01526108e5015260008181610ac301528181610b0c01528181610bab01528181610beb0152610c7e01526000818161058c015281816107ba01528181610a8001528181610e6c01528181611155015281816111cc015281816113cf01526116850152612b3b6000f3fe60806040526004361061021a5760003560e01c8063970eb3a811610123578063c0c53b8b116100ab578063c6e891131161006f578063c6e89113146106c1578063cd8f80c214610708578063f2fde38b1461072a578063f465c77e1461074a578063f5bf3fcf1461077857600080fd5b8063c0c53b8b146105f8578063c0c73aed14610618578063c23a5cea14610658578063c399ec8814610678578063c5c036991461068d57600080fd5b8063a9a23409116100f2578063a9a234091461055a578063b0d691fe1461057a578063b7b188d1146105ae578063bb4fceb9146105c3578063bb9fe6bf146105e357600080fd5b8063970eb3a8146104c957806399a6cddd146104e95780639ed0fb6814610509578063a1a3f5b91461052d57600080fd5b806363445989116101a6578063796d437111610175578063796d43711461040e5780637eae838a14610425578063802bfd1b1461043b578063828212561461045b5780638da5cb5b1461049757600080fd5b806363445989146103735780636e2fe00d146103cb578063715018a6146103e257806376fdd149146103f757600080fd5b80633659cfe6116101ed5780633659cfe61461029c5780634a6f84cf146102bc5780634ce5f9c2146102e95780634f1ef2861461034b57806352d1902d1461035e57600080fd5b80630396cb601461021f5780630993969a146102345780631aa2b92e1461024757806327e235e31461026f575b600080fd5b61023261022d3660046121fe565b610798565b005b610232610242366004612240565b610824565b34801561025357600080fd5b5061025c603281565b6040519081526020015b60405180910390f35b34801561027b57600080fd5b5061025c61028a366004612240565b60666020526000908152604090205481565b3480156102a857600080fd5b506102326102b7366004612240565b610ab9565b3480156102c857600080fd5b5061025c6102d7366004612240565b60686020526000908152604090205481565b3480156102f557600080fd5b5061033061030436600461225d565b606960209081526000928352604080842090915290825290208054600182015460029092015490919083565b60408051938452602084019290925290820152606001610266565b61023261035936600461234d565b610ba1565b34801561036a57600080fd5b5061025c610c71565b34801561037f57600080fd5b506103b661038e366004612240565b6001600160a01b03166000908152606660209081526040808320546068909252909120549091565b60408051928352602083019190915201610266565b3480156103d757600080fd5b5061025c623d090081565b3480156103ee57600080fd5b50610232610d24565b34801561040357600080fd5b5061025c6208165081565b34801561041a57600080fd5b5061025c62030d4081565b34801561043157600080fd5b5061025c606e5481565b34801561044757600080fd5b50610232610456366004612240565b610d38565b34801561046757600080fd5b50610330610476366004612240565b606b6020526000908152604090208054600182015460029092015490919083565b3480156104a357600080fd5b506000546001600160a01b03165b6040516001600160a01b039091168152602001610266565b3480156104d557600080fd5b506102326104e436600461239d565b610dff565b3480156104f557600080fd5b50606d546104b1906001600160a01b031681565b34801561051557600080fd5b50610232336000908152606860205260409020439055565b34801561053957600080fd5b5061025c610548366004612240565b60676020526000908152604090205481565b34801561056657600080fd5b506102326105753660046123b6565b610e48565b34801561058657600080fd5b506104b17f000000000000000000000000000000000000000000000000000000000000000081565b3480156105ba57600080fd5b5061025c603c81565b3480156105cf57600080fd5b50606c546104b1906001600160a01b031681565b3480156105ef57600080fd5b50610232610e62565b34801561060457600080fd5b50610232610613366004612445565b610ed9565b34801561062457600080fd5b5061063861063336600461225d565b61105c565b604080519485526020850193909352918301526060820152608001610266565b34801561066457600080fd5b50610232610673366004612240565b61112e565b34801561068457600080fd5b5061025c6111b4565b34801561069957600080fd5b506104b17f000000000000000000000000000000000000000000000000000000000000000081565b3480156106cd57600080fd5b506103306106dc36600461225d565b606a60209081526000928352604080842090915290825290208054600182015460029092015490919083565b34801561071457600080fd5b5061023233600090815260686020526040812055565b34801561073657600080fd5b50610232610745366004612240565b611244565b34801561075657600080fd5b5061076a610765366004612490565b6112ba565b604051610266929190612534565b34801561078457600080fd5b50610232610793366004612556565b6112dd565b6107a0611435565b604051621cb65b60e51b815263ffffffff821660048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690630396cb609034906024015b6000604051808303818588803b15801561080857600080fd5b505af115801561081c573d6000803e3d6000fd5b505050505050565b346000036108455760405163162908e360e11b815260040160405180910390fd5b606d546040516313289ea360e31b81523360048201526001600160a01b0390911690639944f51890602401602060405180830381865afa15801561088d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108b19190612582565b1580156108c957506000546001600160a01b03163314155b801561095a57506040516304131fc960e31b81523360048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690632098fe4890602401602060405180830381865afa158015610934573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061095891906125a4565b155b1561097857604051631e74ff5560e21b815260040160405180910390fd5b6001600160a01b0381163b1580156109fb5750606d546040516313289ea360e31b81526001600160a01b03838116600483015290911690639944f51890602401602060405180830381865afa1580156109d5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109f99190612582565b155b15610a19576040516357206d6b60e01b815260040160405180910390fd5b6001600160a01b03811660009081526066602052604081208054349290610a419084906125d3565b90915550506001600160a01b0381163303610a6b57610a6b33600090815260686020526040812055565b60405163b760faf960e01b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063b760faf99034906024016107ef565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000163003610b0a5760405162461bcd60e51b8152600401610b01906125e6565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610b53600080516020612abf833981519152546001600160a01b031690565b6001600160a01b031614610b795760405162461bcd60e51b8152600401610b0190612632565b610b828161148f565b60408051600080825260208201909252610b9e918391906114ba565b50565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000163003610be95760405162461bcd60e51b8152600401610b01906125e6565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610c32600080516020612abf833981519152546001600160a01b031690565b6001600160a01b031614610c585760405162461bcd60e51b8152600401610b0190612632565b610c618261148f565b610c6d828260016114ba565b5050565b6000306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614610d115760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c60448201527f6c6564207468726f7567682064656c656761746563616c6c00000000000000006064820152608401610b01565b50600080516020612abf83398151915290565b610d2c611435565b610d36600061162a565b565b610d40611435565b6001600160a01b038116610d67576040516311a1e69760e01b815260040160405180910390fd5b606c546001600160a01b0390811690821603610d96576040516311a1e69760e01b815260040160405180910390fd5b606c54604080516001600160a01b03928316815291831660208301527f08044c8203cd564e6e5f99394e0a9c59972fa37135216bf7711da6599786a592910160405180910390a1606c80546001600160a01b0319166001600160a01b0392909216919091179055565b610e07611435565b606e5460408051918252602082018390527f89a2d77d4d68a0e9825ef16b56eed9617b01d2e593f658dc54a4f13c8e0b7699910160405180910390a1606e55565b610e5061167a565b610e5c848484846116ea565b50505050565b610e6a611435565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663bb9fe6bf6040518163ffffffff1660e01b8152600401600060405180830381600087803b158015610ec557600080fd5b505af1158015610e5c573d6000803e3d6000fd5b600054600160a81b900460ff1615808015610f0157506000546001600160a01b90910460ff16105b80610f225750303b158015610f225750600054600160a01b900460ff166001145b610f855760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610b01565b6000805460ff60a01b1916600160a01b1790558015610fb2576000805460ff60a81b1916600160a81b1790555b610fba6119ba565b610fc38461162a565b606d80546001600160a01b038085166001600160a01b031992831617909255606c80548684169216919091179055666a94d74f430000606e55841660009081526068602052604090204390558015610e5c576000805460ff60a81b19169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a150505050565b6000806000806000866001600160a01b031663025e7c2760006040518263ffffffff1660e01b815260040161109391815260200190565b602060405180830381865afa1580156110b0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110d4919061267e565b6001600160a01b0390811660008181526069602090815260408083209a90941680835299815283822060018101549054938352606a82528483209a8352999052919091206002810154905497999198509695509350505050565b611136611435565b60405163611d2e7560e11b81526001600160a01b0382811660048301527f0000000000000000000000000000000000000000000000000000000000000000169063c23a5cea90602401600060405180830381600087803b15801561119957600080fd5b505af11580156111ad573d6000803e3d6000fd5b5050505050565b6040516370a0823160e01b81523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316906370a0823190602401602060405180830381865afa15801561121b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061123f91906125a4565b905090565b61124c611435565b6001600160a01b0381166112b15760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201526564647265737360d01b6064820152608401610b01565b610b9e8161162a565b606060006112c661167a565b6112d1858585611a27565b91509150935093915050565b6112e5611c64565b3360009081526066602052604090205481118061130f575033600090815260686020526040902054155b806113295750336000908152606860205260409020544311155b156113475760405163202e89bb60e21b815260040160405180910390fd5b6001600160a01b038216158061136757506000826001600160a01b03163b115b156113855760405163416aebb560e11b815260040160405180910390fd5b33600090815260666020526040812080548392906113a490849061269b565b909155505060405163040b850f60e31b81526001600160a01b038381166004830152602482018390527f0000000000000000000000000000000000000000000000000000000000000000169063205c287890604401600060405180830381600087803b15801561141357600080fd5b505af1158015611427573d6000803e3d6000fd5b50505050610c6d6001606555565b6000546001600160a01b03163314610d365760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610b01565b6000546001600160a01b03163314610b9e57604051635fc483c560e01b815260040160405180910390fd5b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156114f2576114ed83611cbd565b505050565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa92505050801561154c575060408051601f3d908101601f19168201909252611549918101906125a4565b60015b6115af5760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b6064820152608401610b01565b600080516020612abf833981519152811461161e5760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b6064820152608401610b01565b506114ed838383611d59565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b336001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614610d365760405162461bcd60e51b815260206004820152601560248201527414d95b99195c881b9bdd08115b9d1c9e541bda5b9d605a1b6044820152606401610b01565b60008080806116fb868801886126ae565b93509350935093506000836001600160a01b031663025e7c2760006040518263ffffffff1660e01b815260040161173491815260200190565b602060405180830381865afa158015611751573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611775919061267e565b6001600160a01b0381166000908152606b6020526040902080549192509061179f90603c906125d3565b4211156117b4574281556001808201556117cf565b60018160010160008282546117c991906125d3565b90915550505b606c54604051630b17025b60e41b81526001600160a01b038881166004830152600092169063b17025b090602401608060405180830381865afa15801561181a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061183e91906126f4565b6001600160a01b038481166000908152606960209081526040808320938c1683529290522081518154929350909161187691906125d3565b42111561188b574281556001808201556118a6565b60018160010160008282546118a091906125d3565b90915550505b60006118bb876118b648896125d3565b611d7e565b905060006118cc8262030d40612788565b6118d6908c6125d3565b6001600160a01b038b1660009081526066602052604081208054929350839290919061190390849061269b565b90915550506001600160a01b038a16600090815260676020526040812080548392906119309084906125d3565b90915550506001600160a01b038087166000908152606a60209081526040808320938e168352929052208460026020020151815461196e91906125d3565b421115611984574281556002810182905561199e565b8181600201600082825461199891906125d3565b90915550505b6119a9878c84611d98565b505050505050505050505050505050565b600054600160a81b900460ff16610d365760405162461bcd60e51b815260206004820152602b60248201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960448201526a6e697469616c697a696e6760a81b6064820152608401610b01565b6060600062030d408560a001351080611a465750620816508560a00135115b15611a64576040516325d8553160e21b815260040160405180910390fd5b623d09008560c001351115611a8c57604051634d1de76760e01b815260040160405180910390fd5b611a9a61012086018661279f565b9050601414611abc576040516366190c9f60e11b815260040160405180910390fd5b60e08501356000611ad08262030d40612788565b611ada90866125d3565b9050606e54811115611aff57604051633e1173f560e11b815260040160405180910390fd5b606c546000906001600160a01b031663dc3acebe611b28611b2360608c018c61279f565b611fa6565b6040516001600160e01b031960e084901b1681526001600160a01b039091166004820152602401602060405180830381865afa158015611b6c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611b90919061267e565b6001600160a01b03811660009081526068602052604090205490915015611bca5760405163732e4f3f60e11b815260040160405180910390fd5b6001600160a01b038116600090815260666020526040902054821115611c0357604051632b7786bd60e21b815260040160405180910390fd5b80611c1160208a018a612240565b604080516001600160a01b039384166020820152929091169082015260e08901356060820152610100890135608082015260a00160408051601f1981840301815291905298600098509650505050505050565b600260655403611cb65760405162461bcd60e51b815260206004820152601f60248201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c006044820152606401610b01565b6002606555565b6001600160a01b0381163b611d2a5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610b01565b600080516020612abf83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b611d628361207b565b600082511180611d6f5750805b156114ed57610e5c83836120bb565b6000818310611d8d5781611d8f565b825b90505b92915050565b6001600160a01b0383166000908152606b60209081526040918290208251606081018452815480825260018301549382019390935260029091015492810192909252611de690603c906125d3565b42108015611df8575060328160200151115b15611e165760405163a58f6e4b60e01b815260040160405180910390fd5b606c54604051630b17025b60e41b81526001600160a01b038581166004830152600092169063b17025b090602401608060405180830381865afa158015611e61573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611e8591906126f4565b6001600160a01b03868116600090815260696020908152604080832093891683529281529082902082516060810184528154808252600183015493820193909352600290910154928101929092528251919450919250611ee4916125d3565b42108015611ef9575060208082015190830151115b15611f17576040516313f6f48b60e21b815260040160405180910390fd5b6001600160a01b038581166000908152606a60209081526040808320938816835292815290829020825160608101845281548082526001830154938201939093526002909101548184015291830151919350611f7391906125d3565b42108015611f88575060608101516040830151115b156111ad576040516352846cb560e01b815260040160405180910390fd5b600080611fb660048285876127ed565b611fbf91612817565b9050635c0f12eb60e11b6001600160e01b031982160161203c576000611fe884600481886127ed565b810190611ff5919061295a565b50509050805160000361200d57600092505050611d92565b806001825161201c919061269b565b8151811061202c5761202c612772565b6020026020010151925050612074565b6324f16c0560e11b6001600160e01b03198216016120745761206183600481876127ed565b81019061206e9190612a40565b50909250505b5092915050565b61208481611cbd565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b6060611d8f8383604051806060016040528060278152602001612adf602791396060600080856001600160a01b0316856040516120f89190612a8f565b600060405180830381855af49150503d8060008114612133576040519150601f19603f3d011682016040523d82523d6000602084013e612138565b606091505b509150915061214986838387612153565b9695505050505050565b606083156121c25782516000036121bb576001600160a01b0385163b6121bb5760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606401610b01565b50816121cc565b6121cc83836121d4565b949350505050565b8151156121e45781518083602001fd5b8060405162461bcd60e51b8152600401610b019190612aab565b60006020828403121561221057600080fd5b813563ffffffff8116811461222457600080fd5b9392505050565b6001600160a01b0381168114610b9e57600080fd5b60006020828403121561225257600080fd5b81356122248161222b565b6000806040838503121561227057600080fd5b823561227b8161222b565b9150602083013561228b8161222b565b809150509250929050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff811182821017156122d5576122d5612296565b604052919050565b600082601f8301126122ee57600080fd5b813567ffffffffffffffff81111561230857612308612296565b61231b601f8201601f19166020016122ac565b81815284602083860101111561233057600080fd5b816020850160208301376000918101602001919091529392505050565b6000806040838503121561236057600080fd5b823561236b8161222b565b9150602083013567ffffffffffffffff81111561238757600080fd5b612393858286016122dd565b9150509250929050565b6000602082840312156123af57600080fd5b5035919050565b600080600080606085870312156123cc57600080fd5b8435600381106123db57600080fd5b9350602085013567ffffffffffffffff808211156123f857600080fd5b818701915087601f83011261240c57600080fd5b81358181111561241b57600080fd5b88602082850101111561242d57600080fd5b95986020929092019750949560400135945092505050565b60008060006060848603121561245a57600080fd5b83356124658161222b565b925060208401356124758161222b565b915060408401356124858161222b565b809150509250925092565b6000806000606084860312156124a557600080fd5b833567ffffffffffffffff8111156124bc57600080fd5b840161016081870312156124cf57600080fd5b95602085013595506040909401359392505050565b60005b838110156124ff5781810151838201526020016124e7565b50506000910152565b600081518084526125208160208601602086016124e4565b601f01601f19169290920160200192915050565b6040815260006125476040830185612508565b90508260208301529392505050565b6000806040838503121561256957600080fd5b82356125748161222b565b946020939093013593505050565b60006020828403121561259457600080fd5b8151801515811461222457600080fd5b6000602082840312156125b657600080fd5b5051919050565b634e487b7160e01b600052601160045260246000fd5b80820180821115611d9257611d926125bd565b6020808252602c908201527f46756e6374696f6e206d7573742062652063616c6c6564207468726f7567682060408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c908201527f46756e6374696f6e206d7573742062652063616c6c6564207468726f7567682060408201526b6163746976652070726f787960a01b606082015260800190565b60006020828403121561269057600080fd5b81516122248161222b565b81810381811115611d9257611d926125bd565b600080600080608085870312156126c457600080fd5b84356126cf8161222b565b935060208501356126df8161222b565b93969395505050506040820135916060013590565b60006080828403121561270657600080fd5b82601f83011261271557600080fd5b6040516080810181811067ffffffffffffffff8211171561273857612738612296565b60405280608084018581111561274d57600080fd5b845b8181101561276757805183526020928301920161274f565b509195945050505050565b634e487b7160e01b600052603260045260246000fd5b8082028115828204841417611d9257611d926125bd565b6000808335601e198436030181126127b657600080fd5b83018035915067ffffffffffffffff8211156127d157600080fd5b6020019150368190038213156127e657600080fd5b9250929050565b600080858511156127fd57600080fd5b8386111561280a57600080fd5b5050820193919092039150565b6001600160e01b0319813581811691600485101561283f5780818660040360031b1b83161692505b505092915050565b600067ffffffffffffffff82111561286157612861612296565b5060051b60200190565b600082601f83011261287c57600080fd5b8135602061289161288c83612847565b6122ac565b8083825260208201915060208460051b8701019350868411156128b357600080fd5b602086015b848110156128cf57803583529183019183016128b8565b509695505050505050565b600082601f8301126128eb57600080fd5b813560206128fb61288c83612847565b82815260059290921b8401810191818101908684111561291a57600080fd5b8286015b848110156128cf57803567ffffffffffffffff81111561293e5760008081fd5b61294c8986838b01016122dd565b84525091830191830161291e565b60008060006060848603121561296f57600080fd5b833567ffffffffffffffff8082111561298757600080fd5b818601915086601f83011261299b57600080fd5b813560206129ab61288c83612847565b82815260059290921b8401810191818101908a8411156129ca57600080fd5b948201945b838610156129f15785356129e28161222b565b825294820194908201906129cf565b97505087013592505080821115612a0757600080fd5b612a138783880161286b565b93506040860135915080821115612a2957600080fd5b50612a36868287016128da565b9150509250925092565b600080600060608486031215612a5557600080fd5b8335612a608161222b565b925060208401359150604084013567ffffffffffffffff811115612a8357600080fd5b612a36868287016122dd565b60008251612aa18184602087016124e4565b9190910192915050565b602081526000611d8f602083018461250856fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a26469706673582212209683dbf76cf60e771cccd8283a7da4540b43978f986e33a1798713b003f8e3cc64736f6c634300081800330000000000000000000000002843c269d2a64ecfa63548e8b3fc0fd23b7f70cb0000000000000000000000008a4720488ca32f1223ccfe5a087e250fe3bc5d75", - "nonce": "0x4bf5", + "input": "0x000000000000000000000000000000000000000000000000000000000000000060e06040523060a0523480156200001557600080fd5b5060405162002e6438038062002e648339810160408190526200003891620001a9565b81620000443362000072565b6001600160a01b031660805260016065556200005f620000c2565b6001600160a01b031660c05250620001e8565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b600054600160a81b900460ff1615620001315760405162461bcd60e51b815260206004820152602760248201527f496e697469616c697a61626c653a20636f6e747261637420697320696e697469604482015266616c697a696e6760c81b606482015260840160405180910390fd5b600054600160a01b900460ff908116146200018e576000805460ff60a01b191660ff60a01b17905560405160ff81527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b565b6001600160a01b0381168114620001a657600080fd5b50565b60008060408385031215620001bd57600080fd5b8251620001ca8162000190565b6020840151909250620001dd8162000190565b809150509250929050565b60805160a05160c051612bf1620002736000396000818161069f015281816108e50152611c42015260008181610ac301528181610b0c01528181610bab01528181610beb0152610c7e01526000818161058c015281816107ba01528181610a8001528181610e6c01528181611155015281816111cc015281816113cf01526116850152612bf16000f3fe60806040526004361061021a5760003560e01c8063970eb3a811610123578063c0c53b8b116100ab578063c6e891131161006f578063c6e89113146106c1578063cd8f80c214610708578063f2fde38b1461072a578063f465c77e1461074a578063f5bf3fcf1461077857600080fd5b8063c0c53b8b146105f8578063c0c73aed14610618578063c23a5cea14610658578063c399ec8814610678578063c5c036991461068d57600080fd5b8063a9a23409116100f2578063a9a234091461055a578063b0d691fe1461057a578063b7b188d1146105ae578063bb4fceb9146105c3578063bb9fe6bf146105e357600080fd5b8063970eb3a8146104c957806399a6cddd146104e95780639ed0fb6814610509578063a1a3f5b91461052d57600080fd5b806363445989116101a6578063796d437111610175578063796d43711461040e5780637eae838a14610425578063802bfd1b1461043b578063828212561461045b5780638da5cb5b1461049757600080fd5b806363445989146103735780636e2fe00d146103cb578063715018a6146103e257806376fdd149146103f757600080fd5b80633659cfe6116101ed5780633659cfe61461029c5780634a6f84cf146102bc5780634ce5f9c2146102e95780634f1ef2861461034b57806352d1902d1461035e57600080fd5b80630396cb601461021f5780630993969a146102345780631aa2b92e1461024757806327e235e31461026f575b600080fd5b61023261022d3660046122b4565b610798565b005b6102326102423660046122f6565b610824565b34801561025357600080fd5b5061025c603281565b6040519081526020015b60405180910390f35b34801561027b57600080fd5b5061025c61028a3660046122f6565b60666020526000908152604090205481565b3480156102a857600080fd5b506102326102b73660046122f6565b610ab9565b3480156102c857600080fd5b5061025c6102d73660046122f6565b60686020526000908152604090205481565b3480156102f557600080fd5b50610330610304366004612313565b606960209081526000928352604080842090915290825290208054600182015460029092015490919083565b60408051938452602084019290925290820152606001610266565b610232610359366004612403565b610ba1565b34801561036a57600080fd5b5061025c610c71565b34801561037f57600080fd5b506103b661038e3660046122f6565b6001600160a01b03166000908152606660209081526040808320546068909252909120549091565b60408051928352602083019190915201610266565b3480156103d757600080fd5b5061025c623d090081565b3480156103ee57600080fd5b50610232610d24565b34801561040357600080fd5b5061025c6208165081565b34801561041a57600080fd5b5061025c62030d4081565b34801561043157600080fd5b5061025c606e5481565b34801561044757600080fd5b506102326104563660046122f6565b610d38565b34801561046757600080fd5b506103306104763660046122f6565b606b6020526000908152604090208054600182015460029092015490919083565b3480156104a357600080fd5b506000546001600160a01b03165b6040516001600160a01b039091168152602001610266565b3480156104d557600080fd5b506102326104e4366004612453565b610dff565b3480156104f557600080fd5b50606d546104b1906001600160a01b031681565b34801561051557600080fd5b50610232336000908152606860205260409020439055565b34801561053957600080fd5b5061025c6105483660046122f6565b60676020526000908152604090205481565b34801561056657600080fd5b5061023261057536600461246c565b610e48565b34801561058657600080fd5b506104b17f000000000000000000000000000000000000000000000000000000000000000081565b3480156105ba57600080fd5b5061025c603c81565b3480156105cf57600080fd5b50606c546104b1906001600160a01b031681565b3480156105ef57600080fd5b50610232610e62565b34801561060457600080fd5b506102326106133660046124fb565b610ed9565b34801561062457600080fd5b50610638610633366004612313565b61105c565b604080519485526020850193909352918301526060820152608001610266565b34801561066457600080fd5b506102326106733660046122f6565b61112e565b34801561068457600080fd5b5061025c6111b4565b34801561069957600080fd5b506104b17f000000000000000000000000000000000000000000000000000000000000000081565b3480156106cd57600080fd5b506103306106dc366004612313565b606a60209081526000928352604080842090915290825290208054600182015460029092015490919083565b34801561071457600080fd5b5061023233600090815260686020526040812055565b34801561073657600080fd5b506102326107453660046122f6565b611244565b34801561075657600080fd5b5061076a610765366004612546565b6112ba565b6040516102669291906125ea565b34801561078457600080fd5b5061023261079336600461260c565b6112dd565b6107a0611435565b604051621cb65b60e51b815263ffffffff821660048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690630396cb609034906024015b6000604051808303818588803b15801561080857600080fd5b505af115801561081c573d6000803e3d6000fd5b505050505050565b346000036108455760405163162908e360e11b815260040160405180910390fd5b606d546040516313289ea360e31b81523360048201526001600160a01b0390911690639944f51890602401602060405180830381865afa15801561088d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108b19190612638565b1580156108c957506000546001600160a01b03163314155b801561095a57506040516304131fc960e31b81523360048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690632098fe4890602401602060405180830381865afa158015610934573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610958919061265a565b155b1561097857604051631e74ff5560e21b815260040160405180910390fd5b6001600160a01b0381163b1580156109fb5750606d546040516313289ea360e31b81526001600160a01b03838116600483015290911690639944f51890602401602060405180830381865afa1580156109d5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109f99190612638565b155b15610a19576040516357206d6b60e01b815260040160405180910390fd5b6001600160a01b03811660009081526066602052604081208054349290610a41908490612689565b90915550506001600160a01b0381163303610a6b57610a6b33600090815260686020526040812055565b60405163b760faf960e01b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063b760faf99034906024016107ef565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000163003610b0a5760405162461bcd60e51b8152600401610b019061269c565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610b53600080516020612b75833981519152546001600160a01b031690565b6001600160a01b031614610b795760405162461bcd60e51b8152600401610b01906126e8565b610b828161148f565b60408051600080825260208201909252610b9e918391906114ba565b50565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000163003610be95760405162461bcd60e51b8152600401610b019061269c565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610c32600080516020612b75833981519152546001600160a01b031690565b6001600160a01b031614610c585760405162461bcd60e51b8152600401610b01906126e8565b610c618261148f565b610c6d828260016114ba565b5050565b6000306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614610d115760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c60448201527f6c6564207468726f7567682064656c656761746563616c6c00000000000000006064820152608401610b01565b50600080516020612b7583398151915290565b610d2c611435565b610d36600061162a565b565b610d40611435565b6001600160a01b038116610d67576040516311a1e69760e01b815260040160405180910390fd5b606c546001600160a01b0390811690821603610d96576040516311a1e69760e01b815260040160405180910390fd5b606c54604080516001600160a01b03928316815291831660208301527f08044c8203cd564e6e5f99394e0a9c59972fa37135216bf7711da6599786a592910160405180910390a1606c80546001600160a01b0319166001600160a01b0392909216919091179055565b610e07611435565b606e5460408051918252602082018390527f89a2d77d4d68a0e9825ef16b56eed9617b01d2e593f658dc54a4f13c8e0b7699910160405180910390a1606e55565b610e5061167a565b610e5c848484846116ea565b50505050565b610e6a611435565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663bb9fe6bf6040518163ffffffff1660e01b8152600401600060405180830381600087803b158015610ec557600080fd5b505af1158015610e5c573d6000803e3d6000fd5b600054600160a81b900460ff1615808015610f0157506000546001600160a01b90910460ff16105b80610f225750303b158015610f225750600054600160a01b900460ff166001145b610f855760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610b01565b6000805460ff60a01b1916600160a01b1790558015610fb2576000805460ff60a81b1916600160a81b1790555b610fba6119ba565b610fc38461162a565b606d80546001600160a01b038085166001600160a01b031992831617909255606c80548684169216919091179055666a94d74f430000606e55841660009081526068602052604090204390558015610e5c576000805460ff60a81b19169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a150505050565b6000806000806000866001600160a01b031663025e7c2760006040518263ffffffff1660e01b815260040161109391815260200190565b602060405180830381865afa1580156110b0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110d49190612734565b6001600160a01b0390811660008181526069602090815260408083209a90941680835299815283822060018101549054938352606a82528483209a8352999052919091206002810154905497999198509695509350505050565b611136611435565b60405163611d2e7560e11b81526001600160a01b0382811660048301527f0000000000000000000000000000000000000000000000000000000000000000169063c23a5cea90602401600060405180830381600087803b15801561119957600080fd5b505af11580156111ad573d6000803e3d6000fd5b5050505050565b6040516370a0823160e01b81523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316906370a0823190602401602060405180830381865afa15801561121b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061123f919061265a565b905090565b61124c611435565b6001600160a01b0381166112b15760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201526564647265737360d01b6064820152608401610b01565b610b9e8161162a565b606060006112c661167a565b6112d1858585611a27565b91509150935093915050565b6112e5611d1a565b3360009081526066602052604090205481118061130f575033600090815260686020526040902054155b806113295750336000908152606860205260409020544311155b156113475760405163202e89bb60e21b815260040160405180910390fd5b6001600160a01b038216158061136757506000826001600160a01b03163b115b156113855760405163416aebb560e11b815260040160405180910390fd5b33600090815260666020526040812080548392906113a4908490612751565b909155505060405163040b850f60e31b81526001600160a01b038381166004830152602482018390527f0000000000000000000000000000000000000000000000000000000000000000169063205c287890604401600060405180830381600087803b15801561141357600080fd5b505af1158015611427573d6000803e3d6000fd5b50505050610c6d6001606555565b6000546001600160a01b03163314610d365760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610b01565b6000546001600160a01b03163314610b9e57604051635fc483c560e01b815260040160405180910390fd5b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156114f2576114ed83611d73565b505050565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa92505050801561154c575060408051601f3d908101601f191682019092526115499181019061265a565b60015b6115af5760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b6064820152608401610b01565b600080516020612b75833981519152811461161e5760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b6064820152608401610b01565b506114ed838383611e0f565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b336001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614610d365760405162461bcd60e51b815260206004820152601560248201527414d95b99195c881b9bdd08115b9d1c9e541bda5b9d605a1b6044820152606401610b01565b60008080806116fb86880188612764565b93509350935093506000836001600160a01b031663025e7c2760006040518263ffffffff1660e01b815260040161173491815260200190565b602060405180830381865afa158015611751573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117759190612734565b6001600160a01b0381166000908152606b6020526040902080549192509061179f90603c90612689565b4211156117b4574281556001808201556117cf565b60018160010160008282546117c99190612689565b90915550505b606c54604051630b17025b60e41b81526001600160a01b038881166004830152600092169063b17025b090602401608060405180830381865afa15801561181a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061183e91906127aa565b6001600160a01b038481166000908152606960209081526040808320938c168352929052208151815492935090916118769190612689565b42111561188b574281556001808201556118a6565b60018160010160008282546118a09190612689565b90915550505b60006118bb876118b64889612689565b611e34565b905060006118cc8262030d4061283e565b6118d6908c612689565b6001600160a01b038b16600090815260666020526040812080549293508392909190611903908490612751565b90915550506001600160a01b038a1660009081526067602052604081208054839290611930908490612689565b90915550506001600160a01b038087166000908152606a60209081526040808320938e168352929052208460026020020151815461196e9190612689565b421115611984574281556002810182905561199e565b818160020160008282546119989190612689565b90915550505b6119a9878c84611e4e565b505050505050505050505050505050565b600054600160a81b900460ff16610d365760405162461bcd60e51b815260206004820152602b60248201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960448201526a6e697469616c697a696e6760a81b6064820152608401610b01565b6060600062030d408560a001351080611a465750620816508560a00135115b15611a64576040516325d8553160e21b815260040160405180910390fd5b623d09008560c001351115611a8c57604051634d1de76760e01b815260040160405180910390fd5b611a9a610120860186612855565b9050601414611abc576040516366190c9f60e11b815260040160405180910390fd5b60e08501356000611ad08262030d4061283e565b611ada9086612689565b9050606e54811115611aff57604051633e1173f560e11b815260040160405180910390fd5b606c546000906001600160a01b031663dc3acebe611b28611b2360608c018c612855565b61205c565b6040516001600160e01b031960e084901b1681526001600160a01b039091166004820152602401602060405180830381865afa158015611b6c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611b909190612734565b6001600160a01b03811660009081526068602052604090205490915015611bca5760405163732e4f3f60e11b815260040160405180910390fd5b6001600160a01b038116600090815260666020526040902054821115611cb957611bf760208901896122f6565b6001600160a01b0316816001600160a01b031614611c2857604051632b7786bd60e21b815260040160405180910390fd5b606c54604051636e1d675f60e11b81526001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000811660048301529091169063dc3acebe90602401602060405180830381865afa158015611c92573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611cb69190612734565b90505b80611cc760208a018a6122f6565b604080516001600160a01b039384166020820152929091169082015260e08901356060820152610100890135608082015260a00160408051601f1981840301815291905298600098509650505050505050565b600260655403611d6c5760405162461bcd60e51b815260206004820152601f60248201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c006044820152606401610b01565b6002606555565b6001600160a01b0381163b611de05760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610b01565b600080516020612b7583398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b611e1883612131565b600082511180611e255750805b156114ed57610e5c8383612171565b6000818310611e435781611e45565b825b90505b92915050565b6001600160a01b0383166000908152606b60209081526040918290208251606081018452815480825260018301549382019390935260029091015492810192909252611e9c90603c90612689565b42108015611eae575060328160200151115b15611ecc5760405163a58f6e4b60e01b815260040160405180910390fd5b606c54604051630b17025b60e41b81526001600160a01b038581166004830152600092169063b17025b090602401608060405180830381865afa158015611f17573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611f3b91906127aa565b6001600160a01b03868116600090815260696020908152604080832093891683529281529082902082516060810184528154808252600183015493820193909352600290910154928101929092528251919450919250611f9a91612689565b42108015611faf575060208082015190830151115b15611fcd576040516313f6f48b60e21b815260040160405180910390fd5b6001600160a01b038581166000908152606a602090815260408083209388168352928152908290208251606081018452815480825260018301549382019390935260029091015481840152918301519193506120299190612689565b4210801561203e575060608101516040830151115b156111ad576040516352846cb560e01b815260040160405180910390fd5b60008061206c60048285876128a3565b612075916128cd565b9050635c0f12eb60e11b6001600160e01b03198216016120f257600061209e84600481886128a3565b8101906120ab9190612a10565b5050905080516000036120c357600092505050611e48565b80600182516120d29190612751565b815181106120e2576120e2612828565b602002602001015192505061212a565b6324f16c0560e11b6001600160e01b031982160161212a5761211783600481876128a3565b8101906121249190612af6565b50909250505b5092915050565b61213a81611d73565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b6060611e458383604051806060016040528060278152602001612b95602791396060600080856001600160a01b0316856040516121ae9190612b45565b600060405180830381855af49150503d80600081146121e9576040519150601f19603f3d011682016040523d82523d6000602084013e6121ee565b606091505b50915091506121ff86838387612209565b9695505050505050565b60608315612278578251600003612271576001600160a01b0385163b6122715760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606401610b01565b5081612282565b612282838361228a565b949350505050565b81511561229a5781518083602001fd5b8060405162461bcd60e51b8152600401610b019190612b61565b6000602082840312156122c657600080fd5b813563ffffffff811681146122da57600080fd5b9392505050565b6001600160a01b0381168114610b9e57600080fd5b60006020828403121561230857600080fd5b81356122da816122e1565b6000806040838503121561232657600080fd5b8235612331816122e1565b91506020830135612341816122e1565b809150509250929050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff8111828210171561238b5761238b61234c565b604052919050565b600082601f8301126123a457600080fd5b813567ffffffffffffffff8111156123be576123be61234c565b6123d1601f8201601f1916602001612362565b8181528460208386010111156123e657600080fd5b816020850160208301376000918101602001919091529392505050565b6000806040838503121561241657600080fd5b8235612421816122e1565b9150602083013567ffffffffffffffff81111561243d57600080fd5b61244985828601612393565b9150509250929050565b60006020828403121561246557600080fd5b5035919050565b6000806000806060858703121561248257600080fd5b84356003811061249157600080fd5b9350602085013567ffffffffffffffff808211156124ae57600080fd5b818701915087601f8301126124c257600080fd5b8135818111156124d157600080fd5b8860208285010111156124e357600080fd5b95986020929092019750949560400135945092505050565b60008060006060848603121561251057600080fd5b833561251b816122e1565b9250602084013561252b816122e1565b9150604084013561253b816122e1565b809150509250925092565b60008060006060848603121561255b57600080fd5b833567ffffffffffffffff81111561257257600080fd5b8401610160818703121561258557600080fd5b95602085013595506040909401359392505050565b60005b838110156125b557818101518382015260200161259d565b50506000910152565b600081518084526125d681602086016020860161259a565b601f01601f19169290920160200192915050565b6040815260006125fd60408301856125be565b90508260208301529392505050565b6000806040838503121561261f57600080fd5b823561262a816122e1565b946020939093013593505050565b60006020828403121561264a57600080fd5b815180151581146122da57600080fd5b60006020828403121561266c57600080fd5b5051919050565b634e487b7160e01b600052601160045260246000fd5b80820180821115611e4857611e48612673565b6020808252602c908201527f46756e6374696f6e206d7573742062652063616c6c6564207468726f7567682060408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c908201527f46756e6374696f6e206d7573742062652063616c6c6564207468726f7567682060408201526b6163746976652070726f787960a01b606082015260800190565b60006020828403121561274657600080fd5b81516122da816122e1565b81810381811115611e4857611e48612673565b6000806000806080858703121561277a57600080fd5b8435612785816122e1565b93506020850135612795816122e1565b93969395505050506040820135916060013590565b6000608082840312156127bc57600080fd5b82601f8301126127cb57600080fd5b6040516080810181811067ffffffffffffffff821117156127ee576127ee61234c565b60405280608084018581111561280357600080fd5b845b8181101561281d578051835260209283019201612805565b509195945050505050565b634e487b7160e01b600052603260045260246000fd5b8082028115828204841417611e4857611e48612673565b6000808335601e1984360301811261286c57600080fd5b83018035915067ffffffffffffffff82111561288757600080fd5b60200191503681900382131561289c57600080fd5b9250929050565b600080858511156128b357600080fd5b838611156128c057600080fd5b5050820193919092039150565b6001600160e01b031981358181169160048510156128f55780818660040360031b1b83161692505b505092915050565b600067ffffffffffffffff8211156129175761291761234c565b5060051b60200190565b600082601f83011261293257600080fd5b81356020612947612942836128fd565b612362565b8083825260208201915060208460051b87010193508684111561296957600080fd5b602086015b84811015612985578035835291830191830161296e565b509695505050505050565b600082601f8301126129a157600080fd5b813560206129b1612942836128fd565b82815260059290921b840181019181810190868411156129d057600080fd5b8286015b8481101561298557803567ffffffffffffffff8111156129f45760008081fd5b612a028986838b0101612393565b8452509183019183016129d4565b600080600060608486031215612a2557600080fd5b833567ffffffffffffffff80821115612a3d57600080fd5b818601915086601f830112612a5157600080fd5b81356020612a61612942836128fd565b82815260059290921b8401810191818101908a841115612a8057600080fd5b948201945b83861015612aa7578535612a98816122e1565b82529482019490820190612a85565b97505087013592505080821115612abd57600080fd5b612ac987838801612921565b93506040860135915080821115612adf57600080fd5b50612aec86828701612990565b9150509250925092565b600080600060608486031215612b0b57600080fd5b8335612b16816122e1565b925060208401359150604084013567ffffffffffffffff811115612b3957600080fd5b612aec86828701612393565b60008251612b5781846020870161259a565b9190910192915050565b602081526000611e4560208301846125be56fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a26469706673582212207d7b422efd4e15f68c723a00bd060a1a81a5bf5a3391a8e01864ad4a3f93b47864736f6c634300081800330000000000000000000000002843c269d2a64ecfa63548e8b3fc0fd23b7f70cb0000000000000000000000008a4720488ca32f1223ccfe5a087e250fe3bc5d75", + "nonce": "0x4b85c", "chainId": "0x1ecf" }, "additionalContracts": [], "isFixedGasLimit": false }, { - "hash": "0x48bf54ac6eddb8f55a5022a708f4fb84257506e82c543733fa6ad5da57cc6c02", + "hash": "0x1a916af8dd468332c79abaf6546f4e990c99908a26ac4d0775c63b8eaf295603", "transactionType": "CALL", "contractName": null, "contractAddress": "0x2843c269d2a64ecfa63548e8b3fc0fd23b7f70cb", "function": "handleOps((address,uint256,bytes,bytes,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],address)", "arguments": [ - "[(0x2e2B1c42E38f5af81771e65D87729E57ABD1337a, 2617, 0x, 0xb61d27f60000000000000000000000001842a4eff3efd24c50b63c3cf89cecee245fc2bd0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000243659cfe6000000000000000000000000cbb3ba88bfd944860463585a557022fcee3cc28000000000000000000000000000000000000000000000000000000000, 4000000, 210000, 21000, 1, 1000000000, 0x0000000000000000000000000000000000000000, 0xe79114dee21107449ad3df04a5919c52256ff72c2e679a45eb5ac48b56246de2429ec8af5314e30b697fe400068dd63fad407fc4b8f0bc9ba7c361dc855ab4671b4fde3d178aaae046db1df0e33d83fb9f43f80512027df5ea93b3ad3b5a22575c3229f31fad4062d1e167aabd3cf9294d0d1deebad2b4da710873cc5f2e7a373a1c)]", + "[(0x2e2B1c42E38f5af81771e65D87729E57ABD1337a, 3853, 0x, 0xb61d27f60000000000000000000000001842a4eff3efd24c50b63c3cf89cecee245fc2bd0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000243659cfe60000000000000000000000002a10b80be8ee546c52fde9b58d65d089c6b929bb00000000000000000000000000000000000000000000000000000000, 4000000, 210000, 21000, 1, 1000000000, 0x0000000000000000000000000000000000000000, 0xdeec9637c6376665629d32cc2846bb4be7d7cb3c95e921c528dfaf1902a34f9a2a784977129185a88ded587efbc6f1519733a07f339701d3b1d4b2a83666bbac1baad657e37f5bcb9171dc9d7ca63a0cfee68bdabbc6c30cfc470ddb9132756c1c7daf51024db6e207ce890c625e238684745f45ec93c8507018f4ac7c06845db71b)]", "0x660ad4B5A74130a4796B4d54BC6750Ae93C86e6c" ], "transaction": { "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", "to": "0x2843c269d2a64ecfa63548e8b3fc0fd23b7f70cb", "value": "0x0", - "input": "0x1fad948c0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000660ad4b5a74130a4796b4d54bc6750ae93c86e6c000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000002e2b1c42e38f5af81771e65d87729e57abd1337a0000000000000000000000000000000000000000000000000000000000000a390000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000003d0900000000000000000000000000000000000000000000000000000000000003345000000000000000000000000000000000000000000000000000000000000052080000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000003b9aca00000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c4b61d27f60000000000000000000000001842a4eff3efd24c50b63c3cf89cecee245fc2bd0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000243659cfe6000000000000000000000000cbb3ba88bfd944860463585a557022fcee3cc2800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000082e79114dee21107449ad3df04a5919c52256ff72c2e679a45eb5ac48b56246de2429ec8af5314e30b697fe400068dd63fad407fc4b8f0bc9ba7c361dc855ab4671b4fde3d178aaae046db1df0e33d83fb9f43f80512027df5ea93b3ad3b5a22575c3229f31fad4062d1e167aabd3cf9294d0d1deebad2b4da710873cc5f2e7a373a1c000000000000000000000000000000000000000000000000000000000000", - "nonce": "0x4bf6", + "input": "0x1fad948c0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000660ad4b5a74130a4796b4d54bc6750ae93c86e6c000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000002e2b1c42e38f5af81771e65d87729e57abd1337a0000000000000000000000000000000000000000000000000000000000000f0d0000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000003d0900000000000000000000000000000000000000000000000000000000000003345000000000000000000000000000000000000000000000000000000000000052080000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000003b9aca00000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c4b61d27f60000000000000000000000001842a4eff3efd24c50b63c3cf89cecee245fc2bd0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000243659cfe60000000000000000000000002a10b80be8ee546c52fde9b58d65d089c6b929bb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000082deec9637c6376665629d32cc2846bb4be7d7cb3c95e921c528dfaf1902a34f9a2a784977129185a88ded587efbc6f1519733a07f339701d3b1d4b2a83666bbac1baad657e37f5bcb9171dc9d7ca63a0cfee68bdabbc6c30cfc470ddb9132756c1c7daf51024db6e207ce890c625e238684745f45ec93c8507018f4ac7c06845db71b000000000000000000000000000000000000000000000000000000000000", + "nonce": "0x4b85d", "chainId": "0x1ecf" }, "additionalContracts": [], @@ -46,54 +46,54 @@ "receipts": [ { "status": "0x1", - "cumulativeGasUsed": "0xc03b66", + "cumulativeGasUsed": "0x361820", "logs": [ { - "address": "0xcbb3ba88bfd944860463585a557022fcee3cc280", + "address": "0x2a10b80be8ee546c52fde9b58d65d089c6b929bb", "topics": [ "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000004e59b44847b379578588920ca78fbf26c0b4956c" ], "data": "0x", - "blockHash": "0xcad05470e7c8ebd6d1342609affb87afe08e533b74b20c6977b30d5226f250b2", - "blockNumber": "0x387eb", - "transactionHash": "0xdee3915b9e84b4693151b28d7e0263e42d7dd535c21c508e96ebf4e1c162814e", + "blockHash": "0x3263f72586ac217437940d79206631eb9458d94c6774967b0610d033a6eae1f2", + "blockNumber": "0x8e300", + "transactionHash": "0x5c5abeae5779f6907140f8bc55638da7cca8ecf84a76a783e4b74f4382672289", "transactionIndex": "0x1", "logIndex": "0x0", "removed": false }, { - "address": "0xcbb3ba88bfd944860463585a557022fcee3cc280", + "address": "0x2a10b80be8ee546c52fde9b58d65d089c6b929bb", "topics": [ "0x7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498" ], "data": "0x00000000000000000000000000000000000000000000000000000000000000ff", - "blockHash": "0xcad05470e7c8ebd6d1342609affb87afe08e533b74b20c6977b30d5226f250b2", - "blockNumber": "0x387eb", - "transactionHash": "0xdee3915b9e84b4693151b28d7e0263e42d7dd535c21c508e96ebf4e1c162814e", + "blockHash": "0x3263f72586ac217437940d79206631eb9458d94c6774967b0610d033a6eae1f2", + "blockNumber": "0x8e300", + "transactionHash": "0x5c5abeae5779f6907140f8bc55638da7cca8ecf84a76a783e4b74f4382672289", "transactionIndex": "0x1", "logIndex": "0x1", "removed": false } ], - "logsBloom": "0x00000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000020000000000000000000800000000000000000000000000000000400000000000000000000000000000000000000000001080000000000000000000000000000001000000000000000400000000000000000000000000000000000000000000000000000008000000040010000000000001000000000000000020000000000000000000000000000000000080000000000000000000000000000000", + "logsBloom": "0x00000040000000000000000000000000000000000000000000800000000400000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000020000000000000000000800000000000000000000000000000000400000000000000000000000000000000000000000001080000000000000000000000000000001000000000000000400000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000020000000000000000000000000000000000080000000000000000000000000000000", "type": "0x2", - "transactionHash": "0xdee3915b9e84b4693151b28d7e0263e42d7dd535c21c508e96ebf4e1c162814e", + "transactionHash": "0x5c5abeae5779f6907140f8bc55638da7cca8ecf84a76a783e4b74f4382672289", "transactionIndex": "0x1", - "blockHash": "0xcad05470e7c8ebd6d1342609affb87afe08e533b74b20c6977b30d5226f250b2", - "blockNumber": "0x387eb", - "gasUsed": "0xc03b66", + "blockHash": "0x3263f72586ac217437940d79206631eb9458d94c6774967b0610d033a6eae1f2", + "blockNumber": "0x8e300", + "gasUsed": "0x361820", "effectiveGasPrice": "0x5f5e100", "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", "to": "0x4e59b44847b379578588920ca78fbf26c0b4956c", "contractAddress": null, - "gasUsedForL1": "0x9a131c", - "l1BlockNumber": "0x13f984d" + "gasUsedForL1": "0xf56e1", + "l1BlockNumber": "0x14583b6" }, { "status": "0x1", - "cumulativeGasUsed": "0x107029", + "cumulativeGasUsed": "0x40e88", "logs": [ { "address": "0x2843c269d2a64ecfa63548e8b3fc0fd23b7f70cb", @@ -101,9 +101,9 @@ "0xbb47ee3e183a558b1a2ff0874b079f3fc5478b7454eacf2bfc5af2ff5878f972" ], "data": "0x", - "blockHash": "0x655e5002ca92cd5ac13d8beff3e76bd586eb3db732d8296e184913d75b63b157", - "blockNumber": "0x387ec", - "transactionHash": "0x48bf54ac6eddb8f55a5022a708f4fb84257506e82c543733fa6ad5da57cc6c02", + "blockHash": "0x69596ef4986dfbd74822c19a6d00391679a30fcfc247f65e1d4a48e620d19275", + "blockNumber": "0x8e301", + "transactionHash": "0x1a916af8dd468332c79abaf6546f4e990c99908a26ac4d0775c63b8eaf295603", "transactionIndex": "0x1", "logIndex": "0x0", "removed": false @@ -112,12 +112,12 @@ "address": "0x1842a4eff3efd24c50b63c3cf89cecee245fc2bd", "topics": [ "0xbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b", - "0x000000000000000000000000cbb3ba88bfd944860463585a557022fcee3cc280" + "0x0000000000000000000000002a10b80be8ee546c52fde9b58d65d089c6b929bb" ], "data": "0x", - "blockHash": "0x655e5002ca92cd5ac13d8beff3e76bd586eb3db732d8296e184913d75b63b157", - "blockNumber": "0x387ec", - "transactionHash": "0x48bf54ac6eddb8f55a5022a708f4fb84257506e82c543733fa6ad5da57cc6c02", + "blockHash": "0x69596ef4986dfbd74822c19a6d00391679a30fcfc247f65e1d4a48e620d19275", + "blockNumber": "0x8e301", + "transactionHash": "0x1a916af8dd468332c79abaf6546f4e990c99908a26ac4d0775c63b8eaf295603", "transactionIndex": "0x1", "logIndex": "0x1", "removed": false @@ -126,38 +126,38 @@ "address": "0x2843c269d2a64ecfa63548e8b3fc0fd23b7f70cb", "topics": [ "0x49628fd1471006c1482da88028e9ce4dbb080b815c9b0344d39e5a8e6ec1419f", - "0xb81e57bd626c0c829c4e06fec9d09d6f27e29b22d528b57f367816bd58bb677f", + "0xfdc9da8f9529cd4dd537b3d9118e577a6fd50779cabf63568f8556df6443dafe", "0x0000000000000000000000002e2b1c42e38f5af81771e65d87729e57abd1337a", "0x0000000000000000000000000000000000000000000000000000000000000000" ], - "data": "0x0000000000000000000000000000000000000000000000000000000000000a39000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000853480000000000000000000000000000000000000000000000000000000000085348", - "blockHash": "0x655e5002ca92cd5ac13d8beff3e76bd586eb3db732d8296e184913d75b63b157", - "blockNumber": "0x387ec", - "transactionHash": "0x48bf54ac6eddb8f55a5022a708f4fb84257506e82c543733fa6ad5da57cc6c02", + "data": "0x0000000000000000000000000000000000000000000000000000000000000f0d0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000008534a000000000000000000000000000000000000000000000000000000000008534a", + "blockHash": "0x69596ef4986dfbd74822c19a6d00391679a30fcfc247f65e1d4a48e620d19275", + "blockNumber": "0x8e301", + "transactionHash": "0x1a916af8dd468332c79abaf6546f4e990c99908a26ac4d0775c63b8eaf295603", "transactionIndex": "0x1", "logIndex": "0x2", "removed": false } ], - "logsBloom": "0x00000000000000000000000000000000400000000000000000000000000000000008000000000000000010010000000000000000000000000000020000000000000000000020000000000000000002000000000000000000000000000000000800000000020000000000000000002800002000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000400000020000000400000000000000000000000000000300002000000000000000020000000100001000000000000000000000000000000000000000020000000002000010000000000000000000000004000000000000000000000800000", + "logsBloom": "0x0000000000000000000000000000000040000000000000000000000010000000000800000000000000000001000000000000000400000100000002000000000000000000000000000000000000000200000000000000000000000000000000080000000002000000000000000200280000200000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000040000000000000040000000000000000000000000000020000200000000000000002000000010000100000080000000000000000000000000000000002000000000000001000000000000000000000000c000000000000000000000000000", "type": "0x2", - "transactionHash": "0x48bf54ac6eddb8f55a5022a708f4fb84257506e82c543733fa6ad5da57cc6c02", + "transactionHash": "0x1a916af8dd468332c79abaf6546f4e990c99908a26ac4d0775c63b8eaf295603", "transactionIndex": "0x1", - "blockHash": "0x655e5002ca92cd5ac13d8beff3e76bd586eb3db732d8296e184913d75b63b157", - "blockNumber": "0x387ec", - "gasUsed": "0x107029", + "blockHash": "0x69596ef4986dfbd74822c19a6d00391679a30fcfc247f65e1d4a48e620d19275", + "blockNumber": "0x8e301", + "gasUsed": "0x40e88", "effectiveGasPrice": "0x5f5e100", "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", "to": "0x2843c269d2a64ecfa63548e8b3fc0fd23b7f70cb", "contractAddress": null, - "gasUsedForL1": "0xdc123", - "l1BlockNumber": "0x13f984d" + "gasUsedForL1": "0x15f76", + "l1BlockNumber": "0x14583b6" } ], "libraries": [], "pending": [], "returns": {}, - "timestamp": 1728681084, + "timestamp": 1733360951, "chain": 7887, - "commit": "48b3496" + "commit": "c220c7b" } \ No newline at end of file diff --git a/script/migrations/134-upgrade-paymaster.s.sol b/script/migrations/134-upgrade-paymaster.s.sol index 79ffaeda..026476eb 100644 --- a/script/migrations/134-upgrade-paymaster.s.sol +++ b/script/migrations/134-upgrade-paymaster.s.sol @@ -14,8 +14,8 @@ contract Script is MigrationHelper { type(SponsorPaymaster).creationCode, abi.encode(_getChainDeployment("EntryPoint"), _getChainDeployment("KintoWalletFactory")) ); - address impl = _deployImplementationAndUpgrade("SponsorPaymaster", "V14", bytecode); - saveContractAddress("SponsorPaymasterV14-impl", impl); + address impl = _deployImplementationAndUpgrade("SponsorPaymaster", "V15", bytecode); + saveContractAddress("SponsorPaymasterV15-impl", impl); ISponsorPaymaster paymaster = ISponsorPaymaster(_getChainDeployment("SponsorPaymaster")); diff --git a/src/paymasters/SponsorPaymaster.sol b/src/paymasters/SponsorPaymaster.sol index 4c9fee5b..7e70def3 100644 --- a/src/paymasters/SponsorPaymaster.sol +++ b/src/paymasters/SponsorPaymaster.sol @@ -461,6 +461,6 @@ contract SponsorPaymaster is Initializable, BasePaymaster, UUPSUpgradeable, Reen } } -contract SponsorPaymasterV14 is SponsorPaymaster { +contract SponsorPaymasterV15 is SponsorPaymaster { constructor(IEntryPoint entryPoint, IKintoWalletFactory factory) SponsorPaymaster(entryPoint, factory) {} } diff --git a/test/artifacts/7887/addresses.json b/test/artifacts/7887/addresses.json index cc3e5c56..ab3408d5 100644 --- a/test/artifacts/7887/addresses.json +++ b/test/artifacts/7887/addresses.json @@ -242,5 +242,6 @@ "cbBTC": "0xCBb7c0F98bb7312b821e78AB76312Cd3950fBFca", "AAVE-impl": "0x87a0D1c12f83ce5aB21C88f7459891586C32B875", "AAVE": "0xaa0e00F095Eb986CB65FD3FA328782c7Fe4ceFD9", - "KintoAppRegistryV22": "0xb9cE6BC89b79c713f34fd15D82a70900fEFD0de1" -} + "KintoAppRegistryV22": "0xb9cE6BC89b79c713f34fd15D82a70900fEFD0de1", + "SponsorPaymasterV15-impl": "0x2A10b80bE8Ee546C52Fde9b58d65D089C6B929BB" +} \ No newline at end of file