Merge branch 'develop' of https://github.com/epociask/optimism into indexer.client

Makefile

@@ -89,10 +89,8 @@ devnet-up:
 	@if [ ! -e op-program/bin ]; then \
 		make cannon-prestate; \
 	fi
-	$(shell ./ops/scripts/newer-file.sh .devnet/allocs-l1.json ./packages/contracts-bedrock)
-	if [ $(.SHELLSTATUS) -ne 0 ]; then \
-		make devnet-allocs; \
-	fi
+	./ops/scripts/newer-file.sh .devnet/allocs-l1.json ./packages/contracts-bedrock \
+		|| make devnet-allocs
 	PYTHONPATH=./bedrock-devnet python3 ./bedrock-devnet/main.py --monorepo-dir=.
 .PHONY: devnet-up
 

op-bootnode/Makefile

@@ -10,5 +10,17 @@ LDFLAGS := -ldflags "$(LDFLAGSSTRING)"
 op-bootnode:
 	env GO111MODULE=on GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) go build -v $(LDFLAGS) -o ./bin/op-bootnode ./cmd
 
+clean:
+	rm -f bin/op-bootnode
+
+test:
+	go test -v ./...
+
 lint:
 	golangci-lint run -E goimports,sqlclosecheck,bodyclose,asciicheck,misspell,errorlint --timeout 5m -e "errors.As" -e "errors.Is" ./...
+
+.PHONY: \
+	op-bootnode \
+	clean \
+	test \
+	lint

op-bootnode/cmd/main.go

@@ -3,21 +3,16 @@ package main
 import (
 	"os"
 
-	"github.com/ethereum-optimism/optimism/op-bootnode/bootnode"
-	"github.com/ethereum-optimism/optimism/op-bootnode/flags"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/urfave/cli/v2"
+
+	"github.com/ethereum-optimism/optimism/op-bootnode/bootnode"
+	"github.com/ethereum-optimism/optimism/op-bootnode/flags"
+	oplog "github.com/ethereum-optimism/optimism/op-service/log"
 )
 
 func main() {
-	// Set up logger with a default INFO level in case we fail to parse flags,
-	// otherwise the final critical log won't show what the parsing error was.
-	log.Root().SetHandler(
-		log.LvlFilterHandler(
-			log.LvlInfo,
-			log.StreamHandler(os.Stdout, log.TerminalFormat(true)),
-		),
-	)
+	oplog.SetupDefaults()
 
 	app := cli.NewApp()
 	app.Flags = flags.Flags

op-challenger/game/fault/types/game.go

@@ -51,6 +51,10 @@ type extendedClaim struct {
 type gameState struct {
 	agreeWithProposedOutput bool
 	root                    claimEntry
+	// contractIndicies maps a contract index to it's extended claim.
+	// This is used to perform O(1) parent lookups.
+	contractIndicies map[int]*extendedClaim
+	// claims maps a claim entry to it's extended claim.
 	claims map[claimEntry]*extendedClaim
 	depth  uint64
 }
@@ -59,15 +63,18 @@ type gameState struct {
 // The provided [Claim] is used as the root node.
 func NewGameState(agreeWithProposedOutput bool, root Claim, depth uint64) *gameState {
 	claims := make(map[claimEntry]*extendedClaim)
+	parents := make(map[int]*extendedClaim)
 	rootClaimEntry := makeClaimEntry(root)
 	claims[rootClaimEntry] = &extendedClaim{
 		self:     root,
 		children: make([]claimEntry, 0),
 	}
+	parents[root.ContractIndex] = claims[rootClaimEntry]
 	return &gameState{
 		agreeWithProposedOutput: agreeWithProposedOutput,
 		root:                    rootClaimEntry,
 		claims:                  claims,
+		contractIndicies:        parents,
 		depth:                   depth,
 	}
 }
@@ -106,10 +113,12 @@ func (g *gameState) Put(claim Claim) error {
 		return errors.New("no parent claim")
 	}
 	parent.children = append(parent.children, makeClaimEntry(claim))
-	g.claims[makeClaimEntry(claim)] = &extendedClaim{
+	claimWithExtension := &extendedClaim{
 		self:     claim,
 		children: make([]claimEntry, 0),
 	}
+	g.claims[makeClaimEntry(claim)] = claimWithExtension
+	g.contractIndicies[claim.ContractIndex] = claimWithExtension
 	return nil
 }
 
@@ -150,11 +159,8 @@ func (g *gameState) getParent(claim Claim) *extendedClaim {
 	if claim.IsRoot() {
 		return nil
 	}
-	// TODO(inphi): refactor gameState for faster parent lookups
-	for _, c := range g.claims {
-		if c.self.ContractIndex == claim.ParentContractIndex {
-			return c
-		}
+	if parent, ok := g.contractIndicies[claim.ParentContractIndex]; ok {
+		return parent
 	}
 	return nil
 }