Skip to content

Commit 228c489

Browse files
authored
Merge branch 'testnet' into version-12
2 parents 37f10de + 743deba commit 228c489

File tree

283 files changed

+14840
-2952
lines changed

Some content is hidden

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

283 files changed

+14840
-2952
lines changed

.github/workflows/build-ton-linux-arm64-appimage.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ jobs:
2121
- name: Install system libraries
2222
run: |
2323
sudo apt update
24-
sudo apt install -y build-essential git cmake ninja-build zlib1g-dev libsecp256k1-dev libmicrohttpd-dev libsodium-dev liblz4-dev ccache
25-
sudo apt remove libgsl-dev
24+
sudo apt install -y build-essential git cmake ninja-build zlib1g-dev libsecp256k1-dev libmicrohttpd-dev libsodium-dev liblz4-dev ccache libgsl-dev libblas-dev libgslcblas0
2625
mkdir ~/.ccache 3pp
2726
2827
- name: Install clang-16

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Install system libraries
2222
run: |
2323
sudo apt update
24-
sudo apt install -y build-essential git cmake ninja-build zlib1g-dev libsecp256k1-dev libmicrohttpd-dev libsodium-dev liblz4-dev ccache libgsl-dev libblas-dev
24+
sudo apt install -y build-essential git cmake ninja-build zlib1g-dev libsecp256k1-dev libmicrohttpd-dev libsodium-dev liblz4-dev ccache libgsl-dev libblas-dev libgslcblas0
2525
mkdir ~/.ccache 3pp
2626
2727
- name: Install clang-16

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
git submodule update
3737
cp assembly/native/build-macos-shared.sh .
3838
chmod +x build-macos-shared.sh
39-
./build-macos-shared.sh -t -c -o 15.0
39+
./build-macos-shared.sh -t -c -o 16.0
4040
ccache -sp
4141
4242
- name: Run Tests

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ on:
99

1010
permissions: write-all
1111

12+
env:
13+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
14+
1215
jobs:
1316
create-release:
1417
runs-on: ubuntu-22.04
@@ -152,3 +155,11 @@ jobs:
152155
asset_name: ton-wasm.zip
153156
tag: ${{ inputs.tag }}
154157

158+
- name: Upload stdlib
159+
run: |
160+
mkdir smartcont_lib
161+
cd smartcont_lib
162+
cp -r ../artifacts/ton-x86_64-linux/{smartcont,lib} .
163+
zip -r smartcont_lib.zip .
164+
gh release upload ${{ inputs.tag }} smartcont_lib.zip
165+

Changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2025.07 Accelerator Update
2+
3+
Separation of validation and collation processes that allows to host them on independent machines and achieve full horizontal scaling. [More details in documentation](https://docs.ton.org/v3/documentation/infra/nodes/validation/collators)
4+
15
## 2025.06 Update
26

37
1. ADNL and candidate broadcast optimization

adnl/adnl-ext-client.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,14 @@ void AdnlExtClientImpl::alarm() {
3131
next_create_at_ = td::Timestamp::in(10.0);
3232
alarm_timestamp() = next_create_at_;
3333

34+
if (!dst_host_.empty()) {
35+
auto S = dst_addr_.init_host_port(dst_host_);
36+
if (S.is_error()) {
37+
LOG(INFO) << "failed to connect to " << dst_host_ << ": " << S;
38+
return;
39+
}
40+
LOG(DEBUG) << "resolved " << dst_host_ << " -> " << dst_addr_;
41+
}
3442
auto fd = td::SocketFd::open(dst_addr_);
3543
if (fd.is_error()) {
3644
LOG(INFO) << "failed to connect to " << dst_addr_ << ": " << fd.move_as_error();
@@ -166,6 +174,12 @@ td::actor::ActorOwn<AdnlExtClient> AdnlExtClient::create(AdnlNodeIdFull dst, td:
166174
return td::actor::create_actor<AdnlExtClientImpl>("extclient", std::move(dst), dst_addr, std::move(callback));
167175
}
168176

177+
td::actor::ActorOwn<AdnlExtClient> AdnlExtClient::create(AdnlNodeIdFull dst, std::string dst_host,
178+
std::unique_ptr<AdnlExtClient::Callback> callback) {
179+
return td::actor::create_actor<AdnlExtClientImpl>("extclient", std::move(dst), std::move(dst_host),
180+
std::move(callback));
181+
}
182+
169183
td::actor::ActorOwn<AdnlExtClient> AdnlExtClient::create(AdnlNodeIdFull dst, PrivateKey local_id,
170184
td::IPAddress dst_addr,
171185
std::unique_ptr<AdnlExtClient::Callback> callback) {

adnl/adnl-ext-client.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ class AdnlExtClient : public td::actor::Actor {
3939
td::Promise<td::BufferSlice> promise) = 0;
4040
static td::actor::ActorOwn<AdnlExtClient> create(AdnlNodeIdFull dst, td::IPAddress dst_addr,
4141
std::unique_ptr<AdnlExtClient::Callback> callback);
42+
static td::actor::ActorOwn<AdnlExtClient> create(AdnlNodeIdFull dst, std::string dst_host,
43+
std::unique_ptr<AdnlExtClient::Callback> callback);
4244
static td::actor::ActorOwn<AdnlExtClient> create(AdnlNodeIdFull dst, PrivateKey local_id, td::IPAddress dst_addr,
4345
std::unique_ptr<AdnlExtClient::Callback> callback);
4446
};

adnl/adnl-ext-client.hpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ class AdnlExtClientImpl : public AdnlExtClient {
7171
AdnlExtClientImpl(AdnlNodeIdFull dst_id, td::IPAddress dst_addr, std::unique_ptr<Callback> callback)
7272
: dst_(std::move(dst_id)), dst_addr_(dst_addr), callback_(std::move(callback)) {
7373
}
74+
AdnlExtClientImpl(AdnlNodeIdFull dst_id, std::string dst_host, std::unique_ptr<Callback> callback)
75+
: dst_(std::move(dst_id)), dst_host_(std::move(dst_host)), callback_(std::move(callback)) {
76+
}
7477
AdnlExtClientImpl(AdnlNodeIdFull dst_id, PrivateKey local_id, td::IPAddress dst_addr,
7578
std::unique_ptr<Callback> callback)
7679
: dst_(std::move(dst_id)), local_id_(local_id), dst_addr_(dst_addr), callback_(std::move(callback)) {
@@ -133,6 +136,7 @@ class AdnlExtClientImpl : public AdnlExtClient {
133136
AdnlNodeIdFull dst_;
134137
PrivateKey local_id_;
135138
td::IPAddress dst_addr_;
139+
std::string dst_host_;
136140

137141
std::unique_ptr<Callback> callback_;
138142

assembly/appimage/create-appimages.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ for file in ../artifacts/*; do
2727
printf '[Desktop Entry]\nName='$appName'\nExec='$appName'\nIcon='$appName'\nType=Application\nCategories=Utility;\n' > $appName.AppDir/$appName.desktop
2828
cp ../ton.png $appName.AppDir/$appName.png
2929
cp $file $appName.AppDir/usr/bin/
30-
cp ../build/openssl_3/libcrypto.so.3 \
30+
cp ../openssl_3/libcrypto.so.3 \
3131
/lib/$ARCH-linux-gnu/libatomic.so.1 \
3232
/lib/$ARCH-linux-gnu/libsodium.so.23 \
3333
/lib/$ARCH-linux-gnu/libz.so.1 \
@@ -37,6 +37,7 @@ for file in ../artifacts/*; do
3737
/lib/$ARCH-linux-gnu/libstdc++.so.6 \
3838
/lib/$ARCH-linux-gnu/libgsl.so.27 \
3939
/lib/$ARCH-linux-gnu/libblas.so.3 \
40+
/lib/$ARCH-linux-gnu/libgslcblas.so.0 \
4041
$appName.AppDir/usr/lib/
4142

4243
chmod +x ./$appName.AppDir/usr/bin/$appName

assembly/native/build-macos-portable.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ fi
127127
cmake -GNinja .. \
128128
-DPORTABLE=1 \
129129
-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=$OSX_TARGET \
130+
-DCMAKE_CXX_FLAGS="-stdlib=libc++" \
131+
-DCMAKE_SYSROOT=$(xcrun --show-sdk-path) \
130132
-DCMAKE_BUILD_TYPE=Release \
131133
-DOPENSSL_FOUND=1 \
132134
-DOPENSSL_INCLUDE_DIR=$opensslPath/include \

0 commit comments

Comments
 (0)