Merge pull request #205 from ethereum/develop

version 0.3.1 development (update docker instructions to master)

Author: winsvega

CMakeLists.txt

@@ -4,6 +4,13 @@ set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/toolchain.cmake)
 
 include("./cmake/Hunter/HunterGate.cmake")
 
+if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+    add_compile_definitions("__DEBUG__")
+endif()
+if (${UNITTESTS})
+    add_compile_definitions("UNITTESTS")
+endif()
+
 set(HUNTER_CONFIGURATION_TYPES Release)
 set(HUNTER_JOBS_NUMBER 4 CACHE STRING "Hunter jobs number")
 set(HUNTER_CACHE_SERVERS "https://github.com/ethereum/hunter-cache" CACHE STRING "Hunter cache servers")
@@ -15,7 +22,7 @@ HunterGate(
 )
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
-project(retesteth VERSION 0.3.0)
+project(retesteth VERSION 0.3.1)
 set(VERSION_SUFFIX "shanghai")
 
 set(Boost_USE_STATIC_LIBS ON)
@@ -48,8 +55,13 @@ if (POLICY CMP0135)
     cmake_policy(SET CMP0135 NEW)   # Use provided package_ROOT variables
 endif()
 
-hunter_add_package(CURL)
-find_package(CURL CONFIG REQUIRED)
+IF (NOT LOCALDEPS MATCHES ".*CURL")
+    hunter_add_package(CURL)
+    find_package(CURL CONFIG REQUIRED)
+ELSE()
+    message(STATUS "[retesteth] LOCALDEPS=CURL looking for locally installed version")
+    find_package(CURL CONFIG REQUIRED)
+ENDIF()
 
 
 #Cmake files configuration
@@ -70,4 +82,8 @@ endif()
 add_subdirectory(libdevcore)
 add_subdirectory(libdevcrypto)
 add_subdirectory(libdataobj)
+if (${UNITTESTS})
+    set(LIBSSZ ssz)
+    add_subdirectory(libssz)
+endif()
 add_subdirectory(retesteth)

Dockerfile

@@ -1,49 +1,133 @@
 FROM ubuntu:20.04 as retesteth
 
+ARG BESU_SRC="https://github.com/hyperledger/besu.git"
+ARG PYSPECS_SRC="https://github.com/ethereum/execution-spec-tests"
+ARG ETEREUMJS_SRC="https://github.com/ethereumjs/ethereumjs-monorepo.git"
+ARG RETESTETH_SRC="https://github.com/ethereum/retesteth.git"
+ARG GETH_SRC="https://github.com/ethereum/go-ethereum.git"
+ARG NIMBUS_SRC="https://github.com/status-im/nimbus-eth1.git"
+ARG EVMONE_SRC="https://github.com/ethereum/evmone.git"
+
+# Leave empty to disable the build, can point to commit hash as well
+ARG BESU="main"
+ARG GETH="master"
+ARG NIMBUS="master"
+ARG ETHEREUMJS="master"
+ARG RETESTETH="develop"
+ARG PYSPECS="main"
+ARG EVMONE="master"
+
+SHELL ["/bin/bash", "-c"]
 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 wget libboost-all-dev \
