Merge pull request #3 from toncenter/develop

Enormous refactor

Author: kdimentionaltree

.clang-format

@@ -17,6 +17,8 @@ BreakBeforeTernaryOperators: false
 BreakConstructorInitializers: AfterColon
 ColumnLimit:     120
 DeriveLineEnding: false
+IndentWidth: 2
+ContinuationIndentWidth: 2
 IndentCaseBlocks: false
 IndentExternBlock: AfterExternBlock
 InsertNewlineAtEOF: true

.github/workflows/build-docker.yaml

@@ -4,6 +4,7 @@ on:
   push:
     tags:
       - 'v*.*.*'
+      - 'dev*'
 
 jobs:
   release:

.gitignore

@@ -166,6 +166,7 @@ celerybeat.pid
 
 # Environments
 .env
+.env*
 .venv
 env/
 venv/
@@ -221,3 +222,7 @@ sandbox/
 .vscode/
 .idea/
 .DS_Store
+
+# codegen schemas
+playground/schemas/
+ton-http-api/src/schemas/

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "external/ton"]
 	path = external/ton
-	url = https://github.com/kdimentionaltree/ton
+	url = https://github.com/ton-blockchain/ton
 	branch = testnet
 [submodule "external/pybind11"]
 	path = external/pybind11

CMakeLists.txt

@@ -6,9 +6,10 @@ set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 set(CMAKE_CXX_EXTENSIONS FALSE)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)
-set(PY_TONLIB_MULTICLIENT FALSE CACHE BOOL "Build python bindings")
-set(TONLIB_MULTICLIENT_EXAMPLES FALSE CACHE BOOL "Build examples")
+set(PY_TONLIB_MULTICLIENT TRUE CACHE BOOL "Build python bindings")
+set(TONLIB_MULTICLIENT_EXAMPLES TRUE CACHE BOOL "Build examples")
 set(TON_HTTP_API_CPP TRUE CACHE BOOL "Build TON HTTP API")
+set(BUILD_TON_PLAYGROUND FALSE CACHE BOOL "Build TON playground")
 
 add_subdirectory(external/ton EXCLUDE_FROM_ALL)
 
@@ -23,15 +24,22 @@ if (PY_TONLIB_MULTICLIENT)
   add_subdirectory(py)
 endif()
 
+
 if (TON_HTTP_API_CPP)
   # userver config
   set(USERVER_FEATURE_REDIS TRUE)
   set(USERVER_FEATURE_UBOOST_CORO TRUE)
-  set(USERVER_FEATURE_CHAOTIC FALSE)
-  set(USERVER_FEATURE_CHAOTIC_EXPERIMENAL FALSE)
+  set(USERVER_FEATURE_CHAOTIC TRUE)
+  set(USERVER_FEATURE_CHAOTIC_EXPERIMENAL TRUE)
   set(USERVER_FEATURE_UTEST FALSE)
   set(USERVER_FEATURE_TESTSUITE FALSE)
   set(USERVER_USE_STATIC_LIBS TRUE)
   add_subdirectory(external/userver EXCLUDE_FROM_ALL)
   add_subdirectory(ton-http-api)
-endif()
+endif()
+
+
+if (BUILD_TON_PLAYGROUND)
+  message("-- Building TON Playground binary")
+  add_subdirectory(playground)
+endif()

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:24.04
+FROM ubuntu:24.04 AS builder
 RUN DEBIAN_FRONTEND=noninteractive apt update -y \
     && apt install -y wget curl build-essential cmake clang openssl  \
     libssl-dev zlib1g-dev gperf wget git ninja-build libsodium-dev libmicrohttpd-dev liblz4-dev  \
@@ -10,33 +10,38 @@ RUN DEBIAN_FRONTEND=noninteractive apt update -y \
     libhiredis-dev libidn11-dev libjemalloc2 libjemalloc-dev libkrb5-dev libldap2-dev liblz4-dev \
      libnghttp2-dev libpugixml-dev libsnappy-dev libsasl2-dev libssl-dev libxxhash-dev libyaml-cpp0.8  libyaml-cpp-dev \
     libzstd-dev libssh2-1-dev netbase python3-dev python3-jinja2 python3-venv python3-yaml \
