Merge branch 'develop' into po/oracle_proof

ethstorage · Nov 9, 2024 · 3390c9d · 3390c9d
2 parents bd144d9 + 9d991ee
commit 3390c9d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/op-challenger2/game/fault/trace/translate.go b/op-challenger2/game/fault/trace/translate.go
@@ -2,6 +2,7 @@ package trace
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/ethereum-optimism/optimism/op-challenger2/game/fault/types"
 	"github.com/ethereum/go-ethereum/common"
@@ -45,11 +46,7 @@ func (p *TranslatingProvider) GetStepData(ctx context.Context, pos types.Positio
 }
 
 func (p *TranslatingProvider) GetStepData2(ctx context.Context, pos types.Position) (prestate []byte, proofData []byte, preimageData *types.PreimageOracleData, err error) {
-	relativePos, err := pos.RelativeToAncestorAtDepth(p.rootDepth)
-	if err != nil {
-		return nil, nil, nil, err
-	}
-	return p.provider.GetStepData(ctx, relativePos)
+	return nil, nil, nil, fmt.Errorf("GetStepData2 is not implemented for TranslatingProvider")
 }
 
 func (p *TranslatingProvider) AbsolutePreStateCommitment(ctx context.Context) (hash common.Hash, err error) {

diff --git a/op-challenger2/game/fault/types/game.go b/op-challenger2/game/fault/types/game.go
@@ -110,7 +110,6 @@ func (g *gameState) Claims() []Claim {
 }
 
 func (g *gameState) RootClaim() Claim {
-	// Defensively copy to avoid modifications to the underlying array.
 	return g.claims[0]
 }