Merge pull request #6624 from EOSIO/refactor-fork-database

Refactor fork database

.buildkite/pipeline.yml

@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,20 +1,23 @@
 <!-- PLEASE FILL OUT THE FOLLOWING MARKDOWN TEMPLATE -->
-<!-- Give your PR a title that is sufficient to understand what is being changed. -->
+<!-- PR title alone should be sufficient to understand changes. -->
 
 ## Change Description
+<!-- Describe your changes, their justification, AND their impact. Reference issues or pull requests where possible (use '#XX' or 'GH-XX' where XX is the issue or pull request number). -->
 
-<!-- Describe the change you made, the motivation for it, and the impact it will have. Reference issues or pull requests where possible (use '#XX' or 'GH-XX' where XX is the issue or pull request number). -->
 
 ## Consensus Changes
-
+- [ ] Consensus Changes
+<!-- checked [x] = Consensus changes; unchecked [ ] = no changes, ignore this section -->
 <!-- If this PR introduces a change to the validation of blocks in the chain or consensus in general, please describe the impact. -->
 
 
 ## API Changes
-
+- [ ] API Changes
+<!-- checked [x] = API changes; unchecked [ ] = no changes, ignore this section -->
 <!-- If this PR introduces API changes, please describe the changes here. What will developers need to know before upgrading to this version? -->
 
 
 ## Documentation Additions
-
-<!-- List all the information that needs to be added to the documentation after merge. -->
+- [ ] Documentation Additions
+<!-- checked [x] = Documentation changes; unchecked [ ] = no changes, ignore this section -->
+<!-- Describe what must be added to the documentation after merge. -->

.gitignore

@@ -3,9 +3,9 @@
 *.dylib
 *.ll
 *.bc
+*.wasm
 *.wast
 *.wast.hpp
-*.wasm
 *.s
 *.dot
 *.abi.hpp

.gitmodules

@@ -6,27 +6,12 @@
 	path = libraries/appbase
 	url = https://github.com/eosio/appbase
         ignore = dirty
-[submodule "contracts/musl/upstream"]
-	path = contracts/musl/upstream
-	url = https://github.com/EOSIO/musl.git
-	branch = eosio
-[submodule "contracts/libc++/upstream"]
-	path = contracts/libc++/upstream
-	url = https://github.com/EOSIO/libcxx.git
-	branch = eosio
-[submodule "externals/binaryen"]
-	path = externals/binaryen
-	url = https://github.com/EOSIO/binaryen
-
 [submodule "libraries/softfloat"]
 	path = libraries/softfloat
 	url = https://github.com/eosio/berkeley-softfloat-3
-[submodule "externals/magic_get"]
-	path = externals/magic_get
-	url = https://github.com/EOSIO/magic_get
 [submodule "libraries/fc"]
 	path = libraries/fc
 	url = https://github.com/EOSIO/fc
 [submodule "libraries/wabt"]
 	path = libraries/wabt
-	url = http://github.com/EOSIO/wabt
+	url = https://github.com/EOSIO/wabt

CMakeLists.txt

@@ -72,12 +72,6 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS "ON")
 set(BUILD_DOXYGEN FALSE CACHE BOOL "Build doxygen documentation on every make")
 set(BUILD_MONGO_DB_PLUGIN FALSE CACHE BOOL "Build mongo database plugin")
 
-#set (USE_PCH 1)
-
-if (USE_PCH)
-  include (cotire)
-endif(USE_PCH)
-
 # add defaults for openssl
 if ("${OPENSSL_ROOT_DIR}" STREQUAL "")
    if (NOT "$ENV{OPENSSL_ROOT_DIR}" STREQUAL "")
@@ -207,7 +201,6 @@ if(ENABLE_COVERAGE_TESTING)
 endif()
 
 include(utils)
-add_subdirectory( externals )
 
 if ("${CORE_SYMBOL_NAME}" STREQUAL "")
   set( CORE_SYMBOL_NAME "SYS" )
@@ -227,9 +220,7 @@ endif()
 
 message( STATUS "Using '${EOSIO_ROOT_KEY}' as public key for 'eosio' account" )
 
-include(wasm)
 add_subdirectory( libraries )
-add_subdirectory( contracts )
 add_subdirectory( plugins )
 add_subdirectory( programs )
 add_subdirectory( scripts )
@@ -270,16 +261,19 @@ configure_file(${CMAKE_SOURCE_DIR}/libraries/fc/secp256k1/upstream/COPYING
                ${CMAKE_BINARY_DIR}/licenses/eosio/LICENSE.secp256k1 COPYONLY)
 configure_file(${CMAKE_SOURCE_DIR}/libraries/fc/src/network/LICENSE.go 
                ${CMAKE_BINARY_DIR}/licenses/eosio/LICENSE.go COPYONLY)
-configure_file(${CMAKE_SOURCE_DIR}/externals/binaryen/LICENSE 
-               ${CMAKE_BINARY_DIR}/licenses/eosio/LICENSE.binaryen COPYONLY)
-
-install(FILES LICENSE DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/)
-install(FILES libraries/wabt/LICENSE DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ RENAME LICENSE.wabt)
-install(FILES libraries/softfloat/COPYING.txt DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ RENAME LICENSE.softfloat)
-install(FILES libraries/wasm-jit/LICENSE DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ RENAME LICENSE.wavm)
-install(FILES libraries/fc/secp256k1/upstream/COPYING DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ RENAME LICENSE.secp256k1)
-install(FILES externals/binaryen/LICENSE DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ RENAME LICENSE.binaryen)
-install(FILES libraries/fc/src/network/LICENSE.go DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ )
+
+install(FILES LICENSE DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ COMPONENT base)
+install(FILES libraries/wabt/LICENSE DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ RENAME LICENSE.wabt COMPONENT base)
+install(FILES libraries/softfloat/COPYING.txt DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ RENAME LICENSE.softfloat COMPONENT base)
+install(FILES libraries/wasm-jit/LICENSE DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ RENAME LICENSE.wavm COMPONENT base)
+install(FILES libraries/fc/secp256k1/upstream/COPYING DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ RENAME LICENSE.secp256k1 COMPONENT base)
+install(FILES libraries/fc/src/network/LICENSE.go DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ COMPONENT base)
+
+add_custom_target(base-install
+  COMMAND "${CMAKE_COMMAND}" --build "${CMAKE_BINARY_DIR}"
+  COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=base -P "${CMAKE_BINARY_DIR}/cmake_install.cmake"
+  USES_TERMINAL
+)
 
 include(package)
 include(doxygen)