Merge pull request #217 from vulcanize/feature/known-gaps

Feature/known gaps

.github/workflows/on-master.yaml

@@ -1,6 +1,7 @@
 name: Docker Build and publish to Github
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - statediff

.gitignore

@@ -49,3 +49,11 @@ profile.cov
 **/yarn-error.log
 foundry/deployments/local-private-network/geth-linux-amd64
 foundry/projects/local-private-network/geth-linux-amd64
+
+# Helpful repos
+related-repositories/foundry-test/**
+related-repositories/hive/**
+related-repositories/ipld-eth-db/**
+statediff/indexer/database/sql/statediffing_test_file.sql
+statediff/statediffing_test_file.sql
+statediff/known_gaps.sql

.gitmodules

@@ -5,7 +5,4 @@
 [submodule "evm-benchmarks"]
 	path = tests/evm-benchmarks
 	url = https://github.com/ipsilon/evm-benchmarks
-	shallow = true
-[submodule "foundry/projects/local-private-network/Stateful/lib/ds-test"]
-	path = foundry/projects/local-private-network/Stateful/lib/ds-test
-	url = https://github.com/dapphub/ds-test
+	shallow = true

cmd/geth/config.go

@@ -252,13 +252,14 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
 			}
 		}
 		p := statediff.Config{
-			IndexerConfig:   indexerConfig,
-			ID:              nodeID,
-			ClientName:      clientName,
-			Context:         context.Background(),
-			EnableWriteLoop: ctx.GlobalBool(utils.StateDiffWritingFlag.Name),
-			NumWorkers:      ctx.GlobalUint(utils.StateDiffWorkersFlag.Name),
-			WaitForSync:     ctx.GlobalBool(utils.StateDiffWaitForSync.Name),
+			IndexerConfig:     indexerConfig,
+			KnownGapsFilePath: ctx.GlobalString(utils.StateDiffKnownGapsFilePath.Name),
+			ID:                nodeID,
+			ClientName:        clientName,
+			Context:           context.Background(),
+			EnableWriteLoop:   ctx.GlobalBool(utils.StateDiffWritingFlag.Name),
+			NumWorkers:        ctx.GlobalUint(utils.StateDiffWorkersFlag.Name),
+			WaitForSync:       ctx.GlobalBool(utils.StateDiffWaitForSync.Name),
 		}
 		utils.RegisterStateDiffService(stack, eth, &cfg.Eth, p, backend)
 	}

cmd/geth/main.go

@@ -176,6 +176,7 @@ var (
 		utils.StateDiffWritingFlag,
 		utils.StateDiffWorkersFlag,
 		utils.StateDiffFilePath,
+		utils.StateDiffKnownGapsFilePath,
 		utils.StateDiffWaitForSync,
 		configFileFlag,
 	}

cmd/geth/usage.go

@@ -246,6 +246,7 @@ var AppHelpFlagGroups = []flags.FlagGroup{
 			utils.StateDiffWritingFlag,
 			utils.StateDiffWorkersFlag,
 			utils.StateDiffFilePath,
+			utils.StateDiffKnownGapsFilePath,
 			utils.StateDiffWaitForSync,
 		},
 	},

cmd/utils/flags.go

@@ -867,6 +867,11 @@ var (
 		Name:  "statediff.file.path",
 		Usage: "Full path (including filename) to write statediff data out to when operating in file mode",
 	}
+	StateDiffKnownGapsFilePath = cli.StringFlag{
+		Name:  "statediff.knowngapsfile.path",
+		Usage: "Full path (including filename) to write knownGaps statements when the DB is unavailable.",
+		Value: "./known_gaps.sql",
+	}
 	StateDiffDBClientNameFlag = cli.StringFlag{
 		Name:  "statediff.db.clientname",
 		Usage: "Client name to use when writing state diffs to database",

docker-compose.yml

@@ -1,9 +1,9 @@
-version: '3.2'
+version: "3.2"
 
 services:
   ipld-eth-db:
     restart: always
-    image: vulcanize/ipld-eth-db:v0.3.1
+    image: vulcanize/ipld-eth-db:v3.2.0
     environment:
       POSTGRES_USER: "vdbm"
       POSTGRES_DB: "vulcanize_testing_v3"