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

Fix liquid block replacing with better one #3864

Merged
merged 9 commits into from
Aug 29, 2023
Merged

Fix liquid block replacing with better one #3864

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e609e64
Fix liquid block replacing with better one
Aug 7, 2023
d0c37b2
Fix
ivan-mashonskiy Aug 7, 2023
67f7139
Fix
ivan-mashonskiy Aug 7, 2023
29b0fd7
Add block stats event for liquid block replace
Aug 8, 2023
2fd807a
Fix block processing result
Aug 10, 2023
d219849
Add test
Aug 10, 2023
654e5ec
Silently ignore duplicate incoming block
Aug 23, 2023
dc4b3d5
Delete test
Aug 23, 2023
0f0235b
Merge branch 'version-1.4.x' into gen-sig-fix
phearnot Aug 29, 2023
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
78 changes: 42 additions & 36 deletions node/src/main/scala/com/wavesplatform/consensus/PoSSelector.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,16 @@ case class PoSSelector(blockchain: Blockchain, maxBaseTarget: Option[Long]) exte
): Either[ValidationError, NxtLikeConsensusBlockData] = {
val bt = posCalculator(height).calculateBaseTarget(targetBlockDelay.toSeconds, height, refBlockBT, refBlockTS, greatGrandParentTS, currentTime)

checkBaseTargetLimit(bt, height).flatMap(
_ =>
if (vrfActivated(height + 1))
getHitSource(height)
.map(hs => NxtLikeConsensusBlockData(bt, crypto.signVRF(account.privateKey, hs.arr)))
else
blockchain
.blockHeader(height)
.map(_.header.generationSignature)
.map(gs => NxtLikeConsensusBlockData(bt, ByteStr(generationSignature(gs, account.publicKey))))
.toRight(GenericError("No blocks in blockchain"))
checkBaseTargetLimit(bt, height).flatMap(_ =>
if (vrfActivated(height + 1))
getHitSource(height)
.map(hs => NxtLikeConsensusBlockData(bt, crypto.signVRF(account.privateKey, hs.arr)))
else
blockchain
.blockHeader(height)
.map(_.header.generationSignature)
.map(gs => NxtLikeConsensusBlockData(bt, ByteStr(generationSignature(gs, account.publicKey))))
.toRight(GenericError("No blocks in blockchain"))
)
}

Expand All @@ -60,11 +59,14 @@ case class PoSSelector(blockchain: Blockchain, maxBaseTarget: Option[Long]) exte
def validateBlockDelay(parentHeight: Int, header: BlockHeader, parent: BlockHeader, effectiveBalance: Long): Either[ValidationError, Unit] = {
for {
parentHitSource <- getHitSource(parentHeight)
gs <- if (vrfActivated(parentHeight + 1)) {
crypto.verifyVRF(header.generationSignature, parentHitSource.arr, header.generator, blockchain.isFeatureActivated(BlockchainFeatures.RideV6)).map(_.arr)
} else {
generationSignature(parentHitSource, header.generator).asRight[ValidationError]
}
gs <-
if (vrfActivated(parentHeight + 1)) {
crypto
.verifyVRF(header.generationSignature, parentHitSource.arr, header.generator, blockchain.isFeatureActivated(BlockchainFeatures.RideV6, parentHeight))
.map(_.arr)
} else {
generationSignature(parentHitSource, header.generator).asRight[ValidationError]
}
ts = posCalculator(parentHeight).calculateDelay(hit(gs), parent.baseTarget, effectiveBalance) + parent.timestamp
_ <- Either.cond(
ts <= header.timestamp,
Expand All @@ -76,20 +78,23 @@ case class PoSSelector(blockchain: Blockchain, maxBaseTarget: Option[Long]) exte

def validateGenerationSignature(block: Block): Either[ValidationError, ByteStr] = {
val blockGenSig = block.header.generationSignature
val height = blockchain.height

if (vrfActivated(height + 1)) {
getHitSource(height).flatMap(hs => crypto.verifyVRF(blockGenSig, hs.arr, block.header.generator, blockchain.isFeatureActivated(BlockchainFeatures.RideV6)))
} else {
blockchain.lastBlockHeader
.toRight(GenericError("No blocks in blockchain"))
.map(b => generationSignature(b.header.generationSignature, block.header.generator))
.ensureOr { expectedGenSig =>
GenericError(s"Generation signatures does not match: Expected = ${Base58.encode(expectedGenSig)}; Found = $blockGenSig")
} { expectedGenSig =>
blockGenSig.arr sameElements expectedGenSig
}
.map(_ => block.header.generationSignature)

blockchain.heightOf(block.header.reference).toRight(GenericError(s"Block reference ${block.header.reference} doesn't exist")).flatMap { height =>
if (vrfActivated(height + 1)) {
getHitSource(height)
.flatMap(hs => crypto.verifyVRF(blockGenSig, hs.arr, block.header.generator, blockchain.isFeatureActivated(BlockchainFeatures.RideV6, height)))
} else {
blockchain
.blockHeader(height)
.toRight(GenericError("No blocks in blockchain"))
.map(b => generationSignature(b.header.generationSignature, block.header.generator))
.ensureOr { expectedGenSig =>
GenericError(s"Generation signatures does not match: Expected = ${Base58.encode(expectedGenSig)}; Found = $blockGenSig")
} { expectedGenSig =>
blockGenSig.arr sameElements expectedGenSig
}
.map(_ => block.header.generationSignature)
}
}
}

Expand Down Expand Up @@ -145,12 +150,13 @@ case class PoSSelector(blockchain: Blockchain, maxBaseTarget: Option[Long]) exte
private def getHit(height: Int, account: KeyPair): Either[ValidationError, BigInt] =
for {
hitSource <- getHitSource(height)
gs <- if (vrfActivated(height + 1)) {
val vrfProof = crypto.signVRF(account.privateKey, hitSource.arr)
crypto.verifyVRF(vrfProof, hitSource.arr, account.publicKey, blockchain.isFeatureActivated(BlockchainFeatures.RideV6)).map(_.arr)
} else {
generationSignature(hitSource, account.publicKey).asRight[ValidationError]
}
gs <-
if (vrfActivated(height + 1)) {
val vrfProof = crypto.signVRF(account.privateKey, hitSource.arr)
crypto.verifyVRF(vrfProof, hitSource.arr, account.publicKey, blockchain.isFeatureActivated(BlockchainFeatures.RideV6, height)).map(_.arr)
} else {
generationSignature(hitSource, account.publicKey).asRight[ValidationError]
}
} yield hit(gs)

private def fairPosActivated(height: Int): Boolean = blockchain.activatedFeaturesAt(height).contains(BlockchainFeatures.FairPoS.id)
Expand Down
7 changes: 5 additions & 2 deletions node/src/main/scala/com/wavesplatform/state/appender/BlockAppender.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,15 @@ object BlockAppender extends ScorexLogging {
verify: Boolean = true
)(newBlock: Block): Task[Either[ValidationError, Option[BigInt]]] =
Task {
if (blockchainUpdater.isLastBlockId(newBlock.header.reference))
if (
blockchainUpdater
.isLastBlockId(newBlock.header.reference) || blockchainUpdater.lastBlockHeader.exists(_.header.reference == newBlock.header.reference)
)
appendKeyBlock(blockchainUpdater, utxStorage, pos, time, verify)(newBlock).map(_ => Some(blockchainUpdater.score))
else if (blockchainUpdater.contains(newBlock.id()) || blockchainUpdater.isLastBlockId(newBlock.id()))
Right(None)
else
Left(BlockAppendError("Block is not a child of the last block", newBlock))
Left(BlockAppendError("Block is not a child of the last block or its parent", newBlock))
}.executeOn(scheduler)

def apply(
Expand Down
Loading