updated tonlib

- updated tonlib - updated validator - updated documentation - first version of http over rldp proxy
coalars · Feb 6, 2020 · 77842f9 · 77842f9
1 parent 53ec968
commit 77842f9
Show file tree

Hide file tree

Showing 128 changed files with 10,520 additions and 2,250 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -323,6 +323,7 @@ if (LATEX_FOUND)
   add_latex_document(doc/tvm.tex TARGET_NAME ton_vm_description)
   add_latex_document(doc/tblkch.tex TARGET_NAME ton_blockchain_description)
   add_latex_document(doc/fiftbase.tex TARGET_NAME fift_basic_description)
+  add_latex_document(doc/catchain.tex TARGET_NAME catchain_consensus_description)
 endif()
 #END internal
 
@@ -374,6 +375,8 @@ add_subdirectory(validator-engine)
 add_subdirectory(validator-engine-console)
 add_subdirectory(dht-server)
 add_subdirectory(utils)
+add_subdirectory(http)
+add_subdirectory(rldp-http-proxy)
 endif()
 #END internal
 
@@ -473,6 +476,9 @@ target_link_libraries(test-ton-collator overlay tdutils tdactor adnl tl_api dht
 #add_executable(test-ext-client test/test-ext-client.cpp)
 #target_link_libraries(test-ext-client tdutils tdactor adnl tl_api tl-lite-utils)
 
+add_executable(test-http test/test-http.cpp)
+target_link_libraries(test-http PRIVATE tonhttp)
+
 get_directory_property(HAS_PARENT PARENT_DIRECTORY)
 if (HAS_PARENT)
   set(ALL_TEST_SOURCE

diff --git a/GPLv2 b/GPLv2
@@ -1,4 +1,4 @@
-/* 
+/*
     This file is part of TON Blockchain source code.
 
     TON Blockchain is free software; you can redistribute it and/or
@@ -14,13 +14,13 @@
     You should have received a copy of the GNU General Public License
     along with TON Blockchain.  If not, see <http://www.gnu.org/licenses/>.
 
-    In addition, as a special exception, the copyright holders give permission 
-    to link the code of portions of this program with the OpenSSL library. 
-    You must obey the GNU General Public License in all respects for all 
-    of the code used other than OpenSSL. If you modify file(s) with this 
-    exception, you may extend this exception to your version of the file(s), 
-    but you are not obligated to do so. If you do not wish to do so, delete this 
-    exception statement from your version. If you delete this exception statement 
+    In addition, as a special exception, the copyright holders give permission
+    to link the code of portions of this program with the OpenSSL library.
+    You must obey the GNU General Public License in all respects for all
+    of the code used other than OpenSSL. If you modify file(s) with this
+    exception, you may extend this exception to your version of the file(s),
+    but you are not obligated to do so. If you do not wish to do so, delete this
+    exception statement from your version. If you delete this exception statement
     from all source files in the program, then also delete it here.
 
     Copyright 2017-2020 Telegram Systems LLP

diff --git a/adnl/adnl-address-list.cpp b/adnl/adnl-address-list.cpp
@@ -14,7 +14,7 @@
     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 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "adnl-address-list.hpp"
 #include "adnl-peer-table.h"

diff --git a/adnl/adnl-address-list.h b/adnl/adnl-address-list.h
@@ -14,7 +14,7 @@
     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 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 

diff --git a/adnl/adnl-channel.cpp b/adnl/adnl-channel.cpp
@@ -14,7 +14,7 @@
     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 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "adnl-channel.hpp"
 #include "adnl-peer.h"

diff --git a/adnl/adnl-channel.h b/adnl/adnl-channel.h
@@ -14,7 +14,7 @@
     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 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 

diff --git a/adnl/adnl-channel.hpp b/adnl/adnl-channel.hpp
@@ -14,7 +14,7 @@
     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 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 

diff --git a/adnl/adnl-local-id.cpp b/adnl/adnl-local-id.cpp
@@ -14,7 +14,7 @@
     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 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "td/utils/crypto.h"
 #include "td/utils/Random.h"

diff --git a/adnl/adnl-local-id.h b/adnl/adnl-local-id.h
@@ -14,7 +14,7 @@
     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 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 

diff --git a/adnl/adnl-network-manager.cpp b/adnl/adnl-network-manager.cpp
@@ -14,7 +14,7 @@
     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 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "adnl-network-manager.hpp"
 #include "adnl-peer-table.h"

diff --git a/adnl/adnl-packet.h b/adnl/adnl-packet.h
@@ -14,7 +14,7 @@
     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 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 

diff --git a/adnl/adnl-peer-table.cpp b/adnl/adnl-peer-table.cpp
@@ -14,7 +14,7 @@
     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 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "adnl-peer-table.hpp"
 #include "adnl-peer.h"

diff --git a/adnl/adnl-peer-table.h b/adnl/adnl-peer-table.h
@@ -14,7 +14,7 @@
     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 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 

diff --git a/adnl/adnl-peer-table.hpp b/adnl/adnl-peer-table.hpp
@@ -14,7 +14,7 @@
     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 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 

diff --git a/adnl/adnl-peer.cpp b/adnl/adnl-peer.cpp
@@ -14,7 +14,7 @@
     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 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "adnl-peer.h"
 #include "adnl-peer.hpp"

diff --git a/blockchain-explorer/blockchain-explorer-http.hpp b/blockchain-explorer/blockchain-explorer-http.hpp
@@ -23,7 +23,7 @@
     exception statement from your version. If you delete this exception statement 
     from all source files in the program, then also delete it here.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 

diff --git a/blockchain-explorer/blockchain-explorer-query.cpp b/blockchain-explorer/blockchain-explorer-query.cpp
@@ -24,7 +24,7 @@
     from all source files in the program, then also delete it here.
     along with TON Blockchain.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "blockchain-explorer-query.hpp"
 #include "blockchain-explorer-http.hpp"
@@ -47,7 +47,7 @@
 #include "vm/boc.h"
 #include "vm/cellops.h"
 #include "vm/cells/MerkleProof.h"
-#include "vm/continuation.h"
+#include "vm/vm.h"
 #include "vm/cp0.h"
 
 namespace {
@@ -198,8 +198,9 @@ void HttpQueryCommon::abort_query(td::Status error) {
     HttpAnswer A{"error", prefix_};
     A.abort(std::move(error));
     auto page = A.finish();
-    promise_.set_value(
-        MHD_create_response_from_buffer(page.length(), const_cast<char *>(page.c_str()), MHD_RESPMEM_MUST_COPY));
+    auto R = MHD_create_response_from_buffer(page.length(), const_cast<char *>(page.c_str()), MHD_RESPMEM_MUST_COPY);
+    MHD_add_response_header(R, "Content-Type", "text/html");
+    promise_.set_value(std::move(R));
   }
   stop();
 }
@@ -291,8 +292,9 @@ void HttpQueryBlockView::finish_query() {
       A << HttpAnswer::RawData<block::gen::Block>{root};
       return A.finish();
     }();
-    promise_.set_value(
-        MHD_create_response_from_buffer(page.length(), const_cast<char *>(page.c_str()), MHD_RESPMEM_MUST_COPY));
+    auto R = MHD_create_response_from_buffer(page.length(), const_cast<char *>(page.c_str()), MHD_RESPMEM_MUST_COPY);
+    MHD_add_response_header(R, "Content-Type", "text/html");
+    promise_.set_value(std::move(R));
   }
   stop();
 }
@@ -488,8 +490,9 @@ void HttpQueryBlockInfo::finish_query() {
 
       return A.finish();
     }();
-    promise_.set_value(
-        MHD_create_response_from_buffer(page.length(), const_cast<char *>(page.c_str()), MHD_RESPMEM_MUST_COPY));
+    auto R = MHD_create_response_from_buffer(page.length(), const_cast<char *>(page.c_str()), MHD_RESPMEM_MUST_COPY);
+    MHD_add_response_header(R, "Content-Type", "text/html");
+    promise_.set_value(std::move(R));
   }
   stop();
 }
@@ -709,8 +712,9 @@ void HttpQueryBlockSearch::finish_query() {
 
       return A.finish();
     }();
-    promise_.set_value(
-        MHD_create_response_from_buffer(page.length(), const_cast<char *>(page.c_str()), MHD_RESPMEM_MUST_COPY));
+    auto R = MHD_create_response_from_buffer(page.length(), const_cast<char *>(page.c_str()), MHD_RESPMEM_MUST_COPY);
+    MHD_add_response_header(R, "Content-Type", "text/html");
+    promise_.set_value(std::move(R));
   }
   stop();
 }
@@ -795,8 +799,9 @@ void HttpQueryViewAccount::finish_query() {
       A << HttpAnswer::AccountCell{addr_, res_block_id_, root, Q_roots};
       return A.finish();
     }();
-    promise_.set_value(
-        MHD_create_response_from_buffer(page.length(), const_cast<char *>(page.c_str()), MHD_RESPMEM_MUST_COPY));
+    auto R = MHD_create_response_from_buffer(page.length(), const_cast<char *>(page.c_str()), MHD_RESPMEM_MUST_COPY);
+    MHD_add_response_header(R, "Content-Type", "text/html");
+    promise_.set_value(std::move(R));
   }
   stop();
 }
@@ -893,8 +898,9 @@ void HttpQueryViewTransaction::finish_query() {
       }
       return A.finish();
     }();
-    promise_.set_value(
-        MHD_create_response_from_buffer(page.length(), const_cast<char *>(page.c_str()), MHD_RESPMEM_MUST_COPY));
+    auto R = MHD_create_response_from_buffer(page.length(), const_cast<char *>(page.c_str()), MHD_RESPMEM_MUST_COPY);
+    MHD_add_response_header(R, "Content-Type", "text/html");
+    promise_.set_value(std::move(R));
   }
   stop();
 }
@@ -974,8 +980,9 @@ void HttpQueryViewTransaction2::finish_query() {
       A << HttpAnswer::TransactionCell{addr_, block_id_, list};
       return A.finish();
     }();
-    promise_.set_value(
-        MHD_create_response_from_buffer(page.length(), const_cast<char *>(page.c_str()), MHD_RESPMEM_MUST_COPY));
+    auto R = MHD_create_response_from_buffer(page.length(), const_cast<char *>(page.c_str()), MHD_RESPMEM_MUST_COPY);
+    MHD_add_response_header(R, "Content-Type", "text/html");
+    promise_.set_value(std::move(R));
   }
   stop();
 }
@@ -1178,8 +1185,9 @@ void HttpQueryConfig::finish_query() {
       }
       return A.finish();
     }();
-    promise_.set_value(
-        MHD_create_response_from_buffer(page.length(), const_cast<char *>(page.c_str()), MHD_RESPMEM_MUST_COPY));
+    auto R = MHD_create_response_from_buffer(page.length(), const_cast<char *>(page.c_str()), MHD_RESPMEM_MUST_COPY);
+    MHD_add_response_header(R, "Content-Type", "text/html");
+    promise_.set_value(std::move(R));
   }
   stop();
 }
@@ -1209,8 +1217,9 @@ void HttpQuerySendForm::finish_query() {
         << "</div></form></div>";
       return A.finish();
     }();
-    promise_.set_value(
-        MHD_create_response_from_buffer(page.length(), const_cast<char *>(page.c_str()), MHD_RESPMEM_MUST_COPY));
+    auto R = MHD_create_response_from_buffer(page.length(), const_cast<char *>(page.c_str()), MHD_RESPMEM_MUST_COPY);
+    MHD_add_response_header(R, "Content-Type", "text/html");
+    promise_.set_value(std::move(R));
   }
   stop();
 }
@@ -1270,8 +1279,9 @@ void HttpQuerySend::finish_query() {
       }
       return A.finish();
     }();
-    promise_.set_value(
-        MHD_create_response_from_buffer(page.length(), const_cast<char *>(page.c_str()), MHD_RESPMEM_MUST_COPY));
+    auto R = MHD_create_response_from_buffer(page.length(), const_cast<char *>(page.c_str()), MHD_RESPMEM_MUST_COPY);
+    MHD_add_response_header(R, "Content-Type", "text/html");
+    promise_.set_value(std::move(R));
   }
   stop();
 }
@@ -1434,8 +1444,9 @@ void HttpQueryRunMethod::finish_query() {
 
       return A.finish();
     }();
-    promise_.set_value(
-        MHD_create_response_from_buffer(page.length(), const_cast<char *>(page.c_str()), MHD_RESPMEM_MUST_COPY));
+    auto R = MHD_create_response_from_buffer(page.length(), const_cast<char *>(page.c_str()), MHD_RESPMEM_MUST_COPY);
+    MHD_add_response_header(R, "Content-Type", "text/html");
+    promise_.set_value(std::move(R));
   }
   stop();
 }
@@ -1511,8 +1522,9 @@ void HttpQueryStatus::finish_query() {
       A << "</table></div>";
       return A.finish();
     }();
-    promise_.set_value(
-        MHD_create_response_from_buffer(page.length(), const_cast<char *>(page.c_str()), MHD_RESPMEM_MUST_COPY));
+    auto R = MHD_create_response_from_buffer(page.length(), const_cast<char *>(page.c_str()), MHD_RESPMEM_MUST_COPY);
+    MHD_add_response_header(R, "Content-Type", "text/html");
+    promise_.set_value(std::move(R));
   }
   stop();
 }
diff --git a/blockchain-explorer/blockchain-explorer.cpp b/blockchain-explorer/blockchain-explorer.cpp
@@ -23,7 +23,7 @@
     from all source files in the program, then also delete it here.
     along with TON Blockchain.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "adnl/adnl-ext-client.h"
 #include "adnl/utils.hpp"
@@ -52,7 +52,6 @@
 #include "vm/boc.h"
 #include "vm/cellops.h"
 #include "vm/cells/MerkleProof.h"
-#include "vm/continuation.h"
 #include "vm/cp0.h"
 
 #include "auto/tl/lite_api.h"

diff --git a/blockchain-explorer/blockchain-explorer.hpp b/blockchain-explorer/blockchain-explorer.hpp
@@ -23,7 +23,7 @@
     exception statement from your version. If you delete this exception statement 
     from all source files in the program, then also delete it here.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once