Remove power of 2 g2 points

Signed-off-by: litt3 <[email protected]>

Author: litt3

.env.example.holesky

@@ -27,9 +27,6 @@ EIGENDA_PROXY_EIGENDA_CONFIRMATION_DEPTH=6
 # Directory path to g1.point file
 EIGENDA_PROXY_EIGENDA_TARGET_KZG_G1_PATH=resources/g1.point
 
-# Directory path to g2.powerOf2.point file
-EIGENDA_PROXY_EIGENDA_TARGET_KZG_G2_POWER_OF_2_PATH=resources/g2.powerOf2.point
-
 # Disable point verification mode. This mode performs IFFT on data before writing and FFT on data after reading. Disabling requires supplying the entire blob for verification against the KZG commitment.
 EIGENDA_PROXY_EIGENDA_DISABLE_POINT_VERIFICATION_MODE=false
 

.vscode/launch.json

@@ -13,7 +13,6 @@
                 "ENV_PATH": "../../.env",
                 "EIGENDA_PROXY_EIGENDA_CERT_VERIFICATION_DISABLED": "true",
                 "EIGENDA_PROXY_EIGENDA_TARGET_KZG_G1_PATH": "../../resources/g1.point",
-                "EIGENDA_PROXY_EIGENDA_TARGET_KZG_G2_POWER_OF_2_PATH": "../../resources/g2.powerOf2.point",
                 "EIGENDA_PROXY_EIGENDA_TARGET_KZG_G2_PATH": "../../resources/g2.point",
                 "EIGENDA_PROXY_EIGENDA_TARGET_KZG_G2_TRAILING_PATH": "../../resources/g2.trailing.point"
             },

config/proxy_config_test.go

@@ -42,8 +42,8 @@ func validCfg() ProxyConfig {
 		},
 		KzgConfig: kzg.KzgConfig{
 			G1Path:         "path/to/g1",
-			G2PowerOf2Path: "path/to/g2",
 			G2Path:         "path/to/g2",
+			G2TrailingPath: "path/to/trailing/g2",
 			CacheDir:       "path/to/cache",
 			SRSOrder:       maxBlobLengthBytes / 32,
 		},

resources/g2.powerOf2.point

