Skip to content

Checking keys during internal nodes deserialization #91

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

Merged
merged 2 commits into from
Nov 17, 2021
Merged

Checking keys during internal nodes deserialization #91

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7526c22
keys checking
kushti Nov 13, 2021
b70a098
keys comparison fixed
kushti Nov 15, 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
7 changes: 7 additions & 0 deletions ...ain/scala/scorex/crypto/authds/avltree/batch/serialization/BatchAVLProverSerializer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import com.google.common.primitives.{Bytes, Ints}
import scorex.crypto.authds.avltree.batch.{BatchAVLProver, InternalProverNode, ProverLeaf, ProverNodes}
import scorex.crypto.authds.{ADKey, ADValue, Balance}
import scorex.crypto.hash.{CryptographicHash, Digest}
import scorex.util.encode.Base16
import scorex.utils.ByteArray

import scala.util.Try

Expand Down Expand Up @@ -128,6 +130,11 @@ class BatchAVLProverSerializer[D <: Digest, HF <: CryptographicHash[D]](implicit
val rightBytes = bytes.slice(keyLength + 6 + leftLength, bytes.length)
val left = loop(leftBytes)
val right = loop(rightBytes)

// check that left.key < key <= right.key
val leftComparison = ByteArray.compare(left.key, key)
val rightComparison = ByteArray.compare(key, right.key)
require(leftComparison < 0 && rightComparison <= 0, s"key check fail for key ${Base16.encode(key)}")
new InternalProverNode[D](key, left, right, balance)
case 2 =>
val balance = Balance @@ bytes.slice(1, 2).head
Expand Down