Merge pull request #628 from eosnetworkfoundation/elmato/new-eos-evm-…

…contract

Repository refactor

.github/workflows/build-contract-test.sh

@@ -15,15 +15,15 @@ echo 'Leap version:'
 cat "$Deosio_DIR/EosioTester.cmake" | grep 'EOSIO_VERSION' | grep -oP "['\"].*['\"]" | tr -d "'\"" || :
 
 # build
-ee mkdir -p contract/tests/build
-ee pushd contract/tests
+ee mkdir -p tests/build
+ee pushd tests
 ee pushd build
 ee "cmake -DCMAKE_BUILD_TYPE=$DCMAKE_BUILD_TYPE .."
 ee make -j "$(nproc)" unit_test
 
 # pack
 ee popd
-ee 'tar -czf ../../contract-test.tar.gz build/*'
+ee 'tar -czf ../contract-test.tar.gz build/*'
 ee popd
 
 echo "Done! - ${0##*/}"

.github/workflows/build-contract.sh

@@ -13,15 +13,13 @@ ee cdt-cc --version
 ee cmake --version
 
 # build
-ee mkdir -p contract/build
-ee pushd contract
+ee mkdir -p build
 ee pushd build
 ee "cmake -DCMAKE_BUILD_TYPE=$DCMAKE_BUILD_TYPE -DWITH_TEST_ACTIONS=$DWITH_TEST_ACTIONS -DWITH_LARGE_STACK=$DWITH_TEST_ACTIONS .."
 ee make -j "$(nproc)"
 
 # pack
 ee popd
-ee 'tar -czf ../contract.tar.gz build/*'
-ee popd
+ee 'tar -czf contract.tar.gz build/*'
 
 echo "Done! - ${0##*/}"

.github/workflows/test-contract.sh

@@ -8,12 +8,12 @@ function ee()
     eval "$@"
 }
 
-ee pushd contract/tests/build
+ee pushd tests/build
 if [ "$DWITH_TEST_ACTIONS" = "on" ] || [ "$DWITH_TEST_ACTIONS" = "true" ]; then
 ee "ctest -R consensus_tests -j \"$(nproc)\" --output-on-failure -T Test"
 else
 ee "ctest -E consensus_tests -j \"$(nproc)\" --output-on-failure -T Test"
 fi
 
-cp "$(find ./Testing -name 'Test.xml' | sort | tail -n '1')" "../../../${XUNIT_FILENAME:-test-results.xml}"
+cp "$(find ./Testing -name 'Test.xml' | sort | tail -n '1')" "../../${XUNIT_FILENAME:-test-results.xml}"
 echo "Done! - ${0##*/}"

.gitignore

@@ -1,86 +1,3 @@
-# archives
-*.7z
-*.iso
-*.rar
-*.tar
-*.tar.gz
-*.tgz
-*.zip
-
-# build artifacts
 build
-cmake-build-debug
-
-# compiled dynamic libraries
-*.dll
-*.dylib
-*.so
-
-# compiled object files
-*.lo
-*.o
-*.obj
-*.slo
-
-# compiled static libraries
-*.a
-*.la
-*.lai
-*.lib
-
-# data
-*.csv
-*.db
-*.dbf
-*.fods
-*.html
-*.json
-*.ods
-*.ots
-*.tsv
-*.uos
-*.xhtml
-*.xls
-*.xlsm
-*.xlsx
-*.xlt
-*.xltx
-*.xml
-
-# editor files
-.ccls-cache
-.idea
-*.vim
+tests/build
 .vscode
-
-# executables
-*.apk
-*.app
-*.AppImage
-*.com
-*.deb
-*.dll
-*.dmg
-*.exe
-*.jar
-*.msi
-*.out
-*.rpm
-
-# logs
-*.log
-*.txt
-
-# macOS
-.DS_Store
-
-# precompiled headers
-*.gch
-*.pch
-
-# prerequisites
-*.d
-
-# python
-__pycache__
-.mypy_cache

.gitmodules

@@ -1,30 +1,24 @@
-[submodule "interfaces"]
-	path = interfaces
-	url = https://github.com/ledgerwatch/interfaces
-[submodule "silkrpc/croaring"]
-	path = silkrpc/croaring
-	url = https://github.com/lemire/CRoaringUnityBuild
 [submodule "silkworm"]
 	path = silkworm
 	url = https://github.com/eosnetworkfoundation/silkworm
-[submodule "contract/external/ethash"]
-	path = contract/external/ethash
-	url = https://github.com/eosnetworkfoundation/ethash
-[submodule "contract/external/intx"]
-	path = contract/external/intx
-	url = https://github.com/chfast/intx
-[submodule "contract/external/nlohmann_json"]
-	path = contract/external/nlohmann_json
-	url = https://github.com/nlohmann/json
-[submodule "contract/external/GSL"]
-	path = contract/external/GSL
+[submodule "external/expected"]
+	path = external/expected
+	url = https://github.com/TartanLlama/expected
+[submodule "external/GSL"]
+	path = external/GSL
 	url = https://github.com/microsoft/GSL
-[submodule "external/appbase"]
-	path = external/appbase
-	url = https://github.com/AntelopeIO/appbase
-[submodule "external/abieos"]
-	path = external/abieos
-	url = https://github.com/AntelopeIO/abieos
-[submodule "contract/tests/external/abseil"]
-	path = contract/tests/external/abseil
+[submodule "tests/external/abseil"]
+	path = tests/external/abseil
 	url = https://github.com/abseil/abseil-cpp
+[submodule "tests/external/ethash"]
+	path = tests/external/ethash
+	url = https://github.com/eosnetworkfoundation/ethash
+[submodule "tests/external/intx"]
+	path = tests/external/intx
+	url = https://github.com/chfast/intx
+[submodule "tests/external/evmone"]
+	path = tests/external/evmone
+	url = https://github.com/eosnetworkfoundation/evmone
+[submodule "tests/external/secp256k1"]
+	path = tests/external/secp256k1
+	url = https://github.com/bitcoin-core/secp256k1.git