[master] Merge q4-working-branch to master #3780
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changed flag in lookup.cpp to send everything to dsgaurd Replaced isolated-server-accounts.json with single entry for use with the scripts : FundFromPrimaryAccount.ts in the hardhat EvmAcceptanceTests script dir Updated constants.xml open telemetry settings for localdev.py reduced extra time for consensus as described in Zelensky doc. Did basic startup tests Note this is derived from master updated localdev.py to start the appropriate number of nodes localdev.py now defaults to using isolated-server-accounts # it is sufficient to use this to bring up the system once you have edited your hosts to reflect ip address from minikube ip ./scripts/localdev.py up
Changed flag in lookup.cpp to send everything to dsgaurd Replaced isolated-server-accounts.json with single entry for use with the scripts : FundFromPrimaryAccount.ts in the hardhat EvmAcceptanceTests script dir Updated constants.xml open telemetry settings for localdev.py reduced extra time for consensus as described in Zelensky doc. Did basic startup tests Note this is derived from master updated localdev.py to start the appropriate number of nodes localdev.py now defaults to using isolated-server-accounts # it is sufficient to use this to bring up the system once you have edited your hosts to reflect ip address from minikube ip ./scripts/localdev.py up
Co-authored-by: bzawisto <bartosz@zilliqa.com>
* Fixing test * Increasing POW window --------- Co-authored-by: bzawisto <bartosz@zilliqa.com>
* Remove Python3 port and mentions in CMakeLists.txt & vcpkg manifest files. * Update the baseline to tag 2023.07.21. * Use Boost.Process to run download_incr_DB.py with python3. * Switch boost::filesystem -> std::filesystem. * Experimental use of vcpkg binary caching in Dockerfile.
* Fixing test * Increasing POW window * Fixing errorneous test --------- Co-authored-by: bzawisto <bartosz@zilliqa.com>
* Add TODOs to fix * p2pcomm refactor pt.1 * update #2, sending part, relaxed blacklisting policy * update #3, some wiring * fixing one stupid thing * more fixes * redundant log message eliminated * dont assigh empty pubkeys * fix #1 * hotfix about l2 comm * extra logging * fix cv_setRejoinRecovery * fix cv_dsInfoUpdate * fix cv_shardStruct * fix cv_vcDsBlockProcessed * fix cv_vcFinalBlockProcessed * fix cv_dsLeaderTxnPool * fix cv_setStateDeltasFromSeed * fix cv_setCosigRewardsFromSeed * p2p distributed test tool * build fix * extra logging * Fix Dockerfile to add neccassary apt-get update * outgoing connections to multiplier nodes follow the old protocol (w/reconnects) * attempt to fix GetDSLeaderTxPool * libevent gone * some TODOs explained * Just a checkpoint locally * Fixing test * Made modifications to logger to make LOG_MARKER very quiet Changed flag in lookup.cpp to send everything to dsgaurd Replaced isolated-server-accounts.json with single entry for use with the scripts : FundFromPrimaryAccount.ts in the hardhat EvmAcceptanceTests script dir Updated constants.xml open telemetry settings for localdev.py reduced extra time for consensus as described in Zelensky doc. Did basic startup tests Note this is derived from master updated localdev.py to start the appropriate number of nodes localdev.py now defaults to using isolated-server-accounts # it is sufficient to use this to bring up the system once you have edited your hosts to reflect ip address from minikube ip ./scripts/localdev.py up * Made modifications to logger to make LOG_MARKER very quiet Changed flag in lookup.cpp to send everything to dsgaurd Replaced isolated-server-accounts.json with single entry for use with the scripts : FundFromPrimaryAccount.ts in the hardhat EvmAcceptanceTests script dir Updated constants.xml open telemetry settings for localdev.py reduced extra time for consensus as described in Zelensky doc. Did basic startup tests Note this is derived from master updated localdev.py to start the appropriate number of nodes localdev.py now defaults to using isolated-server-accounts # it is sufficient to use this to bring up the system once you have edited your hosts to reflect ip address from minikube ip ./scripts/localdev.py up * Increasing POW window * Upgraded Blacklist to to be keyed by ip/port/node combo. This is only a partial implementation, need to do the same for whitelist and push through rest of arch. This change needs to be done in such a way that preserves existing functionality at the ip level. * Upgraded Blacklist to to be keyed by ip/port/node combo. This is only a partial implementation, need to do the same for whitelist and push through rest of arch. This change needs to be done in such a way that preserves existing functionality at the ip level. * Upgraded Blacklist to to be keyed by ip/port/node combo. This is only a partial implementation, need to do the same for whitelist and push through rest of arch. This change needs to be done in such a way that preserves existing functionality at the ip level. * Upgraded Blacklist to to be keyed by ip/port/node combo. This is only a partial implementation, need to do the same for whitelist and push through rest of arch. This change needs to be done in such a way that preserves existing functionality at the ip level. * Fixing errorneous test * Upgraded Blacklist to to be keyed by ip/port/node combo. This is only a partial implementation, need to do the same for whitelist and push through rest of arch. This change needs to be done in such a way that preserves existing functionality at the ip level. * Reverted newer tests * Reverted newer tests Turned off special handling for multiplier, will remove code on next pass. * Reverted newer tests Turned off special handling for multiplier, will remove code on next pass. * Some in-progress work * Change genesis account * Reverted newer tests Turned off special handling for multiplier, will remove code on next pass. --------- Co-authored-by: Valeriy Zamaraiev <valeriy@zilliqa.com> Co-authored-by: Artem <artgor4github@gmail.com> Co-authored-by: bzawisto <bartosz@zilliqa.com>
* simplified n_parallel jobs * simplified n_parallel jobs
* Fixing test * Increasing POW window * Fixing errorneous test * Some in-progress work * Change genesis account * Doesn't compile but we're getting there * Further progress with desharding * Further work with txns dispatching * Further progress with desharding * Comilation fix --------- Co-authored-by: bzawisto <bartosz@zilliqa.com>
* CHeckpoint of framework for a new multiplier. * CHeckpoint of framework for a new multiplier. Upgraded with script from Yaron, massaged a little for new multiplier. * CHeckpoint of framework for a new multiplier. Upgraded with script from Yaron, massaged a little for new multiplier. * CHeckpoint of framework for a new multiplier. Upgraded with script from Yaron, massaged a little for new multiplier. * A few more hacks to get things up, not perfect but good enough for toady. * Mightly checkpoint * Mightly checkpoint after fixing a couple more bugs * Mightly checkpoint after fixing a couple more bugs * Rewrite original now I understand it, making minimal changes * Rewrite original now I understand it, making minimal changes * Rewrite original now I understand it, making minimal changes * Rewrite original now I understand it, making minimal changes * Rewrite original now I understand it, making minimal changes * Rewrite original now I understand it, making minimal changes * Rewrite original now I understand it, making minimal changes * First version of C++ Multiplier now working with Native version of code. * First version of C++ Multiplier now working with Native version of code. * Rewrite original now I understand it, making minimal changes * First version of C++ Multiplier now working with Native version of code.
* . * First version of C++ Multiplier now working with Native version of code.
* Add parallel tests to q4 branch * Disable parallel on contract deployment tests * Add new changes * Disable parallel on contract deployment tests --------- Co-authored-by: saeed <saeed@pop-os.localdomain>
yaron-zilliqa
requested review from
its-saeed,
bzawisto,
chetan-zilliqa and
Steve-White-UK
github-actions
bot
changed the title
…m/Zilliqa/Zilliqa into merge-q4-working-branch-to-master
yaron-zilliqa
force-pushed
the
merge-q4-working-branch-to-master
branch
from
371d887
to
edde918
Compare
yaron-zilliqa
force-pushed
the
merge-q4-working-branch-to-master
branch
from
40104cb
to
4fb808a
Compare
…nally introduced to overcome limitations of godupliactor in release 8.x (#3786)
* Fixing test * Increasing POW window * Fixing errorneous test * Some in-progress work * Change genesis account * Doesn't compile but we're getting there * Further progress with desharding * Further work with txns dispatching * Further progress with desharding * Comilation fix * Some progress with deshard and consensus fixes * Some more helpful printfs * Removing microblock consensus * Remove microblock consensus (next part) * Remove microblock consensus - next * Remove microblock consensus (next) * Remove microblock consensus part X * Remove microblocks - next part * Remove microblock consensus - further work * Remove mb consensus - further work * Remove mb consensus - further work * Remove dead code * Regenerated cache --------- Co-authored-by: bzawisto <bartosz@zilliqa.com>
yaron-zilliqa
force-pushed
the
merge-q4-working-branch-to-master
branch
5 times, most recently
from
bd4d364
to
f8c1c09
Compare
yaron-zilliqa
force-pushed
the
merge-q4-working-branch-to-master
branch
from
f8c1c09
to
a4bf6d1
Compare
…m/Zilliqa/Zilliqa into merge-q4-working-branch-to-master
yaron-zilliqa
force-pushed
the
merge-q4-working-branch-to-master
branch
2 times, most recently
from
d622040
to
7ce94a1
Compare
yaron-zilliqa
force-pushed
the
merge-q4-working-branch-to-master
branch
from
7ce94a1
to
528d400
Compare
yaron-zilliqa
force-pushed
the
merge-q4-working-branch-to-master
branch
from
e1f65d1
to
4aaa77c
Compare
Steve-White-UK
approved these changes
Sep 25, 2023
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Backward Compatibility
Review Suggestion
Status
Implementation
Integration Test (Core Team)