Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,23 +6,21 @@ import ( | |
| "errors" | ||
| "fmt" | ||
|
|
||
| "github.com/celestiaorg/celestia-app/v3/pkg/appconsts" | ||
|
Check failure on line 9 in blob/blob.go
|
||
| app "github.com/celestiaorg/celestia-app/v3/pkg/appconsts/v2" | ||
|
Check failure on line 10 in blob/blob.go
|
||
| "github.com/celestiaorg/go-square/merkle" | ||
| "github.com/celestiaorg/go-square/v2/inclusion" | ||
| "github.com/celestiaorg/go-square/v2/share" | ||
| "github.com/celestiaorg/nmt" | ||
| ) | ||
|
|
||
| // appVersion is the current application version of celestia-app. | ||
| const appVersion = app.Version | ||
|
|
||
| var errEmptyShares = errors.New("empty shares") | ||
|
|
||
| var subtreeRootThreshold = appconsts.SubtreeRootThreshold(appVersion) | ||
|
|
||
| // The Proof is a set of nmt proofs that can be verified only through | ||
| // the included method (due to limitation of the nmt https://github.com/celestiaorg/nmt/issues/218). | ||
| // Proof proves the WHOLE namespaced data to the row roots. | ||
|
|
@@ -61,14 +59,10 @@ func (p Proof) equal(input Proof) error { | |
|
|
||
| // Blob represents any application-specific binary data that anyone can submit to Celestia. | ||
| type Blob struct { | ||
| *share.Blob `json:"blob"` | ||
|
|
||
| Commitment Commitment `json:"commitment"` | ||
|
|
||
| // index represents the index of the blob's first share in the EDS. | ||
| // Only retrieved, on-chain blobs will have the index set. Default is -1. | ||
| index int | ||
|
|
@@ -77,35 +71,43 @@ type Blob struct { | |
| // NewBlobV0 constructs a new blob from the provided Namespace and data. | ||
| // The blob will be formatted as v0 shares. | ||
| func NewBlobV0(namespace share.Namespace, data []byte) (*Blob, error) { | ||
| return NewBlob(share.ShareVersionZero, namespace, data, nil) | ||
| } | ||
|
|
||
| // NewBlobV1 constructs a new blob from the provided Namespace and data. | ||
| // The blob will be formatted as v0 shares. | ||
| func NewBlobV1(namespace share.Namespace, data, signer []byte) (*Blob, error) { | ||
| return NewBlob(share.ShareVersionOne, namespace, data, signer) | ||
| } | ||
|
|
||
| // NewBlob constructs a new blob from the provided Namespace, data and share version. | ||
| func NewBlob(shareVersion uint8, namespace share.Namespace, data, signer []byte) (*Blob, error) { | ||
| if len(data) == 0 || len(data) > appconsts.DefaultMaxBytes { | ||
| return nil, fmt.Errorf("blob data must be > 0 && <= %d, but it was %d bytes", appconsts.DefaultMaxBytes, len(data)) | ||
| } | ||
|
|
||
| if err := share.ValidateUserNamespace(namespace.Version(), namespace.ID()); err != nil { | ||
| return nil, fmt.Errorf("invalid user namespace: %w", err) | ||
| } | ||
| if !namespace.IsUsableNamespace() { | ||
| return nil, fmt.Errorf("namespace %s is not usable", namespace.ID()) // rename | ||
| } | ||
|
|
||
| squareBlob, err := share.NewBlob(namespace, data, shareVersion, signer) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| com, err := inclusion.CreateCommitment(squareBlob, merkle.HashFromByteSlices, subtreeRootThreshold) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return &Blob{Blob: squareBlob, Commitment: com, index: -1}, nil | ||
| } | ||
|
|
||
| // Namespace returns blob's namespace. | ||
| func (b *Blob) Namespace() share.Namespace { | ||
| return b.Blob.Namespace() | ||
| } | ||
|
|
||
| // Index returns the blob's first share index in the EDS. | ||
|
|
@@ -124,38 +126,34 @@ func (b *Blob) Length() (int, error) { | |
| if len(s) == 0 { | ||
| return 0, errors.New("blob with zero shares received") | ||
| } | ||
| return share.SparseSharesNeeded(s[0].SequenceLen()), nil | ||
| } | ||
|
|
||
| // Signer returns blob's author. | ||
| func (b *Blob) Signer() []byte { | ||
| return b.Blob.Signer() | ||
| } | ||
|
|
||
| func (b *Blob) compareCommitments(com Commitment) bool { | ||
| return bytes.Equal(b.Commitment, com) | ||
| } | ||
|
|
||
| type jsonBlob struct { | ||
| Namespace []byte `json:"namespace"` | ||
| Data []byte `json:"data"` | ||
| ShareVersion uint32 `json:"share_version"` | ||
| Commitment Commitment `json:"commitment"` | ||
| Signer []byte `json:"signer,omitempty"` | ||
| Index int `json:"index"` | ||
| } | ||
|
|
||
| func (b *Blob) MarshalJSON() ([]byte, error) { | ||
| blob := &jsonBlob{ | ||
| Namespace: b.Namespace().Bytes(), | ||
| Data: b.Data(), | ||
| ShareVersion: uint32(b.ShareVersion()), | ||
| Commitment: b.Commitment, | ||
| Signer: b.Signer(), | ||
| Index: b.index, | ||
| } | ||
| return json.Marshal(blob) | ||
|
|
@@ -168,17 +166,18 @@ func (b *Blob) UnmarshalJSON(data []byte) error { | |
| return err | ||
| } | ||
|
|
||
| ns, err := share.NewNamespaceFromBytes(jsonBlob.Namespace) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| blob, err := NewBlob(uint8(jsonBlob.ShareVersion), ns, jsonBlob.Data, jsonBlob.Signer) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| blob.Commitment = jsonBlob.Commitment | ||
| blob.index = jsonBlob.Index | ||
| *b = *blob | ||
| return nil | ||
| } | ||
Oops, something went wrong.