Merge branch 'master' into ci/update_grpc2

Author: canepat

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

@@ -97,6 +97,10 @@ jobs:
 
                # Save test results to a directory with timestamp and commit hash
                cp -r ${{runner.workspace}}/rpc-tests/perf/reports/mainnet $RPC_PAST_TEST_DIR/mainnet_$(date +%Y%m%d_%H%M%S)_perf_$(git -C ${{runner.workspace}}/silkworm rev-parse --short HEAD)
+               
+               # Detect the pre-built db version
+               db_version=$(python3 $ERIGON_QA_PATH/test_system/qa-tests/uploads/prod_info.py $ERIGON_DIR/production.ini production erigon_repo_commit) 
+               
                # Check test runner script exit status
                if [ $perf_exit_status -eq 0 ]; then
 
@@ -107,13 +111,29 @@ jobs:
                   cp -r ${{runner.workspace}}/rpc-tests/perf/reports/bin ${{runner.workspace}}/last_execution_test/
 
                   echo "Save test result on DB"
-                  cd ${{runner.workspace}}/silkworm
-                  python3 $ERIGON_QA_PATH/test_system/qa-tests/uploads/upload_test_results.py --repo silkworm --branch ${{ github.ref_name }} --commit $(git rev-parse HEAD) --test_name rpc-performance-test-${servers[i-1]}-$method --chain mainnet --outcome success --result_file ${{runner.workspace}}/rpc-tests/perf/reports/mainnet/result.json
+                  cd ${{runner.workspace}}/silkworm                                             
+                  python3 $ERIGON_QA_PATH/test_system/qa-tests/uploads/upload_test_results.py \
+                    --repo silkworm \
+                    --branch ${{ github.ref_name }} \
+                    --commit $(git rev-parse HEAD) \
+                    --test_name rpc-performance-test-${servers[i-1]}-$method \
+                    --chain mainnet \
+                    --runner ${{ runner.name }} \
+                    --db_version $db_version \
+                    --outcome success \ 
+                    --result_file ${{runner.workspace}}/rpc-tests/perf/reports/mainnet/result.json
                else
                   failed_test=1
                   cd ${{runner.workspace}}/silkworm
-                  python3 $ERIGON_QA_PATH/test_system/qa-tests/uploads/upload_test_results.py --repo silkworm --branch ${{ github.ref_name }} --commit $(git rev-parse HEAD) --test_name rpc-performance-test-${servers[i-1]}-$method --chain mainnet --outcome failure
-
+                  python3 $ERIGON_QA_PATH/test_system/qa-tests/uploads/upload_test_results.py \
+                     --repo silkworm \
+                     --branch ${{ github.ref_name }} \
+                     --commit $(git rev-parse HEAD) \
+                     --test_name rpc-performance-test-${servers[i-1]}-$method \
+                     --chain mainnet \
+                     --runner ${{ runner.name }} \
+                     --db_version $db_version \
+                     --outcome failure
                fi
             done
 

silkworm/capi/silkworm_test.cpp

@@ -41,6 +41,7 @@ namespace snapshot_test = snapshots::test_util;
 struct CApiTest : public db::test_util::TestDatabaseContext {
     TemporaryDirectory tmp_dir;
     SilkwormSettings settings{.log_verbosity = SilkwormLogLevel::SILKWORM_LOG_NONE};
+    mdbx::env_managed& db{get_mdbx_env()};
 };
 
 //! Utility to copy `src` C-string to `dst` fixed-size char array

silkworm/db/test_util/test_database_context.cpp

@@ -188,6 +188,12 @@ namespace {
 
 }  // namespace
 
-TestDatabaseContext::TestDatabaseContext() : db{initialize_test_database()} {}
+TestDatabaseContext::TestDatabaseContext() : db_{initialize_test_database()} {}
+
+silkworm::ChainConfig TestDatabaseContext::get_chain_config() {
+    db::ROTxnManaged txn{db_};
+    auto chain_config = db::read_chain_config(txn);
+    return chain_config ? *chain_config : silkworm::ChainConfig{};
+}
 
 }  // namespace silkworm::db::test_util

silkworm/db/test_util/test_database_context.hpp

@@ -34,12 +34,18 @@ class TestDatabaseContext {
     TestDatabaseContext();
 
     ~TestDatabaseContext() {
-        auto db_path = db.get_path();
-        db.close();
+        auto db_path = db_.get_path();
+        db_.close();
         std::filesystem::remove_all(db_path);
     }
 
-    mdbx::env_managed db;
+    mdbx::env_managed& get_mdbx_env() { return db_; }
+    db::EnvConfig get_env_config() { return env_config_; }
+    silkworm::ChainConfig get_chain_config();
+
+  private:
+    mdbx::env_managed db_;
+    db::EnvConfig env_config_;
 };
 
 }  // namespace silkworm::db::test_util