Merge branch 'testnet' into collated-data-opt

Author: SpyCheese

.clang-format

@@ -49,6 +49,16 @@ DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
 FixNamespaceComments: true
 # ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
+IncludeBlocks: Regroup
+IncludeCategories:
+  - Regex:           '>$'
+    Priority:        -3
+  - Regex:           '.h>$'
+    Priority:        -2
+  - Regex:           '^\".*/.*\"$'
+    Priority:        -1
+  - Regex:           '^\"[^/]*\"$'
+    Priority:        0
 IndentCaseLabels: true
 IndentWidth:     2
 IndentWrappedFunctionNames: false
@@ -70,7 +80,7 @@ PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 200
 PointerAlignment: Left
 ReflowComments:  false # true
-SortIncludes: false # disabled, because we need case insensitive sort
+SortIncludes: true
 SpaceAfterCStyleCast: false
 SpaceAfterTemplateKeyword: true
 SpaceBeforeAssignmentOperators: true

.gitattributes

@@ -34,3 +34,7 @@ third_party/** linguist-vendored
 *.a binary
 *.jar binary
 *.tlo binary
+
+*.h merge=clang-format-driver
+*.cpp merge=clang-format-driver
+*.hpp merge=clang-format-driver

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

@@ -1,9 +1,9 @@
-name: Ubuntu TON -Werror build (shared, x86-64)
+name: Lint
 
 on: [push, pull_request, workflow_dispatch, workflow_call]
 
 jobs:
-  build:
+  lint:
     runs-on: ubuntu-24.04
 
     steps:
@@ -27,7 +27,7 @@ jobs:
       run: |
         wget https://apt.llvm.org/llvm.sh
         chmod +x llvm.sh
-        sudo ./llvm.sh 21 clang
+        sudo ./llvm.sh 21 all
 
     # TODO: Preserve ccache cache between runs once we get rid of warning suppression mappings.
 
@@ -41,3 +41,9 @@ jobs:
           -DTON_USE_LLD=On \
           -DTON_WERROR_BUILD=On
         ninja -C build
+
+    - name: Check C++ formatting
+      run: |
+        # TODO: Run clang-format only on changed files.
+        clang-format-21 -i $(git ls-files '*.h' '*.hpp' '*.cpp' ':!^example/android/third_party' ':!^tolk/')
+        git diff --exit-code

.github/workflows/build-ton-macos-13-x86-64-portable.yml renamed to .github/workflows/build-ton-macos-15-x86-64-portable.yml

@@ -1,10 +1,10 @@
-name: MacOS-13 TON build (portable, x86-64)
+name: MacOS-15 TON build (portable, x86-64)
 
 on: [push, pull_request, workflow_dispatch, workflow_call]
 
 jobs:
   build:
-    runs-on: macos-13
+    runs-on: macos-15-intel
 
     steps:
       - name: Check out repository
@@ -28,23 +28,23 @@ jobs:
         uses: actions/cache@v4
         with:
           path: 3pp
-          key: ${{ runner.os }}-${{ runner.arch }}-13-3pp-${{ hashFiles('**/assembly/native/build-macos-portable.sh') }}
+          key: ${{ runner.os }}-${{ runner.arch }}-15-3pp-${{ hashFiles('**/assembly/native/build-macos-portable.sh') }}
 
       - name: Cache TON test
         id: cache-ton
         uses: actions/cache@v4
         with:
           path: ~/.ccache
-          key: ${{ runner.os }}-${{ runner.arch }}-13-portable-ccache-${{ steps.date-stamp.outputs.timestamp }}
-          restore-keys: ${{ runner.os }}-${{ runner.arch }}-13-portable-ccache
+          key: ${{ runner.os }}-${{ runner.arch }}-15-portable-ccache-${{ steps.date-stamp.outputs.timestamp }}
+          restore-keys: ${{ runner.os }}-${{ runner.arch }}-15-portable-ccache
 
       - name: Build TON
         run: |
           git submodule sync --recursive
           git submodule update
           cp assembly/native/build-macos-portable.sh .
           chmod +x build-macos-portable.sh
-          ./build-macos-portable.sh -t -a -c -o 13.0
+          ./build-macos-portable.sh -t -a -c -o 15.0
           ccache -sp
 
       - name: Run Tests

.github/workflows/clear-gh-cache.yml

@@ -0,0 +1,13 @@
+name: Clear all GH cache
+
+on:
+  workflow_dispatch
+
+jobs:
+  clear-cache:
+    env:
+      GH_TOKEN: ${{ github.token }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clear all cache
+        run: gh cache delete --all

.github/workflows/create-release.yml

@@ -53,7 +53,7 @@ jobs:
       - name: Download Mac x86-64 artifacts
         uses: dawidd6/action-download-artifact@v6
         with:
-          workflow: build-ton-macos-13-x86-64-portable.yml
+          workflow: build-ton-macos-15-x86-64-portable.yml
           path: artifacts
           workflow_conclusion: success
           branch: master
@@ -71,7 +71,7 @@ jobs:
       - name: Download and unzip Mac x86-64 artifacts
         uses: dawidd6/action-download-artifact@v6
         with:
-          workflow: build-ton-macos-13-x86-64-portable.yml
+          workflow: build-ton-macos-15-x86-64-portable.yml
           path: artifacts
           workflow_conclusion: success
           branch: master

.github/workflows/create-tolk-release.yml

@@ -40,7 +40,7 @@ jobs:
       - name: Download and unzip Mac x86-64 artifacts
         uses: dawidd6/action-download-artifact@v6
         with:
-          workflow: build-ton-macos-13-x86-64-portable.yml
+          workflow: build-ton-macos-15-x86-64-portable.yml
           path: artifacts
           workflow_conclusion: success
           branch: master

adnl/adnl-address-list.cpp

@@ -16,12 +16,13 @@
 
     Copyright 2017-2020 Telegram Systems LLP
 */
-#include "adnl-address-list.hpp"
-#include "adnl-peer-table.h"
 #include "auto/tl/ton_api.hpp"
-#include "td/utils/overloaded.h"
-#include "td/net/UdpServer.h"
 #include "keys/encryptor.h"
+#include "td/net/UdpServer.h"
+#include "td/utils/overloaded.h"
+
+#include "adnl-address-list.hpp"
+#include "adnl-peer-table.h"
 
 namespace ton {
 

adnl/adnl-address-list.h

@@ -18,9 +18,10 @@
 */
 #pragma once
 
-#include "adnl-network-manager.h"
 #include "crypto/common/refcnt.hpp"
 
+#include "adnl-network-manager.h"
+
 namespace ton {
 
 namespace adnl {

adnl/adnl-address-list.hpp

@@ -18,8 +18,8 @@
 */
 #pragma once
 
-#include "adnl-node-id.hpp"
 #include "adnl-address-list.h"
+#include "adnl-node-id.hpp"
 
 namespace ton {