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

add cell index to the Push method of Tree #20

Merged
merged 6 commits into from
Mar 27, 2021
Merged

add cell index to the Push method of Tree #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8213a4a
add cell index to the Push method of Tree
evan-forbes Mar 26, 2021
a666394
small doc change
evan-forbes Mar 26, 2021
3b5ae81
add docs
evan-forbes Mar 26, 2021
640c368
remove axis as it's not needed
evan-forbes Mar 26, 2021
ca5dd8e
add prefix to indicate arg is unused
evan-forbes Mar 27, 2021
1f35c00
change name of CellIndex to SquareIndex to avoid using the same name
evan-forbes Mar 27, 2021
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
12 changes: 6 additions & 6 deletions datasquare.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@ func (ds *dataSquare) RowRoot(x uint) []byte {
}

tree := ds.createTreeFn()
for _, d := range ds.Row(x) {
tree.Push(d)
for i, d := range ds.Row(x) {
tree.Push(d, SquareIndex{Cell: uint(i), Axis: x})
}

return tree.Root()
Expand All @@ -190,8 +190,8 @@ func (ds *dataSquare) ColRoot(y uint) []byte {
}

tree := ds.createTreeFn()
for _, d := range ds.Column(y) {
tree.Push(d)
for i, d := range ds.Column(y) {
tree.Push(d, SquareIndex{Axis: y, Cell: uint(i)})
}

return tree.Root()
Expand All @@ -202,7 +202,7 @@ func (ds *dataSquare) computeRowProof(x uint, y uint) ([]byte, [][]byte, uint, u
data := ds.Row(x)

for i := uint(0); i < ds.width; i++ {
tree.Push(data[i])
tree.Push(data[i], SquareIndex{Axis: y, Cell: uint(i)})
}

merkleRoot, proof, proofIndex, numLeaves := tree.Prove(int(y))
Expand All @@ -214,7 +214,7 @@ func (ds *dataSquare) computeColumnProof(x uint, y uint) ([]byte, [][]byte, uint
data := ds.Column(y)

for i := uint(0); i < ds.width; i++ {
tree.Push(data[i])
tree.Push(data[i], SquareIndex{Axis: y, Cell: uint(i)})
}
// TODO(ismail): check for overflow when casting from uint -> int
merkleRoot, proof, proofIndex, numLeaves := tree.Prove(int(x))
Expand Down
12 changes: 10 additions & 2 deletions tree.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,15 @@ import (
// TreeConstructorFn creates a fresh Tree instance to be used as the Merkle inside of rsmt2d.
type TreeConstructorFn = func() Tree

// SquareIndex contains all information needed to identify the cell that is being
// pushed
type SquareIndex struct {
Axis, Cell uint
}

// Tree wraps merkle tree implementations to work with rsmt2d
type Tree interface {
Push(data []byte)
Push(data []byte, idx SquareIndex)
// TODO(ismail): is this general enough?
Prove(idx int) (merkleRoot []byte, proofSet [][]byte, proofIndex uint64, numLeaves uint64)
Root() []byte
Expand All @@ -32,7 +39,8 @@ func NewDefaultTree() Tree {
}
}

func (d *DefaultTree) Push(data []byte) {
func (d *DefaultTree) Push(data []byte, _idx SquareIndex) {
// ignore the idx, as this implementation doesn't need that info
d.leaves = append(d.leaves, data)
}

Expand Down