Skip to content

Commit

Permalink
chore!: bump celestia-app to v0.10.0-rc1 (#1338)
Browse files Browse the repository at this point in the history
Co-authored-by: Vlad <vlad@celestia.org>
Co-authored-by: Wondertan <hlibwondertan@gmail.com>
  • Loading branch information
3 people committed Nov 15, 2022
1 parent 290cc65 commit 566daa0
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 28 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
cosmossdk.io/math v1.0.0-beta.3
github.com/99designs/keyring v1.2.1 // indirect
github.com/BurntSushi/toml v1.2.0
github.com/celestiaorg/celestia-app v0.9.0
github.com/celestiaorg/celestia-app v0.10.0-rc1
github.com/celestiaorg/go-libp2p-messenger v0.1.0
github.com/celestiaorg/nmt v0.11.0
github.com/celestiaorg/rsmt2d v0.7.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,8 @@ github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7
github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34=
github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
github.com/celestiaorg/celestia-app v0.9.0 h1:c5Vlx9ajCn2qne2NpAojblicFRGq4gnXKLGDoJMXOPA=
github.com/celestiaorg/celestia-app v0.9.0/go.mod h1:6k/zcNDEgOyJRGnAgWw1VsrwTKcVjOyYG5LPTHcZR+w=
github.com/celestiaorg/celestia-app v0.10.0-rc1 h1:Uj7wapqGCTBJ49Ub6luoUGwVtFxbEs0n5eDpGD1j/S0=
github.com/celestiaorg/celestia-app v0.10.0-rc1/go.mod h1:6k/zcNDEgOyJRGnAgWw1VsrwTKcVjOyYG5LPTHcZR+w=
github.com/celestiaorg/celestia-core v1.5.0-tm-v0.34.20 h1:BqlcOQqL2UqdDTcdCtrOLXDlmwxIA8DiKiY79oahxkQ=
github.com/celestiaorg/celestia-core v1.5.0-tm-v0.34.20/go.mod h1:f4R8qNJrP1CDH0SNwj4jA3NymBLQM4lNdx6Ijmfllbw=
github.com/celestiaorg/cosmos-sdk v1.4.0-sdk-v0.46.0 h1:65gnQ92mfz+9XNVTHeVwMp+SZuBqmToEnz8+WdDRmQ8=
Expand Down
11 changes: 6 additions & 5 deletions share/eds/byzantine/bad_encoding.go
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,8 @@ func (p *BadEncodingProof) Validate(header *header.ExtendedHeader) error {
root = merkleColRoots[p.Index]
}

shares := make([][]byte, len(merkleRowRoots))

// verify that Merkle proofs correspond to particular shares.
shares := make([][]byte, len(merkleRowRoots))
for index, share := range p.Shares {
if share == nil {
continue
Expand All @@ -147,19 +146,21 @@ func (p *BadEncodingProof) Validate(header *header.ExtendedHeader) error {
shares[index] = share.Share[ipld.NamespaceSize:]
}

odsWidth := uint64(len(merkleRowRoots) / 2)
codec := appconsts.DefaultCodec()

// rebuild a row or col.
rebuiltShares, err := codec.Decode(shares)
if err != nil {
return err
}
rebuiltExtendedShares, err := codec.Encode(rebuiltShares[0 : len(shares)/2])
rebuiltExtendedShares, err := codec.Encode(rebuiltShares[0:odsWidth])
if err != nil {
return err
}
rebuiltShares = append(rebuiltShares, rebuiltExtendedShares...)
copy(rebuiltShares[odsWidth:], rebuiltExtendedShares)

tree := wrapper.NewErasuredNamespacedMerkleTree(uint64(len(shares)/2), uint(p.Index))
tree := wrapper.NewErasuredNamespacedMerkleTree(odsWidth, uint(p.Index))
for _, share := range rebuiltShares {
tree.Push(share)
}
Expand Down
32 changes: 16 additions & 16 deletions share/eds/testdata/example-root.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{
"row_roots": [
"IZBw0fNjDzw8rVzYOmsmzL8gIn4iUU1SGf9UheuvEWQYHd/SaarVD7SysSeeQ2R5",
"anU++0fzoDSJpADRWwUyTvYwZoJDLX0Lj1eeQ01vaSBCfKuRNNa/hfeMNJ7Oj+Z4",
"i4P8AN2Ze9vlGn5t8YJPxupnI+5/qgTFnuH029QqSg8oUrku7OJkmPRB6WK0yQ5g",
"6tR+3zc/C9T/WerT48XBj3FpEbOf0UTqjFVUMNmLkGGz2KNw99IVc6SCIyTPfKPD",
"/////////////////////0FmCIqkffiCKDgIwJoPfmrz40xqMzfHhDGeB+yGuDSc",
"/////////////////////1+BZ04UftGUSBZU96AuDIZrrI96rXiRppcLNT1177Ab",
"/////////////////////+v0FFPDkWPoUKpCiI+nbautXgZNGYOKpXWdRRCYdtkO",
"/////////////////////4EHD3dEkvimWgxs7dqy7fZBc5FRiqG0fyT+Jy1XTIM5"
"A3I8MUKAXaEf7JDjUxllL5CGD0/uS8k2l3KpbN+u5fa3tGL1h9FSqZhCJFcZhzAT",
"IA74YwcC1tFMkQfD9sE2NO7hwDtjo37O1KiiptYPCgAQWQnv/G7bxu6mUJ2s3Ljk",
"ZskuRtu6YfK9pTqLAOsfLXbvjrvDD+80xoj/850Z4YGvmAaRH5vFXraZNWgEQNyr",
"w9Tz/Q7t/JfX7McKTWvNjhqi784y+nGCYXrQtu4jy90kx0irPJcVTXTQ7v6Xnjdf",
"/////////////////////1MCHZjf0ySoNlpt+h8Vb6QFm7BHYJXI14SMiNRgwA0K",
"/////////////////////2dOgrZG2ZT+KIrfjoPmTcGpqXdsdFZE6ZHcF0l+fL6i",
"/////////////////////7OJEeOYA6VsagglTnpIysAtyK3m3u4d8Zd66FuqX0+M",
"/////////////////////+hYZyJ10gx7Brp05g/MLtSV4z7SLLwGcMsXZI/Fgw0J"
],
"column_roots": [
"IZBw0fNjDzzq1H7fNz8L1P9OTm5AI5Kr3tnL39TH7nEr+bJzDbprD9S2tHOf/bij",
"Lyod2pBlyrb3P4+cgtvBzqVhQJScQ1mk0hc5LvcZ8GEsGb7OF/rU3wqO+MZZfUGF",
"Mi47oqOs+zD9/Te8h3jnjCRLC5bTfVfoCkpFNpx//xRpRb+tzbIckhjHHa1XpD21",
"PK1c2DprJsz/WerT48XBj3fCvURegK/zpJY3i7rXm0C6QyL/8tat3/XH2MwrzDTL",
"/////////////////////yobAPxEVP+c1M5rGpjtYmajcC4MWSFizs9s42xpYsnw",
"/////////////////////7Amq619RgUhO6MmHywcubh5wGk6+5rDwn82IzyeqBoH",
"/////////////////////xtzAjExf9hu56xbwREDQQvJ0t3kzPvZNJmchRWWu9Ib",
"/////////////////////91tDCFn/64TQorwMFtFfyjA51UM+aH9xJmA3XRqIls+"
"A3I8MUKAXaHD1PP9Du38l5n9/iXzaDzWlVrLnsRE5zp+rEeyH2A0is+czwU/aHUn",
"D7uVznpBCw/S2nVDrzgGx9Ditcfzy/cL2Zdn+MBV31zeOgzCv+zXA0QP3SQRWXlb",
"FQDYNIesVPTUn9q9Ybq0VqDgprQbzKsMGrX+7kTlnbdOu434iOmx4P+vZVGjXAsm",
"H+yQ41MZZS/X7McKTWvNjoZId6AiHkxnGRsmYKuh4EvQCy+eEj19Q6Z5eQoMGWZL",
"/////////////////////1wS3guBpJRGNMLQMkEwgVOuXrTG3gUwJwI+nybYxTRF",
"/////////////////////1Eg48mqxsQejtwUIJkwrjEYCPvDYCRYm+dPXVitBCjl",
"/////////////////////zDz519rhl2FfQp6S3hR887dRSi6zN+Qs4PwIFdRqbxP",
"/////////////////////zARSBQBFxvGNpLt8I1qtbBOyEfFOXD4V/beDdU1kXPm"
]
}
Binary file modified share/eds/testdata/example.car
Binary file not shown.
6 changes: 2 additions & 4 deletions share/ipld/nmt_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@ func TestNamespaceFromCID(t *testing.T) {
var tests = []struct {
randData [][]byte
}{
{randData: generateRandNamespacedRawData(4, appconsts.NamespaceSize, appconsts.ShareSize)},
{randData: generateRandNamespacedRawData(16, 16, appconsts.ShareSize)},
{randData: generateRandNamespacedRawData(4, 4, appconsts.ShareSize)},
{randData: generateRandNamespacedRawData(4, appconsts.NamespaceSize, appconsts.ShareSize/2)},
{randData: generateRandNamespacedRawData(4, appconsts.NamespaceSize, appconsts.ShareSize-appconsts.NamespaceSize)},
{randData: generateRandNamespacedRawData(16, appconsts.NamespaceSize, appconsts.ShareSize-appconsts.NamespaceSize)},
}

for i, tt := range tests {
Expand Down

0 comments on commit 566daa0

Please sign in to comment.