Skip to content
Permalink
Browse files

Merge pull request #123 from Telos-Foundation/developer

Merge 1.4.x / stage3.2
  • Loading branch information...
ARoomWithABue committed Dec 1, 2018
2 parents f47f98b + dbe284b commit 73bf4f5395dbcd2b48f1d545a6e9dfd9cfad4bb4
Showing with 6,103 additions and 3,812 deletions.
  1. +3 −3 .buildkite/coverage.yml
  2. +20 −20 .buildkite/debug.yml
  3. +74 −0 .buildkite/docker.yml
  4. +16 −34 .buildkite/long_running_tests.yml
  5. +195 −56 .buildkite/pipeline.yml
  6. +131 −0 .buildkite/sanitizers.yml
  7. +20 −0 .github/PULL_REQUEST_TEMPLATE.md
  8. +1 −1 .gitignore
  9. +53 −12 CMakeLists.txt
  10. +10 −2 CMakeModules/EosioTester.cmake.in
  11. +11 −3 CMakeModules/EosioTesterBuild.cmake.in
  12. +96 −0 CMakeModules/eosio-config.cmake.in
  13. +11 −0 CMakeModules/package.cmake
  14. +4 −0 CMakeModules/utils.cmake
  15. +15 −15 Docker/README.md
  16. +4 −10 Docker/config.ini
  17. +5 −5 Docker/docker-compose-latest.yml
  18. +5 −5 Docker/docker-compose.yml
  19. +49 −0 README.md
  20. +1 −1 contracts/CMakeLists.txt
  21. +0 −269 contracts/dice/README.md
  22. +0 −221 contracts/dice/dice.abi
  23. +0 −391 contracts/dice/dice.cpp
  24. +32 −0 contracts/eosio.bios/eosio.bios.abi
  25. +1 −1 contracts/eosio.bios/eosio.bios.cpp
  26. +5 −0 contracts/eosio.bios/eosio.bios.hpp
  27. +0 −1 contracts/eosio.system/eosio.system.hpp
  28. +2 −2 contracts/multi_index_test/multi_index_test.cpp
  29. +2 −2 contracts/{dice → snapshot_test}/CMakeLists.txt
  30. +21 −0 contracts/snapshot_test/snapshot_test.abi
  31. +79 −0 contracts/snapshot_test/snapshot_test.cpp
  32. +1 −1 libraries/appbase
  33. +2 −3 libraries/chain/CMakeLists.txt
  34. +469 −101 libraries/chain/abi_serializer.cpp
  35. +60 −47 libraries/chain/apply_context.cpp
  36. +107 −3 libraries/chain/authorization_manager.cpp
  37. +105 −38 libraries/chain/block_log.cpp
  38. +292 −83 libraries/chain/controller.cpp
  39. +193 −124 libraries/chain/include/eosio/chain/abi_serializer.hpp
  40. +5 −4 libraries/chain/include/eosio/chain/account_object.hpp
  41. +4 −5 libraries/chain/include/eosio/chain/apply_context.hpp
  42. +3 −0 libraries/chain/include/eosio/chain/authorization_manager.hpp
  43. +8 −6 libraries/chain/include/eosio/chain/block_log.hpp
  44. +34 −0 libraries/chain/include/eosio/chain/chain_snapshot.hpp
  45. +1 −1 libraries/chain/include/eosio/chain/config.hpp
  46. +36 −6 libraries/chain/include/eosio/chain/contract_table_objects.hpp
  47. +11 −4 libraries/chain/include/eosio/chain/controller.hpp
  48. +219 −0 libraries/chain/include/eosio/chain/database_utils.hpp
  49. +10 −1 libraries/chain/include/eosio/chain/exceptions.hpp
  50. +4 −2 libraries/chain/include/eosio/chain/generated_transaction_object.hpp
  51. +0 −6 libraries/chain/include/eosio/chain/name.hpp
  52. +1 −1 libraries/chain/include/eosio/chain/permission_link_object.hpp
  53. +17 −4 libraries/chain/include/eosio/chain/permission_object.hpp
  54. +1 −0 libraries/chain/include/eosio/chain/producer_schedule.hpp
  55. +6 −0 libraries/chain/include/eosio/chain/resource_limits.hpp
  56. +7 −0 libraries/chain/include/eosio/chain/resource_limits_private.hpp
  57. +383 −0 libraries/chain/include/eosio/chain/snapshot.hpp
  58. +3 −4 libraries/chain/include/eosio/chain/trace.hpp
  59. +16 −0 libraries/chain/include/eosio/chain/transaction_context.hpp
  60. +1 −0 libraries/chain/include/eosio/chain/transaction_object.hpp
  61. +19 −0 libraries/chain/include/eosio/chain/types.hpp
  62. +4 −2 libraries/chain/include/eosio/chain/wasm_interface.hpp
  63. +0 −4 libraries/chain/include/eosio/chain/wasm_interface_private.hpp
  64. +0 −701 libraries/chain/include/eosio/chain/webassembly/binaryen.hpp
  65. +3 −0 libraries/chain/include/eosio/chain/webassembly/runtime_interface.hpp
  66. +14 −6 libraries/chain/include/eosio/chain/webassembly/wabt.hpp
  67. +15 −6 libraries/chain/include/eosio/chain/webassembly/wavm.hpp
  68. +32 −4 libraries/chain/resource_limits.cpp
  69. +361 −0 libraries/chain/snapshot.cpp
  70. +173 −37 libraries/chain/transaction_context.cpp
  71. +8 −8 libraries/chain/wasm_interface.cpp
  72. +0 −105 libraries/chain/webassembly/binaryen.cpp
  73. +4 −0 libraries/chain/webassembly/wabt.cpp
  74. +8 −0 libraries/chain/webassembly/wavm.cpp
  75. +1 −1 libraries/chainbase
  76. +1 −1 libraries/fc
  77. +7 −5 libraries/testing/include/eosio/testing/tester.hpp
  78. +8 −10 libraries/testing/tester.cpp
  79. +1 −0 libraries/wasm-jit/Include/Platform/Platform.h
  80. +4 −0 libraries/wasm-jit/Source/Platform/POSIX.cpp
  81. +5 −2 plugins/COMMUNITY.md
  82. +6 −3 plugins/chain_api_plugin/chain_api_plugin.cpp
  83. +121 −68 plugins/chain_plugin/chain_plugin.cpp
  84. +11 −4 plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
  85. +1 −1 plugins/db_size_api_plugin/db_size_api_plugin.cpp
  86. +1 −1 plugins/history_api_plugin/history_api_plugin.cpp
  87. +12 −7 plugins/history_plugin/history_plugin.cpp
  88. +4 −0 plugins/http_plugin/http_plugin.cpp
  89. +5 −3 plugins/http_plugin/include/eosio/http_plugin/http_plugin.hpp
  90. +95 −34 plugins/mongo_db_plugin/mongo_db_plugin.cpp
  91. +6 −11 plugins/net_plugin/include/eosio/net_plugin/protocol.hpp
  92. +1 −10 plugins/net_plugin/net_plugin.cpp
  93. +4 −0 plugins/producer_api_plugin/producer_api_plugin.cpp
  94. +15 −2 plugins/producer_plugin/include/eosio/producer_plugin/producer_plugin.hpp
  95. +95 −24 plugins/producer_plugin/producer_plugin.cpp
  96. +1 −1 plugins/test_control_api_plugin/test_control_api_plugin.cpp
  97. +3 −6 plugins/wallet_plugin/se_wallet.cpp
  98. +1 −0 programs/CMakeLists.txt
  99. +25 −0 programs/eosio-blocklog/CMakeLists.txt
  100. +204 −0 programs/eosio-blocklog/main.cpp
  101. +111 −93 programs/eosio-launcher/main.cpp
  102. +1 −0 programs/{tkeosd → keosd}/CMakeLists.txt
  103. 0 programs/{tkeosd → keosd}/config.hpp.in
  104. +4 −4 programs/{tkeosd → keosd}/main.cpp
  105. +1 −0 programs/nodeos/CMakeLists.txt
  106. +2 −0 programs/nodeos/main.cpp
  107. +2 −0 programs/teclos/CMakeLists.txt
  108. +3 −9 programs/teclos/httpc.cpp
  109. +1 −1 programs/teclos/httpc.hpp
  110. +98 −90 programs/teclos/main.cpp
  111. +3 −1 scripts/eosio_build_darwin.sh
  112. +62 −0 scripts/generate_bottle.sh
  113. +34 −0 scripts/generate_deb.sh
  114. +35 −0 scripts/generate_package.sh.in
  115. +44 −0 scripts/generate_rpm.sh
  116. +44 −0 scripts/generate_tarball.sh
  117. +2 −2 telos_build.sh
  118. +9 −1 telos_install.sh
  119. +1 −1 telos_uninstall.sh
  120. +3 −3 testnet.template
  121. +19 −13 tests/CMakeLists.txt
  122. +428 −326 tests/Cluster.py
  123. +134 −68 tests/Node.py
  124. +8 −0 tests/TestHelper.py
  125. +82 −18 tests/WalletMgr.py
  126. +1 −6 tests/consensus-validation-malicious-producers.py
  127. +3 −3 tests/distributed-transactions-remote-test.py
  128. +25 −15 tests/distributed-transactions-test.py
  129. +11 −12 tests/launcher_test.py
  130. +26 −22 tests/nodeos_forked_chain_test.py
  131. +4 −3 tests/nodeos_run_remote_test.py
  132. +27 −25 tests/nodeos_run_test.py
  133. +17 −12 tests/nodeos_under_min_avail_ram.py
  134. +10 −13 tests/nodeos_voting_test.py
  135. +2 −6 tests/restart-scenarios-test.py
  136. +155 −16 tests/testUtils.py
  137. +5 −5 tutorials/bios-boot-tutorial/bios-boot-tutorial.py
  138. +3 −6 unittests/CMakeLists.txt
  139. +273 −13 unittests/abi_tests.cpp
  140. +3 −17 unittests/api_tests.cpp
  141. +1 −1 unittests/auth_tests.cpp
  142. +3 −1 unittests/database_tests.cpp
  143. +4 −10 unittests/delay_tests.cpp
  144. +0 −425 unittests/dice_tests.cpp
  145. +253 −0 unittests/snapshot_tests.cpp
  146. +1 −1 unittests/special_accounts_tests.cpp
  147. +1 −5 unittests/whitelist_blacklist_tests.cpp
