Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Merge prune-cfd-stage-1 branch #9061

Merged
merged 158 commits into from
May 8, 2020
Merged

Merge prune-cfd-stage-1 branch #9061

merged 158 commits into from
May 8, 2020

Conversation

huangminghuang
Copy link
Contributor

Change Description

Merge develop branch.

Consensus Changes

  • Consensus Changes

API Changes

  • API Changes

Documentation Additions

  • Documentation Additions

huangminghuang and others added 30 commits March 27, 2020 14:59
@huangminghuang
Added block log v4
2401a98
@heifner
Rename of pruned_transaction, pruned_block to packed_transaction, sig…
a2ac67c 
…ned_block. packed_transaction, signed_block renamed to packed_transaction_v0 and signed_block_v0. Moved codebase to using new types. abi_serializer not done yet.
@heifner
Merge remote-tracking branch 'origin/develop' into move-to-pruned-blo…
4c5283d 
…ck-dev
@heifner
Removed get_raw_transaction as not used
a6f3a6e
@heifner
Add packed_transaction & packed_transaction_v0 support to abi_serializer
0f6fdb6
@heifner
Add new signed_block as signed_block_v0 support to abi_serializer
c0934af
@huangminghuang
Changes for review comments and adding prune_transaction()
c418e11
@heifner
Fix serialization of transaction_receipt_v0 and signed_block to signe…
855d83b 
…d_block_v0 format
@heifner
Support receiving old/new packed_transaction & signed_block
eba4d9b
@huangminghuang
Some more changes on PR comments
739692f
@heifner
Remove unneeded calls to block id()
9a429fd
@heifner
Add protocol version pruned_types
f0247c2
@heifner
Remove head_id()
5433998
@heifner
Rename block id() to calculate_id() to make it obvious it is not retu…
b75d09c 
…rning a cached value
@huangminghuang
refactor repair_log with mmap()
01e3b22
@huangminghuang
Use boost mapped_file_source
2a125a5
@heifner
Update comments
eeb89fa
@heifner
Add estimated size to packed_transaction to more closely track size o…
43eba6b 
…f transaction
@heifner
Use packed_transaction_v0::compression_type where appropriate
f83d51a
@heifner
Updated comments. Going to work new net_version in diff PR.
c1a61c4
@heifner
Added support for add of signed_block. Removed support for extract of…
eef41b4 
… signed_block & packed_transaction.
@huangminghuang
Add test for trim_blocklog_end
1e7705d
@heifner
Prevent implicit copy of transaction/signed_transaction. fix some unn…
50dc7e0 
…eeded copies.
@heifner
Made copy constructor explicit
ebf6e3f
@heifner
Get block id appropriately
d5d4dba
@huangminghuang
refactor test cases and add prune_transaction test
718e222
@heifner
Revert "Support receiving old/new packed_transaction & signed_block"
62d61d3 
This reverts commit eba4d9b.
@heifner
Revert make_unique, going to work on that some other time.
8e35ae5
@heifner
Make signed_block_v0_ptr shared_prt to const
175bae2
@heifner
Remove extract for packed_transaction
2acbf7c
huangminghuang and others added 19 commits April 29, 2020 13:15
@huangminghuang
some more changes
1256d08
@huangminghuang
Merge pull request #9022 from EOSIO/prune-cfd-comments-changes
80806ef 
Minor changes from review comments
@huangminghuang
add missing test
6f1821a
@huangminghuang
label light_validation_sync_test & eosio_blocklog_prune_test as nonpa…
0efbfd3 
…rallelizable_tests
@huangminghuang
try to run light_validation_sync_test & eosio_blocklog_prune_test as …
efd8030 
…long_running_tests
@huangminghuang
Revert "try to run light_validation_sync_test & eosio_blocklog_prune_…
bc34e5e 
…test as long_running_tests"

This reverts commit efd8030.
@huangminghuang
restart node before check prune result
08330f8
@heifner
Use optional instead of unique_ptr since we never have to convert to …
85668c6 
…shared_ptr
@heifner
Use static_variant tag value instead of just hardcoding the value.
3e2327a
@heifner
Merge pull request #8977 from EOSIO/net-plugin-cfd
da26d13 
Net plugin - new signed_block/packed_transaction support
@huangminghuang
remove unneeded comment
e067c04
@huangminghuang
Merge pull request #9023 from EOSIO/prune-cfd-add-missing-test
b81da34 
add missing test
@huangminghuang
Merge branch 'develop' into prune-cfd-stage-1
991d087 
# Conflicts:
#	libraries/chain/apply_context.cpp
#	libraries/chain/wasm_interface.cpp
#	libraries/fc
#	libraries/fc/include/fc/crypto/webauthn_json
#	libraries/fc/secp256k1/upstream
#	pipeline.jsonc
#	plugins/mongo_db_plugin/mongo_db_plugin.cpp
#	plugins/state_history_plugin/state_history_plugin.cpp
#	programs/cleos/main.cpp
#	tests/CMakeLists.txt
@huangminghuang
remove deleted copy constructor used by trace_api_plugin
af07e00
@heifner
Fix merge issue, copy code from prune-cfd-stage-1 branch
8c54b44
@heifner
Remove constructors so object can be created via initilization list
8d4249a
@heifner
Change to better use new signaled packed_transaction_ptr
1a3520f
@heifner
Changes for new packed_transaction
509c8a3
@huangminghuang
fix tester merge issue
d438f91
@huangminghuang huangminghuang changed the title <!-- PLEASE FILL OUT THE FOLLOWING MARKDOWN TEMPLATE --> <!-- PR title alone should be sufficient to understand changes. --> Merge develop branch May 7, 2020
@heifner heifner changed the base branch from prune-cfd-stage-1 to develop May 7, 2020 20:23
@heifner heifner changed the title Merge develop branch Merge prune-cfd-stage-1 branch May 7, 2020
@heifner heifner merged commit 76cccfc into develop May 8, 2020
@heifner heifner deleted the prune-cfd-stage-1-merge branch May 8, 2020 13:46
@heifner heifner mentioned this pull request May 8, 2020
Closed
heifner added a commit that referenced this pull request May 12, 2020
@heifner
Revert "Merge pull request #9061 from EOSIO/prune-cfd-stage-1-merge"
87f7d98 
This reverts commit 76cccfc, reversing
changes made to 19082ed.
@heifner heifner mentioned this pull request May 13, 2020
Merged
3 tasks
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@heifner heifner heifner approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@huangminghuang @heifner