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

Bug/is 700 update consensus da signature verifiaction after rotation #1434

Merged
merged 14 commits into from
Feb 23, 2023
Merged

Bug/is 700 update consensus da signature verifiaction after rotation #1434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
14cd654
update consensus
olehnikolaiev Feb 17, 2023
f7a3b9d
update consensus
olehnikolaiev Feb 19, 2023
071e920
update consensus
olehnikolaiev Feb 19, 2023
7869e3e
update consensus
olehnikolaiev Feb 19, 2023
ee1caae
update consensus
olehnikolaiev Feb 20, 2023
265cc63
update consensus
olehnikolaiev Feb 20, 2023
f7238af
update consensus
olehnikolaiev Feb 22, 2023
2cd4afb
update consensus
olehnikolaiev Feb 22, 2023
e861ce5
sort nodes in historic node groups by schain index
olehnikolaiev Feb 22, 2023
3b17b74
fix config parsing for node groups
olehnikolaiev Feb 22, 2023
d8e8dd2
fix historic ecdsa keys format
olehnikolaiev Feb 22, 2023
4a4780f
update consensus
olehnikolaiev Feb 22, 2023
4c02f22
update consensus to beta
olehnikolaiev Feb 23, 2023
4426af3
Merge branch 'develop' into bug/IS-700-update-consensus-verifiaction-…
olehnikolaiev Feb 23, 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
2 changes: 1 addition & 1 deletion libconsensus
Open in desktop
Submodule libconsensus updated 14 files
+1 −1 blockfinalize/client/BlockFinalizeDownloader.cpp
+4 −5 blockproposal/pusher/BlockProposalClientAgent.cpp
+1 −1 blockproposal/server/BlockProposalServerAgent.cpp
+1 −1 chains/Schain.cpp
+5 −4 crypto/ConsensusEdDSASigShare.cpp
+3 −2 crypto/ConsensusEdDSASigShare.h
+3 −3 crypto/ConsensusEdDSASigShareSet.cpp
+2 −1 crypto/ConsensusEdDSASigShareSet.h
+5 −5 crypto/ConsensusEdDSASignature.cpp
+3 −1 crypto/ConsensusEdDSASignature.h
+77 −20 crypto/CryptoManager.cpp
+7 −5 crypto/CryptoManager.h
+2 −2 datastructures/CommittedBlock.cpp
+3 −3 db/DASigShareDB.cpp
8 changes: 6 additions & 2 deletions libethereum/ChainParams.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,11 +270,15 @@ ChainParams ChainParams::loadConfig(
auto groupNodesObj = nodeGroupObj["nodes"].get_obj();
for ( const auto& groupNodeConf : groupNodesObj ) {
auto groupNodeConfObj = groupNodeConf.second.get_array();
u256 id = groupNodeConfObj[0].get_uint64();
u256 sChainIndex = groupNodeConfObj[1].get_uint64();
u256 sChainIndex = groupNodeConfObj[0].get_uint64();
u256 id = groupNodeConfObj[1].get_uint64();
std::string publicKey = groupNodeConfObj[2].get_str();
groupNodes.push_back( { id, sChainIndex, publicKey } );
}
std::sort( groupNodes.begin(), groupNodes.end(),
[]( const GroupNode& lhs, const GroupNode& rhs ) {
return lhs.schainIndex < rhs.schainIndex;
} );
nodeGroup.nodes = groupNodes;

std::array< std::string, 4 > nodeGroupBlsPublicKey;
Expand Down
2 changes: 1 addition & 1 deletion libethereum/SkaleHost.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ void DefaultConsensusFactory::fillRotationHistory( ConsensusEngine& consensus )
std::vector< uint64_t > nodes;
// add ecdsa keys info and historic groups info
for ( const auto& node : nodeGroup.nodes ) {
historicECDSAKeys[u256toUint64( node.id )] = node.publicKey;
historicECDSAKeys[u256toUint64( node.id )] = node.publicKey.substr( 2 );
nodes.push_back( u256toUint64( node.id ) );
}
historicNodeGroups[nodeGroup.finishTs] = nodes;
Expand Down