Skip to content

Commit d4de286

Browse files
authored
Merge pull request #1288 from ton-blockchain/testnet
Merge developer branch
2 parents 921aa29 + f82827e commit d4de286

File tree

234 files changed

+8386
-1700
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

234 files changed

+8386
-1700
lines changed

.github/workflows/build-ton-linux-android-tonlib.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ jobs:
2828
- name: Upload artifacts
2929
uses: actions/upload-artifact@master
3030
with:
31-
name: tonlib-android
31+
name: ton-android-tonlib
3232
path: artifacts

.github/workflows/build-ton-linux-x86-64-shared.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ jobs:
2121
sudo apt-get update
2222
sudo apt-get install -y build-essential git cmake ninja-build zlib1g-dev libsecp256k1-dev libmicrohttpd-dev libsodium-dev liblz4-dev libjemalloc-dev
2323
24+
- if: matrix.os == 'ubuntu-20.04'
25+
run: |
26+
sudo apt install -y manpages-dev software-properties-common
27+
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
28+
sudo apt update && sudo apt install gcc-11 g++-11
29+
2430
- if: matrix.os != 'ubuntu-24.04'
2531
run: |
2632
wget https://apt.llvm.org/llvm.sh
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: MacOS-15 TON build (shared, arm64)
2+
3+
on: [push,workflow_dispatch,workflow_call]
4+
5+
jobs:
6+
build:
7+
runs-on: macos-15
8+
9+
steps:
10+
- name: Check out repository
11+
uses: actions/checkout@v3
12+
with:
13+
submodules: 'recursive'
14+
15+
- name: Build TON
16+
run: |
17+
cp assembly/native/build-macos-shared.sh .
18+
chmod +x build-macos-shared.sh
19+
./build-macos-shared.sh -t -a
20+
21+
- name: Upload artifacts
22+
uses: actions/upload-artifact@master
23+
with:
24+
name: ton-binaries-macos-15
25+
path: artifacts

.github/workflows/build-ton-macos-arm64-shared.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: MacOS TON build (shared, arm64)
1+
name: MacOS-14 TON build (shared, arm64)
22

33
on: [push,workflow_dispatch,workflow_call]
44

.github/workflows/create-release.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,14 @@ jobs:
8383
workflow_conclusion: success
8484
skip_unpack: true
8585

86+
- name: Download Android Tonlib artifacts
87+
uses: dawidd6/action-download-artifact@v2
88+
with:
89+
workflow: build-ton-linux-android-tonlib.yml
90+
path: artifacts
91+
workflow_conclusion: success
92+
skip_unpack: true
93+
8694
- name: Show all artifacts
8795
run: |
8896
tree artifacts
@@ -501,3 +509,11 @@ jobs:
501509
file: artifacts/ton-wasm-binaries.zip
502510
asset_name: ton-wasm-binaries.zip
503511
tag: ${{ steps.tag.outputs.TAG }}
512+
513+
- name: Upload Android Tonlib artifacts
514+
uses: svenstaro/upload-release-action@v2
515+
with:
516+
repo_token: ${{ secrets.GITHUB_TOKEN }}
517+
file: artifacts/ton-android-tonlib.zip
518+
asset_name: ton-android-tonlib.zip
519+
tag: ${{ steps.tag.outputs.TAG }}

.github/workflows/ton-ccpcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
generate report: true
2121

2222
- name: Upload report
23-
uses: actions/upload-artifact@v1
23+
uses: actions/upload-artifact@master
2424
with:
2525
name: ton-ccpcheck-report
2626
path: output

CMake/FindSodium.cmake

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,16 @@ elseif (WIN32)
127127
endif()
128128
string(APPEND _PLATFORM_PATH "/$$CONFIG$$")
129129

130+
message(STATUS "MSVC_VERSION ${MSVC_VERSION}")
130131
if (MSVC_VERSION LESS 1900)
131132
math(EXPR _VS_VERSION "${MSVC_VERSION} / 10 - 60")
132133
else()
133-
math(EXPR _VS_VERSION "${MSVC_VERSION} / 10 - 50")
134+
if (MSVC_VERSION EQUAL 1941)
135+
math(EXPR _VS_VERSION "${MSVC_VERSION} / 10 - 51")
136+
else()
137+
math(EXPR _VS_VERSION "${MSVC_VERSION} / 10 - 50")
138+
endif()
139+
134140
endif()
135141
string(APPEND _PLATFORM_PATH "/v${_VS_VERSION}")
136142

CMakeLists.txt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ else()
7979
set(HAVE_SSE42 FALSE)
8080
endif()
8181

82-
set(CMAKE_CXX_STANDARD 17)
82+
set(CMAKE_CXX_STANDARD 20)
8383
set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
8484
set(CMAKE_CXX_EXTENSIONS FALSE)
8585

