From a655118ed86e0a703b414552d0218b08343acdc4 Mon Sep 17 00:00:00 2001 From: Ramon Recuero Date: Sat, 14 Dec 2024 10:06:14 -0800 Subject: [PATCH] Removes 1K reward (#328) * Removes 1K reward * Update KintoWalletFactoryTest to check zero balance and claimed rewards after account creation * Remove newUserClaim function and related tests, add NEW_USER_REWARD_END_TIMESTAMP for reward period control. * Update fund-faucets limits and amounts, adjust reward end timestamp, add placeholder function in RewardsDistributor, and temporary call in KintoWalletFactory. * Upgrade RewardsDistributor to V8, update contract addresses, and modify migration script for new implementation deployment. --------- Co-authored-by: Igor Yalovoy --- .../7887/run-1734134256.json | 149 ++++++++++++++++++ .../7887/run-latest.json | 84 +++++----- .../7887/run-1734040112.json | 50 ++++++ .../fund-faucets.s.sol/7887/run-latest.json | 50 ++++++ script/actions/fund-faucets.s.sol | 4 +- script/migrations/112-upgrade_distr.s.sol | 4 +- src/liquidity-mining/RewardsDistributor.sol | 22 +-- src/wallet/KintoWalletFactory.sol | 2 +- test/artifacts/7887/addresses.json | 3 +- test/unit/KintoWalletFactory.t.sol | 6 +- .../liquidity-mining/RewardsDistributor.t.sol | 14 -- 11 files changed, 308 insertions(+), 80 deletions(-) create mode 100644 broadcast/112-upgrade_distr.s.sol/7887/run-1734134256.json create mode 100644 broadcast/fund-faucets.s.sol/7887/run-1734040112.json create mode 100644 broadcast/fund-faucets.s.sol/7887/run-latest.json diff --git a/broadcast/112-upgrade_distr.s.sol/7887/run-1734134256.json b/broadcast/112-upgrade_distr.s.sol/7887/run-1734134256.json new file mode 100644 index 00000000..b407b337 --- /dev/null +++ b/broadcast/112-upgrade_distr.s.sol/7887/run-1734134256.json @@ -0,0 +1,149 @@ +{ + "transactions": [ + { + "hash": "0x853cd50134da0bb4f4a0708327ff6b9e481dbd0f95a851591838750fb063ca59", + "transactionType": "CREATE2", + "contractName": "RewardsDistributor", + "contractAddress": "0xf3d955b4cf3489a37027f0f3484e87328dbdbb39", + "function": null, + "arguments": [ + "0x010700808D59d2bb92257fCafACfe8e5bFF7aB87", + "1718690400", + "0x8a4720488CA32f1223ccFE5A087e250fE3BC5D75" + ], + "transaction": { + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": "0x4e59b44847b379578588920ca78fbf26c0b4956c", + "value": "0x0", + "input": "0x0000000000000000000000000000000000000000000000000000000000000000610100604052306080523480156200001657600080fd5b5060405162001d7538038062001d7583398101604081905262000039916200012b565b6200004362000061565b6001600160a01b0392831660c05260a0919091521660e05262000173565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a00805468010000000000000000900460ff1615620000b25760405163f92ee8a960e01b815260040160405180910390fd5b80546001600160401b0390811614620001125780546001600160401b0319166001600160401b0390811782556040519081527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50565b6001600160a01b03811681146200011257600080fd5b6000806000606084860312156200014157600080fd5b83516200014e8162000115565b602085015160408601519194509250620001688162000115565b809150509250925092565b60805160a05160c05160e051611b9e620001d760003960008181610581015261072301526000818161029e0152610e6501526000818161044301528181610b660152610b9b0152600081816110c2015281816110eb01526112310152611b9e6000f3fe6080604052600436106102045760003560e01c806391d1485411610118578063ca21b177116100a0578063d54ad2a11161006f578063d54ad2a114610638578063d75047421461064e578063d8f9f12d1461066a578063d9c2702c1461067f578063ebf0c7171461069f57600080fd5b8063ca21b177146105b8578063cc11298e146105d8578063cefff0fa146105f8578063d547741f1461061857600080fd5b8063be986420116100e7578063be9864201461050d578063c0d8012c14610522578063c2ebe9e614610542578063c5c036991461056f578063c8c67385146105a357600080fd5b806391d1485414610484578063a217fddf146104a4578063abadaf9a146104b9578063ad3cb1cc146104cf57600080fd5b806347e633801161019b57806352d1902d1161016a57806352d1902d146103e45780635b36c66b146103f9578063682336b71461041957806378e97925146104315780637e1c0c091461046557600080fd5b806347e63380146103585780634dcaf8b11461038c5780634e102072146103b95780634f1ef286146103d157600080fd5b806321ff9970116101d757806321ff9970146102d8578063248a9ca3146102f85780632f2ff15d1461031857806336568abe1461033857600080fd5b806301ffc9a7146102095780630ef096431461023e57806318c411071461025e578063212ca34f1461028c575b600080fd5b34801561021557600080fd5b506102296102243660046116f7565b6106b5565b60405190151581526020015b60405180910390f35b34801561024a57600080fd5b5061025c61025936600461173d565b50565b005b34801561026a57600080fd5b5061027e61027936600461173d565b6106ec565b604051908152602001610235565b34801561029857600080fd5b506102c07f000000000000000000000000000000000000000000000000000000000000000081565b6040516001600160a01b039091168152602001610235565b3480156102e457600080fd5b5061025c6102f3366004611758565b6107e3565b34801561030457600080fd5b5061027e610313366004611758565b610843565b34801561032457600080fd5b5061025c610333366004611771565b610865565b34801561034457600080fd5b5061025c610353366004611771565b610887565b34801561036457600080fd5b5061027e7f56730d7d989818781b81ff2da8c4c452dd13af73dfb8c4f4723e21d17335fd2481565b34801561039857600080fd5b5061027e6103a736600461173d565b60086020526000908152604090205481565b3480156103c557600080fd5b5061027e63675cc72b81565b61025c6103df3660046117e4565b6108bf565b3480156103f057600080fd5b5061027e6108de565b34801561040557600080fd5b5061025c61041436600461188a565b6108fb565b34801561042557600080fd5b5061027e63671a6e3a81565b34801561043d57600080fd5b5061027e7f000000000000000000000000000000000000000000000000000000000000000081565b34801561047157600080fd5b5061027e6a034f086f3b33b68400000081565b34801561049057600080fd5b5061022961049f366004611771565b610b2a565b3480156104b057600080fd5b5061027e600081565b3480156104c557600080fd5b5061027e60035481565b3480156104db57600080fd5b50610500604051806040016040528060058152602001640352e302e360dc1b81525081565b60405161023591906118d0565b34801561051957600080fd5b5061027e602881565b34801561052e57600080fd5b5061027e61053d366004611758565b610b62565b34801561054e57600080fd5b5061027e61055d366004611758565b60066020526000908152604090205481565b34801561057b57600080fd5b506102c07f000000000000000000000000000000000000000000000000000000000000000081565b3480156105af57600080fd5b5061027e610c7a565b3480156105c457600080fd5b5061025c6105d3366004611903565b610c96565b3480156105e457600080fd5b5061027e6105f336600461188a565b610eed565b34801561060457600080fd5b5061025c610613366004611758565b610f12565b34801561062457600080fd5b5061025c610633366004611771565b610f51565b34801561064457600080fd5b5061027e60015481565b34801561065a57600080fd5b5061027e670de0b6b3a764000081565b34801561067657600080fd5b5061027e610f6d565b34801561068b57600080fd5b5061027e61069a366004611758565b610f74565b3480156106ab57600080fd5b5061027e60005481565b60006001600160e01b03198216637965db0b60e01b14806106e657506301ffc9a760e01b6001600160e01b03198316145b92915050565b6001600160a01b0381811660008181526002602052604080822054905163751b97e760e11b815260048101939093529092909183917f0000000000000000000000000000000000000000000000000000000000000000169063ea372fce90602401602060405180830381865afa15801561076a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061078e91906119c4565b905063671a6e3a81101580156107a7575063675cc72b81105b156107dc57670de0b6b3a76400008210156107c257816107d4565b6107d4670de0b6b3a7640000836119f3565b949350505050565b5092915050565b7f56730d7d989818781b81ff2da8c4c452dd13af73dfb8c4f4723e21d17335fd2461080d81610f8c565b600054827f26df13263ccd588bd14d17b939ae977c1d51960da437d7eb886d1cfb6f3d068260405160405180910390a350600055565b6000908152600080516020611b49833981519152602052604090206001015490565b61086e82610843565b61087781610f8c565b6108818383610f96565b50505050565b6001600160a01b03811633146108b05760405163334bd91960e11b815260040160405180910390fd5b6108ba828261103b565b505050565b6108c76110b7565b6108d08261115e565b6108da8282611169565b5050565b60006108e8611226565b50600080516020611b2983398151915290565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff16159067ffffffffffffffff166000811580156109415750825b905060008267ffffffffffffffff16600114801561095e5750303b155b90508115801561096c575080155b1561098a5760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff1916600117855583156109b457845460ff60401b1916600160401b1785555b6109bc61126f565b6109c461126f565b6109cf600033610f96565b506109fa7f56730d7d989818781b81ff2da8c4c452dd13af73dfb8c4f4723e21d17335fd2433610f96565b506000878155600387905560015b60288111610ad957670de0b6b3a764000060005b82811015610a45576069610a31836064611a06565b610a3b9190611a33565b9150600101610a1c565b506000670de0b6b3a7640000610a66836a034f086f3b33b684000000611a06565b610a709190611a33565b9050600084610a8a836a034f086f3b33b6840000006119f3565b610a9491906119f3565b90508060066000610aa66001886119f3565b8152602081019190915260400160002055610ac18186611a47565b94505050508080610ad190611a5a565b915050610a08565b50508315610b2157845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50505050505050565b6000918252600080516020611b49833981519152602090815260408084206001600160a01b0393909316845291905290205460ff1690565b60007f0000000000000000000000000000000000000000000000000000000000000000821015610b9457506000919050565b6000610bc07f0000000000000000000000000000000000000000000000000000000000000000846119f3565b90506000610bd16276a70083611a33565b905060006028821015610c5c5760005b82811015610c0c57600081815260066020526040902054610c029083611a47565b9150600101610be1565b506000610c1c6276a70085611a73565b6000848152600660205260408120549192506276a700610c3c8484611a06565b610c469190611a33565b9050610c528185611a47565b93505050506107d4565b610c716a034f086f3b33b68400000082611a47565b95945050505050565b6000600154610c87610f6d565b610c9191906119f3565b905090565b610c9e611277565b600080546001600160a01b0384168252600860205260409091205403610ce75760405163f83369ff60e01b81526001600160a01b03831660048201526024015b60405180910390fd5b610cf0826106ec565b8111610d1a57604051632058b6db60e01b81526001600160a01b0383166004820152602401610cde565b604080516001600160a01b038416602082015290810182905260009060600160408051601f1981840301815282825280516020918201209083015201604051602081830303815290604052805190602001209050610d7b84600054836112c1565b1515600003610da157838160405163571e214960e11b8152600401610cde929190611a87565b6000610dac846106ec565b610db690846119f3565b9050610dc0610c7a565b811115610dff5780600154610dd59190611a47565b610ddd610f6d565b604051630a0bf79560e01b815260048101929092526024820152604401610cde565b8060016000828254610e119190611a47565b90915550506001600160a01b03841660009081526002602052604081208054839290610e3e908490611a47565b9091555050600080546001600160a01b0380871683526008602052604090922055610e8c907f00000000000000000000000000000000000000000000000000000000000000001685836112d7565b60405181906001600160a01b038616907f5329b89678b0f095cae2abe10b88ad57329871ee9296ae8f358a46b9fa0ff32890600090a350506108ba60017f9b779b17422d0df92223018b32b4d1fa46e071723d6817e2486d003becc55f0055565b6000610ef883610b62565b610f0183610b62565b610f0b91906119f3565b9392505050565b6000610f1d81610f8c565b60035460405183907fd12719f869a4621325e2d0f36e2a6fefcd87e2defb17983e2f2dcbe8b675962290600090a350600355565b610f5a82610843565b610f6381610f8c565b610881838361103b565b6000610c91425b6000600354610f8283610b62565b6106e69190611a47565b6102598133611329565b6000600080516020611b49833981519152610fb18484610b2a565b611031576000848152602082815260408083206001600160a01b03871684529091529020805460ff19166001179055610fe73390565b6001600160a01b0316836001600160a01b0316857f2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d60405160405180910390a460019150506106e6565b60009150506106e6565b6000600080516020611b498339815191526110568484610b2a565b15611031576000848152602082815260408083206001600160a01b0387168085529252808320805460ff1916905551339287917ff6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b9190a460019150506106e6565b306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016148061113e57507f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316611132600080516020611b29833981519152546001600160a01b031690565b6001600160a01b031614155b1561115c5760405163703e46dd60e11b815260040160405180910390fd5b565b60006108da81610f8c565b816001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa9250505080156111c3575060408051601f3d908101601f191682019092526111c0918101906119c4565b60015b6111eb57604051634c9c8ce360e01b81526001600160a01b0383166004820152602401610cde565b600080516020611b29833981519152811461121c57604051632a87526960e21b815260048101829052602401610cde565b6108ba8383611362565b306001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000161461115c5760405163703e46dd60e11b815260040160405180910390fd5b61115c6113b8565b7f9b779b17422d0df92223018b32b4d1fa46e071723d6817e2486d003becc55f008054600119016112bb57604051633ee5aeb560e01b815260040160405180910390fd5b60029055565b6000826112ce8584611401565b14949350505050565b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b031663a9059cbb60e01b1790526108ba908490611444565b6113338282610b2a565b6108da5760405163e2517d3f60e01b81526001600160a01b038216600482015260248101839052604401610cde565b61136b826114a7565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a28051156113b0576108ba828261150c565b6108da611579565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff1661115c57604051631afcd79f60e31b815260040160405180910390fd5b600081815b845181101561143c576114328286838151811061142557611425611ad4565b6020026020010151611598565b9150600101611406565b509392505050565b60006114596001600160a01b038416836115c7565b9050805160001415801561147e57508080602001905181019061147c9190611aea565b155b156108ba57604051635274afe760e01b81526001600160a01b0384166004820152602401610cde565b806001600160a01b03163b6000036114dd57604051634c9c8ce360e01b81526001600160a01b0382166004820152602401610cde565b600080516020611b2983398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080846001600160a01b0316846040516115299190611b0c565b600060405180830381855af49150503d8060008114611564576040519150601f19603f3d011682016040523d82523d6000602084013e611569565b606091505b5091509150610c718583836115d5565b341561115c5760405163b398979f60e01b815260040160405180910390fd5b60008183106115b4576000828152602084905260409020610f0b565b6000838152602083905260409020610f0b565b6060610f0b83836000611631565b6060826115ea576115e5826116ce565b610f0b565b815115801561160157506001600160a01b0384163b155b1561162a57604051639996b31560e01b81526001600160a01b0385166004820152602401610cde565b5080610f0b565b6060814710156116565760405163cd78605960e01b8152306004820152602401610cde565b600080856001600160a01b031684866040516116729190611b0c565b60006040518083038185875af1925050503d80600081146116af576040519150601f19603f3d011682016040523d82523d6000602084013e6116b4565b606091505b50915091506116c48683836115d5565b9695505050505050565b8051156116de5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b60006020828403121561170957600080fd5b81356001600160e01b031981168114610f0b57600080fd5b80356001600160a01b038116811461173857600080fd5b919050565b60006020828403121561174f57600080fd5b610f0b82611721565b60006020828403121561176a57600080fd5b5035919050565b6000806040838503121561178457600080fd5b8235915061179460208401611721565b90509250929050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff811182821017156117dc576117dc61179d565b604052919050565b600080604083850312156117f757600080fd5b61180083611721565b915060208084013567ffffffffffffffff8082111561181e57600080fd5b818601915086601f83011261183257600080fd5b8135818111156118445761184461179d565b611856601f8201601f191685016117b3565b9150808252878482850101111561186c57600080fd5b80848401858401376000848284010152508093505050509250929050565b6000806040838503121561189d57600080fd5b50508035926020909101359150565b60005b838110156118c75781810151838201526020016118af565b50506000910152565b60208152600082518060208401526118ef8160408501602087016118ac565b601f01601f19169190910160400192915050565b60008060006060848603121561191857600080fd5b833567ffffffffffffffff8082111561193057600080fd5b818601915086601f83011261194457600080fd5b81356020828211156119585761195861179d565b8160051b92506119698184016117b3565b828152928401810192818101908a85111561198357600080fd5b948201945b848610156119a157853582529482019490820190611988565b97506119b09050888201611721565b955050505050604084013590509250925092565b6000602082840312156119d657600080fd5b5051919050565b634e487b7160e01b600052601160045260246000fd5b818103818111156106e6576106e66119dd565b80820281158282048414176106e6576106e66119dd565b634e487b7160e01b600052601260045260246000fd5b600082611a4257611a42611a1d565b500490565b808201808211156106e6576106e66119dd565b600060018201611a6c57611a6c6119dd565b5060010190565b600082611a8257611a82611a1d565b500690565b604080825283519082018190526000906020906060840190828701845b82811015611ac057815184529284019290840190600101611aa4565b505050602093909301939093525092915050565b634e487b7160e01b600052603260045260246000fd5b600060208284031215611afc57600080fd5b81518015158114610f0b57600080fd5b60008251611b1e8184602087016118ac565b919091019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc02dd7bc7dec4dceedda775e58dd541e08a116c6c53815c0bd028192f7b626800a26469706673582212206780acf0f779c8b062d8139f94772381775d3fa645b9cc424e452e7a70231b7d64736f6c63430008180033000000000000000000000000010700808d59d2bb92257fcafacfe8e5bff7ab8700000000000000000000000000000000000000000000000000000000667122600000000000000000000000008a4720488ca32f1223ccfe5a087e250fe3bc5d75", + "nonce": "0x4b8ef", + "chainId": "0x1ecf" + }, + "additionalContracts": [], + "isFixedGasLimit": false + }, + { + "hash": "0xc25ca9b0d2a50eba7cec62481c5c83f9222786f3c29479977ff1182a2871c768", + "transactionType": "CALL", + "contractName": null, + "contractAddress": "0x2843c269d2a64ecfa63548e8b3fc0fd23b7f70cb", + "function": "handleOps((address,uint256,bytes,bytes,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],address)", + "arguments": [ + "[(0x2e2B1c42E38f5af81771e65D87729E57ABD1337a, 3873, 0x, 0xb61d27f6000000000000000000000000d157904639e89df05e89e0dabeec99ae3d74f9aa0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000644f1ef286000000000000000000000000f3d955b4cf3489a37027f0f3484e87328dbdbb390000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000, 4000000, 210000, 21000, 1, 1000000000, 0x0000000000000000000000000000000000000000, 0x29bd65c68ccf8d9f39993052c5a10a5b6c92f6ca342bf5127088c907110c593d0ae9d9481fd073d83b14236ffd20b4ed0fe3ef19ae19e33f1adeae80f014eb8b1ba39787a2cdc5dcea8f52f90975dcdefda91e79f3e3da856487e1d52447b2fda247537c9ab1797057b61774e28f50b1559f2d8e7af6fe74a8cbc1bfe3182eefff1c)]", + "0x660ad4B5A74130a4796B4d54BC6750Ae93C86e6c" + ], + "transaction": { + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": "0x2843c269d2a64ecfa63548e8b3fc0fd23b7f70cb", + "value": "0x0", + "input": "0x1fad948c0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000660ad4b5a74130a4796b4d54bc6750ae93c86e6c000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000002e2b1c42e38f5af81771e65d87729e57abd1337a0000000000000000000000000000000000000000000000000000000000000f210000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000003d0900000000000000000000000000000000000000000000000000000000000003345000000000000000000000000000000000000000000000000000000000000052080000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000003b9aca0000000000000000000000000000000000000000000000000000000000000002c0000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000104b61d27f6000000000000000000000000d157904639e89df05e89e0dabeec99ae3d74f9aa0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000644f1ef286000000000000000000000000f3d955b4cf3489a37027f0f3484e87328dbdbb3900000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008229bd65c68ccf8d9f39993052c5a10a5b6c92f6ca342bf5127088c907110c593d0ae9d9481fd073d83b14236ffd20b4ed0fe3ef19ae19e33f1adeae80f014eb8b1ba39787a2cdc5dcea8f52f90975dcdefda91e79f3e3da856487e1d52447b2fda247537c9ab1797057b61774e28f50b1559f2d8e7af6fe74a8cbc1bfe3182eefff1c000000000000000000000000000000000000000000000000000000000000", + "nonce": "0x4b8f0", + "chainId": "0x1ecf" + }, + "additionalContracts": [], + "isFixedGasLimit": false + } + ], + "receipts": [ + { + "status": "0x1", + "cumulativeGasUsed": "0x24e901", + "logs": [ + { + "address": "0xf3d955b4cf3489a37027f0f3484e87328dbdbb39", + "topics": [ + "0xc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d2" + ], + "data": "0x000000000000000000000000000000000000000000000000ffffffffffffffff", + "blockHash": "0x6f5b65287cf34d20aa4b9f2162bdf8c8376866201adb1985942dd592cb062982", + "blockNumber": "0xa06f8", + "transactionHash": "0x853cd50134da0bb4f4a0708327ff6b9e481dbd0f95a851591838750fb063ca59", + "transactionIndex": "0x1", + "logIndex": "0x0", + "removed": false + } + ], + "logsBloom": "0x00000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000004000000000200000000000000000000000000000000000000000000000000000000000000000000000000", + "type": "0x2", + "transactionHash": "0x853cd50134da0bb4f4a0708327ff6b9e481dbd0f95a851591838750fb063ca59", + "transactionIndex": "0x1", + "blockHash": "0x6f5b65287cf34d20aa4b9f2162bdf8c8376866201adb1985942dd592cb062982", + "blockNumber": "0xa06f8", + "gasUsed": "0x24e901", + "effectiveGasPrice": "0x5f5e100", + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": "0x4e59b44847b379578588920ca78fbf26c0b4956c", + "contractAddress": null, + "gasUsedForL1": "0xc5444", + "l1BlockNumber": "0x1467e19" + }, + { + "status": "0x1", + "cumulativeGasUsed": "0x42ad5", + "logs": [ + { + "address": "0x2843c269d2a64ecfa63548e8b3fc0fd23b7f70cb", + "topics": [ + "0xbb47ee3e183a558b1a2ff0874b079f3fc5478b7454eacf2bfc5af2ff5878f972" + ], + "data": "0x", + "blockHash": "0x80cfa8ea84e4637fe148dfb1488b48b21864c6e2d14631cbe2c47526ff3bd27a", + "blockNumber": "0xa06f9", + "transactionHash": "0xc25ca9b0d2a50eba7cec62481c5c83f9222786f3c29479977ff1182a2871c768", + "transactionIndex": "0x1", + "logIndex": "0x0", + "removed": false + }, + { + "address": "0xd157904639e89df05e89e0dabeec99ae3d74f9aa", + "topics": [ + "0xbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b", + "0x000000000000000000000000f3d955b4cf3489a37027f0f3484e87328dbdbb39" + ], + "data": "0x", + "blockHash": "0x80cfa8ea84e4637fe148dfb1488b48b21864c6e2d14631cbe2c47526ff3bd27a", + "blockNumber": "0xa06f9", + "transactionHash": "0xc25ca9b0d2a50eba7cec62481c5c83f9222786f3c29479977ff1182a2871c768", + "transactionIndex": "0x1", + "logIndex": "0x1", + "removed": false + }, + { + "address": "0x2843c269d2a64ecfa63548e8b3fc0fd23b7f70cb", + "topics": [ + "0x49628fd1471006c1482da88028e9ce4dbb080b815c9b0344d39e5a8e6ec1419f", + "0x2b92d10c22f0d33c47fbf7f8dd76456c762e264f492b42e7c2a1b454b2dd6286", + "0x0000000000000000000000002e2b1c42e38f5af81771e65d87729e57abd1337a", + "0x0000000000000000000000000000000000000000000000000000000000000000" + ], + "data": "0x0000000000000000000000000000000000000000000000000000000000000f2100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000084eed0000000000000000000000000000000000000000000000000000000000084eed", + "blockHash": "0x80cfa8ea84e4637fe148dfb1488b48b21864c6e2d14631cbe2c47526ff3bd27a", + "blockNumber": "0xa06f9", + "transactionHash": "0xc25ca9b0d2a50eba7cec62481c5c83f9222786f3c29479977ff1182a2871c768", + "transactionIndex": "0x1", + "logIndex": "0x2", + "removed": false + } + ], + "logsBloom": "0x00000000000000000000000000000000400800000000000000000000000000000008000000000000000000010000000000000000000000000000020000000000000000000000000000000000000002000000000000001000000000000000000802000000020000000000000000000800002000000000000000000010000004000000000000000000000000000000800000000000000000000000000000000000000400000000000000400000000000000000000000000000000002000100000000000020000000100041000000000000000000000000000000000000001020200000000000010000000000000000000000000000000000000000000000000000", + "type": "0x2", + "transactionHash": "0xc25ca9b0d2a50eba7cec62481c5c83f9222786f3c29479977ff1182a2871c768", + "transactionIndex": "0x1", + "blockHash": "0x80cfa8ea84e4637fe148dfb1488b48b21864c6e2d14631cbe2c47526ff3bd27a", + "blockNumber": "0xa06f9", + "gasUsed": "0x42ad5", + "effectiveGasPrice": "0x5f5e100", + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": "0x2843c269d2a64ecfa63548e8b3fc0fd23b7f70cb", + "contractAddress": null, + "gasUsedForL1": "0x17f89", + "l1BlockNumber": "0x1467e19" + } + ], + "libraries": [], + "pending": [], + "returns": {}, + "timestamp": 1734134256, + "chain": 7887, + "commit": "6890bd4" +} \ No newline at end of file diff --git a/broadcast/112-upgrade_distr.s.sol/7887/run-latest.json b/broadcast/112-upgrade_distr.s.sol/7887/run-latest.json index 5acd3142..b407b337 100644 --- a/broadcast/112-upgrade_distr.s.sol/7887/run-latest.json +++ b/broadcast/112-upgrade_distr.s.sol/7887/run-latest.json @@ -1,10 +1,10 @@ { "transactions": [ { - "hash": "0x4dbea8c3ebb30125d18463ff479a8b7cbfc7cb5694aaa920ad9b11e17b6d6fbc", + "hash": "0x853cd50134da0bb4f4a0708327ff6b9e481dbd0f95a851591838750fb063ca59", "transactionType": "CREATE2", "contractName": "RewardsDistributor", - "contractAddress": "0x5b4d3f7d5876a68107f755be97cdef36091a336f", + "contractAddress": "0xf3d955b4cf3489a37027f0f3484e87328dbdbb39", "function": null, "arguments": [ "0x010700808D59d2bb92257fCafACfe8e5bFF7aB87", @@ -15,29 +15,29 @@ "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", "to": "0x4e59b44847b379578588920ca78fbf26c0b4956c", "value": "0x0", - "input": "0x0000000000000000000000000000000000000000000000000000000000000000610100604052306080523480156200001657600080fd5b5060405162001edb38038062001edb83398101604081905262000039916200012b565b6200004362000061565b6001600160a01b0392831660c05260a0919091521660e05262000173565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a00805468010000000000000000900460ff1615620000b25760405163f92ee8a960e01b815260040160405180910390fd5b80546001600160401b0390811614620001125780546001600160401b0319166001600160401b0390811782556040519081527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50565b6001600160a01b03811681146200011257600080fd5b6000806000606084860312156200014157600080fd5b83516200014e8162000115565b602085015160408601519194509250620001688162000115565b809150509250925092565b60805160a05160c05160e051611cf6620001e560003960008181610560015281816106de015261089d015260008181610295015281816107c90152610fbb01526000818161042201528181610cbf0152610cf40152600081816112ad015281816112d6015261141c0152611cf66000f3fe6080604052600436106101f95760003560e01c8063a217fddf1161010d578063ca21b177116100a0578063d54ad2a11161006f578063d54ad2a114610617578063d75047421461062d578063d8f9f12d14610649578063d9c2702c1461065e578063ebf0c7171461067e57600080fd5b8063ca21b17714610597578063cc11298e146105b7578063cefff0fa146105d7578063d547741f146105f757600080fd5b8063c0d8012c116100dc578063c0d8012c14610501578063c2ebe9e614610521578063c5c036991461054e578063c8c673851461058257600080fd5b8063a217fddf14610483578063abadaf9a14610498578063ad3cb1cc146104ae578063be986420146104ec57600080fd5b806347e63380116101905780635b36c66b1161015f5780635b36c66b146103d8578063682336b7146103f857806378e97925146104105780637e1c0c091461044457806391d148541461046357600080fd5b806347e633801461034f5780634dcaf8b1146103835780634f1ef286146103b057806352d1902d146103c357600080fd5b806321ff9970116101cc57806321ff9970146102cf578063248a9ca3146102ef5780632f2ff15d1461030f57806336568abe1461032f57600080fd5b806301ffc9a7146101fe5780630ef096431461023357806318c4110714610255578063212ca34f14610283575b600080fd5b34801561020a57600080fd5b5061021e61021936600461184f565b610694565b60405190151581526020015b60405180910390f35b34801561023f57600080fd5b5061025361024e366004611895565b6106cb565b005b34801561026157600080fd5b50610275610270366004611895565b610862565b60405190815260200161022a565b34801561028f57600080fd5b506102b77f000000000000000000000000000000000000000000000000000000000000000081565b6040516001600160a01b03909116815260200161022a565b3480156102db57600080fd5b506102536102ea3660046118b0565b61093c565b3480156102fb57600080fd5b5061027561030a3660046118b0565b61099c565b34801561031b57600080fd5b5061025361032a3660046118c9565b6109be565b34801561033b57600080fd5b5061025361034a3660046118c9565b6109e0565b34801561035b57600080fd5b506102757f56730d7d989818781b81ff2da8c4c452dd13af73dfb8c4f4723e21d17335fd2481565b34801561038f57600080fd5b5061027561039e366004611895565b60086020526000908152604090205481565b6102536103be36600461193c565b610a18565b3480156103cf57600080fd5b50610275610a37565b3480156103e457600080fd5b506102536103f33660046119e2565b610a54565b34801561040457600080fd5b5061027563671a6e3a81565b34801561041c57600080fd5b506102757f000000000000000000000000000000000000000000000000000000000000000081565b34801561045057600080fd5b506102756a034f086f3b33b68400000081565b34801561046f57600080fd5b5061021e61047e3660046118c9565b610c83565b34801561048f57600080fd5b50610275600081565b3480156104a457600080fd5b5061027560035481565b3480156104ba57600080fd5b506104df604051806040016040528060058152602001640352e302e360dc1b81525081565b60405161022a9190611a28565b3480156104f857600080fd5b50610275602881565b34801561050d57600080fd5b5061027561051c3660046118b0565b610cbb565b34801561052d57600080fd5b5061027561053c3660046118b0565b60066020526000908152604090205481565b34801561055a57600080fd5b506102b77f000000000000000000000000000000000000000000000000000000000000000081565b34801561058e57600080fd5b50610275610dd5565b3480156105a357600080fd5b506102536105b2366004611a5b565b610df1565b3480156105c357600080fd5b506102756105d23660046119e2565b611043565b3480156105e357600080fd5b506102536105f23660046118b0565b611061565b34801561060357600080fd5b506102536106123660046118c9565b6110a0565b34801561062357600080fd5b5061027560015481565b34801561063957600080fd5b50610275670de0b6b3a764000081565b34801561065557600080fd5b506102756110bc565b34801561066a57600080fd5b506102756106793660046118b0565b6110c3565b34801561068a57600080fd5b5061027560005481565b60006001600160e01b03198216637965db0b60e01b14806106c557506301ffc9a760e01b6001600160e01b03198316145b92915050565b6106d36110db565b336001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614610723576040516317f96fa160e01b81523360048201526024015b60405180910390fd5b6001600160a01b0381166000908152600260205260409020541561076557604051632058b6db60e01b81526001600160a01b038216600482015260240161071a565b6001600160a01b03811660009081526002602052604081208054670de0b6b3a76400009290610795908490611b32565b92505081905550670de0b6b3a7640000600160008282546107b69190611b32565b909155506107f890506001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001682670de0b6b3a7640000611125565b604051670de0b6b3a7640000906001600160a01b038316907f6e5415f3b28629b8fa5ea955a9c84675a06a58937625c758da2f4169e4585dbb90600090a361085f60017f9b779b17422d0df92223018b32b4d1fa46e071723d6817e2486d003becc55f0055565b50565b6001600160a01b0381811660008181526002602052604080822054905163751b97e760e11b815260048101939093529092909163671a6e3a917f0000000000000000000000000000000000000000000000000000000000000000169063ea372fce90602401602060405180830381865afa1580156108e4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109089190611b45565b106106c557670de0b6b3a76400008110156109235780610935565b610935670de0b6b3a764000082611b5e565b9392505050565b7f56730d7d989818781b81ff2da8c4c452dd13af73dfb8c4f4723e21d17335fd2461096681611177565b600054827f26df13263ccd588bd14d17b939ae977c1d51960da437d7eb886d1cfb6f3d068260405160405180910390a350600055565b6000908152600080516020611ca1833981519152602052604090206001015490565b6109c78261099c565b6109d081611177565b6109da8383611181565b50505050565b6001600160a01b0381163314610a095760405163334bd91960e11b815260040160405180910390fd5b610a138282611226565b505050565b610a206112a2565b610a2982611349565b610a338282611354565b5050565b6000610a41611411565b50600080516020611c8183398151915290565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff16159067ffffffffffffffff16600081158015610a9a5750825b905060008267ffffffffffffffff166001148015610ab75750303b155b905081158015610ac5575080155b15610ae35760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff191660011785558315610b0d57845460ff60401b1916600160401b1785555b610b1561145a565b610b1d61145a565b610b28600033611181565b50610b537f56730d7d989818781b81ff2da8c4c452dd13af73dfb8c4f4723e21d17335fd2433611181565b506000878155600387905560015b60288111610c3257670de0b6b3a764000060005b82811015610b9e576069610b8a836064611b71565b610b949190611b9e565b9150600101610b75565b506000670de0b6b3a7640000610bbf836a034f086f3b33b684000000611b71565b610bc99190611b9e565b9050600084610be3836a034f086f3b33b684000000611b5e565b610bed9190611b5e565b90508060066000610bff600188611b5e565b8152602081019190915260400160002055610c1a8186611b32565b94505050508080610c2a90611bb2565b915050610b61565b50508315610c7a57845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50505050505050565b6000918252600080516020611ca1833981519152602090815260408084206001600160a01b0393909316845291905290205460ff1690565b60007f0000000000000000000000000000000000000000000000000000000000000000821015610ced57506000919050565b6000610d197f000000000000000000000000000000000000000000000000000000000000000084611b5e565b90506000610d2a6276a70083611b9e565b905060006028821015610db55760005b82811015610d6557600081815260066020526040902054610d5b9083611b32565b9150600101610d3a565b506000610d756276a70085611bcb565b6000848152600660205260408120549192506276a700610d958484611b71565b610d9f9190611b9e565b9050610dab8185611b32565b9350505050610dcd565b610dca6a034f086f3b33b68400000082611b32565b90505b949350505050565b6000600154610de26110bc565b610dec9190611b5e565b905090565b610df96110db565b600080546001600160a01b0384168252600860205260409091205403610e3d5760405163f83369ff60e01b81526001600160a01b038316600482015260240161071a565b610e4682610862565b8111610e7057604051632058b6db60e01b81526001600160a01b038316600482015260240161071a565b604080516001600160a01b038416602082015290810182905260009060600160408051601f1981840301815282825280516020918201209083015201604051602081830303815290604052805190602001209050610ed18460005483611462565b1515600003610ef757838160405163571e214960e11b815260040161071a929190611bdf565b6000610f0284610862565b610f0c9084611b5e565b9050610f16610dd5565b811115610f555780600154610f2b9190611b32565b610f336110bc565b604051630a0bf79560e01b81526004810192909252602482015260440161071a565b8060016000828254610f679190611b32565b90915550506001600160a01b03841660009081526002602052604081208054839290610f94908490611b32565b9091555050600080546001600160a01b0380871683526008602052604090922055610fe2907f0000000000000000000000000000000000000000000000000000000000000000168583611125565b60405181906001600160a01b038616907f5329b89678b0f095cae2abe10b88ad57329871ee9296ae8f358a46b9fa0ff32890600090a35050610a1360017f9b779b17422d0df92223018b32b4d1fa46e071723d6817e2486d003becc55f0055565b600061104e83610cbb565b61105783610cbb565b6109359190611b5e565b600061106c81611177565b60035460405183907fd12719f869a4621325e2d0f36e2a6fefcd87e2defb17983e2f2dcbe8b675962290600090a350600355565b6110a98261099c565b6110b281611177565b6109da8383611226565b6000610dec425b60006003546110d183610cbb565b6106c59190611b32565b7f9b779b17422d0df92223018b32b4d1fa46e071723d6817e2486d003becc55f0080546001190161111f57604051633ee5aeb560e01b815260040160405180910390fd5b60029055565b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b031663a9059cbb60e01b179052610a13908490611478565b61085f81336114db565b6000600080516020611ca183398151915261119c8484610c83565b61121c576000848152602082815260408083206001600160a01b03871684529091529020805460ff191660011790556111d23390565b6001600160a01b0316836001600160a01b0316857f2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d60405160405180910390a460019150506106c5565b60009150506106c5565b6000600080516020611ca18339815191526112418484610c83565b1561121c576000848152602082815260408083206001600160a01b0387168085529252808320805460ff1916905551339287917ff6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b9190a460019150506106c5565b306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016148061132957507f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661131d600080516020611c81833981519152546001600160a01b031690565b6001600160a01b031614155b156113475760405163703e46dd60e11b815260040160405180910390fd5b565b6000610a3381611177565b816001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa9250505080156113ae575060408051601f3d908101601f191682019092526113ab91810190611b45565b60015b6113d657604051634c9c8ce360e01b81526001600160a01b038316600482015260240161071a565b600080516020611c81833981519152811461140757604051632a87526960e21b81526004810182905260240161071a565b610a138383611514565b306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016146113475760405163703e46dd60e11b815260040160405180910390fd5b61134761156a565b60008261146f85846115b3565b14949350505050565b600061148d6001600160a01b038416836115f6565b905080516000141580156114b25750808060200190518101906114b09190611c2c565b155b15610a1357604051635274afe760e01b81526001600160a01b038416600482015260240161071a565b6114e58282610c83565b610a335760405163e2517d3f60e01b81526001600160a01b03821660048201526024810183905260440161071a565b61151d82611604565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a280511561156257610a138282611669565b610a336116df565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff1661134757604051631afcd79f60e31b815260040160405180910390fd5b600081815b84518110156115ee576115e4828683815181106115d7576115d7611c4e565b60200260200101516116fe565b91506001016115b8565b509392505050565b60606109358383600061172d565b806001600160a01b03163b60000361163a57604051634c9c8ce360e01b81526001600160a01b038216600482015260240161071a565b600080516020611c8183398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080846001600160a01b0316846040516116869190611c64565b600060405180830381855af49150503d80600081146116c1576040519150601f19603f3d011682016040523d82523d6000602084013e6116c6565b606091505b50915091506116d68583836117ca565b95945050505050565b34156113475760405163b398979f60e01b815260040160405180910390fd5b600081831061171a576000828152602084905260409020610935565b6000838152602083905260409020610935565b6060814710156117525760405163cd78605960e01b815230600482015260240161071a565b600080856001600160a01b0316848660405161176e9190611c64565b60006040518083038185875af1925050503d80600081146117ab576040519150601f19603f3d011682016040523d82523d6000602084013e6117b0565b606091505b50915091506117c08683836117ca565b9695505050505050565b6060826117df576117da82611826565b610935565b81511580156117f657506001600160a01b0384163b155b1561181f57604051639996b31560e01b81526001600160a01b038516600482015260240161071a565b5080610935565b8051156118365780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b60006020828403121561186157600080fd5b81356001600160e01b03198116811461093557600080fd5b80356001600160a01b038116811461189057600080fd5b919050565b6000602082840312156118a757600080fd5b61093582611879565b6000602082840312156118c257600080fd5b5035919050565b600080604083850312156118dc57600080fd5b823591506118ec60208401611879565b90509250929050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff81118282101715611934576119346118f5565b604052919050565b6000806040838503121561194f57600080fd5b61195883611879565b915060208084013567ffffffffffffffff8082111561197657600080fd5b818601915086601f83011261198a57600080fd5b81358181111561199c5761199c6118f5565b6119ae601f8201601f1916850161190b565b915080825287848285010111156119c457600080fd5b80848401858401376000848284010152508093505050509250929050565b600080604083850312156119f557600080fd5b50508035926020909101359150565b60005b83811015611a1f578181015183820152602001611a07565b50506000910152565b6020815260008251806020840152611a47816040850160208701611a04565b601f01601f19169190910160400192915050565b600080600060608486031215611a7057600080fd5b833567ffffffffffffffff80821115611a8857600080fd5b818601915086601f830112611a9c57600080fd5b8135602082821115611ab057611ab06118f5565b8160051b9250611ac181840161190b565b828152928401810192818101908a851115611adb57600080fd5b948201945b84861015611af957853582529482019490820190611ae0565b9750611b089050888201611879565b955050505050604084013590509250925092565b634e487b7160e01b600052601160045260246000fd5b808201808211156106c5576106c5611b1c565b600060208284031215611b5757600080fd5b5051919050565b818103818111156106c5576106c5611b1c565b80820281158282048414176106c5576106c5611b1c565b634e487b7160e01b600052601260045260246000fd5b600082611bad57611bad611b88565b500490565b600060018201611bc457611bc4611b1c565b5060010190565b600082611bda57611bda611b88565b500690565b604080825283519082018190526000906020906060840190828701845b82811015611c1857815184529284019290840190600101611bfc565b505050602093909301939093525092915050565b600060208284031215611c3e57600080fd5b8151801515811461093557600080fd5b634e487b7160e01b600052603260045260246000fd5b60008251611c76818460208701611a04565b919091019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc02dd7bc7dec4dceedda775e58dd541e08a116c6c53815c0bd028192f7b626800a2646970667358221220f60a851dd34d6f625bc30aa64b2e74a63062c69e53a69b9df11f85031355804164736f6c63430008180033000000000000000000000000010700808d59d2bb92257fcafacfe8e5bff7ab8700000000000000000000000000000000000000000000000000000000667122600000000000000000000000008a4720488ca32f1223ccfe5a087e250fe3bc5d75", - "nonce": "0x5bff", + "input": "0x0000000000000000000000000000000000000000000000000000000000000000610100604052306080523480156200001657600080fd5b5060405162001d7538038062001d7583398101604081905262000039916200012b565b6200004362000061565b6001600160a01b0392831660c05260a0919091521660e05262000173565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a00805468010000000000000000900460ff1615620000b25760405163f92ee8a960e01b815260040160405180910390fd5b80546001600160401b0390811614620001125780546001600160401b0319166001600160401b0390811782556040519081527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50565b6001600160a01b03811681146200011257600080fd5b6000806000606084860312156200014157600080fd5b83516200014e8162000115565b602085015160408601519194509250620001688162000115565b809150509250925092565b60805160a05160c05160e051611b9e620001d760003960008181610581015261072301526000818161029e0152610e6501526000818161044301528181610b660152610b9b0152600081816110c2015281816110eb01526112310152611b9e6000f3fe6080604052600436106102045760003560e01c806391d1485411610118578063ca21b177116100a0578063d54ad2a11161006f578063d54ad2a114610638578063d75047421461064e578063d8f9f12d1461066a578063d9c2702c1461067f578063ebf0c7171461069f57600080fd5b8063ca21b177146105b8578063cc11298e146105d8578063cefff0fa146105f8578063d547741f1461061857600080fd5b8063be986420116100e7578063be9864201461050d578063c0d8012c14610522578063c2ebe9e614610542578063c5c036991461056f578063c8c67385146105a357600080fd5b806391d1485414610484578063a217fddf146104a4578063abadaf9a146104b9578063ad3cb1cc146104cf57600080fd5b806347e633801161019b57806352d1902d1161016a57806352d1902d146103e45780635b36c66b146103f9578063682336b71461041957806378e97925146104315780637e1c0c091461046557600080fd5b806347e63380146103585780634dcaf8b11461038c5780634e102072146103b95780634f1ef286146103d157600080fd5b806321ff9970116101d757806321ff9970146102d8578063248a9ca3146102f85780632f2ff15d1461031857806336568abe1461033857600080fd5b806301ffc9a7146102095780630ef096431461023e57806318c411071461025e578063212ca34f1461028c575b600080fd5b34801561021557600080fd5b506102296102243660046116f7565b6106b5565b60405190151581526020015b60405180910390f35b34801561024a57600080fd5b5061025c61025936600461173d565b50565b005b34801561026a57600080fd5b5061027e61027936600461173d565b6106ec565b604051908152602001610235565b34801561029857600080fd5b506102c07f000000000000000000000000000000000000000000000000000000000000000081565b6040516001600160a01b039091168152602001610235565b3480156102e457600080fd5b5061025c6102f3366004611758565b6107e3565b34801561030457600080fd5b5061027e610313366004611758565b610843565b34801561032457600080fd5b5061025c610333366004611771565b610865565b34801561034457600080fd5b5061025c610353366004611771565b610887565b34801561036457600080fd5b5061027e7f56730d7d989818781b81ff2da8c4c452dd13af73dfb8c4f4723e21d17335fd2481565b34801561039857600080fd5b5061027e6103a736600461173d565b60086020526000908152604090205481565b3480156103c557600080fd5b5061027e63675cc72b81565b61025c6103df3660046117e4565b6108bf565b3480156103f057600080fd5b5061027e6108de565b34801561040557600080fd5b5061025c61041436600461188a565b6108fb565b34801561042557600080fd5b5061027e63671a6e3a81565b34801561043d57600080fd5b5061027e7f000000000000000000000000000000000000000000000000000000000000000081565b34801561047157600080fd5b5061027e6a034f086f3b33b68400000081565b34801561049057600080fd5b5061022961049f366004611771565b610b2a565b3480156104b057600080fd5b5061027e600081565b3480156104c557600080fd5b5061027e60035481565b3480156104db57600080fd5b50610500604051806040016040528060058152602001640352e302e360dc1b81525081565b60405161023591906118d0565b34801561051957600080fd5b5061027e602881565b34801561052e57600080fd5b5061027e61053d366004611758565b610b62565b34801561054e57600080fd5b5061027e61055d366004611758565b60066020526000908152604090205481565b34801561057b57600080fd5b506102c07f000000000000000000000000000000000000000000000000000000000000000081565b3480156105af57600080fd5b5061027e610c7a565b3480156105c457600080fd5b5061025c6105d3366004611903565b610c96565b3480156105e457600080fd5b5061027e6105f336600461188a565b610eed565b34801561060457600080fd5b5061025c610613366004611758565b610f12565b34801561062457600080fd5b5061025c610633366004611771565b610f51565b34801561064457600080fd5b5061027e60015481565b34801561065a57600080fd5b5061027e670de0b6b3a764000081565b34801561067657600080fd5b5061027e610f6d565b34801561068b57600080fd5b5061027e61069a366004611758565b610f74565b3480156106ab57600080fd5b5061027e60005481565b60006001600160e01b03198216637965db0b60e01b14806106e657506301ffc9a760e01b6001600160e01b03198316145b92915050565b6001600160a01b0381811660008181526002602052604080822054905163751b97e760e11b815260048101939093529092909183917f0000000000000000000000000000000000000000000000000000000000000000169063ea372fce90602401602060405180830381865afa15801561076a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061078e91906119c4565b905063671a6e3a81101580156107a7575063675cc72b81105b156107dc57670de0b6b3a76400008210156107c257816107d4565b6107d4670de0b6b3a7640000836119f3565b949350505050565b5092915050565b7f56730d7d989818781b81ff2da8c4c452dd13af73dfb8c4f4723e21d17335fd2461080d81610f8c565b600054827f26df13263ccd588bd14d17b939ae977c1d51960da437d7eb886d1cfb6f3d068260405160405180910390a350600055565b6000908152600080516020611b49833981519152602052604090206001015490565b61086e82610843565b61087781610f8c565b6108818383610f96565b50505050565b6001600160a01b03811633146108b05760405163334bd91960e11b815260040160405180910390fd5b6108ba828261103b565b505050565b6108c76110b7565b6108d08261115e565b6108da8282611169565b5050565b60006108e8611226565b50600080516020611b2983398151915290565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff16159067ffffffffffffffff166000811580156109415750825b905060008267ffffffffffffffff16600114801561095e5750303b155b90508115801561096c575080155b1561098a5760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff1916600117855583156109b457845460ff60401b1916600160401b1785555b6109bc61126f565b6109c461126f565b6109cf600033610f96565b506109fa7f56730d7d989818781b81ff2da8c4c452dd13af73dfb8c4f4723e21d17335fd2433610f96565b506000878155600387905560015b60288111610ad957670de0b6b3a764000060005b82811015610a45576069610a31836064611a06565b610a3b9190611a33565b9150600101610a1c565b506000670de0b6b3a7640000610a66836a034f086f3b33b684000000611a06565b610a709190611a33565b9050600084610a8a836a034f086f3b33b6840000006119f3565b610a9491906119f3565b90508060066000610aa66001886119f3565b8152602081019190915260400160002055610ac18186611a47565b94505050508080610ad190611a5a565b915050610a08565b50508315610b2157845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50505050505050565b6000918252600080516020611b49833981519152602090815260408084206001600160a01b0393909316845291905290205460ff1690565b60007f0000000000000000000000000000000000000000000000000000000000000000821015610b9457506000919050565b6000610bc07f0000000000000000000000000000000000000000000000000000000000000000846119f3565b90506000610bd16276a70083611a33565b905060006028821015610c5c5760005b82811015610c0c57600081815260066020526040902054610c029083611a47565b9150600101610be1565b506000610c1c6276a70085611a73565b6000848152600660205260408120549192506276a700610c3c8484611a06565b610c469190611a33565b9050610c528185611a47565b93505050506107d4565b610c716a034f086f3b33b68400000082611a47565b95945050505050565b6000600154610c87610f6d565b610c9191906119f3565b905090565b610c9e611277565b600080546001600160a01b0384168252600860205260409091205403610ce75760405163f83369ff60e01b81526001600160a01b03831660048201526024015b60405180910390fd5b610cf0826106ec565b8111610d1a57604051632058b6db60e01b81526001600160a01b0383166004820152602401610cde565b604080516001600160a01b038416602082015290810182905260009060600160408051601f1981840301815282825280516020918201209083015201604051602081830303815290604052805190602001209050610d7b84600054836112c1565b1515600003610da157838160405163571e214960e11b8152600401610cde929190611a87565b6000610dac846106ec565b610db690846119f3565b9050610dc0610c7a565b811115610dff5780600154610dd59190611a47565b610ddd610f6d565b604051630a0bf79560e01b815260048101929092526024820152604401610cde565b8060016000828254610e119190611a47565b90915550506001600160a01b03841660009081526002602052604081208054839290610e3e908490611a47565b9091555050600080546001600160a01b0380871683526008602052604090922055610e8c907f00000000000000000000000000000000000000000000000000000000000000001685836112d7565b60405181906001600160a01b038616907f5329b89678b0f095cae2abe10b88ad57329871ee9296ae8f358a46b9fa0ff32890600090a350506108ba60017f9b779b17422d0df92223018b32b4d1fa46e071723d6817e2486d003becc55f0055565b6000610ef883610b62565b610f0183610b62565b610f0b91906119f3565b9392505050565b6000610f1d81610f8c565b60035460405183907fd12719f869a4621325e2d0f36e2a6fefcd87e2defb17983e2f2dcbe8b675962290600090a350600355565b610f5a82610843565b610f6381610f8c565b610881838361103b565b6000610c91425b6000600354610f8283610b62565b6106e69190611a47565b6102598133611329565b6000600080516020611b49833981519152610fb18484610b2a565b611031576000848152602082815260408083206001600160a01b03871684529091529020805460ff19166001179055610fe73390565b6001600160a01b0316836001600160a01b0316857f2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d60405160405180910390a460019150506106e6565b60009150506106e6565b6000600080516020611b498339815191526110568484610b2a565b15611031576000848152602082815260408083206001600160a01b0387168085529252808320805460ff1916905551339287917ff6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b9190a460019150506106e6565b306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016148061113e57507f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316611132600080516020611b29833981519152546001600160a01b031690565b6001600160a01b031614155b1561115c5760405163703e46dd60e11b815260040160405180910390fd5b565b60006108da81610f8c565b816001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa9250505080156111c3575060408051601f3d908101601f191682019092526111c0918101906119c4565b60015b6111eb57604051634c9c8ce360e01b81526001600160a01b0383166004820152602401610cde565b600080516020611b29833981519152811461121c57604051632a87526960e21b815260048101829052602401610cde565b6108ba8383611362565b306001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000161461115c5760405163703e46dd60e11b815260040160405180910390fd5b61115c6113b8565b7f9b779b17422d0df92223018b32b4d1fa46e071723d6817e2486d003becc55f008054600119016112bb57604051633ee5aeb560e01b815260040160405180910390fd5b60029055565b6000826112ce8584611401565b14949350505050565b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b031663a9059cbb60e01b1790526108ba908490611444565b6113338282610b2a565b6108da5760405163e2517d3f60e01b81526001600160a01b038216600482015260248101839052604401610cde565b61136b826114a7565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a28051156113b0576108ba828261150c565b6108da611579565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff1661115c57604051631afcd79f60e31b815260040160405180910390fd5b600081815b845181101561143c576114328286838151811061142557611425611ad4565b6020026020010151611598565b9150600101611406565b509392505050565b60006114596001600160a01b038416836115c7565b9050805160001415801561147e57508080602001905181019061147c9190611aea565b155b156108ba57604051635274afe760e01b81526001600160a01b0384166004820152602401610cde565b806001600160a01b03163b6000036114dd57604051634c9c8ce360e01b81526001600160a01b0382166004820152602401610cde565b600080516020611b2983398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080846001600160a01b0316846040516115299190611b0c565b600060405180830381855af49150503d8060008114611564576040519150601f19603f3d011682016040523d82523d6000602084013e611569565b606091505b5091509150610c718583836115d5565b341561115c5760405163b398979f60e01b815260040160405180910390fd5b60008183106115b4576000828152602084905260409020610f0b565b6000838152602083905260409020610f0b565b6060610f0b83836000611631565b6060826115ea576115e5826116ce565b610f0b565b815115801561160157506001600160a01b0384163b155b1561162a57604051639996b31560e01b81526001600160a01b0385166004820152602401610cde565b5080610f0b565b6060814710156116565760405163cd78605960e01b8152306004820152602401610cde565b600080856001600160a01b031684866040516116729190611b0c565b60006040518083038185875af1925050503d80600081146116af576040519150601f19603f3d011682016040523d82523d6000602084013e6116b4565b606091505b50915091506116c48683836115d5565b9695505050505050565b8051156116de5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b60006020828403121561170957600080fd5b81356001600160e01b031981168114610f0b57600080fd5b80356001600160a01b038116811461173857600080fd5b919050565b60006020828403121561174f57600080fd5b610f0b82611721565b60006020828403121561176a57600080fd5b5035919050565b6000806040838503121561178457600080fd5b8235915061179460208401611721565b90509250929050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff811182821017156117dc576117dc61179d565b604052919050565b600080604083850312156117f757600080fd5b61180083611721565b915060208084013567ffffffffffffffff8082111561181e57600080fd5b818601915086601f83011261183257600080fd5b8135818111156118445761184461179d565b611856601f8201601f191685016117b3565b9150808252878482850101111561186c57600080fd5b80848401858401376000848284010152508093505050509250929050565b6000806040838503121561189d57600080fd5b50508035926020909101359150565b60005b838110156118c75781810151838201526020016118af565b50506000910152565b60208152600082518060208401526118ef8160408501602087016118ac565b601f01601f19169190910160400192915050565b60008060006060848603121561191857600080fd5b833567ffffffffffffffff8082111561193057600080fd5b818601915086601f83011261194457600080fd5b81356020828211156119585761195861179d565b8160051b92506119698184016117b3565b828152928401810192818101908a85111561198357600080fd5b948201945b848610156119a157853582529482019490820190611988565b97506119b09050888201611721565b955050505050604084013590509250925092565b6000602082840312156119d657600080fd5b5051919050565b634e487b7160e01b600052601160045260246000fd5b818103818111156106e6576106e66119dd565b80820281158282048414176106e6576106e66119dd565b634e487b7160e01b600052601260045260246000fd5b600082611a4257611a42611a1d565b500490565b808201808211156106e6576106e66119dd565b600060018201611a6c57611a6c6119dd565b5060010190565b600082611a8257611a82611a1d565b500690565b604080825283519082018190526000906020906060840190828701845b82811015611ac057815184529284019290840190600101611aa4565b505050602093909301939093525092915050565b634e487b7160e01b600052603260045260246000fd5b600060208284031215611afc57600080fd5b81518015158114610f0b57600080fd5b60008251611b1e8184602087016118ac565b919091019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc02dd7bc7dec4dceedda775e58dd541e08a116c6c53815c0bd028192f7b626800a26469706673582212206780acf0f779c8b062d8139f94772381775d3fa645b9cc424e452e7a70231b7d64736f6c63430008180033000000000000000000000000010700808d59d2bb92257fcafacfe8e5bff7ab8700000000000000000000000000000000000000000000000000000000667122600000000000000000000000008a4720488ca32f1223ccfe5a087e250fe3bc5d75", + "nonce": "0x4b8ef", "chainId": "0x1ecf" }, "additionalContracts": [], "isFixedGasLimit": false }, { - "hash": "0x8cc00818699e26f0978aa2f780cfcbd559b68eca4e38822a363fbfb72f991170", + "hash": "0xc25ca9b0d2a50eba7cec62481c5c83f9222786f3c29479977ff1182a2871c768", "transactionType": "CALL", "contractName": null, "contractAddress": "0x2843c269d2a64ecfa63548e8b3fc0fd23b7f70cb", "function": "handleOps((address,uint256,bytes,bytes,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],address)", "arguments": [ - "[(0x2e2B1c42E38f5af81771e65D87729E57ABD1337a, 2684, 0x, 0xb61d27f6000000000000000000000000d157904639e89df05e89e0dabeec99ae3d74f9aa0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000644f1ef2860000000000000000000000005b4d3f7d5876a68107f755be97cdef36091a336f0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000, 4000000, 210000, 21000, 1, 1000000000, 0x0000000000000000000000000000000000000000, 0xbb0b9c5ccf9cb9977c1a091631f64f9582cfae334947e33400264821f066c21f11c47ec7352dd28d1221c9da40bcb349eb5a3fb117047418596dc8cc0bfc8f6c1b7896f13d173cf21a2e869320fae65c8b7f7d036e0638e61b2068b64e3b86537d27fc18f7a2baf5b98511f614e6c72de6a7ef28754d8797a29faaf1d07cfa69251c)]", + "[(0x2e2B1c42E38f5af81771e65D87729E57ABD1337a, 3873, 0x, 0xb61d27f6000000000000000000000000d157904639e89df05e89e0dabeec99ae3d74f9aa0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000644f1ef286000000000000000000000000f3d955b4cf3489a37027f0f3484e87328dbdbb390000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000, 4000000, 210000, 21000, 1, 1000000000, 0x0000000000000000000000000000000000000000, 0x29bd65c68ccf8d9f39993052c5a10a5b6c92f6ca342bf5127088c907110c593d0ae9d9481fd073d83b14236ffd20b4ed0fe3ef19ae19e33f1adeae80f014eb8b1ba39787a2cdc5dcea8f52f90975dcdefda91e79f3e3da856487e1d52447b2fda247537c9ab1797057b61774e28f50b1559f2d8e7af6fe74a8cbc1bfe3182eefff1c)]", "0x660ad4B5A74130a4796B4d54BC6750Ae93C86e6c" ], "transaction": { "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", "to": "0x2843c269d2a64ecfa63548e8b3fc0fd23b7f70cb", "value": "0x0", - "input": "0x1fad948c0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000660ad4b5a74130a4796b4d54bc6750ae93c86e6c000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000002e2b1c42e38f5af81771e65d87729e57abd1337a0000000000000000000000000000000000000000000000000000000000000a7c0000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000003d0900000000000000000000000000000000000000000000000000000000000003345000000000000000000000000000000000000000000000000000000000000052080000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000003b9aca0000000000000000000000000000000000000000000000000000000000000002c0000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000104b61d27f6000000000000000000000000d157904639e89df05e89e0dabeec99ae3d74f9aa0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000644f1ef2860000000000000000000000005b4d3f7d5876a68107f755be97cdef36091a336f000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000082bb0b9c5ccf9cb9977c1a091631f64f9582cfae334947e33400264821f066c21f11c47ec7352dd28d1221c9da40bcb349eb5a3fb117047418596dc8cc0bfc8f6c1b7896f13d173cf21a2e869320fae65c8b7f7d036e0638e61b2068b64e3b86537d27fc18f7a2baf5b98511f614e6c72de6a7ef28754d8797a29faaf1d07cfa69251c000000000000000000000000000000000000000000000000000000000000", - "nonce": "0x5c00", + "input": "0x1fad948c0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000660ad4b5a74130a4796b4d54bc6750ae93c86e6c000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000002e2b1c42e38f5af81771e65d87729e57abd1337a0000000000000000000000000000000000000000000000000000000000000f210000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000003d0900000000000000000000000000000000000000000000000000000000000003345000000000000000000000000000000000000000000000000000000000000052080000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000003b9aca0000000000000000000000000000000000000000000000000000000000000002c0000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000104b61d27f6000000000000000000000000d157904639e89df05e89e0dabeec99ae3d74f9aa0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000644f1ef286000000000000000000000000f3d955b4cf3489a37027f0f3484e87328dbdbb3900000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008229bd65c68ccf8d9f39993052c5a10a5b6c92f6ca342bf5127088c907110c593d0ae9d9481fd073d83b14236ffd20b4ed0fe3ef19ae19e33f1adeae80f014eb8b1ba39787a2cdc5dcea8f52f90975dcdefda91e79f3e3da856487e1d52447b2fda247537c9ab1797057b61774e28f50b1559f2d8e7af6fe74a8cbc1bfe3182eefff1c000000000000000000000000000000000000000000000000000000000000", + "nonce": "0x4b8f0", "chainId": "0x1ecf" }, "additionalContracts": [], @@ -47,39 +47,39 @@ "receipts": [ { "status": "0x1", - "cumulativeGasUsed": "0x43389f", + "cumulativeGasUsed": "0x24e901", "logs": [ { - "address": "0x5b4d3f7d5876a68107f755be97cdef36091a336f", + "address": "0xf3d955b4cf3489a37027f0f3484e87328dbdbb39", "topics": [ "0xc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d2" ], "data": "0x000000000000000000000000000000000000000000000000ffffffffffffffff", - "blockHash": "0xece657332180580e8910d83ba8c8fc47bff34153d2ca4de758f05155697adeb1", - "blockNumber": "0x3c319", - "transactionHash": "0x4dbea8c3ebb30125d18463ff479a8b7cbfc7cb5694aaa920ad9b11e17b6d6fbc", + "blockHash": "0x6f5b65287cf34d20aa4b9f2162bdf8c8376866201adb1985942dd592cb062982", + "blockNumber": "0xa06f8", + "transactionHash": "0x853cd50134da0bb4f4a0708327ff6b9e481dbd0f95a851591838750fb063ca59", "transactionIndex": "0x1", "logIndex": "0x0", "removed": false } ], - "logsBloom": "0x00010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "logsBloom": "0x00000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000004000000000200000000000000000000000000000000000000000000000000000000000000000000000000", "type": "0x2", - "transactionHash": "0x4dbea8c3ebb30125d18463ff479a8b7cbfc7cb5694aaa920ad9b11e17b6d6fbc", + "transactionHash": "0x853cd50134da0bb4f4a0708327ff6b9e481dbd0f95a851591838750fb063ca59", "transactionIndex": "0x1", - "blockHash": "0xece657332180580e8910d83ba8c8fc47bff34153d2ca4de758f05155697adeb1", - "blockNumber": "0x3c319", - "gasUsed": "0x43389f", + "blockHash": "0x6f5b65287cf34d20aa4b9f2162bdf8c8376866201adb1985942dd592cb062982", + "blockNumber": "0xa06f8", + "gasUsed": "0x24e901", "effectiveGasPrice": "0x5f5e100", "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", "to": "0x4e59b44847b379578588920ca78fbf26c0b4956c", "contractAddress": null, - "gasUsedForL1": "0x298337", - "l1BlockNumber": "0x141c788" + "gasUsedForL1": "0xc5444", + "l1BlockNumber": "0x1467e19" }, { "status": "0x1", - "cumulativeGasUsed": "0x7ab00", + "cumulativeGasUsed": "0x42ad5", "logs": [ { "address": "0x2843c269d2a64ecfa63548e8b3fc0fd23b7f70cb", @@ -87,9 +87,9 @@ "0xbb47ee3e183a558b1a2ff0874b079f3fc5478b7454eacf2bfc5af2ff5878f972" ], "data": "0x", - "blockHash": "0x9f30ba790a3a72a7ed717deacebefaeded409ea5033b3597f45eb759b61b51d4", - "blockNumber": "0x3c31a", - "transactionHash": "0x8cc00818699e26f0978aa2f780cfcbd559b68eca4e38822a363fbfb72f991170", + "blockHash": "0x80cfa8ea84e4637fe148dfb1488b48b21864c6e2d14631cbe2c47526ff3bd27a", + "blockNumber": "0xa06f9", + "transactionHash": "0xc25ca9b0d2a50eba7cec62481c5c83f9222786f3c29479977ff1182a2871c768", "transactionIndex": "0x1", "logIndex": "0x0", "removed": false @@ -98,12 +98,12 @@ "address": "0xd157904639e89df05e89e0dabeec99ae3d74f9aa", "topics": [ "0xbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b", - "0x0000000000000000000000005b4d3f7d5876a68107f755be97cdef36091a336f" + "0x000000000000000000000000f3d955b4cf3489a37027f0f3484e87328dbdbb39" ], "data": "0x", - "blockHash": "0x9f30ba790a3a72a7ed717deacebefaeded409ea5033b3597f45eb759b61b51d4", - "blockNumber": "0x3c31a", - "transactionHash": "0x8cc00818699e26f0978aa2f780cfcbd559b68eca4e38822a363fbfb72f991170", + "blockHash": "0x80cfa8ea84e4637fe148dfb1488b48b21864c6e2d14631cbe2c47526ff3bd27a", + "blockNumber": "0xa06f9", + "transactionHash": "0xc25ca9b0d2a50eba7cec62481c5c83f9222786f3c29479977ff1182a2871c768", "transactionIndex": "0x1", "logIndex": "0x1", "removed": false @@ -112,38 +112,38 @@ "address": "0x2843c269d2a64ecfa63548e8b3fc0fd23b7f70cb", "topics": [ "0x49628fd1471006c1482da88028e9ce4dbb080b815c9b0344d39e5a8e6ec1419f", - "0x9cb110ee19876d156de38718467466b872c91a87e4d258d4693b1c2f2fd707ef", + "0x2b92d10c22f0d33c47fbf7f8dd76456c762e264f492b42e7c2a1b454b2dd6286", "0x0000000000000000000000002e2b1c42e38f5af81771e65d87729e57abd1337a", "0x0000000000000000000000000000000000000000000000000000000000000000" ], - "data": "0x0000000000000000000000000000000000000000000000000000000000000a7c00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000084eb90000000000000000000000000000000000000000000000000000000000084eb9", - "blockHash": "0x9f30ba790a3a72a7ed717deacebefaeded409ea5033b3597f45eb759b61b51d4", - "blockNumber": "0x3c31a", - "transactionHash": "0x8cc00818699e26f0978aa2f780cfcbd559b68eca4e38822a363fbfb72f991170", + "data": "0x0000000000000000000000000000000000000000000000000000000000000f2100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000084eed0000000000000000000000000000000000000000000000000000000000084eed", + "blockHash": "0x80cfa8ea84e4637fe148dfb1488b48b21864c6e2d14631cbe2c47526ff3bd27a", + "blockNumber": "0xa06f9", + "transactionHash": "0xc25ca9b0d2a50eba7cec62481c5c83f9222786f3c29479977ff1182a2871c768", "transactionIndex": "0x1", "logIndex": "0x2", "removed": false } ], - "logsBloom": "0x00000000000000000000000000000000400800000000000000000000000000000008400000000000000000010000000010000000000000000000020000000000000002000000000000000000000002000000000000000000000000000000000800040000020000000000000000000800002000000000000000000000000004000000000000000000000000000000800000000000000000000000000000000000000400000000000000400000000000000000000000000000000002000100000000000020000000100001000000000000000000000000002000000000000020000000000000010000000000000000000000000000000004000000000000000000", + "logsBloom": "0x00000000000000000000000000000000400800000000000000000000000000000008000000000000000000010000000000000000000000000000020000000000000000000000000000000000000002000000000000001000000000000000000802000000020000000000000000000800002000000000000000000010000004000000000000000000000000000000800000000000000000000000000000000000000400000000000000400000000000000000000000000000000002000100000000000020000000100041000000000000000000000000000000000000001020200000000000010000000000000000000000000000000000000000000000000000", "type": "0x2", - "transactionHash": "0x8cc00818699e26f0978aa2f780cfcbd559b68eca4e38822a363fbfb72f991170", + "transactionHash": "0xc25ca9b0d2a50eba7cec62481c5c83f9222786f3c29479977ff1182a2871c768", "transactionIndex": "0x1", - "blockHash": "0x9f30ba790a3a72a7ed717deacebefaeded409ea5033b3597f45eb759b61b51d4", - "blockNumber": "0x3c31a", - "gasUsed": "0x7ab00", + "blockHash": "0x80cfa8ea84e4637fe148dfb1488b48b21864c6e2d14631cbe2c47526ff3bd27a", + "blockNumber": "0xa06f9", + "gasUsed": "0x42ad5", "effectiveGasPrice": "0x5f5e100", "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", "to": "0x2843c269d2a64ecfa63548e8b3fc0fd23b7f70cb", "contractAddress": null, - "gasUsedForL1": "0x4ffed", - "l1BlockNumber": "0x141c788" + "gasUsedForL1": "0x17f89", + "l1BlockNumber": "0x1467e19" } ], "libraries": [], "pending": [], "returns": {}, - "timestamp": 1730407994, + "timestamp": 1734134256, "chain": 7887, - "commit": "4e7a32b" + "commit": "6890bd4" } \ No newline at end of file diff --git a/broadcast/fund-faucets.s.sol/7887/run-1734040112.json b/broadcast/fund-faucets.s.sol/7887/run-1734040112.json new file mode 100644 index 00000000..e29fdda9 --- /dev/null +++ b/broadcast/fund-faucets.s.sol/7887/run-1734040112.json @@ -0,0 +1,50 @@ +{ + "transactions": [ + { + "hash": "0xbe47b43594af3097b4d55fcede2891ad1b82978596e32e97606de953e25064d1", + "transactionType": "CALL", + "contractName": null, + "contractAddress": "0x8a4720488ca32f1223ccfe5a087e250fe3bc5d75", + "function": "sendMoneyToAccount(address)", + "arguments": [ + "0x0719D47A213149E2Ef8d3f5afDaDA8a8E22dfc03" + ], + "transaction": { + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": "0x8a4720488ca32f1223ccfe5a087e250fe3bc5d75", + "value": "0x3782dace9d90000", + "input": "0x08aae1630000000000000000000000000719d47a213149e2ef8d3f5afdada8a8e22dfc03", + "nonce": "0x4b8ab", + "chainId": "0x1ecf" + }, + "additionalContracts": [], + "isFixedGasLimit": false + } + ], + "receipts": [ + { + "status": "0x1", + "cumulativeGasUsed": "0x1536c", + "logs": [], + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "type": "0x2", + "transactionHash": "0xbe47b43594af3097b4d55fcede2891ad1b82978596e32e97606de953e25064d1", + "transactionIndex": "0x1", + "blockHash": "0x4299dd7fab26d12bd0b7baf7789e0791005079a3a1f1e8b206b6f9586771819f", + "blockNumber": "0x9e35e", + "gasUsed": "0x1536c", + "effectiveGasPrice": "0x5f5e100", + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": "0x8a4720488ca32f1223ccfe5a087e250fe3bc5d75", + "contractAddress": null, + "gasUsedForL1": "0x4dcd", + "l1BlockNumber": "0x1465f9d" + } + ], + "libraries": [], + "pending": [], + "returns": {}, + "timestamp": 1734040112, + "chain": 7887, + "commit": "cfac64e" +} \ No newline at end of file diff --git a/broadcast/fund-faucets.s.sol/7887/run-latest.json b/broadcast/fund-faucets.s.sol/7887/run-latest.json new file mode 100644 index 00000000..e29fdda9 --- /dev/null +++ b/broadcast/fund-faucets.s.sol/7887/run-latest.json @@ -0,0 +1,50 @@ +{ + "transactions": [ + { + "hash": "0xbe47b43594af3097b4d55fcede2891ad1b82978596e32e97606de953e25064d1", + "transactionType": "CALL", + "contractName": null, + "contractAddress": "0x8a4720488ca32f1223ccfe5a087e250fe3bc5d75", + "function": "sendMoneyToAccount(address)", + "arguments": [ + "0x0719D47A213149E2Ef8d3f5afDaDA8a8E22dfc03" + ], + "transaction": { + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": "0x8a4720488ca32f1223ccfe5a087e250fe3bc5d75", + "value": "0x3782dace9d90000", + "input": "0x08aae1630000000000000000000000000719d47a213149e2ef8d3f5afdada8a8e22dfc03", + "nonce": "0x4b8ab", + "chainId": "0x1ecf" + }, + "additionalContracts": [], + "isFixedGasLimit": false + } + ], + "receipts": [ + { + "status": "0x1", + "cumulativeGasUsed": "0x1536c", + "logs": [], + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "type": "0x2", + "transactionHash": "0xbe47b43594af3097b4d55fcede2891ad1b82978596e32e97606de953e25064d1", + "transactionIndex": "0x1", + "blockHash": "0x4299dd7fab26d12bd0b7baf7789e0791005079a3a1f1e8b206b6f9586771819f", + "blockNumber": "0x9e35e", + "gasUsed": "0x1536c", + "effectiveGasPrice": "0x5f5e100", + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": "0x8a4720488ca32f1223ccfe5a087e250fe3bc5d75", + "contractAddress": null, + "gasUsedForL1": "0x4dcd", + "l1BlockNumber": "0x1465f9d" + } + ], + "libraries": [], + "pending": [], + "returns": {}, + "timestamp": 1734040112, + "chain": 7887, + "commit": "cfac64e" +} \ No newline at end of file diff --git a/script/actions/fund-faucets.s.sol b/script/actions/fund-faucets.s.sol index 74d81fa1..d9ba151d 100644 --- a/script/actions/fund-faucets.s.sol +++ b/script/actions/fund-faucets.s.sol @@ -57,8 +57,8 @@ contract FundFaucetsScript is MigrationHelper { address[3] memory apps = [KINTO_CORE, DINARI, SOCKET_DL]; string[3] memory appNames = ["KINTO_CORE", "DINARI", "SOCKET_DL"]; - uint56[3] memory appLimits = [0.02 ether, 0.02 ether, 0.02 ether]; - uint56[3] memory appAmounts = [0.01 ether, 0.01 ether, 0.01 ether]; + uint56[3] memory appLimits = [0.05 ether, 0.05 ether, 0.05 ether]; + uint64[3] memory appAmounts = [0.2 ether, 0.2 ether, 0.2 ether]; SponsorPaymaster paymaster = SponsorPaymaster(_getChainDeployment("SponsorPaymaster")); for (uint256 index = 0; index < apps.length; index++) { diff --git a/script/migrations/112-upgrade_distr.s.sol b/script/migrations/112-upgrade_distr.s.sol index 8a2dcf92..9662bebe 100644 --- a/script/migrations/112-upgrade_distr.s.sol +++ b/script/migrations/112-upgrade_distr.s.sol @@ -18,7 +18,7 @@ contract UpgradeDistributorScript is MigrationHelper { ) ); - address impl = _deployImplementationAndUpgrade("RewardsDistributor", "V7", bytecode); + address impl = _deployImplementationAndUpgrade("RewardsDistributor", "V8", bytecode); RewardsDistributor distr = RewardsDistributor(_getChainDeployment("RewardsDistributor")); @@ -26,6 +26,6 @@ contract UpgradeDistributorScript is MigrationHelper { assertEq(distr.startTime(), LIQUIDITY_MINING_START_DATE); assertEq(distr.walletFactory(), _getChainDeployment("KintoWalletFactory")); - saveContractAddress("RewardsDistributorV7-impl", impl); + saveContractAddress("RewardsDistributorV8-impl", impl); } } diff --git a/src/liquidity-mining/RewardsDistributor.sol b/src/liquidity-mining/RewardsDistributor.sol index 14b5333f..d07544fa 100644 --- a/src/liquidity-mining/RewardsDistributor.sol +++ b/src/liquidity-mining/RewardsDistributor.sol @@ -126,6 +126,9 @@ contract RewardsDistributor is Initializable, UUPSUpgradeable, ReentrancyGuardUp /// @notice New user rewards timestmap uint256 public constant NEW_USER_REWARD_TIMESTAMP = 1729785402; + /// @notice New user rewards end timestmap + uint256 public constant NEW_USER_REWARD_END_TIMESTAMP = 1734133547; + /* ============ State Variables ============ */ /// @notice The root of the merkle tree for Kinto token distribition. @@ -269,21 +272,9 @@ contract RewardsDistributor is Initializable, UUPSUpgradeable, ReentrancyGuardUp } /** - * @notice Allows a new user to claim the new user reward. - * @param wallet The address of the wallet to claim the reward for. + * @notice Does nothing. Remove upon the upgrade of KintoWalletFactory */ - function newUserClaim(address wallet) external nonReentrant { - if (msg.sender != walletFactory) { - revert OnlyWalletFactory(msg.sender); - } - if (_claimedByUser[wallet] > 0) { - revert AlreadyClaimed(wallet); - } - _claimedByUser[wallet] += NEW_USER_REWARD; - totalClaimed += NEW_USER_REWARD; - KINTO.safeTransfer(wallet, NEW_USER_REWARD); - emit NewUserReward(wallet, NEW_USER_REWARD); - } + function newUserClaim(address) external {} /** * @notice Updates the root of the Merkle tree. @@ -386,7 +377,8 @@ contract RewardsDistributor is Initializable, UUPSUpgradeable, ReentrancyGuardUp */ function claimedByUser(address wallet) public view returns (uint256) { uint256 claimed = _claimedByUser[wallet]; - if (IKintoWalletFactory(walletFactory).getWalletTimestamp(wallet) >= NEW_USER_REWARD_TIMESTAMP) { + uint256 walletTs = IKintoWalletFactory(walletFactory).getWalletTimestamp(wallet); + if (walletTs >= NEW_USER_REWARD_TIMESTAMP && walletTs < NEW_USER_REWARD_END_TIMESTAMP) { // Offset K bonus for new users after the launch of the rewards program return claimed >= NEW_USER_REWARD ? claimed - NEW_USER_REWARD : claimed; } diff --git a/src/wallet/KintoWalletFactory.sol b/src/wallet/KintoWalletFactory.sol index 6058bad8..1cfd458d 100644 --- a/src/wallet/KintoWalletFactory.sol +++ b/src/wallet/KintoWalletFactory.sol @@ -133,7 +133,7 @@ contract KintoWalletFactory is Initializable, UUPSUpgradeable, OwnableUpgradeabl walletTs[address(ret)] = block.timestamp; totalWallets++; - // Claim new user rewards + // TODO: Remove upon next upgrade. This call does nothing. rewardsDistributor.newUserClaim(address(ret)); emit KintoWalletFactoryCreation(address(ret), owner, factoryWalletVersion); } diff --git a/test/artifacts/7887/addresses.json b/test/artifacts/7887/addresses.json index 5c8efc1e..151659ce 100644 --- a/test/artifacts/7887/addresses.json +++ b/test/artifacts/7887/addresses.json @@ -245,5 +245,6 @@ "KintoAppRegistryV22": "0xb9cE6BC89b79c713f34fd15D82a70900fEFD0de1", "KintoIDV9-impl": "0x7CFe474936fA50181ae7c2C43EeB8806e25bc983", "SponsorPaymasterV15-impl": "0x2A10b80bE8Ee546C52Fde9b58d65D089C6B929BB", - "KintoIDV10-impl": "0xaa0726829d41E3C70B84Bc5390cce82afC56871A" + "KintoIDV10-impl": "0xaa0726829d41E3C70B84Bc5390cce82afC56871A", + "RewardsDistributorV8-impl": "0xF3D955B4cF3489A37027f0F3484E87328dBdBB39" } \ No newline at end of file diff --git a/test/unit/KintoWalletFactory.t.sol b/test/unit/KintoWalletFactory.t.sol index abc78fce..1a818229 100644 --- a/test/unit/KintoWalletFactory.t.sol +++ b/test/unit/KintoWalletFactory.t.sol @@ -69,8 +69,8 @@ contract KintoWalletFactoryTest is SharedSetup { _kintoWallet = _walletFactory.createAccount(_owner, _owner, 0); assertEq(_kintoWallet.owners(0), _owner); - assertEq(_bridgedKinto.balanceOf(address(_kintoWallet)), 1e18); - assertEq(_rewardsDistributor.claimedByUser(address(_kintoWallet)), 1e18); + assertEq(_bridgedKinto.balanceOf(address(_kintoWallet)), 0); + assertEq(_rewardsDistributor.claimedByUser(address(_kintoWallet)), 0); } function testCreateAccount_WhenAfterNewRewards() public { @@ -82,7 +82,7 @@ contract KintoWalletFactoryTest is SharedSetup { _kintoWallet = _walletFactory.createAccount(_owner, _owner, 0); assertEq(_kintoWallet.owners(0), _owner); - assertEq(_bridgedKinto.balanceOf(address(_kintoWallet)), 1e18); + assertEq(_bridgedKinto.balanceOf(address(_kintoWallet)), 0); assertEq(_rewardsDistributor.claimedByUser(address(_kintoWallet)), 0); } diff --git a/test/unit/liquidity-mining/RewardsDistributor.t.sol b/test/unit/liquidity-mining/RewardsDistributor.t.sol index d784aee8..8c15c658 100644 --- a/test/unit/liquidity-mining/RewardsDistributor.t.sol +++ b/test/unit/liquidity-mining/RewardsDistributor.t.sol @@ -383,18 +383,4 @@ contract RewardsDistributorTest is SharedSetup { 38978619272429166666666 ); // 39k for a 30 days in 11'th quarter } - - function testNewUserClaim_RevertWhen_NotFactory() public { - vm.expectRevert(abi.encodeWithSelector(RewardsDistributor.OnlyWalletFactory.selector, address(this))); - distributor.newUserClaim(address(_kintoWallet)); - } - - function testNewUserClaim_RevertWhen_AlreadyClaimed() public { - vm.prank(address(_owner)); - _kintoWallet = _walletFactory.createAccount(_owner, _owner, 0); - - vm.expectRevert(abi.encodeWithSelector(RewardsDistributor.AlreadyClaimed.selector, address(_kintoWallet))); - vm.prank(address(_walletFactory)); - _rewardsDistributor.newUserClaim(address(_kintoWallet)); - } }