Merge branch 'testnet' into collated-data-opt

Author: SpyCheese

CMakeLists.txt

@@ -65,6 +65,7 @@ option(TONLIB_ENABLE_JNI "Use \"ON\" to enable JNI-compatible TonLib API.")
 option(TON_USE_ASAN "Use \"ON\" to enable AddressSanitizer." OFF)
 option(TON_USE_TSAN "Use \"ON\" to enable ThreadSanitizer." OFF)
 option(TON_USE_UBSAN "Use \"ON\" to enable UndefinedBehaviorSanitizer." OFF)
+option(TON_USE_COVERAGE "Use \"ON\" to enable code coverage with gcov." OFF)
 set(TON_ARCH "native" CACHE STRING "Architecture, will be passed to -march=")
 
 option(TON_PRINT_BACKTRACE_ON_CRASH "Attempt to print a backtrace when a fatal signal is caught" ON)
@@ -266,7 +267,7 @@ elseif (CLANG OR GCC)
       set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--gc-sections -Wl,--exclude-libs,ALL")
     endif()
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gc-sections")
-    if (NOT TON_USE_ASAN AND NOT TON_USE_TSAN AND NOT MEMPROF)
+    if (NOT TON_USE_ASAN AND NOT TON_USE_TSAN AND NOT TON_USE_COVERAGE AND NOT MEMPROF)
       if (NOT USE_EMSCRIPTEN)
         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--exclude-libs,ALL")
       endif()
@@ -350,6 +351,23 @@ if (TON_USE_UBSAN)
   add_compile_options(-fsanitize=undefined)
   add_link_options(-fsanitize=undefined)
 endif()
+if (TON_USE_COVERAGE)
+  add_cxx_compiler_flag("-fprofile-arcs")
+  add_cxx_compiler_flag("-ftest-coverage")
+  add_cxx_compiler_flag("--coverage")
+  add_cxx_compiler_flag("-O0")
+  add_cxx_compiler_flag("-g")
+  add_cxx_compiler_flag("-fno-inline")
+  add_cxx_compiler_flag("-fno-inline-small-functions")
+  add_cxx_compiler_flag("-fno-default-inline")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage --coverage")
+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fprofile-arcs -ftest-coverage --coverage")
+endif()
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=thread")
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined")
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=leak")
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -finstrument-functions")
 
 #Compilation database
 set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
@@ -562,6 +580,7 @@ add_test(test-cells test-cells ${TEST_OPTIONS})
 add_test(test-smartcont test-smartcont)
 add_test(test-net test-net)
 add_test(test-actors test-tdactor)
+add_test(test-actors-coro tdactor/test/test-coro)
 add_test(test-emulator test-emulator)
 
 #BEGIN tonlib

assembly/native/build-macos-portable.sh

@@ -155,7 +155,7 @@ if [ "$with_tests" = true ]; then
   lite-client validator-engine-console generate-random-id json2tlo dht-server dht-ping-servers dht-resolve \
   http-proxy rldp-http-proxy adnl-proxy create-state create-hardfork tlbc emulator \
   test-ed25519 test-bigint test-vm test-fift test-cells test-smartcont \
-  test-net test-tdactor test-tdutils test-tonlib-offline test-adnl test-dht test-rldp \
+  test-net test-tdactor test-coro test-tdutils test-tonlib-offline test-adnl test-dht test-rldp \
   test-rldp2 test-catchain test-fec test-tddb test-db test-validator-session-state test-emulator proxy-liteserver
   test $? -eq 0 || { echo "Can't compile ton"; exit 1; }
 else

assembly/native/build-macos-shared.sh

@@ -93,7 +93,7 @@ if [ "$with_tests" = true ]; then
   lite-client validator-engine-console generate-random-id json2tlo dht-server dht-ping-servers dht-resolve \
   http-proxy rldp-http-proxy adnl-proxy create-state create-hardfork tlbc emulator \
   test-ed25519 test-bigint test-vm test-fift test-cells test-smartcont \
-  test-net test-tdactor test-tdutils test-tonlib-offline test-adnl test-dht test-rldp \
+  test-net test-tdactor test-coro test-tdutils test-tonlib-offline test-adnl test-dht test-rldp \
   test-rldp2 test-catchain test-fec test-tddb test-db test-validator-session-state test-emulator proxy-liteserver
   test $? -eq 0 || { echo "Can't compile ton"; exit 1; }
 else

assembly/native/build-ubuntu-appimages.sh

@@ -63,7 +63,7 @@ ninja storage-daemon storage-daemon-cli fift func tolk tonlib tonlibjson tonlib-
       validator-engine lite-client validator-engine-console blockchain-explorer \
       generate-random-id json2tlo dht-server http-proxy rldp-http-proxy dht-ping-servers dht-resolve \
       adnl-proxy create-state emulator test-ed25519 test-bigint \
-      test-vm test-fift test-cells test-smartcont test-net test-tdactor test-tdutils \
+      test-vm test-fift test-cells test-smartcont test-net test-tdactor test-coro test-tdutils \
       test-tonlib-offline test-adnl test-dht test-rldp test-rldp2 test-catchain \
       test-fec test-tddb test-db test-validator-session-state test-emulator proxy-liteserver
       test $? -eq 0 || { echo "Can't compile ton"; exit 1; }

assembly/native/build-ubuntu-portable.sh