@@ -333,6 +333,10 @@ add_cxx_compiler_flag("-Wno-sign-conversion")
333333
add_cxx_compiler_flag("-Qunused-arguments")
334334
add_cxx_compiler_flag("-Wno-unused-private-field")
335335
add_cxx_compiler_flag("-Wno-redundant-move")
336+
337+
#add_cxx_compiler_flag("-Wno-unused-function")
338+
#add_cxx_compiler_flag("-Wno-unused-variable")
339+
#add_cxx_compiler_flag("-Wno-shorten-64-to-32")
336340
#add_cxx_compiler_flag("-Werror")
337341

338342
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem /usr/include/c++/v1")
@@ -484,10 +488,10 @@ target_link_libraries(test-net PRIVATE tdnet tdutils ${CMAKE_THREAD_LIBS_INIT})
484488

485489
#BEGIN tonlib
486490
add_executable(test-tonlib ${TONLIB_ONLINE_TEST_SOURCE})
487-
target_link_libraries(test-tonlib tdutils tdactor adnllite tl_api ton_crypto ton_block tl_tonlib_api tonlib)
491+
target_link_libraries(test-tonlib tdactor adnllite tl_api ton_crypto tl_tonlib_api tonlib)
488492

489493
add_executable(test-tonlib-offline test/test-td-main.cpp ${TONLIB_OFFLINE_TEST_SOURCE})
490-
target_link_libraries(test-tonlib-offline tdutils tdactor adnllite tl_api ton_crypto ton_block fift-lib tl_tonlib_api tonlib)
494+
target_link_libraries(test-tonlib-offline tdactor adnllite tl_api ton_crypto fift-lib tl_tonlib_api tonlib)
491495

492496
if (NOT CMAKE_CROSSCOMPILING)
493497
add_dependencies(test-tonlib-offline gen_fif)
@@ -529,6 +533,8 @@ target_link_libraries(test-rldp2 adnl adnltest dht rldp2 tl_api)
529533
add_executable(test-validator-session-state test/test-validator-session-state.cpp)
530534
target_link_libraries(test-validator-session-state adnl dht rldp validatorsession tl_api)
531535

536+
add_executable(test-overlay test/test-overlay.cpp)
537+
target_link_libraries(test-overlay overlay tdutils tdactor adnl adnltest tl_api dht )
532538
add_executable(test-catchain test/test-catchain.cpp)
533539
target_link_libraries(test-catchain overlay tdutils tdactor adnl adnltest rldp tl_api dht
534540
catchain )

Changelog.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
## 2024.10 Update
2+
3+
1. Parallel write to celldb: substantial improvement of sync and GC speed, especially with slow disks.
4+
2. Decreased network traffic: only first block candidate is sent optimistically.
5+
3. Improved channel creation and dht lookups, introduction of semi-private overlays
6+
4. New LS dispatch queue related methods and improvement security
7+
5. Fixing recursion in TVM continuations
8+
6. Improved stats for actors, validator sessions, perf counters, overlays, adnl, rocksdb
9+
7. Migration to C++20
10+
8. Improved block size estimates: account for depth in various structures
11+
9. Fix bug with `<<` optimization in FunC
12+
10. Minor changes of TVM which will be activated by `Config8.version >= 9`
13+
11. Multiple minor improvements
14+
15+
Besides the work of the core team, this update is based on the efforts of @krigga (emulator), Arayz @ TonBit (LS security, TVM recursion), @ret2happy (UB in BLST).
16+
117
## 2024.08 Update
218

319
1. Introduction of dispatch queues, message envelopes with transaction chain metadata, and explicitly stored msg_queue size, which will be activated by `Config8.version >= 8` and new `Config8.capabilities` bits: `capStoreOutMsgQueueSize`, `capMsgMetadata`, `capDeferMessages`.

adnl/CMakeLists.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,17 +88,15 @@ target_link_libraries(adnl PUBLIC tdactor ton_crypto tl_api tdnet tddb keys keyr
8888

8989
add_executable(adnl-proxy ${ADNL_PROXY_SOURCE})
9090
target_include_directories(adnl-proxy PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>)
91-
target_link_libraries(adnl-proxy PUBLIC tdactor ton_crypto tl_api tdnet common
92-
tl-utils git)
91+
target_link_libraries(adnl-proxy PUBLIC tdactor ton_crypto tl_api tdnet common tl-utils git)
9392

9493
add_executable(adnl-pong adnl-pong.cpp)
9594
target_include_directories(adnl-pong PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>)
96-
target_link_libraries(adnl-pong PUBLIC tdactor ton_crypto tl_api tdnet common
97-
tl-utils adnl dht git)
95+
target_link_libraries(adnl-pong PUBLIC tdactor ton_crypto tl_api tdnet common tl-utils adnl dht git)
9896

9997
add_library(adnltest STATIC ${ADNL_TEST_SOURCE})
10098
target_include_directories(adnltest PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>)
101-
target_link_libraries(adnltest PUBLIC adnl )
99+
target_link_libraries(adnltest PUBLIC adnl)
102100

103101
install(TARGETS adnl-proxy RUNTIME DESTINATION bin)
104102
endif()

0 commit comments

Comments
 (0)