Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(eds): WriteEDS thread safety for concurrent writingSessions #1498

Merged
merged 3 commits into from
Dec 20, 2022
Merged

fix(eds): WriteEDS thread safety for concurrent writingSessions #1498

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ea1219
fix: making WriteEDS writeSessions thread safe
distractedm1nd Dec 15, 2022
da380ff
using minio
distractedm1nd Dec 15, 2022
9680cab
exporting ipld.NmtHashSize, removing old todos
distractedm1nd Dec 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions share/eds/eds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
format "github.com/ipfs/go-ipld-format"
"github.com/ipld/go-car"
"github.com/ipld/go-car/util"
"github.com/minio/sha256-simd"

"github.com/celestiaorg/celestia-app/pkg/appconsts"
"github.com/celestiaorg/celestia-app/pkg/da"
Expand All @@ -28,16 +29,19 @@ import (
"github.com/celestiaorg/celestia-node/share/ipld"
)

// childHashLen is the length of each half of an inner node's data. It consists of the respective
// min and max namespaces, followed by a sha256 hash.
const childHashLen = (appconsts.NamespaceSize * 2) + sha256.Size
distractedm1nd marked this conversation as resolved.
Show resolved Hide resolved

var ErrEmptySquare = errors.New("share: importing empty data")

// writingSession contains the components needed to write an EDS to a CARv1 file with our custom
// node order.
type writingSession struct {
eds *rsmt2d.ExtendedDataSquare
// store is an in-memory blockstore, used to cache the inner nodes (proofs) while we walk the nmt
// tree.
store bstore.Blockstore
w io.Writer
eds *rsmt2d.ExtendedDataSquare
store bstore.Blockstore // caches inner nodes (proofs) while we walk the nmt tree.
hasher *nmt.Hasher
w io.Writer
}

// WriteEDS writes the entire EDS into the given io.Writer as CARv1 file.
Expand Down Expand Up @@ -106,9 +110,10 @@ func initializeWriter(ctx context.Context, eds *rsmt2d.ExtendedDataSquare, w io.
}

return &writingSession{
eds: eds,
store: store,
w: w,
eds: eds,
store: store,
hasher: nmt.NewNmtHasher(sha256.New(), appconsts.NamespaceSize, true),
w: w,
}, nil
}

Expand All @@ -129,7 +134,7 @@ func (w *writingSession) writeHeader() error {
func (w *writingSession) writeQuadrants() error {
shares := quadrantOrder(w.eds)
for _, share := range shares {
cid, err := ipld.CidFromNamespacedSha256(nmt.Sha256Namespace8FlaggedLeaf(share))
cid, err := ipld.CidFromNamespacedSha256(w.hasher.HashLeaf(share))
if err != nil {
return fmt.Errorf("getting cid from share: %w", err)
}
Expand All @@ -151,15 +156,18 @@ func (w *writingSession) writeProofs(ctx context.Context) error {
return fmt.Errorf("getting all keys from the blockstore: %w", err)
}
for proofCid := range proofs {
node, err := w.store.Get(ctx, proofCid)
block, err := w.store.Get(ctx, proofCid)
if err != nil {
return fmt.Errorf("getting proof from the blockstore: %w", err)
}
cid, err := ipld.CidFromNamespacedSha256(nmt.Sha256Namespace8FlaggedInner(node.RawData()))

node := block.RawData()
left, right := node[:childHashLen], node[childHashLen:]
cid, err := ipld.CidFromNamespacedSha256(w.hasher.HashNode(left, right))
if err != nil {
return fmt.Errorf("getting cid: %w", err)
}
err = util.LdWrite(w.w, cid.Bytes(), node.RawData())
err = util.LdWrite(w.w, cid.Bytes(), node)
if err != nil {
return fmt.Errorf("writing proof to the car: %w", err)
}
Expand Down