From 45ba08f9d18804941f25882ce3fef2bb3e932b8e Mon Sep 17 00:00:00 2001 From: Daniel Mancia <21249320+dmanc@users.noreply.github.com> Date: Fri, 20 Dec 2024 16:19:14 -0800 Subject: [PATCH] rename dockerfile --- docker-bake.hcl | 16 ++++++------- tools/traffic/Makefile | 24 +++++-------------- tools/traffic/config/config.go | 4 ++++ tools/traffic/config/flags.go | 10 ++------ ...ckerfile => trafficgenerator-v2.Dockerfile | 0 5 files changed, 20 insertions(+), 34 deletions(-) rename trafficgenerator2.Dockerfile => trafficgenerator-v2.Dockerfile (100%) diff --git a/docker-bake.hcl b/docker-bake.hcl index 6fa0c24f20..2c7f04e4b6 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -203,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}" ] } diff --git a/tools/traffic/Makefile b/tools/traffic/Makefile index fd2893a709..5c7c9cdd7b 100644 --- a/tools/traffic/Makefile +++ b/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 diff --git a/tools/traffic/config/config.go b/tools/traffic/config/config.go index 9fbb38d36d..c1cd26bd6f 100644 --- a/tools/traffic/config/config.go +++ b/tools/traffic/config/config.go @@ -42,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 { diff --git a/tools/traffic/config/flags.go b/tools/traffic/config/flags.go index 1b9709f78b..fc0ec776d9 100644 --- a/tools/traffic/config/flags.go +++ b/tools/traffic/config/flags.go @@ -4,9 +4,6 @@ import ( "time" "github.com/Layr-Labs/eigenda/common" - "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/urfave/cli" ) @@ -132,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{ @@ -224,7 +221,6 @@ var ( var requiredFlags = []cli.Flag{ HostnameFlag, GrpcPortFlag, - TheGraphUrlFlag, } var optionalFlags = []cli.Flag{ @@ -242,6 +238,7 @@ var optionalFlags = []cli.Flag{ RequiredDownloadsFlag, DisableTLSFlag, MetricsHTTPPortFlag, + TheGraphUrlFlag, TheGraphPullIntervalFlag, TheGraphRetriesFlag, VerifierIntervalFlag, @@ -260,9 +257,6 @@ var Flags []cli.Flag func init() { Flags = append(requiredFlags, optionalFlags...) - 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)...) } diff --git a/trafficgenerator2.Dockerfile b/trafficgenerator-v2.Dockerfile similarity index 100% rename from trafficgenerator2.Dockerfile rename to trafficgenerator-v2.Dockerfile