Merge branch 'master' into db_datastore_direct_range_as_of

Author: canepat

.github/actions/perf-common-steps/action.yml

@@ -182,6 +182,7 @@ runs:
           run_perf mainnet eth_getTransactionByHash 5 stress_test_eth_getTransactionByHash_13M 1:1,100:30,1000:20,10000:20
           run_perf mainnet eth_getTransactionReceipt 5 stress_test_eth_getTransactionReceipt_14M 1:1,100:30,1000:20,5000:20,10000:20,20000:20
           run_perf mainnet eth_createAccessList 5 stress_test_eth_createAccessList_16M 1:1,100:30,1000:20,10000:20,20000:20
+          run_perf mainnet debug_traceTransaction 5 stress_test_debug_trace_transaction_21M 1:1,100:30,1000:20,2000:20
         fi
         
         if [ $failed_test -eq 0 ]; then

.github/workflows/execution-test.yml

@@ -10,6 +10,10 @@ on:
         description: 'Stage to stop at; none for all; sample values: "Execution", "IntermediateHashes", "HashState", "HistoryIndex"'
         required: false
         type: string
+      clean_datadir:
+        description: 'Remove datadir before running the test'
+        type: boolean
+        default: true
 
 jobs:
   execution-test-suite:
@@ -33,6 +37,10 @@ jobs:
       - name: Clean Build Directory
         run: rm -rf ${{runner.workspace}}/silkworm/build
 
+      - name: Clean Database Directory
+        if: ${{github.event.inputs.clean_datadir}}
+        run: rm -rf ${{runner.workspace}}/silkworm_datadir
+
       - name: Create Build Environment
         run: cmake -E make_directory ${{runner.workspace}}/silkworm/build
 
@@ -55,7 +63,7 @@ jobs:
         run: |
           set +e # Disable exit on error
           
-          # Run Erigon, wait sync and check ability to maintain sync
+          # Run Silkworm, wait until the end of historical execution and check the result
           python3 $ERIGON_QA_PATH/test_system/qa-tests/silkworm-execution/run_and_check_execution.py \
           ${{runner.workspace}}/silkworm/build/cmd ${{runner.workspace}}/silkworm_datadir $TRACKING_TIME_SECONDS $TOTAL_TIME_SECONDS $CHAIN
           

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

@@ -33,7 +33,7 @@ jobs:
       - name: Checkout RPC Tests Repository & Install Requirements
         run: |
           rm -rf ${{runner.workspace}}/rpc-tests
-          git -c advice.detachedHead=false clone --depth 1 --branch v1.56.0 https://github.com/erigontech/rpc-tests ${{runner.workspace}}/rpc-tests
+          git -c advice.detachedHead=false clone --depth 1 --branch v1.57.0 https://github.com/erigontech/rpc-tests ${{runner.workspace}}/rpc-tests
           cd ${{runner.workspace}}/rpc-tests
           pip3 install -r requirements.txt --break-system-packages
 

cmake/compiler_settings.cmake

@@ -123,3 +123,5 @@ else()
     add_link_options(-fsanitize=safe-stack)
   endif()
 endif()
+
+add_compile_definitions(SILKWORM_CAPI_COMPONENT)

silkworm/capi/CMakeLists.txt

@@ -3,6 +3,8 @@
 
 include("${SILKWORM_MAIN_DIR}/cmake/common/targets.cmake")
 
+add_subdirectory(common)
+
 set(TARGET silkworm_capi)
 
 find_package(Microsoft.GSL REQUIRED)
@@ -11,10 +13,11 @@ set(PUBLIC_LIBS "")
 set(PRIVATE_LIBS
     glaze::glaze
     Microsoft.GSL::GSL
+    silkworm_capi_common
     silkworm_core
     silkworm_db
+    silkworm_execution
     silkworm_sentry
-    silkworm_node
     silkworm_rpcdaemon
 )
 
@@ -47,4 +50,14 @@ set_target_properties(${TARGET} PROPERTIES LINK_OPTIONS "${LINK_OPTIONS}")
 
 add_subdirectory(cli)
 
