Merge pull request #221 from ethereum/develop

version 0.3.2 development

Author: winsvega

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "libdataobj"]
+	path = libdataobj
+	url = https://github.com/winsvega/libdataobj

CMakeLists.txt

@@ -1,5 +1,6 @@
 
 cmake_minimum_required(VERSION 3.9.3)
+
 set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/toolchain.cmake)
 
 include("./cmake/Hunter/HunterGate.cmake")
@@ -23,10 +24,11 @@ HunterGate(
     SHA1 "908ddcb223f25fa155315baae64ce0ab48a38bf7"
     LOCAL
 )
+
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
-project(retesteth VERSION 0.3.1)
-set(VERSION_SUFFIX "cancun")
+project(retesteth VERSION 0.3.2)
+set(VERSION_SUFFIX "legacy")
 
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_MULTITHREADED ON)
@@ -84,7 +86,11 @@ endif()
 
 add_subdirectory(libdevcore)
 add_subdirectory(libdevcrypto)
+
+set(DATA_YAML ON)
+add_compile_definitions(DATA_YAML="${DATA_YAML}")
 add_subdirectory(libdataobj)
+
 if (${UNITTESTS})
     set(LIBSSZ ssz)
     add_subdirectory(libssz)

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:20.04 as retesteth
+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"
@@ -28,18 +28,20 @@ RUN apt-get update \
     && 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 jq lsof git cmake make perl psmisc curl wget gcc-11 g++-11 python3.10 python3.10-venv python3-pip python3-dev \
+    && apt-get install --yes jq lsof git make libssl-dev libgmp-dev 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 \
     && apt-get install --yes uuid-runtime \
     && 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++
 
+# CMAKE LATEST
+RUN wget https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0.tar.gz \
+    && tar -zxvf cmake-3.28.0.tar.gz && cd cmake-3.28.0 \
+    && ./bootstrap && make && make install
+
 # Tests
 #RUN git clone --depth 1 -b master https://github.com/ethereum/tests /tests
 
@@ -60,9 +62,9 @@ RUN wget https://github.com/ethereum/solidity/releases/download/v0.8.21/solc-sta
 # 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 . \
+    && curl -LsSf https://astral.sh/uv/install.sh | sh && source $HOME/.local/bin/env \
+    && uv sync --all-extras  \
+    && uv run solc-select use 0.8.24 --always-install\
     && wget https://raw.githubusercontent.com/ethereum/retesteth/develop/web/tfinit.sh \
     && cp tfinit.sh /usr/bin/tfinit.sh \
     && chmod +x /usr/bin/tfinit.sh
@@ -73,15 +75,15 @@ RUN test -n "$PYT8N" \
      && cd /pyt8n && git fetch && git checkout $PYT8N \
      && python3 -m venv ./venv/ \
      && source ./venv/bin/activate \
-     && pip install -e . \
+     && pip install -e .[test] \
     || echo "Pyt8n is empty"
 
 # Geth
 RUN test -n "$GETH" \
      && git clone $GETH_SRC /geth \
      && cd /geth && git fetch && git checkout $GETH \
-     && wget https://dl.google.com/go/go1.20.linux-amd64.tar.gz \
-     && tar -xvf go1.20.linux-amd64.tar.gz \
+     && wget https://go.dev/dl/go1.21.8.linux-amd64.tar.gz \
+     && tar -xvf go1.21.8.linux-amd64.tar.gz \
      && mv go /usr/local && ln -s /usr/local/go/bin/go /bin/go \
      && go build ./cmd/evm  && cp evm /bin/evm \
      && rm -rf /geth && rm -rf /usr/local/go \
@@ -102,22 +104,24 @@ RUN test -n "$NIMBUS" \
 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 \
