updated submodules, bugfixes

- added new fift/func code for validator complaint creation
- bugfixes in validator
- updates in tonlib
- new versions of rocksdb/abseil
- hardfork support

crypto/common/bigint.hpp

@@ -272,7 +272,7 @@ class AnyIntView {
   int parse_binary_any(const char* str, int str_len, int* frac = nullptr);
   std::string to_dec_string_destroy_any();
   std::string to_dec_string_slow_destroy_any();
-  std::string to_hex_string_any(bool upcase = false) const;
+  std::string to_hex_string_any(bool upcase = false, int zero_pad = 0) const;
   std::string to_hex_string_slow_destroy_any();
   std::string to_binary_string_any() const;
 
@@ -650,7 +650,7 @@ class BigIntG {
   std::string to_dec_string_destroy();
   std::string to_dec_string_slow() const;
   std::string to_hex_string_slow() const;
-  std::string to_hex_string(bool upcase = false) const;
+  std::string to_hex_string(bool upcase = false, int zero_pad = 0) const;
   std::string to_binary_string() const;
   double to_double() const {
     return is_valid() ? ldexp(top_double(), (n - 1) * word_shift) : NAN;
@@ -2290,16 +2290,19 @@ std::string AnyIntView<Tr>::to_hex_string_slow_destroy_any() {
 }
 
 template <class Tr>
-std::string AnyIntView<Tr>::to_hex_string_any(bool upcase) const {
+std::string AnyIntView<Tr>::to_hex_string_any(bool upcase, int zero_pad) const {
   if (!is_valid()) {
     return "NaN";
   }
   int s = sgn(), k = 0;
   if (!s) {
+    if (zero_pad > 0) {
+      return std::string(zero_pad, '0');
+    }
     return "0";
   }
   std::string x;
-  x.reserve(((size() * word_shift + word_bits) >> 2) + 2);
+  x.reserve(2 + std::max((size() * word_shift + word_bits) >> 2, zero_pad));
   assert(word_shift < word_bits - 4);
   const char* hex_digs = (upcase ? HEX_digits : hex_digits);
   word_t v = 0;
@@ -2317,6 +2320,11 @@ std::string AnyIntView<Tr>::to_hex_string_any(bool upcase) const {
     x += hex_digs[v & 15];
     v >>= 4;
   }
+  if (zero_pad > 0) {
+    while (x.size() < (unsigned)zero_pad) {
+      x += '0';
+    }
+  }
   if (s < 0) {
     x += '-';
   }
@@ -2498,8 +2506,8 @@ std::string BigIntG<len, Tr>::to_hex_string_slow() const {
 }
 
 template <int len, class Tr>
-std::string BigIntG<len, Tr>::to_hex_string(bool upcase) const {
-  return as_any_int().to_hex_string_any(upcase);
+std::string BigIntG<len, Tr>::to_hex_string(bool upcase, int zero_pad) const {
+  return as_any_int().to_hex_string_any(upcase, zero_pad);
 }
 
 template <int len, class Tr>

crypto/common/promiseop.hpp

@@ -0,0 +1,72 @@
+/*
+    This file is part of TON Blockchain Library.
+
+    TON Blockchain Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    TON Blockchain Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2020 Telegram Systems LLP
+*/
+#pragma once
+#include "refcnt.hpp"
+#include "td/actor/PromiseFuture.h"
+
+namespace td {
+
+template <typename S, typename T>
+class BinaryPromiseMerger : public CntObject {
+  Result<S> first_;
+  Result<T> second_;
+  Promise<std::pair<S, T>> promise_;
+  std::atomic<int> pending_;
+
+ public:
+  BinaryPromiseMerger(Promise<std::pair<S, T>> promise) : promise_(std::move(promise)), pending_(2) {
+  }
+  static std::pair<Promise<S>, Promise<T>> split(Promise<std::pair<S, T>> promise) {
+    auto ref = make_ref<BinaryPromiseMerger>(std::move(promise));
+    auto& obj = ref.write();
+    return std::make_pair(obj.left(), obj.right());
+  }
+
+ private:
+  Promise<S> left() {
+    return [this, self = Ref<BinaryPromiseMerger>(this)](Result<S> res) {
+      first_ = std::move(res);
+      work();
+    };
+  }
+  Promise<T> right() {
+    return [this, self = Ref<BinaryPromiseMerger>(this)](Result<T> res) {
+      second_ = std::move(res);
+      work();
+    };
+  }
+  void work() {
+    if (!--pending_) {
+      if (first_.is_error()) {
+        promise_.set_error(first_.move_as_error());
+      } else if (second_.is_error()) {
+        promise_.set_error(second_.move_as_error());
+      } else {
+        promise_.set_result(std::pair<S, T>(first_.move_as_ok(), second_.move_as_ok()));
+      }
+    }
+  }
+};
+
+template <typename S, typename T>
+std::pair<Promise<S>, Promise<T>> split_promise(Promise<std::pair<S, T>> promise) {
+  return BinaryPromiseMerger<S, T>::split(std::move(promise));
+}
+
+}  // namespace td

crypto/common/refint.cpp

@@ -287,8 +287,8 @@ std::string dec_string2(RefInt256&& x) {
   return x.is_null() ? "(null)" : (x.is_unique() ? x.unique_write().to_dec_string_destroy() : x->to_dec_string());
 }
 
-std::string hex_string(RefInt256 x, bool upcase) {
-  return x.is_null() ? "(null)" : x->to_hex_string(upcase);
+std::string hex_string(RefInt256 x, bool upcase, int zero_pad) {
+  return x.is_null() ? "(null)" : x->to_hex_string(upcase, zero_pad);
 }
 
 std::string binary_string(RefInt256 x) {

crypto/common/refint.h

@@ -120,7 +120,7 @@ extern RefInt256 bits_to_refint(td::ConstBitPtr bits, int n, bool sgnd = false);
 
 extern std::string dec_string(RefInt256 x);
 extern std::string dec_string2(RefInt256&& x);
-extern std::string hex_string(RefInt256 x, bool upcase = false);
+extern std::string hex_string(RefInt256 x, bool upcase = false, int zero_pad = 0);
 extern std::string binary_string(RefInt256 x);
 
 extern RefInt256 dec_string_to_int256(const std::string& s);