@@ -137,7 +137,7 @@ ninja storage-daemon storage-daemon-cli fift func tolk tonlib tonlibjson tonlib-
       validator-engine lite-client validator-engine-console blockchain-explorer \
       generate-random-id json2tlo dht-server http-proxy rldp-http-proxy dht-ping-servers dht-resolve \
       adnl-proxy create-state emulator test-ed25519 test-bigint \
-      test-vm test-fift test-cells test-smartcont test-net test-tdactor test-tdutils \
+      test-vm test-fift test-cells test-smartcont test-net test-tdactor test-coro test-tdutils \
       test-tonlib-offline test-adnl test-dht test-rldp test-rldp2 test-catchain \
       test-fec test-tddb test-db test-validator-session-state test-emulator proxy-liteserver
       test $? -eq 0 || { echo "Can't compile ton"; exit 1; }

assembly/native/build-ubuntu-shared.sh

@@ -66,7 +66,7 @@ ninja storage-daemon storage-daemon-cli fift func tolk tonlib tonlibjson tonlib-
       validator-engine lite-client validator-engine-console blockchain-explorer \
       generate-random-id json2tlo dht-server http-proxy rldp-http-proxy dht-ping-servers dht-resolve \
       adnl-proxy create-state emulator test-ed25519 test-bigint \
-      test-vm test-fift test-cells test-smartcont test-net test-tdactor test-tdutils \
+      test-vm test-fift test-cells test-smartcont test-net test-tdactor test-coro test-tdutils \
       test-tonlib-offline test-adnl test-dht test-rldp test-rldp2 test-catchain \
       test-fec test-tddb test-db test-validator-session-state test-emulator proxy-liteserver
       test $? -eq 0 || { echo "Can't compile ton"; exit 1; }

assembly/native/build-windows-2019.bat

@@ -148,7 +148,7 @@ ninja storage-daemon storage-daemon-cli blockchain-explorer fift func tolk tonli
 tonlib-cli validator-engine lite-client validator-engine-console generate-random-id ^
 json2tlo dht-server http-proxy rldp-http-proxy adnl-proxy create-state create-hardfork emulator ^
 test-ed25519 test-bigint test-vm test-fift test-cells test-smartcont test-net ^
-test-tdactor test-tdutils test-tonlib-offline test-adnl test-dht test-rldp test-rldp2 test-catchain ^
+test-tdactor test-coro test-tdutils test-tonlib-offline test-adnl test-dht test-rldp test-rldp2 test-catchain ^
 test-fec test-tddb test-db test-validator-session-state test-emulator proxy-liteserver dht-ping-servers dht-resolve
 IF %errorlevel% NEQ 0 (
   echo Can't compile TON

assembly/native/build-windows-2022.bat

@@ -148,7 +148,7 @@ ninja storage-daemon storage-daemon-cli blockchain-explorer fift func tolk tonli
 tonlib-cli validator-engine lite-client validator-engine-console generate-random-id ^
 json2tlo dht-server http-proxy rldp-http-proxy adnl-proxy create-state create-hardfork emulator ^
 test-ed25519 test-bigint test-vm test-fift test-cells test-smartcont test-net ^
-test-tdactor test-tdutils test-tonlib-offline test-adnl test-dht test-rldp test-rldp2 test-catchain ^
+test-tdactor test-coro test-tdutils test-tonlib-offline test-adnl test-dht test-rldp test-rldp2 test-catchain ^
 test-fec test-tddb test-db test-validator-session-state test-emulator proxy-liteserver
 IF %errorlevel% NEQ 0 (
   echo Can't compile TON

assembly/native/build-windows.bat

@@ -148,7 +148,7 @@ ninja storage-daemon storage-daemon-cli blockchain-explorer fift func tolk tonli
 tonlib-cli validator-engine lite-client validator-engine-console generate-random-id ^
 json2tlo dht-server http-proxy rldp-http-proxy adnl-proxy create-state create-hardfork emulator ^
 test-ed25519 test-bigint test-vm test-fift test-cells test-smartcont test-net ^
-test-tdactor test-tdutils test-tonlib-offline test-adnl test-dht test-rldp test-rldp2 test-catchain ^
+test-tdactor test-coro test-tdutils test-tonlib-offline test-adnl test-dht test-rldp test-rldp2 test-catchain ^
 test-fec test-tddb test-db test-validator-session-state test-emulator proxy-liteserver dht-ping-servers dht-resolve
 IF %errorlevel% NEQ 0 (
   echo Can't compile TON

blockchain-explorer/blockchain-explorer-http.cpp

@@ -366,7 +366,7 @@ HttpAnswer& HttpAnswer::operator<<(AccountCell acc_c) {
   last_trans_hash.set_zero();
   block::CurrencyCollection balance = block::CurrencyCollection::zero();
   try {
-    auto state_root = vm::MerkleProof::virtualize(acc_c.q_roots[1], 1);
+    auto state_root = vm::MerkleProof::virtualize(acc_c.q_roots[1]);
     if (state_root.is_null()) {
       abort("account state proof is invalid");
       return *this;
@@ -474,7 +474,7 @@ HttpAnswer& HttpAnswer::operator<<(BlockHeaderCell head_c) {
   vm::CellSlice cs{vm::NoVm(), head_c.root};
   auto block_id = head_c.block_id;
   try {
-    auto virt_root = vm::MerkleProof::virtualize(head_c.root, 1);
+    auto virt_root = vm::MerkleProof::virtualize(head_c.root);
     if (virt_root.is_null()) {
       abort("invalid merkle proof");
       return *this;