Merge pull request #194 from ethereum/develop

version 0.2.3 development - part 2

CMakeLists.txt

@@ -15,8 +15,8 @@ HunterGate(
 )
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
-project(retesteth VERSION 0.2.3)
-set(VERSION_SUFFIX "postmerge")
+project(retesteth VERSION 0.3.0)
+set(VERSION_SUFFIX "shanghai")
 
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_MULTITHREADED ON)
@@ -40,22 +40,6 @@ message(STATUS "[retesteth] Boost include: `${Boost_INCLUDE_DIR}`")
 hunter_add_package(yaml-cpp)
 find_package(yaml-cpp CONFIG REQUIRED)
 
-IF (NOT LOCALDEPS MATCHES ".*CRYPTOPP")
-    hunter_add_package(cryptopp)
-    find_package(cryptopp CONFIG REQUIRED)
-    set(CRYPTOPP_LINK "cryptopp-static")
-ELSE()
-    message(STATUS "[retesteth] LOCALDEPS=CRYPTOPP looking for locally installed version")
-    find_package(cryptopp MODULE REQUIRED)
-    message(STATUS "[retesteth] cryptopp libdir: `${CRYPTOPP_LIBRARIES}`")
-    message(STATUS "[retesteth] cryptopp include: `${CRYPTOPP_INCLUDE_DIRS}`")
-    set(CRYPTOPP_LINK ${CRYPTOPP_LIBRARIES})
-ENDIF()
-
-
-hunter_add_package(libscrypt)
-find_package(libscrypt CONFIG REQUIRED)
-
 # Silence cmake warnings on newer versions
 if (POLICY CMP0074)
     cmake_policy(SET CMP0074 NEW)   # Use download timestamp for remote objects
@@ -76,7 +60,6 @@ include(EthDependencies)
 include(EthCompilerSettings)
 
 include(ProjectSecp256k1)
-include(ProjectLibFF)
 configure_project()
 
 if(JSONCPP)

Dockerfile

@@ -3,8 +3,9 @@ FROM ubuntu:20.04 as retesteth
 ENV TZ=Etc/UTC
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
+# Get necessary packages
 RUN apt-get update \
-    && apt-get install --yes git cmake g++ make perl psmisc curl python3  \
+    && apt-get install --yes git cmake g++ make perl psmisc curl python3 wget libboost-all-dev \
     && rm -rf /var/lib/apt/lists/*
 
 # Retesteth
@@ -21,8 +22,6 @@ RUN mkdir /build && cd /build \
 # Solidity LLLC
 RUN git clone --depth 1 -b master https://github.com/winsvega/solidity.git /solidity
 RUN mkdir /build && cd /build \
-    && apt-get update \
-    && apt-get install --yes libboost-all-dev \
     && cmake /solidity -DCMAKE_BUILD_TYPE=Release -DLLL=1 && make lllc \
     && cp /build/lllc/lllc /bin/lllc \
     && rm -rf /build /solidity /var/cache/* /root/.hunter/*
@@ -33,13 +32,13 @@ RUN mkdir /build && cd /build \
 #    && cmake /solidity -DCMAKE_BUILD_TYPE=Release && make solc \
 #    && cp /build/solc/solc /bin/solc \
 #    && rm -rf /build /solidity /var/cache/* /root/.hunter/*
-RUN apt-get install wget && wget https://github.com/ethereum/solidity/releases/download/v0.8.5/solc-static-linux \
+RUN wget https://github.com/ethereum/solidity/releases/download/v0.8.17/solc-static-linux \
    && cp solc-static-linux /bin/solc \
    && chmod +x /bin/solc
 
 # Geth
 RUN git clone --depth 1 -b master https://github.com/ethereum/go-ethereum.git /geth
-RUN cd /geth && apt-get install wget \
+RUN cd /geth \
     && wget https://dl.google.com/go/go1.19.linux-amd64.tar.gz \
     && tar -xvf go1.19.linux-amd64.tar.gz \
     && mv go /usr/local && ln -s /usr/local/go/bin/go /bin/go \

README.md

@@ -64,7 +64,7 @@ If one of the following dependecies is failing to autoinstall, some times due to
 ```
 rm -r /root/.hunter
 rm CMakeCache.txt
-cmake .. -DLOCALDEPS="BOOST,MPIR,CRYPTOPP"
+cmake .. -DLOCALDEPS="BOOST"
 ```
 
 Try building instruction for beginners: [retesteth + solidity build](https://github.com/ethereum/retesteth#building-instructions-for-beginners)

circle.yml

@@ -44,8 +44,8 @@ defaults:
       name: "LinuxInstallGO and Tests"
       working_directory: ~/project
       command: |
-          curl -L --output go1.18.linux-amd64.tar.gz "https://dl.google.com/go/go1.18.linux-amd64.tar.gz"
-          tar -xf go1.18.linux-amd64.tar.gz
+          curl -L --output go1.19.linux-amd64.tar.gz "https://dl.google.com/go/go1.19.linux-amd64.tar.gz"
+          tar -xf go1.19.linux-amd64.tar.gz
           sudo mv go /usr/local
           sudo ln -s /usr/local/go/bin/go /usr/local/bin/go
           git clone --depth 1 https://github.com/ethereum/go-ethereum.git

cmake/EthCompilerSettings.cmake

@@ -55,12 +55,6 @@ if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MA
 		if("${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 4.8)
 			message(FATAL_ERROR "This compiler ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} is not supported. GCC 4.8 or newer is required.")
 		endif()
-
-	# Stop if buggy clang compiler detected.
-	elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES AppleClang)
-		if("${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 8.4)
-			message(FATAL_ERROR "This compiler ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} is not able to compile required libff. Install clang 4+ from Homebrew or XCode 9.")
-		endif()
 	endif()
 
 # The major alternative compiler to GCC/Clang is Microsoft's Visual C++ compiler, only available on Windows.

cmake/Hunter/config.cmake

@@ -1,8 +1,3 @@
-# cryptopp has very bad CMakeLists.txt config.
-# We have to enforce "cross compiling mode" there by setting CMAKE_SYSTEM_VERSION=NO
-# to any "false" value.
-hunter_config(cryptopp VERSION ${HUNTER_cryptopp_VERSION} CMAKE_ARGS CMAKE_SYSTEM_VERSION=NO)
-
 hunter_config(
     libjson-rpc-cpp
     VERSION ${HUNTER_libjson-rpc-cpp_VERSION}