Skip to content

Commit

Permalink
Merge branch 'master' into distributed-payload-retrieval
Browse files Browse the repository at this point in the history
  • Loading branch information
litt3 committed Jan 31, 2025
2 parents 1026ea2 + a1fceb9 commit 5bed3c9
Show file tree
Hide file tree
Showing 53 changed files with 679 additions and 303 deletions.
4 changes: 2 additions & 2 deletions api/clients/node_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func (c client) GetBlobHeader(
blobIndex uint32,
) (*core.BlobHeader, *merkletree.Proof, error) {
conn, err := grpc.NewClient(
core.OperatorSocket(socket).GetRetrievalSocket(),
core.OperatorSocket(socket).GetV1RetrievalSocket(),
grpc.WithTransportCredentials(insecure.NewCredentials()),
)
if err != nil {
Expand Down Expand Up @@ -86,7 +86,7 @@ func (c client) GetChunks(
chunksChan chan RetrievedChunks,
) {
conn, err := grpc.NewClient(
core.OperatorSocket(opInfo.Socket).GetRetrievalSocket(),
core.OperatorSocket(opInfo.Socket).GetV1RetrievalSocket(),
grpc.WithTransportCredentials(insecure.NewCredentials()),
)
if err != nil {
Expand Down
12 changes: 5 additions & 7 deletions api/clients/v2/payload_disperser.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,9 @@ func BuildPayloadDisperser(log logging.Logger, payloadDispCfg PayloadDisperserCo
kzgConfig *kzg.KzgConfig, encoderCfg *encoding.Config) (*PayloadDisperser, error) {

// 1 - verify key semantics and create signer
var signer core.BlobRequestSigner
if len(payloadDispCfg.SignerPaymentKey) == 64 {
signer = auth.NewLocalBlobRequestSigner(payloadDispCfg.SignerPaymentKey)
} else {
return nil, fmt.Errorf("invalid length for signer private key")
signer, err := auth.NewLocalBlobRequestSigner(payloadDispCfg.SignerPaymentKey)
if err != nil {
return nil, fmt.Errorf("new local blob request signer: %w", err)
}

// 2 - create prover
Expand Down Expand Up @@ -213,7 +211,7 @@ func (pd *PayloadDisperser) pollBlobStatusUntilCertified(
case <-ctx.Done():
return nil, fmt.Errorf(
"timed out waiting for %v blob status, final status was %v: %w",
dispgrpc.BlobStatus_CERTIFIED.Descriptor(),
dispgrpc.BlobStatus_COMPLETE.Descriptor(),
previousStatus.Descriptor(),
ctx.Err())
case <-ticker.C:
Expand All @@ -237,7 +235,7 @@ func (pd *PayloadDisperser) pollBlobStatusUntilCertified(

// TODO: we'll need to add more in-depth response status processing to derive failover errors
switch newStatus {
case dispgrpc.BlobStatus_CERTIFIED:
case dispgrpc.BlobStatus_COMPLETE:
return blobStatusReply, nil
case dispgrpc.BlobStatus_QUEUED, dispgrpc.BlobStatus_ENCODED:
continue
Expand Down
2 changes: 1 addition & 1 deletion api/clients/v2/retrieval_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ func (r *retrievalClient) getChunksFromOperator(
chunksChan chan clients.RetrievedChunks,
) {
conn, err := grpc.NewClient(
core.OperatorSocket(opInfo.Socket).GetRetrievalSocket(),
core.OperatorSocket(opInfo.Socket).GetV2RetrievalSocket(),
grpc.WithTransportCredentials(insecure.NewCredentials()),
)
defer func() {
Expand Down
35 changes: 22 additions & 13 deletions api/docs/disperser_v2.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 7 additions & 9 deletions api/docs/disperser_v2.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 22 additions & 13 deletions api/docs/eigenda-protos.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 5bed3c9

Please sign in to comment.