Add inabox-docker framework for 'docker-compose up' local deploys

.gitignore

@@ -1,8 +1,11 @@
 inabox/testdata/*
 inabox/anvil.pid
+inabox/resources/kzg/SRSTables/*
+
+inabox-docker/testdata/*
+inabox-docker/resources/kzg/SRSTables/*
 
 test/testdata/*
-inabox/resources/kzg/SRSTables/*
 
 **/bin/*
 coverage.*

common/aws/dynamodb/client_test.go

@@ -67,7 +67,7 @@ func teardown() {
 
 func createTable(t *testing.T, tableName string) {
 	ctx := context.Background()
-	tableDescription, err := test_utils.CreateTable(ctx, clientConfig, tableName, &dynamodb.CreateTableInput{
+	tableDescription, err := test_utils.CreateTableIfNotExists(ctx, clientConfig, tableName, &dynamodb.CreateTableInput{
 		AttributeDefinitions: []types.AttributeDefinition{{
 			AttributeName: aws.String("MetadataKey"),
 			AttributeType: types.ScalarAttributeTypeS,

common/aws/dynamodb/utils/test_utils.go

@@ -2,6 +2,7 @@ package test_utils
 
 import (
 	"context"
+	"errors"
 	"time"
 
 	commonaws "github.com/Layr-Labs/eigenda/common/aws"
@@ -17,25 +18,52 @@ const (
 	waiterDuration = 15 * time.Second
 )
 
-func CreateTable(ctx context.Context, cfg commonaws.ClientConfig, name string, input *dynamodb.CreateTableInput) (*types.TableDescription, error) {
+func CreateTableIfNotExists(ctx context.Context, cfg commonaws.ClientConfig, name string, input *dynamodb.CreateTableInput) (*types.TableDescription, error) {
 	c, err := getClient(cfg)
 	if err != nil {
 		return nil, err
 	}
-	table, err := c.CreateTable(ctx, input)
+
+	// Check if the table already exists
+	_, err = c.DescribeTable(ctx, &dynamodb.DescribeTableInput{
+		TableName: aws.String(name),
+	})
+
+	// If the table does not exist, create it
 	if err != nil {
-		return nil, err
+		var aerr *types.ResourceNotFoundException
+		if errors.As(err, &aerr) {
+			// Table does not exist, so create it
+			table, err := c.CreateTable(ctx, input)
+			if err != nil {
+				return nil, err
+			}
+
+			// Wait for the table to be created
+			waiter := dynamodb.NewTableExistsWaiter(c)
+			err = waiter.Wait(ctx, &dynamodb.DescribeTableInput{
+				TableName: aws.String(name),
+			}, waiterDuration)
+			if err != nil {
+				return nil, err
+			}
+
+			return table.TableDescription, nil
+		} else {
+			// Some other error occurred
+			return nil, err
+		}
 	}
 
-	waiter := dynamodb.NewTableExistsWaiter(c)
-	err = waiter.Wait(ctx, &dynamodb.DescribeTableInput{
+	// If the table exists, return its description
+	tableDescription, err := c.DescribeTable(ctx, &dynamodb.DescribeTableInput{
 		TableName: aws.String(name),
-	}, waiterDuration)
+	})
 	if err != nil {
 		return nil, err
 	}
 
-	return table.TableDescription, nil
+	return tableDescription.Table, nil
 }
 
 func getClient(clientConfig commonaws.ClientConfig) (*dynamodb.Client, error) {

common/aws/s3/utils/utils.go

@@ -0,0 +1,55 @@
+package utils
+
+import (
+	"context"
+	"fmt"
+	"log"
+
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/config"
+	"github.com/aws/aws-sdk-go-v2/credentials"
+	"github.com/aws/aws-sdk-go-v2/service/s3"
+)
+
+func CheckOrCreateBucket(awsAccessKeyID, awsSecretAccessKey, bucketName, region, endpoint string) {
+	customResolver := aws.EndpointResolverWithOptionsFunc(func(service, region string, options ...interface{}) (aws.Endpoint, error) {
+		if service == s3.ServiceID {
+			return aws.Endpoint{
+				PartitionID:       "aws",
+				URL:               endpoint,
+				SigningRegion:     region,
+				HostnameImmutable: true,
+			}, nil
+		}
+		// Fallback to default resolver
+		return aws.Endpoint{}, &aws.EndpointNotFoundError{}
+	})
+
+	cfg, err := config.LoadDefaultConfig(context.TODO(),
+		config.WithRegion(region),
+		config.WithCredentialsProvider(credentials.NewStaticCredentialsProvider(awsAccessKeyID, awsSecretAccessKey, "")),
+		config.WithEndpointResolverWithOptions(customResolver),
+	)
+	if err != nil {
+		log.Fatalf("unable to load SDK config, %v", err)
+	}
+
+	s3Client := s3.NewFromConfig(cfg)
+
+	_, err = s3Client.HeadBucket(context.TODO(), &s3.HeadBucketInput{
+		Bucket: aws.String(bucketName),
+	})
+
+	if err == nil {
+		fmt.Printf("Bucket %s already exists\n", bucketName)
+	} else {
+		fmt.Printf("Creating bucket %s\n", bucketName)
+		_, err = s3Client.CreateBucket(context.TODO(), &s3.CreateBucketInput{
+			Bucket: aws.String(bucketName),
+		})
+		if err != nil {
+			log.Fatalf("Unable to create bucket %s, %v", bucketName, err)
+		}
+		fmt.Printf("Bucket %s created successfully\n", bucketName)
+	}
+}

common/geth/cli.go

@@ -7,7 +7,7 @@ import (
 
 var (
 	rpcUrlFlagName     = "chain.rpc"
-	privateKeyFlagName = "chain.private-key"
+	PrivateKeyFlagName = "chain.private-key"
 )
 
 type EthClientConfig struct {
@@ -24,9 +24,9 @@ func EthClientFlags(envPrefix string) []cli.Flag {
 			EnvVar:   common.PrefixEnvVar(envPrefix, "CHAIN_RPC"),
 		},
 		cli.StringFlag{
-			Name:     privateKeyFlagName,
+			Name:     PrivateKeyFlagName,
 			Usage:    "Ethereum private key for disperser",
-			Required: true,
+			Required: false,
 			EnvVar:   common.PrefixEnvVar(envPrefix, "PRIVATE_KEY"),
 		},
 	}
@@ -35,7 +35,11 @@ func EthClientFlags(envPrefix string) []cli.Flag {
 func ReadEthClientConfig(ctx *cli.Context) EthClientConfig {
 	cfg := EthClientConfig{}
 	cfg.RPCURL = ctx.GlobalString(rpcUrlFlagName)
-	cfg.PrivateKeyString = ctx.GlobalString(privateKeyFlagName)
+	pkStr := ctx.GlobalString(PrivateKeyFlagName)
+	if len(pkStr) >= 2 && pkStr[:2] == "0x" {
+		pkStr = pkStr[2:]
+	}
+	cfg.PrivateKeyString = pkStr
 	return cfg
 }
 

common/store/dynamo_store_test.go

@@ -59,7 +59,7 @@ func setup(m *testing.M) {
 		panic("failed to create dynamodb client: " + err.Error())
 	}
 
-	_, err = test_utils.CreateTable(context.Background(), cfg, bucketTableName, store.GenerateTableSchema(10, 10, bucketTableName))
+	_, err = test_utils.CreateTableIfNotExists(context.Background(), cfg, bucketTableName, store.GenerateTableSchema(10, 10, bucketTableName))
 	if err != nil {
 		teardown()
 		panic("failed to create dynamodb table: " + err.Error())

contracts/foundry.toml

@@ -2,15 +2,15 @@
 src = 'src'
 out = 'out'
 libs = ['lib']
-fs_permissions = [{ access = "read-write", path = "./"}]
+fs_permissions = [{ access = "read-write", path = "./" }]
 
 remappings = [
     "@eigenlayer-middleware/=lib/eigenlayer-middleware/src/",
     "@eigenlayer-core/=lib/eigenlayer-contracts/src/",
     "@eigenlayer-scripts/=lib/eigenlayer-contracts/script/",
     "@openzeppelin/=lib/openzeppelin-contracts/",
     "@openzeppelin-upgrades/=lib/openzeppelin-contracts-upgradeable/",
-    "forge-std/=lib/forge-std/src/"
+    "forge-std/=lib/forge-std/src/",
 ]
 
 gas_reports = ["*"]
@@ -24,4 +24,4 @@ optimizer_runs = 200
 # Whether or not to use the Yul intermediate representation compilation pipeline
 via_ir = false
 # Override the Solidity version (this overrides `auto_detect_solc`)
-solc_version = '0.8.12'
+solc_version = '0.8.12'

disperser/blobstore/blobstore_test.go

@@ -76,7 +76,7 @@ func setup(m *testing.M) {
 		panic("failed to create dynamodb client: " + err.Error())
 	}
 
-	_, err = test_utils.CreateTable(context.Background(), cfg, metadataTableName, blobstore.GenerateTableSchema(metadataTableName, 10, 10))
+	_, err = test_utils.CreateTableIfNotExists(context.Background(), cfg, metadataTableName, blobstore.GenerateTableSchema(metadataTableName, 10, 10))
 	if err != nil {
 		teardown()
 		panic("failed to create dynamodb table: " + err.Error())

inabox-docker/.gitignore

@@ -0,0 +1 @@
+data/

inabox-docker/Makefile

@@ -0,0 +1,41 @@
+dt := $(shell date '+%YY-%mM-%dD-%HH-%MM-%SS')
+
+new-anvil:
+	mkdir -p "testdata/$(dt)"
+	cp ./templates/testconfig-anvil.yaml "testdata/$(dt)/config.yaml"
+
+new-docker-anvil:
+	mkdir -p "testdata/$(dt)"
+	cp ./templates/testconfig-anvil-docker.yaml "testdata/$(dt)/config.yaml"
+
+config: 
+	go run ./deploy/cmd
+	$(eval CURRENT_TESTDATA := $(shell ls -1r testdata/ | head -n 1))
+	docker-compose \
+		-f docker-compose.yml \
+		-f testdata/$(CURRENT_TESTDATA)/docker-compose.yml \
+		config > testdata/$(CURRENT_TESTDATA)/docker-compose.all.yml
+
+devnet-up:
+	$(eval CURRENT_TESTDATA := $(shell ls -1r testdata/ | head -n 1))
+	docker-compose -f testdata/$(CURRENT_TESTDATA)/docker-compose.all.yml up --detach
+
+devnet-logs:
+	$(eval CURRENT_TESTDATA := $(shell ls -1r testdata/ | head -n 1))
+	docker-compose -f testdata/$(CURRENT_TESTDATA)/docker-compose.all.yml logs --follow
+
+devnet-down:
+	$(eval CURRENT_TESTDATA := $(shell ls -1r testdata/ | head -n 1))
+	docker-compose -f testdata/$(CURRENT_TESTDATA)/docker-compose.all.yml down --volumes
+
+# run-e2e:
+# 	go test ./tests -v -config=../templates/testconfig-anvil.yaml
+
+# run-e2e-nochurner:
+# 	go test ./tests -v -config=../templates/testconfig-anvil-nochurner.yaml
+
+# run-e2e-nograph:
+# 	go test ./tests -v -config=../templates/testconfig-anvil-nograph.yaml
+
+clean:
+	rm -rf testdata/*

inabox-docker/README.md

@@ -0,0 +1,8 @@
+# Inabox Docker Environment
+
+A fully docker-based local EigenDA environment.
+
+### Usage
+
+1. `make devnet-up`
+2. `make devnet-logs`