+     && nvm install 20 && nvm alias default 20 && nvm use default \
+     && cp -r ~/.nvm/versions/node/v20*/* /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" \
+     && apt-get update \
+     && apt-get install --yes openjdk-21-jdk \
+    || echo "Besu is empty"
 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 \
+     && ln -s /besu/ethereum/evmtool/build/install/evmtool/bin/evmtool /usr/bin/besuevm \
     || echo "Besu is empty"
 
 # Evmone
@@ -126,14 +130,16 @@ RUN test -n "$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 \
+     && ln -s /evmone/build/bin/evmone-t8n /usr/bin/evmone-t8n \
      && 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 \
+    && cd /retesteth \
+    && git fetch && git checkout $RETESTETH && git submodule update --init --recursive \
+    && mkdir /build && cd /build \
     && cmake /retesteth -DCMAKE_BUILD_TYPE=Release \
     && make -j2 \
     && cp /build/retesteth/retesteth /usr/bin/retesteth \

README.md

@@ -123,7 +123,7 @@ ln -s /besu/ethereum/evmtool/build/install/evmtool/bin/evm /usr/bin/besuevm
 ln -s /evmone/build/bin/evmone-t8n /usr/bin/evmone
 ```
 
-Setup evn vars: 
+Setup env vars: 
 ```
 ETHEREUMJS_PATH env var is required for ethereumjs client
 PYSPECS_PATH env var to generate .py test fillers (https://github.com/ethereum/execution-spec-tests)

circle.yml

@@ -31,7 +31,7 @@ defaults:
       name: "ConfigureMac"
       working_directory: ~/build
       command: |
-        cmake ../project -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CMAKE_OPTIONS -DCMAKE_TOOLCHAIN_FILE=~/project/toolchain.cmake
+        cmake ../project -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CMAKE_OPTIONS -DCMAKE_TOOLCHAIN_FILE=~/project/toolchain.cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 
   build: &build
     run:
@@ -44,8 +44,8 @@ defaults:
       name: "LinuxInstallGO and Tests"
       working_directory: ~/project
       command: |
-          curl -L --output go1.20.linux-amd64.tar.gz "https://dl.google.com/go/go1.20.linux-amd64.tar.gz"
-          tar -xf go1.20.linux-amd64.tar.gz
+          curl -L --output go1.21.8.linux-amd64.tar.gz "https://go.dev/dl/go1.21.8.linux-amd64.tar.gz"
+          tar -xf go1.21.8.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
@@ -143,6 +143,12 @@ defaults:
         
   linux-steps: &linux-steps
     - checkout
+    - run:
+          name: Update Git Submodules
+          command: |
+            git submodule sync
+            git submodule update --init --recursive
+
     - *environment-info
     - *configure
 #    - *upload-hunter-cache
@@ -157,17 +163,24 @@ defaults:
 
   mac-steps: &mac-steps
       - checkout
+      - run:
+          name: Update Git Submodules
+          command: |
+            git submodule sync
+            git submodule update --init --recursive
+
       - run:
           name: "Install macOS dependencies"
           # Python3 and requests are needed for Hunter upload.
           command: |
-            HOMEBREW_NO_AUTO_UPDATE=1 brew install -q cmake ninja git
+            brew install -q cmake ninja git
             git clone --depth 1 https://github.com/ethereum/go-ethereum.git
             git clone --depth 1 https://github.com/ethereum/tests.git
 
-            curl -L https://go.dev/dl/go1.20.1.darwin-amd64.pkg -o go1.20.pkg
-            chmod +x go1.20.pkg
-            sudo installer -pkg go1.20.pkg -target /
+            sudo softwareupdate --install-rosetta --agree-to-license
+            curl -L https://go.dev/dl/go1.21.8.darwin-amd64.pkg -o go1.21.pkg
+            chmod +x go1.21.pkg
+            sudo installer -pkg go1.21.pkg -target /
             sudo ln -s /usr/local/go/bin/go /usr/local/bin
 
             cd go-ethereum

cmake/Hunter/config.cmake

@@ -17,4 +17,9 @@ hunter_config(ethash VERSION 0.4.0
     SHA1 fd92ffadff2931877a3b68685dd8c53f0bdec539
 )
 
+hunter_config(Boost VERSION 1.79.1
+    URL "https://archives.boost.io/release/1.79.0/source/boost_1_79_0.tar.bz2"
+    SHA1 "31209dcff292bd6a64e5e08ceb3ce44a33615dc0"
+)
+
 hunter_config(CURL VERSION ${HUNTER_CURL_VERSION} CMAKE_ARGS HTTP_ONLY=ON CMAKE_USE_OPENSSL=OFF CMAKE_USE_LIBSSH2=OFF CURL_CA_PATH=none)

dretesteth.sh

@@ -4,14 +4,15 @@ testpath="notfound"
 installImage() {
     SCRIPT=$(readlink -f "$0")              # Get the absolute path of the script
     SCRIPT_NAME=$(basename "$SCRIPT")       # Get the name of the script without the path
-    SCRIPT_NAME_LINK="${SCRIPT_NAME::-3}"
+    SCRIPT_NAME_LINK="${SCRIPT_NAME%.*}"     # Get the name of the bash script without extension
 
-    if [ "$SCRIPT" != "/usr/bin/$SCRIPT_NAME" ]; then
-      sudo ln -s "$SCRIPT" "/usr/bin/$SCRIPT_NAME_LINK"
-      echo "Added link /usr/bin/$SCRIPT_NAME_LINK >> $SCRIPT"
+    INSTALL_PATH="/usr/local/bin"
+    if [ "$SCRIPT" != "$INSTALL_PATH/$SCRIPT_NAME" ]; then
+      echo "Adding link $INSTALL_PATH/$SCRIPT_NAME_LINK >> $SCRIPT"
+      sudo ln -s "$SCRIPT" "$INSTALL_PATH/$SCRIPT_NAME_LINK"
       if [ "$SCRIPT_NAME" = "dretesteth.sh" ]; then
-        sudo ln -s "$SCRIPT" "/usr/bin/dr"
-        echo "Added link /usr/bin/dr >> $SCRIPT"
+        echo "Adding link $INSTALL_PATH/dr >> $SCRIPT"
+        sudo ln -s "$SCRIPT" "$INSTALL_PATH/dr"
       fi
     fi
     exit 0