diff --git a/contracts/src/v0.8/automation/testhelpers/SimpleLogUpkeepCounter.sol b/contracts/src/v0.8/automation/testhelpers/SimpleLogUpkeepCounter.sol index 062b716fc74..d37f51e3893 100644 --- a/contracts/src/v0.8/automation/testhelpers/SimpleLogUpkeepCounter.sol +++ b/contracts/src/v0.8/automation/testhelpers/SimpleLogUpkeepCounter.sol @@ -116,15 +116,16 @@ contract SimpleLogUpkeepCounter is ILogAutomation, StreamsLookupCompatibleInterf lastBlock = block.number; counter = counter + 1; previousPerformBlock = lastBlock; - (Log memory log, uint256 checkBlock, bytes memory extraData) = abi.decode(performData, (Log, uint256, bytes)); + (, bytes memory extraData) = abi.decode(performData, (bytes[], bytes)); + (Log memory log, uint256 checkBlock, bytes memory checkData) = abi.decode(extraData, (Log, uint256, bytes)); timeToPerform = block.timestamp - log.timestamp; isRecovered = false; if (checkBlock != log.blockNumber) { isRecovered = true; } - (, , uint256 performBurnAmount, bytes32 eventSig) = abi.decode( - extraData, - (bytes[], uint256, uint256, bytes32) + (, uint256 performBurnAmount, bytes32 eventSig) = abi.decode( + checkData, + (uint256, uint256, bytes32) ); uint256 startGas = gasleft(); bytes32 dummyIndex = blockhash(block.number - 1); diff --git a/core/gethwrappers/generated/simple_log_upkeep_counter_wrapper/simple_log_upkeep_counter_wrapper.go b/core/gethwrappers/generated/simple_log_upkeep_counter_wrapper/simple_log_upkeep_counter_wrapper.go index 7985130c9ed..4db53d06e5b 100644 --- a/core/gethwrappers/generated/simple_log_upkeep_counter_wrapper/simple_log_upkeep_counter_wrapper.go +++ b/core/gethwrappers/generated/simple_log_upkeep_counter_wrapper/simple_log_upkeep_counter_wrapper.go @@ -49,7 +49,7 @@ type Log struct { var SimpleLogUpkeepCounterMetaData = &bind.MetaData{ ABI: "[{\"inputs\":[{\"internalType\":\"bool\",\"name\":\"_isStreamsLookup\",\"type\":\"bool\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"feedParamKey\",\"type\":\"string\"},{\"internalType\":\"string[]\",\"name\":\"feeds\",\"type\":\"string[]\"},{\"internalType\":\"string\",\"name\":\"timeParamKey\",\"type\":\"string\"},{\"internalType\":\"uint256\",\"name\":\"time\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"extraData\",\"type\":\"bytes\"}],\"name\":\"StreamsLookup\",\"type\":\"error\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"initialBlock\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"lastBlock\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"previousBlock\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"counter\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"timeToPerform\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"bool\",\"name\":\"isRecovered\",\"type\":\"bool\"}],\"name\":\"PerformingUpkeep\",\"type\":\"event\"},{\"inputs\":[{\"components\":[{\"internalType\":\"uint256\",\"name\":\"checkBurnAmount\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"performBurnAmount\",\"type\":\"uint256\"},{\"internalType\":\"bytes32\",\"name\":\"eventSig\",\"type\":\"bytes32\"}],\"internalType\":\"structCheckData\",\"name\":\"\",\"type\":\"tuple\"}],\"name\":\"_checkDataConfig\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes[]\",\"name\":\"values\",\"type\":\"bytes[]\"},{\"internalType\":\"bytes\",\"name\":\"extraData\",\"type\":\"bytes\"}],\"name\":\"checkCallback\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"},{\"internalType\":\"bytes\",\"name\":\"\",\"type\":\"bytes\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"errCode\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"extraData\",\"type\":\"bytes\"}],\"name\":\"checkErrorHandler\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"upkeepNeeded\",\"type\":\"bool\"},{\"internalType\":\"bytes\",\"name\":\"performData\",\"type\":\"bytes\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"uint256\",\"name\":\"index\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"timestamp\",\"type\":\"uint256\"},{\"internalType\":\"bytes32\",\"name\":\"txHash\",\"type\":\"bytes32\"},{\"internalType\":\"uint256\",\"name\":\"blockNumber\",\"type\":\"uint256\"},{\"internalType\":\"bytes32\",\"name\":\"blockHash\",\"type\":\"bytes32\"},{\"internalType\":\"address\",\"name\":\"source\",\"type\":\"address\"},{\"internalType\":\"bytes32[]\",\"name\":\"topics\",\"type\":\"bytes32[]\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"internalType\":\"structLog\",\"name\":\"log\",\"type\":\"tuple\"},{\"internalType\":\"bytes\",\"name\":\"checkData\",\"type\":\"bytes\"}],\"name\":\"checkLog\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"},{\"internalType\":\"bytes\",\"name\":\"\",\"type\":\"bytes\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"counter\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"name\":\"dummyMap\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"feedParamKey\",\"outputs\":[{\"internalType\":\"string\",\"name\":\"\",\"type\":\"string\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"feedsHex\",\"outputs\":[{\"internalType\":\"string\",\"name\":\"\",\"type\":\"string\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"initialBlock\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"isStreamsLookup\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"lastBlock\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"performData\",\"type\":\"bytes\"}],\"name\":\"performUpkeep\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"previousPerformBlock\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"feedParam\",\"type\":\"string\"}],\"name\":\"setFeedParamKey\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"string[]\",\"name\":\"newFeeds\",\"type\":\"string[]\"}],\"name\":\"setFeedsHex\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bool\",\"name\":\"value\",\"type\":\"bool\"}],\"name\":\"setShouldRetryOnErrorBool\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"timeParam\",\"type\":\"string\"}],\"name\":\"setTimeParamKey\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"shouldRetryOnError\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"timeParamKey\",\"outputs\":[{\"internalType\":\"string\",\"name\":\"\",\"type\":\"string\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"timeToPerform\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"}]", - Bin: "0x60e0604052600860a090815267030783030303230360c41b60c05260809081526200002f906007906001620000f3565b50604080518082019091526007808252666665656449447360c81b6020909201918252620000609160089162000157565b5060408051808201909152600980825268074696d657374616d760bc1b602090920191825262000091918162000157565b503480156200009f57600080fd5b5060405162001cd138038062001cd1833981016040819052620000c2916200025c565b60006002819055436001556003819055600455600680549115156101000261ff0019909216919091179055620002c4565b82805482825590600052602060002090810192821562000145579160200282015b828111156200014557825180516200013491849160209091019062000157565b509160200191906001019062000114565b5062000153929150620001e2565b5090565b828054620001659062000287565b90600052602060002090601f016020900481019282620001895760008555620001d4565b82601f10620001a457805160ff1916838001178555620001d4565b82800160010185558215620001d4579182015b82811115620001d4578251825591602001919060010190620001b7565b506200015392915062000203565b8082111562000153576000620001f982826200021a565b50600101620001e2565b5b8082111562000153576000815560010162000204565b508054620002289062000287565b6000825580601f1062000239575050565b601f01602090049060005260206000209081019062000259919062000203565b50565b6000602082840312156200026f57600080fd5b815180151581146200028057600080fd5b9392505050565b600181811c908216806200029c57607f821691505b60208210811415620002be57634e487b7160e01b600052602260045260246000fd5b50919050565b6119fd80620002d46000396000f3fe608060405234801561001057600080fd5b506004361061016c5760003560e01c806361bc221a116100cd5780639525d57411610081578063afb28d1f11610066578063afb28d1f14610310578063c6066f0d14610318578063c98f10b01461032157600080fd5b80639525d574146102dd5780639d6f1cc7146102f057600080fd5b80637145f11b116100b25780637145f11b146102a8578063806b984f146102cb578063917d895f146102d457600080fd5b806361bc221a1461028e578063697794731461029757600080fd5b806340691db4116101245780634585e33b116101095780634585e33b146102555780634b56a42e14610268578063601d5a711461027b57600080fd5b806340691db41461022f57806342eb3d921461024257600080fd5b806313fab5901161015557806313fab590146101b057806323148cee146101f65780632cb158641461021857600080fd5b806305e25131146101715780630fb172fb14610186575b600080fd5b61018461017f366004610eb5565b610329565b005b6101996101943660046111ff565b610340565b6040516101a79291906114b6565b60405180910390f35b6101846101be366004610f6d565b6006805491151562010000027fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ffff909216919091179055565b60065461020890610100900460ff1681565b60405190151581526020016101a7565b61022160035481565b6040519081526020016101a7565b61019961023d36600461108a565b610447565b6006546102089062010000900460ff1681565b610184610263366004610faf565b6106c9565b610199610276366004610ccb565b610914565b610184610289366004610ff1565b610968565b61022160045481565b6101846102a536600461102e565b50565b6102086102b6366004610f96565b60006020819052908152604090205460ff1681565b61022160015481565b61022160025481565b6101846102eb366004610ff1565b61097b565b6103036102fe366004610f96565b61098e565b6040516101a791906114d1565b610303610a3a565b61022160055481565b610303610a47565b805161033c906007906020840190610a54565b5050565b6040805160028082526060828101909352600092918391816020015b606081526020019060019003908161035c575050604080516020810188905291925001604051602081830303815290604052816000815181106103a1576103a1611992565b6020026020010181905250836040516020016103bd91906114d1565b604051602081830303815290604052816001815181106103df576103df611992565b6020026020010181905250600081856040516020016103ff929190611422565b604080518083037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe001815291905260065462010000900460ff169450925050505b9250929050565b6000606081806104598587018761123c565b925050915060005a905060006104706001436118c8565b409050600084156104df575b845a61048890856118c8565b10156104df578080156104a9575060008281526020819052604090205460ff165b6040805160208101859052309181019190915290915060600160405160208183030381529060405280519060200120915061047c565b60408051600280825260608201909252600091816020015b60608152602001906001900390816104f7579050506040805160006020820152919250016040516020818303038152906040528160008151811061053d5761053d611992565b60200260200101819052506000604051602001610563919060ff91909116815260200190565b6040516020818303038152906040528160018151811061058557610585611992565b602002602001018190525060008b438c8c6040516020016105a994939291906115a7565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190529050856105e760c08e018e61169a565b60028181106105f8576105f8611992565b90506020020135141561069157600654610100900460ff161561065d5760086007600943846040517ff055e4a20000000000000000000000000000000000000000000000000000000081526004016106549594939291906114e4565b60405180910390fd5b60018282604051602001610672929190611422565b60405160208183030381529060405298509850505050505050506106c1565b600082826040516020016106a6929190611422565b60405160208183030381529060405298509850505050505050505b935093915050565b6003546106d557436003555b4360019081556004546106e7916118b0565b60045560015460025560008080610700848601866110fc565b92509250925082602001514261071691906118c8565b600555600680547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001690556060830151821461077857600680547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001660011790555b6000808280602001905181019061078f9190610da5565b93509350505060005a905060006107a76001436118c8565b4090506000838860c001516002815181106107c4576107c4611992565b602002602001015114610833576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f496e76616c6964206576656e74207369676e61747572650000000000000000006044820152606401610654565b841561089d575b845a61084690856118c8565b101561089d57808015610867575060008281526020819052604090205460ff165b6040805160208101859052309181019190915290915060600160405160208183030381529060405280519060200120915061083a565b600354600154600254600454600554600654604080519687526020870195909552938501929092526060840152608083015260ff16151560a082015232907f29eff4cb37911c3ea85db4630638cc5474fdd0631ec42215aef1d7ec96c8e63d9060c00160405180910390a250505050505050505050565b600060606000848460405160200161092d929190611422565b604080518083037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe00181529190526001969095509350505050565b805161033c906009906020840190610ab1565b805161033c906008906020840190610ab1565b6007818154811061099e57600080fd5b9060005260206000200160009150905080546109b99061190f565b80601f01602080910402602001604051908101604052809291908181526020018280546109e59061190f565b8015610a325780601f10610a0757610100808354040283529160200191610a32565b820191906000526020600020905b815481529060010190602001808311610a1557829003601f168201915b505050505081565b600880546109b99061190f565b600980546109b99061190f565b828054828255906000526020600020908101928215610aa1579160200282015b82811115610aa15782518051610a91918491602090910190610ab1565b5091602001919060010190610a74565b50610aad929150610b31565b5090565b828054610abd9061190f565b90600052602060002090601f016020900481019282610adf5760008555610b25565b82601f10610af857805160ff1916838001178555610b25565b82800160010185558215610b25579182015b82811115610b25578251825591602001919060010190610b0a565b50610aad929150610b4e565b80821115610aad576000610b458282610b63565b50600101610b31565b5b80821115610aad5760008155600101610b4f565b508054610b6f9061190f565b6000825580601f10610b7f575050565b601f0160209004906000526020600020908101906102a59190610b4e565b803573ffffffffffffffffffffffffffffffffffffffff81168114610bc157600080fd5b919050565b600082601f830112610bd757600080fd5b81356020610bec610be78361177b565b61172c565b80838252828201915082860187848660051b8901011115610c0c57600080fd5b60005b85811015610c2b57813584529284019290840190600101610c0f565b5090979650505050505050565b60008083601f840112610c4a57600080fd5b50813567ffffffffffffffff811115610c6257600080fd5b60208301915083602082850101111561044057600080fd5b600082601f830112610c8b57600080fd5b8135610c99610be78261179f565b818152846020838601011115610cae57600080fd5b816020850160208301376000918101602001919091529392505050565b60008060408385031215610cde57600080fd5b823567ffffffffffffffff80821115610cf657600080fd5b818501915085601f830112610d0a57600080fd5b81356020610d1a610be78361177b565b8083825282820191508286018a848660051b8901011115610d3a57600080fd5b60005b85811015610d7557813587811115610d5457600080fd5b610d628d87838c0101610c7a565b8552509284019290840190600101610d3d565b50909750505086013592505080821115610d8e57600080fd5b50610d9b85828601610c7a565b9150509250929050565b60008060008060808587031215610dbb57600080fd5b845167ffffffffffffffff80821115610dd357600080fd5b818701915087601f830112610de757600080fd5b8151610df5610be78261177b565b80828252602082019150602085018b60208560051b8801011115610e1857600080fd5b60005b84811015610e9157815186811115610e3257600080fd5b8701603f81018e13610e4357600080fd5b6020810151610e54610be78261179f565b8181528f6040838501011115610e6957600080fd5b610e7a8260208301604086016118df565b865250506020938401939190910190600101610e1b565b505060208a015160408b01516060909b0151919c909b509098509650505050505050565b60006020808385031215610ec857600080fd5b823567ffffffffffffffff80821115610ee057600080fd5b818501915085601f830112610ef457600080fd5b8135610f02610be78261177b565b80828252858201915085850189878560051b8801011115610f2257600080fd5b6000805b85811015610f5d57823587811115610f3c578283fd5b610f4a8d8b838c0101610c7a565b8652509388019391880191600101610f26565b50919a9950505050505050505050565b600060208284031215610f7f57600080fd5b81358015158114610f8f57600080fd5b9392505050565b600060208284031215610fa857600080fd5b5035919050565b60008060208385031215610fc257600080fd5b823567ffffffffffffffff811115610fd957600080fd5b610fe585828601610c38565b90969095509350505050565b60006020828403121561100357600080fd5b813567ffffffffffffffff81111561101a57600080fd5b61102684828501610c7a565b949350505050565b60006060828403121561104057600080fd5b6040516060810181811067ffffffffffffffff82111715611063576110636119c1565b80604052508235815260208301356020820152604083013560408201528091505092915050565b60008060006040848603121561109f57600080fd5b833567ffffffffffffffff808211156110b757600080fd5b9085019061010082880312156110cc57600080fd5b909350602085013590808211156110e257600080fd5b506110ef86828701610c38565b9497909650939450505050565b60008060006060848603121561111157600080fd5b833567ffffffffffffffff8082111561112957600080fd5b90850190610100828803121561113e57600080fd5b611146611702565b823581526020830135602082015260408301356040820152606083013560608201526080830135608082015261117e60a08401610b9d565b60a082015260c08301358281111561119557600080fd5b6111a189828601610bc6565b60c08301525060e0830135828111156111b957600080fd5b6111c589828601610c7a565b60e08301525094506020860135935060408601359150808211156111e857600080fd5b506111f586828701610c7a565b9150509250925092565b6000806040838503121561121257600080fd5b82359150602083013567ffffffffffffffff81111561123057600080fd5b610d9b85828601610c7a565b60008060006060848603121561125157600080fd5b505081359360208301359350604090920135919050565b81835260007f07ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff83111561129a57600080fd5b8260051b8083602087013760009401602001938452509192915050565b8183528181602085013750600060208284010152600060207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f840116840101905092915050565b600081518084526113188160208601602086016118df565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b8054600090600181811c908083168061136457607f831692505b602080841082141561139f577f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b8388528180156113b657600181146113e857611416565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff008616828a0152604089019650611416565b876000528160002060005b8681101561140e5781548b82018501529085019083016113f3565b8a0183019750505b50505050505092915050565b6000604082016040835280855180835260608501915060608160051b8601019250602080880160005b83811015611497577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0888703018552611485868351611300565b9550938201939082019060010161144b565b5050858403818701525050506114ad8185611300565b95945050505050565b82151581526040602082015260006110266040830184611300565b602081526000610f8f6020830184611300565b60a0815260006114f760a083018861134a565b6020838203818501528188548084528284019150828160051b8501018a6000528360002060005b83811015611569577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0878403018552611557838361134a565b9486019492506001918201910161151e565b5050868103604088015261157d818b61134a565b945050505050846060840152828103608084015261159b8185611300565b98975050505050505050565b606081528435606082015260208501356080820152604085013560a0820152606085013560c0820152608085013560e082015260006115e860a08701610b9d565b61010073ffffffffffffffffffffffffffffffffffffffff82168185015261161360c08901896117e5565b92508161012086015261162b61016086018483611268565b9250505061163c60e088018861184c565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0858403016101408601526116728382846112b7565b92505050856020840152828103604084015261168f8185876112b7565b979650505050505050565b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe18436030181126116cf57600080fd5b83018035915067ffffffffffffffff8211156116ea57600080fd5b6020019150600581901b360382131561044057600080fd5b604051610100810167ffffffffffffffff81118282101715611726576117266119c1565b60405290565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff81118282101715611773576117736119c1565b604052919050565b600067ffffffffffffffff821115611795576117956119c1565b5060051b60200190565b600067ffffffffffffffff8211156117b9576117b96119c1565b50601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe01660200190565b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe184360301811261181a57600080fd5b830160208101925035905067ffffffffffffffff81111561183a57600080fd5b8060051b360383131561044057600080fd5b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe184360301811261188157600080fd5b830160208101925035905067ffffffffffffffff8111156118a157600080fd5b80360383131561044057600080fd5b600082198211156118c3576118c3611963565b500190565b6000828210156118da576118da611963565b500390565b60005b838110156118fa5781810151838201526020016118e2565b83811115611909576000848401525b50505050565b600181811c9082168061192357607f821691505b6020821081141561195d577f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b50919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fdfea164736f6c6343000806000a", + Bin: "0x60e0604052600860a090815267030783030303230360c41b60c05260809081526200002f906007906001620000f3565b50604080518082019091526007808252666665656449447360c81b6020909201918252620000609160089162000157565b5060408051808201909152600980825268074696d657374616d760bc1b602090920191825262000091918162000157565b503480156200009f57600080fd5b5060405162001c6038038062001c60833981016040819052620000c2916200025c565b60006002819055436001556003819055600455600680549115156101000261ff0019909216919091179055620002c4565b82805482825590600052602060002090810192821562000145579160200282015b828111156200014557825180516200013491849160209091019062000157565b509160200191906001019062000114565b5062000153929150620001e2565b5090565b828054620001659062000287565b90600052602060002090601f016020900481019282620001895760008555620001d4565b82601f10620001a457805160ff1916838001178555620001d4565b82800160010185558215620001d4579182015b82811115620001d4578251825591602001919060010190620001b7565b506200015392915062000203565b8082111562000153576000620001f982826200021a565b50600101620001e2565b5b8082111562000153576000815560010162000204565b508054620002289062000287565b6000825580601f1062000239575050565b601f01602090049060005260206000209081019062000259919062000203565b50565b6000602082840312156200026f57600080fd5b815180151581146200028057600080fd5b9392505050565b600181811c908216806200029c57607f821691505b60208210811415620002be57634e487b7160e01b600052602260045260246000fd5b50919050565b61198c80620002d46000396000f3fe608060405234801561001057600080fd5b506004361061016c5760003560e01c806361bc221a116100cd5780639525d57411610081578063afb28d1f11610066578063afb28d1f14610310578063c6066f0d14610318578063c98f10b01461032157600080fd5b80639525d574146102dd5780639d6f1cc7146102f057600080fd5b80637145f11b116100b25780637145f11b146102a8578063806b984f146102cb578063917d895f146102d457600080fd5b806361bc221a1461028e578063697794731461029757600080fd5b806340691db4116101245780634585e33b116101095780634585e33b146102555780634b56a42e14610268578063601d5a711461027b57600080fd5b806340691db41461022f57806342eb3d921461024257600080fd5b806313fab5901161015557806313fab590146101b057806323148cee146101f65780632cb158641461021857600080fd5b806305e25131146101715780630fb172fb14610186575b600080fd5b61018461017f366004610df3565b610329565b005b610199610194366004611136565b610340565b6040516101a792919061141b565b60405180910390f35b6101846101be366004610eab565b6006805491151562010000027fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ffff909216919091179055565b60065461020890610100900460ff1681565b60405190151581526020016101a7565b61022160035481565b6040519081526020016101a7565b61019961023d366004610fc0565b610447565b6006546102089062010000900460ff1681565b610184610263366004610eed565b6106c9565b610199610276366004610d19565b61092e565b610184610289366004610f2f565b610982565b61022160045481565b6101846102a5366004610f64565b50565b6102086102b6366004610ed4565b60006020819052908152604090205460ff1681565b61022160015481565b61022160025481565b6101846102eb366004610f2f565b610995565b6103036102fe366004610ed4565b6109a8565b6040516101a79190611436565b610303610a54565b61022160055481565b610303610a61565b805161033c906007906020840190610a6e565b5050565b6040805160028082526060828101909352600092918391816020015b606081526020019060019003908161035c575050604080516020810188905291925001604051602081830303815290604052816000815181106103a1576103a16118ff565b6020026020010181905250836040516020016103bd9190611436565b604051602081830303815290604052816001815181106103df576103df6118ff565b6020026020010181905250600081856040516020016103ff929190611387565b604080518083037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe001815291905260065462010000900460ff169450925050505b9250929050565b60006060818061045985870187611173565b925050915060005a90506000610470600143611835565b409050600084156104df575b845a6104889085611835565b10156104df578080156104a9575060008281526020819052604090205460ff165b6040805160208101859052309181019190915290915060600160405160208183030381529060405280519060200120915061047c565b60408051600280825260608201909252600091816020015b60608152602001906001900390816104f7579050506040805160006020820152919250016040516020818303038152906040528160008151811061053d5761053d6118ff565b60200260200101819052506000604051602001610563919060ff91909116815260200190565b60405160208183030381529060405281600181518110610585576105856118ff565b602002602001018190525060008b438c8c6040516020016105a9949392919061150c565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190529050856105e760c08e018e611607565b60028181106105f8576105f86118ff565b90506020020135141561069157600654610100900460ff161561065d5760086007600943846040517ff055e4a2000000000000000000000000000000000000000000000000000000008152600401610654959493929190611449565b60405180910390fd5b60018282604051602001610672929190611387565b60405160208183030381529060405298509850505050505050506106c1565b600082826040516020016106a6929190611387565b60405160208183030381529060405298509850505050505050505b935093915050565b6003546106d557436003555b4360019081556004546106e79161181d565b60045560015460025560006106fe82840184610d19565b91505060008060008380602001905181019061071a9190611032565b9250925092508260200151426107309190611835565b600555600680547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001690556060830151821461079257600680547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001660011790555b600080828060200190518101906107a9919061119f565b925092505060005a905060006107c0600143611835565b4090506000838860c001516002815181106107dd576107dd6118ff565b60200260200101511461084c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f496e76616c6964206576656e74207369676e61747572650000000000000000006044820152606401610654565b84156108b6575b845a61085f9085611835565b10156108b657808015610880575060008281526020819052604090205460ff165b60408051602081018590523091810191909152909150606001604051602081830303815290604052805190602001209150610853565b600354600154600254600454600554600654604080519687526020870195909552938501929092526060840152608083015260ff16151560a082015232907f29eff4cb37911c3ea85db4630638cc5474fdd0631ec42215aef1d7ec96c8e63d9060c00160405180910390a25050505050505050505050565b6000606060008484604051602001610947929190611387565b604080518083037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe00181529190526001969095509350505050565b805161033c906009906020840190610acb565b805161033c906008906020840190610acb565b600781815481106109b857600080fd5b9060005260206000200160009150905080546109d39061187c565b80601f01602080910402602001604051908101604052809291908181526020018280546109ff9061187c565b8015610a4c5780601f10610a2157610100808354040283529160200191610a4c565b820191906000526020600020905b815481529060010190602001808311610a2f57829003601f168201915b505050505081565b600880546109d39061187c565b600980546109d39061187c565b828054828255906000526020600020908101928215610abb579160200282015b82811115610abb5782518051610aab918491602090910190610acb565b5091602001919060010190610a8e565b50610ac7929150610b4b565b5090565b828054610ad79061187c565b90600052602060002090601f016020900481019282610af95760008555610b3f565b82601f10610b1257805160ff1916838001178555610b3f565b82800160010185558215610b3f579182015b82811115610b3f578251825591602001919060010190610b24565b50610ac7929150610b68565b80821115610ac7576000610b5f8282610b7d565b50600101610b4b565b5b80821115610ac75760008155600101610b69565b508054610b899061187c565b6000825580601f10610b99575050565b601f0160209004906000526020600020908101906102a59190610b68565b8051610bc28161195d565b919050565b600082601f830112610bd857600080fd5b81516020610bed610be8836116e8565b611699565b80838252828201915082860187848660051b8901011115610c0d57600080fd5b60005b85811015610c2c57815184529284019290840190600101610c10565b5090979650505050505050565b60008083601f840112610c4b57600080fd5b50813567ffffffffffffffff811115610c6357600080fd5b60208301915083602082850101111561044057600080fd5b600082601f830112610c8c57600080fd5b8135610c9a610be88261170c565b818152846020838601011115610caf57600080fd5b816020850160208301376000918101602001919091529392505050565b600082601f830112610cdd57600080fd5b8151610ceb610be88261170c565b818152846020838601011115610d0057600080fd5b610d1182602083016020870161184c565b949350505050565b60008060408385031215610d2c57600080fd5b823567ffffffffffffffff80821115610d4457600080fd5b818501915085601f830112610d5857600080fd5b81356020610d68610be8836116e8565b8083825282820191508286018a848660051b8901011115610d8857600080fd5b60005b85811015610dc357813587811115610da257600080fd5b610db08d87838c0101610c7b565b8552509284019290840190600101610d8b565b50909750505086013592505080821115610ddc57600080fd5b50610de985828601610c7b565b9150509250929050565b60006020808385031215610e0657600080fd5b823567ffffffffffffffff80821115610e1e57600080fd5b818501915085601f830112610e3257600080fd5b8135610e40610be8826116e8565b80828252858201915085850189878560051b8801011115610e6057600080fd5b6000805b85811015610e9b57823587811115610e7a578283fd5b610e888d8b838c0101610c7b565b8652509388019391880191600101610e64565b50919a9950505050505050505050565b600060208284031215610ebd57600080fd5b81358015158114610ecd57600080fd5b9392505050565b600060208284031215610ee657600080fd5b5035919050565b60008060208385031215610f0057600080fd5b823567ffffffffffffffff811115610f1757600080fd5b610f2385828601610c39565b90969095509350505050565b600060208284031215610f4157600080fd5b813567ffffffffffffffff811115610f5857600080fd5b610d1184828501610c7b565b600060608284031215610f7657600080fd5b6040516060810181811067ffffffffffffffff82111715610f9957610f9961192e565b80604052508235815260208301356020820152604083013560408201528091505092915050565b600080600060408486031215610fd557600080fd5b833567ffffffffffffffff80821115610fed57600080fd5b90850190610100828803121561100257600080fd5b9093506020850135908082111561101857600080fd5b5061102586828701610c39565b9497909650939450505050565b60008060006060848603121561104757600080fd5b835167ffffffffffffffff8082111561105f57600080fd5b90850190610100828803121561107457600080fd5b61107c61166f565b82518152602083015160208201526040830151604082015260608301516060820152608083015160808201526110b460a08401610bb7565b60a082015260c0830151828111156110cb57600080fd5b6110d789828601610bc7565b60c08301525060e0830151828111156110ef57600080fd5b6110fb89828601610ccc565b60e08301525060208701516040880151919650945091508082111561111f57600080fd5b5061112c86828701610ccc565b9150509250925092565b6000806040838503121561114957600080fd5b82359150602083013567ffffffffffffffff81111561116757600080fd5b610de985828601610c7b565b60008060006060848603121561118857600080fd5b505081359360208301359350604090920135919050565b6000806000606084860312156111b457600080fd5b8351925060208401519150604084015190509250925092565b81835260007f07ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8311156111ff57600080fd5b8260051b8083602087013760009401602001938452509192915050565b8183528181602085013750600060208284010152600060207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f840116840101905092915050565b6000815180845261127d81602086016020860161184c565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b8054600090600181811c90808316806112c957607f831692505b6020808410821415611304577f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b83885281801561131b576001811461134d5761137b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff008616828a015260408901965061137b565b876000528160002060005b868110156113735781548b8201850152908501908301611358565b8a0183019750505b50505050505092915050565b6000604082016040835280855180835260608501915060608160051b8601019250602080880160005b838110156113fc577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa08887030185526113ea868351611265565b955093820193908201906001016113b0565b5050858403818701525050506114128185611265565b95945050505050565b8215158152604060208201526000610d116040830184611265565b602081526000610ecd6020830184611265565b60a08152600061145c60a08301886112af565b6020838203818501528188548084528284019150828160051b8501018a6000528360002060005b838110156114ce577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08784030185526114bc83836112af565b94860194925060019182019101611483565b505086810360408801526114e2818b6112af565b94505050505084606084015282810360808401526115008185611265565b98975050505050505050565b606081528435606082015260208501356080820152604085013560a0820152606085013560c0820152608085013560e0820152600060a086013561154f8161195d565b6101006115738185018373ffffffffffffffffffffffffffffffffffffffff169052565b61158060c0890189611752565b925081610120860152611598610160860184836111cd565b925050506115a960e08801886117b9565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0858403016101408601526115df83828461121c565b9250505085602084015282810360408401526115fc81858761121c565b979650505050505050565b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe184360301811261163c57600080fd5b83018035915067ffffffffffffffff82111561165757600080fd5b6020019150600581901b360382131561044057600080fd5b604051610100810167ffffffffffffffff811182821017156116935761169361192e565b60405290565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff811182821017156116e0576116e061192e565b604052919050565b600067ffffffffffffffff8211156117025761170261192e565b5060051b60200190565b600067ffffffffffffffff8211156117265761172661192e565b50601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe01660200190565b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe184360301811261178757600080fd5b830160208101925035905067ffffffffffffffff8111156117a757600080fd5b8060051b360383131561044057600080fd5b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe18436030181126117ee57600080fd5b830160208101925035905067ffffffffffffffff81111561180e57600080fd5b80360383131561044057600080fd5b60008219821115611830576118306118d0565b500190565b600082821015611847576118476118d0565b500390565b60005b8381101561186757818101518382015260200161184f565b83811115611876576000848401525b50505050565b600181811c9082168061189057607f821691505b602082108114156118ca577f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b50919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b73ffffffffffffffffffffffffffffffffffffffff811681146102a557600080fdfea164736f6c6343000806000a", } var SimpleLogUpkeepCounterABI = SimpleLogUpkeepCounterMetaData.ABI diff --git a/core/gethwrappers/generation/generated-wrapper-dependency-versions-do-not-edit.txt b/core/gethwrappers/generation/generated-wrapper-dependency-versions-do-not-edit.txt index f9cf3182866..8781ade7c24 100644 --- a/core/gethwrappers/generation/generated-wrapper-dependency-versions-do-not-edit.txt +++ b/core/gethwrappers/generation/generated-wrapper-dependency-versions-do-not-edit.txt @@ -69,7 +69,7 @@ optimism_module: ../../contracts/solc/v0.8.19/OptimismModule/OptimismModule.abi oracle_wrapper: ../../contracts/solc/v0.6/Oracle/Oracle.abi ../../contracts/solc/v0.6/Oracle/Oracle.bin 7af2fbac22a6e8c2847e8e685a5400cac5101d72ddf5365213beb79e4dede43a perform_data_checker_wrapper: ../../contracts/solc/v0.8.16/PerformDataChecker/PerformDataChecker.abi ../../contracts/solc/v0.8.16/PerformDataChecker/PerformDataChecker.bin 48d8309c2117c29a24e1155917ab0b780956b2cd6a8a39ef06ae66a7f6d94f73 scroll_module: ../../contracts/solc/v0.8.19/ScrollModule/ScrollModule.abi ../../contracts/solc/v0.8.19/ScrollModule/ScrollModule.bin 8de157cb7e5bc78146548212803d60926c8483aca7e912d802b7c66dc5d2ab11 -simple_log_upkeep_counter_wrapper: ../../contracts/solc/v0.8.6/SimpleLogUpkeepCounter/SimpleLogUpkeepCounter.abi ../../contracts/solc/v0.8.6/SimpleLogUpkeepCounter/SimpleLogUpkeepCounter.bin 3af3ae10528fb5fe1983c6073a8ab80fa909089609addad9ff1530b975825110 +simple_log_upkeep_counter_wrapper: ../../contracts/solc/v0.8.6/SimpleLogUpkeepCounter/SimpleLogUpkeepCounter.abi ../../contracts/solc/v0.8.6/SimpleLogUpkeepCounter/SimpleLogUpkeepCounter.bin 062a8fbaee1ca6b098b8d05afb04c2d34811dd1d900280b118a958afa6d903f3 solidity_vrf_consumer_interface: ../../contracts/solc/v0.6/VRFConsumer/VRFConsumer.abi ../../contracts/solc/v0.6/VRFConsumer/VRFConsumer.bin ecc99378aa798014de9db42b2eb81320778b0663dbe208008dad75ccdc1d4366 solidity_vrf_consumer_interface_v08: ../../contracts/solc/v0.8.6/VRFConsumer/VRFConsumer.abi ../../contracts/solc/v0.8.6/VRFConsumer/VRFConsumer.bin b14f9136b15e3dc9d6154d5700f3ed4cf88ddc4f70f20c3bb57fc46050904c8f solidity_vrf_coordinator_interface: ../../contracts/solc/v0.6/VRFCoordinator/VRFCoordinator.abi ../../contracts/solc/v0.6/VRFCoordinator/VRFCoordinator.bin a23d3c395156804788c7f6fbda2994e8f7184304c0f0c9f2c4ddeaf073d346d2