feat: Initial V2 scaffolds - update dependency injection

flags/eigendaflags/cli.go

@@ -252,10 +252,10 @@ func ReadV2DispersalConfig(ctx *cli.Context) v2_clients.PayloadDisperserConfig {
 	}
 }
 
-func ReadV2RetrievalConfig(ctx *cli.Context) v2_clients.PayloadRetrieverConfig {
+func ReadV2RetrievalConfig(ctx *cli.Context) v2_clients.RelayPayloadRetrieverConfig {
 	payCfg := readPayloadClientConfig(ctx)
 
-	return v2_clients.PayloadRetrieverConfig{
+	return v2_clients.RelayPayloadRetrieverConfig{
 		PayloadClientConfig: payCfg,
 		RelayTimeout:        ctx.Duration(RelayTimeoutName),
 	}

server/config.go

@@ -31,7 +31,7 @@ type Config struct {
 
 	EigenDAV2Enabled  bool
 	V2DispersalConfig clients_v2.PayloadDisperserConfig
-	V2RetrievalConfig clients_v2.PayloadRetrieverConfig
+	V2RetrievalConfig clients_v2.RelayPayloadRetrieverConfig
 }
 
 // ReadConfig ... parses the Config from the provided flags or environment variables.

server/load_store.go

@@ -19,7 +19,7 @@ import (
 	"github.com/Layr-Labs/eigenda/api/clients/codecs"
 	clients_v2 "github.com/Layr-Labs/eigenda/api/clients/v2"
 	"github.com/Layr-Labs/eigenda/api/clients/v2/verification"
-
+	authv2 "github.com/Layr-Labs/eigenda/core/auth/v2"
 	corev2 "github.com/Layr-Labs/eigenda/core/v2"
 
 	"github.com/Layr-Labs/eigenda/encoding"
@@ -31,7 +31,6 @@ import (
 
 	"github.com/ethereum/go-ethereum/log"
 
-	authv2 "github.com/Layr-Labs/eigenda/core/auth/v2"
 	eigenda_eth "github.com/Layr-Labs/eigenda/core/eth"
 	geth_common "github.com/ethereum/go-ethereum/common"
 )
@@ -44,8 +43,12 @@ func BuildPayloadDisperser(log logging.Logger, payloadDispCfg clients_v2.Payload
 
 	// 1 - verify key semantics and create signer
 	var signer corev2.BlobRequestSigner
+	var err error
 	if len(privKey) == 64 {
-		signer = authv2.NewLocalBlobRequestSigner(privKey)
+		signer, err = authv2.NewLocalBlobRequestSigner(privKey)
+		if err != nil {
+			return nil, err
+		}
 	} else {
 		return nil, fmt.Errorf("invalid length for signer private key")
 	}
@@ -172,7 +175,7 @@ func loadEigenDAV2Store(ctx context.Context, cfg CLIConfig) (*eigenda_v2.Store,
 		Sockets:            relayURLs,
 	}
 
-	retriever, err := clients_v2.BuildPayloadRetriever(tempLogger,
+	retriever, err := clients_v2.BuildRelayPayloadRetriever(tempLogger,
 		cfg.EigenDAConfig.V2RetrievalConfig,
 		gethCfg,
 		&relayCfg,
@@ -186,6 +189,8 @@ func loadEigenDAV2Store(ctx context.Context, cfg CLIConfig) (*eigenda_v2.Store,
 	splits := strings.Split(cfg.EigenDAConfig.EdaV1ClientConfig.RPC, ":")
 	println(fmt.Sprintf("%v", splits))
 
+	cfg.EigenDAConfig.V2DispersalConfig.SignerPaymentKey = cfg.EigenDAConfig.EdaV1ClientConfig.SignerPrivateKeyHex
+
 	cfg.EigenDAConfig.V2DispersalConfig.BlobCertifiedTimeout = time.Second * 100
 
 	log.Info("Building payload disperser")

store/generated_key/eigenda_v2/eigenda.go

@@ -36,14 +36,14 @@ type Store struct {
 	log log.Logger
 
 	disperser *clients.PayloadDisperser
-	retriever *clients.PayloadRetriever
+	retriever clients.PayloadRetriever
 	verifier  verification.ICertVerifier
 }
 
 var _ common.GeneratedKeyStore = (*Store)(nil)
 
 func NewStore(log log.Logger, cfg *Config, ethClient eigenda_common.EthClient,
-	disperser *clients.PayloadDisperser, retriever *clients.PayloadRetriever, verifier verification.ICertVerifier) (*Store, error) {
+	disperser *clients.PayloadDisperser, retriever clients.PayloadRetriever, verifier verification.ICertVerifier) (*Store, error) {
 
 	return &Store{
 		log:       log,
@@ -92,15 +92,8 @@ func (e Store) Get(ctx context.Context, key []byte) ([]byte, error) {
 	if err != nil {
 		return nil, fmt.Errorf("RLP decoding EigenDA v2 cert: %w", err)
 	}
-
-	// TODO: Update this to use changes from
-	// https://github.com/Layr-Labs/eigenda/pull/1187 once merged
-	blobKey, err := computeBlobKey(&cert)
-	if err != nil {
-		return nil, fmt.Errorf("computing blob key from cert: %w", err)
-	}
-
-	payload, err := e.retriever.GetPayload(ctx, *blobKey, &cert)
+
+	payload, err := e.retriever.GetPayload(ctx, &cert)
 	if err != nil {
 		return nil, fmt.Errorf("getting payload: %w", err)
 	}