@@ -41,7 +41,6 @@ func TestGetSet(t *testing.T) {
 
 	kzgConfig := kzg.KzgConfig{
 		G1Path:          "../../../resources/g1.point",
-		G2PowerOf2Path:  "../../../resources/g2.powerOf2.point",
 		G2Path:          "../../../resources/g2.point",
 		G2TrailingPath:  "../../../resources/g2.trailing.point",
 		CacheDir:        "../../../resources/SRSTables",

store/generated_key/memstore/memstore_test.go

@@ -196,8 +196,7 @@ func getKZGEnvVars() []EnvVar {
 		{verify.G1PathFlagName, "../resources/g1.point"},
 		{verify.G2PathFlagName, "../resources/g2.point"},
 		{verify.G2TrailingPathFlagName, "../resources/g2.trailing.point"},
-		{verify.G2PowerOf2PathFlagName, "../resources/g2.powerOf2.point"},
-		{verify.ReadG2PointsFlagName, "false"},
+		{verify.ReadG2PointsFlagName, "true"},
 		{verify.CachePathFlagName, "../resources/SRSTables"},
 	}
 

testutils/env_vars.go

@@ -18,7 +18,6 @@ var (
 	G2PathFlagName         = withFlagPrefix("g2-path")
 	G2TrailingPathFlagName = withFlagPrefix("g2-path-trailing")
 	ReadG2PointsFlagName   = withFlagPrefix("read-g2-points")
-	G2PowerOf2PathFlagName = withFlagPrefix("g2-power-of-2-path")
 	CachePathFlagName      = withFlagPrefix("cache-path")
 )
 
@@ -75,13 +74,6 @@ func CLIFlags(envPrefix, category string) []cli.Flag {
 			Value:    false,
 			Category: category,
 		},
-		&cli.StringFlag{
-			Name:     G2PowerOf2PathFlagName,
-			Usage:    "path to g2.powerOf2.point file. This resource is not currently used, but needed because of the shared eigenda KZG library that we use. We will eventually fix this.",
-			EnvVars:  []string{withEnvPrefix(envPrefix, "TARGET_KZG_G2_POWER_OF_2_PATH")},
-			Value:    "resources/g2.powerOf2.point",
-			Category: category,
-		},
 		&cli.StringFlag{
 			Name:     CachePathFlagName,
 			Usage:    "path to SRS tables for caching. This resource is not currently used, but needed because of the shared eigenda KZG library that we use. We will eventually fix this.",
@@ -95,7 +87,6 @@ func CLIFlags(envPrefix, category string) []cli.Flag {
 func ReadKzgConfig(ctx *cli.Context, maxBlobSizeBytes uint64) kzg.KzgConfig {
 	return kzg.KzgConfig{
 		G1Path:          ctx.String(G1PathFlagName),
-		G2PowerOf2Path:  ctx.String(G2PowerOf2PathFlagName),
 		G2Path:          ctx.String(G2PathFlagName),
 		G2TrailingPath:  ctx.String(G2TrailingPathFlagName),
 		LoadG2Points:    ctx.Bool(ReadG2PointsFlagName),

verify/cli.go

@@ -92,22 +92,6 @@ func DeprecatedCLIFlags(envPrefix, category string) []cli.Flag {
 			},
 			Category: category,
 		},
-		&cli.StringFlag{
-			Name:    DeprecatedG2TauFlagName,
-			Usage:   "path to g2.point.powerOf2 file.",
-			EnvVars: []string{withDeprecatedEnvPrefix(envPrefix, "TARGET_G2_TAU_PATH")},
-			// we use a relative path so that the path works for both the binary and the docker container
-			// aka we assume the binary is run from root dir, and that the resources/ dir is copied into the working dir
-			// of the container
-			Value: "resources/g2.point.powerOf2",
-			Action: func(_ *cli.Context, _ string) error {
-				return fmt.Errorf(
-					"flag --%s (env var %s) is deprecated, use --%s (env var %s) instead",
-					DeprecatedG2TauFlagName, withDeprecatedEnvPrefix(envPrefix, "TARGET_G2_TAU_PATH"),
-					G2PowerOf2PathFlagName, withEnvPrefix(envPrefix, "TARGET_KZG_G2_POWER_OF_2_PATH"))
-			},
-			Category: category,
-		},
 		&cli.StringFlag{
 			Name:    DeprecatedCachePathFlagName,
 			Usage:   "path to SRS tables for caching.",

verify/deprecated_flags.go

@@ -73,6 +73,12 @@ func NewVerifier(cfg *Config, kzgConfig kzg.KzgConfig, l logging.Logger) (*Verif
 		log.Warn("Certificate verification against Ethereum state disabled")
 	}
 
+	// It's really ugly, but we must force this value to false here.
+	// The verifier doesn't initialize its SRS data in a clean way, and will try to read g2 points it doesn't need,
+	// even though they are missing from the file. It's not always possible to set LoadG2Points with environment
+	// variables, though, because it might need to be true in other contexts (e.g. initializing a prover)
+	kzgConfig.LoadG2Points = false
+
 	log.Info("Creating blob KZG verifier")
 	kzgVerifier, err := kzgverifier.NewVerifier(&kzgConfig, encoding.DefaultConfig())
 	if err != nil {

verify/verifier.go

@@ -32,7 +32,6 @@ func TestCommitmentVerification(t *testing.T) {
 
 	kzgConfig := kzg.KzgConfig{
 		G1Path:          "../resources/g1.point",
-		G2PowerOf2Path:  "../resources/g2.powerOf2.point",
 		G2Path:          "../resources/g2.point",
 		G2TrailingPath:  "../resources/g2.trailing.point",
 		CacheDir:        "../resources/SRSTables",
@@ -71,7 +70,6 @@ func TestCommitmentWithTooLargeBlob(t *testing.T) {
 
 	kzgConfig := kzg.KzgConfig{
 		G1Path:          "../resources/g1.point",
-		G2PowerOf2Path:  "../resources/g2.powerOf2.point",
 		G2Path:          "../resources/g2.point",
 		G2TrailingPath:  "../resources/g2.trailing.point",
 		CacheDir:        "../resources/SRSTables",