contracts-bedrock: reduce diff

75b89b03 · Mark Tyneway · 2402bdef · 75b89b03 · 75b89b03 · 75b89b03
Commit 75b89b03 authored Aug 07, 2023 by Mark Tyneway
6 changed files
--- a/op-bindings/bindings/l2outputoracle.go
+++ b/op-bindings/bindings/l2outputoracle.go
@@ -38,7 +38,7 @@ type TypesOutputProposal struct {
 // L2OutputOracleMetaData contains all meta data concerning the L2OutputOracle contract.
 var L2OutputOracleMetaData = &bind.MetaData{
 	ABI: "[{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_submissionInterval\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_l2BlockTime\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_finalizationPeriodSeconds\",\"type\":\"uint256\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint8\",\"name\":\"version\",\"type\":\"uint8\"}],\"name\":\"Initialized\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"outputRoot\",\"type\":\"bytes32\"},{\"indexed\":true,\"internalType\":\"uint256\",\"name\":\"l2OutputIndex\",\"type\":\"uint256\"},{\"indexed\":true,\"internalType\":\"uint256\",\"name\":\"l2BlockNumber\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"l1Timestamp\",\"type\":\"uint256\"}],\"name\":\"OutputProposed\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint256\",\"name\":\"prevNextOutputIndex\",\"type\":\"uint256\"},{\"indexed\":true,\"internalType\":\"uint256\",\"name\":\"newNextOutputIndex\",\"type\":\"uint256\"}],\"name\":\"OutputsDeleted\",\"type\":\"event\"},{\"inputs\":[],\"name\":\"CHALLENGER\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"FINALIZATION_PERIOD_SECONDS\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"L2_BLOCK_TIME\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"PROPOSER\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"SUBMISSION_INTERVAL\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"challenger\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_l2BlockNumber\",\"type\":\"uint256\"}],\"name\":\"computeL2Timestamp\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_l2OutputIndex\",\"type\":\"uint256\"}],\"name\":\"deleteL2Outputs\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"finalizationPeriodSeconds\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_l2OutputIndex\",\"type\":\"uint256\"}],\"name\":\"getL2Output\",\"outputs\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"outputRoot\",\"type\":\"bytes32\"},{\"internalType\":\"uint128\",\"name\":\"timestamp\",\"type\":\"uint128\"},{\"internalType\":\"uint128\",\"name\":\"l2BlockNumber\",\"type\":\"uint128\"}],\"internalType\":\"structTypes.OutputProposal\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_l2BlockNumber\",\"type\":\"uint256\"}],\"name\":\"getL2OutputAfter\",\"outputs\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"outputRoot\",\"type\":\"bytes32\"},{\"internalType\":\"uint128\",\"name\":\"timestamp\",\"type\":\"uint128\"},{\"internalType\":\"uint128\",\"name\":\"l2BlockNumber\",\"type\":\"uint128\"}],\"internalType\":\"structTypes.OutputProposal\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_l2BlockNumber\",\"type\":\"uint256\"}],\"name\":\"getL2OutputIndexAfter\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_startingBlockNumber\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_startingTimestamp\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"_proposer\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"_challenger\",\"type\":\"address\"}],\"name\":\"initialize\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"l2BlockTime\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"latestBlockNumber\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"latestOutputIndex\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"nextBlockNumber\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"nextOutputIndex\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"_outputRoot\",\"type\":\"bytes32\"},{\"internalType\":\"uint256\",\"name\":\"_l2BlockNumber\",\"type\":\"uint256\"},{\"internalType\":\"bytes32\",\"name\":\"_l1BlockHash\",\"type\":\"bytes32\"},{\"internalType\":\"uint256\",\"name\":\"_l1BlockNumber\",\"type\":\"uint256\"}],\"name\":\"proposeL2Output\",\"outputs\":[],\"stateMutability\":\"payable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"proposer\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"startingBlockNumber\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"startingTimestamp\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"submissionInterval\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"version\",\"outputs\":[{\"internalType\":\"string\",\"name\":\"\",\"type\":\"string\"}],\"stateMutability\":\"view\",\"type\":\"function\"}]",
-	Bin: "0x6101406040523480156200001257600080fd5b5060405162001a7d38038062001a7d833981016040819052620000359162000302565b6001608052600460a052600060c05281620000bd5760405162461bcd60e51b815260206004820152603460248201527f4c324f75747075744f7261636c653a204c3220626c6f636b2074696d65206d7560448201527f73742062652067726561746572207468616e203000000000000000000000000060648201526084015b60405180910390fd5b60008311620001355760405162461bcd60e51b815260206004820152603a60248201527f4c324f75747075744f7261636c653a207375626d697373696f6e20696e74657260448201527f76616c206d7573742062652067726561746572207468616e20300000000000006064820152608401620000b4565b60e08390526101008290526101208190526200015560008080806200015e565b50505062000331565b600054600290610100900460ff1615801562000181575060005460ff8083169116105b620001e65760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401620000b4565b6000805461ffff191660ff83161761010017905542841115620002805760405162461bcd60e51b8152602060048201526044602482018190527f4c324f75747075744f7261636c653a207374617274696e67204c322074696d65908201527f7374616d70206d757374206265206c657373207468616e2063757272656e742060648201526374696d6560e01b608482015260a401620000b4565b60028490556001859055600580546001600160a01b038581166001600160a01b03199283161790925560048054928516929091169190911790556000805461ff001916905560405160ff821681527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15050505050565b6000806000606084860312156200031857600080fd5b8351925060208401519150604084015190509250925092565b60805160a05160c05160e05161010051610120516116e762000396600039600081816103e80152610b5c01526000818161019e01526111e501526000818161021701526112330152600061078c015260006107630152600061073a01526116e76000f3fe60806040526004361061018a5760003560e01c806389c44cbb116100d6578063ce5db8d61161007f578063dcec334811610059578063dcec33481461044c578063e1a41bcf14610208578063f4daa291146103d957600080fd5b8063ce5db8d6146103d9578063cf8e5cf01461040c578063d1de856c1461042c57600080fd5b8063a25ae557116100b0578063a25ae55714610352578063a8e4fb90146103ae578063bffa7f0f146103ae57600080fd5b806389c44cbb1461031f57806393991af31461018f5780639aaab6481461033f57600080fd5b806369f16eec1161013857806370872aa51161011257806370872aa5146102d35780637f006420146102e9578063887862721461030957600080fd5b806369f16eec146102a95780636abcf563146102be5780636b4d98dd1461023b57600080fd5b8063529933df11610169578063529933df14610208578063534db0e21461023b57806354fd4d501461028757600080fd5b80622134cc1461018f578063019e2729146101d15780634599c788146101f3575b600080fd5b34801561019b57600080fd5b507f00000000000000000000000000000000000000000000000000000000000000005b6040519081526020015b60405180910390f35b3480156101dd57600080fd5b506101f16101ec3660046113ca565b610461565b005b3480156101ff57600080fd5b506101be6106c0565b34801561021457600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006101be565b34801561024757600080fd5b5060045473ffffffffffffffffffffffffffffffffffffffff165b60405173ffffffffffffffffffffffffffffffffffffffff90911681526020016101c8565b34801561029357600080fd5b5061029c610733565b6040516101c89190611440565b3480156102b557600080fd5b506101be6107d6565b3480156102ca57600080fd5b506003546101be565b3480156102df57600080fd5b506101be60015481565b3480156102f557600080fd5b506101be610304366004611491565b6107e8565b34801561031557600080fd5b506101be60025481565b34801561032b57600080fd5b506101f161033a366004611491565b6109fc565b6101f161034d3660046114aa565b610cb4565b34801561035e57600080fd5b5061037261036d366004611491565b611115565b60408051825181526020808401516fffffffffffffffffffffffffffffffff9081169183019190915292820151909216908201526060016101c8565b3480156103ba57600080fd5b5060055473ffffffffffffffffffffffffffffffffffffffff16610262565b3480156103e557600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006101be565b34801561041857600080fd5b50610372610427366004611491565b6111a9565b34801561043857600080fd5b506101be610447366004611491565b6111e1565b34801561045857600080fd5b506101be61122f565b600054600290610100900460ff16158015610483575060005460ff8083169116105b610514576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201527f647920696e697469616c697a656400000000000000000000000000000000000060648201526084015b60405180910390fd5b600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00001660ff831617610100179055428411156105fc576040517f08c379a0000000000000000000000000000000000000000000000000000000008152602060048201526044602482018190527f4c324f75747075744f7261636c653a207374617274696e67204c322074696d65908201527f7374616d70206d757374206265206c657373207468616e2063757272656e742060648201527f74696d6500000000000000000000000000000000000000000000000000000000608482015260a40161050b565b600284905560018590556005805473ffffffffffffffffffffffffffffffffffffffff8581167fffffffffffffffffffffffff0000000000000000000000000000000000000000928316179092556004805492851692909116919091179055600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff16905560405160ff821681527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15050505050565b6003546000901561072a57600380546106db9060019061150b565b815481106106eb576106eb611522565b600091825260209091206002909102016001015470010000000000000000000000000000000090046fffffffffffffffffffffffffffffffff16919050565b6001545b905090565b606061075e7f0000000000000000000000000000000000000000000000000000000000000000611264565b6107877f0000000000000000000000000000000000000000000000000000000000000000611264565b6107b07f0000000000000000000000000000000000000000000000000000000000000000611264565b6040516020016107c293929190611551565b604051602081830303815290604052905090565b60035460009061072e9060019061150b565b60006107f26106c0565b8211156108a7576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604860248201527f4c324f75747075744f7261636c653a2063616e6e6f7420676574206f7574707560448201527f7420666f72206120626c6f636b207468617420686173206e6f74206265656e2060648201527f70726f706f736564000000000000000000000000000000000000000000000000608482015260a40161050b565b60035461095c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604660248201527f4c324f75747075744f7261636c653a2063616e6e6f7420676574206f7574707560448201527f74206173206e6f206f7574707574732068617665206265656e2070726f706f7360648201527f6564207965740000000000000000000000000000000000000000000000000000608482015260a40161050b565b6003546000905b808210156109f5576000600261097983856115c7565b610983919061160e565b9050846003828154811061099957610999611522565b600091825260209091206002909102016001015470010000000000000000000000000000000090046fffffffffffffffffffffffffffffffff1610156109eb576109e48160016115c7565b92506109ef565b8091505b50610963565b5092915050565b60045473ffffffffffffffffffffffffffffffffffffffff163314610aa3576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603e60248201527f4c324f75747075744f7261636c653a206f6e6c7920746865206368616c6c656e60448201527f67657220616464726573732063616e2064656c657465206f7574707574730000606482015260840161050b565b6003548110610b5a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604360248201527f4c324f75747075744f7261636c653a2063616e6e6f742064656c657465206f7560448201527f747075747320616674657220746865206c6174657374206f757470757420696e60648201527f6465780000000000000000000000000000000000000000000000000000000000608482015260a40161050b565b7f000000000000000000000000000000000000000000000000000000000000000060038281548110610b8e57610b8e611522565b6000918252602090912060016002909202010154610bbe906fffffffffffffffffffffffffffffffff164261150b565b10610c71576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604660248201527f4c324f75747075744f7261636c653a2063616e6e6f742064656c657465206f7560448201527f74707574732074686174206861766520616c7265616479206265656e2066696e60648201527f616c697a65640000000000000000000000000000000000000000000000000000608482015260a40161050b565b6000610c7c60035490565b90508160035581817f4ee37ac2c786ec85e87592d3c5c8a1dd66f8496dda3f125d9ea8ca5f657629b660405160405180910390a35050565b60055473ffffffffffffffffffffffffffffffffffffffff163314610d81576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604160248201527f4c324f75747075744f7261636c653a206f6e6c79207468652070726f706f736560448201527f7220616464726573732063616e2070726f706f7365206e6577206f757470757460648201527f7300000000000000000000000000000000000000000000000000000000000000608482015260a40161050b565b610d8961122f565b8314610e3d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604860248201527f4c324f75747075744f7261636c653a20626c6f636b206e756d626572206d757360448201527f7420626520657175616c20746f206e65787420657870656374656420626c6f6360648201527f6b206e756d626572000000000000000000000000000000000000000000000000608482015260a40161050b565b42610e47846111e1565b10610ed4576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603660248201527f4c324f75747075744f7261636c653a2063616e6e6f742070726f706f7365204c60448201527f32206f757470757420696e207468652066757475726500000000000000000000606482015260840161050b565b83610f61576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603a60248201527f4c324f75747075744f7261636c653a204c32206f75747075742070726f706f7360448201527f616c2063616e6e6f7420626520746865207a65726f2068617368000000000000606482015260840161050b565b811561101d578181401461101d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604960248201527f4c324f75747075744f7261636c653a20626c6f636b206861736820646f65732060448201527f6e6f74206d61746368207468652068617368206174207468652065787065637460648201527f6564206865696768740000000000000000000000000000000000000000000000608482015260a40161050b565b8261102760035490565b857fa7aaf2512769da4e444e3de247be2564225c2e7a8f74cfe528e46e17d24868e24260405161105991815260200190565b60405180910390a45050604080516060810182529283526fffffffffffffffffffffffffffffffff4281166020850190815292811691840191825260038054600181018255600091909152935160029094027fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b810194909455915190518216700100000000000000000000000000000000029116177fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85c90910155565b60408051606081018252600080825260208201819052918101919091526003828154811061114557611145611522565b600091825260209182902060408051606081018252600290930290910180548352600101546fffffffffffffffffffffffffffffffff8082169484019490945270010000000000000000000000000000000090049092169181019190915292915050565b604080516060810182526000808252602082018190529181019190915260036111d1836107e8565b8154811061114557611145611522565b60007f000000000000000000000000000000000000000000000000000000000000000060015483611212919061150b565b61121c9190611622565b60025461122991906115c7565b92915050565b60007f000000000000000000000000000000000000000000000000000000000000000061125a6106c0565b61072e91906115c7565b6060816000036112a757505060408051808201909152600181527f3000000000000000000000000000000000000000000000000000000000000000602082015290565b8160005b81156112d157806112bb8161165f565b91506112ca9050600a8361160e565b91506112ab565b60008167ffffffffffffffff8111156112ec576112ec611697565b6040519080825280601f01601f191660200182016040528015611316576020820181803683370190505b5090505b84156113995761132b60018361150b565b9150611338600a866116c6565b6113439060306115c7565b60f81b81838151811061135857611358611522565b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a905350611392600a8661160e565b945061131a565b949350505050565b803573ffffffffffffffffffffffffffffffffffffffff811681146113c557600080fd5b919050565b600080600080608085870312156113e057600080fd5b84359350602085013592506113f7604086016113a1565b9150611405606086016113a1565b905092959194509250565b60005b8381101561142b578181015183820152602001611413565b8381111561143a576000848401525b50505050565b602081526000825180602084015261145f816040850160208701611410565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169190910160400192915050565b6000602082840312156114a357600080fd5b5035919050565b600080600080608085870312156114c057600080fd5b5050823594602084013594506040840135936060013592509050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60008282101561151d5761151d6114dc565b500390565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b60008451611563818460208901611410565b80830190507f2e00000000000000000000000000000000000000000000000000000000000000808252855161159f816001850160208a01611410565b600192019182015283516115ba816002840160208801611410565b0160020195945050505050565b600082198211156115da576115da6114dc565b500190565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b60008261161d5761161d6115df565b500490565b6000817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff048311821515161561165a5761165a6114dc565b500290565b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8203611690576116906114dc565b5060010190565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6000826116d5576116d56115df565b50069056fea164736f6c634300080f000a",
+	Bin: "0x6101406040523480156200001257600080fd5b5060405162001b8c38038062001b8c833981016040819052620000359162000302565b6001608052600460a052600060c05281620000bd5760405162461bcd60e51b815260206004820152603460248201527f4c324f75747075744f7261636c653a204c3220626c6f636b2074696d65206d7560448201527f73742062652067726561746572207468616e203000000000000000000000000060648201526084015b60405180910390fd5b60008311620001355760405162461bcd60e51b815260206004820152603a60248201527f4c324f75747075744f7261636c653a207375626d697373696f6e20696e74657260448201527f76616c206d7573742062652067726561746572207468616e20300000000000006064820152608401620000b4565b60e08390526101008290526101208190526200015560008080806200015e565b50505062000331565b600054600290610100900460ff1615801562000181575060005460ff8083169116105b620001e65760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401620000b4565b6000805461ffff191660ff83161761010017905542841115620002805760405162461bcd60e51b8152602060048201526044602482018190527f4c324f75747075744f7261636c653a207374617274696e67204c322074696d65908201527f7374616d70206d757374206265206c657373207468616e2063757272656e742060648201526374696d6560e01b608482015260a401620000b4565b60028490556001859055600580546001600160a01b038581166001600160a01b03199283161790925560048054928516929091169190911790556000805461ff001916905560405160ff821681527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15050505050565b6000806000606084860312156200031857600080fd5b8351925060208401519150604084015190509250925092565b60805160a05160c05160e05161010051610120516117e1620003ab6000396000818161047b015281816105390152610c560152600081816101a10152818161038101526112df01526000818161021f01528181610503015261132d015260006108860152600061085d0152600061083401526117e16000f3fe60806040526004361061018a5760003560e01c806389c44cbb116100d6578063ce5db8d61161007f578063dcec334811610059578063dcec3348146104df578063e1a41bcf146104f4578063f4daa2911461052757600080fd5b8063ce5db8d61461046c578063cf8e5cf01461049f578063d1de856c146104bf57600080fd5b8063a25ae557116100b0578063a25ae557146103b8578063a8e4fb9014610414578063bffa7f0f1461043f57600080fd5b806389c44cbb1461035257806393991af3146103725780639aaab648146103a557600080fd5b806369f16eec1161013857806370872aa51161011257806370872aa5146103065780637f0064201461031c578063887862721461033c57600080fd5b806369f16eec146102af5780636abcf563146102c45780636b4d98dd146102d957600080fd5b8063529933df11610169578063529933df1461020d578063534db0e21461024157806354fd4d501461028d57600080fd5b80622134cc1461018f578063019e2729146101d65780634599c788146101f8575b600080fd5b34801561019b57600080fd5b506101c37f000000000000000000000000000000000000000000000000000000000000000081565b6040519081526020015b60405180910390f35b3480156101e257600080fd5b506101f66101f13660046114c4565b61055b565b005b34801561020457600080fd5b506101c36107ba565b34801561021957600080fd5b506101c37f000000000000000000000000000000000000000000000000000000000000000081565b34801561024d57600080fd5b5060045473ffffffffffffffffffffffffffffffffffffffff165b60405173ffffffffffffffffffffffffffffffffffffffff90911681526020016101cd565b34801561029957600080fd5b506102a261082d565b6040516101cd919061153a565b3480156102bb57600080fd5b506101c36108d0565b3480156102d057600080fd5b506003546101c3565b3480156102e557600080fd5b506004546102689073ffffffffffffffffffffffffffffffffffffffff1681565b34801561031257600080fd5b506101c360015481565b34801561032857600080fd5b506101c361033736600461158b565b6108e2565b34801561034857600080fd5b506101c360025481565b34801561035e57600080fd5b506101f661036d36600461158b565b610af6565b34801561037e57600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006101c3565b6101f66103b33660046115a4565b610dae565b3480156103c457600080fd5b506103d86103d336600461158b565b61120f565b60408051825181526020808401516fffffffffffffffffffffffffffffffff9081169183019190915292820151909216908201526060016101cd565b34801561042057600080fd5b5060055473ffffffffffffffffffffffffffffffffffffffff16610268565b34801561044b57600080fd5b506005546102689073ffffffffffffffffffffffffffffffffffffffff1681565b34801561047857600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006101c3565b3480156104ab57600080fd5b506103d86104ba36600461158b565b6112a3565b3480156104cb57600080fd5b506101c36104da36600461158b565b6112db565b3480156104eb57600080fd5b506101c3611329565b34801561050057600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006101c3565b34801561053357600080fd5b506101c37f000000000000000000000000000000000000000000000000000000000000000081565b600054600290610100900460ff1615801561057d575060005460ff8083169116105b61060e576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201527f647920696e697469616c697a656400000000000000000000000000000000000060648201526084015b60405180910390fd5b600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00001660ff831617610100179055428411156106f6576040517f08c379a0000000000000000000000000000000000000000000000000000000008152602060048201526044602482018190527f4c324f75747075744f7261636c653a207374617274696e67204c322074696d65908201527f7374616d70206d757374206265206c657373207468616e2063757272656e742060648201527f74696d6500000000000000000000000000000000000000000000000000000000608482015260a401610605565b600284905560018590556005805473ffffffffffffffffffffffffffffffffffffffff8581167fffffffffffffffffffffffff0000000000000000000000000000000000000000928316179092556004805492851692909116919091179055600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff16905560405160ff821681527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15050505050565b6003546000901561082457600380546107d590600190611605565b815481106107e5576107e561161c565b600091825260209091206002909102016001015470010000000000000000000000000000000090046fffffffffffffffffffffffffffffffff16919050565b6001545b905090565b60606108587f000000000000000000000000000000000000000000000000000000000000000061135e565b6108817f000000000000000000000000000000000000000000000000000000000000000061135e565b6108aa7f000000000000000000000000000000000000000000000000000000000000000061135e565b6040516020016108bc9392919061164b565b604051602081830303815290604052905090565b60035460009061082890600190611605565b60006108ec6107ba565b8211156109a1576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604860248201527f4c324f75747075744f7261636c653a2063616e6e6f7420676574206f7574707560448201527f7420666f72206120626c6f636b207468617420686173206e6f74206265656e2060648201527f70726f706f736564000000000000000000000000000000000000000000000000608482015260a401610605565b600354610a56576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604660248201527f4c324f75747075744f7261636c653a2063616e6e6f7420676574206f7574707560448201527f74206173206e6f206f7574707574732068617665206265656e2070726f706f7360648201527f6564207965740000000000000000000000000000000000000000000000000000608482015260a401610605565b6003546000905b80821015610aef5760006002610a7383856116c1565b610a7d9190611708565b90508460038281548110610a9357610a9361161c565b600091825260209091206002909102016001015470010000000000000000000000000000000090046fffffffffffffffffffffffffffffffff161015610ae557610ade8160016116c1565b9250610ae9565b8091505b50610a5d565b5092915050565b60045473ffffffffffffffffffffffffffffffffffffffff163314610b9d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603e60248201527f4c324f75747075744f7261636c653a206f6e6c7920746865206368616c6c656e60448201527f67657220616464726573732063616e2064656c657465206f75747075747300006064820152608401610605565b6003548110610c54576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604360248201527f4c324f75747075744f7261636c653a2063616e6e6f742064656c657465206f7560448201527f747075747320616674657220746865206c6174657374206f757470757420696e60648201527f6465780000000000000000000000000000000000000000000000000000000000608482015260a401610605565b7f000000000000000000000000000000000000000000000000000000000000000060038281548110610c8857610c8861161c565b6000918252602090912060016002909202010154610cb8906fffffffffffffffffffffffffffffffff1642611605565b10610d6b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604660248201527f4c324f75747075744f7261636c653a2063616e6e6f742064656c657465206f7560448201527f74707574732074686174206861766520616c7265616479206265656e2066696e60648201527f616c697a65640000000000000000000000000000000000000000000000000000608482015260a401610605565b6000610d7660035490565b90508160035581817f4ee37ac2c786ec85e87592d3c5c8a1dd66f8496dda3f125d9ea8ca5f657629b660405160405180910390a35050565b60055473ffffffffffffffffffffffffffffffffffffffff163314610e7b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604160248201527f4c324f75747075744f7261636c653a206f6e6c79207468652070726f706f736560448201527f7220616464726573732063616e2070726f706f7365206e6577206f757470757460648201527f7300000000000000000000000000000000000000000000000000000000000000608482015260a401610605565b610e83611329565b8314610f37576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604860248201527f4c324f75747075744f7261636c653a20626c6f636b206e756d626572206d757360448201527f7420626520657175616c20746f206e65787420657870656374656420626c6f6360648201527f6b206e756d626572000000000000000000000000000000000000000000000000608482015260a401610605565b42610f41846112db565b10610fce576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603660248201527f4c324f75747075744f7261636c653a2063616e6e6f742070726f706f7365204c60448201527f32206f757470757420696e2074686520667574757265000000000000000000006064820152608401610605565b8361105b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603a60248201527f4c324f75747075744f7261636c653a204c32206f75747075742070726f706f7360448201527f616c2063616e6e6f7420626520746865207a65726f20686173680000000000006064820152608401610605565b81156111175781814014611117576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604960248201527f4c324f75747075744f7261636c653a20626c6f636b206861736820646f65732060448201527f6e6f74206d61746368207468652068617368206174207468652065787065637460648201527f6564206865696768740000000000000000000000000000000000000000000000608482015260a401610605565b8261112160035490565b857fa7aaf2512769da4e444e3de247be2564225c2e7a8f74cfe528e46e17d24868e24260405161115391815260200190565b60405180910390a45050604080516060810182529283526fffffffffffffffffffffffffffffffff4281166020850190815292811691840191825260038054600181018255600091909152935160029094027fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b810194909455915190518216700100000000000000000000000000000000029116177fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85c90910155565b60408051606081018252600080825260208201819052918101919091526003828154811061123f5761123f61161c565b600091825260209182902060408051606081018252600290930290910180548352600101546fffffffffffffffffffffffffffffffff8082169484019490945270010000000000000000000000000000000090049092169181019190915292915050565b604080516060810182526000808252602082018190529181019190915260036112cb836108e2565b8154811061123f5761123f61161c565b60007f00000000000000000000000000000000000000000000000000000000000000006001548361130c9190611605565b611316919061171c565b60025461132391906116c1565b92915050565b60007f00000000000000000000000000000000000000000000000000000000000000006113546107ba565b61082891906116c1565b6060816000036113a157505060408051808201909152600181527f3000000000000000000000000000000000000000000000000000000000000000602082015290565b8160005b81156113cb57806113b581611759565b91506113c49050600a83611708565b91506113a5565b60008167ffffffffffffffff8111156113e6576113e6611791565b6040519080825280601f01601f191660200182016040528015611410576020820181803683370190505b5090505b841561149357611425600183611605565b9150611432600a866117c0565b61143d9060306116c1565b60f81b8183815181106114525761145261161c565b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a90535061148c600a86611708565b9450611414565b949350505050565b803573ffffffffffffffffffffffffffffffffffffffff811681146114bf57600080fd5b919050565b600080600080608085870312156114da57600080fd5b84359350602085013592506114f16040860161149b565b91506114ff6060860161149b565b905092959194509250565b60005b8381101561152557818101518382015260200161150d565b83811115611534576000848401525b50505050565b602081526000825180602084015261155981604085016020870161150a565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169190910160400192915050565b60006020828403121561159d57600080fd5b5035919050565b600080600080608085870312156115ba57600080fd5b5050823594602084013594506040840135936060013592509050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600082821015611617576116176115d6565b500390565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b6000845161165d81846020890161150a565b80830190507f2e000000000000000000000000000000000000000000000000000000000000008082528551611699816001850160208a0161150a565b600192019182015283516116b481600284016020880161150a565b0160020195945050505050565b600082198211156116d4576116d46115d6565b500190565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b600082611717576117176116d9565b500490565b6000817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0483118215151615611754576117546115d6565b500290565b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff820361178a5761178a6115d6565b5060010190565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6000826117cf576117cf6116d9565b50069056fea164736f6c634300080f000a",
 }

 // L2OutputOracleABI is the input ABI used to generate the binding from.

--- a/op-bindings/bindings/l2outputoracle_more.go
+++ b/op-bindings/bindings/l2outputoracle_more.go
@@ -9,11 +9,11 @@ import (
 	"github.com/ethereum-optimism/optimism/op-bindings/solc"
 )

-const L2OutputOracleStorageLayoutJSON = "{\"storage\":[{\"astId\":1000,\"contract\":\"src/L1/L2OutputOracle.sol:L2OutputOracle\",\"label\":\"_initialized\",\"offset\":0,\"slot\":\"0\",\"type\":\"t_uint8\"},{\"astId\":1001,\"contract\":\"src/L1/L2OutputOracle.sol:L2OutputOracle\",\"label\":\"_initializing\",\"offset\":1,\"slot\":\"0\",\"type\":\"t_bool\"},{\"astId\":1002,\"contract\":\"src/L1/L2OutputOracle.sol:L2OutputOracle\",\"label\":\"startingBlockNumber\",\"offset\":0,\"slot\":\"1\",\"type\":\"t_uint256\"},{\"astId\":1003,\"contract\":\"src/L1/L2OutputOracle.sol:L2OutputOracle\",\"label\":\"startingTimestamp\",\"offset\":0,\"slot\":\"2\",\"type\":\"t_uint256\"},{\"astId\":1004,\"contract\":\"src/L1/L2OutputOracle.sol:L2OutputOracle\",\"label\":\"l2Outputs\",\"offset\":0,\"slot\":\"3\",\"type\":\"t_array(t_struct(OutputProposal)1007_storage)dyn_storage\"},{\"astId\":1005,\"contract\":\"src/L1/L2OutputOracle.sol:L2OutputOracle\",\"label\":\"_CHALLENGER\",\"offset\":0,\"slot\":\"4\",\"type\":\"t_address\"},{\"astId\":1006,\"contract\":\"src/L1/L2OutputOracle.sol:L2OutputOracle\",\"label\":\"_PROPOSER\",\"offset\":0,\"slot\":\"5\",\"type\":\"t_address\"}],\"types\":{\"t_address\":{\"encoding\":\"inplace\",\"label\":\"address\",\"numberOfBytes\":\"20\"},\"t_array(t_struct(OutputProposal)1007_storage)dyn_storage\":{\"encoding\":\"dynamic_array\",\"label\":\"struct Types.OutputProposal[]\",\"numberOfBytes\":\"32\",\"base\":\"t_struct(OutputProposal)1007_storage\"},\"t_bool\":{\"encoding\":\"inplace\",\"label\":\"bool\",\"numberOfBytes\":\"1\"},\"t_bytes32\":{\"encoding\":\"inplace\",\"label\":\"bytes32\",\"numberOfBytes\":\"32\"},\"t_struct(OutputProposal)1007_storage\":{\"encoding\":\"inplace\",\"label\":\"struct Types.OutputProposal\",\"numberOfBytes\":\"64\"},\"t_uint128\":{\"encoding\":\"inplace\",\"label\":\"uint128\",\"numberOfBytes\":\"16\"},\"t_uint256\":{\"encoding\":\"inplace\",\"label\":\"uint256\",\"numberOfBytes\":\"32\"},\"t_uint8\":{\"encoding\":\"inplace\",\"label\":\"uint8\",\"numberOfBytes\":\"1\"}}}"
+const L2OutputOracleStorageLayoutJSON = "{\"storage\":[{\"astId\":1000,\"contract\":\"src/L1/L2OutputOracle.sol:L2OutputOracle\",\"label\":\"_initialized\",\"offset\":0,\"slot\":\"0\",\"type\":\"t_uint8\"},{\"astId\":1001,\"contract\":\"src/L1/L2OutputOracle.sol:L2OutputOracle\",\"label\":\"_initializing\",\"offset\":1,\"slot\":\"0\",\"type\":\"t_bool\"},{\"astId\":1002,\"contract\":\"src/L1/L2OutputOracle.sol:L2OutputOracle\",\"label\":\"startingBlockNumber\",\"offset\":0,\"slot\":\"1\",\"type\":\"t_uint256\"},{\"astId\":1003,\"contract\":\"src/L1/L2OutputOracle.sol:L2OutputOracle\",\"label\":\"startingTimestamp\",\"offset\":0,\"slot\":\"2\",\"type\":\"t_uint256\"},{\"astId\":1004,\"contract\":\"src/L1/L2OutputOracle.sol:L2OutputOracle\",\"label\":\"l2Outputs\",\"offset\":0,\"slot\":\"3\",\"type\":\"t_array(t_struct(OutputProposal)1007_storage)dyn_storage\"},{\"astId\":1005,\"contract\":\"src/L1/L2OutputOracle.sol:L2OutputOracle\",\"label\":\"CHALLENGER\",\"offset\":0,\"slot\":\"4\",\"type\":\"t_address\"},{\"astId\":1006,\"contract\":\"src/L1/L2OutputOracle.sol:L2OutputOracle\",\"label\":\"PROPOSER\",\"offset\":0,\"slot\":\"5\",\"type\":\"t_address\"}],\"types\":{\"t_address\":{\"encoding\":\"inplace\",\"label\":\"address\",\"numberOfBytes\":\"20\"},\"t_array(t_struct(OutputProposal)1007_storage)dyn_storage\":{\"encoding\":\"dynamic_array\",\"label\":\"struct Types.OutputProposal[]\",\"numberOfBytes\":\"32\",\"base\":\"t_struct(OutputProposal)1007_storage\"},\"t_bool\":{\"encoding\":\"inplace\",\"label\":\"bool\",\"numberOfBytes\":\"1\"},\"t_bytes32\":{\"encoding\":\"inplace\",\"label\":\"bytes32\",\"numberOfBytes\":\"32\"},\"t_struct(OutputProposal)1007_storage\":{\"encoding\":\"inplace\",\"label\":\"struct Types.OutputProposal\",\"numberOfBytes\":\"64\"},\"t_uint128\":{\"encoding\":\"inplace\",\"label\":\"uint128\",\"numberOfBytes\":\"16\"},\"t_uint256\":{\"encoding\":\"inplace\",\"label\":\"uint256\",\"numberOfBytes\":\"32\"},\"t_uint8\":{\"encoding\":\"inplace\",\"label\":\"uint8\",\"numberOfBytes\":\"1\"}}}"

 var L2OutputOracleStorageLayout = new(solc.StorageLayout)

-var L2OutputOracleDeployedBin = "0x60806040526004361061018a5760003560e01c806389c44cbb116100d6578063ce5db8d61161007f578063dcec334811610059578063dcec33481461044c578063e1a41bcf14610208578063f4daa291146103d957600080fd5b8063ce5db8d6146103d9578063cf8e5cf01461040c578063d1de856c1461042c57600080fd5b8063a25ae557116100b0578063a25ae55714610352578063a8e4fb90146103ae578063bffa7f0f146103ae57600080fd5b806389c44cbb1461031f57806393991af31461018f5780639aaab6481461033f57600080fd5b806369f16eec1161013857806370872aa51161011257806370872aa5146102d35780637f006420146102e9578063887862721461030957600080fd5b806369f16eec146102a95780636abcf563146102be5780636b4d98dd1461023b57600080fd5b8063529933df11610169578063529933df14610208578063534db0e21461023b57806354fd4d501461028757600080fd5b80622134cc1461018f578063019e2729146101d15780634599c788146101f3575b600080fd5b34801561019b57600080fd5b507f00000000000000000000000000000000000000000000000000000000000000005b6040519081526020015b60405180910390f35b3480156101dd57600080fd5b506101f16101ec3660046113ca565b610461565b005b3480156101ff57600080fd5b506101be6106c0565b34801561021457600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006101be565b34801561024757600080fd5b5060045473ffffffffffffffffffffffffffffffffffffffff165b60405173ffffffffffffffffffffffffffffffffffffffff90911681526020016101c8565b34801561029357600080fd5b5061029c610733565b6040516101c89190611440565b3480156102b557600080fd5b506101be6107d6565b3480156102ca57600080fd5b506003546101be565b3480156102df57600080fd5b506101be60015481565b3480156102f557600080fd5b506101be610304366004611491565b6107e8565b34801561031557600080fd5b506101be60025481565b34801561032b57600080fd5b506101f161033a366004611491565b6109fc565b6101f161034d3660046114aa565b610cb4565b34801561035e57600080fd5b5061037261036d366004611491565b611115565b60408051825181526020808401516fffffffffffffffffffffffffffffffff9081169183019190915292820151909216908201526060016101c8565b3480156103ba57600080fd5b5060055473ffffffffffffffffffffffffffffffffffffffff16610262565b3480156103e557600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006101be565b34801561041857600080fd5b50610372610427366004611491565b6111a9565b34801561043857600080fd5b506101be610447366004611491565b6111e1565b34801561045857600080fd5b506101be61122f565b600054600290610100900460ff16158015610483575060005460ff8083169116105b610514576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201527f647920696e697469616c697a656400000000000000000000000000000000000060648201526084015b60405180910390fd5b600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00001660ff831617610100179055428411156105fc576040517f08c379a0000000000000000000000000000000000000000000000000000000008152602060048201526044602482018190527f4c324f75747075744f7261636c653a207374617274696e67204c322074696d65908201527f7374616d70206d757374206265206c657373207468616e2063757272656e742060648201527f74696d6500000000000000000000000000000000000000000000000000000000608482015260a40161050b565b600284905560018590556005805473ffffffffffffffffffffffffffffffffffffffff8581167fffffffffffffffffffffffff0000000000000000000000000000000000000000928316179092556004805492851692909116919091179055600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff16905560405160ff821681527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15050505050565b6003546000901561072a57600380546106db9060019061150b565b815481106106eb576106eb611522565b600091825260209091206002909102016001015470010000000000000000000000000000000090046fffffffffffffffffffffffffffffffff16919050565b6001545b905090565b606061075e7f0000000000000000000000000000000000000000000000000000000000000000611264565b6107877f0000000000000000000000000000000000000000000000000000000000000000611264565b6107b07f0000000000000000000000000000000000000000000000000000000000000000611264565b6040516020016107c293929190611551565b604051602081830303815290604052905090565b60035460009061072e9060019061150b565b60006107f26106c0565b8211156108a7576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604860248201527f4c324f75747075744f7261636c653a2063616e6e6f7420676574206f7574707560448201527f7420666f72206120626c6f636b207468617420686173206e6f74206265656e2060648201527f70726f706f736564000000000000000000000000000000000000000000000000608482015260a40161050b565b60035461095c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604660248201527f4c324f75747075744f7261636c653a2063616e6e6f7420676574206f7574707560448201527f74206173206e6f206f7574707574732068617665206265656e2070726f706f7360648201527f6564207965740000000000000000000000000000000000000000000000000000608482015260a40161050b565b6003546000905b808210156109f5576000600261097983856115c7565b610983919061160e565b9050846003828154811061099957610999611522565b600091825260209091206002909102016001015470010000000000000000000000000000000090046fffffffffffffffffffffffffffffffff1610156109eb576109e48160016115c7565b92506109ef565b8091505b50610963565b5092915050565b60045473ffffffffffffffffffffffffffffffffffffffff163314610aa3576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603e60248201527f4c324f75747075744f7261636c653a206f6e6c7920746865206368616c6c656e60448201527f67657220616464726573732063616e2064656c657465206f7574707574730000606482015260840161050b565b6003548110610b5a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604360248201527f4c324f75747075744f7261636c653a2063616e6e6f742064656c657465206f7560448201527f747075747320616674657220746865206c6174657374206f757470757420696e60648201527f6465780000000000000000000000000000000000000000000000000000000000608482015260a40161050b565b7f000000000000000000000000000000000000000000000000000000000000000060038281548110610b8e57610b8e611522565b6000918252602090912060016002909202010154610bbe906fffffffffffffffffffffffffffffffff164261150b565b10610c71576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604660248201527f4c324f75747075744f7261636c653a2063616e6e6f742064656c657465206f7560448201527f74707574732074686174206861766520616c7265616479206265656e2066696e60648201527f616c697a65640000000000000000000000000000000000000000000000000000608482015260a40161050b565b6000610c7c60035490565b90508160035581817f4ee37ac2c786ec85e87592d3c5c8a1dd66f8496dda3f125d9ea8ca5f657629b660405160405180910390a35050565b60055473ffffffffffffffffffffffffffffffffffffffff163314610d81576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604160248201527f4c324f75747075744f7261636c653a206f6e6c79207468652070726f706f736560448201527f7220616464726573732063616e2070726f706f7365206e6577206f757470757460648201527f7300000000000000000000000000000000000000000000000000000000000000608482015260a40161050b565b610d8961122f565b8314610e3d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604860248201527f4c324f75747075744f7261636c653a20626c6f636b206e756d626572206d757360448201527f7420626520657175616c20746f206e65787420657870656374656420626c6f6360648201527f6b206e756d626572000000000000000000000000000000000000000000000000608482015260a40161050b565b42610e47846111e1565b10610ed4576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603660248201527f4c324f75747075744f7261636c653a2063616e6e6f742070726f706f7365204c60448201527f32206f757470757420696e207468652066757475726500000000000000000000606482015260840161050b565b83610f61576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603a60248201527f4c324f75747075744f7261636c653a204c32206f75747075742070726f706f7360448201527f616c2063616e6e6f7420626520746865207a65726f2068617368000000000000606482015260840161050b565b811561101d578181401461101d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604960248201527f4c324f75747075744f7261636c653a20626c6f636b206861736820646f65732060448201527f6e6f74206d61746368207468652068617368206174207468652065787065637460648201527f6564206865696768740000000000000000000000000000000000000000000000608482015260a40161050b565b8261102760035490565b857fa7aaf2512769da4e444e3de247be2564225c2e7a8f74cfe528e46e17d24868e24260405161105991815260200190565b60405180910390a45050604080516060810182529283526fffffffffffffffffffffffffffffffff4281166020850190815292811691840191825260038054600181018255600091909152935160029094027fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b810194909455915190518216700100000000000000000000000000000000029116177fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85c90910155565b60408051606081018252600080825260208201819052918101919091526003828154811061114557611145611522565b600091825260209182902060408051606081018252600290930290910180548352600101546fffffffffffffffffffffffffffffffff8082169484019490945270010000000000000000000000000000000090049092169181019190915292915050565b604080516060810182526000808252602082018190529181019190915260036111d1836107e8565b8154811061114557611145611522565b60007f000000000000000000000000000000000000000000000000000000000000000060015483611212919061150b565b61121c9190611622565b60025461122991906115c7565b92915050565b60007f000000000000000000000000000000000000000000000000000000000000000061125a6106c0565b61072e91906115c7565b6060816000036112a757505060408051808201909152600181527f3000000000000000000000000000000000000000000000000000000000000000602082015290565b8160005b81156112d157806112bb8161165f565b91506112ca9050600a8361160e565b91506112ab565b60008167ffffffffffffffff8111156112ec576112ec611697565b6040519080825280601f01601f191660200182016040528015611316576020820181803683370190505b5090505b84156113995761132b60018361150b565b9150611338600a866116c6565b6113439060306115c7565b60f81b81838151811061135857611358611522565b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a905350611392600a8661160e565b945061131a565b949350505050565b803573ffffffffffffffffffffffffffffffffffffffff811681146113c557600080fd5b919050565b600080600080608085870312156113e057600080fd5b84359350602085013592506113f7604086016113a1565b9150611405606086016113a1565b905092959194509250565b60005b8381101561142b578181015183820152602001611413565b8381111561143a576000848401525b50505050565b602081526000825180602084015261145f816040850160208701611410565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169190910160400192915050565b6000602082840312156114a357600080fd5b5035919050565b600080600080608085870312156114c057600080fd5b5050823594602084013594506040840135936060013592509050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60008282101561151d5761151d6114dc565b500390565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b60008451611563818460208901611410565b80830190507f2e00000000000000000000000000000000000000000000000000000000000000808252855161159f816001850160208a01611410565b600192019182015283516115ba816002840160208801611410565b0160020195945050505050565b600082198211156115da576115da6114dc565b500190565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b60008261161d5761161d6115df565b500490565b6000817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff048311821515161561165a5761165a6114dc565b500290565b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8203611690576116906114dc565b5060010190565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6000826116d5576116d56115df565b50069056fea164736f6c634300080f000a"
+var L2OutputOracleDeployedBin = "0x60806040526004361061018a5760003560e01c806389c44cbb116100d6578063ce5db8d61161007f578063dcec334811610059578063dcec3348146104df578063e1a41bcf146104f4578063f4daa2911461052757600080fd5b8063ce5db8d61461046c578063cf8e5cf01461049f578063d1de856c146104bf57600080fd5b8063a25ae557116100b0578063a25ae557146103b8578063a8e4fb9014610414578063bffa7f0f1461043f57600080fd5b806389c44cbb1461035257806393991af3146103725780639aaab648146103a557600080fd5b806369f16eec1161013857806370872aa51161011257806370872aa5146103065780637f0064201461031c578063887862721461033c57600080fd5b806369f16eec146102af5780636abcf563146102c45780636b4d98dd146102d957600080fd5b8063529933df11610169578063529933df1461020d578063534db0e21461024157806354fd4d501461028d57600080fd5b80622134cc1461018f578063019e2729146101d65780634599c788146101f8575b600080fd5b34801561019b57600080fd5b506101c37f000000000000000000000000000000000000000000000000000000000000000081565b6040519081526020015b60405180910390f35b3480156101e257600080fd5b506101f66101f13660046114c4565b61055b565b005b34801561020457600080fd5b506101c36107ba565b34801561021957600080fd5b506101c37f000000000000000000000000000000000000000000000000000000000000000081565b34801561024d57600080fd5b5060045473ffffffffffffffffffffffffffffffffffffffff165b60405173ffffffffffffffffffffffffffffffffffffffff90911681526020016101cd565b34801561029957600080fd5b506102a261082d565b6040516101cd919061153a565b3480156102bb57600080fd5b506101c36108d0565b3480156102d057600080fd5b506003546101c3565b3480156102e557600080fd5b506004546102689073ffffffffffffffffffffffffffffffffffffffff1681565b34801561031257600080fd5b506101c360015481565b34801561032857600080fd5b506101c361033736600461158b565b6108e2565b34801561034857600080fd5b506101c360025481565b34801561035e57600080fd5b506101f661036d36600461158b565b610af6565b34801561037e57600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006101c3565b6101f66103b33660046115a4565b610dae565b3480156103c457600080fd5b506103d86103d336600461158b565b61120f565b60408051825181526020808401516fffffffffffffffffffffffffffffffff9081169183019190915292820151909216908201526060016101cd565b34801561042057600080fd5b5060055473ffffffffffffffffffffffffffffffffffffffff16610268565b34801561044b57600080fd5b506005546102689073ffffffffffffffffffffffffffffffffffffffff1681565b34801561047857600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006101c3565b3480156104ab57600080fd5b506103d86104ba36600461158b565b6112a3565b3480156104cb57600080fd5b506101c36104da36600461158b565b6112db565b3480156104eb57600080fd5b506101c3611329565b34801561050057600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006101c3565b34801561053357600080fd5b506101c37f000000000000000000000000000000000000000000000000000000000000000081565b600054600290610100900460ff1615801561057d575060005460ff8083169116105b61060e576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201527f647920696e697469616c697a656400000000000000000000000000000000000060648201526084015b60405180910390fd5b600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00001660ff831617610100179055428411156106f6576040517f08c379a0000000000000000000000000000000000000000000000000000000008152602060048201526044602482018190527f4c324f75747075744f7261636c653a207374617274696e67204c322074696d65908201527f7374616d70206d757374206265206c657373207468616e2063757272656e742060648201527f74696d6500000000000000000000000000000000000000000000000000000000608482015260a401610605565b600284905560018590556005805473ffffffffffffffffffffffffffffffffffffffff8581167fffffffffffffffffffffffff0000000000000000000000000000000000000000928316179092556004805492851692909116919091179055600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff16905560405160ff821681527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15050505050565b6003546000901561082457600380546107d590600190611605565b815481106107e5576107e561161c565b600091825260209091206002909102016001015470010000000000000000000000000000000090046fffffffffffffffffffffffffffffffff16919050565b6001545b905090565b60606108587f000000000000000000000000000000000000000000000000000000000000000061135e565b6108817f000000000000000000000000000000000000000000000000000000000000000061135e565b6108aa7f000000000000000000000000000000000000000000000000000000000000000061135e565b6040516020016108bc9392919061164b565b604051602081830303815290604052905090565b60035460009061082890600190611605565b60006108ec6107ba565b8211156109a1576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604860248201527f4c324f75747075744f7261636c653a2063616e6e6f7420676574206f7574707560448201527f7420666f72206120626c6f636b207468617420686173206e6f74206265656e2060648201527f70726f706f736564000000000000000000000000000000000000000000000000608482015260a401610605565b600354610a56576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604660248201527f4c324f75747075744f7261636c653a2063616e6e6f7420676574206f7574707560448201527f74206173206e6f206f7574707574732068617665206265656e2070726f706f7360648201527f6564207965740000000000000000000000000000000000000000000000000000608482015260a401610605565b6003546000905b80821015610aef5760006002610a7383856116c1565b610a7d9190611708565b90508460038281548110610a9357610a9361161c565b600091825260209091206002909102016001015470010000000000000000000000000000000090046fffffffffffffffffffffffffffffffff161015610ae557610ade8160016116c1565b9250610ae9565b8091505b50610a5d565b5092915050565b60045473ffffffffffffffffffffffffffffffffffffffff163314610b9d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603e60248201527f4c324f75747075744f7261636c653a206f6e6c7920746865206368616c6c656e60448201527f67657220616464726573732063616e2064656c657465206f75747075747300006064820152608401610605565b6003548110610c54576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604360248201527f4c324f75747075744f7261636c653a2063616e6e6f742064656c657465206f7560448201527f747075747320616674657220746865206c6174657374206f757470757420696e60648201527f6465780000000000000000000000000000000000000000000000000000000000608482015260a401610605565b7f000000000000000000000000000000000000000000000000000000000000000060038281548110610c8857610c8861161c565b6000918252602090912060016002909202010154610cb8906fffffffffffffffffffffffffffffffff1642611605565b10610d6b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604660248201527f4c324f75747075744f7261636c653a2063616e6e6f742064656c657465206f7560448201527f74707574732074686174206861766520616c7265616479206265656e2066696e60648201527f616c697a65640000000000000000000000000000000000000000000000000000608482015260a401610605565b6000610d7660035490565b90508160035581817f4ee37ac2c786ec85e87592d3c5c8a1dd66f8496dda3f125d9ea8ca5f657629b660405160405180910390a35050565b60055473ffffffffffffffffffffffffffffffffffffffff163314610e7b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604160248201527f4c324f75747075744f7261636c653a206f6e6c79207468652070726f706f736560448201527f7220616464726573732063616e2070726f706f7365206e6577206f757470757460648201527f7300000000000000000000000000000000000000000000000000000000000000608482015260a401610605565b610e83611329565b8314610f37576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604860248201527f4c324f75747075744f7261636c653a20626c6f636b206e756d626572206d757360448201527f7420626520657175616c20746f206e65787420657870656374656420626c6f6360648201527f6b206e756d626572000000000000000000000000000000000000000000000000608482015260a401610605565b42610f41846112db565b10610fce576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603660248201527f4c324f75747075744f7261636c653a2063616e6e6f742070726f706f7365204c60448201527f32206f757470757420696e2074686520667574757265000000000000000000006064820152608401610605565b8361105b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603a60248201527f4c324f75747075744f7261636c653a204c32206f75747075742070726f706f7360448201527f616c2063616e6e6f7420626520746865207a65726f20686173680000000000006064820152608401610605565b81156111175781814014611117576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604960248201527f4c324f75747075744f7261636c653a20626c6f636b206861736820646f65732060448201527f6e6f74206d61746368207468652068617368206174207468652065787065637460648201527f6564206865696768740000000000000000000000000000000000000000000000608482015260a401610605565b8261112160035490565b857fa7aaf2512769da4e444e3de247be2564225c2e7a8f74cfe528e46e17d24868e24260405161115391815260200190565b60405180910390a45050604080516060810182529283526fffffffffffffffffffffffffffffffff4281166020850190815292811691840191825260038054600181018255600091909152935160029094027fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b810194909455915190518216700100000000000000000000000000000000029116177fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85c90910155565b60408051606081018252600080825260208201819052918101919091526003828154811061123f5761123f61161c565b600091825260209182902060408051606081018252600290930290910180548352600101546fffffffffffffffffffffffffffffffff8082169484019490945270010000000000000000000000000000000090049092169181019190915292915050565b604080516060810182526000808252602082018190529181019190915260036112cb836108e2565b8154811061123f5761123f61161c565b60007f00000000000000000000000000000000000000000000000000000000000000006001548361130c9190611605565b611316919061171c565b60025461132391906116c1565b92915050565b60007f00000000000000000000000000000000000000000000000000000000000000006113546107ba565b61082891906116c1565b6060816000036113a157505060408051808201909152600181527f3000000000000000000000000000000000000000000000000000000000000000602082015290565b8160005b81156113cb57806113b581611759565b91506113c49050600a83611708565b91506113a5565b60008167ffffffffffffffff8111156113e6576113e6611791565b6040519080825280601f01601f191660200182016040528015611410576020820181803683370190505b5090505b841561149357611425600183611605565b9150611432600a866117c0565b61143d9060306116c1565b60f81b8183815181106114525761145261161c565b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a90535061148c600a86611708565b9450611414565b949350505050565b803573ffffffffffffffffffffffffffffffffffffffff811681146114bf57600080fd5b919050565b600080600080608085870312156114da57600080fd5b84359350602085013592506114f16040860161149b565b91506114ff6060860161149b565b905092959194509250565b60005b8381101561152557818101518382015260200161150d565b83811115611534576000848401525b50505050565b602081526000825180602084015261155981604085016020870161150a565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169190910160400192915050565b60006020828403121561159d57600080fd5b5035919050565b600080600080608085870312156115ba57600080fd5b5050823594602084013594506040840135936060013592509050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600082821015611617576116176115d6565b500390565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b6000845161165d81846020890161150a565b80830190507f2e000000000000000000000000000000000000000000000000000000000000008082528551611699816001850160208a0161150a565b600192019182015283516116b481600284016020880161150a565b0160020195945050505050565b600082198211156116d4576116d46115d6565b500190565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b600082611717576117176116d9565b500490565b6000817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0483118215151615611754576117546115d6565b500290565b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff820361178a5761178a6115d6565b5060010190565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6000826117cf576117cf6116d9565b50069056fea164736f6c634300080f000a"

 func init() {
 	if err := json.Unmarshal([]byte(L2OutputOracleStorageLayoutJSON), L2OutputOracleStorageLayout); err != nil {

--- a/packages/contracts-bedrock/.gas-snapshot
+++ b/packages/contracts-bedrock/.gas-snapshot
@@ -104,7 +104,7 @@ FaultDisputeGame_Test:test_gameData_succeeds() (gas: 32829)
 FaultDisputeGame_Test:test_gameType_succeeds() (gas: 8250)
 FaultDisputeGame_Test:test_initialize_correctData_succeeds() (gas: 57650)
 FaultDisputeGame_Test:test_initialize_firstOutput_reverts() (gas: 210554)
-FaultDisputeGame_Test:test_initialize_l1HeadTooOld_reverts() (gas: 228334)
+FaultDisputeGame_Test:test_initialize_l1HeadTooOld_reverts() (gas: 228337)
 FaultDisputeGame_Test:test_move_clockCorrectness_succeeds() (gas: 415993)
 FaultDisputeGame_Test:test_move_clockTimeExceeded_reverts() (gas: 23219)
 FaultDisputeGame_Test:test_move_defendRoot_reverts() (gas: 13366)
@@ -234,17 +234,17 @@ L2ERC721Bridge_Test:test_finalizeBridgeERC721_notFromRemoteMessenger_reverts() (
 L2ERC721Bridge_Test:test_finalizeBridgeERC721_notViaLocalMessenger_reverts() (gas: 16126)
 L2ERC721Bridge_Test:test_finalizeBridgeERC721_selfToken_reverts() (gas: 17681)
 L2ERC721Bridge_Test:test_finalizeBridgeERC721_succeeds() (gas: 169375)
-L2OutputOracleUpgradeable_Test:test_initValuesOnImpl_succeeds() (gas: 23851)
-L2OutputOracleUpgradeable_Test:test_initValuesOnProxy_succeeds() (gas: 46738)
+L2OutputOracleUpgradeable_Test:test_initValuesOnImpl_succeeds() (gas: 23891)
+L2OutputOracleUpgradeable_Test:test_initValuesOnProxy_succeeds() (gas: 46789)
 L2OutputOracleUpgradeable_Test:test_initializeImpl_alreadyInitialized_reverts() (gas: 15216)
 L2OutputOracleUpgradeable_Test:test_initializeProxy_alreadyInitialized_reverts() (gas: 20216)
 L2OutputOracleUpgradeable_Test:test_upgrading_succeeds() (gas: 191346)
-L2OutputOracle_constructor_Test:test_constructor_l2BlockTimeZero_reverts() (gas: 39147)
-L2OutputOracle_constructor_Test:test_constructor_submissionInterval_reverts() (gas: 39157)
-L2OutputOracle_constructor_Test:test_constructor_succeeds() (gas: 51712)
+L2OutputOracle_constructor_Test:test_constructor_l2BlockTimeZero_reverts() (gas: 39209)
+L2OutputOracle_constructor_Test:test_constructor_submissionInterval_reverts() (gas: 39219)
+L2OutputOracle_constructor_Test:test_constructor_succeeds() (gas: 51766)
 L2OutputOracle_constructor_Test:test_initialize_badTimestamp_reverts() (gas: 12353)
 L2OutputOracle_deleteOutputs_Test:test_deleteL2Outputs_afterLatest_reverts() (gas: 217031)
-L2OutputOracle_deleteOutputs_Test:test_deleteL2Outputs_finalized_reverts() (gas: 113255)
+L2OutputOracle_deleteOutputs_Test:test_deleteL2Outputs_finalized_reverts() (gas: 113258)
 L2OutputOracle_deleteOutputs_Test:test_deleteL2Outputs_ifNotChallenger_reverts() (gas: 21018)
 L2OutputOracle_deleteOutputs_Test:test_deleteL2Outputs_nonExistent_reverts() (gas: 111651)
 L2OutputOracle_deleteOutputs_Test:test_deleteOutputs_multipleOutputs_succeeds() (gas: 307411)
@@ -256,7 +256,7 @@ L2OutputOracle_getter_Test:test_getL2OutputIndexAfter_previousBlock_succeeds() (
 L2OutputOracle_getter_Test:test_getL2OutputIndexAfter_sameBlock_succeeds() (gas: 98096)
 L2OutputOracle_getter_Test:test_getL2Output_succeeds() (gas: 103735)
 L2OutputOracle_getter_Test:test_latestBlockNumber_succeeds() (gas: 99129)
-L2OutputOracle_getter_Test:test_nextBlockNumber_succeeds() (gas: 17444)
+L2OutputOracle_getter_Test:test_nextBlockNumber_succeeds() (gas: 17447)
 L2OutputOracle_proposeL2Output_Test:test_proposeL2Output_emptyOutput_reverts() (gas: 28812)
 L2OutputOracle_proposeL2Output_Test:test_proposeL2Output_futureTimetamp_reverts() (gas: 30792)
 L2OutputOracle_proposeL2Output_Test:test_proposeL2Output_notProposer_reverts() (gas: 27928)
@@ -355,23 +355,23 @@ OptimismPortalUpgradeable_Test:test_initialize_cannotInitImpl_reverts() (gas: 11
 OptimismPortalUpgradeable_Test:test_initialize_cannotInitProxy_reverts() (gas: 16111)
 OptimismPortalUpgradeable_Test:test_params_initValuesOnProxy_succeeds() (gas: 21796)
 OptimismPortalUpgradeable_Test:test_upgradeToAndCall_upgrading_succeeds() (gas: 191412)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifOutputRootChanges_reverts() (gas: 178661)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifOutputTimestampIsNotFinalized_reverts() (gas: 182297)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifOutputRootChanges_reverts() (gas: 178667)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifOutputTimestampIsNotFinalized_reverts() (gas: 182306)
 OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifWithdrawalNotProven_reverts() (gas: 41780)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifWithdrawalProofNotOldEnough_reverts() (gas: 173950)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onInsufficientGas_reverts() (gas: 180692)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onRecentWithdrawal_reverts() (gas: 154737)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onReentrancy_reverts() (gas: 218735)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onReplay_reverts() (gas: 220968)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifWithdrawalProofNotOldEnough_reverts() (gas: 173953)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onInsufficientGas_reverts() (gas: 180701)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onRecentWithdrawal_reverts() (gas: 154740)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onReentrancy_reverts() (gas: 218747)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onReplay_reverts() (gas: 220983)
 OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_paused_reverts() (gas: 38706)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_provenWithdrawalHash_succeeds() (gas: 209670)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_provenWithdrawalHash_succeeds() (gas: 209679)
 OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_targetFails_fails() (gas: 8797746687696162676)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_timestampLessThanL2OracleStart_reverts() (gas: 171299)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_timestampLessThanL2OracleStart_reverts() (gas: 171302)
 OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_onInvalidOutputRootProof_reverts() (gas: 85805)
 OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_onInvalidWithdrawalProof_reverts() (gas: 111317)
 OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_onSelfCall_reverts() (gas: 52973)
 OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_paused_reverts() (gas: 58846)
-OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_replayProveChangedOutputRootAndOutputIndex_succeeds() (gas: 297494)
+OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_replayProveChangedOutputRootAndOutputIndex_succeeds() (gas: 297500)
 OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_replayProveChangedOutputRoot_succeeds() (gas: 227596)
 OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_replayProve_reverts() (gas: 166699)
 OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_validWithdrawalProof_succeeds() (gas: 154430)
@@ -387,12 +387,12 @@ OptimismPortal_Test:test_depositTransaction_withEthValueAndContractContractCreat
 OptimismPortal_Test:test_depositTransaction_withEthValueAndEOAContractCreation_succeeds() (gas: 75932)
 OptimismPortal_Test:test_depositTransaction_withEthValueFromContract_succeeds() (gas: 83479)
 OptimismPortal_Test:test_depositTransaction_withEthValueFromEOA_succeeds() (gas: 84072)
-OptimismPortal_Test:test_isOutputFinalized_succeeds() (gas: 126740)
+OptimismPortal_Test:test_isOutputFinalized_succeeds() (gas: 126755)
 OptimismPortal_Test:test_minimumGasLimit_succeeds() (gas: 17430)
 OptimismPortal_Test:test_pause_onlyGuardian_reverts() (gas: 24487)
 OptimismPortal_Test:test_pause_succeeds() (gas: 27344)
 OptimismPortal_Test:test_receive_succeeds() (gas: 127567)
-OptimismPortal_Test:test_simple_isOutputFinalized_succeeds() (gas: 35639)
+OptimismPortal_Test:test_simple_isOutputFinalized_succeeds() (gas: 35651)
 OptimismPortal_Test:test_unpause_onlyGuardian_reverts() (gas: 31514)
 OptimismPortal_Test:test_unpause_succeeds() (gas: 27451)
 OptimistAllowlistTest:test_constructor_succeeds() (gas: 16407)

--- a/packages/contracts-bedrock/.storage-layout
+++ b/packages/contracts-bedrock/.storage-layout
@@ -49,8 +49,8 @@
 | startingBlockNumber | uint256                       | 1    | 0      | 32    | src/L1/L2OutputOracle.sol:L2OutputOracle |
 | startingTimestamp   | uint256                       | 2    | 0      | 32    | src/L1/L2OutputOracle.sol:L2OutputOracle |
 | l2Outputs           | struct Types.OutputProposal[] | 3    | 0      | 32    | src/L1/L2OutputOracle.sol:L2OutputOracle |
-| _CHALLENGER         | address                       | 4    | 0      | 20    | src/L1/L2OutputOracle.sol:L2OutputOracle |
-| _PROPOSER           | address                       | 5    | 0      | 20    | src/L1/L2OutputOracle.sol:L2OutputOracle |
+| CHALLENGER          | address                       | 4    | 0      | 20    | src/L1/L2OutputOracle.sol:L2OutputOracle |
+| PROPOSER            | address                       | 5    | 0      | 20    | src/L1/L2OutputOracle.sol:L2OutputOracle |

 =======================
 ➡ src/L1/OptimismPortal.sol:OptimismPortal

--- a/packages/contracts-bedrock/semver-lock.json
+++ b/packages/contracts-bedrock/semver-lock.json
@@ -2,7 +2,7 @@
  "src/L1/L1CrossDomainMessenger.sol": "0x2b276f14475869cfd81868b03dc72b91dd726a787c9568caf4849fe34830b207",
  "src/L1/L1ERC721Bridge.sol": "0xac9d8e236a1b35c358f9800834f65375cf4270155e817cf3d0f2bac1968f9107",
  "src/L1/L1StandardBridge.sol": "0x26fd79e041c403f4bc68758c410fcc801975e7648c0b51a2c4a6e8c44fabcbfd",
-  "src/L1/L2OutputOracle.sol": "0xc9dcbefd8e1fec6fdafedbf509a95cd01fd31a819c5bc474ffb0aae10e29e44a",
+  "src/L1/L2OutputOracle.sol": "0x7c3245c8f37475aab4e43b6ed753ed140b5d4c38d25de797af56ee63258c002a",
  "src/L1/OptimismPortal.sol": "0xeaa47a63e8a3bcfdb7dfd3e6c8608369e34e362d9de82f3acf13cbc27c070bf7",
  "src/L1/SystemConfig.sol": "0x8e2b5103d2eb93b74af2e2f96a4505e637cdc3c44d80cf5ec2eca70060e1deff",
  "src/L2/BaseFeeVault.sol": "0xa596e60762f16192cfa86459fcb9f4da9d8f756106eedac643a1ffeafbbfcc5f",

--- a/packages/contracts-bedrock/src/L1/L2OutputOracle.sol
+++ b/packages/contracts-bedrock/src/L1/L2OutputOracle.sol
@@ -14,13 +14,22 @@ contract L2OutputOracle is Initializable, Semver {
    /// @notice The interval in L2 blocks at which checkpoints must be submitted.
    ///         Although this is immutable, it can safely be modified by upgrading the
    ///         implementation contract.
-    uint256 internal immutable _SUBMISSION_INTERVAL;
+    ///         Public getter is legacy and will be removed in the future. Use `submissionInterval`
+    ///         instead.
+    /// @custom:legacy
+    uint256 public immutable SUBMISSION_INTERVAL;

    /// @notice The time between L2 blocks in seconds. Once set, this value MUST NOT be modified.
-    uint256 internal immutable _L2_BLOCK_TIME;
+    ///         Public getter is legacy and will be removed in the future. Use `l2BlockTime`
+    ///         instead.
+    /// @custom:legacy
+    uint256 public immutable L2_BLOCK_TIME;

    /// @notice The minimum time (in seconds) that must elapse before a withdrawal can be finalized.
-    uint256 internal immutable _FINALIZATION_PERIOD_SECONDS;
+    ///         Public getter is legacy and will be removed in the future. Use
+    //          `finalizationPeriodSeconds` instead.
+    /// @custom:legacy
+    uint256 public immutable FINALIZATION_PERIOD_SECONDS;

    /// @notice The number of the first L2 block recorded in this contract.
    uint256 public startingBlockNumber;
@@ -32,12 +41,18 @@ contract L2OutputOracle is Initializable, Semver {
    Types.OutputProposal[] internal l2Outputs;

    /// @notice The address of the challenger. Can be updated via upgrade.
+    ///         Public getter is legacy and will be removed in the future.
+    ///         Use `challenger` instead.
    /// @custom:network-specific
-    address internal _CHALLENGER;
+    /// @custom:legacy
+    address public CHALLENGER;

    /// @notice The address of the proposer. Can be updated via upgrade.
+    ///         Public getter is legacy and will be removed in the future.
+    ///         Use `proposer` instead.
    /// @custom:network-specific
-    address internal _PROPOSER;
+    /// @custom:legacy
+    address public PROPOSER;

    /// @notice Emitted when an output is proposed.
    /// @param outputRoot    The output root.
@@ -73,9 +88,9 @@ contract L2OutputOracle is Initializable, Semver {
            "L2OutputOracle: submission interval must be greater than 0"
        );

-        _SUBMISSION_INTERVAL = _submissionInterval;
-        _L2_BLOCK_TIME = _l2BlockTime;
-        _FINALIZATION_PERIOD_SECONDS = _finalizationPeriodSeconds;
+        SUBMISSION_INTERVAL = _submissionInterval;
+        L2_BLOCK_TIME = _l2BlockTime;
+        FINALIZATION_PERIOD_SECONDS = _finalizationPeriodSeconds;

        initialize({
            _startingBlockNumber: 0,
@@ -104,63 +119,33 @@ contract L2OutputOracle is Initializable, Semver {
        startingTimestamp = _startingTimestamp;
        startingBlockNumber = _startingBlockNumber;

-        _PROPOSER = _proposer;
-        _CHALLENGER = _challenger;
-    }
-
-    /// @notice Getter for the output proposal submission interval.
-    /// @custom:legacy
-    function SUBMISSION_INTERVAL() external view returns (uint256) {
-        return _SUBMISSION_INTERVAL;
+        PROPOSER = _proposer;
+        CHALLENGER = _challenger;
    }

    /// @notice Getter for the output proposal submission interval.
    function submissionInterval() external view returns (uint256) {
-        return _SUBMISSION_INTERVAL;
-    }
-
-    /// @notice Getter for the L2 block time.
-    /// @custom:legacy
-    function L2_BLOCK_TIME() external view returns (uint256) {
-        return _L2_BLOCK_TIME;
+        return SUBMISSION_INTERVAL;
    }

    /// @notice Getter for the L2 block time.
    function l2BlockTime() external view returns (uint256) {
-        return _L2_BLOCK_TIME;
-    }
-
-    /// @notice Getter for the finalization period.
-    /// @custom:legacy
-    function FINALIZATION_PERIOD_SECONDS() external view returns (uint256) {
-        return _FINALIZATION_PERIOD_SECONDS;
+        return L2_BLOCK_TIME;
    }

    /// @notice Getter for the finalization period.
    function finalizationPeriodSeconds() external view returns (uint256) {
-        return _FINALIZATION_PERIOD_SECONDS;
-    }
-
-    /// @notice Getter for the challenger address.
-    /// @custom:legacy
-    function CHALLENGER() external view returns (address) {
-        return _CHALLENGER;
+        return FINALIZATION_PERIOD_SECONDS;
    }

    /// @notice Getter for the challenger address.
    function challenger() external view returns (address) {
-        return _CHALLENGER;
-    }
-
-    /// @notice Getter for the proposer address.
-    /// @custom:legacy
-    function PROPOSER() external view returns (address) {
-        return _PROPOSER;
+        return CHALLENGER;
    }

    /// @notice Getter for the proposer address.
    function proposer() external view returns (address) {
-        return _PROPOSER;
+        return PROPOSER;
    }

    /// @notice Deletes all output proposals after and including the proposal that corresponds to
@@ -170,7 +155,7 @@ contract L2OutputOracle is Initializable, Semver {
    // solhint-disable-next-line ordering
    function deleteL2Outputs(uint256 _l2OutputIndex) external {
        require(
-            msg.sender == _CHALLENGER,
+            msg.sender == CHALLENGER,
            "L2OutputOracle: only the challenger address can delete outputs"
        );

@@ -182,7 +167,7 @@ contract L2OutputOracle is Initializable, Semver {

        // Do not allow deleting any outputs that have already been finalized.
        require(
-            block.timestamp - l2Outputs[_l2OutputIndex].timestamp < _FINALIZATION_PERIOD_SECONDS,
+            block.timestamp - l2Outputs[_l2OutputIndex].timestamp < FINALIZATION_PERIOD_SECONDS,
            "L2OutputOracle: cannot delete outputs that have already been finalized"
        );

@@ -210,7 +195,7 @@ contract L2OutputOracle is Initializable, Semver {
        uint256 _l1BlockNumber
    ) external payable {
        require(
-            msg.sender == _PROPOSER,
+            msg.sender == PROPOSER,
            "L2OutputOracle: only the proposer address can propose new outputs"
        );

@@ -339,13 +324,13 @@ contract L2OutputOracle is Initializable, Semver {
    /// @notice Computes the block number of the next L2 block that needs to be checkpointed.
    /// @return Next L2 block number.
    function nextBlockNumber() public view returns (uint256) {
-        return latestBlockNumber() + _SUBMISSION_INTERVAL;
+        return latestBlockNumber() + SUBMISSION_INTERVAL;
    }

    /// @notice Returns the L2 timestamp corresponding to a given L2 block number.
    /// @param _l2BlockNumber The L2 block number of the target block.
    /// @return L2 timestamp of the given block.
    function computeL2Timestamp(uint256 _l2BlockNumber) public view returns (uint256) {
-        return startingTimestamp + ((_l2BlockNumber - startingBlockNumber) * _L2_BLOCK_TIME);
+        return startingTimestamp + ((_l2BlockNumber - startingBlockNumber) * L2_BLOCK_TIME);
    }
 }