Skip to content

Commit d8462db

Browse files
authored
third_party: update evmone to v0.12.0 (#2217)
1 parent 09c93f2 commit d8462db

File tree

12 files changed

+27
-48
lines changed

12 files changed

+27
-48
lines changed

.circleci/config.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ commands:
142142
- install_conan
143143
- run:
144144
name: "Install compiler"
145-
command: cmake/setup/compiler_install.sh clang 15
145+
command: cmake/setup/compiler_install.sh clang <<pipeline.parameters.clang_version_min>>
146146
- run:
147147
name: "CMake Fuzzer"
148148
working_directory: ~/build
@@ -260,7 +260,7 @@ jobs:
260260
type: boolean
261261
default: true
262262
machine:
263-
image: ubuntu-2204:2023.04.2
263+
image: ubuntu-2404:2024.05.1
264264
resource_class: 2xlarge
265265
steps:
266266
- checkout_with_submodules:
@@ -354,8 +354,8 @@ jobs:
354354
environment:
355355
BUILD_CMAKE_ARGS: -DSILKWORM_FUZZER=ON
356356
UBSAN_OPTIONS: print_stacktrace=1
357-
docker:
358-
- image: cimg/python:3.12
357+
machine:
358+
image: ubuntu-2404:2024.05.1
359359
resource_class: 2xlarge
360360
steps:
361361
- build_fuzzer
@@ -393,7 +393,7 @@ jobs:
393393
name: "Build GMP"
394394
working_directory: ~/tmp3
395395
command: |
396-
git clone https://github.com/torquem-ch/gmp-wasm
396+
git clone https://github.com/erigontech/gmp-wasm
397397
cd gmp-wasm
398398
git checkout 87e9087
399399
./configure --prefix $HOME/opt-wasm CC=/opt/wasi-sdk/bin/clang --host=none AR=llvm-ar RANLIB=llvm-ranlib --enable-cxx CXX=/opt/wasi-sdk/bin/clang++ ABI=longlong
@@ -415,7 +415,7 @@ jobs:
415415
parameters:
416416
clang_version_min:
417417
type: integer
418-
default: 15
418+
default: 16
419419
clang_version_latest:
420420
type: integer
421421
default: 18

.github/workflows/rpc-fuzzer-tests.yml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,8 @@ jobs:
2222
submodules: recursive
2323
fetch-depth: "1" # Fetch only the last commit, not the entire history
2424

25-
- name: Install Compiler (Clang 15)
26-
run: |
27-
# Ensure the correct version of Clang is installed
28-
# sudo apt-get install -y libc++-15-dev libc++abi-15-dev clang-15
29-
30-
# Set the compiler paths
31-
sudo ln -sfv /usr/bin/clang-15 /usr/bin/clang
32-
sudo ln -sfv /usr/bin/clang++-15 /usr/bin/clang++
33-
sudo update-alternatives --install /usr/bin/cc cc /usr/bin/clang 120
34-
sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 120
35-
update-alternatives --query cc
36-
update-alternatives --query c++
25+
- name: Install Compiler
26+
run: cmake/setup/compiler_install.sh clang 16
3727

3828
- name: Clean Build Directory
3929
run: rm -rf ${{runner.workspace}}/silkworm/build
@@ -48,11 +38,11 @@ jobs:
4838

4939
- name: Configure CMake
5040
working-directory: ${{runner.workspace}}/silkworm/build
51-
run: CC=clang-15 CXX=clang++-15 cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCONAN_PROFILE=linux_x64_clang_13_release -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain/clang_libcxx.cmake -DSILKWORM_FUZZER=ON
41+
run: CC=clang-16 CXX=clang++-16 cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCONAN_PROFILE=linux_x64_clang_13_release -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain/clang_libcxx.cmake -DSILKWORM_FUZZER=ON
5242

5343
- name: Build Silkworm Fuzzer Test
5444
working-directory: ${{runner.workspace}}/silkworm/build
55-
run: CC=clang-15 CXX=clang++-15 cmake --build . --target rpcdaemon_fuzzer_test -j 8
45+
run: CC=clang-16 CXX=clang++-16 cmake --build . --target rpcdaemon_fuzzer_test -j 8
5646

5747
- name: Prepare Corpus Directories
5848
working-directory: ${{runner.workspace}}/silkworm/build/cmd/test

.gitmodules

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
[submodule "evmone"]
22
path = third_party/evmone/evmone
3-
url = https://github.com/erigontech/evmone.git
4-
branch = revert_517
3+
url = https://github.com/ethereum/evmone.git
54
[submodule "ethereum-tests"]
65
path = third_party/ethereum-tests
76
url = https://github.com/ethereum/tests.git
87
[submodule "cbor-cpp"]
98
path = third_party/cbor-cpp/cbor-cpp
10-
url = https://github.com/torquem-ch/cbor-cpp.git
9+
url = https://github.com/erigontech/cbor-cpp.git
1110
[submodule "interfaces"]
1211
path = third_party/erigon-interfaces
1312
url = https://github.com/erigontech/interfaces.git
@@ -25,7 +24,7 @@
2524
url = https://github.com/bitcoin-core/secp256k1.git
2625
[submodule "libff"]
2726
path = third_party/libff/libff
28-
url = https://github.com/torquem-ch/libff.git
27+
url = https://github.com/erigontech/libff.git
2928
branch = win
3029
[submodule "glaze"]
3130
path = third_party/glaze/glaze

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ git submodule update --init --recursive
8383
## Building on Linux & macOS
8484

8585
Building Silkworm requires:
86-
* C++20 compiler: [GCC](https://www.gnu.org/software/gcc/) >= 11.2 or [Clang](https://clang.llvm.org/) >= 15
86+
* C++20 compiler: [GCC](https://www.gnu.org/software/gcc/) >= 11.2 or [Clang](https://clang.llvm.org/) >= 16
8787
or AppleClang ([Xcode](https://developer.apple.com/xcode/) >= 15)
8888
* [CMake](https://cmake.org)
8989
* [Conan](https://conan.io)

docs/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ In addition to the [Boost libraries permitted in the style guide](https://google
3434
* System
3535
* Thread
3636

37-
[clang-tidy](https://clang.llvm.org/extra/clang-tidy/) runs on CI. The report is attached to the "ARTIFACTS" section of the linux-clang-tidy job that can be found [here](https://app.circleci.com/pipelines/github/torquem-ch/silkworm?branch=master).
37+
[clang-tidy](https://clang.llvm.org/extra/clang-tidy/) runs on CI. The report is attached to the "ARTIFACTS" section of the linux-clang-tidy job that can be found [here](https://app.circleci.com/pipelines/github/erigontech/silkworm?branch=master).
3838

3939

4040
## Code Structure

silkworm/core/protocol/rule_set.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class RuleSet {
5656
//! \param [in] header: header to validate.
5757
//! \param [in] state: current state.
5858
//! \param [in] with_future_timestamp_check : whether to check header timestamp is in the future wrt host current
59-
//! time \see https://github.com/torquem-ch/silkworm/issues/448
59+
//! time \see https://github.com/erigontech/silkworm/issues/448
6060
//! \note Shouldn't be used for genesis block.
6161
virtual ValidationResult validate_block_header(const BlockHeader& header, const BlockState& state,
6262
bool with_future_timestamp_check);

silkworm/db/test_util/test_database_context.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ InMemoryState populate_genesis(db::RWTxn& txn, const std::filesystem::path& test
6363
.withdrawals = std::vector<silkworm::Withdrawal>{0},
6464
};
6565

66-
// FIX 2: set empty receipts root, should be done in the main code, requires https://github.com/torquem-ch/silkworm/issues/1348
66+
// FIX 2: set empty receipts root, should be done in the main code, requires https://github.com/erigontech/silkworm/issues/1348
6767
header.withdrawals_root = kEmptyRoot;
6868

6969
auto block_hash{header.hash()};

tests/docker/Dockerfile

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,7 @@ RUN git submodule sync
1818
RUN git submodule update --init --recursive
1919

2020
# 3 Install compiler
21-
RUN cmake/setup/compiler_install.sh clang 15
22-
# Alternative way to install clang > 15
23-
# WORKDIR /app
24-
# ARG LLVM_VERSION=16
25-
# RUN sudo wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
26-
# RUN wget https://apt.llvm.org/llvm.sh
27-
# RUN chmod +x llvm.sh
28-
# RUN sudo ./llvm.sh ${LLVM_VERSION} all
29-
# RUN sudo ln -sfv /usr/bin/clang-${LLVM_VERSION} /usr/bin/clang
30-
# RUN sudo ln -sfv /usr/bin/clang++-${LLVM_VERSION} /usr/bin/clang++
31-
# RUN sudo update-alternatives --install /usr/bin/cc cc /usr/bin/clang-${LLVM_VERSION} 100
32-
# RUN sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-${LLVM_VERSION} 100
21+
RUN cmake/setup/compiler_install.sh clang 16
3322

3423
# 4 Build all targets
3524
WORKDIR /app/build

tests/docker/run-docker.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ fi
1717
BRANCH=$1
1818

1919
if [ -z "$RENEW" ]; then
20-
echo docker build --tag silkworm-clang:15 --progress=plain --build-arg="CACHEBUST=$(date +%s)" --build-arg="BRANCH=$BRANCH" -f ./Dockerfile ../..
20+
echo docker build --tag silkworm-clang:16 --progress=plain --build-arg="CACHEBUST=$(date +%s)" --build-arg="BRANCH=$BRANCH" -f ./Dockerfile ../..
2121
else
22-
echo docker build --tag silkworm-clang:15 --progress=plain --no-cache --build-arg="BRANCH=$BRANCH" -f ./Dockerfile ../..
22+
echo docker build --tag silkworm-clang:16 --progress=plain --no-cache --build-arg="BRANCH=$BRANCH" -f ./Dockerfile ../..
2323
fi
2424

25-
echo docker rm -f $(docker ps -aq --filter name=silkworm-clang-15)
26-
echo docker run --name silkworm-clang-15 -d -t silkworm-clang:15
25+
echo docker rm -f $(docker ps -aq --filter name=silkworm-clang-16)
26+
echo docker run --name silkworm-clang-16 -d -t silkworm-clang:16

third_party/evmone/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ add_library(
2626
evmone/lib/evmone/advanced_execution.cpp
2727
evmone/lib/evmone/advanced_execution.hpp
2828
evmone/lib/evmone/advanced_instructions.cpp
29+
evmone/lib/evmone/baseline_analysis.cpp
30+
evmone/lib/evmone/baseline_execution.cpp
2931
evmone/lib/evmone/baseline_instruction_table.cpp
3032
evmone/lib/evmone/baseline_instruction_table.hpp
31-
evmone/lib/evmone/baseline.cpp
3233
evmone/lib/evmone/baseline.hpp
3334
evmone/lib/evmone/constants.hpp
3435
evmone/lib/evmone/eof.cpp
@@ -45,7 +46,7 @@ add_library(
4546
evmone/lib/evmone/vm.cpp
4647
evmone/lib/evmone/vm.hpp
4748
)
48-
set_source_files_properties(evmone/lib/evmone/vm.cpp PROPERTIES COMPILE_DEFINITIONS PROJECT_VERSION="0.12.0-dev")
49+
set_source_files_properties(evmone/lib/evmone/vm.cpp PROPERTIES COMPILE_DEFINITIONS PROJECT_VERSION="0.12.0")
4950
target_include_directories(evmone PUBLIC evmone/include evmone/lib)
5051
target_link_libraries(
5152
evmone

0 commit comments

Comments
 (0)