@@ -6,14 +6,14 @@ steps:
echo "--- :spiral_note_pad: Generating Code Coverage Report" && \
/usr/bin/ninja EOSIO_ut_coverage && \
echo "--- :arrow_up: Publishing Code Coverage Report" && \
buildkite-agent artifact upload "EOSIO_ut_coverage/**/*" s3://eosio-coverage/$BUILDKITE_JOB_ID && \
buildkite-agent artifact upload "EOSIO_ut_coverage/**/*" s3://eos-coverage/$BUILDKITE_JOB_ID && \
cp /config/.coveralls.yml . && \
/usr/local/bin/coveralls-lcov EOSIO_ut_coverage_filtered.info && \
echo "+++ View Report" && \
printf "\033]1339;url=https://eosio-coverage.s3-us-west-2.amazonaws.com/$BUILDKITE_JOB_ID/EOSIO_ut_coverage/index.html;content=View Full Coverage Report\a\n"
printf "\033]1339;url=https://eos-coverage.s3-us-west-2.amazonaws.com/$BUILDKITE_JOB_ID/EOSIO_ut_coverage/index.html;content=View Full Coverage Report\a\n"
label: ":spiral_note_pad: Generate Report"
agents:
- "role=linux-coverage"
queue: "automation-large-builder-fleet"
plugins:
docker#v1.4.0:
image: "eosio/ci:ubuntu18"
@@ -19,10 +19,10 @@ steps:
tar -pczf build.tar.gz build/
label: ":ubuntu: Build"
agents:
- "role=linux-builder"
queue: "automation-large-builder-fleet"
artifact_paths: "build.tar.gz"
plugins:
docker#v1.4.0:
docker#v2.0.0:
image: "eosio/ci:ubuntu"
workdir: /data/job
timeout: 60
@@ -34,10 +34,10 @@ steps:
tar -pczf build.tar.gz build/
label: ":ubuntu: 18.04 Build"
agents:
- "role=linux-builder"
queue: "automation-large-builder-fleet"
artifact_paths: "build.tar.gz"
plugins:
docker#v1.4.0:
docker#v2.0.0:
image: "eosio/ci:ubuntu18"
workdir: /data/job
timeout: 60
@@ -49,10 +49,10 @@ steps:
tar -pczf build.tar.gz build/
label: ":fedora: Build"
agents:
- "role=linux-builder"
queue: "automation-large-builder-fleet"
artifact_paths: "build.tar.gz"
plugins:
docker#v1.4.0:
docker#v2.0.0:
image: "eosio/ci:fedora"
workdir: /data/job
timeout: 60
@@ -64,10 +64,10 @@ steps:
tar -pczf build.tar.gz build/
label: ":centos: Build"
agents:
- "role=linux-builder"
queue: "automation-large-builder-fleet"
artifact_paths: "build.tar.gz"
plugins:
docker#v1.4.0:
docker#v2.0.0:
image: "eosio/ci:centos"
workdir: /data/job
timeout: 60
@@ -79,10 +79,10 @@ steps:
tar -pczf build.tar.gz build/
label: ":aws: Build"
agents:
- "role=linux-builder"
queue: "automation-large-builder-fleet"
artifact_paths: "build.tar.gz"
plugins:
docker#v1.4.0:
docker#v2.0.0:
image: "eosio/ci:amazonlinux"
workdir: /data/job
timeout: 60
@@ -122,13 +122,13 @@ steps:
limit: 1
label: ":ubuntu: Tests"
agents:
- "role=linux-tester"
queue: "automation-large-builder-fleet"
artifact_paths:
- "mongod.log"
- "build/genesis.json"
- "build/config.ini"
plugins:
docker#v1.4.0:
docker#v2.0.0:
image: "eosio/ci:ubuntu"
workdir: /data/job
timeout: 60
@@ -146,13 +146,13 @@ steps:
limit: 1
label: ":ubuntu: 18.04 Tests"
agents:
- "role=linux-tester"
queue: "automation-large-builder-fleet"
artifact_paths:
- "mongod.log"
- "build/genesis.json"
- "build/config.ini"
plugins:
docker#v1.4.0:
docker#v2.0.0:
image: "eosio/ci:ubuntu18"
workdir: /data/job
timeout: 60
@@ -170,13 +170,13 @@ steps:
limit: 1
label: ":fedora: Tests"
agents:
- "role=linux-tester"
queue: "automation-large-builder-fleet"
artifact_paths:
- "mongod.log"
- "build/genesis.json"
- "build/config.ini"
plugins:
docker#v1.4.0:
docker#v2.0.0:
image: "eosio/ci:fedora"
workdir: /data/job
timeout: 60
@@ -194,13 +194,13 @@ steps:
limit: 1
label: ":centos: Tests"
agents:
- "role=linux-tester"
queue: "automation-large-builder-fleet"
artifact_paths:
- "mongod.log"
- "build/genesis.json"
- "build/config.ini"
plugins:
docker#v1.4.0:
docker#v2.0.0:
image: "eosio/ci:centos"
workdir: /data/job
timeout: 60
@@ -218,13 +218,13 @@ steps:
limit: 1
label: ":aws: Tests"
agents:
- "role=linux-tester"
queue: "automation-large-builder-fleet"
artifact_paths:
- "mongod.log"
- "build/genesis.json"
- "build/config.ini"
plugins:
docker#v1.4.0:
docker#v2.0.0:
image: "eosio/ci:amazonlinux"
workdir: /data/job
timeout: 60
@@ -0,0 +1,74 @@
steps:
- command: |
echo "AUTHENTICATING GOOGLE SERVICE ACCOUNT" && \
gcloud --quiet auth activate-service-account b1-automation-svc@b1-automation-dev.iam.gserviceaccount.com --key-file=/etc/gcp-service-account.json && \
docker-credential-gcr configure-docker && \
echo "BUILDING BUILD IMAGE" && \
cd Docker/builder && \
docker build -t eosio/builder:latest -t eosio/builder:$BUILDKITE_COMMIT . --build-arg branch=$BUILDKITE_COMMIT && \
docker tag eosio/builder:$BUILDKITE_COMMIT gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_COMMIT && \
docker tag eosio/builder:latest gcr.io/b1-automation-dev/eosio/builder:latest && \
echo "PUSHING DOCKER IMAGES" && \
docker push gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_COMMIT && \
docker push gcr.io/b1-automation-dev/eosio/builder:latest && \
echo "TRASHING OLD IMAGES" && \
docker rmi eosio/builder:$BUILDKITE_COMMIT && \
docker rmi eosio/builder:latest && \
docker rmi gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_COMMIT && \
docker rmi gcr.io/b1-automation-dev/eosio/builder:latest
label: "Docker build builder"
agents:
queue: "automation-docker-builder-fleet"
timeout: 300
- wait

