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

check the block index #2306

Merged
merged 2 commits into from Mar 28, 2022
Merged

check the block index #2306

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
825bdeb
check the block index
cyjseagull Mar 28, 2022
b50ce34
Merge branch 'release-3.0.0-rc3' into release-3.0.0-rc3
cyjseagull Mar 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 19 additions & 0 deletions bcos-pbft/bcos-pbft/pbft/engine/Validator.cpp
View file
Open in desktop
Expand Up @@ -24,6 +24,25 @@ using namespace bcos::consensus;
using namespace bcos::crypto;
using namespace bcos::protocol;

void TxsValidator::verifyProposal(bcos::crypto::PublicPtr _fromNode,
PBFTProposalInterface::Ptr _proposal,
std::function<void(Error::Ptr, bool)> _verifyFinishedHandler)
{
// TODO: check the sealerList here
auto block = m_blockFactory->createBlock(_proposal->data());
auto blockHeader = block->blockHeader();
if (blockHeader->number() != _proposal->index())
{
if (_verifyFinishedHandler)
{
auto error = std::make_shared<Error>(-1, "Invalid proposal");
_verifyFinishedHandler(error, false);
}
return;
}
m_txPool->asyncVerifyBlock(_fromNode, _proposal->data(), _verifyFinishedHandler);
}

void TxsValidator::asyncResetTxsFlag(bytesConstRef _data, bool _flag)
{
auto block = m_blockFactory->createBlock(_data);
Expand Down
5 changes: 1 addition & 4 deletions bcos-pbft/bcos-pbft/pbft/engine/Validator.h
View file
Open in desktop
Expand Up @@ -91,10 +91,7 @@ class TxsValidator : public ValidatorInterface, public std::enable_shared_from_t
});
}
void verifyProposal(bcos::crypto::PublicPtr _fromNode, PBFTProposalInterface::Ptr _proposal,
std::function<void(Error::Ptr, bool)> _verifyFinishedHandler) override
{
m_txPool->asyncVerifyBlock(_fromNode, _proposal->data(), _verifyFinishedHandler);
}
std::function<void(Error::Ptr, bool)> _verifyFinishedHandler) override;

void asyncResetTxsFlag(bytesConstRef _data, bool _flag) override;
ssize_t resettingProposalSize() const override
Expand Down