diff --git a/api/clients/accountant_test.go b/api/clients/accountant_test.go index a896c52083..c6dc3fa692 100644 --- a/api/clients/accountant_test.go +++ b/api/clients/accountant_test.go @@ -272,7 +272,6 @@ func TestConcurrentBinRotationAndAccountBlob(t *testing.T) { defer wg.Done() _, err := accountant.AccountBlob(ctx, 100, quorums, salt) assert.NoError(t, err) - time.Sleep(500 * time.Millisecond) }() } diff --git a/api/docs/disperser.html b/api/docs/disperser.html index 12de6ecca6..fba274aa78 100644 --- a/api/docs/disperser.html +++ b/api/docs/disperser.html @@ -839,7 +839,7 @@

DispersePaidBlobRequest

payment_header common.PaymentHeader -

Payment header contains AccountID, ReservationPeriod, CumulativePayment, and Salt

+

Payment header contains account_id, reservation_period, cumulative_payment, and salt

diff --git a/api/docs/disperser.md b/api/docs/disperser.md index 25f0bc5f64..39f01e439a 100644 --- a/api/docs/disperser.md +++ b/api/docs/disperser.md @@ -287,7 +287,7 @@ BlobStatusRequest is used to query the status of a blob. | ----- | ---- | ----- | ----------- | | data | [bytes](#bytes) | | The data to be dispersed. Same requirements as DisperseBlobRequest. | | quorum_numbers | [uint32](#uint32) | repeated | The quorums to which the blob to be sent | -| payment_header | [common.PaymentHeader](#common-PaymentHeader) | | Payment header contains AccountID, ReservationPeriod, CumulativePayment, and Salt | +| payment_header | [common.PaymentHeader](#common-PaymentHeader) | | Payment header contains account_id, reservation_period, cumulative_payment, and salt | | payment_signature | [bytes](#bytes) | | signature of payment_header | diff --git a/api/docs/eigenda-protos.html b/api/docs/eigenda-protos.html index b81d3ba540..987f3250d2 100644 --- a/api/docs/eigenda-protos.html +++ b/api/docs/eigenda-protos.html @@ -1721,7 +1721,7 @@

DispersePaidBlobRequest

payment_header common.PaymentHeader -

Payment header contains AccountID, ReservationPeriod, CumulativePayment, and Salt

+

Payment header contains account_id, reservation_period, cumulative_payment, and salt

diff --git a/api/docs/eigenda-protos.md b/api/docs/eigenda-protos.md index 587859c917..732b7dc77c 100644 --- a/api/docs/eigenda-protos.md +++ b/api/docs/eigenda-protos.md @@ -639,7 +639,7 @@ BlobStatusRequest is used to query the status of a blob. | ----- | ---- | ----- | ----------- | | data | [bytes](#bytes) | | The data to be dispersed. Same requirements as DisperseBlobRequest. | | quorum_numbers | [uint32](#uint32) | repeated | The quorums to which the blob to be sent | -| payment_header | [common.PaymentHeader](#common-PaymentHeader) | | Payment header contains AccountID, ReservationPeriod, CumulativePayment, and Salt | +| payment_header | [common.PaymentHeader](#common-PaymentHeader) | | Payment header contains account_id, reservation_period, cumulative_payment, and salt | | payment_signature | [bytes](#bytes) | | signature of payment_header | diff --git a/api/grpc/disperser/disperser.pb.go b/api/grpc/disperser/disperser.pb.go index 2d39b960e9..47d211b77f 100644 --- a/api/grpc/disperser/disperser.pb.go +++ b/api/grpc/disperser/disperser.pb.go @@ -458,7 +458,7 @@ type DispersePaidBlobRequest struct { Data []byte `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` // The quorums to which the blob to be sent QuorumNumbers []uint32 `protobuf:"varint,2,rep,packed,name=quorum_numbers,json=quorumNumbers,proto3" json:"quorum_numbers,omitempty"` - // Payment header contains AccountID, ReservationPeriod, CumulativePayment, and Salt + // Payment header contains account_id, reservation_period, cumulative_payment, and salt PaymentHeader *common.PaymentHeader `protobuf:"bytes,3,opt,name=payment_header,json=paymentHeader,proto3" json:"payment_header,omitempty"` // signature of payment_header PaymentSignature []byte `protobuf:"bytes,4,opt,name=payment_signature,json=paymentSignature,proto3" json:"payment_signature,omitempty"` diff --git a/api/proto/disperser/disperser.proto b/api/proto/disperser/disperser.proto index d779a16ee4..ee537ee156 100644 --- a/api/proto/disperser/disperser.proto +++ b/api/proto/disperser/disperser.proto @@ -99,7 +99,7 @@ message DispersePaidBlobRequest { // The quorums to which the blob to be sent repeated uint32 quorum_numbers = 2; - // Payment header contains AccountID, ReservationPeriod, CumulativePayment, and Salt + // Payment header contains account_id, reservation_period, cumulative_payment, and salt common.PaymentHeader payment_header = 3; // signature of payment_header bytes payment_signature = 4; diff --git a/core/data.go b/core/data.go index fb6db312d0..adfb1509da 100644 --- a/core/data.go +++ b/core/data.go @@ -567,6 +567,11 @@ func (pm *PaymentMetadata) UnmarshalDynamoDBAttributeValue(av types.AttributeVal } pm.ReservationPeriod = uint32(reservationPeriod) pm.CumulativePayment, _ = new(big.Int).SetString(m.Value["CumulativePayment"].(*types.AttributeValueMemberN).Value, 10) + salt, err := strconv.ParseUint(m.Value["Salt"].(*types.AttributeValueMemberN).Value, 10, 32) + if err != nil { + return fmt.Errorf("failed to parse Salt: %w", err) + } + pm.Salt = uint32(salt) return nil }