- command: |
echo "AUTHENTICATING GOOGLE SERVICE ACCOUNT" && \
gcloud --quiet auth activate-service-account b1-automation-svc@b1-automation-dev.iam.gserviceaccount.com --key-file=/etc/gcp-service-account.json && \
docker-credential-gcr configure-docker && \
echo "BUILDING EOS IMAGE" && \
docker pull gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_COMMIT && \
cd Docker && \
docker build -t eosio/eos:latest -t eosio/eos:$BUILDKITE_COMMIT . --build-arg branch=$BUILDKITE_BRANCH && \
docker tag eosio/eos:$BUILDKITE_COMMIT gcr.io/b1-automation-dev/eosio/eos:$BUILDKITE_COMMIT && \
docker tag eosio/eos:latest gcr.io/b1-automation-dev/eosio/eos:latest && \
echo "PUSHING DOCKER IMAGES" && \
docker push gcr.io/b1-automation-dev/eosio/eos:$BUILDKITE_COMMIT && \
docker push gcr.io/b1-automation-dev/eosio/eos:latest && \
echo "TRASHING OLD IMAGES" && \
docker rmi eosio/eos:$BUILDKITE_COMMIT && \
docker rmi eosio/eos:latest && \
docker rmi gcr.io/b1-automation-dev/eosio/eos:$BUILDKITE_COMMIT && \
docker rmi gcr.io/b1-automation-dev/eosio/eos:latest && \
docker rmi gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_COMMIT
label: "Docker build eos"
agents:
queue: "automation-docker-builder-fleet"
timeout: 300
- command: |
echo "AUTHENTICATING GOOGLE SERVICE ACCOUNT" && \
gcloud --quiet auth activate-service-account b1-automation-svc@b1-automation-dev.iam.gserviceaccount.com --key-file=/etc/gcp-service-account.json && \
docker-credential-gcr configure-docker && \
echo "BUILDING EOS DEV IMAGE" && \
docker pull gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_COMMIT && \
cd Docker/dev && \
docker build -t eosio/eos-dev:latest -t eosio/eos-dev:$BUILDKITE_COMMIT . --build-arg branch=$BUILDKITE_BRANCH && \
docker tag eosio/eos-dev:$BUILDKITE_COMMIT gcr.io/b1-automation-dev/eosio/eos-dev:$BUILDKITE_COMMIT && \
docker tag eosio/eos-dev:latest gcr.io/b1-automation-dev/eosio/eos-dev:latest && \
echo "PUSHING DOCKER IMAGES" && \
docker push gcr.io/b1-automation-dev/eosio/eos-dev:$BUILDKITE_COMMIT && \
docker push gcr.io/b1-automation-dev/eosio/eos-dev:latest && \
echo "TRASHING OLD IMAGES" && \
docker rmi eosio/eos-dev:$BUILDKITE_COMMIT && \
docker rmi eosio/eos-dev:latest && \
docker rmi gcr.io/b1-automation-dev/eosio/eos-dev:$BUILDKITE_COMMIT && \
docker rmi gcr.io/b1-automation-dev/eosio/eos-dev:latest && \
docker rmi gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_COMMIT
label: "Docker build eos-dev"
agents:
queue: "automation-docker-builder-fleet"
timeout: 300
- wait

0 comments on commit 73bf4f5

Please sign in to comment.
You can’t perform that action at this time.