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.

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

Update to master branches for hf1 #25

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
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
2 changes: 1 addition & 1 deletion commun.contracts
2 changes: 1 addition & 1 deletion cyberway
Submodule cyberway updated 41 files
+2 −2 LICENSE
+60 −9 README.md
+1 −0 contracts/CMakeLists.txt
+9 −0 contracts/eosiolib/transaction.h
+5 −0 contracts/eosiolib/transaction.hpp
+8 −0 contracts/nested_trx/CMakeLists.txt
+3 −0 contracts/nested_trx/README.md
+53 −0 contracts/nested_trx/nested_trx.abi
+71 −0 contracts/nested_trx/nested_trx.cpp
+30 −0 contracts/nested_trx/nested_trx.hpp
+ docs/logo.jpg
+ docs/logo.png
+18 −0 libraries/chain/apply_context.cpp
+10 −0 libraries/chain/chaindb/controller.cpp
+40 −0 libraries/chain/chaindb/typed_name.cpp
+135 −15 libraries/chain/controller.cpp
+20 −31 libraries/chain/eosio_contract.cpp
+9 −0 libraries/chain/eosio_contract_abi.cpp
+2 −0 libraries/chain/include/cyberway/chaindb/typed_name.hpp
+0 −32 libraries/chain/include/eosio/chain/abi_def.hpp
+1 −0 libraries/chain/include/eosio/chain/apply_context.hpp
+15 −0 libraries/chain/include/eosio/chain/contract_types.hpp
+3 −1 libraries/chain/include/eosio/chain/controller.hpp
+1 −0 libraries/chain/include/eosio/chain/eosio_contract.hpp
+7 −0 libraries/chain/include/eosio/chain/exceptions.hpp
+25 −0 libraries/chain/include/eosio/chain/fc_pack.hpp
+4 −1 libraries/chain/include/eosio/chain/trace.hpp
+4 −1 libraries/chain/include/eosio/chain/transaction_context.hpp
+1 −0 libraries/chain/include/eosio/chain/transaction_metadata.hpp
+32 −0 libraries/chain/include/eosio/chain/types.hpp
+2 −2 libraries/chain/transaction_context.cpp
+7 −0 libraries/chain/wasm_interface.cpp
+6 −2 libraries/testing/include/eosio/testing/tester.hpp
+11 −5 libraries/testing/tester.cpp
+3 −1 plugins/event_engine_plugin/include/eosio/event_engine_plugin/messages.hpp
+8 −0 plugins/net_plugin/include/eosio/net_plugin/net_plugin.hpp
+17 −3 plugins/net_plugin/include/eosio/net_plugin/protocol.hpp
+356 −231 plugins/net_plugin/net_plugin.cpp
+42 −36 programs/cleos/main.cpp
+1 −0 tests/core_unit_tests/CMakeLists.txt
+448 −0 tests/core_unit_tests/nested_trx_tests.cpp
2 changes: 1 addition & 1 deletion cyberway.cdt
Submodule cyberway.cdt updated 72 files
+43 −26 Doxyfile
+2 −2 LICENSE
+18 −12 README.md
+255 −0 docs/DoxygenLayout.xml
+63 −0 docs/cdt_specifics/cyberway_cdt_specifics.md
+12 −0 docs/cdt_specifics/no_ricardian_contracts.md
+12 −5 docs/guides/cmake.md
+24 −17 docs/guides/first-smart-contract.md
+0 −90 docs/guides/generator-attributes.md
+19 −13 docs/guides/native-tester.md
+ docs/html/doc_1.png
+ docs/html/folderclosed_1.png
+ docs/html/folderopen_1.png
+ docs/html/logo.png
+ docs/html/navlogo.png
+ docs/html/point.png
+ docs/html/std-cbegin.png
+ docs/html/std-crend.png
+ docs/images/doc_1.png
+ docs/images/folderclosed_1.png
+ docs/images/folderopen_1.png
+ docs/images/logo.png
+ docs/images/navlogo.png
+ docs/images/point.png
+ docs/images/std-cbegin.png
+ docs/images/std-crend.png
+ docs/logo.jpg
+ docs/logo.png
+49 −0 docs/main_page.md
+2,280 −0 docs/new_customdoxygen.css
+61 −0 docs/new_footer.html
+56 −0 docs/new_header.html
+30 −0 docs/tools/cyberway-abidiff.md
+8 −5 docs/tools/cyberway-cpp.md
+0 −24 docs/tools/eosio-abidiff.md
+11 −6 docs/tools/eosio-abigen.md
+8 −4 docs/tools/eosio-init.md
+7 −2 docs/tools/eosio-ld.md
+0 −217 docs/upgrading/1.2-to-1.3.md
+0 −140 docs/upgrading/1.5-to-1.6.md
+9 −9 libraries/eosiolib/capi/eosio/action.h
+1 −1 libraries/eosiolib/capi/eosio/chain.h
+1 −1 libraries/eosiolib/capi/eosio/crypto.h
+8 −8 libraries/eosiolib/capi/eosio/domain.h
+1 −1 libraries/eosiolib/capi/eosio/permission.h
+1 −1 libraries/eosiolib/capi/eosio/print.h
+1 −1 libraries/eosiolib/capi/eosio/system.h
+1 −1 libraries/eosiolib/capi/eosio/transaction.h
+3 −3 libraries/eosiolib/capi/eosio/types.h
+21 −19 libraries/eosiolib/contracts/eosio/action.hpp
+2 −2 libraries/eosiolib/contracts/eosio/contract.hpp
+6 −7 libraries/eosiolib/contracts/eosio/dispatcher.hpp
+13 −11 libraries/eosiolib/contracts/eosio/domain.hpp
+16 −8 libraries/eosiolib/contracts/eosio/eosio.hpp
+24 −30 libraries/eosiolib/contracts/eosio/event.hpp
+333 −0 libraries/eosiolib/contracts/eosio/multi_index.hpp
+9 −9 libraries/eosiolib/contracts/eosio/permission.hpp
+1 −1 libraries/eosiolib/contracts/eosio/privileged.hpp
+6 −6 libraries/eosiolib/contracts/eosio/singleton.hpp
+1 −1 libraries/eosiolib/contracts/eosio/system.hpp
+2 −2 libraries/eosiolib/contracts/eosio/transaction.hpp
+58 −5 libraries/eosiolib/core/eosio/binary_extension.hpp
+1 −1 libraries/eosiolib/core/eosio/check.hpp
+3 −3 libraries/eosiolib/core/eosio/crypto.hpp
+7 −7 libraries/eosiolib/core/eosio/datastream.hpp
+5 −4 libraries/eosiolib/core/eosio/fixed_bytes.hpp
+4 −3 libraries/eosiolib/core/eosio/ignore.hpp
+5 −5 libraries/eosiolib/core/eosio/name.hpp
+4 −3 libraries/eosiolib/core/eosio/print.hpp
+5 −5 libraries/eosiolib/core/eosio/symbol.hpp
+1 −1 libraries/eosiolib/core/eosio/time.hpp
+1 −1 libraries/eosiolib/core/eosio/varint.hpp
2 changes: 1 addition & 1 deletion cyberway.contracts
Submodule cyberway.contracts updated 47 files
+1 −1 .buildkite/steps/build-image.sh
+3 −0 .gitmodules
+18 −0 CMakeLists.txt
+3 −0 Docker/Dockerfile
+1 −1 LICENSE
+0 −3 README.md
+1 −1 build.sh
+4 −1 common/config.hpp
+1 −1 cyber.bios/CMakeLists.txt
+306 −0 cyber.bios/cyber.bios.abi
+5 −0 cyber.bios/include/cyber.bios/cyber.bios.hpp
+33 −1 cyber.bios/src/cyber.bios.cpp
+1 −1 cyber.domain/CMakeLists.txt
+144 −0 cyber.domain/cyber.domain.abi
+1 −1 cyber.govern/CMakeLists.txt
+102 −0 cyber.govern/cyber.govern.abi
+2 −2 cyber.govern/include/cyber.govern/config.hpp
+27 −29 cyber.govern/include/cyber.govern/cyber.govern.hpp
+231 −155 cyber.govern/src/cyber.govern.cpp
+1 −1 cyber.incomereject/CMakeLists.txt
+10 −0 cyber.incomereject/cyber.incomereject.abi
+1 −1 cyber.msig/CMakeLists.txt
+177 −0 cyber.msig/cyber.msig.abi
+13 −11 cyber.msig/include/cyber.msig/cyber.msig.hpp
+65 −59 cyber.msig/src/cyber.msig.cpp
+1 −1 cyber.rejector/CMakeLists.txt
+10 −0 cyber.rejector/cyber.rejector.abi
+1 −1 cyber.stake/CMakeLists.txt
+283 −0 cyber.stake/cyber.stake.abi
+2 −0 cyber.stake/include/cyber.stake/config.hpp
+13 −11 cyber.stake/include/cyber.stake/cyber.stake.hpp
+33 −20 cyber.stake/src/cyber.stake.cpp
+1 −1 cyber.token/CMakeLists.txt
+249 −0 cyber.token/cyber.token.abi
+238 −1 cyber.token/include/cyber.token/cyber.token.hpp
+209 −0 cyber.token/src/cyber.token.cpp
+1 −0 scripts/deployutils
+4 −3 tests/cyber.govern_test_api.hpp
+6 −4 tests/cyber.govern_tests.cpp
+224 −37 tests/cyber.msig_tests.cpp
+24 −14 tests/cyber.stake_test_api.hpp
+148 −130 tests/cyber.stake_tests.cpp
+792 −0 tests/cyber.token_safe_tests.cpp
+176 −6 tests/cyber.token_test_api.hpp
+8 −5 tests/golos_tester.cpp
+2 −2 tests/golos_tester.hpp
+16 −3 tests/test_api_helper.hpp
2 changes: 1 addition & 1 deletion golos.contracts
Submodule golos.contracts updated 57 files
+7 −9 .buildkite/pipeline.yml
+10 −23 .buildkite/steps/build-image.sh
+1 −2 .buildkite/steps/deploy-test.sh
+10 −12 .buildkite/steps/publish-image.sh
+0 −12 .buildkite/steps/upload-image.sh
+0 −5 .dockerignore
+3 −7 CMakeLists.txt
+35 −20 Docker/Dockerfile
+2 −2 common/calclib/atmsp_storable.h
+0 −71 common/config.hpp
+0 −3 common/config.hpp.in
+0 −15 common/dispatchers.hpp
+1 −1 common/parameter.hpp
+1 −2 golos.charge/CMakeLists.txt
+395 −0 golos.charge/golos.charge.abi
+9 −2 golos.charge/golos.charge.cpp
+5 −13 golos.charge/golos.charge.hpp
+1 −2 golos.config/CMakeLists.txt
+65 −0 golos.config/abi/golos.config.abi
+5 −5 golos.config/include/golos.config/golos.config.hpp
+2 −2 golos.config/include/golos.config/parameters.hpp
+10 −10 golos.config/src/golos.config.cpp
+1 −2 golos.ctrl/CMakeLists.txt
+209 −0 golos.ctrl/abi/golos.ctrl.abi
+10 −23 golos.ctrl/include/golos.ctrl/golos.ctrl.hpp
+22 −21 golos.ctrl/include/golos.ctrl/parameters.hpp
+20 −14 golos.ctrl/src/golos.ctrl.cpp
+1 −2 golos.emit/CMakeLists.txt
+126 −0 golos.emit/abi/golos.emit.abi
+5 −5 golos.emit/include/golos.emit/golos.emit.hpp
+20 −21 golos.emit/include/golos.emit/parameters.hpp
+15 −14 golos.emit/src/golos.emit.cpp
+1 −2 golos.memo/CMakeLists.txt
+33 −0 golos.memo/golos.memo.abi
+6 −0 golos.memo/golos.memo.cpp
+2 −2 golos.memo/golos.memo.hpp
+1 −2 golos.publication/CMakeLists.txt
+1,164 −0 golos.publication/golos.publication.abi
+133 −73 golos.publication/golos.publication.cpp
+23 −66 golos.publication/golos.publication.hpp
+34 −45 golos.publication/objects.hpp
+49 −50 golos.publication/parameters.hpp
+1 −2 golos.referral/CMakeLists.txt
+131 −0 golos.referral/abi/golos.referral.abi
+9 −15 golos.referral/include/golos.referral/golos.referral.hpp
+13 −13 golos.referral/include/golos.referral/parameters.hpp
+9 −7 golos.referral/src/golos.referral.cpp
+1 −2 golos.social/CMakeLists.txt
+112 −0 golos.social/golos.social.abi
+2 −0 golos.social/golos.social.cpp
+9 −9 golos.social/golos.social.hpp
+1 −1 golos.social/objects.hpp
+1 −2 golos.vesting/CMakeLists.txt
+320 −0 golos.vesting/golos.vesting.abi
+20 −20 golos.vesting/golos.vesting.cpp
+24 −43 golos.vesting/golos.vesting.hpp
+17 −18 golos.vesting/parameters.hpp