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

[PH] Ph merge main #611

Merged
merged 108 commits into from
Jan 3, 2023
Merged

[PH] Ph merge main #611

merged 108 commits into from
Jan 3, 2023

Conversation

ClaytonCalabrese
Copy link
Contributor

Merges main into PH phase 2 branch

huangminghuang and others added 30 commits October 28, 2022 12:50
@huangminghuang
update to use bn256
74e80f8
@huangminghuang
update bn256
f3e5344
@huangminghuang
Fix alt_bn128_pair
d62951a
@huangminghuang
replace benchmark alt_bn128
e3b10cb
@huangminghuang
fix alt_bn128_add
19cf07a
@huangminghuang
remove ff submodule
64c953d
@huangminghuang
Merge branch 'main' into huangminghuang/bn256
9772bed 
# Conflicts:
#	libraries/libfc/libraries/ff
@huangminghuang
fix find gmp
b24a270
@huangminghuang
fix gcc8 compile problem
02a065b
@huangminghuang
address PR comments
f1142ff
@vladtr
Use cli11 as submodule
e872980
@mikelik
Fix undefined behavior - uninitialized variables revealed by valgrind
ce57001
@mikelik
Code review fix.
253aae4
@mikelik
Revert "Code review fix."
a629507 
This reverts commit bd3a600.
@mikelik
Code review fixes.
48fb28e 
Revert changes in Operators.h as apparently some unit tests were failing.
@huangminghuang
update bn256 and tester dependency
2e09a53
@huangminghuang
Merge branch 'main' into huangminghuang/bn256
9af2daf
@huangminghuang
fix bn256 installation
098e535
@ericpassmore
fixes producer plugin docs
1bd84d8
@ericpassmore
fixed component paths on openapi docs
266175a
@ericpassmore
added 4xx return codes as required by redocly linter
16c8021
@ClaytonCalabrese
enable compatibility for 2_0 and 2_1 nodeos on performance tests.
53a6902
@ClaytonCalabrese
remove unused and unneeded cl option for old nodeos
a6ad4d7
@ClaytonCalabrese
rename oldNodeos to isNodeosv2 to improve clarity
8f5095b
@ericpassmore
paused returns boolean, pause does not
b0ea27b
@ericpassmore
updated version tag
76a341e
@ClaytonCalabrese
address pr comments to make old nodeos code more efficient
c4726da
@greg7mdp
use state_dir() which can now be configured
fd93d2d
@greg7mdp
Revert "update submodule appbase"
952f1ef 
This reverts commit 4f262f3.
@greg7mdp
Move state-dir config from appbase to chain_plugin
4167a56
heifner and others added 18 commits December 22, 2022 12:04
@heifner
Merge pull request #575 from AntelopeIO/misc-python-test
27515b7 
Small Misc python test improvements
@heifner
Merge pull request #594 from AntelopeIO/multi-prod-perf
ec1089b 
Fix for mulit-producer run of performance test
@heifner
Merge pull request #581 from AntelopeIO/GH-330-tx-cpu-errors
edbded1 
Include additional info in tx_cpu_usage_exceeded exceptions
@ericpassmore
Merge pull request #589 from AntelopeIO/ehp/GH-547-producer-api-doc-c…
1b8eade 
…leanup

Fixes Producer Plugin Schema Fixes and Better Alignment with OpenAPI spec
@mikelik
Merge pull request #495 from AntelopeIO/mikelik/valgrind_fix
539502a 
Fix undefined behavior - uninitialized variables revealed by valgrind
@lparisc
Merge pull request #583 from AntelopeIO/fix-devrel#60b
6c90128 
[3.1] Update nodeos options help usage [docs]
@lparisc
Merge remote-tracking branch 'origin/release/3.1' into fix-devrel#60-3.2
dc398b5
@lparisc
Merge pull request #595 from AntelopeIO/fix-devrel#60-3.2
2f01e9e 
[3.1 -> 3.2] Update nodeos options help usage [docs]
@lparisc
Merge remote-tracking branch 'origin/release/3.2' into fix-devrel#60-…
22ff6df 
…main
@lparisc
update chain plugin options (main) :doc
3a9f157
@lparisc
update http plugin options (main) :doc
445c439
@lparisc
update producer plugin options (main) :doc
b1a08f0
@lparisc
update state history plugin options (main) :doc
933b5d7
@lparisc
update txn_test_gen plugin options :doc
33adf25
@lparisc
Merge pull request #597 from AntelopeIO/fix-devrel#60-main
7c534bf 
[3.2 -> main] Update nodeos options help usage [docs]
@heifner
GH-570 cleos v2 does not have --time-limit option
1b04b4f
@ClaytonCalabrese
merge from main
099bbe4
@ClaytonCalabrese
resolve failures for 2.0 following merge.
dc1575b
@ClaytonCalabrese ClaytonCalabrese self-assigned this Jan 2, 2023
@ClaytonCalabrese ClaytonCalabrese merged commit 3fd598b into feature_performance_harness_stage_2 Jan 3, 2023
@ClaytonCalabrese ClaytonCalabrese deleted the ph_merge_main_phase2_1_2 branch January 3, 2023 21:25
@oschwaldp-oci oschwaldp-oci mentioned this pull request Feb 21, 2023
Merged
@oschwaldp-oci oschwaldp-oci added the OCI Work exclusive to OCI team label Apr 14, 2023
@greg7mdp greg7mdp mentioned this pull request Jun 19, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oschwaldp-oci oschwaldp-oci oschwaldp-oci approved these changes

@heifner heifner Awaiting requested review from heifner

Assignees

@ClaytonCalabrese ClaytonCalabrese

Labels
OCI Work exclusive to OCI team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@ClaytonCalabrese @oschwaldp-oci @linh2931 @huangminghuang @vladtr @ericpassmore @greg7mdp @heifner @lparisc @mikelik