State dump

CMakeLists.txt

@@ -23,7 +23,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 set(CMAKE_CXX_EXTENSIONS OFF)
 SET(DEBUG ON CACHE BOOL "Debug mode")
 if(DEBUG)
-  set(CMAKE_CXX_FLAGS "-O0 -g -fsanitize=address -fno-inline -fno-eliminate-unused-debug-types -fstack-protector -Werror=unused-variable") # Provides faster compile time.
+  set(CMAKE_CXX_FLAGS "-O0 -g -fno-inline -fno-eliminate-unused-debug-types -Werror=unused-variable") # Provides faster compile time.
 elseif(SONARQUBE_ANALYSIS)
   set(CMAKE_CXX_FLAGS "-O0 -g --coverage")
 else()
@@ -34,9 +34,9 @@ set(CMAKE_FIND_LIBRARY_SUFFIXES ".a") # Always look for static libraries - "ZLIB
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # For clang-tidy
 
 # Set project version inside the code (forcefully so changes in the .in file are always reflected correctly to the compiler)
-if (EXISTS ${CMAKE_SOURCE_DIR}/src/utils/options.h)
-  file(REMOVE ${CMAKE_SOURCE_DIR}/src/utils/options.h)
-endif()
+# if (EXISTS ${CMAKE_SOURCE_DIR}/src/utils/options.h)
+#   file(REMOVE ${CMAKE_SOURCE_DIR}/src/utils/options.h)
+# endif()
 configure_file(
   ${CMAKE_SOURCE_DIR}/src/utils/options.h.in
   ${CMAKE_SOURCE_DIR}/src/utils/options.h
@@ -88,6 +88,8 @@ include(cmake/ProjectBoostCertify.cmake)  # Boost Certify
 include(cmake/ProjectEthash.cmake)        # Ethash
 include(cmake/ProjectSecp256k1.cmake)     # Bitcoin core fast implementation
 include(cmake/ProjectSpeedb.cmake)        # Speedb (Level/RocksDB drop-in replacement)
+include(cmake/ProjectEVMOne.cmake)        # EVMOne (EVMOne + EVMC)
+
 
 # Add catch2 as a library
 add_library(catch2
@@ -382,7 +384,7 @@ if(BUILD_AVALANCHEGO)
     ${NET_SOURCES}
   )
 
-  add_dependencies(orbitersdk_lib gen-grpc ProtoFiles)
+  add_dependencies(orbitersdk_lib gen-grpc ProtoFiles Evmc)
 
   target_include_directories(orbitersdk_lib PUBLIC ${CMAKE_SOURCE_DIR}/include ${OPENSSL_INCLUDE_DIR})
 
@@ -408,7 +410,7 @@ else()
 
   target_include_directories(orbitersdk_lib PRIVATE ${CMAKE_SOURCE_DIR}/include ${OPENSSL_INCLUDE_DIR})
 
-  target_link_libraries(orbitersdk_lib PRIVATE
+  target_link_libraries(orbitersdk_lib PRIVATE EvmcInstructions EvmcLoader EvmcTooling Evmone
     ${CRYPTOPP_LIBRARIES} ${SCRYPT_LIBRARY} Secp256k1 Ethash ${ETHASH_BYPRODUCTS}
     Speedb ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES}
   )

cmake/ProjectBoostCertify.cmake

@@ -16,7 +16,7 @@ ExternalProject_Add(
   URL_HASH SHA256=1c964b0aba47cd90081eaacc4946ea8e58d0c14fb267856f26515219e8ca1d68
   PATCH_COMMAND patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/cmake/certifyPatch.patch
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-             -DCMAKE_POSITION_INDEPENDENT_CODE=${BUILD_SHARED_LIBS}
+             -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
              -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
              -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
              -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}

cmake/ProjectEVMOne.cmake

@@ -0,0 +1,87 @@
+include(ExternalProject)
+
+if (MSVC)
+    set(_only_release_configuration -DCMAKE_CONFIGURATION_TYPES=Release)
+    set(_overwrite_install_command INSTALL_COMMAND cmake --build <BINARY_DIR> --config Release --target install)
+endif()
+
+set(prefix "${CMAKE_BINARY_DIR}/deps")
+set(EVMONE_LIBRARY "${prefix}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}evmone${CMAKE_STATIC_LIBRARY_SUFFIX}")
+set(EVMONE_INCLUDE_DIR "${prefix}/include")
+set(EVMONE_VERSION "0.11.0")
+set(EVMC_INCLUDE_DIR "${prefix}/include")
+set(EVMC_INSTRUCTIONS_LIBRARY "${prefix}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}evmc-instructions${CMAKE_STATIC_LIBRARY_SUFFIX}")
+set(EVMC_LOADER_LIBRARY "${prefix}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}evmc-loader${CMAKE_STATIC_LIBRARY_SUFFIX}")
+set(EVMC_TOOLING_LIBRARY "${prefix}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}tooling${CMAKE_STATIC_LIBRARY_SUFFIX}")
+
+if(DEBUG)
+  ## EVMONE Can't be compiled with address sanitizer/stack protector
+  ## due to GCC stack size limits and GCC not accepting -Wno-stack-usage as a ignore error flag
+  set(EVMONE_CXX_FLAGS "-O0 -g -fno-inline -fno-eliminate-unused-debug-types -Werror=unused-variable") # Provides faster compile time.
+  ExternalProject_Add(
+          evmone
+          PREFIX "${prefix}"
+          GIT_REPOSITORY https://github.com/chfast/evmone
+          GIT_TAG "v${EVMONE_VERSION}"
+          CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${prefix}
+          -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
+          -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+          -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+          -DCMAKE_CXX_FLAGS=${EVMONE_CXX_FLAGS}
+          -DBUILD_SHARED_LIBS=OFF
+          -DEVMC_INSTALL=ON
+          -DCMAKE_INSTALL_LIBDIR=lib
+          ${_only_release_configuration}
+          LOG_CONFIGURE 1
+          ${_overwrite_install_command}
+          LOG_INSTALL 1
+          BUILD_BYPRODUCTS ${EVMONE_LIBRARY}
+          BUILD_BYPRODUCTS ${EVMC_INSTRUCTIONS_LIBRARY}
+          BUILD_BYPRODUCTS ${EVMC_LOADER_LIBRARY}
+          BUILD_BYPRODUCTS ${EVMC_TOOLING_LIBRARY}
+  )
+else()
+    ExternalProject_Add(
+            evmone
+            PREFIX "${prefix}"
+            GIT_REPOSITORY https://github.com/chfast/evmone
+            GIT_TAG "v${EVMONE_VERSION}"
+            CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${prefix}
+            -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
+            -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+            -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+            -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+            -DBUILD_SHARED_LIBS=OFF
+            -DEVMC_INSTALL=ON
+            -DCMAKE_INSTALL_LIBDIR=lib
+            ${_only_release_configuration}
+            LOG_CONFIGURE 1
+            ${_overwrite_install_command}
+            LOG_INSTALL 1
+            BUILD_BYPRODUCTS ${EVMONE_LIBRARY}
+            BUILD_BYPRODUCTS ${EVMC_INSTRUCTIONS_LIBRARY}
+            BUILD_BYPRODUCTS ${EVMC_LOADER_LIBRARY}
+            BUILD_BYPRODUCTS ${EVMC_TOOLING_LIBRARY}
+    )
+endif()
+
+# Create imported library
+add_library(Evmone STATIC IMPORTED)
+file(MAKE_DIRECTORY "${EVMONE_INCLUDE_DIR}")  # Must exist.
+set_property(TARGET Evmone PROPERTY IMPORTED_CONFIGURATIONS Release)
+set_property(TARGET Evmone PROPERTY IMPORTED_LOCATION_RELEASE "${EVMONE_LIBRARY}")
+set_property(TARGET Evmone PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${EVMONE_INCLUDE_DIR}")
+add_dependencies(Evmone evmone ${EVMONE_LIBRARY} ${EVMONE_BYPRODUCTS})
+
+# Create an imported target for each library
+add_library(EvmcInstructions STATIC IMPORTED)
+set_property(TARGET EvmcInstructions PROPERTY IMPORTED_LOCATION "${EVMC_INSTRUCTIONS_LIBRARY}")
+add_dependencies(EvmcInstructions evmone)
+
+add_library(EvmcLoader STATIC IMPORTED)
+set_property(TARGET EvmcLoader PROPERTY IMPORTED_LOCATION "${EVMC_LOADER_LIBRARY}")
+add_dependencies(EvmcLoader evmone)
+
+add_library(EvmcTooling STATIC IMPORTED)
+set_property(TARGET EvmcTooling PROPERTY IMPORTED_LOCATION "${EVMC_TOOLING_LIBRARY}")
+add_dependencies(EvmcTooling evmone)

cmake/ProjectEthash.cmake

@@ -18,7 +18,7 @@ ExternalProject_Add(
   GIT_REPOSITORY https://github.com/chfast/ethash
   GIT_TAG "v${ETHASH_VERSION}"
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${prefix}
-             -DCMAKE_POSITION_INDEPENDENT_CODE=${BUILD_SHARED_LIBS}
+             -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
              -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
              -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
              -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}

cmake/ProjectEvmc.cmake

@@ -0,0 +1,48 @@
+include(ExternalProject)
+
+if (MSVC)
+    set(_only_release_configuration -DCMAKE_CONFIGURATION_TYPES=Release)
+    set(_overwrite_install_command INSTALL_COMMAND cmake --build <BINARY_DIR> --config Release --target install)
+endif()
+
+set(prefix "${CMAKE_BINARY_DIR}/deps")
+set(EVMC_INCLUDE_DIR "${prefix}/include")
+set(EVMC_INSTRUCTIONS_LIBRARY "${prefix}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}evmc-instructions${CMAKE_STATIC_LIBRARY_SUFFIX}")
+set(EVMC_LOADER_LIBRARY "${prefix}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}evmc-loader${CMAKE_STATIC_LIBRARY_SUFFIX}")
+set(EVMC_TOOLING_LIBRARY "${prefix}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}tooling${CMAKE_STATIC_LIBRARY_SUFFIX}")
+
+set(EVMC_VERSION "11.0.1")
+
+ExternalProject_Add(
+        evmc
+        PREFIX "${prefix}"
+        GIT_REPOSITORY https://github.com/ethereum/evmc
+        GIT_TAG "v${EVMC_VERSION}"
+        CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${prefix}
+        -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
+        -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+        -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+        -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+        -DCMAKE_INSTALL_LIBDIR=lib
+        ${_only_release_configuration}
+        LOG_CONFIGURE 1
+        ${_overwrite_install_command}
+        LOG_INSTALL 1
+        BUILD_BYPRODUCTS ${EVMC_INSTRUCTIONS_LIBRARY}
+        BUILD_BYPRODUCTS ${EVMC_LOADER_LIBRARY}
+        BUILD_BYPRODUCTS ${EVMC_TOOLING_LIBRARY}
+)
+
+# Create an imported target for each library
+add_library(EvmcInstructions STATIC IMPORTED)
+set_property(TARGET EvmcInstructions PROPERTY IMPORTED_LOCATION "${EVMC_INSTRUCTIONS_LIBRARY}")
+add_dependencies(EvmcInstructions evmc)
+
+add_library(EvmcLoader STATIC IMPORTED)
+set_property(TARGET EvmcLoader PROPERTY IMPORTED_LOCATION "${EVMC_LOADER_LIBRARY}")
+add_dependencies(EvmcLoader evmc)
+
+add_library(EvmcTooling STATIC IMPORTED)
+set_property(TARGET EvmcTooling PROPERTY IMPORTED_LOCATION "${EVMC_TOOLING_LIBRARY}")
+add_dependencies(EvmcTooling evmc)
+

cmake/ProjectSecp256k1.cmake

@@ -18,7 +18,7 @@ ExternalProject_Add(
   GIT_TAG "v${SECP256K1_VERSION}"
   PATCH_COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_LIST_DIR}/secp256k1/CMakeLists.txt <SOURCE_DIR>
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${prefix}
-             -DCMAKE_POSITION_INDEPENDENT_CODE=${BUILD_SHARED_LIBS}
+             -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
              -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
              -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
              -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}

cmake/ProjectSpeedb.cmake

@@ -33,7 +33,7 @@ ExternalProject_Add(
   GIT_REPOSITORY https://github.com/speedb-io/speedb
   GIT_TAG "speedb/v${SPEEDB_VERSION}"
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${prefix}
-             -DCMAKE_POSITION_INDEPENDENT_CODE=${BUILD_SHARED_LIBS}
+             -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
              -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
              -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
              -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}

scripts/AIO-setup.sh

@@ -104,7 +104,7 @@ if [ "$ONLY_DEPLOY" = false ]; then
   ## Build the project
   cd build_local_testnet
   cmake -DDEBUG=$DEBUG ..
-  cmake --build . --target orbitersdkd orbitersdkd-discovery -- -j${CORES}
+  make -j${CORES}
 fi
 
 if [ "$DEPLOY" = true ]; then

src/bins/orbitersdkd/main.cpp

@@ -22,6 +22,15 @@ std::unique_ptr<Blockchain> blockchain = nullptr;
 }
 
 int main() {
+  uint256_t valueiiii = uint256_t("10000");
+  auto valueiiiii = Utils::uint256ToEvmcUint256(valueiiii);
+  auto valueiiiiii = Utils::evmcUint256ToUint256(valueiiiii);
+  evmc::uint256be value(10000);
+  uint256_t valuei = Utils::evmcUint256ToUint256(value);
+  evmc::uint256be valueii = {};
+  uint256_t valueiii = Utils::evmcUint256ToUint256(valueii);
+
+  return 0;
   Utils::logToCout = true;
   std::string blockchainPath = std::filesystem::current_path().string() + std::string("/blockchain");
   blockchain = std::make_unique<Blockchain>(blockchainPath);

src/contract/CMakeLists.txt

@@ -1,7 +1,8 @@
 set(CONTRACT_HEADERS
   ${CMAKE_SOURCE_DIR}/src/contract/abi.h
   ${CMAKE_SOURCE_DIR}/src/contract/contract.h
-  ${CMAKE_SOURCE_DIR}/src/contract/contractcalllogger.h
+  ${CMAKE_SOURCE_DIR}/src/contract/contractstack.h
+  ${CMAKE_SOURCE_DIR}/src/contract/contracthost.h
   ${CMAKE_SOURCE_DIR}/src/contract/contractfactory.h
   ${CMAKE_SOURCE_DIR}/src/contract/contractmanager.h
   ${CMAKE_SOURCE_DIR}/src/contract/customcontracts.h
@@ -39,8 +40,9 @@ set(CONTRACT_SOURCES
   ${CMAKE_SOURCE_DIR}/src/contract/abi.cpp
   ${CMAKE_SOURCE_DIR}/src/contract/contract.cpp
   ${CMAKE_SOURCE_DIR}/src/contract/contractfactory.cpp
+  ${CMAKE_SOURCE_DIR}/src/contract/contractstack.cpp
+  ${CMAKE_SOURCE_DIR}/src/contract/contracthost.cpp
   ${CMAKE_SOURCE_DIR}/src/contract/contractmanager.cpp
-  ${CMAKE_SOURCE_DIR}/src/contract/contractcalllogger.cpp
   ${CMAKE_SOURCE_DIR}/src/contract/dynamiccontract.cpp
   ${CMAKE_SOURCE_DIR}/src/contract/event.cpp
   ${CMAKE_SOURCE_DIR}/src/contract/templates/erc20.cpp

src/contract/abi.h

@@ -365,8 +365,11 @@ namespace ABI {
      * @param funcSig The function signature (name).
      */
     template <typename... Args> static Functor encode(const std::string& funcSig) {
+      Functor ret;
       std::string fullSig = funcSig + "(" + listArgumentTypes<Args...>() + ")";
-      return Utils::sha3(Utils::create_view_span(fullSig)).view(0, 4);
+      auto hash = Utils::sha3(Utils::create_view_span(fullSig));
+      ret.value = Utils::bytesToUint32(hash.view(0,4));
+      return ret;
     }
   }; // namespace FunctorEncoder
 
@@ -581,7 +584,7 @@ namespace ABI {
     template<typename T, typename Enable = void>
     struct TypeEncoder {
       static Bytes encode(const T&) {
-        static_assert(always_false<T>, "TypeName specialization for this type is not defined");
+        static_assert(std::is_same_v<T, void>, "TypeName specialization for this type is not defined");
         return Bytes();
       }
     };

src/contract/contract.cpp

@@ -6,9 +6,23 @@ See the LICENSE.txt file in the project root for more information.
 */
 
 #include "contract.h"
+#include "contracthost.h"
 
 Address ContractGlobals::coinbase_ = Address(Hex::toBytes("0x0000000000000000000000000000000000000000"));
 Hash ContractGlobals::blockHash_ = Hash();
 uint64_t ContractGlobals::blockHeight_ = 0;
 uint64_t ContractGlobals::blockTimestamp_ = 0;
 
+Address BaseContract::getOrigin() const {
+  if (this->host_ == nullptr) {
+    throw DynamicException("Contracts going haywire! trying to get origin without a host!");
+  }
+  return this->host_->get_tx_context().tx_origin;
+}
+
+uint64_t BaseContract::getNonce(const Address& address) const {
+  if (this->host_ == nullptr) {
+    throw DynamicException("Contracts going haywire! trying to get nonce without a host!");
+  }
+  return this->host_->getNonce(address);
+}