Merge branch 'develop' into feat/checkl2

op-preimage/oracle.go

@@ -2,6 +2,7 @@ package preimage
 
 import (
 	"encoding/binary"
+	"encoding/hex"
 	"fmt"
 	"io"
 )
@@ -57,7 +58,7 @@ func (o *OracleServer) NextPreimageRequest(getPreimage PreimageGetter) error {
 	}
 	value, err := getPreimage(key)
 	if err != nil {
-		return fmt.Errorf("failed to serve pre-image %s request: %w", key, err)
+		return fmt.Errorf("failed to serve pre-image %s request: %w", hex.EncodeToString(key[:]), err)
 	}
 
 	if err := binary.Write(o.rw, binary.BigEndian, uint64(len(value))); err != nil {

op-program/verify/cmd/goerli.go

@@ -114,6 +114,7 @@ func Run(l1RpcUrl string, l2RpcUrl string, l2OracleAddr common.Address) error {
 	}()
 	fmt.Printf("Using temp dir: %s\n", temp)
 	args := []string{
+		"--log.level", "DEBUG",
 		"--network", "goerli",
 		"--exec", "./bin/op-program-client",
 		"--datadir", temp,

packages/contracts-bedrock/.gas-snapshot

@@ -40,21 +40,21 @@ FaultDisputeGame_ResolvesCorrectly_IncorrectRoot3:test_resolvesCorrectly_succeed
 FaultDisputeGame_ResolvesCorrectly_IncorrectRoot:test_resolvesCorrectly_succeeds() (gas: 487044)
 FaultDisputeGame_Test:test_defendRoot_invalidMove_reverts() (gas: 13294)
 FaultDisputeGame_Test:test_extraData_succeeds() (gas: 17426)
-FaultDisputeGame_Test:test_gameData_succeeds() (gas: 17873)
+FaultDisputeGame_Test:test_gameData_succeeds() (gas: 17917)
 FaultDisputeGame_Test:test_gameStart_succeeds() (gas: 10315)
-FaultDisputeGame_Test:test_gameType_succeeds() (gas: 8238)
-FaultDisputeGame_Test:test_initialRootClaimData_succeeds() (gas: 17713)
-FaultDisputeGame_Test:test_move_clockTimeExceeded_reverts() (gas: 26432)
-FaultDisputeGame_Test:test_move_duplicateClaim_reverts() (gas: 103275)
+FaultDisputeGame_Test:test_gameType_succeeds() (gas: 8282)
+FaultDisputeGame_Test:test_initialRootClaimData_succeeds() (gas: 17691)
+FaultDisputeGame_Test:test_move_clockTimeExceeded_reverts() (gas: 26387)
+FaultDisputeGame_Test:test_move_duplicateClaim_reverts() (gas: 103230)
 FaultDisputeGame_Test:test_move_gameDepthExceeded_reverts() (gas: 408100)
-FaultDisputeGame_Test:test_move_gameNotInProgress_reverts() (gas: 10968)
-FaultDisputeGame_Test:test_move_nonExistentParent_reverts() (gas: 24698)
-FaultDisputeGame_Test:test_resolve_challengeContested() (gas: 221135)
-FaultDisputeGame_Test:test_resolve_notInProgress_reverts() (gas: 9635)
-FaultDisputeGame_Test:test_resolve_rootContested() (gas: 106143)
-FaultDisputeGame_Test:test_resolve_rootUncontested() (gas: 23625)
-FaultDisputeGame_Test:test_resolve_teamDeathmatch() (gas: 391864)
-FaultDisputeGame_Test:test_rootClaim_succeeds() (gas: 8159)
+FaultDisputeGame_Test:test_move_gameNotInProgress_reverts() (gas: 10923)
+FaultDisputeGame_Test:test_move_nonExistentParent_reverts() (gas: 24655)
+FaultDisputeGame_Test:test_resolve_challengeContested_succeeds() (gas: 221201)
+FaultDisputeGame_Test:test_resolve_notInProgress_reverts() (gas: 9679)
+FaultDisputeGame_Test:test_resolve_rootContested_succeeds() (gas: 106068)
+FaultDisputeGame_Test:test_resolve_rootUncontested_succeeds() (gas: 23692)
+FaultDisputeGame_Test:test_resolve_teamDeathmatch_succeeds() (gas: 391875)
+FaultDisputeGame_Test:test_rootClaim_succeeds() (gas: 8181)
 FaultDisputeGame_Test:test_simpleAttack_succeeds() (gas: 107388)
 FeeVault_Test:test_constructor_succeeds() (gas: 18185)
 GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 352135)

packages/contracts-bedrock/contracts/test/FaultDisputeGame.t.sol

@@ -236,7 +236,7 @@ contract FaultDisputeGame_Test is FaultDisputeGame_Init {
     }
 
     /// @dev Static unit test for the correctness an uncontested root resolution.
-    function test_resolve_rootUncontested() public {
+    function test_resolve_rootUncontested_succeeds() public {
         GameStatus status = gameProxy.resolve();
         assertEq(uint8(status), uint8(GameStatus.DEFENDER_WINS));
         assertEq(uint8(gameProxy.status()), uint8(GameStatus.DEFENDER_WINS));
@@ -260,7 +260,7 @@ contract FaultDisputeGame_Test is FaultDisputeGame_Init {
     }
 
     /// @dev Static unit test for the correctness of resolving a single attack game state.
-    function test_resolve_rootContested() public {
+    function test_resolve_rootContested_succeeds() public {
         gameProxy.attack(0, Claim.wrap(bytes32(uint256(5))));
 
         GameStatus status = gameProxy.resolve();
@@ -269,7 +269,7 @@ contract FaultDisputeGame_Test is FaultDisputeGame_Init {
     }
 
     /// @dev Static unit test for the correctness of resolving a game with a contested challenge claim.
-    function test_resolve_challengeContested() public {
+    function test_resolve_challengeContested_succeeds() public {
         gameProxy.attack(0, Claim.wrap(bytes32(uint256(5))));
         gameProxy.defend(1, Claim.wrap(bytes32(uint256(6))));
 
@@ -279,7 +279,7 @@ contract FaultDisputeGame_Test is FaultDisputeGame_Init {
     }
 
     /// @dev Static unit test for the correctness of resolving a game with multiplayer moves.
-    function test_resolve_teamDeathmatch() public {
+    function test_resolve_teamDeathmatch_succeeds() public {
         gameProxy.attack(0, Claim.wrap(bytes32(uint256(5))));
         gameProxy.attack(0, Claim.wrap(bytes32(uint256(4))));
         gameProxy.defend(1, Claim.wrap(bytes32(uint256(6))));