[WIP] Traffic generator V2

api/clients/v2/accountant.go

@@ -107,6 +107,7 @@ func (a *Accountant) BlobPaymentInfo(ctx context.Context, numSymbols uint32, quo
 		}
 		return 0, a.cumulativePayment, nil
 	}
+
 	return 0, big.NewInt(0), fmt.Errorf("neither reservation nor on-demand payment is available")
 }
 

api/clients/v2/disperser_client.go

@@ -103,6 +103,7 @@ func (c *disperserClient) PopulateAccountant(ctx context.Context) error {
 	if err != nil {
 		return fmt.Errorf("error setting payment state for accountant: %w", err)
 	}
+
 	return nil
 }
 

docker-bake.hcl

@@ -44,6 +44,7 @@ group "all" {
     "churner",
     "dataapi",
     "traffic-generator",
+    "traffic-generator2",
     "controller",
     "relay"
   ]
@@ -84,6 +85,7 @@ group "internal-release" {
     "churner-internal",
     "dataapi-internal",
     "traffic-generator-internal",
+    "traffic-generator2-internal",
     "controller-internal",
     "relay-internal"
   ]
@@ -201,19 +203,19 @@ target "traffic-generator-internal" {
   ]
 }
 
-target "traffic-generator2" {
+target "traffic-generator-v2" {
   context    = "."
-  dockerfile = "./trafficgenerator2.Dockerfile"
+  dockerfile = "./trafficgenerator-v2.Dockerfile"
   target     = "generator2"
-  tags       = ["${REGISTRY}/${REPO}/traffic-generator2:${BUILD_TAG}"]
+  tags       = ["${REGISTRY}/${REPO}/traffic-generator-v2:${BUILD_TAG}"]
 }
 
-target "traffic-generator2-internal" {
-  inherits = ["traffic-generator2"]
+target "traffic-generator-v2-internal" {
+  inherits = ["traffic-generator-v2"]
   tags     = [
-    "${REGISTRY}/eigenda-traffic-generator2:${BUILD_TAG}",
-    "${REGISTRY}/eigenda-traffic-generator2:${GIT_SHA}",
-    "${REGISTRY}/eigenda-traffic-generator2:sha-${GIT_SHORT_SHA}"
+    "${REGISTRY}/eigenda-traffic-generator-v2:${BUILD_TAG}",
+    "${REGISTRY}/eigenda-traffic-generator-v2:${GIT_SHA}",
+    "${REGISTRY}/eigenda-traffic-generator-v2:sha-${GIT_SHORT_SHA}"
   ]
 }
 

tools/traffic/Makefile

@@ -23,25 +23,13 @@ build2: clean
 
 run2: build2
 	TRAFFIC_GENERATOR_LOG_FORMAT=text \
-	TRAFFIC_GENERATOR_DISPERSER_HOSTNAME=localhost \
-	TRAFFIC_GENERATOR_DISPERSER_PORT=32003 \
-	RETRIEVER_HOSTNAME=localhost \
-	RETRIEVER_GRPC_PORT=32003 \
-	RETRIEVER_BLS_OPERATOR_STATE_RETRIVER=0x5f3f1dBD7B74C6B46e8c44f98792A1dAf8d69154 \
-	RETRIEVER_EIGENDA_SERVICE_MANAGER=0x851356ae760d987E095750cCeb3bC6014560891C \
-	RETRIEVER_TIMEOUT=10s \
+	TRAFFIC_GENERATOR_DISPERSER_HOSTNAME=disperser-preprod-holesky.eigenda.xyz \
+	TRAFFIC_GENERATOR_DISPERSER_PORT=443 \
+	TRAFFIC_GENERATOR_DISPERSER_USE_SECURE_GRPC=true \
 	TRAFFIC_GENERATOR_NUM_WRITE_INSTANCES=1 \
-	TRAFFIC_GENERATOR_WRITE_REQUEST_INTERVAL=1s \
+	TRAFFIC_GENERATOR_WRITE_REQUEST_INTERVAL=5s \
 	TRAFFIC_GENERATOR_DATA_SIZE=1000 \
-	TRAFFIC_GENERATOR_SIGNER_PRIVATE_KEY_HEX=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA \
-	TRAFFIC_GENERATOR_PRIVATE_KEY=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA \
+	TRAFFIC_GENERATOR_SIGNER_PRIVATE_KEY_HEX=73ae7e3a40b59caacb1cda8fa04f4e7fa5bb2b37101f9f3506290c201f57bf7b \
 	TRAFFIC_GENERATOR_METRICS_HTTP_PORT=9101 \
-	TRAFFIC_GENERATOR_GRAPH_URL=http://localhost:8000/subgraphs/name/Layr-Labs/eigenda-operator-state \
-	TRAFFIC_GENERATOR_THE_GRAPH_URL=http://localhost:8000/subgraphs/name/Layr-Labs/eigenda-operator-state \
-	TRAFFIC_GENERATOR_G1_PATH=../../inabox/resources/kzg/g1.point \
-	TRAFFIC_GENERATOR_G2_PATH=../../inabox/resources/kzg/g2.point \
-	TRAFFIC_GENERATOR_CACHE_PATH=../../inabox/resources/kzg/SRSTables \
-	TRAFFIC_GENERATOR_SRS_ORDER=3000 \
-	TRAFFIC_GENERATOR_SRS_LOAD=3000 \
-	TRAFFIC_GENERATOR_CHAIN_RPC=http://localhost:8545 \
+	TRAFFIC_GENERATOR_CUSTOM_QUORUM_NUMBERS=1 \
 	./bin/server2

tools/traffic/config/config.go

@@ -2,13 +2,11 @@ package config
 
 import (
 	"errors"
-	"fmt"
-	"github.com/Layr-Labs/eigenda/api/clients"
-	"github.com/Layr-Labs/eigenda/core/thegraph"
-	"github.com/Layr-Labs/eigenda/retriever"
 	"time"
 
+	"github.com/Layr-Labs/eigenda/api/clients/v2"
 	"github.com/Layr-Labs/eigenda/common"
+	"github.com/Layr-Labs/eigenda/core/thegraph"
 	"github.com/urfave/cli"
 )
 
@@ -19,17 +17,14 @@ type Config struct {
 	LoggingConfig common.LoggerConfig
 
 	// Configuration for the disperser client.
-	DisperserClientConfig *clients.Config
+	DisperserClientConfig *clients.DisperserClientConfig
 
-	// Configuration for the retriever client.
-	RetrievalClientConfig *retriever.Config
+	// Signer private key
+	SignerPrivateKey string
 
 	// Configuration for the graph.
 	TheGraphConfig *thegraph.Config
 
-	// Configuration for the EigenDA client.
-	EigenDAClientConfig *clients.EigenDAClientConfig
-
 	// Configures the traffic generator workers.
 	WorkerConfig WorkerConfig
 
@@ -47,6 +42,10 @@ func NewConfig(ctx *cli.Context) (*Config, error) {
 		return nil, err
 	}
 	customQuorums := ctx.GlobalIntSlice(CustomQuorumNumbersFlag.Name)
+	if len(customQuorums) == 0 {
+		return nil, errors.New("no custom quorum numbers provided")
+	}
+
 	customQuorumsUint8 := make([]uint8, len(customQuorums))
 	for i, q := range customQuorums {
 		if q < 0 || q > 255 {
@@ -55,30 +54,21 @@ func NewConfig(ctx *cli.Context) (*Config, error) {
 		customQuorumsUint8[i] = uint8(q)
 	}
 
-	retrieverConfig := retriever.ReadRetrieverConfig(ctx)
-
 	config := &Config{
-		DisperserClientConfig: &clients.Config{
+		DisperserClientConfig: &clients.DisperserClientConfig{
 			Hostname:          ctx.GlobalString(HostnameFlag.Name),
 			Port:              ctx.GlobalString(GrpcPortFlag.Name),
-			Timeout:           ctx.Duration(TimeoutFlag.Name),
 			UseSecureGrpcFlag: ctx.GlobalBool(UseSecureGrpcFlag.Name),
 		},
 
-		RetrievalClientConfig: retrieverConfig,
+		SignerPrivateKey: ctx.String(SignerPrivateKeyFlag.Name),
 
 		TheGraphConfig: &thegraph.Config{
 			Endpoint:     ctx.String(TheGraphUrlFlag.Name),
 			PullInterval: ctx.Duration(TheGraphPullIntervalFlag.Name),
 			MaxRetries:   ctx.Int(TheGraphRetriesFlag.Name),
 		},
 
-		EigenDAClientConfig: &clients.EigenDAClientConfig{
-			RPC:                 fmt.Sprintf("%s:%s", ctx.GlobalString(HostnameFlag.Name), ctx.GlobalString(GrpcPortFlag.Name)),
-			SignerPrivateKeyHex: ctx.String(SignerPrivateKeyFlag.Name),
-			DisableTLS:          ctx.GlobalBool(DisableTLSFlag.Name),
-		},
-
 		LoggingConfig: *loggerConfig,
 
 		MetricsHTTPPort:   ctx.GlobalString(MetricsHTTPPortFlag.Name),
@@ -103,19 +93,12 @@ func NewConfig(ctx *cli.Context) (*Config, error) {
 			RetrieveBlobChunksTimeout:    ctx.Duration(RetrieveBlobChunksTimeoutFlag.Name),
 			StatusTrackerChannelCapacity: ctx.Uint(VerificationChannelCapacityFlag.Name),
 
-			EigenDAServiceManager: retrieverConfig.EigenDAServiceManagerAddr,
-			SignerPrivateKey:      ctx.String(SignerPrivateKeyFlag.Name),
-			CustomQuorums:         customQuorumsUint8,
+			CustomQuorums: customQuorumsUint8,
 
 			MetricsBlacklist:      ctx.StringSlice(MetricsBlacklistFlag.Name),
 			MetricsFuzzyBlacklist: ctx.StringSlice(MetricsFuzzyBlacklistFlag.Name),
 		},
 	}
 
-	err = config.EigenDAClientConfig.CheckAndSetDefaults()
-	if err != nil {
-		return nil, err
-	}
-
 	return config, nil
 }

tools/traffic/config/flags.go

@@ -1,14 +1,10 @@
 package config
 
 import (
-	"github.com/Layr-Labs/eigenda/common/geth"
-	"github.com/Layr-Labs/eigenda/core/thegraph"
-	"github.com/Layr-Labs/eigenda/encoding/kzg"
-	"github.com/Layr-Labs/eigenda/indexer"
-	"github.com/Layr-Labs/eigenda/retriever/flags"
 	"time"
 
 	"github.com/Layr-Labs/eigenda/common"
+	"github.com/Layr-Labs/eigenda/indexer"
 	"github.com/urfave/cli"
 )
 
@@ -133,7 +129,7 @@ var (
 	TheGraphUrlFlag = cli.StringFlag{
 		Name:     common.PrefixFlag(FlagPrefix, "the-graph-url"),
 		Usage:    "URL of the subgraph instance.",
-		Required: true,
+		Required: false,
 		EnvVar:   common.PrefixEnvVar(envPrefix, "THE_GRAPH_URL"),
 	}
 	TheGraphPullIntervalFlag = cli.DurationFlag{
@@ -225,7 +221,6 @@ var (
 var requiredFlags = []cli.Flag{
 	HostnameFlag,
 	GrpcPortFlag,
-	TheGraphUrlFlag,
 }
 
 var optionalFlags = []cli.Flag{
@@ -243,6 +238,7 @@ var optionalFlags = []cli.Flag{
 	RequiredDownloadsFlag,
 	DisableTLSFlag,
 	MetricsHTTPPortFlag,
+	TheGraphUrlFlag,
 	TheGraphPullIntervalFlag,
 	TheGraphRetriesFlag,
 	VerifierIntervalFlag,
@@ -261,10 +257,6 @@ var Flags []cli.Flag
 
 func init() {
 	Flags = append(requiredFlags, optionalFlags...)
-	Flags = append(Flags, flags.RetrieverFlags(envPrefix)...)
-	Flags = append(Flags, kzg.CLIFlags(envPrefix)...)
 	Flags = append(Flags, common.LoggerCLIFlags(envPrefix, FlagPrefix)...)
-	Flags = append(Flags, geth.EthClientFlags(envPrefix)...)
 	Flags = append(Flags, indexer.CLIFlags(envPrefix)...)
-	Flags = append(Flags, thegraph.CLIFlags(envPrefix)...)
 }

tools/traffic/config/worker_config.go

@@ -38,8 +38,7 @@ type WorkerConfig struct {
 
 	// The address of the EigenDA service manager smart contract, in hex.
 	EigenDAServiceManager string
-	// The private key to use for signing requests.
-	SignerPrivateKey string
+
 	// Custom quorum numbers to use for the traffic generator.
 	CustomQuorums []uint8