Merge branch 'testnet' into collated-data-opt

Author: SpyCheese

CMakeLists.txt

@@ -424,9 +424,12 @@ add_subdirectory(tolk)
 add_subdirectory(tonlib)
 #END tonlib
 
+# Temporary (?) move those two targets in TONLIB targets
+add_subdirectory(common)
+add_subdirectory(http)
+
 #BEGIN internal
 if (NOT TON_ONLY_TONLIB)
-add_subdirectory(common)
 add_subdirectory(tdfec)
 add_subdirectory(keyring)
 add_subdirectory(fec)
@@ -444,7 +447,6 @@ add_subdirectory(validator-engine-console)
 add_subdirectory(create-hardfork)
 add_subdirectory(dht-server)
 add_subdirectory(utils)
-add_subdirectory(http)
 add_subdirectory(rldp-http-proxy)
 endif()
 #END internal

adnl/adnl.h

@@ -66,9 +66,11 @@ class Adnl : public AdnlSenderInterface {
  public:
   class Callback {
    public:
-    virtual void receive_message(AdnlNodeIdShort src, AdnlNodeIdShort dst, td::BufferSlice data) = 0;
+    virtual void receive_message(AdnlNodeIdShort src, AdnlNodeIdShort dst, td::BufferSlice data) {
+    }
     virtual void receive_query(AdnlNodeIdShort src, AdnlNodeIdShort dst, td::BufferSlice data,
-                               td::Promise<td::BufferSlice> promise) = 0;
+                               td::Promise<td::BufferSlice> promise) {
+    }
     virtual ~Callback() = default;
   };
 

assembly/android/build-android-tonlib.sh

@@ -12,12 +12,12 @@ export CC=$(which clang-16)
 export CXX=$(which clang++-16)
 export CCACHE_DISABLE=1
 
-if [ ! -d android-ndk-r25b ]; then
-  rm android-ndk-r25b-linux.zip
-  echo "Downloading https://dl.google.com/android/repository/android-ndk-r25b-linux.zip"
-  wget -q https://dl.google.com/android/repository/android-ndk-r25b-linux.zip
-  unzip -q android-ndk-r25b-linux.zip
-  test $? -eq 0 || { echo "Can't unzip android-ndk-r25b-linux.zip"; exit 1; }
+if [ ! -d android-ndk-r27d ]; then
+  rm android-ndk-r27d-linux.zip
+  echo "Downloading https://dl.google.com/android/repository/android-ndk-r27d-linux.zip"
+  wget -q https://dl.google.com/android/repository/android-ndk-r27d-linux.zip
+  unzip -q android-ndk-r27d-linux.zip
+  test $? -eq 0 || { echo "Can't unzip android-ndk-r27d-linux.zip"; exit 1; }
   echo "Android NDK extracted"
 else
   echo "Using extracted Android NDK"
@@ -29,13 +29,13 @@ export JAVA_INCLUDE_PATH=${JAVA_HOME}/include
 export JAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include
 export JAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux
 
-export ANDROID_NDK_ROOT=$(pwd)/android-ndk-r25b
+export ANDROID_NDK_ROOT=$(pwd)/android-ndk-r27d
 export NDK_PLATFORM="android-21"
 export ANDROID_PLATFORM="android-21"
 export OPENSSL_DIR=$(pwd)/example/android/third_party/crypto
 
 rm -rf example/android/src/drinkless/org/ton/TonApi.java
-cd example/android/
+cd example/android/ || exit
 
 rm CMakeCache.txt .ninja_*
 cmake -GNinja -DTON_ONLY_TONLIB=ON .

catchain/catchain-receiver.cpp

@@ -825,7 +825,7 @@ void CatChainReceiverImpl::synchronize_with(CatChainReceiverSource *S) {
     if (SS->blamed()) {
       rt[i] = -1;
     } else {
-      rt[i] = static_cast<td::int32>(S->delivered_height());
+      rt[i] = static_cast<td::int32>(SS->delivered_height());
     }
   }
 

common/global-version.h

@@ -19,6 +19,6 @@
 namespace ton {
 
 // See doc/GlobalVersions.md
-constexpr int SUPPORTED_VERSION = 12;
+constexpr int SUPPORTED_VERSION = 13;
 
 }  // namespace ton

create-hardfork/create-hardfork.cpp

@@ -234,53 +234,6 @@ class HardforkCreator : public td::actor::Actor {
         td::actor::send_closure(id_, &ton::validator::ValidatorManager::sync_complete,
                                 td::PromiseCreator::lambda([](td::Unit) {}));
       }
-      void on_new_masterchain_block(td::Ref<ton::validator::MasterchainState> state,
-                                    std::set<ton::ShardIdFull> shards_to_monitor) override {
-      }
-      void send_ihr_message(ton::AccountIdPrefixFull dst, td::BufferSlice data) override {
-      }
-      void send_ext_message(ton::AccountIdPrefixFull dst, td::BufferSlice data) override {
-      }
-      void send_shard_block_info(ton::BlockIdExt block_id, ton::CatchainSeqno cc_seqno, td::BufferSlice data) override {
-      }
-      void send_block_candidate_broadcast(ton::BlockIdExt block_id, ton::CatchainSeqno cc_seqno,
-                                          td::uint32 validator_set_hash, td::BufferSlice data,
-                                          td::optional<td::BufferSlice> collated_data, int mode) override {
-      }
-      void send_broadcast(ton::BlockBroadcast broadcast, int mode) override {
-      }
-      void download_block(ton::BlockIdExt block_id, td::uint32 priority, td::Timestamp timeout,
-                          td::Promise<ton::ReceivedBlock> promise) override {
-      }
-      void download_zero_state(ton::BlockIdExt block_id, td::uint32 priority, td::Timestamp timeout,
-                               td::Promise<td::BufferSlice> promise) override {
-      }
-      void download_persistent_state(ton::BlockIdExt block_id, ton::BlockIdExt masterchain_block_id,
-                                     ton::validator::PersistentStateType type, td::uint32 priority,
-                                     td::Timestamp timeout, td::Promise<td::BufferSlice> promise) override {
-      }
-      void download_block_proof(ton::BlockIdExt block_id, td::uint32 priority, td::Timestamp timeout,
-                                td::Promise<td::BufferSlice> promise) override {
-      }
-      void download_block_proof_link(ton::BlockIdExt block_id, td::uint32 priority, td::Timestamp timeout,
-                                     td::Promise<td::BufferSlice> promise) override {
-      }
-      void get_next_key_blocks(ton::BlockIdExt block_id, td::Timestamp timeout,
-                               td::Promise<std::vector<ton::BlockIdExt>> promise) override {
-      }
-      void download_archive(ton::BlockSeqno masterchain_seqno, ton::ShardIdFull shard_prefix, std::string tmp_dir,
-                            td::Timestamp timeout, td::Promise<std::string> promise) override {
-      }
-      void download_out_msg_queue_proof(
-          ton::ShardIdFull dst_shard, std::vector<ton::BlockIdExt> blocks, block::ImportedMsgQueueLimits limits,
-          td::Timestamp timeout, td::Promise<std::vector<td::Ref<ton::validator::OutMsgQueueProof>>> promise) override {
-      }
-      void download_block_candidate(ton::BlockIdExt block_id, bool only_collated_data, td::Timestamp timeout,
-                                    td::Promise<std::pair<td::BufferSlice, td::BufferSlice>> promise) override {
-      }
-
-      void new_key_block(ton::validator::BlockHandle handle) override {
-      }
     };
 
     td::actor::send_closure(validator_manager_, &ton::validator::ValidatorManagerInterface::install_callback,