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

Added support for FC_REFLECT_DERIVED #6518

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ steps:
sleep 5 && ln -s "$(pwd)" /data/job && cd /data/job && \
echo "+++ Building :hammer:" && \
echo 1 | ./eosio_build.sh && \
echo "+++ Validating:" && \
echo 1 | ./tools/validate_reflection.py plugins/ programs/ libraries/ --recurse --extension "cpp" --extension "hpp" -e && \
echo "--- Compressing build directory :compression:" && \
tar -pczf build.tar.gz build/
label: ":darwin: High Sierra Build"
Expand All @@ -17,6 +19,8 @@ steps:
sleep 5 && ln -s "$(pwd)" /data/job && cd /data/job && \
echo "+++ Building :hammer:" && \
echo 1 | ./eosio_build.sh && \
echo "+++ Validating:" && \
echo 1 | ./tools/validate_reflection.py plugins/ programs/ libraries/ --recurse --extension "cpp" --extension "hpp" -e && \
echo "--- Compressing build directory :compression:" && \
tar -pczf build.tar.gz build/
label: ":darwin: Mojave Build"
Expand All @@ -29,6 +33,8 @@ steps:
- command: |
echo "+++ :hammer: Building" && \
echo 1 | ./eosio_build.sh && \
echo "+++ Validating:" && \
echo 1 | ./tools/validate_reflection.py plugins/ programs/ libraries/ --recurse --extension "cpp" --extension "hpp" -e && \
echo "--- :compression: Compressing build directory" && \
tar -pczf build.tar.gz build/
label: ":ubuntu: Build"
Expand All @@ -44,6 +50,8 @@ steps:
- command: |
echo "+++ :hammer: Building" && \
echo 1 | ./eosio_build.sh && \
echo "+++ Validating:" && \
echo 1 | ./tools/validate_reflection.py plugins/ programs/ libraries/ --recurse --extension "cpp" --extension "hpp" -e && \
echo "--- :compression: Compressing build directory" && \
tar -pczf build.tar.gz build/
label: ":ubuntu: 18.04 Build"
Expand All @@ -59,6 +67,8 @@ steps:
- command: |
echo "+++ :hammer: Building" && \
echo 1 | ./eosio_build.sh && \
echo "+++ Validating:" && \
echo 1 | ./tools/validate_reflection.py plugins/ programs/ libraries/ --recurse --extension "cpp" --extension "hpp" -e && \
echo "--- :compression: Compressing build directory" && \
tar -pczf build.tar.gz build/
label: ":fedora: Build"
Expand All @@ -74,6 +84,8 @@ steps:
- command: |
echo "+++ :hammer: Building" && \
echo 1 | ./eosio_build.sh && \
echo "+++ Validating:" && \
echo 1 | ./tools/validate_reflection.py plugins/ programs/ libraries/ --recurse --extension "cpp" --extension "hpp" -e && \
echo "--- :compression: Compressing build directory" && \
tar -pczf build.tar.gz build/
label: ":centos: Build"
Expand All @@ -89,6 +101,8 @@ steps:
- command: |
echo "+++ :hammer: Building" && \
echo 1 | ./eosio_build.sh && \
echo "+++ Validating:" && \
echo 1 | ./tools/validate_reflection.py plugins/ programs/ libraries/ --recurse --extension "cpp" --extension "hpp" -e && \
echo "--- :compression: Compressing build directory" && \
tar -pczf build.tar.gz build/
label: ":aws: Build"
Expand Down
1 change: 1 addition & 0 deletions libraries/chain/include/eosio/chain/transaction.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ FC_REFLECT( eosio::chain::transaction_header, (expiration)(ref_block_num)(ref_bl
FC_REFLECT_DERIVED( eosio::chain::transaction, (eosio::chain::transaction_header), (context_free_actions)(actions)(transaction_extensions) )
FC_REFLECT_DERIVED( eosio::chain::signed_transaction, (eosio::chain::transaction), (signatures)(context_free_data) )
FC_REFLECT_ENUM( eosio::chain::packed_transaction::compression_type, (none)(zlib))
// @ignore unpacked_trx
FC_REFLECT( eosio::chain::packed_transaction, (signatures)(compression)(packed_context_free_data)(packed_trx) )
FC_REFLECT_DERIVED( eosio::chain::deferred_transaction, (eosio::chain::signed_transaction), (sender_id)(sender)(payer)(execute_after) )
FC_REFLECT( eosio::chain::deferred_reference, (sender)(sender_id) )
1 change: 1 addition & 0 deletions plugins/bnet_plugin/bnet_plugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ struct hello {
uint32_t last_irr_block_num = 0;
vector<block_id_type> pending_block_ids;
};
// @swap user, password
FC_REFLECT( hello, (peer_id)(network_version)(user)(password)(agent)(protocol_version)(chain_id)(request_transactions)(last_irr_block_num)(pending_block_ids) )

struct hello_extension_irreversible_only {};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -735,6 +735,7 @@ FC_REFLECT( eosio::chain_apis::read_only::get_account_results,
(account_name)(head_block_num)(head_block_time)(privileged)(last_code_update)(created)
(core_liquid_balance)(ram_quota)(net_weight)(cpu_weight)(net_limit)(cpu_limit)(ram_usage)(permissions)
(total_resources)(self_delegated_bandwidth)(refund_request)(voter_info) )
// @swap code_hash
FC_REFLECT( eosio::chain_apis::read_only::get_code_results, (account_name)(code_hash)(wast)(wasm)(abi) )
FC_REFLECT( eosio::chain_apis::read_only::get_code_hash_results, (account_name)(code_hash) )
FC_REFLECT( eosio::chain_apis::read_only::get_abi_results, (account_name)(abi) )
Expand Down
10 changes: 7 additions & 3 deletions programs/eosio-launcher/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2006,7 +2006,7 @@ int main (int argc, char *argv[]) {


//-------------------------------------------------------------

// @ignore local_config_file
FC_REFLECT( remote_deploy,
(ssh_cmd)(scp_cmd)(ssh_identity)(ssh_args) )

Expand All @@ -2016,16 +2016,20 @@ FC_REFLECT( prodkey_def,
FC_REFLECT( producer_set_def,
(schedule))

// @ignore listen_addr, p2p_count, http_count, dot_label_str
FC_REFLECT( host_def,
(genesis)(ssh_identity)(ssh_args)(eosio_home)
(host_name)(public_name)
(base_p2p_port)(base_http_port)(def_file_size)
(instances) )

// @ignore node, dot_label_str
FC_REFLECT( eosd_def,
(name)(config_dir_name)(data_dir_name)(has_db)
(p2p_port)(http_port)(file_size) )
(config_dir_name)(data_dir_name)(p2p_port)
(http_port)(file_size)(has_db)(name)(host)
(p2p_endpoint) )

// @ignore instance, gelf_endpoint
FC_REFLECT( tn_node_def, (name)(keys)(peers)(producers) )

FC_REFLECT( testnet_def, (name)(ssh_helper)(nodes) )
Expand Down
1 change: 1 addition & 0 deletions tools/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/llvm-gcov.sh ${CMAKE_CURRENT_BINARY_DIR}/llvm-gcov.sh COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ctestwrapper.sh ${CMAKE_CURRENT_BINARY_DIR}/ctestwrapper.sh COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/validate_reflection.py ${CMAKE_CURRENT_BINARY_DIR}/validate_reflection.py COPYONLY)
Loading