-    ragel yasm zlib1g-dev liblzma-dev libre2-dev clang-format gcc g++ \
+    ragel yasm zlib1g-dev liblzma-dev libre2-dev clang-format gcc g++ yq \
     && rm -rf /var/lib/apt/lists/*
 
-ENV CC=/usr/bin/gcc
-ENV CXX=/usr/bin/g++
+ENV CC=/usr/bin/clang
+ENV CXX=/usr/bin/clang++
 ENV CCACHE_DISABLE=1
+ENV USERVER_FEATURE_CRYPTOPP_BLAKE2=0
+ENV BUILD_TON_PLAYGROUND=1
 
 COPY examples/ /app/examples/
 COPY py/ /app/py/
 COPY external/ /app/external/
 COPY tonlib-multiclient/ /app/tonlib-multiclient/
 COPY ton-http-api/ /app/ton-http-api/
+COPY playground/ /app/playground/
 COPY CMakeLists.txt /app/CMakeLists.txt
 
 WORKDIR /app/build
 RUN cmake -DCMAKE_BUILD_TYPE=Release -DPORTABLE=1 .. && make -j$(nproc) && make install
+RUN apt update -y && apt install -y gdb && mkdir -p /root/.config/gdb && echo "set auto-load safe-path /" > /root/.config/gdb/gdbinit
+COPY ton-http-api/static/ /app/static/
 COPY config/static_config.yaml /app/static_config.yaml
-
-RUN apt update && apt install -y gdb && mkdir -p /root/.config/gdb
-RUN echo "set auto-load safe-path /" > /root/.config/gdb/gdbinit
 ENTRYPOINT [ "ton-http-api-cpp" ]
+# end builder
+
 
-# FROM ubuntu:24.04
-# RUN DEBIAN_FRONTEND=noninteractive apt update -y \
-#     && apt install -y wget curl dnsutils libsecp256k1-dev libsodium-dev libfmt-dev \
-#     && rm -rf /var/lib/apt/lists/*
-# COPY --from=builder /app/build/ton-http-api/ton-http-api-cpp /usr/bin/
-# COPY --from=builder /app/build/tonlib-multiclient/libtonlib_multiclient_lib.so /usr/lib
-# COPY config/static_config_compose.yaml /app/static_config.yaml
-# ENTRYPOINT [ "ton-http-api-cpp" ]
+FROM ubuntu:24.04 AS http-api-cpp
+RUN DEBIAN_FRONTEND=noninteractive apt update -y \
+    && apt install -y curl dnsutils libcurl4 libfmt9 libsodium23 libcctz2 libatomic1 libicu74 \
+    && rm -rf /var/lib/apt/lists/*
+COPY --from=builder /app/build/ton-http-api/ton-http-api-cpp /usr/bin/
+COPY --from=builder /app/build/tonlib-multiclient/libtonlib_multiclient_lib.so /usr/lib
+COPY ton-http-api/static/ /app/static/
+COPY config/static_config.yaml /app/static_config.yaml
+ENTRYPOINT [ "ton-http-api-cpp" ]

config/config_vars.yaml

@@ -22,8 +22,16 @@ log_path: "@stdout"         # log destination, available options:
                             # /path/to/file - log to file
                             # Note: if you log into file,
                             # logs will be deleted after deploying new container
-log_format: json            # logs format, one of `tskv`, `ltsv`, `json`
 system_log_level: warning   # userver system logs
-system_log_path: "@null"
+system_log_path: "@stdout"
+
+jsonrpc_log_level: warning  # jsonrpc endpoint logs
+                            # note that requests to jsonRPC endpoint will appear in both of api-v2 and jsonrpc loggers
+jsonrpc_log_path: "@stdout"
+
+log_format: json            # logs format, one of `tskv`, `ltsv`, `json`
 
 http_worker_user_agent: empty  # http user agent to set in request to boc endpoint
+
+static_content_dir: "/static/"  # directory for static content
+max_stack_entry_depth: 100      # max stack entry depth for runGetMethod