-target_link_libraries(silkworm_capi_static_test PRIVATE silkworm_db_test_util silkworm_node)
+target_link_libraries(silkworm_capi_static_test PRIVATE silkworm_db_test_util)
+
+# collect all public C headers into the same directory
+set(HEADERS_INSTALL_PATH "${CMAKE_CURRENT_BINARY_DIR}/include")
+file(GLOB_RECURSE HEADERS "../capi/*.h" "../*/capi/*.h")
+add_custom_command(
+  TARGET ${TARGET}
+  POST_BUILD
+  COMMAND ${CMAKE_COMMAND} ARGS -E make_directory "${HEADERS_INSTALL_PATH}"
+  COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${HEADERS} "${HEADERS_INSTALL_PATH}"
+)

silkworm/capi/cli/sample-go-client/main.go

@@ -3,7 +3,7 @@ package main
 // #cgo LDFLAGS: -lsilkworm_capi
 // #cgo LDFLAGS: -L${SRCDIR}/../../../../build/silkworm/capi
 // #cgo LDFLAGS: -Wl,-rpath ${SRCDIR}/../../../../build/silkworm/capi
-// #cgo CFLAGS: -I${SRCDIR}/../../../../silkworm/capi
+// #cgo CFLAGS: -I${SRCDIR}/../../../../build/silkworm/capi/include
 /*
 #include "silkworm.h"
 #include <stdlib.h>

silkworm/capi/common/CMakeLists.txt

@@ -0,0 +1,6 @@
+# Copyright 2025 The Silkworm Authors
+# SPDX-License-Identifier: Apache-2.0
+
+include("${SILKWORM_MAIN_DIR}/cmake/common/targets.cmake")
+
+silkworm_library(silkworm_capi_common)

silkworm/capi/common/common_component.hpp

@@ -0,0 +1,19 @@
+// Copyright 2025 The Silkworm Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+
+#include <filesystem>
+
+#include <silkworm/infra/common/log.hpp>
+#include <silkworm/infra/concurrency/context_pool_settings.hpp>
+
+namespace silkworm::capi {
+
+struct CommonComponent {
+    silkworm::log::Settings log_settings;
+    silkworm::concurrency::ContextPoolSettings context_pool_settings;
+    std::filesystem::path data_dir_path;
+};
+
+}  // namespace silkworm::capi

silkworm/capi/common/errors.h

@@ -0,0 +1,29 @@
+// Copyright 2025 The Silkworm Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#ifndef SILKWORM_CAPI_ERRORS_H_
+#define SILKWORM_CAPI_ERRORS_H_
+
+// Silkworm library error codes (SILKWORM_OK indicates no error, i.e. success)
+
+#define SILKWORM_OK 0
+#define SILKWORM_INTERNAL_ERROR 1
+#define SILKWORM_UNKNOWN_ERROR 2
+#define SILKWORM_INVALID_HANDLE 3
+#define SILKWORM_INVALID_PATH 4
+#define SILKWORM_INVALID_SNAPSHOT 5
+#define SILKWORM_INVALID_MDBX_ENV 6
+#define SILKWORM_INVALID_BLOCK_RANGE 7
+#define SILKWORM_BLOCK_NOT_FOUND 8
+#define SILKWORM_UNKNOWN_CHAIN_ID 9
+#define SILKWORM_MDBX_ERROR 10
+#define SILKWORM_INVALID_BLOCK 11
+#define SILKWORM_DECODING_ERROR 12
+#define SILKWORM_TOO_MANY_INSTANCES 13
+#define SILKWORM_INVALID_SETTINGS 14
+#define SILKWORM_TERMINATION_SIGNAL 15
+#define SILKWORM_SERVICE_ALREADY_STARTED 16
+#define SILKWORM_INCOMPATIBLE_LIBMDBX 17
+#define SILKWORM_INVALID_MDBX_TXN 18
+
+#endif  // SILKWORM_CAPI_ERRORS_H_

silkworm/capi/common/instance.hpp

@@ -0,0 +1,34 @@
+// Copyright 2025 The Silkworm Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+
+#include <memory>
+
+#include "common_component.hpp"
+
+namespace silkworm::db::capi {
+struct Component;
+}
+
+namespace silkworm::rpc {
+class Daemon;
+}
+
+namespace silkworm::sentry::capi {
+struct Component;
+}
+
+namespace capi_todo {
+
+struct SilkwormInstance {
+    silkworm::capi::CommonComponent common;
+    std::unique_ptr<silkworm::db::capi::Component> db;
+    std::unique_ptr<silkworm::rpc::Daemon> rpcdaemon;
+    std::unique_ptr<silkworm::sentry::capi::Component> sentry;
+
+    SilkwormInstance();
+    ~SilkwormInstance();
+};
+
+}  // namespace capi_todo