+    && apt install software-properties-common -y \
+    && add-apt-repository -y ppa:ubuntu-toolchain-r/test \
+    && add-apt-repository -y ppa:deadsnakes/ppa  \
+    && add-apt-repository ppa:linuxuprising/java \
+    && apt-get install --yes git cmake make perl psmisc curl wget gcc-11 g++-11 python3.10 python3.10-venv python3-pip python3-dev \
+    && apt-get install --yes libboost-filesystem-dev libboost-system-dev libboost-program-options-dev libboost-test-dev \
+    && echo oracle-java17-installer shared/accepted-oracle-license-v1-3 select true | /usr/bin/debconf-set-selections  \
+    && apt-get install --yes oracle-java17-installer oracle-java17-set-default \
     && rm -rf /var/lib/apt/lists/*
+RUN rm /usr/bin/python3 && ln -s /usr/bin/python3.10 /usr/bin/python3 \
+    && rm /usr/bin/gcc && rm /usr/bin/g++ \
+    && ln -s /usr/bin/gcc-11 /usr/bin/gcc \
+    && ln -s /usr/bin/g++-11 /usr/bin/g++
 
-# Retesteth
-# ADD . /retesteth
-RUN git clone --depth 1 -b master https://github.com/ethereum/retesteth.git /retesteth
-RUN mkdir /build && cd /build \
-    && cmake /retesteth -DCMAKE_BUILD_TYPE=Release \
-    && make -j8 \
-    && cp /build/retesteth/retesteth /usr/bin/retesteth \
-    && rm -rf /build /retesteth /var/cache/* /root/.hunter/*
-
+# Tests
 #RUN git clone --depth 1 -b master https://github.com/ethereum/tests /tests
 
 # Solidity LLLC
-RUN git clone --depth 1 -b master https://github.com/winsvega/solidity.git /solidity
-RUN mkdir /build && cd /build \
+RUN test -n "$RETESTETH" \
+    && git clone --depth 1 -b master https://github.com/winsvega/solidity.git /solidity \
+    && mkdir /build && cd /build \
     && cmake /solidity -DCMAKE_BUILD_TYPE=Release -DLLL=1 && make lllc \
     && cp /build/lllc/lllc /bin/lllc \
-    && rm -rf /build /solidity /var/cache/* /root/.hunter/*
+    && rm -rf /build /solidity /var/cache/* /root/.hunter/* \
+    || echo "Retesteth is empty, skip LLLC"
 
 # Solidity solc
-# RUN git clone https://github.com/ethereum/solidity.git /solidity
-# 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 wget https://github.com/ethereum/solidity/releases/download/v0.8.17/solc-static-linux \
    && cp solc-static-linux /bin/solc \
    && chmod +x /bin/solc
 
+# Pyspecs
+RUN git clone $PYSPECS_SRC /execution-spec-tests 
+RUN cd /execution-spec-tests && git fetch && git checkout $PYSPECS \
+    && python3 -m venv ./venv/ \
+    && source ./venv/bin/activate \
+    && pip install -e . \
+    && wget https://raw.githubusercontent.com/ethereum/retesteth/develop/web/tfinit.sh \
+    && cp tfinit.sh /usr/bin/tfinit.sh \
+    && chmod +x /usr/bin/tfinit.sh
+
+
 # Geth
-RUN git clone --depth 1 -b master https://github.com/ethereum/go-ethereum.git /geth
-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 \
-    && make all && cp /geth/build/bin/evm /bin/evm \
-    && cp /geth/build/bin/geth /bin/geth \
-    && rm -rf /geth && rm -rf /usr/local/go
+RUN test -n "$GETH" \
+     && git clone $GETH_SRC /geth \
+     && cd /geth && git fetch && git checkout $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 \
+     && make all && cp /geth/build/bin/evm /bin/evm \
+     && cp /geth/build/bin/geth /bin/geth \
+     && rm -rf /geth && rm -rf /usr/local/go \
+    || echo "Geth is empty"
+
+# Nimbus
+RUN test -n "$NIMBUS" \
+     && apt-get update \
+     && apt-get install --yes librocksdb-dev \
+     && rm -rf /var/lib/apt/lists/* \
+     && git clone --recursive $NIMBUS_SRC /nimbus \
+     && cd /nimbus && git fetch && git checkout $NIMBUS && make t8n \
+     && cp /nimbus/tools/t8n/t8n /bin/evm_nimbus \
+     && rm -rf /nimbus \
+    || echo "Nimbus is empty"
+
+# Ethereumjs
+RUN test -n "$ETHEREUMJS" \
+     && wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash \
+     && . ~/.nvm/nvm.sh \
+     && nvm install 19 && nvm alias default 19 && nvm use default \
+     && cp -r ~/.nvm/versions/node/v19*/* /usr \
+     && git clone $ETEREUMJS_SRC /ethereumjs \
+     && cd /ethereumjs && git fetch && git checkout $ETHEREUMJS && npm i && npm run build --workspaces \
+    || echo "Ethereumjs is empty"
+
+# Besu
+RUN test -n "$BESU" \
+     && git clone $BESU_SRC /besu \
+     && cd /besu && git fetch && git checkout $BESU \
+     && ./gradlew build \
+    || echo "Besu is empty"
+
+RUN test -n "$BESU" \
+     && cd /besu && ./gradlew ethereum:evmtool:installDist \
+     && ln -s /besu/ethereum/evmtool/build/install/evmtool/bin/evm /usr/bin/besuevm \
+    || echo "Besu is empty"
+
+# Evmone
+RUN test -n "$EVMONE" \
+     && git clone --recursive $EVMONE_SRC /evmone \
+     && cd /evmone && git fetch && git checkout $evmone \
+     && cmake -S . -B build -DEVMONE_TESTING=ON \
+     && cmake --build build \
+     && ln -s /evmone/build/bin/evmone-t8n /usr/bin/evmone \
+     && rm -rf /var/cache/* /root/.hunter/* \
+    || echo "Evmone is empty"
+
+# Retesteth
+RUN test -n "$RETESTETH" \
+    && git clone $RETESTETH_SRC /retesteth \
+    && cd /retesteth && git fetch && git checkout $RETESTETH && mkdir /build && cd /build \
+    && cmake /retesteth -DCMAKE_BUILD_TYPE=Release \
+    && make -j2 \
+    && cp /build/retesteth/retesteth /usr/bin/retesteth \
+    && rm -rf /build /retesteth /var/cache/* /root/.hunter/* \
+    || echo "Retesteth is empty" > /usr/bin/retesteth
 
 ENTRYPOINT ["/usr/bin/retesteth"]