From e2bd06dceaf52ca030bcb31d9a970b463a5dea83 Mon Sep 17 00:00:00 2001 From: Ian Shim Date: Thu, 14 Nov 2024 21:16:28 -0800 Subject: [PATCH] inabox test setup for v2 --- disperser/Makefile | 2 +- go.mod | 4 +- go.sum | 2 - inabox/bin.sh | 10 ++ inabox/deploy/cmd/main.go | 27 +-- inabox/deploy/codegen/main.go | 5 + inabox/deploy/config.go | 160 +++++++++++++++--- inabox/deploy/config_types.go | 2 +- inabox/deploy/env_vars.go | 93 ++++++++++ inabox/templates/testconfig-anvil-docker.yaml | 1 - .../templates/testconfig-anvil-nochurner.yaml | 1 - .../templates/testconfig-anvil-nograph.yaml | 1 - inabox/templates/testconfig-anvil.yaml | 1 - inabox/templates/testconfig-docker-anvil.yaml | 1 - inabox/templates/testconfig-geth.yaml | 1 - inabox/tests/integration_suite_test.go | 21 +-- 16 files changed, 276 insertions(+), 56 deletions(-) diff --git a/disperser/Makefile b/disperser/Makefile index 66e13fc119..78a35fa696 100644 --- a/disperser/Makefile +++ b/disperser/Makefile @@ -1,7 +1,7 @@ clean: rm -rf ./bin -build: build_server build_batcher build_encoder build_dataapi +build: build_server build_batcher build_encoder build_dataapi build_controller build_batcher: go build -o ./bin/batcher ./cmd/batcher diff --git a/go.mod b/go.mod index 3f4cefdf39..7d7c05c547 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/fxamacker/cbor/v2 v2.5.0 github.com/gin-contrib/logger v0.2.6 github.com/gin-gonic/gin v1.9.1 - github.com/golang/protobuf v1.5.4 + github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 github.com/hashicorp/go-multierror v1.1.1 github.com/jedib0t/go-pretty/v6 v6.5.9 github.com/joho/godotenv v1.5.1 @@ -102,8 +102,8 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt v3.2.2+incompatible // indirect github.com/golang-jwt/jwt/v4 v4.5.0 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect - github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 // indirect github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-bexpr v0.1.10 // indirect diff --git a/go.sum b/go.sum index 72343a11af..f07fe49f3a 100644 --- a/go.sum +++ b/go.sum @@ -364,8 +364,6 @@ github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= -github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBWDRM= -github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/pointerstructure v1.2.0 h1:O+i9nHnXS3l/9Wu7r4NrEdwA2VFTicjUEN1uBnDo34A= diff --git a/inabox/bin.sh b/inabox/bin.sh index 7f27cd79f4..83659b7a71 100755 --- a/inabox/bin.sh +++ b/inabox/bin.sh @@ -145,6 +145,16 @@ function start_detached { pids="$pids $pid" done + for FILE in $(ls $testpath/envs/controller*.env); do + set -a + source $FILE + set +a + ../disperser/bin/controller > $testpath/logs/controller.log 2>&1 & + + pid="$!" + pids="$pids $pid" + done + files=($(ls $testpath/envs/opr*.env)) last_index=$(( ${#files[@]} - 1 )) diff --git a/inabox/deploy/cmd/main.go b/inabox/deploy/cmd/main.go index 1e14f88a30..4f94897b6f 100644 --- a/inabox/deploy/cmd/main.go +++ b/inabox/deploy/cmd/main.go @@ -1,7 +1,6 @@ package main import ( - "fmt" "log" "os" "path/filepath" @@ -16,13 +15,15 @@ var ( localstackFlagName = "localstack-port" deployResourcesFlagName = "deploy-resources" - metadataTableName = "test-BlobMetadata" - bucketTableName = "test-BucketStore" + metadataTableName = "test-BlobMetadata" + bucketTableName = "test-BucketStore" + metadataTableNameV2 = "test-BlobMetadata-v2" - chainCmdName = "chain" - localstackCmdName = "localstack" - expCmdName = "exp" - allCmdName = "all" + chainCmdName = "chain" + localstackCmdName = "localstack" + expCmdName = "exp" + generateEnvCmdName = "env" + allCmdName = "all" ) func main() { @@ -66,6 +67,11 @@ func main() { Usage: "deploy the contracts and create configurations for all EigenDA components", Action: getRunner(expCmdName), }, + { + Name: generateEnvCmdName, + Usage: "generate the environment variables for the inabox test", + Action: getRunner(generateEnvCmdName), + }, { Name: allCmdName, Usage: "deploy all infra, resources, contracts", @@ -106,6 +112,8 @@ func getRunner(command string) func(ctx *cli.Context) error { return localstack(ctx) case expCmdName: config.DeployExperiment() + case generateEnvCmdName: + config.GenerateAllVariables() case allCmdName: return all(ctx, config) } @@ -121,7 +129,6 @@ func chainInfra(ctx *cli.Context, config *deploy.Config) error { config.StartAnvil() if deployer, ok := config.GetDeployer(config.EigenDA.Deployer); ok && deployer.DeploySubgraphs { - fmt.Println("Starting graph node") config.StartGraphNode() } @@ -130,14 +137,12 @@ func chainInfra(ctx *cli.Context, config *deploy.Config) error { } func localstack(ctx *cli.Context) error { - pool, _, err := deploy.StartDockertestWithLocalstackContainer(ctx.String(localstackFlagName)) if err != nil { return err } - if ctx.Bool(deployResourcesFlagName) { - return deploy.DeployResources(pool, ctx.String(localstackFlagName), metadataTableName, bucketTableName, "") + return deploy.DeployResources(pool, ctx.String(localstackFlagName), metadataTableName, bucketTableName, metadataTableNameV2) } return nil diff --git a/inabox/deploy/codegen/main.go b/inabox/deploy/codegen/main.go index d08db2fe47..ab95e1aa2f 100644 --- a/inabox/deploy/codegen/main.go +++ b/inabox/deploy/codegen/main.go @@ -9,11 +9,14 @@ import ( dis "github.com/Layr-Labs/eigenda/disperser/cmd/apiserver/flags" bat "github.com/Layr-Labs/eigenda/disperser/cmd/batcher/flags" + controller "github.com/Layr-Labs/eigenda/disperser/cmd/controller/flags" enc "github.com/Layr-Labs/eigenda/disperser/cmd/encoder/flags" opr "github.com/Layr-Labs/eigenda/node/flags" churner "github.com/Layr-Labs/eigenda/operators/churner/flags" retriever "github.com/Layr-Labs/eigenda/retriever/flags" + // relay "github.com/Layr-Labs/eigenda/relay/flags" + "github.com/urfave/cli" ) @@ -119,6 +122,8 @@ func main() { configs += genVars("OperatorVars", opr.Flags) configs += genVars("RetrieverVars", retriever.Flags) configs += genVars("ChurnerVars", churner.Flags) + configs += genVars("ControllerVars", controller.Flags) + // configs += genVars("RelayVars", relay.Flags) fmt.Println(configs) diff --git a/inabox/deploy/config.go b/inabox/deploy/config.go index e1efbf4b91..75fe8f5bda 100644 --- a/inabox/deploy/config.go +++ b/inabox/deploy/config.go @@ -39,7 +39,7 @@ func (env *Config) loadPrivateKeys() error { names = append(names, fmt.Sprintf("%v%v", prefix, i)) } } - addNames("dis", env.Services.Counts.NumDis) + addNames("dis", 2) addNames("opr", env.Services.Counts.NumOpr) addNames("staker", env.Services.Counts.NumOpr) addNames("retriever", 1) @@ -110,7 +110,7 @@ func (env *Config) applyDefaults(c any, prefix, stub string, ind int) { for key, value := range env.Services.Variables["globals"] { field := v.FieldByName(prefix + key) - if field.IsValid() && field.CanSet() { + if field.IsValid() && field.CanSet() && field.String() == "" { field.SetString(value) } } @@ -157,7 +157,7 @@ func (env *Config) generateChurnerVars(ind int, graphUrl, logPath, grpcPort stri } // Generates disperser .env -func (env *Config) generateDisperserVars(ind int, key, address, logPath, dbPath, grpcPort string) DisperserVars { +func (env *Config) generateDisperserVars(ind int, logPath, dbPath, grpcPort string) DisperserVars { v := DisperserVars{ DISPERSER_SERVER_S3_BUCKET_NAME: "test-eigenda-blobstore", DISPERSER_SERVER_DYNAMODB_TABLE_NAME: "test-BlobMetadata", @@ -194,6 +194,43 @@ func (env *Config) generateDisperserVars(ind int, key, address, logPath, dbPath, } +func (env *Config) generateDisperserV2Vars(ind int, logPath, dbPath, grpcPort string) DisperserVars { + v := DisperserVars{ + DISPERSER_SERVER_S3_BUCKET_NAME: "test-eigenda-blobstore", + DISPERSER_SERVER_DYNAMODB_TABLE_NAME: "test-BlobMetadata-v2", + DISPERSER_SERVER_RATE_BUCKET_TABLE_NAME: "", + DISPERSER_SERVER_RATE_BUCKET_STORE_SIZE: "100000", + DISPERSER_SERVER_GRPC_PORT: grpcPort, + DISPERSER_SERVER_ENABLE_METRICS: "true", + DISPERSER_SERVER_METRICS_HTTP_PORT: "9093", + DISPERSER_SERVER_CHAIN_RPC: "", + DISPERSER_SERVER_PRIVATE_KEY: "123", + DISPERSER_SERVER_NUM_CONFIRMATIONS: "0", + + DISPERSER_SERVER_REGISTERED_QUORUM_ID: "0,1", + DISPERSER_SERVER_TOTAL_UNAUTH_BYTE_RATE: "10000000,10000000", + DISPERSER_SERVER_PER_USER_UNAUTH_BYTE_RATE: "32000,32000", + DISPERSER_SERVER_TOTAL_UNAUTH_BLOB_RATE: "10,10", + DISPERSER_SERVER_PER_USER_UNAUTH_BLOB_RATE: "2,2", + DISPERSER_SERVER_ENABLE_RATELIMITER: "true", + + DISPERSER_SERVER_RETRIEVAL_BLOB_RATE: "4", + DISPERSER_SERVER_RETRIEVAL_BYTE_RATE: "10000000", + + DISPERSER_SERVER_BUCKET_SIZES: "5s", + DISPERSER_SERVER_BUCKET_MULTIPLIERS: "1", + DISPERSER_SERVER_COUNT_FAILED: "true", + + DISPERSER_SERVER_BLS_OPERATOR_STATE_RETRIVER: env.EigenDA.OperatorStateRetreiver, + DISPERSER_SERVER_EIGENDA_SERVICE_MANAGER: env.EigenDA.ServiceManager, + DISPERSER_SERVER_DISPERSER_VERSION: "2", + } + + env.applyDefaults(&v, "DISPERSER_SERVER", "dis", ind) + + return v +} + // Generates batcher .env func (env *Config) generateBatcherVars(ind int, key, graphUrl, logPath string) BatcherVars { v := BatcherVars{ @@ -252,6 +289,58 @@ func (env *Config) generateEncoderVars(ind int, grpcPort string) EncoderVars { return v } +func (env *Config) generateEncoderV2Vars(ind int, grpcPort string) EncoderVars { + v := EncoderVars{ + DISPERSER_ENCODER_AWS_REGION: "", + DISPERSER_ENCODER_AWS_ACCESS_KEY_ID: "", + DISPERSER_ENCODER_AWS_SECRET_ACCESS_KEY: "", + DISPERSER_ENCODER_AWS_ENDPOINT_URL: "", + DISPERSER_ENCODER_GRPC_PORT: grpcPort, + DISPERSER_ENCODER_ENABLE_METRICS: "true", + DISPERSER_ENCODER_G1_PATH: "", + DISPERSER_ENCODER_G2_PATH: "", + DISPERSER_ENCODER_SRS_ORDER: "", + DISPERSER_ENCODER_SRS_LOAD: "", + DISPERSER_ENCODER_CACHE_PATH: "", + DISPERSER_ENCODER_VERBOSE: "", + DISPERSER_ENCODER_NUM_WORKERS: fmt.Sprint(runtime.GOMAXPROCS(0)), + DISPERSER_ENCODER_MAX_CONCURRENT_REQUESTS: "16", + DISPERSER_ENCODER_REQUEST_POOL_SIZE: "32", + DISPERSER_ENCODER_ENCODER_VERSION: "2", + } + + env.applyDefaults(&v, "DISPERSER_ENCODER", "enc", ind) + + return v +} + +func (env *Config) generateControllerVars(ind int, graphUrl string) ControllerVars { + v := ControllerVars{ + CONTROLLER_DYNAMODB_TABLE_NAME: "test-BlobMetadata-v2", + CONTROLLER_BLS_OPERATOR_STATE_RETRIVER: env.EigenDA.OperatorStateRetreiver, + CONTROLLER_EIGENDA_SERVICE_MANAGER: env.EigenDA.ServiceManager, + CONTROLLER_USE_GRAPH: "true", + CONTROLLER_GRAPH_URL: graphUrl, + CONTROLLER_ENCODING_PULL_INTERVAL: "1s", + CONTROLLER_AVAILABLE_RELAYS: "0,1,2,3", + CONTROLLER_DISPATCHER_PULL_INTERVAL: "1s", + CONTROLLER_NODE_REQUEST_TIMEOUT: "5s", + CONTROLLER_NUM_CONNECTIONS_TO_NODES: "10", + CONTROLLER_CHAIN_RPC: "", + CONTROLLER_PRIVATE_KEY: "123", + CONTROLLER_NUM_CONFIRMATIONS: "0", + CONTROLLER_INDEXER_PULL_INTERVAL: "1s", + CONTROLLER_AWS_REGION: "", + CONTROLLER_AWS_ACCESS_KEY_ID: "", + CONTROLLER_AWS_SECRET_ACCESS_KEY: "", + CONTROLLER_AWS_ENDPOINT_URL: "", + CONTROLLER_ENCODER_ADDRESS: "0.0.0.0:34001", + } + env.applyDefaults(&v, "CONTROLLER", "controller", ind) + + return v +} + // Generates DA node .env func (env *Config) generateOperatorVars(ind int, name, key, churnerUrl, logPath, dbPath, dispersalPort, retrievalPort, metricsPort, nodeApiPort string) OperatorVars { @@ -282,7 +371,7 @@ func (env *Config) generateOperatorVars(ind int, name, key, churnerUrl, logPath, NODE_METRICS_PORT: metricsPort, NODE_ENABLE_NODE_API: "true", NODE_API_PORT: nodeApiPort, - NODE_TIMEOUT: "10", + NODE_TIMEOUT: "10s", NODE_QUORUM_ID_LIST: "0,1", NODE_DB_PATH: dbPath, NODE_ENABLE_TEST_MODE: "false", // using encrypted key in inabox @@ -344,6 +433,8 @@ func (env *Config) generateRetrieverVars(ind int, key string, graphUrl, logPath, RETRIEVER_CACHE_ENCODED_BLOBS: "false", RETRIEVER_INDEXER_PULL_INTERVAL: "1s", + RETRIEVER_USE_GRAPH: "true", + RETRIEVER_GRAPH_URL: graphUrl, } v.RETRIEVER_G2_PATH = "" @@ -483,23 +574,34 @@ func (env *Config) GenerateAllVariables() { churnerUrl := fmt.Sprintf("%s:%s", churnerConfig.CHURNER_HOSTNAME, churnerConfig.CHURNER_GRPC_PORT) // Generate disperser nodes - for i := 0; i < env.Services.Counts.NumDis; i++ { - grpcPort := fmt.Sprint(port + 1) - port += 2 + grpcPort := fmt.Sprint(port + 1) + port += 2 - name := fmt.Sprintf("dis%v", i) - logPath, dbPath, filename, envFile := env.getPaths(name) - key, address := env.getKey(name) + name = "dis0" + logPath, dbPath, filename, envFile := env.getPaths(name) + disperserConfig := env.generateDisperserVars(0, logPath, dbPath, grpcPort) + writeEnv(disperserConfig.getEnvMap(), envFile) + env.Dispersers = append(env.Dispersers, disperserConfig) - // Convert key to address - disperserConfig := env.generateDisperserVars(i, key, address, logPath, dbPath, grpcPort) - writeEnv(disperserConfig.getEnvMap(), envFile) - env.Dispersers = append(env.Dispersers, disperserConfig) + env.genService( + compose, name, disImage, + filename, []string{grpcPort}) - env.genService( - compose, name, disImage, - filename, []string{grpcPort}) - } + // v2 disperser + grpcPort = fmt.Sprint(port + 1) + port += 2 + + name = "dis1" + logPath, dbPath, filename, envFile = env.getPaths(name) + + // Convert key to address + disperserConfig = env.generateDisperserV2Vars(0, logPath, dbPath, grpcPort) + writeEnv(disperserConfig.getEnvMap(), envFile) + env.Dispersers = append(env.Dispersers, disperserConfig) + + env.genService( + compose, name, disImage, + filename, []string{grpcPort}) for i := 0; i < env.Services.Counts.NumOpr; i++ { metricsPort := fmt.Sprint(port + 1) // port @@ -545,6 +647,16 @@ func (env *Config) GenerateAllVariables() { compose, name, encoderImage, filename, []string{"34000"}) + // v2 encoder + name = "enc1" + _, _, filename, envFile = env.getPaths(name) + encoderConfig = env.generateEncoderV2Vars(0, "34001") + writeEnv(encoderConfig.getEnvMap(), envFile) + env.Encoder = append(env.Encoder, encoderConfig) + env.genService( + compose, name, encoderImage, + filename, []string{"34001"}) + // Stakers for i := 0; i < env.Services.Counts.NumOpr; i++ { @@ -562,15 +674,17 @@ func (env *Config) GenerateAllVariables() { port += 2 name = "retriever0" key, _ = env.getKey(name) - logPath, _, filename, envFile = env.getPaths(name) + logPath, _, _, envFile = env.getPaths(name) retrieverConfig := env.generateRetrieverVars(0, key, graphUrl, logPath, fmt.Sprint(port)) writeEnv(retrieverConfig.getEnvMap(), envFile) env.Retriever = retrieverConfig - _ = filename - // env.genService( - // compose, name, retrieverImage, - // filename, []string{fmt.Sprint(port)}) + // Controller + name = "controller0" + _, _, _, envFile = env.getPaths(name) + controllerConfig := env.generateControllerVars(0, graphUrl) + writeEnv(controllerConfig.getEnvMap(), envFile) + env.Controller = controllerConfig if env.Environment.IsLocal() { diff --git a/inabox/deploy/config_types.go b/inabox/deploy/config_types.go index 875a70b803..b3db22e05c 100644 --- a/inabox/deploy/config_types.go +++ b/inabox/deploy/config_types.go @@ -112,7 +112,6 @@ type Stakes struct { type ServicesSpec struct { Counts struct { - NumDis int `yaml:"dispersers"` NumOpr int `yaml:"operators"` NumMaxOperatorCount int `yaml:"maxOperatorCount"` } `yaml:"counts"` @@ -172,6 +171,7 @@ type Config struct { Operators []OperatorVars Stakers []Staker Retriever RetrieverVars + Controller ControllerVars } func (c Config) IsEigenDADeployed() bool { diff --git a/inabox/deploy/env_vars.go b/inabox/deploy/env_vars.go index c8f36a70d0..6fa7147de5 100644 --- a/inabox/deploy/env_vars.go +++ b/inabox/deploy/env_vars.go @@ -543,3 +543,96 @@ func (vars ChurnerVars) getEnvMap() map[string]string { } return envMap } + +type ControllerVars struct { + CONTROLLER_DYNAMODB_TABLE_NAME string + + CONTROLLER_BLS_OPERATOR_STATE_RETRIVER string + + CONTROLLER_EIGENDA_SERVICE_MANAGER string + + CONTROLLER_USE_GRAPH string + + CONTROLLER_ENCODING_PULL_INTERVAL string + + CONTROLLER_AVAILABLE_RELAYS string + + CONTROLLER_ENCODER_ADDRESS string + + CONTROLLER_DISPATCHER_PULL_INTERVAL string + + CONTROLLER_NODE_REQUEST_TIMEOUT string + + CONTROLLER_NUM_CONNECTIONS_TO_NODES string + + CONTROLLER_INDEXER_DATA_DIR string + + CONTROLLER_ENCODING_REQUEST_TIMEOUT string + + CONTROLLER_ENCODING_STORE_TIMEOUT string + + CONTROLLER_NUM_ENCODING_RETRIES string + + CONTROLLER_NUM_RELAY_ASSIGNMENT string + + CONTROLLER_NUM_CONCURRENT_ENCODING_REQUESTS string + + CONTROLLER_FINALIZATION_BLOCK_DELAY string + + CONTROLLER_NUM_REQUEST_RETRIES string + + CONTROLLER_NUM_CONCURRENT_DISPERSAL_REQUESTS string + + CONTROLLER_NODE_CLIENT_CACHE_NUM_ENTRIES string + + CONTROLLER_CHAIN_RPC string + + CONTROLLER_CHAIN_RPC_FALLBACK string + + CONTROLLER_PRIVATE_KEY string + + CONTROLLER_NUM_CONFIRMATIONS string + + CONTROLLER_NUM_RETRIES string + + CONTROLLER_LOG_LEVEL string + + CONTROLLER_LOG_PATH string + + CONTROLLER_LOG_FORMAT string + + CONTROLLER_INDEXER_PULL_INTERVAL string + + CONTROLLER_AWS_REGION string + + CONTROLLER_AWS_ACCESS_KEY_ID string + + CONTROLLER_AWS_SECRET_ACCESS_KEY string + + CONTROLLER_AWS_ENDPOINT_URL string + + CONTROLLER_FRAGMENT_PREFIX_CHARS string + + CONTROLLER_FRAGMENT_PARALLELISM_FACTOR string + + CONTROLLER_FRAGMENT_PARALLELISM_CONSTANT string + + CONTROLLER_FRAGMENT_READ_TIMEOUT string + + CONTROLLER_FRAGMENT_WRITE_TIMEOUT string + + CONTROLLER_GRAPH_URL string + + CONTROLLER_GRAPH_BACKOFF string + + CONTROLLER_GRAPH_MAX_RETRIES string +} + +func (vars ControllerVars) getEnvMap() map[string]string { + v := reflect.ValueOf(vars) + envMap := make(map[string]string) + for i := 0; i < v.NumField(); i++ { + envMap[v.Type().Field(i).Name] = v.Field(i).String() + } + return envMap +} diff --git a/inabox/templates/testconfig-anvil-docker.yaml b/inabox/templates/testconfig-anvil-docker.yaml index 6f15261aec..1d477e55f3 100644 --- a/inabox/templates/testconfig-anvil-docker.yaml +++ b/inabox/templates/testconfig-anvil-docker.yaml @@ -22,7 +22,6 @@ privateKeys: services: counts: - dispersers: 1 operators: 4 maxOperatorCount: 3 stakes: diff --git a/inabox/templates/testconfig-anvil-nochurner.yaml b/inabox/templates/testconfig-anvil-nochurner.yaml index 1449b48b66..fba88791e4 100644 --- a/inabox/templates/testconfig-anvil-nochurner.yaml +++ b/inabox/templates/testconfig-anvil-nochurner.yaml @@ -22,7 +22,6 @@ privateKeys: services: counts: - dispersers: 1 operators: 3 stakes: - total: 100e18 diff --git a/inabox/templates/testconfig-anvil-nograph.yaml b/inabox/templates/testconfig-anvil-nograph.yaml index d9788cb63f..1fdae78892 100644 --- a/inabox/templates/testconfig-anvil-nograph.yaml +++ b/inabox/templates/testconfig-anvil-nograph.yaml @@ -22,7 +22,6 @@ privateKeys: services: counts: - dispersers: 1 operators: 4 stakes: - total: 100e18 diff --git a/inabox/templates/testconfig-anvil.yaml b/inabox/templates/testconfig-anvil.yaml index e43ec64b47..fde1175fcc 100644 --- a/inabox/templates/testconfig-anvil.yaml +++ b/inabox/templates/testconfig-anvil.yaml @@ -22,7 +22,6 @@ privateKeys: services: counts: - dispersers: 1 operators: 4 maxOperatorCount: 3 stakes: diff --git a/inabox/templates/testconfig-docker-anvil.yaml b/inabox/templates/testconfig-docker-anvil.yaml index 5b81f16f42..c5d8923496 100644 --- a/inabox/templates/testconfig-docker-anvil.yaml +++ b/inabox/templates/testconfig-docker-anvil.yaml @@ -29,7 +29,6 @@ telemetry: services: counts: - dispersers: 1 operators: 4 stakes: total: 100e18 diff --git a/inabox/templates/testconfig-geth.yaml b/inabox/templates/testconfig-geth.yaml index 353e91b8df..8ec9424c89 100644 --- a/inabox/templates/testconfig-geth.yaml +++ b/inabox/templates/testconfig-geth.yaml @@ -16,7 +16,6 @@ privateKeys: services: counts: - dispersers: 1 operators: 4 stakes: total: 100e18 diff --git a/inabox/tests/integration_suite_test.go b/inabox/tests/integration_suite_test.go index 2f8250a1ae..3e9cc6ecd4 100644 --- a/inabox/tests/integration_suite_test.go +++ b/inabox/tests/integration_suite_test.go @@ -39,15 +39,16 @@ var ( dockertestResource *dockertest.Resource localStackPort string - metadataTableName = "test-BlobMetadata" - bucketTableName = "test-BucketStore" - logger logging.Logger - ethClient common.EthClient - rpcClient common.RPCEthClient - mockRollup *rollupbindings.ContractMockRollup - retrievalClient clients.RetrievalClient - numConfirmations int = 3 - numRetries = 0 + metadataTableName = "test-BlobMetadata" + bucketTableName = "test-BucketStore" + metadataTableNameV2 = "test-BlobMetadata-v2" + logger logging.Logger + ethClient common.EthClient + rpcClient common.RPCEthClient + mockRollup *rollupbindings.ContractMockRollup + retrievalClient clients.RetrievalClient + numConfirmations int = 3 + numRetries = 0 cancel context.CancelFunc ) @@ -91,7 +92,7 @@ var _ = BeforeSuite(func() { dockertestPool = pool dockertestResource = resource - err = deploy.DeployResources(pool, localStackPort, metadataTableName, bucketTableName, "") + err = deploy.DeployResources(pool, localStackPort, metadataTableName, bucketTableName, metadataTableNameV2) Expect(err).To(BeNil()) } else {