Merge branch 'develop' into cleanup/ctb-clean

go.mod

@@ -17,7 +17,7 @@ require (
 	github.com/google/uuid v1.3.0
 	github.com/gorilla/mux v1.8.0
 	github.com/hashicorp/go-multierror v1.1.1
-	github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d
+	github.com/hashicorp/golang-lru v1.0.2
 	github.com/hashicorp/golang-lru/v2 v2.0.1
 	github.com/holiman/uint256 v1.2.3
 	github.com/ipfs/go-datastore v0.6.0

go.sum

@@ -319,8 +319,8 @@ github.com/hashicorp/go-bexpr v0.1.11/go.mod h1:f03lAo0duBlDIUMGCuad8oLcgejw4m7U
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
-github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d h1:dg1dEPuWpEqDnvIw251EVy4zlP8gWbsGj4BsUKCRpYs=
-github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
+github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c=
+github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hashicorp/golang-lru/v2 v2.0.1 h1:5pv5N1lT1fjLg2VQ5KWc7kmucp2x/kvFOnxuVTqZ6x4=
 github.com/hashicorp/golang-lru/v2 v2.0.1/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=

op-bindings/bindings/l1blocknumber.go

@@ -31,7 +31,7 @@ var (
 // L1BlockNumberMetaData contains all meta data concerning the L1BlockNumber contract.
 var L1BlockNumberMetaData = &bind.MetaData{
 	ABI: "[{\"inputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"stateMutability\":\"payable\",\"type\":\"fallback\"},{\"inputs\":[],\"name\":\"getL1BlockNumber\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"version\",\"outputs\":[{\"internalType\":\"string\",\"name\":\"\",\"type\":\"string\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"stateMutability\":\"payable\",\"type\":\"receive\"}]",
-	Bin: "0x60e060405234801561001057600080fd5b5060016080819052600060a081905260c08290528161059461004a8339600061018d015260006101640152600061013b01526105946000f3fe60806040526004361061002d5760003560e01c806354fd4d5014610052578063b9b3efe91461007d57610048565b3661004857600061003c6100a0565b90508060005260206000f35b600061003c6100a0565b34801561005e57600080fd5b50610067610134565b6040516100749190610344565b60405180910390f35b34801561008957600080fd5b506100926100a0565b604051908152602001610074565b600073420000000000000000000000000000000000001573ffffffffffffffffffffffffffffffffffffffff16638381f58a6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610101573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101259190610395565b67ffffffffffffffff16905090565b606061015f7f00000000000000000000000000000000000000000000000000000000000000006101d7565b6101887f00000000000000000000000000000000000000000000000000000000000000006101d7565b6101b17f00000000000000000000000000000000000000000000000000000000000000006101d7565b6040516020016101c3939291906103c6565b604051602081830303815290604052905090565b60608160000361021a57505060408051808201909152600181527f3000000000000000000000000000000000000000000000000000000000000000602082015290565b8160005b8115610244578061022e8161046b565b915061023d9050600a836104d2565b915061021e565b60008167ffffffffffffffff81111561025f5761025f6104e6565b6040519080825280601f01601f191660200182016040528015610289576020820181803683370190505b5090505b841561030c5761029e600183610515565b91506102ab600a8661052c565b6102b6906030610540565b60f81b8183815181106102cb576102cb610558565b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a905350610305600a866104d2565b945061028d565b949350505050565b60005b8381101561032f578181015183820152602001610317565b8381111561033e576000848401525b50505050565b6020815260008251806020840152610363816040850160208701610314565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169190910160400192915050565b6000602082840312156103a757600080fd5b815167ffffffffffffffff811681146103bf57600080fd5b9392505050565b600084516103d8818460208901610314565b80830190507f2e000000000000000000000000000000000000000000000000000000000000008082528551610414816001850160208a01610314565b6001920191820152835161042f816002840160208801610314565b0160020195945050505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff820361049c5761049c61043c565b5060010190565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b6000826104e1576104e16104a3565b500490565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6000828210156105275761052761043c565b500390565b60008261053b5761053b6104a3565b500690565b600082198211156105535761055361043c565b500190565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fdfea164736f6c634300080f000a",
+	Bin: "0x60e060405234801561001057600080fd5b506001608052600060a052600260c05260805160a05160c05161059461004f600039600061018d015260006101640152600061013b01526105946000f3fe60806040526004361061002d5760003560e01c806354fd4d5014610052578063b9b3efe91461007d57610048565b3661004857600061003c6100a0565b90508060005260206000f35b600061003c6100a0565b34801561005e57600080fd5b50610067610134565b6040516100749190610344565b60405180910390f35b34801561008957600080fd5b506100926100a0565b604051908152602001610074565b600073420000000000000000000000000000000000001573ffffffffffffffffffffffffffffffffffffffff16638381f58a6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610101573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101259190610395565b67ffffffffffffffff16905090565b606061015f7f00000000000000000000000000000000000000000000000000000000000000006101d7565b6101887f00000000000000000000000000000000000000000000000000000000000000006101d7565b6101b17f00000000000000000000000000000000000000000000000000000000000000006101d7565b6040516020016101c3939291906103c6565b604051602081830303815290604052905090565b60608160000361021a57505060408051808201909152600181527f3000000000000000000000000000000000000000000000000000000000000000602082015290565b8160005b8115610244578061022e8161046b565b915061023d9050600a836104d2565b915061021e565b60008167ffffffffffffffff81111561025f5761025f6104e6565b6040519080825280601f01601f191660200182016040528015610289576020820181803683370190505b5090505b841561030c5761029e600183610515565b91506102ab600a8661052c565b6102b6906030610540565b60f81b8183815181106102cb576102cb610558565b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a905350610305600a866104d2565b945061028d565b949350505050565b60005b8381101561032f578181015183820152602001610317565b8381111561033e576000848401525b50505050565b6020815260008251806020840152610363816040850160208701610314565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169190910160400192915050565b6000602082840312156103a757600080fd5b815167ffffffffffffffff811681146103bf57600080fd5b9392505050565b600084516103d8818460208901610314565b80830190507f2e000000000000000000000000000000000000000000000000000000000000008082528551610414816001850160208a01610314565b6001920191820152835161042f816002840160208801610314565b0160020195945050505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff820361049c5761049c61043c565b5060010190565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b6000826104e1576104e16104a3565b500490565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6000828210156105275761052761043c565b500390565b60008261053b5761053b6104a3565b500690565b600082198211156105535761055361043c565b500190565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fdfea164736f6c634300080f000a",
 }
 
 // L1BlockNumberABI is the input ABI used to generate the binding from.

op-bindings/bindings/legacymessagepasser.go

@@ -31,7 +31,7 @@ var (
 // LegacyMessagePasserMetaData contains all meta data concerning the LegacyMessagePasser contract.
 var LegacyMessagePasserMetaData = &bind.MetaData{
 	ABI: "[{\"inputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"_message\",\"type\":\"bytes\"}],\"name\":\"passMessageToL1\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"name\":\"sentMessages\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"version\",\"outputs\":[{\"internalType\":\"string\",\"name\":\"\",\"type\":\"string\"}],\"stateMutability\":\"view\",\"type\":\"function\"}]",
-	Bin: "0x60e060405234801561001057600080fd5b5060016080819052600060a081905260c082905281610698610048833960006101050152600060dc0152600060b301526106986000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c806354fd4d501461004657806382e3702d14610064578063cafa81dc14610097575b600080fd5b61004e6100ac565b60405161005b9190610347565b60405180910390f35b610087610072366004610398565b60006020819052908152604090205460ff1681565b604051901515815260200161005b565b6100aa6100a53660046103e0565b61014f565b005b60606100d77f00000000000000000000000000000000000000000000000000000000000000006101da565b6101007f00000000000000000000000000000000000000000000000000000000000000006101da565b6101297f00000000000000000000000000000000000000000000000000000000000000006101da565b60405160200161013b939291906104af565b604051602081830303815290604052905090565b60016000808333604051602001610167929190610525565b604080518083037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe001815291815281516020928301208352908201929092520160002080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001691151591909117905550565b60608160000361021d57505060408051808201909152600181527f3000000000000000000000000000000000000000000000000000000000000000602082015290565b8160005b811561024757806102318161059e565b91506102409050600a83610605565b9150610221565b60008167ffffffffffffffff811115610262576102626103b1565b6040519080825280601f01601f19166020018201604052801561028c576020820181803683370190505b5090505b841561030f576102a1600183610619565b91506102ae600a86610630565b6102b9906030610644565b60f81b8183815181106102ce576102ce61065c565b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a905350610308600a86610605565b9450610290565b949350505050565b60005b8381101561033257818101518382015260200161031a565b83811115610341576000848401525b50505050565b6020815260008251806020840152610366816040850160208701610317565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169190910160400192915050565b6000602082840312156103aa57600080fd5b5035919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6000602082840312156103f257600080fd5b813567ffffffffffffffff8082111561040a57600080fd5b818401915084601f83011261041e57600080fd5b813581811115610430576104306103b1565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0908116603f01168101908382118183101715610476576104766103b1565b8160405282815287602084870101111561048f57600080fd5b826020860160208301376000928101602001929092525095945050505050565b600084516104c1818460208901610317565b80830190507f2e0000000000000000000000000000000000000000000000000000000000000080825285516104fd816001850160208a01610317565b60019201918201528351610518816002840160208801610317565b0160020195945050505050565b60008351610537818460208801610317565b60609390931b7fffffffffffffffffffffffffffffffffffffffff000000000000000000000000169190920190815260140192915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82036105cf576105cf61056f565b5060010190565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b600082610614576106146105d6565b500490565b60008282101561062b5761062b61056f565b500390565b60008261063f5761063f6105d6565b500690565b600082198211156106575761065761056f565b500190565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fdfea164736f6c634300080f000a",
+	Bin: "0x60e060405234801561001057600080fd5b506001608052600060a052600260c05260805160a05160c05161069861004d60003960006101050152600060dc0152600060b301526106986000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c806354fd4d501461004657806382e3702d14610064578063cafa81dc14610097575b600080fd5b61004e6100ac565b60405161005b9190610347565b60405180910390f35b610087610072366004610398565b60006020819052908152604090205460ff1681565b604051901515815260200161005b565b6100aa6100a53660046103e0565b61014f565b005b60606100d77f00000000000000000000000000000000000000000000000000000000000000006101da565b6101007f00000000000000000000000000000000000000000000000000000000000000006101da565b6101297f00000000000000000000000000000000000000000000000000000000000000006101da565b60405160200161013b939291906104af565b604051602081830303815290604052905090565b60016000808333604051602001610167929190610525565b604080518083037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe001815291815281516020928301208352908201929092520160002080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001691151591909117905550565b60608160000361021d57505060408051808201909152600181527f3000000000000000000000000000000000000000000000000000000000000000602082015290565b8160005b811561024757806102318161059e565b91506102409050600a83610605565b9150610221565b60008167ffffffffffffffff811115610262576102626103b1565b6040519080825280601f01601f19166020018201604052801561028c576020820181803683370190505b5090505b841561030f576102a1600183610619565b91506102ae600a86610630565b6102b9906030610644565b60f81b8183815181106102ce576102ce61065c565b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a905350610308600a86610605565b9450610290565b949350505050565b60005b8381101561033257818101518382015260200161031a565b83811115610341576000848401525b50505050565b6020815260008251806020840152610366816040850160208701610317565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169190910160400192915050565b6000602082840312156103aa57600080fd5b5035919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6000602082840312156103f257600080fd5b813567ffffffffffffffff8082111561040a57600080fd5b818401915084601f83011261041e57600080fd5b813581811115610430576104306103b1565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0908116603f01168101908382118183101715610476576104766103b1565b8160405282815287602084870101111561048f57600080fd5b826020860160208301376000928101602001929092525095945050505050565b600084516104c1818460208901610317565b80830190507f2e0000000000000000000000000000000000000000000000000000000000000080825285516104fd816001850160208a01610317565b60019201918201528351610518816002840160208801610317565b0160020195945050505050565b60008351610537818460208801610317565b60609390931b7fffffffffffffffffffffffffffffffffffffffff000000000000000000000000169190920190815260140192915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82036105cf576105cf61056f565b5060010190565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b600082610614576106146105d6565b500490565b60008282101561062b5761062b61056f565b500390565b60008261063f5761063f6105d6565b500690565b600082198211156106575761065761056f565b500190565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fdfea164736f6c634300080f000a",
 }
 
 // LegacyMessagePasserABI is the input ABI used to generate the binding from.

op-challenger/fault/loader.go

@@ -8,9 +8,9 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 )
 
-// ClaimFetcher is a minimal interface around [bindings.FaultDisputeGameCaller].
+// MinimalFaultDisputeGameCaller is a minimal interface around [bindings.FaultDisputeGameCaller].
 // This needs to be updated if the [bindings.FaultDisputeGameCaller] interface changes.
-type ClaimFetcher interface {
+type MinimalFaultDisputeGameCaller interface {
 	ClaimData(opts *bind.CallOpts, arg0 *big.Int) (struct {
 		ParentIndex uint32
 		Countered   bool
@@ -20,23 +20,25 @@ type ClaimFetcher interface {
 	}, error)
 	ClaimDataLen(opts *bind.CallOpts) (*big.Int, error)
 	MAXGAMEDEPTH(opts *bind.CallOpts) (*big.Int, error)
+	ABSOLUTEPRESTATE(opts *bind.CallOpts) ([32]byte, error)
 }
 
 // Loader is a minimal interface for loading onchain [Claim] data.
 type Loader interface {
 	FetchClaims(ctx context.Context) ([]types.Claim, error)
 	FetchGameDepth(ctx context.Context) (uint64, error)
+	FetchAbsolutePrestateHash(ctx context.Context) ([]byte, error)
 }
 
 // loader pulls in fault dispute game claim data periodically and over subscriptions.
 type loader struct {
-	claimFetcher ClaimFetcher
+	caller MinimalFaultDisputeGameCaller
 }
 
 // NewLoader creates a new [loader].
-func NewLoader(claimFetcher ClaimFetcher) *loader {
+func NewLoader(caller MinimalFaultDisputeGameCaller) *loader {
 	return &loader{
-		claimFetcher: claimFetcher,
+		caller: caller,
 	}
 }
 
@@ -46,7 +48,7 @@ func (l *loader) FetchGameDepth(ctx context.Context) (uint64, error) {
 		Context: ctx,
 	}
 
-	gameDepth, err := l.claimFetcher.MAXGAMEDEPTH(&callOpts)
+	gameDepth, err := l.caller.MAXGAMEDEPTH(&callOpts)
 	if err != nil {
 		return 0, err
 	}
@@ -60,7 +62,7 @@ func (l *loader) fetchClaim(ctx context.Context, arrIndex uint64) (types.Claim,
 		Context: ctx,
 	}
 
-	fetchedClaim, err := l.claimFetcher.ClaimData(&callOpts, new(big.Int).SetUint64(arrIndex))
+	fetchedClaim, err := l.caller.ClaimData(&callOpts, new(big.Int).SetUint64(arrIndex))
 	if err != nil {
 		return types.Claim{}, err
 	}
@@ -78,7 +80,7 @@ func (l *loader) fetchClaim(ctx context.Context, arrIndex uint64) (types.Claim,
 
 	if !claim.IsRootPosition() {
 		parentIndex := uint64(fetchedClaim.ParentIndex)
-		parentClaim, err := l.claimFetcher.ClaimData(&callOpts, new(big.Int).SetUint64(parentIndex))
+		parentClaim, err := l.caller.ClaimData(&callOpts, new(big.Int).SetUint64(parentIndex))
 		if err != nil {
 			return types.Claim{}, err
 		}
@@ -94,7 +96,7 @@ func (l *loader) fetchClaim(ctx context.Context, arrIndex uint64) (types.Claim,
 // FetchClaims fetches all claims from the fault dispute game.
 func (l *loader) FetchClaims(ctx context.Context) ([]types.Claim, error) {
 	// Get the current claim count.
-	claimCount, err := l.claimFetcher.ClaimDataLen(&bind.CallOpts{
+	claimCount, err := l.caller.ClaimDataLen(&bind.CallOpts{
 		Context: ctx,
 	})
 	if err != nil {
@@ -113,3 +115,18 @@ func (l *loader) FetchClaims(ctx context.Context) ([]types.Claim, error) {
 
 	return claimList, nil
 }
+
+// FetchAbsolutePrestateHash fetches the hashed absolute prestate from the fault dispute game.
+func (l *loader) FetchAbsolutePrestateHash(ctx context.Context) ([]byte, error) {
+	callOpts := bind.CallOpts{
+		Context: ctx,
+	}
+
+	absolutePrestate, err := l.caller.ABSOLUTEPRESTATE(&callOpts)
+	if err != nil {
+		return nil, err
+	}
+	returnValue := absolutePrestate[:]
+
+	return returnValue, nil
+}

op-challenger/fault/loader_test.go

@@ -7,7 +7,9 @@ import (
 	"testing"
 
 	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
+
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/stretchr/testify/require"
 )
 
@@ -15,12 +17,14 @@ var (
 	mockClaimDataError    = fmt.Errorf("claim data errored")
 	mockClaimLenError     = fmt.Errorf("claim len errored")
 	mockMaxGameDepthError = fmt.Errorf("max game depth errored")
+	mockPrestateError     = fmt.Errorf("prestate errored")
 )
 
-type mockClaimFetcher struct {
+type mockCaller struct {
 	claimDataError    bool
 	claimLenError     bool
 	maxGameDepthError bool
+	prestateError     bool
 	maxGameDepth      uint64
 	currentIndex      uint64
 	returnClaims      []struct {
@@ -32,8 +36,8 @@ type mockClaimFetcher struct {
 	}
 }
 
-func newMockClaimFetcher() *mockClaimFetcher {
-	return &mockClaimFetcher{
+func newMockCaller() *mockCaller {
+	return &mockCaller{
 		returnClaims: []struct {
 			ParentIndex uint32
 			Countered   bool
@@ -63,7 +67,7 @@ func newMockClaimFetcher() *mockClaimFetcher {
 	}
 }
 
-func (m *mockClaimFetcher) ClaimData(opts *bind.CallOpts, arg0 *big.Int) (struct {
+func (m *mockCaller) ClaimData(opts *bind.CallOpts, arg0 *big.Int) (struct {
 	ParentIndex uint32
 	Countered   bool
 	Claim       [32]byte
@@ -84,46 +88,73 @@ func (m *mockClaimFetcher) ClaimData(opts *bind.CallOpts, arg0 *big.Int) (struct
 	return returnClaim, nil
 }
 
-func (m *mockClaimFetcher) ClaimDataLen(opts *bind.CallOpts) (*big.Int, error) {
+func (m *mockCaller) ClaimDataLen(opts *bind.CallOpts) (*big.Int, error) {
 	if m.claimLenError {
 		return big.NewInt(0), mockClaimLenError
 	}
 	return big.NewInt(int64(len(m.returnClaims))), nil
 }
 
-func (m *mockClaimFetcher) MAXGAMEDEPTH(opts *bind.CallOpts) (*big.Int, error) {
+func (m *mockCaller) MAXGAMEDEPTH(opts *bind.CallOpts) (*big.Int, error) {
 	if m.maxGameDepthError {
 		return nil, mockMaxGameDepthError
 	}
 	return big.NewInt(int64(m.maxGameDepth)), nil
 }
 
+func (m *mockCaller) ABSOLUTEPRESTATE(opts *bind.CallOpts) ([32]byte, error) {
+	if m.prestateError {
+		return [32]byte{}, mockPrestateError
+	}
+	return common.HexToHash("0xdEad"), nil
+}
+
 // TestLoader_FetchGameDepth tests [loader.FetchGameDepth].
 func TestLoader_FetchGameDepth(t *testing.T) {
 	t.Run("Succeeds", func(t *testing.T) {
-		mockClaimFetcher := newMockClaimFetcher()
-		mockClaimFetcher.maxGameDepth = 10
-		loader := NewLoader(mockClaimFetcher)
+		mockCaller := newMockCaller()
+		mockCaller.maxGameDepth = 10
+		loader := NewLoader(mockCaller)
 		depth, err := loader.FetchGameDepth(context.Background())
 		require.NoError(t, err)
 		require.Equal(t, uint64(10), depth)
 	})
 
 	t.Run("Errors", func(t *testing.T) {
-		mockClaimFetcher := newMockClaimFetcher()
-		mockClaimFetcher.maxGameDepthError = true
-		loader := NewLoader(mockClaimFetcher)
+		mockCaller := newMockCaller()
+		mockCaller.maxGameDepthError = true
+		loader := NewLoader(mockCaller)
 		depth, err := loader.FetchGameDepth(context.Background())
 		require.ErrorIs(t, mockMaxGameDepthError, err)
 		require.Equal(t, depth, uint64(0))
 	})
 }
 
+// TestLoader_FetchAbsolutePrestateHash tests the [loader.FetchAbsolutePrestateHash] function.
+func TestLoader_FetchAbsolutePrestateHash(t *testing.T) {
+	t.Run("Succeeds", func(t *testing.T) {
+		mockCaller := newMockCaller()
+		loader := NewLoader(mockCaller)
+		prestate, err := loader.FetchAbsolutePrestateHash(context.Background())
+		require.NoError(t, err)
+		require.ElementsMatch(t, common.HexToHash("0xdEad"), prestate)
+	})
+
+	t.Run("Errors", func(t *testing.T) {
+		mockCaller := newMockCaller()
+		mockCaller.prestateError = true
+		loader := NewLoader(mockCaller)
+		prestate, err := loader.FetchAbsolutePrestateHash(context.Background())
+		require.Error(t, err)
+		require.ElementsMatch(t, common.Hash{}, prestate)
+	})
+}
+
 // TestLoader_FetchClaims_Succeeds tests [loader.FetchClaims].
 func TestLoader_FetchClaims_Succeeds(t *testing.T) {
-	mockClaimFetcher := newMockClaimFetcher()
-	expectedClaims := mockClaimFetcher.returnClaims
-	loader := NewLoader(mockClaimFetcher)
+	mockCaller := newMockCaller()
+	expectedClaims := mockCaller.returnClaims
+	loader := NewLoader(mockCaller)
 	claims, err := loader.FetchClaims(context.Background())
 	require.NoError(t, err)
 	require.ElementsMatch(t, []types.Claim{
@@ -172,9 +203,9 @@ func TestLoader_FetchClaims_Succeeds(t *testing.T) {
 // TestLoader_FetchClaims_ClaimDataErrors tests [loader.FetchClaims]
 // when the claim fetcher [ClaimData] function call errors.
 func TestLoader_FetchClaims_ClaimDataErrors(t *testing.T) {
-	mockClaimFetcher := newMockClaimFetcher()
-	mockClaimFetcher.claimDataError = true
-	loader := NewLoader(mockClaimFetcher)
+	mockCaller := newMockCaller()
+	mockCaller.claimDataError = true
+	loader := NewLoader(mockCaller)
 	claims, err := loader.FetchClaims(context.Background())
 	require.ErrorIs(t, err, mockClaimDataError)
 	require.Empty(t, claims)
@@ -183,9 +214,9 @@ func TestLoader_FetchClaims_ClaimDataErrors(t *testing.T) {
 // TestLoader_FetchClaims_ClaimLenErrors tests [loader.FetchClaims]
 // when the claim fetcher [ClaimDataLen] function call errors.
 func TestLoader_FetchClaims_ClaimLenErrors(t *testing.T) {
-	mockClaimFetcher := newMockClaimFetcher()
-	mockClaimFetcher.claimLenError = true
-	loader := NewLoader(mockClaimFetcher)
+	mockCaller := newMockCaller()
+	mockCaller.claimLenError = true
+	loader := NewLoader(mockCaller)
 	claims, err := loader.FetchClaims(context.Background())
 	require.ErrorIs(t, err, mockClaimLenError)
 	require.Empty(t, claims)

op-e2e/e2eutils/disputegame/cannon_helper.go

@@ -27,7 +27,7 @@ func (g *CannonGameHelper) StartChallenger(ctx context.Context, rollupCfg *rollu
 			c.CannonDatadir = g.t.TempDir()
 			c.CannonServer = "../op-program/bin/op-program"
 			c.CannonAbsolutePreState = "../op-program/bin/prestate.json"
-			c.CannonSnapshotFreq = config.DefaultCannonSnapshotFreq
+			c.CannonSnapshotFreq = 10_000_000
 
 			genesisBytes, err := json.Marshal(l2Genesis)
 			g.require.NoError(err, "marshall l2 genesis config")

op-e2e/e2eutils/disputegame/helper.go

@@ -22,7 +22,6 @@ import (
 const alphabetGameType uint8 = 0
 const cannonGameType uint8 = 1
 const alphabetGameDepth = 4
-const cannonGameDepth = 64
 const lastAlphabetTraceIndex = 1<<alphabetGameDepth - 1
 
 type Status uint8
@@ -109,13 +108,12 @@ func (h *FactoryHelper) StartAlphabetGame(ctx context.Context, claimedAlphabet s
 
 	return &AlphabetGameHelper{
 		FaultGameHelper: FaultGameHelper{
-			t:        h.t,
-			require:  h.require,
-			client:   h.client,
-			opts:     h.opts,
-			game:     game,
-			maxDepth: alphabetGameDepth,
-			addr:     createdEvent.DisputeProxy,
+			t:       h.t,
+			require: h.require,
+			client:  h.client,
+			opts:    h.opts,
+			game:    game,
+			addr:    createdEvent.DisputeProxy,
 		},
 		claimedAlphabet: claimedAlphabet,
 	}
@@ -143,13 +141,12 @@ func (h *FactoryHelper) StartCannonGame(ctx context.Context, rootClaim common.Ha
 
 	return &CannonGameHelper{
 		FaultGameHelper: FaultGameHelper{
-			t:        h.t,
-			require:  h.require,
-			client:   h.client,
-			opts:     h.opts,
-			game:     game,
-			maxDepth: cannonGameDepth,
-			addr:     createdEvent.DisputeProxy,
+			t:       h.t,
+			require: h.require,
+			client:  h.client,
+			opts:    h.opts,
+			game:    game,
+			addr:    createdEvent.DisputeProxy,
 		},
 	}
 }

op-e2e/faultproof_test.go

@@ -160,8 +160,18 @@ func TestCannonDisputeGame(t *testing.T) {
 		c.TxMgrConfig.PrivateKey = e2eutils.EncodePrivKeyToString(sys.cfg.Secrets.Alice)
 	})
 
-	// Challenger should counter the root claim
-	game.WaitForClaimCount(ctx, 2)
+	maxDepth := game.MaxDepth(ctx)
+	for claimCount := int64(1); claimCount < maxDepth; {
+		claimCount++
+		// Wait for the challenger to counter
+		game.WaitForClaimCount(ctx, claimCount)
+
+		// Post our own counter to the latest challenger claim
+		game.Attack(ctx, claimCount-1, common.Hash{byte(claimCount)})
+		claimCount++
+		game.WaitForClaimCount(ctx, claimCount)
+	}
+	game.WaitForClaimAtMaxDepth(ctx, false)
 
 	sys.TimeTravelClock.AdvanceTime(game.GameDuration(ctx))
 	require.NoError(t, utils.WaitNextBlock(ctx, l1Client))

packages/contracts-bedrock/.eslintignore

@@ -5,6 +5,5 @@ lib
 artifacts
 forge-artifacts
 cache
-typechain
 coverage*
 deployments

packages/contracts-bedrock/.npmignore

 scripts
 test
+.envrc

packages/contracts-bedrock/.prettierrc.js

-module.exports = {
-  ...require('../../.prettierrc.js'),
-}

packages/contracts-bedrock/.solhintignore

-# Deps and test files
-node_modules
-lib
-contracts/test/*.t.sol
-contracts/vendor/*.sol
-
-# MIPS.sol has special VM formatting, not like other contracts.
-contracts/cannon/MIPS.sol

packages/contracts-bedrock/scripts/DeployConfig.s.sol

@@ -106,7 +106,7 @@ contract DeployConfig is Script {
             } catch {
                 try vm.parseJsonUint(_json, "$.l1StartingBlockTag") returns (uint256 tag) {
                     return _getBlockByTag(vm.toString(tag));
-                } catch {}
+                } catch { }
             }
         }
         revert("l1StartingBlockTag must be a bytes32, string or uint256 or cannot fetch l1StartingBlockTag");

packages/contracts-bedrock/scripts/DeployL2.s.sol

@@ -39,7 +39,7 @@ contract DeployL2 is Deployer {
     }
 
     /// @notice Deploy the EAS implementation.
-    function deployEAS() broadcast() public returns (address) {
+    function deployEAS() public broadcast returns (address) {
         EAS eas = new EAS();
 
         ISchemaRegistry registry = eas.getSchemaRegistry();
@@ -55,7 +55,7 @@ contract DeployL2 is Deployer {
     }
 
     /// @notice Deploy the SchemaManager implementation.
-    function deploySchemaRegistry() broadcast() public returns (address) {
+    function deploySchemaRegistry() public broadcast returns (address) {
         SchemaRegistry registry = new SchemaRegistry();
 
         save("SchemaRegistry", address(registry));
@@ -67,4 +67,3 @@ contract DeployL2 is Deployer {
         return address(registry);
     }
 }
-

packages/contracts-bedrock/scripts/FaultDisputeGameViz.s.sol

@@ -54,13 +54,7 @@ contract FaultDisputeGameViz is Script, FaultDisputeGame_Init {
         uint256 numClaims = uint256(vm.load(address(gameProxy), bytes32(uint256(1))));
         IFaultDisputeGame.ClaimData[] memory gameData = new IFaultDisputeGame.ClaimData[](numClaims);
         for (uint256 i = 0; i < numClaims; i++) {
-            (
-                uint32 parentIndex,
-                bool countered,
-                Claim claim,
-                Position position,
-                Clock clock
-            ) = gameProxy.claimData(i);
+            (uint32 parentIndex, bool countered, Claim claim, Position position, Clock clock) = gameProxy.claimData(i);
 
             gameData[i] = IFaultDisputeGame.ClaimData({
                 parentIndex: parentIndex,

packages/contracts-bedrock/scripts/SemverLock.s.sol

@@ -31,11 +31,7 @@ contract SemverLock is Script {
             commands = new string[](3);
             commands[0] = "bash";
             commands[1] = "-c";
-            commands[2] = string.concat(
-                "echo \"",
-                _files[i],
-                "\"| sed -E \'s|src/.*/(.+)\\.sol|\\1|\'"
-            );
+            commands[2] = string.concat("echo \"", _files[i], "\"| sed -E \'s|src/.*/(.+)\\.sol|\\1|\'");
             string memory contractName = string(vm.ffi(commands));
 
             commands[0] = "bash";
@@ -44,14 +40,8 @@ contract SemverLock is Script {
             string memory artifactsDir = string(vm.ffi(commands));
 
             // Parse the artifact to get the contract's initcode hash.
-            bytes memory initCode = vm.getCode(string.concat(
-                artifactsDir,
-                "/",
-                contractName,
-                ".sol/",
-                contractName,
-                ".json"
-            ));
+            bytes memory initCode =
+                vm.getCode(string.concat(artifactsDir, "/", contractName, ".sol/", contractName, ".json"));
 
             // Serialize the source hash in JSON.
             string memory j = vm.serializeBytes32(out, _files[i], keccak256(abi.encodePacked(fileContents, initCode)));

packages/contracts-bedrock/scripts/outputs/DeleteOutput.s.sol

@@ -68,7 +68,7 @@ contract DeleteOutput is SafeBuilder {
     }
 
     /// @notice Test coverage of the script.
-    function test_script_succeeds() skipWhenNotForking external {
+    function test_script_succeeds() external skipWhenNotForking {
         uint256 _index = getLatestIndex();
         require(_index != 0, "DeleteOutput: No outputs to delete.");
 
@@ -103,10 +103,7 @@ contract DeleteOutput is SafeBuilder {
         calls[0] = IMulticall3.Call3({
             target: oracle,
             allowFailure: false,
-            callData: abi.encodeCall(
-                L2OutputOracle.deleteL2Outputs,
-                (index)
-            )
+            callData: abi.encodeCall(L2OutputOracle.deleteL2Outputs, (index))
         });
 
         return abi.encodeCall(IMulticall3.aggregate3, (calls));

packages/contracts-bedrock/src/EAS/SchemaRegistry.sol

@@ -2,9 +2,7 @@
 pragma solidity 0.8.19;
 
 import { Semver } from "../universal/Semver.sol";
-
 import { ISchemaResolver } from "./resolver/ISchemaResolver.sol";
-
 import { EMPTY_UID, MAX_GAP } from "./Common.sol";
 import { ISchemaRegistry, SchemaRecord } from "./ISchemaRegistry.sol";
 
@@ -22,16 +20,12 @@ contract SchemaRegistry is ISchemaRegistry, Semver {
     uint256[MAX_GAP - 1] private __gap;
 
     /// @dev Creates a new SchemaRegistry instance.
-    constructor() Semver(1, 0, 1) {}
+    constructor() Semver(1, 0, 2) { }
 
     /// @inheritdoc ISchemaRegistry
     function register(string calldata schema, ISchemaResolver resolver, bool revocable) external returns (bytes32) {
-        SchemaRecord memory schemaRecord = SchemaRecord({
-            uid: EMPTY_UID,
-            schema: schema,
-            resolver: resolver,
-            revocable: revocable
-        });
+        SchemaRecord memory schemaRecord =
+            SchemaRecord({ uid: EMPTY_UID, schema: schema, resolver: resolver, revocable: revocable });
 
         bytes32 uid = _getUID(schemaRecord);
         if (_registry[uid].uid != EMPTY_UID) {

packages/contracts-bedrock/src/EAS/eip712/EIP712Verifier.sol

@@ -20,7 +20,8 @@ import { EIP712Signature, InvalidSignature, MAX_GAP, stringToBytes32, bytes32ToS
 /// @notice The EIP712 typed signatures verifier for EAS delegated attestations.
 abstract contract EIP712Verifier is EIP712 {
     // The hash of the data type used to relay calls to the attest function. It's the value of
-    // keccak256("Attest(bytes32 schema,address recipient,uint64 expirationTime,bool revocable,bytes32 refUID,bytes data,uint256 nonce)").
+    // keccak256("Attest(bytes32 schema,address recipient,uint64 expirationTime,bool revocable,bytes32 refUID,bytes
+    // data,uint256 nonce)").
     bytes32 private constant ATTEST_TYPEHASH = 0xdbfdf8dc2b135c26253e00d5b6cbe6f20457e003fd526d97cea183883570de61;
 
     // The hash of the data type used to relay calls to the revoke function. It's the value of

packages/contracts-bedrock/src/EAS/resolver/ISchemaResolver.sol

@@ -22,7 +22,10 @@ interface ISchemaResolver {
     function multiAttest(
         Attestation[] calldata attestations,
         uint256[] calldata values
-    ) external payable returns (bool);
+    )
+        external
+        payable
+        returns (bool);
 
     /// @notice Processes an attestation revocation and verifies if it can be revoked.
     /// @param attestation The existing attestation to be revoked.
@@ -36,5 +39,8 @@ interface ISchemaResolver {
     function multiRevoke(
         Attestation[] calldata attestations,
         uint256[] calldata values
-    ) external payable returns (bool);
+    )
+        external
+        payable
+        returns (bool);
 }

packages/contracts-bedrock/src/L1/L1CrossDomainMessenger.sol

@@ -18,9 +18,9 @@ contract L1CrossDomainMessenger is CrossDomainMessenger, Semver {
     /// @custom:legacy
     OptimismPortal public PORTAL;
 
-    /// @custom:semver 1.5.0
+    /// @custom:semver 1.5.1
     /// @notice Constructs the L1CrossDomainMessenger contract.
-    constructor() Semver(1, 5, 0) CrossDomainMessenger(Predeploys.L2_CROSS_DOMAIN_MESSENGER) {
+    constructor() Semver(1, 5, 1) CrossDomainMessenger(Predeploys.L2_CROSS_DOMAIN_MESSENGER) {
         initialize({ _portal: OptimismPortal(payable(0)) });
     }
 
@@ -37,12 +37,7 @@ contract L1CrossDomainMessenger is CrossDomainMessenger, Semver {
     }
 
     /// @inheritdoc CrossDomainMessenger
-    function _sendMessage(
-        address _to,
-        uint64 _gasLimit,
-        uint256 _value,
-        bytes memory _data
-    ) internal override {
+    function _sendMessage(address _to, uint64 _gasLimit, uint256 _value, bytes memory _data) internal override {
         PORTAL.depositTransaction{ value: _value }(_to, _value, _gasLimit, false, _data);
     }
 

packages/contracts-bedrock/src/L1/ResourceMetering.sol

@@ -76,16 +76,16 @@ abstract contract ResourceMetering is Initializable {
         uint256 blockDiff = block.number - params.prevBlockNum;
 
         ResourceConfig memory config = _resourceConfig();
-        int256 targetResourceLimit = int256(uint256(config.maxResourceLimit)) /
-            int256(uint256(config.elasticityMultiplier));
+        int256 targetResourceLimit =
+            int256(uint256(config.maxResourceLimit)) / int256(uint256(config.elasticityMultiplier));
 
         if (blockDiff > 0) {
             // Handle updating EIP-1559 style gas parameters. We use EIP-1559 to restrict the rate
             // at which deposits can be created and therefore limit the potential for deposits to
             // spam the L2 system. Fee scheme is very similar to EIP-1559 with minor changes.
             int256 gasUsedDelta = int256(uint256(params.prevBoughtGas)) - targetResourceLimit;
-            int256 baseFeeDelta = (int256(uint256(params.prevBaseFee)) * gasUsedDelta) /
-                (targetResourceLimit * int256(uint256(config.baseFeeMaxChangeDenominator)));
+            int256 baseFeeDelta = (int256(uint256(params.prevBaseFee)) * gasUsedDelta)
+                / (targetResourceLimit * int256(uint256(config.baseFeeMaxChangeDenominator)));
 
             // Update base fee by adding the base fee delta and clamp the resulting value between
             // min and max.
@@ -155,10 +155,6 @@ abstract contract ResourceMetering is Initializable {
     ///         child contract.
     // solhint-disable-next-line func-name-mixedcase
     function __ResourceMetering_init() internal onlyInitializing {
-        params = ResourceParams({
-            prevBaseFee: 1 gwei,
-            prevBoughtGas: 0,
-            prevBlockNum: uint64(block.number)
-        });
+        params = ResourceParams({ prevBaseFee: 1 gwei, prevBoughtGas: 0, prevBlockNum: uint64(block.number) });
     }
 }

packages/contracts-bedrock/src/L2/BaseFeeVault.sol

@@ -9,7 +9,7 @@ import { FeeVault } from "../universal/FeeVault.sol";
 /// @title BaseFeeVault
 /// @notice The BaseFeeVault accumulates the base fee that is paid by transactions.
 contract BaseFeeVault is FeeVault, Semver {
-    /// @custom:semver 1.3.0
+    /// @custom:semver 1.3.1
     /// @notice Constructs the BaseFeeVault contract.
     /// @param _recipient           Wallet that will receive the fees.
     /// @param _minWithdrawalAmount Minimum balance for withdrawals.
@@ -18,5 +18,8 @@ contract BaseFeeVault is FeeVault, Semver {
         address _recipient,
         uint256 _minWithdrawalAmount,
         WithdrawalNetwork _withdrawalNetwork
-    ) FeeVault(_recipient, _minWithdrawalAmount, _withdrawalNetwork) Semver(1, 3, 0) {}
+    )
+        FeeVault(_recipient, _minWithdrawalAmount, _withdrawalNetwork)
+        Semver(1, 3, 1)
+    { }
 }

packages/contracts-bedrock/src/L2/CrossDomainOwnable.sol

@@ -14,8 +14,7 @@ abstract contract CrossDomainOwnable is Ownable {
     ///         `msg.sender` is the owner of the contract.
     function _checkOwner() internal view override {
         require(
-            owner() == AddressAliasHelper.undoL1ToL2Alias(msg.sender),
-            "CrossDomainOwnable: caller is not the owner"
+            owner() == AddressAliasHelper.undoL1ToL2Alias(msg.sender), "CrossDomainOwnable: caller is not the owner"
         );
     }
 }

packages/contracts-bedrock/src/L2/CrossDomainOwnable2.sol

@@ -15,18 +15,10 @@ abstract contract CrossDomainOwnable2 is Ownable {
     ///         `xDomainMessageSender` is the owner of the contract. This value is set to the caller
     ///         of the L1CrossDomainMessenger.
     function _checkOwner() internal view override {
-        L2CrossDomainMessenger messenger = L2CrossDomainMessenger(
-            Predeploys.L2_CROSS_DOMAIN_MESSENGER
-        );
+        L2CrossDomainMessenger messenger = L2CrossDomainMessenger(Predeploys.L2_CROSS_DOMAIN_MESSENGER);
 
-        require(
-            msg.sender == address(messenger),
-            "CrossDomainOwnable2: caller is not the messenger"
-        );
+        require(msg.sender == address(messenger), "CrossDomainOwnable2: caller is not the messenger");
 
-        require(
-            owner() == messenger.xDomainMessageSender(),
-            "CrossDomainOwnable2: caller is not the owner"
-        );
+        require(owner() == messenger.xDomainMessageSender(), "CrossDomainOwnable2: caller is not the owner");
     }
 }

packages/contracts-bedrock/src/L2/L1Block.sol

@@ -38,9 +38,9 @@ contract L1Block is Semver {
     /// @notice The scalar value applied to the L1 portion of the transaction fee.
     uint256 public l1FeeScalar;
 
-    /// @custom:semver 1.0.1
+    /// @custom:semver 1.0.2
     /// @notice Constructs the L1Block contract.
-    constructor() Semver(1, 0, 1) {}
+    constructor() Semver(1, 0, 2) { }
 
     /// @notice Updates the L1 block values.
     /// @param _number         L1 blocknumber.
@@ -60,11 +60,10 @@ contract L1Block is Semver {
         bytes32 _batcherHash,
         uint256 _l1FeeOverhead,
         uint256 _l1FeeScalar
-    ) external {
-        require(
-            msg.sender == DEPOSITOR_ACCOUNT,
-            "L1Block: only the depositor account can set L1 block values"
-        );
+    )
+        external
+    {
+        require(msg.sender == DEPOSITOR_ACCOUNT, "L1Block: only the depositor account can set L1 block values");
 
         number = _number;
         timestamp = _timestamp;

packages/contracts-bedrock/src/L2/SequencerFeeVault.sol

@@ -10,7 +10,7 @@ import { FeeVault } from "../universal/FeeVault.sol";
 /// @notice The SequencerFeeVault is the contract that holds any fees paid to the Sequencer during
 ///         transaction processing and block production.
 contract SequencerFeeVault is FeeVault, Semver {
-    /// @custom:semver 1.3.0
+    /// @custom:semver 1.3.1
     /// @notice Constructs the SequencerFeeVault contract.
     /// @param _recipient           Wallet that will receive the fees.
     /// @param _minWithdrawalAmount Minimum balance for withdrawals.
@@ -19,7 +19,10 @@ contract SequencerFeeVault is FeeVault, Semver {
         address _recipient,
         uint256 _minWithdrawalAmount,
         WithdrawalNetwork _withdrawalNetwork
-    ) FeeVault(_recipient, _minWithdrawalAmount, _withdrawalNetwork) Semver(1, 3, 0) {}
+    )
+        FeeVault(_recipient, _minWithdrawalAmount, _withdrawalNetwork)
+        Semver(1, 3, 1)
+    { }
 
     /// @custom:legacy
     /// @notice Legacy getter for the recipient address.

packages/contracts-bedrock/src/cannon/PreimageOracle.sol

@@ -16,11 +16,7 @@ contract PreimageOracle is IPreimageOracle {
     mapping(bytes32 => mapping(uint256 => bool)) public preimagePartOk;
 
     /// @inheritdoc IPreimageOracle
-    function readPreimage(bytes32 _key, uint256 _offset)
-        external
-        view
-        returns (bytes32 dat_, uint256 datLen_)
-    {
+    function readPreimage(bytes32 _key, uint256 _offset) external view returns (bytes32 dat_, uint256 datLen_) {
         require(preimagePartOk[_key][_offset], "pre-image must exist");
 
         // Calculate the length of the pre-image data
@@ -40,12 +36,7 @@ contract PreimageOracle is IPreimageOracle {
     /// and restrict local pre-image insertion to the dispute-managing contract.
     /// For now we permit anyone to write any pre-image unchecked, to make testing easy.
     /// This method is DANGEROUS. And NOT FOR PRODUCTION.
-    function cheat(
-        uint256 partOffset,
-        bytes32 key,
-        bytes32 part,
-        uint256 size
-    ) external {
+    function cheat(uint256 partOffset, bytes32 key, bytes32 part, uint256 size) external {
         preimagePartOk[key][partOffset] = true;
         preimageParts[key][partOffset] = part;
         preimageLengths[key] = size;
@@ -57,7 +48,10 @@ contract PreimageOracle is IPreimageOracle {
         bytes32 _word,
         uint256 _size,
         uint256 _partOffset
-    ) external returns (bytes32 key_) {
+    )
+        external
+        returns (bytes32 key_)
+    {
         // Compute the localized key from the given local identifier.
         key_ = PreimageKeyLib.localizeIdent(_ident);