From e2dcbbe134ee9d8e9955ed7ec079004e2848cd67 Mon Sep 17 00:00:00 2001 From: ice-hermes <83634377+ice-hermes@users.noreply.github.com> Date: Thu, 31 Oct 2024 21:24:57 +0200 Subject: [PATCH] Apply rebranding changes --- ...yml => build-ion-linux-android-tonlib.yml} | 0 ....yml => build-ion-linux-x86-64-shared.yml} | 0 ...ml => build-ion-macos-15-arm64-shared.yml} | 0 ...d.yml => build-ion-macos-arm64-shared.yml} | 0 ....yml => build-ion-macos-x86-64-shared.yml} | 0 ...pten.yml => build-ion-wasm-emscripten.yml} | 0 ...on-arm64-macos.yml => ion-arm64-macos.yml} | 0 .../{ton-ccpcheck.yml => ion-ccpcheck.yml} | 0 ...-x86-64-linux.yml => ion-x86-64-linux.yml} | 0 ...-x86-64-macos.yml => ion-x86-64-macos.yml} | 0 ...-64-windows.yml => ion-x86-64-windows.yml} | 0 CMakeLists.txt | 130 +++++++++--------- adnl/CMakeLists.txt | 12 +- assembly/android/build-android-tonlib.sh | 8 +- assembly/native/build-macos-portable.sh | 6 +- assembly/native/build-macos-shared.sh | 6 +- assembly/native/build-ubuntu-portable.sh | 6 +- assembly/native/build-ubuntu-shared.sh | 8 +- assembly/nix/build-linux-arm64-nix.sh | 2 +- assembly/nix/build-linux-x86-64-nix.sh | 2 +- assembly/nix/build-macos-nix.sh | 2 +- assembly/wasm/fift-func-wasm-build-ubuntu.sh | 10 +- blockchain-explorer/CMakeLists.txt | 10 +- common/CMakeLists.txt | 2 +- create-hardfork/CMakeLists.txt | 2 +- crypto/CMakeLists.txt | 122 ++++++++-------- crypto/func/auto-tests/legacy_tester.py | 8 +- crypto/func/auto-tests/legacy_tests.json | 2 +- .../imports/constants.fc | 0 .../imports/jetion-utils.fc} | 0 .../imports/op-codes.fc | 0 .../imports/params.fc | 0 .../imports/stdlib.fc | 0 .../imports/utils.fc | 0 .../jetion-minter.fc} | 0 .../imports/constants.fc | 0 .../imports/jetion-utils.fc} | 0 .../imports/op-codes.fc | 0 .../imports/params.fc | 0 .../imports/stdlib.fc | 0 .../imports/utils.fc | 0 .../jetion-wallet.fc} | 0 ....fc => jetion_JetionDefaultWallet.code.fc} | 0 ...on.code.fc => jetion_SampleJetion.code.fc} | 0 crypto/vm/{tonops.cpp => ionops.cpp} | 0 crypto/vm/{tonops.h => ionops.h} | 0 doc/{ton.tex => ion.tex} | 0 doc/smc-guidelines.txt | 10 +- docker/init.sh | 30 ++-- docker/{ton-ali.yaml => ion-ali.yaml} | 0 docker/{ton-aws.yaml => ion-aws.yaml} | 0 docker/{ton-gcp.yaml => ion-gcp.yaml} | 0 .../{ton-metal-lb.yaml => ion-metal-lb.yaml} | 0 ...{ton-node-port.yaml => ion-node-port.yaml} | 0 emulator/CMakeLists.txt | 2 +- example/android/CMakeLists.txt | 26 ++-- example/android/build.sh | 4 +- example/android/export.sh | 4 +- .../drinkless/org/{ton => ion}/Client.java | 0 example/android/test.sh | 6 +- example/android/test/{ton => ion}/.gitignore | 0 .../android/test/{ton => ion}/build.gradle | 0 .../test/{ton => ion}/proguard-rules.pro | 0 .../java/drinkless/org/ion}/TonTest.kt | 0 .../java/drinkless/org/ion}/TonTestJava.java | 0 .../{ton => ion}/src/main/AndroidManifest.xml | 0 .../main/java/drinkless/org/ion}/Client.java | 0 .../src/main/res/values/strings.xml | 0 .../drinkless/org/ion}/ExampleUnitTest.java | 0 example/cpp/CMakeLists.txt | 6 +- ...onjson_example.cpp => ionjson_example.cpp} | 0 http/CMakeLists.txt | 8 +- ton/ton-io.hpp => ion/ion-io.hpp | 0 ton/ton-shard.h => ion/ion-shard.h | 0 ton/ton-tl.hpp => ion/ion-tl.hpp | 0 ton/ton-types.h => ion/ion-types.h | 0 {ton => ion}/lite-tl.hpp | 0 keyring/CMakeLists.txt | 2 +- keys/CMakeLists.txt | 2 +- lite-client/CMakeLists.txt | 2 +- rldp-http-proxy/CMakeLists.txt | 2 +- rldp2/CMakeLists.txt | 2 +- storage/CMakeLists.txt | 2 +- storage/storage-daemon/CMakeLists.txt | 2 +- tdutils/generate/mime_types.txt | 2 +- test/generate-test-node-config.py | 6 +- ...ton-collator.cpp => test-ion-collator.cpp} | 0 tl-utils/CMakeLists.txt | 4 +- tl/CMakeLists.txt | 14 +- tl/generate/CMakeLists.txt | 32 ++--- tl/generate/scheme/{ton_api.tl => ion_api.tl} | 0 .../scheme/{ton_api.tlo => ion_api.tlo} | Bin tl/generate/scheme/update-tlo.sh | 2 +- tonlib/CMakeLists.txt | 34 ++--- utils/CMakeLists.txt | 8 +- validator-engine-console/CMakeLists.txt | 2 +- validator-engine/CMakeLists.txt | 4 +- validator/CMakeLists.txt | 8 +- validator/impl/CMakeLists.txt | 10 +- 99 files changed, 287 insertions(+), 287 deletions(-) rename .github/workflows/{build-ton-linux-android-tonlib.yml => build-ion-linux-android-tonlib.yml} (100%) rename .github/workflows/{build-ton-linux-x86-64-shared.yml => build-ion-linux-x86-64-shared.yml} (100%) rename .github/workflows/{build-ton-macos-15-arm64-shared.yml => build-ion-macos-15-arm64-shared.yml} (100%) rename .github/workflows/{build-ton-macos-arm64-shared.yml => build-ion-macos-arm64-shared.yml} (100%) rename .github/workflows/{build-ton-macos-x86-64-shared.yml => build-ion-macos-x86-64-shared.yml} (100%) rename .github/workflows/{build-ton-wasm-emscripten.yml => build-ion-wasm-emscripten.yml} (100%) rename .github/workflows/{ton-arm64-macos.yml => ion-arm64-macos.yml} (100%) rename .github/workflows/{ton-ccpcheck.yml => ion-ccpcheck.yml} (100%) rename .github/workflows/{ton-x86-64-linux.yml => ion-x86-64-linux.yml} (100%) rename .github/workflows/{ton-x86-64-macos.yml => ion-x86-64-macos.yml} (100%) rename .github/workflows/{ton-x86-64-windows.yml => ion-x86-64-windows.yml} (100%) rename crypto/func/auto-tests/legacy_tests/{jetton-minter => jetion-minter}/imports/constants.fc (100%) rename crypto/func/auto-tests/legacy_tests/{jetton-minter/imports/jetton-utils.fc => jetion-minter/imports/jetion-utils.fc} (100%) rename crypto/func/auto-tests/legacy_tests/{jetton-minter => jetion-minter}/imports/op-codes.fc (100%) rename crypto/func/auto-tests/legacy_tests/{jetton-minter => jetion-minter}/imports/params.fc (100%) rename crypto/func/auto-tests/legacy_tests/{jetton-minter => jetion-minter}/imports/stdlib.fc (100%) rename crypto/func/auto-tests/legacy_tests/{jetton-minter => jetion-minter}/imports/utils.fc (100%) rename crypto/func/auto-tests/legacy_tests/{jetton-minter/jetton-minter.fc => jetion-minter/jetion-minter.fc} (100%) rename crypto/func/auto-tests/legacy_tests/{jetton-wallet => jetion-wallet}/imports/constants.fc (100%) rename crypto/func/auto-tests/legacy_tests/{jetton-wallet/imports/jetton-utils.fc => jetion-wallet/imports/jetion-utils.fc} (100%) rename crypto/func/auto-tests/legacy_tests/{jetton-wallet => jetion-wallet}/imports/op-codes.fc (100%) rename crypto/func/auto-tests/legacy_tests/{jetton-wallet => jetion-wallet}/imports/params.fc (100%) rename crypto/func/auto-tests/legacy_tests/{jetton-wallet => jetion-wallet}/imports/stdlib.fc (100%) rename crypto/func/auto-tests/legacy_tests/{jetton-wallet => jetion-wallet}/imports/utils.fc (100%) rename crypto/func/auto-tests/legacy_tests/{jetton-wallet/jetton-wallet.fc => jetion-wallet/jetion-wallet.fc} (100%) rename crypto/func/auto-tests/legacy_tests/tact-examples/{jetton_JettonDefaultWallet.code.fc => jetion_JetionDefaultWallet.code.fc} (100%) rename crypto/func/auto-tests/legacy_tests/tact-examples/{jetton_SampleJetton.code.fc => jetion_SampleJetion.code.fc} (100%) rename crypto/vm/{tonops.cpp => ionops.cpp} (100%) rename crypto/vm/{tonops.h => ionops.h} (100%) rename doc/{ton.tex => ion.tex} (100%) rename docker/{ton-ali.yaml => ion-ali.yaml} (100%) rename docker/{ton-aws.yaml => ion-aws.yaml} (100%) rename docker/{ton-gcp.yaml => ion-gcp.yaml} (100%) rename docker/{ton-metal-lb.yaml => ion-metal-lb.yaml} (100%) rename docker/{ton-node-port.yaml => ion-node-port.yaml} (100%) rename example/android/src/drinkless/org/{ton => ion}/Client.java (100%) rename example/android/test/{ton => ion}/.gitignore (100%) rename example/android/test/{ton => ion}/build.gradle (100%) rename example/android/test/{ton => ion}/proguard-rules.pro (100%) rename example/android/test/{ton/src/androidTest/java/drinkless/org/ton => ion/src/androidTest/java/drinkless/org/ion}/TonTest.kt (100%) rename example/android/test/{ton/src/androidTest/java/drinkless/org/ton => ion/src/androidTest/java/drinkless/org/ion}/TonTestJava.java (100%) rename example/android/test/{ton => ion}/src/main/AndroidManifest.xml (100%) rename example/android/test/{ton/src/main/java/drinkless/org/ton => ion/src/main/java/drinkless/org/ion}/Client.java (100%) rename example/android/test/{ton => ion}/src/main/res/values/strings.xml (100%) rename example/android/test/{ton/src/test/java/drinkless/org/ton => ion/src/test/java/drinkless/org/ion}/ExampleUnitTest.java (100%) rename example/cpp/{tonjson_example.cpp => ionjson_example.cpp} (100%) rename ton/ton-io.hpp => ion/ion-io.hpp (100%) rename ton/ton-shard.h => ion/ion-shard.h (100%) rename ton/ton-tl.hpp => ion/ion-tl.hpp (100%) rename ton/ton-types.h => ion/ion-types.h (100%) rename {ton => ion}/lite-tl.hpp (100%) rename test/{test-ton-collator.cpp => test-ion-collator.cpp} (100%) rename tl/generate/scheme/{ton_api.tl => ion_api.tl} (100%) rename tl/generate/scheme/{ton_api.tlo => ion_api.tlo} (100%) diff --git a/.github/workflows/build-ton-linux-android-tonlib.yml b/.github/workflows/build-ion-linux-android-tonlib.yml similarity index 100% rename from .github/workflows/build-ton-linux-android-tonlib.yml rename to .github/workflows/build-ion-linux-android-tonlib.yml diff --git a/.github/workflows/build-ton-linux-x86-64-shared.yml b/.github/workflows/build-ion-linux-x86-64-shared.yml similarity index 100% rename from .github/workflows/build-ton-linux-x86-64-shared.yml rename to .github/workflows/build-ion-linux-x86-64-shared.yml diff --git a/.github/workflows/build-ton-macos-15-arm64-shared.yml b/.github/workflows/build-ion-macos-15-arm64-shared.yml similarity index 100% rename from .github/workflows/build-ton-macos-15-arm64-shared.yml rename to .github/workflows/build-ion-macos-15-arm64-shared.yml diff --git a/.github/workflows/build-ton-macos-arm64-shared.yml b/.github/workflows/build-ion-macos-arm64-shared.yml similarity index 100% rename from .github/workflows/build-ton-macos-arm64-shared.yml rename to .github/workflows/build-ion-macos-arm64-shared.yml diff --git a/.github/workflows/build-ton-macos-x86-64-shared.yml b/.github/workflows/build-ion-macos-x86-64-shared.yml similarity index 100% rename from .github/workflows/build-ton-macos-x86-64-shared.yml rename to .github/workflows/build-ion-macos-x86-64-shared.yml diff --git a/.github/workflows/build-ton-wasm-emscripten.yml b/.github/workflows/build-ion-wasm-emscripten.yml similarity index 100% rename from .github/workflows/build-ton-wasm-emscripten.yml rename to .github/workflows/build-ion-wasm-emscripten.yml diff --git a/.github/workflows/ton-arm64-macos.yml b/.github/workflows/ion-arm64-macos.yml similarity index 100% rename from .github/workflows/ton-arm64-macos.yml rename to .github/workflows/ion-arm64-macos.yml diff --git a/.github/workflows/ton-ccpcheck.yml b/.github/workflows/ion-ccpcheck.yml similarity index 100% rename from .github/workflows/ton-ccpcheck.yml rename to .github/workflows/ion-ccpcheck.yml diff --git a/.github/workflows/ton-x86-64-linux.yml b/.github/workflows/ion-x86-64-linux.yml similarity index 100% rename from .github/workflows/ton-x86-64-linux.yml rename to .github/workflows/ion-x86-64-linux.yml diff --git a/.github/workflows/ton-x86-64-macos.yml b/.github/workflows/ion-x86-64-macos.yml similarity index 100% rename from .github/workflows/ton-x86-64-macos.yml rename to .github/workflows/ion-x86-64-macos.yml diff --git a/.github/workflows/ton-x86-64-windows.yml b/.github/workflows/ion-x86-64-windows.yml similarity index 100% rename from .github/workflows/ton-x86-64-windows.yml rename to .github/workflows/ion-x86-64-windows.yml diff --git a/CMakeLists.txt b/CMakeLists.txt index 573bc3a32..9c3bf2d8c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR) -project(TON VERSION 0.5 LANGUAGES C CXX) +project(ION VERSION 0.5 LANGUAGES C CXX) set(CMAKE_POSITION_INDEPENDENT_CODE ON) #set(OPENSSL_USE_STATIC_LIBS TRUE) @@ -15,11 +15,11 @@ target_include_directories(git PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) add_dependencies(git check_git) # Prevent in-source build -get_filename_component(TON_REAL_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" REALPATH) -get_filename_component(TON_REAL_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}" REALPATH) +get_filename_component(ION_REAL_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" REALPATH) +get_filename_component(ION_REAL_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}" REALPATH) -if (TON_REAL_BINARY_DIR STREQUAL TON_REAL_SOURCE_DIR) - message(" Out-of-source build should be used to build TON.") +if (ION_REAL_BINARY_DIR STREQUAL ION_REAL_SOURCE_DIR) + message(" Out-of-source build should be used to build ION.") message(" You need to remove the files already created by CMake and") message(" rerun CMake from a new directory:") message(" rm -rf CMakeFiles CMakeCache.txt") @@ -85,36 +85,36 @@ set(CMAKE_CXX_EXTENSIONS FALSE) #BEGIN internal option(USE_EMSCRIPTEN "Use \"ON\" for config building wasm." OFF) -option(TON_ONLY_TONLIB "Use \"ON\" to build only tonlib." OFF) +option(ION_ONLY_IONLIB "Use \"ON\" to build only tonlib." OFF) if (USE_EMSCRIPTEN) - set(TON_ONLY_TONLIB true) + set(ION_ONLY_IONLIB true) endif() -if (TON_ONLY_TONLIB) - set(NOT_TON_ONLY_TONLIB false) +if (ION_ONLY_IONLIB) + set(NOT_ION_ONLY_IONLIB false) else() - set(NOT_TON_ONLY_TONLIB true) + set(NOT_ION_ONLY_IONLIB true) endif() -option(TON_USE_ROCKSDB "Use \"ON\" to enable RocksDb." ${NOT_TON_ONLY_TONLIB}) -option(TON_USE_ABSEIL "Use \"ON\" to enable Abseil." ${NOT_TON_ONLY_TONLIB}) -option(TON_USE_JEMALLOC "Use \"ON\" to enable JeMalloc." OFF) +option(ION_USE_ROCKSDB "Use \"ON\" to enable RocksDb." ${NOT_ION_ONLY_IONLIB}) +option(ION_USE_ABSEIL "Use \"ON\" to enable Abseil." ${NOT_ION_ONLY_IONLIB}) +option(ION_USE_JEMALLOC "Use \"ON\" to enable JeMalloc." OFF) #END internal -option(TONLIB_ENABLE_JNI "Use \"ON\" to enable JNI-compatible TonLib API.") -option(TON_USE_ASAN "Use \"ON\" to enable AddressSanitizer." OFF) -option(TON_USE_TSAN "Use \"ON\" to enable ThreadSanitizer." OFF) -option(TON_USE_UBSAN "Use \"ON\" to enable UndefinedBehaviorSanitizer." OFF) -set(TON_ARCH "native" CACHE STRING "Architecture, will be passed to -march=") +option(IONLIB_ENABLE_JNI "Use \"ON\" to enable JNI-compatible TonLib API.") +option(ION_USE_ASAN "Use \"ON\" to enable AddressSanitizer." OFF) +option(ION_USE_TSAN "Use \"ON\" to enable ThreadSanitizer." OFF) +option(ION_USE_UBSAN "Use \"ON\" to enable UndefinedBehaviorSanitizer." OFF) +set(ION_ARCH "native" CACHE STRING "Architecture, will be passed to -march=") #BEGIN M1 support EXECUTE_PROCESS( COMMAND uname -m COMMAND tr -d '\n' OUTPUT_VARIABLE ARCHITECTURE ) if ((ARCHITECTURE MATCHES "arm64") AND (CMAKE_SYSTEM_NAME STREQUAL "Darwin") AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0)) # only clang 13+ supports cpu=apple-m1 - set(TON_ARCH "apple-m1") + set(ION_ARCH "apple-m1") endif() #END M1 support -if (TON_USE_ABSEIL) +if (ION_USE_ABSEIL) message("Add abseil-cpp") set(ABSL_PROPAGATE_CXX_STD TRUE) add_subdirectory(third-party/abseil-cpp EXCLUDE_FROM_ALL) @@ -148,7 +148,7 @@ else() endif() set(CRC32C_FOUND 1) -if (TON_USE_ROCKSDB) +if (ION_USE_ROCKSDB) if (ANDROID) set(PORTABLE ON CACHE BOOL "portable") endif() @@ -179,7 +179,7 @@ if (USE_LIBRAPTORQ) add_subdirectory(third-party/libraptorq EXCLUDE_FROM_ALL) endif() -message("Add ton") +message("Add ion") set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake" ${CMAKE_MODULE_PATH}) include(BuildBLST) @@ -219,21 +219,21 @@ else() endif() -if (TON_ARCH AND NOT MSVC) - CHECK_CXX_COMPILER_FLAG( "-march=${TON_ARCH}" COMPILER_OPT_ARCH_SUPPORTED ) - if (TON_ARCH STREQUAL "apple-m1") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=${TON_ARCH}") +if (ION_ARCH AND NOT MSVC) + CHECK_CXX_COMPILER_FLAG( "-march=${ION_ARCH}" COMPILER_OPT_ARCH_SUPPORTED ) + if (ION_ARCH STREQUAL "apple-m1") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=${ION_ARCH}") elseif(COMPILER_OPT_ARCH_SUPPORTED) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=${TON_ARCH}") - elseif(NOT TON_ARCH STREQUAL "native") - message(FATAL_ERROR "Compiler doesn't support arch ${TON_ARCH}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=${ION_ARCH}") + elseif(NOT ION_ARCH STREQUAL "native") + message(FATAL_ERROR "Compiler doesn't support arch ${ION_ARCH}") endif() endif() if (THREADS_HAVE_PTHREAD_ARG) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") endif() -if (TON_USE_JEMALLOC) +if (ION_USE_JEMALLOC) find_package(jemalloc REQUIRED) endif() @@ -275,7 +275,7 @@ elseif (CLANG OR GCC) set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--gc-sections -Wl,--exclude-libs,ALL") endif() set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gc-sections") - if (NOT TON_USE_ASAN AND NOT TON_USE_TSAN AND NOT MEMPROF) + if (NOT ION_USE_ASAN AND NOT ION_USE_TSAN AND NOT MEMPROF) if (NOT USE_EMSCRIPTEN) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--exclude-libs,ALL") endif() @@ -300,10 +300,10 @@ set(INTERNAL_COMPILE "0") set(INTERNAL_COMPILE "1") #END internal -set(TONLIB_COMPILE "0") +set(IONLIB_COMPILE "0") #BEGIN tonlib - add_definitions(-D_TONLIB_COMPILE=1) - set(TONLIB_COMPILE "1") + add_definitions(-D_IONLIB_COMPILE=1) + set(IONLIB_COMPILE "1") #END tonlib include(AddCXXCompilerFlag) @@ -343,20 +343,20 @@ add_cxx_compiler_flag("-Wno-redundant-move") if (CLANG) #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") endif() -if (TON_USE_ASAN) +if (ION_USE_ASAN) if (CLANG) add_cxx_compiler_flag("-stdlib=libc++") endif() add_cxx_compiler_flag("-fsanitize=address") add_definitions(-DTD_USE_ASAN=1) endif() -if (TON_USE_TSAN) +if (ION_USE_TSAN) if (CLANG) add_cxx_compiler_flag("-stdlib=libc++") endif() add_cxx_compiler_flag("-fsanitize=thread") endif() -if (TON_USE_UBSAN) +if (ION_USE_UBSAN) if (CLANG) add_cxx_compiler_flag("-stdlib=libc++") endif() @@ -375,9 +375,9 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS 1) find_package(LATEX) if (LATEX_FOUND) include(UseLATEX) - add_latex_document(doc/ton.tex TARGET_NAME ton_white_paper) - 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/ion.tex TARGET_NAME ion_white_paper) + add_latex_document(doc/tvm.tex TARGET_NAME ion_vm_description) + add_latex_document(doc/tblkch.tex TARGET_NAME ion_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() @@ -400,7 +400,7 @@ add_subdirectory(tdutils) add_subdirectory(memprof) add_subdirectory(tdactor) add_subdirectory(tdnet) -if (TON_USE_ROCKSDB) +if (ION_USE_ROCKSDB) option(TDDB_USE_ROCKSDB "Use rockdb" ON) endif() add_subdirectory(tddb) @@ -419,7 +419,7 @@ add_subdirectory(tonlib) #END tonlib #BEGIN internal -if (NOT TON_ONLY_TONLIB) +if (NOT ION_ONLY_IONLIB) add_subdirectory(common) add_subdirectory(tdfec) add_subdirectory(keyring) @@ -452,23 +452,23 @@ endif() #TESTS add_executable(test-ed25519 test/test-td-main.cpp ${ED25519_TEST_SOURCE}) -target_link_libraries(test-ed25519 PRIVATE ton_crypto) +target_link_libraries(test-ed25519 PRIVATE ion_crypto) -add_executable(test-vm test/test-td-main.cpp ${TONVM_TEST_SOURCE}) -target_link_libraries(test-vm PRIVATE ton_crypto fift-lib) +add_executable(test-vm test/test-td-main.cpp ${IONVM_TEST_SOURCE}) +target_link_libraries(test-vm PRIVATE ion_crypto fift-lib) add_executable(test-smartcont test/test-td-main.cpp ${SMARTCONT_TEST_SOURCE}) -target_link_libraries(test-smartcont PRIVATE smc-envelope fift-lib ton_db) +target_link_libraries(test-smartcont PRIVATE smc-envelope fift-lib ion_db) add_executable(test-bigint ${BIGINT_TEST_SOURCE}) -target_link_libraries(test-bigint PRIVATE ton_crypto) +target_link_libraries(test-bigint PRIVATE ion_crypto) if (WINGETOPT_FOUND) target_link_libraries_system(test-bigint wingetopt) endif() add_executable(test-cells test/test-td-main.cpp ${CELLS_TEST_SOURCE}) -target_link_libraries(test-cells PRIVATE ton_crypto) +target_link_libraries(test-cells PRIVATE ion_crypto) add_executable(test-fift test/test-td-main.cpp ${FIFT_TEST_SOURCE}) target_link_libraries(test-fift PRIVATE fift-lib) @@ -487,11 +487,11 @@ add_executable(test-net test/test-td-main.cpp ${NET_TEST_SOURCE}) target_link_libraries(test-net PRIVATE tdnet tdutils ${CMAKE_THREAD_LIBS_INIT}) #BEGIN tonlib -add_executable(test-tonlib ${TONLIB_ONLINE_TEST_SOURCE}) -target_link_libraries(test-tonlib tdactor adnllite tl_api ton_crypto tl_tonlib_api tonlib) +add_executable(test-tonlib ${IONLIB_ONLINE_TEST_SOURCE}) +target_link_libraries(test-tonlib tdactor adnllite tl_api ion_crypto tl_tonlib_api tonlib) -add_executable(test-tonlib-offline test/test-td-main.cpp ${TONLIB_OFFLINE_TEST_SOURCE}) -target_link_libraries(test-tonlib-offline tdactor adnllite tl_api ton_crypto fift-lib tl_tonlib_api tonlib) +add_executable(test-tonlib-offline test/test-td-main.cpp ${IONLIB_OFFLINE_TEST_SOURCE}) +target_link_libraries(test-tonlib-offline tdactor adnllite tl_api ion_crypto fift-lib tl_tonlib_api tonlib) if (NOT CMAKE_CROSSCOMPILING) add_dependencies(test-tonlib-offline gen_fif) @@ -499,12 +499,12 @@ endif() #END tonlib #BEGIN internal -if (NOT TON_ONLY_TONLIB) -add_executable(test-db test/test-td-main.cpp ${TONDB_TEST_SOURCE}) -target_link_libraries(test-db PRIVATE ton_db memprof tdfec) +if (NOT ION_ONLY_IONLIB) +add_executable(test-db test/test-td-main.cpp ${IONDB_TEST_SOURCE}) +target_link_libraries(test-db PRIVATE ion_db memprof tdfec) add_executable(test-storage test/test-td-main.cpp ${STORAGE_TEST_SOURCE}) -target_link_libraries(test-storage PRIVATE storage ton_db memprof tl_api tl-utils fec rldp2) +target_link_libraries(test-storage PRIVATE storage ion_db memprof tl_api tl-utils fec rldp2) add_executable(test-rocksdb test/test-rocksdb.cpp) target_link_libraries(test-rocksdb PRIVATE memprof tddb tdutils) @@ -520,7 +520,7 @@ if (USE_LIBRAPTORQ) endif() add_executable(test-hello-world test/test-hello-world.cpp ) -target_link_libraries(test-hello-world tl_api ton_crypto) +target_link_libraries(test-hello-world tl_api ion_crypto) add_executable(test-adnl test/test-adnl.cpp) target_link_libraries(test-adnl adnl adnltest dht tl_api) @@ -538,12 +538,12 @@ target_link_libraries(test-overlay overlay tdutils tdactor adnl adnltest tl_api add_executable(test-catchain test/test-catchain.cpp) target_link_libraries(test-catchain overlay tdutils tdactor adnl adnltest rldp tl_api dht catchain ) -add_executable(test-ton-collator test/test-ton-collator.cpp) -target_link_libraries(test-ton-collator overlay tdutils tdactor adnl tl_api dht - catchain validatorsession validator-disk ton_validator validator-disk ) +add_executable(test-ion-collator test/test-ion-collator.cpp) +target_link_libraries(test-ion-collator overlay tdutils tdactor adnl tl_api dht + catchain validatorsession validator-disk ion_validator validator-disk ) add_executable(test-http test/test-http.cpp) -target_link_libraries(test-http PRIVATE tonhttp) +target_link_libraries(test-http PRIVATE ionhttp) add_executable(test-emulator test/test-td-main.cpp emulator/test/emulator-tests.cpp) target_link_libraries(test-emulator PRIVATE emulator) @@ -557,13 +557,13 @@ if (HAS_PARENT) ${TDDB_TEST_SOURCE} ${FEC_TEST_SOURCE} ${ED25519_TEST_SOURCE} - ${TONDB_TEST_SOURCE} + ${IONDB_TEST_SOURCE} ${BIGNUM_TEST_SOURCE} - ${CELLS_TEST_SOURCE} # ${TONVM_TEST_SOURCE} ${FIFT_TEST_SOURCE} ${TONLIB_ONLINE_TEST_SOURCE} + ${CELLS_TEST_SOURCE} # ${IONVM_TEST_SOURCE} ${FIFT_TEST_SOURCE} ${IONLIB_ONLINE_TEST_SOURCE} PARENT_SCOPE) endif() add_library(all_tests INTERFACE) -target_link_libraries(all_tests INTERFACE tdutils tdactor tdnet tdfec ton_db ton_crypto fift-lib) +target_link_libraries(all_tests INTERFACE tdutils tdactor tdnet tdfec ion_db ion_crypto fift-lib) endif() #END internal @@ -627,7 +627,7 @@ if (NOT NIX) endif() #BEGIN internal -if (NOT TON_ONLY_TONLIB) +if (NOT ION_ONLY_IONLIB) add_test(test-adnl test-adnl) add_test(test-dht test-dht) add_test(test-rldp test-rldp) diff --git a/adnl/CMakeLists.txt b/adnl/CMakeLists.txt index 111c4c500..037e7609d 100644 --- a/adnl/CMakeLists.txt +++ b/adnl/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR) #BEGIN internal -if (NOT TON_ONLY_TONLIB) +if (NOT ION_ONLY_IONLIB) set(ADNL_HEADERS adnl-address-list.h adnl-address-list.hpp @@ -80,19 +80,19 @@ set(ADNL_LITE_SOURCE ) #BEGIN internal -if (NOT TON_ONLY_TONLIB) +if (NOT ION_ONLY_IONLIB) add_library(adnl STATIC ${ADNL_SOURCE}) target_include_directories(adnl PUBLIC $) -target_link_libraries(adnl PUBLIC tdactor ton_crypto tl_api tdnet tddb keys keyring ) +target_link_libraries(adnl PUBLIC tdactor ion_crypto tl_api tdnet tddb keys keyring ) add_executable(adnl-proxy ${ADNL_PROXY_SOURCE}) target_include_directories(adnl-proxy PUBLIC $) -target_link_libraries(adnl-proxy PUBLIC tdactor ton_crypto tl_api tdnet common tl-utils git) +target_link_libraries(adnl-proxy PUBLIC tdactor ion_crypto tl_api tdnet common tl-utils git) add_executable(adnl-pong adnl-pong.cpp) target_include_directories(adnl-pong PUBLIC $) -target_link_libraries(adnl-pong PUBLIC tdactor ton_crypto tl_api tdnet common tl-utils adnl dht git) +target_link_libraries(adnl-pong PUBLIC tdactor ion_crypto tl_api tdnet common tl-utils adnl dht git) add_library(adnltest STATIC ${ADNL_TEST_SOURCE}) target_include_directories(adnltest PUBLIC $) @@ -105,4 +105,4 @@ endif() add_library(adnllite STATIC ${ADNL_LITE_SOURCE}) target_include_directories(adnllite PUBLIC $) -target_link_libraries(adnllite PUBLIC tdactor ton_crypto tl_lite_api tdnet keys) +target_link_libraries(adnllite PUBLIC tdactor ion_crypto tl_lite_api tdnet keys) diff --git a/assembly/android/build-android-tonlib.sh b/assembly/android/build-android-tonlib.sh index e470f6022..b7736a1be 100644 --- a/assembly/android/build-android-tonlib.sh +++ b/assembly/android/build-android-tonlib.sh @@ -29,13 +29,13 @@ 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 +rm -rf example/android/src/drinkless/org/ion/TonApi.java cd example/android/ rm CMakeCache.txt .ninja_* -cmake -GNinja -DTON_ONLY_TONLIB=ON . +cmake -GNinja -DION_ONLY_IONLIB=ON . -test $? -eq 0 || { echo "Can't configure TON"; exit 1; } +test $? -eq 0 || { echo "Can't configure ION"; exit 1; } ninja prepare_cross_compiling @@ -50,6 +50,6 @@ find . -name "*.debug" -type f -delete if [ "$with_artifacts" = true ]; then cd ../.. mkdir -p artifacts/tonlib-android-jni - cp example/android/src/drinkless/org/ton/TonApi.java artifacts/tonlib-android-jni/ + cp example/android/src/drinkless/org/ion/TonApi.java artifacts/tonlib-android-jni/ cp -R example/android/libs/* artifacts/tonlib-android-jni/ fi diff --git a/assembly/native/build-macos-portable.sh b/assembly/native/build-macos-portable.sh index 0e1003b56..0f42d630a 100644 --- a/assembly/native/build-macos-portable.sh +++ b/assembly/native/build-macos-portable.sh @@ -149,7 +149,7 @@ cmake -GNinja .. \ -DLZ4_LIBRARIES=$lz4Path/lib/liblz4.a -test $? -eq 0 || { echo "Can't configure ton"; exit 1; } +test $? -eq 0 || { echo "Can't configure ion"; exit 1; } if [ "$with_tests" = true ]; then ninja storage-daemon storage-daemon-cli blockchain-explorer \ @@ -159,13 +159,13 @@ if [ "$with_tests" = true ]; then test-ed25519 test-ed25519-crypto test-bigint test-vm test-fift test-cells test-smartcont \ test-net test-tdactor test-tdutils test-tonlib-offline test-adnl test-dht test-rldp \ test-rldp2 test-catchain test-fec test-tddb test-db test-validator-session-state test-emulator - test $? -eq 0 || { echo "Can't compile ton"; exit 1; } + test $? -eq 0 || { echo "Can't compile ion"; exit 1; } else ninja storage-daemon storage-daemon-cli blockchain-explorer \ tonlib tonlibjson tonlib-cli validator-engine func fift \ lite-client pow-miner validator-engine-console generate-random-id json2tlo dht-server \ http-proxy rldp-http-proxy adnl-proxy create-state create-hardfork tlbc emulator - test $? -eq 0 || { echo "Can't compile ton"; exit 1; } + test $? -eq 0 || { echo "Can't compile ion"; exit 1; } fi strip -s storage/storage-daemon/storage-daemon diff --git a/assembly/native/build-macos-shared.sh b/assembly/native/build-macos-shared.sh index 7fdcfb941..58e642863 100644 --- a/assembly/native/build-macos-shared.sh +++ b/assembly/native/build-macos-shared.sh @@ -77,7 +77,7 @@ cmake -GNinja -DCMAKE_BUILD_TYPE=Release .. \ -DLZ4_LIBRARIES=$lz4Path/lib/liblz4.a \ -DLZ4_INCLUDE_DIRS=$lz4Path/lib -test $? -eq 0 || { echo "Can't configure ton"; exit 1; } +test $? -eq 0 || { echo "Can't configure ion"; exit 1; } if [ "$with_tests" = true ]; then ninja storage-daemon storage-daemon-cli blockchain-explorer \ @@ -87,13 +87,13 @@ if [ "$with_tests" = true ]; then test-ed25519 test-ed25519-crypto test-bigint test-vm test-fift test-cells test-smartcont \ test-net test-tdactor test-tdutils test-tonlib-offline test-adnl test-dht test-rldp \ test-rldp2 test-catchain test-fec test-tddb test-db test-validator-session-state test-emulator - test $? -eq 0 || { echo "Can't compile ton"; exit 1; } + test $? -eq 0 || { echo "Can't compile ion"; exit 1; } else ninja storage-daemon storage-daemon-cli blockchain-explorer \ tonlib tonlibjson tonlib-cli validator-engine func fift \ lite-client pow-miner validator-engine-console generate-random-id json2tlo dht-server \ http-proxy rldp-http-proxy adnl-proxy create-state create-hardfork tlbc emulator - test $? -eq 0 || { echo "Can't compile ton"; exit 1; } + test $? -eq 0 || { echo "Can't compile ion"; exit 1; } fi diff --git a/assembly/native/build-ubuntu-portable.sh b/assembly/native/build-ubuntu-portable.sh index 73ae59264..9ea524012 100644 --- a/assembly/native/build-ubuntu-portable.sh +++ b/assembly/native/build-ubuntu-portable.sh @@ -141,7 +141,7 @@ cmake -GNinja .. \ -test $? -eq 0 || { echo "Can't configure ton"; exit 1; } +test $? -eq 0 || { echo "Can't configure ion"; exit 1; } if [ "$with_tests" = true ]; then ninja storage-daemon storage-daemon-cli fift func tonlib tonlibjson tonlib-cli \ @@ -151,13 +151,13 @@ ninja storage-daemon storage-daemon-cli fift func tonlib tonlibjson tonlib-cli \ test-vm test-fift test-cells test-smartcont test-net test-tdactor test-tdutils \ test-tonlib-offline test-adnl test-dht test-rldp test-rldp2 test-catchain \ test-fec test-tddb test-db test-validator-session-state test-emulator - test $? -eq 0 || { echo "Can't compile ton"; exit 1; } + test $? -eq 0 || { echo "Can't compile ion"; exit 1; } else ninja storage-daemon storage-daemon-cli fift func tonlib tonlibjson tonlib-cli \ validator-engine lite-client pow-miner validator-engine-console blockchain-explorer \ generate-random-id json2tlo dht-server http-proxy rldp-http-proxy \ adnl-proxy create-state emulator - test $? -eq 0 || { echo "Can't compile ton"; exit 1; } + test $? -eq 0 || { echo "Can't compile ion"; exit 1; } fi strip -s storage/storage-daemon/storage-daemon \ diff --git a/assembly/native/build-ubuntu-shared.sh b/assembly/native/build-ubuntu-shared.sh index 00b9aa9b4..8e9c85e5f 100644 --- a/assembly/native/build-ubuntu-shared.sh +++ b/assembly/native/build-ubuntu-shared.sh @@ -42,14 +42,14 @@ else echo "Using compiled openssl_3" fi -cmake -GNinja -DTON_USE_JEMALLOC=ON .. \ +cmake -GNinja -DION_USE_JEMALLOC=ON .. \ -DCMAKE_BUILD_TYPE=Release \ -DOPENSSL_ROOT_DIR=$opensslPath \ -DOPENSSL_INCLUDE_DIR=$opensslPath/include \ -DOPENSSL_CRYPTO_LIBRARY=$opensslPath/libcrypto.so -test $? -eq 0 || { echo "Can't configure ton"; exit 1; } +test $? -eq 0 || { echo "Can't configure ion"; exit 1; } if [ "$with_tests" = true ]; then ninja storage-daemon storage-daemon-cli fift func tonlib tonlibjson tonlib-cli \ @@ -59,13 +59,13 @@ ninja storage-daemon storage-daemon-cli fift func tonlib tonlibjson tonlib-cli \ test-vm test-fift test-cells test-smartcont test-net test-tdactor test-tdutils \ test-tonlib-offline test-adnl test-dht test-rldp test-rldp2 test-catchain \ test-fec test-tddb test-db test-validator-session-state test-emulator - test $? -eq 0 || { echo "Can't compile ton"; exit 1; } + test $? -eq 0 || { echo "Can't compile ion"; exit 1; } else ninja storage-daemon storage-daemon-cli fift func tonlib tonlibjson tonlib-cli \ validator-engine lite-client pow-miner validator-engine-console blockchain-explorer \ generate-random-id json2tlo dht-server http-proxy rldp-http-proxy \ adnl-proxy create-state emulator - test $? -eq 0 || { echo "Can't compile ton"; exit 1; } + test $? -eq 0 || { echo "Can't compile ion"; exit 1; } fi strip -s storage/storage-daemon/storage-daemon \ diff --git a/assembly/nix/build-linux-arm64-nix.sh b/assembly/nix/build-linux-arm64-nix.sh index 2c7df521f..aaa10c703 100644 --- a/assembly/nix/build-linux-arm64-nix.sh +++ b/assembly/nix/build-linux-arm64-nix.sh @@ -34,7 +34,7 @@ nix-build linux-arm64-tonlib.nix cp ./result/lib/libtonlibjson.so.0.5 artifacts/libtonlibjson.so cp ./result/lib/libemulator.so artifacts/ cp ./result/lib/fift/* artifacts/lib/ -cp -r ./result/share/ton/smartcont artifacts/ +cp -r ./result/share/ion/smartcont artifacts/ chmod -R +x artifacts cd artifacts sudo strip -s storage-daemon \ diff --git a/assembly/nix/build-linux-x86-64-nix.sh b/assembly/nix/build-linux-x86-64-nix.sh index ae478ec2d..1a11916e4 100644 --- a/assembly/nix/build-linux-x86-64-nix.sh +++ b/assembly/nix/build-linux-x86-64-nix.sh @@ -34,7 +34,7 @@ nix-build linux-x86-64-tonlib.nix cp ./result/lib/libtonlibjson.so.0.5 artifacts/libtonlibjson.so cp ./result/lib/libemulator.so artifacts/ cp ./result/lib/fift/* artifacts/lib/ -cp -r ./result/share/ton/smartcont artifacts/ +cp -r ./result/share/ion/smartcont artifacts/ chmod -R +x artifacts cd artifacts sudo strip -s storage-daemon \ diff --git a/assembly/nix/build-macos-nix.sh b/assembly/nix/build-macos-nix.sh index c92eddb28..712b1bd3d 100644 --- a/assembly/nix/build-macos-nix.sh +++ b/assembly/nix/build-macos-nix.sh @@ -34,7 +34,7 @@ nix-build macos-tonlib.nix cp ./result/lib/libtonlibjson.dylib artifacts/ cp ./result/lib/libemulator.dylib artifacts/ cp ./result/lib/fift/* artifacts/lib/ -cp -r ./result/share/ton/smartcont artifacts/ +cp -r ./result/share/ion/smartcont artifacts/ chmod -R +x artifacts cd artifacts sudo strip -xSX storage-daemon \ diff --git a/assembly/wasm/fift-func-wasm-build-ubuntu.sh b/assembly/wasm/fift-func-wasm-build-ubuntu.sh index 2d3507b23..e45ea3e6a 100644 --- a/assembly/wasm/fift-func-wasm-build-ubuntu.sh +++ b/assembly/wasm/fift-func-wasm-build-ubuntu.sh @@ -26,7 +26,7 @@ export CCACHE_DISABLE=1 echo `pwd` if [ "$scratch_new" = true ]; then - echo Compiling openssl zlib lz4 emsdk secp256k1 libsodium emsdk ton + echo Compiling openssl zlib lz4 emsdk secp256k1 libsodium emsdk ion rm -rf openssl zlib lz4 emsdk secp256k1 libsodium build fi @@ -52,9 +52,9 @@ if [ ! -d "build" ]; then -DOPENSSL_FOUND=1 \ -DOPENSSL_INCLUDE_DIR=$OPENSSL_DIR/include \ -DOPENSSL_CRYPTO_LIBRARY=$OPENSSL_DIR/libcrypto.so \ - -DTON_USE_ABSEIL=OFF .. + -DION_USE_ABSEIL=OFF .. - test $? -eq 0 || { echo "Can't configure TON build"; exit 1; } + test $? -eq 0 || { echo "Can't configure ION build"; exit 1; } ninja fift smc-envelope test $? -eq 0 || { echo "Can't compile fift "; exit 1; } rm -rf * @@ -174,12 +174,12 @@ emcmake cmake -DUSE_EMSCRIPTEN=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAK -DSODIUM_LIBRARY_RELEASE=$SODIUM_DIR/src/libsodium/.libs/libsodium.a \ .. -test $? -eq 0 || { echo "Can't configure TON with emmake "; exit 1; } +test $? -eq 0 || { echo "Can't configure ION with emmake "; exit 1; } cp -R ../crypto/smartcont ../crypto/fift/lib crypto emmake make -j16 funcfiftlib func fift tlbc emulator-emscripten -test $? -eq 0 || { echo "Can't compile TON with emmake "; exit 1; } +test $? -eq 0 || { echo "Can't compile ION with emmake "; exit 1; } if [ "$with_artifacts" = true ]; then echo "Creating artifacts..." diff --git a/blockchain-explorer/CMakeLists.txt b/blockchain-explorer/CMakeLists.txt index 36d4e5069..67063d08c 100644 --- a/blockchain-explorer/CMakeLists.txt +++ b/blockchain-explorer/CMakeLists.txt @@ -16,26 +16,26 @@ add_executable(blockchain-explorer ${BLOCHAIN_EXPLORER_SOURCE}) if (NIX) if (MHD_FOUND) target_include_directories(blockchain-explorer PUBLIC ${MHD_INCLUDE_DIR}) - target_link_libraries(blockchain-explorer tdactor adnllite tl_lite_api tl-lite-utils ton_crypto ${MHD_LIBRARY}) + target_link_libraries(blockchain-explorer tdactor adnllite tl_lite_api tl-lite-utils ion_crypto ${MHD_LIBRARY}) else() find_package(PkgConfig REQUIRED) pkg_check_modules(MHD libmicrohttpd) target_include_directories(blockchain-explorer PUBLIC ${MHD_INCLUDE_DIR} ${MHD_STATIC_INCLUDE_DIRS}) - target_link_libraries(blockchain-explorer tdactor adnllite tl_lite_api tl-lite-utils ton_crypto ${MHD_LIBRARIES} ${MHD_STATIC_LIBRARIES}) + target_link_libraries(blockchain-explorer tdactor adnllite tl_lite_api tl-lite-utils ion_crypto ${MHD_LIBRARIES} ${MHD_STATIC_LIBRARIES}) endif() else() if (MHD_FOUND) target_include_directories(blockchain-explorer PUBLIC ${MHD_INCLUDE_DIR}) - target_link_libraries(blockchain-explorer tdactor adnllite tl_lite_api tl-lite-utils ton_crypto ${MHD_LIBRARY}) + target_link_libraries(blockchain-explorer tdactor adnllite tl_lite_api tl-lite-utils ion_crypto ${MHD_LIBRARY}) else() find_package(MHD) target_include_directories(blockchain-explorer PUBLIC ${MHD_INCLUDE_DIR}) - target_link_libraries(blockchain-explorer tdactor adnllite tl_lite_api tl-lite-utils ton_crypto ${MHD_LIBRARY}) + target_link_libraries(blockchain-explorer tdactor adnllite tl_lite_api tl-lite-utils ion_crypto ${MHD_LIBRARY}) endif() endif() target_include_directories(blockchain-explorer PUBLIC ${MHD_INCLUDE_DIR}) -target_link_libraries(blockchain-explorer tdactor adnllite tl_lite_api tl-lite-utils ton_crypto ${MHD_LIBRARY}) +target_link_libraries(blockchain-explorer tdactor adnllite tl_lite_api tl-lite-utils ion_crypto ${MHD_LIBRARY}) install(TARGETS blockchain-explorer RUNTIME DESTINATION bin) diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 88a3671b3..8473b176f 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -19,4 +19,4 @@ target_include_directories(common PUBLIC $/.. ${OPENSSL_INCLUDE_DIR} ) -target_link_libraries(common PRIVATE tdutils ton_crypto ) +target_link_libraries(common PRIVATE tdutils ion_crypto ) diff --git a/create-hardfork/CMakeLists.txt b/create-hardfork/CMakeLists.txt index 3024603c2..41a598d4e 100644 --- a/create-hardfork/CMakeLists.txt +++ b/create-hardfork/CMakeLists.txt @@ -10,7 +10,7 @@ set(CREATE_HARDFORK_SOURCE ) add_executable(create-hardfork ${CREATE_HARDFORK_SOURCE}) -target_link_libraries(create-hardfork overlay tdutils tdactor adnl tl_api dht rldp catchain validatorsession full-node validator-hardfork ton_validator +target_link_libraries(create-hardfork overlay tdutils tdactor adnl tl_api dht rldp catchain validatorsession full-node validator-hardfork ion_validator validator-hardfork fift-lib memprof git ${JEMALLOC_LIBRARIES}) install(TARGETS create-hardfork RUNTIME DESTINATION bin) diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index c2a737149..51031dede 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -4,7 +4,7 @@ if (NOT OPENSSL_FOUND) find_package(OpenSSL REQUIRED) endif() -set(TON_CRYPTO_CORE_SOURCE +set(ION_CRYPTO_CORE_SOURCE Ed25519.cpp common/bigint.cpp common/refcnt.cpp @@ -97,7 +97,7 @@ set(TON_CRYPTO_CORE_SOURCE ellcurve/p256.h ellcurve/p256.cpp) -set(TON_CRYPTO_SOURCE +set(ION_CRYPTO_SOURCE vm/stack.cpp vm/atom.cpp vm/continuation.cpp @@ -112,7 +112,7 @@ set(TON_CRYPTO_SOURCE vm/contops.cpp vm/dictops.cpp vm/debugops.cpp - vm/tonops.cpp + vm/ionops.cpp vm/utils.cpp vm/vm.cpp vm/bls.cpp @@ -136,13 +136,13 @@ set(TON_CRYPTO_SOURCE vm/stack.hpp vm/stackops.h vm/tupleops.h - vm/tonops.h + vm/ionops.h vm/vmstate.h vm/utils.h vm/vm.h vm/bls.h) -set(TON_DB_SOURCE +set(ION_DB_SOURCE vm/db/DynamicBagOfCellsDb.cpp vm/db/CellStorage.cpp vm/db/TonDb.cpp @@ -259,7 +259,7 @@ set(ED25519_TEST_SOURCE PARENT_SCOPE ) -set(TONDB_TEST_SOURCE +set(IONDB_TEST_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/test/test-db.cpp PARENT_SCOPE ) @@ -269,7 +269,7 @@ set(CELLS_TEST_SOURCE PARENT_SCOPE ) -set(TONVM_TEST_SOURCE +set(IONVM_TEST_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/test/vm.cpp PARENT_SCOPE ) @@ -291,35 +291,35 @@ set(BIGINT_TEST_SOURCE set(USE_EMSCRIPTEN ${USE_EMSCRIPTEN} PARENT_SCOPE) -add_library(ton_crypto_core STATIC ${TON_CRYPTO_CORE_SOURCE}) -target_include_directories(ton_crypto_core PUBLIC $ +add_library(ion_crypto_core STATIC ${ION_CRYPTO_CORE_SOURCE}) +target_include_directories(ion_crypto_core PUBLIC $ $) -target_link_libraries(ton_crypto_core PUBLIC ${OPENSSL_CRYPTO_LIBRARY} tdutils tddb_utils) +target_link_libraries(ion_crypto_core PUBLIC ${OPENSSL_CRYPTO_LIBRARY} tdutils tddb_utils) if (NOT WIN32) - target_link_libraries(ton_crypto_core PUBLIC dl z) + target_link_libraries(ion_crypto_core PUBLIC dl z) endif() -target_include_directories(ton_crypto_core SYSTEM PUBLIC $) +target_include_directories(ion_crypto_core SYSTEM PUBLIC $) -add_library(ton_crypto STATIC ${TON_CRYPTO_SOURCE}) -target_include_directories(ton_crypto PUBLIC $ $) -target_link_libraries(ton_crypto PUBLIC ${OPENSSL_CRYPTO_LIBRARY} ton_crypto_core ton_block) +add_library(ion_crypto STATIC ${ION_CRYPTO_SOURCE}) +target_include_directories(ion_crypto PUBLIC $ $) +target_link_libraries(ion_crypto PUBLIC ${OPENSSL_CRYPTO_LIBRARY} ion_crypto_core ion_block) if (USE_EMSCRIPTEN) - target_link_options(ton_crypto PRIVATE -fexceptions) - target_compile_options(ton_crypto PRIVATE -fexceptions) + target_link_options(ion_crypto PRIVATE -fexceptions) + target_compile_options(ion_crypto PRIVATE -fexceptions) endif() if (NOT WIN32) find_library(DL dl) if (DL) - target_link_libraries(ton_crypto PUBLIC dl z) + target_link_libraries(ion_crypto PUBLIC dl z) else() - target_link_libraries(ton_crypto PUBLIC z) + target_link_libraries(ion_crypto PUBLIC z) endif() endif() -target_include_directories(ton_crypto SYSTEM PUBLIC $) +target_include_directories(ion_crypto SYSTEM PUBLIC $) -add_dependencies(ton_crypto blst) -target_include_directories(ton_crypto PRIVATE ${BLST_INCLUDE_DIR}) -target_link_libraries(ton_crypto PRIVATE ${BLST_LIB}) +add_dependencies(ion_crypto blst) +target_include_directories(ion_crypto PRIVATE ${BLST_INCLUDE_DIR}) +target_link_libraries(ion_crypto PRIVATE ${BLST_LIB}) if (NOT USE_EMSCRIPTEN) find_package(Secp256k1 REQUIRED) @@ -327,39 +327,39 @@ endif() if (MSVC) find_package(Sodium REQUIRED) - target_compile_definitions(ton_crypto PUBLIC SODIUM_STATIC) - target_include_directories(ton_crypto_core PUBLIC $) - target_link_libraries(ton_crypto PUBLIC ${SECP256K1_LIBRARY}) + target_compile_definitions(ion_crypto PUBLIC SODIUM_STATIC) + target_include_directories(ion_crypto_core PUBLIC $) + target_link_libraries(ion_crypto PUBLIC ${SECP256K1_LIBRARY}) elseif (ANDROID OR EMSCRIPTEN) - target_include_directories(ton_crypto_core PUBLIC $) - target_link_libraries(ton_crypto PUBLIC $) + target_include_directories(ion_crypto_core PUBLIC $) + target_link_libraries(ion_crypto PUBLIC $) else() if (NOT SODIUM_FOUND) find_package(Sodium REQUIRED) else() message(STATUS "Using Sodium ${SODIUM_LIBRARY_RELEASE}") endif() - target_compile_definitions(ton_crypto PUBLIC SODIUM_STATIC) - target_include_directories(ton_crypto_core PUBLIC $) - target_link_libraries(ton_crypto PUBLIC ${SECP256K1_LIBRARY}) + target_compile_definitions(ion_crypto PUBLIC SODIUM_STATIC) + target_include_directories(ion_crypto_core PUBLIC $) + target_link_libraries(ion_crypto PUBLIC ${SECP256K1_LIBRARY}) endif() -target_link_libraries(ton_crypto_core PUBLIC ${SECP256K1_LIBRARY}) -target_include_directories(ton_crypto_core PUBLIC $) -target_link_libraries(ton_crypto PUBLIC ${SODIUM_LIBRARY_RELEASE}) +target_link_libraries(ion_crypto_core PUBLIC ${SECP256K1_LIBRARY}) +target_include_directories(ion_crypto_core PUBLIC $) +target_link_libraries(ion_crypto PUBLIC ${SODIUM_LIBRARY_RELEASE}) -add_library(ton_db STATIC ${TON_DB_SOURCE}) -target_include_directories(ton_db PUBLIC $ +add_library(ion_db STATIC ${ION_DB_SOURCE}) +target_include_directories(ion_db PUBLIC $ $) -target_link_libraries(ton_db PUBLIC tdutils tddb ton_crypto) +target_link_libraries(ion_db PUBLIC tdutils tddb ion_crypto) add_executable(test-ed25519-crypto test/test-ed25519-crypto.cpp) target_include_directories(test-ed25519-crypto PUBLIC $) -target_link_libraries(test-ed25519-crypto PUBLIC ton_crypto) +target_link_libraries(test-ed25519-crypto PUBLIC ion_crypto) add_library(fift-lib STATIC ${FIFT_SOURCE}) target_include_directories(fift-lib PUBLIC $) -target_link_libraries(fift-lib PUBLIC ton_crypto) +target_link_libraries(fift-lib PUBLIC ion_crypto) if (USE_EMSCRIPTEN) target_link_options(fift-lib PRIVATE -fexceptions) @@ -375,20 +375,20 @@ endif() add_library(src_parser ${PARSER_SOURCE}) target_include_directories(src_parser PUBLIC $) -target_link_libraries(src_parser PUBLIC ton_crypto_core) +target_link_libraries(src_parser PUBLIC ion_crypto_core) -add_library(ton_block STATIC ${BLOCK_SOURCE}) -target_include_directories(ton_block PUBLIC $ +add_library(ion_block STATIC ${BLOCK_SOURCE}) +target_include_directories(ion_block PUBLIC $ $ $) -target_link_libraries(ton_block PUBLIC ton_crypto_core tdactor tl_api) +target_link_libraries(ion_block PUBLIC ion_crypto_core tdactor tl_api) if (USE_EMSCRIPTEN) - target_link_options(ton_block PRIVATE -fexceptions) - target_compile_options(ton_block PRIVATE -fexceptions) + target_link_options(ion_block PRIVATE -fexceptions) + target_compile_options(ion_block PRIVATE -fexceptions) endif() add_executable(func func/func-main.cpp ${FUNC_LIB_SOURCE}) target_include_directories(func PUBLIC $) -target_link_libraries(func PUBLIC ton_crypto src_parser git) +target_link_libraries(func PUBLIC ion_crypto src_parser git) if (WINGETOPT_FOUND) target_link_libraries_system(func wingetopt) endif() @@ -424,10 +424,10 @@ endif() add_library(pow-miner-lib util/Miner.cpp util/Miner.h) target_include_directories(pow-miner-lib PUBLIC $) -target_link_libraries(pow-miner-lib PUBLIC ton_crypto) +target_link_libraries(pow-miner-lib PUBLIC ion_crypto) add_executable(pow-miner util/pow-miner.cpp) -target_link_libraries(pow-miner PRIVATE ton_crypto pow-miner-lib git) +target_link_libraries(pow-miner PRIVATE ion_crypto pow-miner-lib git) if (WINGETOPT_FOUND) target_link_libraries_system(fift wingetopt) @@ -435,15 +435,15 @@ if (WINGETOPT_FOUND) endif() add_executable(mintless-proof-generator util/mintless-proof-generator.cpp) -target_link_libraries(mintless-proof-generator PRIVATE ton_crypto git ${JEMALLOC_LIBRARIES}) +target_link_libraries(mintless-proof-generator PRIVATE ion_crypto git ${JEMALLOC_LIBRARIES}) if (JEMALLOC_FOUND) target_include_directories(mintless-proof-generator PRIVATE ${JEMALLOC_INCLUDE_DIR}) - target_compile_definitions(mintless-proof-generator PRIVATE -DTON_USE_JEMALLOC=1) + target_compile_definitions(mintless-proof-generator PRIVATE -DION_USE_JEMALLOC=1) endif() set(TURN_OFF_LSAN cd .) -if (TON_USE_ASAN AND NOT WIN32) +if (ION_USE_ASAN AND NOT WIN32) set(TURN_OFF_LSAN export LSAN_OPTIONS=detect_leaks=0) endif() @@ -469,7 +469,7 @@ if (NOT CMAKE_CROSSCOMPILING OR USE_EMSCRIPTEN) ) endif() add_custom_target(tlb_generate_block DEPENDS ${TLB_BLOCK_AUTO}) - add_dependencies(ton_block tlb_generate_block) + add_dependencies(ion_block tlb_generate_block) add_custom_target(gen_fif ALL) function(GenFif) @@ -531,7 +531,7 @@ endif() add_library(smc-envelope STATIC ${SMC_ENVELOPE_SOURCE}) target_include_directories(smc-envelope PUBLIC $) -target_link_libraries(smc-envelope PUBLIC ton_crypto PRIVATE tdutils ton_block) +target_link_libraries(smc-envelope PUBLIC ion_crypto PRIVATE tdutils ion_block) if (NOT CMAKE_CROSSCOMPILING) add_dependencies(smc-envelope gen_fif) endif() @@ -540,12 +540,12 @@ add_executable(create-state block/create-state.cpp) target_include_directories(create-state PUBLIC $ $) if (INTERNAL_COMPILE) - target_link_libraries(create-state PUBLIC ton_crypto fift-lib tonlib git) + target_link_libraries(create-state PUBLIC ion_crypto fift-lib tonlib git) else() - if (TONLIB_COMPILE) - target_link_libraries(create-state PUBLIC ton_crypto fift-lib tonlib git) + if (IONLIB_COMPILE) + target_link_libraries(create-state PUBLIC ion_crypto fift-lib tonlib git) else() - target_link_libraries(create-state PUBLIC ton_crypto fift-lib git) + target_link_libraries(create-state PUBLIC ion_crypto fift-lib git) endif() endif() if (WINGETOPT_FOUND) @@ -555,7 +555,7 @@ endif() add_executable(dump-block block/dump-block.cpp) target_include_directories(dump-block PUBLIC $ $) -target_link_libraries(dump-block PUBLIC ton_crypto fift-lib git) +target_link_libraries(dump-block PUBLIC ion_crypto fift-lib git) if (WINGETOPT_FOUND) target_link_libraries_system(dump-block wingetopt) endif() @@ -563,7 +563,7 @@ endif() add_executable(adjust-block block/adjust-block.cpp) target_include_directories(adjust-block PUBLIC $ $) -target_link_libraries(adjust-block PUBLIC ton_crypto fift-lib git) +target_link_libraries(adjust-block PUBLIC ion_crypto fift-lib git) if (WINGETOPT_FOUND) target_link_libraries_system(dump-block wingetopt) target_link_libraries_system(adjust-block wingetopt) @@ -572,11 +572,11 @@ endif() add_executable(test-weight-distr block/test-weight-distr.cpp) target_include_directories(test-weight-distr PUBLIC $ $) -target_link_libraries(test-weight-distr PUBLIC ton_crypto fift-lib git) +target_link_libraries(test-weight-distr PUBLIC ion_crypto fift-lib git) if (WINGETOPT_FOUND) target_link_libraries_system(test-weight-distr wingetopt) endif() install(TARGETS fift func create-state tlbc RUNTIME DESTINATION bin) install(DIRECTORY fift/lib/ DESTINATION lib/fift) -install(DIRECTORY smartcont DESTINATION share/ton) +install(DIRECTORY smartcont DESTINATION share/ion) diff --git a/crypto/func/auto-tests/legacy_tester.py b/crypto/func/auto-tests/legacy_tester.py index 9a9905012..c388daf9b 100644 --- a/crypto/func/auto-tests/legacy_tester.py +++ b/crypto/func/auto-tests/legacy_tester.py @@ -29,15 +29,15 @@ ["storage/storage-contract.fc", 91377830060355733016937375216020277778264560226873154627574229667513068328151], ["storage/storage-provider.fc", 13618336676213331164384407184540461509022654507176709588621016553953760588122], ["nominator-pool/pool.fc", 69767057279163099864792356875696330339149706521019810113334238732928422055375], - ["jetton-minter/jetton-minter.fc", 9028309926287301331466371999814928201427184114165428257502393474125007156494], + ["jetion-minter/jetion-minter.fc", 9028309926287301331466371999814928201427184114165428257502393474125007156494], ["gg-marketplace/nft-marketplace-v2.fc", 92199806964112524639740773542356508485601908152150843819273107618799016205930], - ["jetton-wallet/jetton-wallet.fc", 86251125787443633057458168028617933212663498001665054651523310772884328206542], + ["jetion-wallet/jetion-wallet.fc", 86251125787443633057458168028617933212663498001665054651523310772884328206542], ["whales-nominators/nominators.fc", 8941364499854379927692172316865293429893094891593442801401542636695127885153], ["tact-examples/treasure_Treasure.code.fc", 13962538639825790677138656603323869918938565499584297120566680287245364723897], - ["tact-examples/jetton_SampleJetton.code.fc", 94076762218493729104783735200107713211245710256802265203823917715299139499110], - ["tact-examples/jetton_JettonDefaultWallet.code.fc", 29421313492520031238091587108198906058157443241743283101866538036369069620563], + ["tact-examples/jetion_SampleJetion.code.fc", 94076762218493729104783735200107713211245710256802265203823917715299139499110], + ["tact-examples/jetion_JetionDefaultWallet.code.fc", 29421313492520031238091587108198906058157443241743283101866538036369069620563], ["tact-examples/maps_MapTestContract.code.fc", 22556550222249123835909180266811414538971143565993192846012583552876721649744], ] diff --git a/crypto/func/auto-tests/legacy_tests.json b/crypto/func/auto-tests/legacy_tests.json index 61a433bb7..6336d3020 100644 --- a/crypto/func/auto-tests/legacy_tests.json +++ b/crypto/func/auto-tests/legacy_tests.json @@ -1 +1 @@ -[["elector/elector-code.fc", "115226404411715505328583639896096915745686314074575650766750648324043316883483"], ["config/config-code.fc", "10913070768607625342121305745084703121685937915388357634624451844356456145601"], ["eth-bridge-multisig/multisig-code.fc", "101509909129354488841890823627011033360100627957439967918234053299675481277954"], ["bsc-bridge-collector/votes-collector.fc", "62190447221288642706570413295807615918589884489514159926097051017036969900417"], ["uni-lock-wallet/uni-lockup-wallet.fc", "61959738324779104851267145467044677651344601417998258530238254441977103654381"], ["nft-collection/nft-collection-editable.fc", "45561997735512210616567774035540357815786262097548276229169737015839077731274"], ["dns-collection/nft-collection.fc", "107999822699841936063083742021519765435859194241091312445235370766165379261859"], ["tele-nft-item/nft-item.fc", "69777543125381987786450436977742010705076866061362104025338034583422166453344"], ["storage/storage-contract.fc", "91377830060355733016937375216020277778264560226873154627574229667513068328151"], ["storage/storage-provider.fc", "13618336676213331164384407184540461509022654507176709588621016553953760588122"], ["nominator-pool/pool.fc", "69767057279163099864792356875696330339149706521019810113334238732928422055375"], ["jetton-minter/jetton-minter.fc", "9028309926287301331466371999814928201427184114165428257502393474125007156494"], ["gg-marketplace/nft-marketplace-v2.fc", "92199806964112524639740773542356508485601908152150843819273107618799016205930"], ["jetton-wallet/jetton-wallet.fc", "86251125787443633057458168028617933212663498001665054651523310772884328206542"], ["whales-nominators/nominators.fc", "8941364499854379927692172316865293429893094891593442801401542636695127885153"], ["tact-examples/treasure_Treasure.code.fc", "13962538639825790677138656603323869918938565499584297120566680287245364723897"], ["tact-examples/jetton_SampleJetton.code.fc", "94076762218493729104783735200107713211245710256802265203823917715299139499110"], ["tact-examples/jetton_JettonDefaultWallet.code.fc", "29421313492520031238091587108198906058157443241743283101866538036369069620563"], ["tact-examples/maps_MapTestContract.code.fc", "22556550222249123835909180266811414538971143565993192846012583552876721649744"]] \ No newline at end of file +[["elector/elector-code.fc", "115226404411715505328583639896096915745686314074575650766750648324043316883483"], ["config/config-code.fc", "10913070768607625342121305745084703121685937915388357634624451844356456145601"], ["eth-bridge-multisig/multisig-code.fc", "101509909129354488841890823627011033360100627957439967918234053299675481277954"], ["bsc-bridge-collector/votes-collector.fc", "62190447221288642706570413295807615918589884489514159926097051017036969900417"], ["uni-lock-wallet/uni-lockup-wallet.fc", "61959738324779104851267145467044677651344601417998258530238254441977103654381"], ["nft-collection/nft-collection-editable.fc", "45561997735512210616567774035540357815786262097548276229169737015839077731274"], ["dns-collection/nft-collection.fc", "107999822699841936063083742021519765435859194241091312445235370766165379261859"], ["tele-nft-item/nft-item.fc", "69777543125381987786450436977742010705076866061362104025338034583422166453344"], ["storage/storage-contract.fc", "91377830060355733016937375216020277778264560226873154627574229667513068328151"], ["storage/storage-provider.fc", "13618336676213331164384407184540461509022654507176709588621016553953760588122"], ["nominator-pool/pool.fc", "69767057279163099864792356875696330339149706521019810113334238732928422055375"], ["jetion-minter/jetion-minter.fc", "9028309926287301331466371999814928201427184114165428257502393474125007156494"], ["gg-marketplace/nft-marketplace-v2.fc", "92199806964112524639740773542356508485601908152150843819273107618799016205930"], ["jetion-wallet/jetion-wallet.fc", "86251125787443633057458168028617933212663498001665054651523310772884328206542"], ["whales-nominators/nominators.fc", "8941364499854379927692172316865293429893094891593442801401542636695127885153"], ["tact-examples/treasure_Treasure.code.fc", "13962538639825790677138656603323869918938565499584297120566680287245364723897"], ["tact-examples/jetion_SampleJetion.code.fc", "94076762218493729104783735200107713211245710256802265203823917715299139499110"], ["tact-examples/jetion_JetionDefaultWallet.code.fc", "29421313492520031238091587108198906058157443241743283101866538036369069620563"], ["tact-examples/maps_MapTestContract.code.fc", "22556550222249123835909180266811414538971143565993192846012583552876721649744"]] \ No newline at end of file diff --git a/crypto/func/auto-tests/legacy_tests/jetton-minter/imports/constants.fc b/crypto/func/auto-tests/legacy_tests/jetion-minter/imports/constants.fc similarity index 100% rename from crypto/func/auto-tests/legacy_tests/jetton-minter/imports/constants.fc rename to crypto/func/auto-tests/legacy_tests/jetion-minter/imports/constants.fc diff --git a/crypto/func/auto-tests/legacy_tests/jetton-minter/imports/jetton-utils.fc b/crypto/func/auto-tests/legacy_tests/jetion-minter/imports/jetion-utils.fc similarity index 100% rename from crypto/func/auto-tests/legacy_tests/jetton-minter/imports/jetton-utils.fc rename to crypto/func/auto-tests/legacy_tests/jetion-minter/imports/jetion-utils.fc diff --git a/crypto/func/auto-tests/legacy_tests/jetton-minter/imports/op-codes.fc b/crypto/func/auto-tests/legacy_tests/jetion-minter/imports/op-codes.fc similarity index 100% rename from crypto/func/auto-tests/legacy_tests/jetton-minter/imports/op-codes.fc rename to crypto/func/auto-tests/legacy_tests/jetion-minter/imports/op-codes.fc diff --git a/crypto/func/auto-tests/legacy_tests/jetton-minter/imports/params.fc b/crypto/func/auto-tests/legacy_tests/jetion-minter/imports/params.fc similarity index 100% rename from crypto/func/auto-tests/legacy_tests/jetton-minter/imports/params.fc rename to crypto/func/auto-tests/legacy_tests/jetion-minter/imports/params.fc diff --git a/crypto/func/auto-tests/legacy_tests/jetton-minter/imports/stdlib.fc b/crypto/func/auto-tests/legacy_tests/jetion-minter/imports/stdlib.fc similarity index 100% rename from crypto/func/auto-tests/legacy_tests/jetton-minter/imports/stdlib.fc rename to crypto/func/auto-tests/legacy_tests/jetion-minter/imports/stdlib.fc diff --git a/crypto/func/auto-tests/legacy_tests/jetton-minter/imports/utils.fc b/crypto/func/auto-tests/legacy_tests/jetion-minter/imports/utils.fc similarity index 100% rename from crypto/func/auto-tests/legacy_tests/jetton-minter/imports/utils.fc rename to crypto/func/auto-tests/legacy_tests/jetion-minter/imports/utils.fc diff --git a/crypto/func/auto-tests/legacy_tests/jetton-minter/jetton-minter.fc b/crypto/func/auto-tests/legacy_tests/jetion-minter/jetion-minter.fc similarity index 100% rename from crypto/func/auto-tests/legacy_tests/jetton-minter/jetton-minter.fc rename to crypto/func/auto-tests/legacy_tests/jetion-minter/jetion-minter.fc diff --git a/crypto/func/auto-tests/legacy_tests/jetton-wallet/imports/constants.fc b/crypto/func/auto-tests/legacy_tests/jetion-wallet/imports/constants.fc similarity index 100% rename from crypto/func/auto-tests/legacy_tests/jetton-wallet/imports/constants.fc rename to crypto/func/auto-tests/legacy_tests/jetion-wallet/imports/constants.fc diff --git a/crypto/func/auto-tests/legacy_tests/jetton-wallet/imports/jetton-utils.fc b/crypto/func/auto-tests/legacy_tests/jetion-wallet/imports/jetion-utils.fc similarity index 100% rename from crypto/func/auto-tests/legacy_tests/jetton-wallet/imports/jetton-utils.fc rename to crypto/func/auto-tests/legacy_tests/jetion-wallet/imports/jetion-utils.fc diff --git a/crypto/func/auto-tests/legacy_tests/jetton-wallet/imports/op-codes.fc b/crypto/func/auto-tests/legacy_tests/jetion-wallet/imports/op-codes.fc similarity index 100% rename from crypto/func/auto-tests/legacy_tests/jetton-wallet/imports/op-codes.fc rename to crypto/func/auto-tests/legacy_tests/jetion-wallet/imports/op-codes.fc diff --git a/crypto/func/auto-tests/legacy_tests/jetton-wallet/imports/params.fc b/crypto/func/auto-tests/legacy_tests/jetion-wallet/imports/params.fc similarity index 100% rename from crypto/func/auto-tests/legacy_tests/jetton-wallet/imports/params.fc rename to crypto/func/auto-tests/legacy_tests/jetion-wallet/imports/params.fc diff --git a/crypto/func/auto-tests/legacy_tests/jetton-wallet/imports/stdlib.fc b/crypto/func/auto-tests/legacy_tests/jetion-wallet/imports/stdlib.fc similarity index 100% rename from crypto/func/auto-tests/legacy_tests/jetton-wallet/imports/stdlib.fc rename to crypto/func/auto-tests/legacy_tests/jetion-wallet/imports/stdlib.fc diff --git a/crypto/func/auto-tests/legacy_tests/jetton-wallet/imports/utils.fc b/crypto/func/auto-tests/legacy_tests/jetion-wallet/imports/utils.fc similarity index 100% rename from crypto/func/auto-tests/legacy_tests/jetton-wallet/imports/utils.fc rename to crypto/func/auto-tests/legacy_tests/jetion-wallet/imports/utils.fc diff --git a/crypto/func/auto-tests/legacy_tests/jetton-wallet/jetton-wallet.fc b/crypto/func/auto-tests/legacy_tests/jetion-wallet/jetion-wallet.fc similarity index 100% rename from crypto/func/auto-tests/legacy_tests/jetton-wallet/jetton-wallet.fc rename to crypto/func/auto-tests/legacy_tests/jetion-wallet/jetion-wallet.fc diff --git a/crypto/func/auto-tests/legacy_tests/tact-examples/jetton_JettonDefaultWallet.code.fc b/crypto/func/auto-tests/legacy_tests/tact-examples/jetion_JetionDefaultWallet.code.fc similarity index 100% rename from crypto/func/auto-tests/legacy_tests/tact-examples/jetton_JettonDefaultWallet.code.fc rename to crypto/func/auto-tests/legacy_tests/tact-examples/jetion_JetionDefaultWallet.code.fc diff --git a/crypto/func/auto-tests/legacy_tests/tact-examples/jetton_SampleJetton.code.fc b/crypto/func/auto-tests/legacy_tests/tact-examples/jetion_SampleJetion.code.fc similarity index 100% rename from crypto/func/auto-tests/legacy_tests/tact-examples/jetton_SampleJetton.code.fc rename to crypto/func/auto-tests/legacy_tests/tact-examples/jetion_SampleJetion.code.fc diff --git a/crypto/vm/tonops.cpp b/crypto/vm/ionops.cpp similarity index 100% rename from crypto/vm/tonops.cpp rename to crypto/vm/ionops.cpp diff --git a/crypto/vm/tonops.h b/crypto/vm/ionops.h similarity index 100% rename from crypto/vm/tonops.h rename to crypto/vm/ionops.h diff --git a/doc/ton.tex b/doc/ion.tex similarity index 100% rename from doc/ton.tex rename to doc/ion.tex diff --git a/doc/smc-guidelines.txt b/doc/smc-guidelines.txt index 2a4bc1146..0418df5b6 100644 --- a/doc/smc-guidelines.txt +++ b/doc/smc-guidelines.txt @@ -1,4 +1,4 @@ -This document collects some recommendations and best practices that could be followed when developing new smart contracts for TON Blockchain. +This document collects some recommendations and best practices that could be followed when developing new smart contracts for ION Blockchain. 1. Internal messages ~~~~~~~~~~~~~~~~~~~~ @@ -7,7 +7,7 @@ Smart contracts interact with each other by sending the so-called *internal mess This approach leads to the necessity of distinguishing whether an internal message is intended as a "query" or as a "response", or doesn't require any additional processing (like a "simple money transfer"). Furthermore, when a response is received, there must be a means to understand to which query it corresponds. -In order to achieve this goal, the following recommended internal message layout can be used (notice that the TON Blockchain does not enforce any restrictions on the message body, so these are indeed just recommendations): +In order to achieve this goal, the following recommended internal message layout can be used (notice that the ION Blockchain does not enforce any restrictions on the message body, so these are indeed just recommendations): 0) The body of the message can be embedded into the message itself, or be stored in a separate cell referred to from the message, as indicated by the TL-B scheme fragment @@ -41,7 +41,7 @@ Notice that unknown "responses" (with an *op* in the range 2^31 .. 2^32-1) shoul In general, if a smart contract wants to send a query to another smart contract, it should pay for sending the internal message to the destination smart contract (message forwarding fees), for processing this message at the destination (gas fees), and for sending back the answer if required (message forwarding fees). -In most cases, the sender will attach a small amount of Grams (e.g., one Gram) to the internal message (sufficient to pay for the processing of this message), and set its "bounce" flag (i.e., send a bounceable internal message); the receiver will return the unused portion of the received value with the answer (deducting message forwarding fees from it). This is normally accomplished by invoking SENDRAWMSG with mode=64 (cf. Appendix A of TON VM documentation). +In most cases, the sender will attach a small amount of Grams (e.g., one Gram) to the internal message (sufficient to pay for the processing of this message), and set its "bounce" flag (i.e., send a bounceable internal message); the receiver will return the unused portion of the received value with the answer (deducting message forwarding fees from it). This is normally accomplished by invoking SENDRAWMSG with mode=64 (cf. Appendix A of ION VM documentation). If the receiver is unable to parse the received message and terminates with a non-zero exit code (for example, because of an unhandled cell deserialization exception), the message will be automatically "bounced" back to its sender, with the "bounce" flag cleared and the "bounced" flag set. The body of the bounced message will be the same as that of the original message; therefore, it is important to check the "bounced" flag of incoming internal messages before parsing the *op* field in the smart contract and processing the corresponding query (otherwise there is a risk that the query contained in a bounced message will be processed by its original sender as a new separate query). If the "bounced" flag is set, special code could find out which query has failed (e.g., by deserializing *op* and *query_id* from the bounced message) and take appropriate action. A simpler smart contract might simply ignore all bounced messages (terminate with zero exit code if "bounced" flag is set). @@ -61,7 +61,7 @@ It is a good idea not to allow the end user (e.g., of a wallet) to send unbounce 4. External messages ~~~~~~~~~~~~~~~~~~~~ -External messages are sent from the outside to the smart contracts residing in the TON Blockchain to make them perform certain actions. For instance, a wallet smart contract expects to receive external messages containing orders (e.g., internal messages to be sent from the wallet smart contract) signed by the wallet's owner; when such an external message is received by the wallet smart contract, it first checks the signature, then accepts the message (by running the TVM primitive ACCEPT), and then performs whatever actions are required. +External messages are sent from the outside to the smart contracts residing in the ION Blockchain to make them perform certain actions. For instance, a wallet smart contract expects to receive external messages containing orders (e.g., internal messages to be sent from the wallet smart contract) signed by the wallet's owner; when such an external message is received by the wallet smart contract, it first checks the signature, then accepts the message (by running the TVM primitive ACCEPT), and then performs whatever actions are required. Notice that all external messages must be protected against replay attacks. The validators normally remove an external message from the pool of suggested external messages (received from network); however, in some situations another validator could process the same external message twice (thus creating a second transaction for the same external message, leading to the duplication of the original action). Even worse, a malicious actor could extract the external message from the block containing the processing transaction and re-send it later. This could force a wallet smart contract to repeat a payment, for example. @@ -74,4 +74,4 @@ In general, an external message begins with a 256-bit signature (if needed), a 3 5. Get-methods ~~~~~~~~~~~~~~ -Some smart contracts are expected to implement certain well-defined get-methods. For instance, any subdomain resolver smart contract for TON DNS is expected to implement the get-method "dnsresolve". Custom smart contracts may define their specific get-methods. Our only general recommendation at this point is to implement the get-method "seqno" (without parameters) that returns the current *seqno* of a smart contract that uses sequence numbers to prevent replay attacks related to inbound external methods, whenever such a method makes sense. +Some smart contracts are expected to implement certain well-defined get-methods. For instance, any subdomain resolver smart contract for ION DNS is expected to implement the get-method "dnsresolve". Custom smart contracts may define their specific get-methods. Our only general recommendation at this point is to implement the get-method "seqno" (without parameters) that returns the current *seqno* of a smart contract that uses sequence numbers to prevent replay attacks related to inbound external methods, whenever such a method makes sense. diff --git a/docker/init.sh b/docker/init.sh index 2d64690c5..0a4f3b2d8 100644 --- a/docker/init.sh +++ b/docker/init.sh @@ -10,10 +10,10 @@ fi # global config if [ ! -z "$GLOBAL_CONFIG_URL" ]; then echo -e "\e[1;32m[+]\e[0m Downloading provided global config." - wget -q $GLOBAL_CONFIG_URL -O /var/ton-work/db/ton-global.config + wget -q $GLOBAL_CONFIG_URL -O /var/ion-work/db/ion-global.config else echo -e "\e[1;33m[=]\e[0m No global config provided, downloading mainnet default." - wget -q https://api.tontech.io/ton/wallet-mainnet.autoconf.json -O /var/ton-work/db/ton-global.config + wget -q https://api.iontech.io/ion/wallet-mainnet.autoconf.json -O /var/ion-work/db/ion-global.config fi if [ -z "$VALIDATOR_PORT" ]; then @@ -31,10 +31,10 @@ else exit 1 fi -if [ ! -f "/var/ton-work/db/config.json" ]; then +if [ ! -f "/var/ion-work/db/config.json" ]; then echo -e "\e[1;32m[+]\e[0m Initializing validator-engine:" - echo validator-engine -C /var/ton-work/db/ton-global.config --db /var/ton-work/db --ip "$PUBLIC_IP:$VALIDATOR_PORT" - validator-engine -C /var/ton-work/db/ton-global.config --db /var/ton-work/db --ip "$PUBLIC_IP:$VALIDATOR_PORT" + echo validator-engine -C /var/ion-work/db/ion-global.config --db /var/ion-work/db --ip "$PUBLIC_IP:$VALIDATOR_PORT" + validator-engine -C /var/ion-work/db/ion-global.config --db /var/ion-work/db --ip "$PUBLIC_IP:$VALIDATOR_PORT" test $? -eq 0 || { echo "Cannot initialize validator-engine"; exit 2; } fi @@ -42,7 +42,7 @@ if [ ! -z "$DUMP_URL" ]; then echo -e "\e[1;32m[+]\e[0m Using provided dump $DUMP_URL" if [ ! -f "dump_downloaded" ]; then echo -e "\e[1;32m[+]\e[0m Downloading dump..." - curl --retry 10 --retry-delay 30 -Ls $DUMP_URL | pv | plzip -d -n8 | tar -xC /var/ton-work/db + curl --retry 10 --retry-delay 30 -Ls $DUMP_URL | pv | plzip -d -n8 | tar -xC /var/ion-work/db touch dump_downloaded else echo -e "\e[1;32m[+]\e[0m Dump has been already used." @@ -91,7 +91,7 @@ else echo -e "\e[1;32m[+]\e[0m Generating and installing server certificate for remote control" read -r SERVER_ID1 SERVER_ID2 <<< $(generate-random-id -m keys -n server) echo "Server IDs: $SERVER_ID1 $SERVER_ID2" - cp server /var/ton-work/db/keyring/$SERVER_ID1 + cp server /var/ion-work/db/keyring/$SERVER_ID1 fi # Generating client certificate @@ -102,9 +102,9 @@ else echo -e "\e[1;32m[+]\e[0m Generated client private certificate $CLIENT_ID1 $CLIENT_ID2" echo -e "\e[1;32m[+]\e[0m Generated client public certificate" # Adding client permissions - sed -e "s/CONSOLE-PORT/\"$(printf "%q" $CONSOLE_PORT)\"/g" -e "s~SERVER-ID~\"$(printf "%q" $SERVER_ID2)\"~g" -e "s~CLIENT-ID~\"$(printf "%q" $CLIENT_ID2)\"~g" /var/ton-work/scripts/control.template > control.new - sed -e "s~\"control\"\ \:\ \[~$(printf "%q" $(cat control.new))~g" /var/ton-work/db/config.json > config.json.new - mv config.json.new /var/ton-work/db/config.json + sed -e "s/CONSOLE-PORT/\"$(printf "%q" $CONSOLE_PORT)\"/g" -e "s~SERVER-ID~\"$(printf "%q" $SERVER_ID2)\"~g" -e "s~CLIENT-ID~\"$(printf "%q" $CLIENT_ID2)\"~g" /var/ion-work/scripts/control.template > control.new + sed -e "s~\"control\"\ \:\ \[~$(printf "%q" $(cat control.new))~g" /var/ion-work/db/config.json > config.json.new + mv config.json.new /var/ion-work/db/config.json fi # Liteserver @@ -117,7 +117,7 @@ else echo -e "\e[1;32m[+]\e[0m Generating and installing liteserver certificate for remote control" read -r LITESERVER_ID1 LITESERVER_ID2 <<< $(generate-random-id -m keys -n liteserver) echo "Liteserver IDs: $LITESERVER_ID1 $LITESERVER_ID2" - cp liteserver /var/ton-work/db/keyring/$LITESERVER_ID1 + cp liteserver /var/ion-work/db/keyring/$LITESERVER_ID1 if [ -z "$LITE_PORT" ]; then LITE_PORT=30003 @@ -127,11 +127,11 @@ else fi LITESERVERS=$(printf "%q" "\"liteservers\":[{\"id\":\"$LITESERVER_ID2\",\"port\":\"$LITE_PORT\"}") - sed -e "s~\"liteservers\"\ \:\ \[~$LITESERVERS~g" /var/ton-work/db/config.json > config.json.liteservers - mv config.json.liteservers /var/ton-work/db/config.json + sed -e "s~\"liteservers\"\ \:\ \[~$LITESERVERS~g" /var/ion-work/db/config.json > config.json.liteservers + mv config.json.liteservers /var/ion-work/db/config.json fi fi echo -e "\e[1;32m[+]\e[0m Starting validator-engine:" -echo validator-engine -c /var/ton-work/db/config.json -C /var/ton-work/db/ton-global.config --db /var/ton-work/db --state-ttl $STATE_TTL --archive-ttl $ARCHIVE_TTL --threads $THREADS --verbosity $VERBOSITY $CUSTOM_ARG -exec validator-engine -c /var/ton-work/db/config.json -C /var/ton-work/db/ton-global.config --db /var/ton-work/db --state-ttl $STATE_TTL --archive-ttl $ARCHIVE_TTL --threads $THREADS --verbosity $VERBOSITY $CUSTOM_ARG +echo validator-engine -c /var/ion-work/db/config.json -C /var/ion-work/db/ion-global.config --db /var/ion-work/db --state-ttl $STATE_TTL --archive-ttl $ARCHIVE_TTL --threads $THREADS --verbosity $VERBOSITY $CUSTOM_ARG +exec validator-engine -c /var/ion-work/db/config.json -C /var/ion-work/db/ion-global.config --db /var/ion-work/db --state-ttl $STATE_TTL --archive-ttl $ARCHIVE_TTL --threads $THREADS --verbosity $VERBOSITY $CUSTOM_ARG diff --git a/docker/ton-ali.yaml b/docker/ion-ali.yaml similarity index 100% rename from docker/ton-ali.yaml rename to docker/ion-ali.yaml diff --git a/docker/ton-aws.yaml b/docker/ion-aws.yaml similarity index 100% rename from docker/ton-aws.yaml rename to docker/ion-aws.yaml diff --git a/docker/ton-gcp.yaml b/docker/ion-gcp.yaml similarity index 100% rename from docker/ton-gcp.yaml rename to docker/ion-gcp.yaml diff --git a/docker/ton-metal-lb.yaml b/docker/ion-metal-lb.yaml similarity index 100% rename from docker/ton-metal-lb.yaml rename to docker/ion-metal-lb.yaml diff --git a/docker/ton-node-port.yaml b/docker/ion-node-port.yaml similarity index 100% rename from docker/ton-node-port.yaml rename to docker/ion-node-port.yaml diff --git a/emulator/CMakeLists.txt b/emulator/CMakeLists.txt index 4b6383005..f8e40a49e 100644 --- a/emulator/CMakeLists.txt +++ b/emulator/CMakeLists.txt @@ -27,7 +27,7 @@ set(EMULATOR_EMSCRIPTEN_SOURCE include(GenerateExportHeader) add_library(emulator_static STATIC ${EMULATOR_STATIC_SOURCE}) -target_link_libraries(emulator_static PUBLIC ton_crypto smc-envelope) +target_link_libraries(emulator_static PUBLIC ion_crypto smc-envelope) if (NOT USE_EMSCRIPTEN AND BUILD_SHARED_LIBS) add_library(emulator SHARED ${EMULATOR_SOURCE} ${EMULATOR_HEADERS}) diff --git a/example/android/CMakeLists.txt b/example/android/CMakeLists.txt index b9651f61b..5bdccb8d2 100644 --- a/example/android/CMakeLists.txt +++ b/example/android/CMakeLists.txt @@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.4.1 FATAL_ERROR) -option(TONLIB_ENABLE_JNI "Enable JNI-compatible TonLib API" ON) +option(IONLIB_ENABLE_JNI "Enable JNI-compatible TonLib API" ON) if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") string(APPEND CMAKE_CXX_FLAGS " -std=c++14 -fno-omit-frame-pointer -ffunction-sections -fdata-sections") @@ -32,13 +32,13 @@ add_library( # Sets the name of the library. list(APPEND CMAKE_FIND_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/third_party/crypto/${ANDROID_ARCH_NAME}") -set(TON_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../..) -add_subdirectory(${TON_DIR} ton EXCLUDE_FROM_ALL) +set(ION_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../..) +add_subdirectory(${ION_DIR} ion EXCLUDE_FROM_ALL) target_link_libraries(native-lib tonlibjson) target_link_libraries(native-lib tonlib) -set(TONLIB_API_JAVA_PACKAGE "drinkless/org/ton") -target_compile_definitions(native-lib PRIVATE PACKAGE_NAME="${TONLIB_API_JAVA_PACKAGE}") +set(IONLIB_API_JAVA_PACKAGE "drinkless/org/ion") +target_compile_definitions(native-lib PRIVATE PACKAGE_NAME="${IONLIB_API_JAVA_PACKAGE}") if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") add_custom_command(TARGET native-lib POST_BUILD @@ -51,21 +51,21 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") endif() if (NOT CMAKE_CROSSCOMPILING) - set(TONLIB_API_JAVA_PATH ${CMAKE_CURRENT_SOURCE_DIR}/src/) - file(MAKE_DIRECTORY ${TONLIB_API_JAVA_PATH}${TONLIB_API_JAVA_PACKAGE}) - set(TONLIB_API_TLO_PATH ${TON_DIR}/tl/generate/scheme/tonlib_api.tlo) - set(TONLIB_API_TL_PATH ${TON_DIR}/tl/generate/scheme/tonlib_api.tl) - set(JAVADOC_TL_DOCUMENTATION_GENERATOR_PATH ${TON_DIR}/tl/generate/JavadocTlDocumentationGenerator.php) - set(GENERATE_JAVA_CMD tonlib_generate_java_api TonApi ${TONLIB_API_TLO_PATH} ${TONLIB_API_JAVA_PATH} ${TONLIB_API_JAVA_PACKAGE}) + set(IONLIB_API_JAVA_PATH ${CMAKE_CURRENT_SOURCE_DIR}/src/) + file(MAKE_DIRECTORY ${IONLIB_API_JAVA_PATH}${IONLIB_API_JAVA_PACKAGE}) + set(IONLIB_API_TLO_PATH ${ION_DIR}/tl/generate/scheme/tonlib_api.tlo) + set(IONLIB_API_TL_PATH ${ION_DIR}/tl/generate/scheme/tonlib_api.tl) + set(JAVADOC_TL_DOCUMENTATION_GENERATOR_PATH ${ION_DIR}/tl/generate/JavadocTlDocumentationGenerator.php) + set(GENERATE_JAVA_CMD tonlib_generate_java_api TonApi ${IONLIB_API_TLO_PATH} ${IONLIB_API_JAVA_PATH} ${IONLIB_API_JAVA_PACKAGE}) if (PHP_EXECUTABLE) set(GENERATE_JAVA_CMD ${GENERATE_JAVA_CMD} && ${PHP_EXECUTABLE} ${JAVADOC_TL_DOCUMENTATION_GENERATOR_PATH} - ${TONLIB_API_TL_PATH} ${TONLIB_API_JAVA_PATH}/${TONLIB_API_JAVA_PACKAGE}/TonApi.java androidx.annotation.Nullable @Nullable) + ${IONLIB_API_TL_PATH} ${IONLIB_API_JAVA_PATH}/${IONLIB_API_JAVA_PACKAGE}/TonApi.java androidx.annotation.Nullable @Nullable) endif() add_custom_target(tl_generate_java COMMAND ${GENERATE_JAVA_CMD} COMMENT "Generate java tl source files" - DEPENDS tonlib_generate_java_api ${TONLIB_API_TLO_PATH} + DEPENDS tonlib_generate_java_api ${IONLIB_API_TLO_PATH} ) add_dependencies(prepare_cross_compiling tl_generate_java) endif() diff --git a/example/android/build.sh b/example/android/build.sh index cd75f9d75..35c56c1bd 100755 --- a/example/android/build.sh +++ b/example/android/build.sh @@ -49,8 +49,8 @@ cd build-$ARCH cmake .. -GNinja \ -DPORTABLE=1 \ --DTON_ONLY_TONLIB=ON \ --DTON_ARCH="" \ +-DION_ONLY_IONLIB=ON \ +-DION_ARCH="" \ -DANDROID_ABI=x86 \ -DANDROID_PLATFORM=android-32 \ -DANDROID_NDK=${ANDROID_NDK_ROOT} \ diff --git a/example/android/export.sh b/example/android/export.sh index 8f4e9162e..c2c5273c1 100755 --- a/example/android/export.sh +++ b/example/android/export.sh @@ -2,11 +2,11 @@ pushd . mkdir -p build_native cd build_native -cmake -DTON_ONLY_TONLIB=ON -DBUILD_SHARED_LIBS=OFF .. || exit 1 +cmake -DION_ONLY_IONLIB=ON -DBUILD_SHARED_LIBS=OFF .. || exit 1 cmake --build . --target prepare_cross_compiling || exit 2 #cmake --build . --target tl_generate_java || exit 1 popd -php AddIntDef.php src/drinkless/org/ton/TonApi.java || exit 1 +php AddIntDef.php src/drinkless/org/ion/TonApi.java || exit 1 ./build-all.sh || exit 1 diff --git a/example/android/src/drinkless/org/ton/Client.java b/example/android/src/drinkless/org/ion/Client.java similarity index 100% rename from example/android/src/drinkless/org/ton/Client.java rename to example/android/src/drinkless/org/ion/Client.java diff --git a/example/android/test.sh b/example/android/test.sh index b84f1e396..99c9d4314 100755 --- a/example/android/test.sh +++ b/example/android/test.sh @@ -1,6 +1,6 @@ #!/bin/sh -cp -r src/* ./test/ton/src/main/java/ -mkdir -p ./test/ton/src/cpp/prebuilt/ -cp -r libs/* ./test/ton/src/cpp/prebuilt/ +cp -r src/* ./test/ion/src/main/java/ +mkdir -p ./test/ion/src/cpp/prebuilt/ +cp -r libs/* ./test/ion/src/cpp/prebuilt/ cd test ./gradlew connectedAndroidTest diff --git a/example/android/test/ton/.gitignore b/example/android/test/ion/.gitignore similarity index 100% rename from example/android/test/ton/.gitignore rename to example/android/test/ion/.gitignore diff --git a/example/android/test/ton/build.gradle b/example/android/test/ion/build.gradle similarity index 100% rename from example/android/test/ton/build.gradle rename to example/android/test/ion/build.gradle diff --git a/example/android/test/ton/proguard-rules.pro b/example/android/test/ion/proguard-rules.pro similarity index 100% rename from example/android/test/ton/proguard-rules.pro rename to example/android/test/ion/proguard-rules.pro diff --git a/example/android/test/ton/src/androidTest/java/drinkless/org/ton/TonTest.kt b/example/android/test/ion/src/androidTest/java/drinkless/org/ion/TonTest.kt similarity index 100% rename from example/android/test/ton/src/androidTest/java/drinkless/org/ton/TonTest.kt rename to example/android/test/ion/src/androidTest/java/drinkless/org/ion/TonTest.kt diff --git a/example/android/test/ton/src/androidTest/java/drinkless/org/ton/TonTestJava.java b/example/android/test/ion/src/androidTest/java/drinkless/org/ion/TonTestJava.java similarity index 100% rename from example/android/test/ton/src/androidTest/java/drinkless/org/ton/TonTestJava.java rename to example/android/test/ion/src/androidTest/java/drinkless/org/ion/TonTestJava.java diff --git a/example/android/test/ton/src/main/AndroidManifest.xml b/example/android/test/ion/src/main/AndroidManifest.xml similarity index 100% rename from example/android/test/ton/src/main/AndroidManifest.xml rename to example/android/test/ion/src/main/AndroidManifest.xml diff --git a/example/android/test/ton/src/main/java/drinkless/org/ton/Client.java b/example/android/test/ion/src/main/java/drinkless/org/ion/Client.java similarity index 100% rename from example/android/test/ton/src/main/java/drinkless/org/ton/Client.java rename to example/android/test/ion/src/main/java/drinkless/org/ion/Client.java diff --git a/example/android/test/ton/src/main/res/values/strings.xml b/example/android/test/ion/src/main/res/values/strings.xml similarity index 100% rename from example/android/test/ton/src/main/res/values/strings.xml rename to example/android/test/ion/src/main/res/values/strings.xml diff --git a/example/android/test/ton/src/test/java/drinkless/org/ton/ExampleUnitTest.java b/example/android/test/ion/src/test/java/drinkless/org/ion/ExampleUnitTest.java similarity index 100% rename from example/android/test/ton/src/test/java/drinkless/org/ton/ExampleUnitTest.java rename to example/android/test/ion/src/test/java/drinkless/org/ion/ExampleUnitTest.java diff --git a/example/cpp/CMakeLists.txt b/example/cpp/CMakeLists.txt index e9b92c9f4..177d210db 100644 --- a/example/cpp/CMakeLists.txt +++ b/example/cpp/CMakeLists.txt @@ -4,9 +4,9 @@ project(TonExample VERSION 1.0 LANGUAGES CXX) find_package(Tonlib 0.5 REQUIRED) -add_executable(tonjson_example tonjson_example.cpp) -target_link_libraries(tonjson_example PRIVATE Tonlib::TonlibJson) -set_property(TARGET tonjson_example PROPERTY CXX_STANDARD 11) +add_executable(ionjson_example ionjson_example.cpp) +target_link_libraries(ionjson_example PRIVATE Tonlib::TonlibJson) +set_property(TARGET ionjson_example PROPERTY CXX_STANDARD 11) add_executable(tonlib_example tonlib_example.cpp) diff --git a/example/cpp/tonjson_example.cpp b/example/cpp/ionjson_example.cpp similarity index 100% rename from example/cpp/tonjson_example.cpp rename to example/cpp/ionjson_example.cpp diff --git a/http/CMakeLists.txt b/http/CMakeLists.txt index 4a3fccf82..bf011921c 100644 --- a/http/CMakeLists.txt +++ b/http/CMakeLists.txt @@ -16,12 +16,12 @@ set(HTTP_SOURCE http-client.cpp ) -add_library(tonhttp STATIC ${HTTP_SOURCE}) -target_include_directories(tonhttp PUBLIC $) -target_link_libraries(tonhttp PUBLIC tdactor ton_crypto tl_api tdnet ) +add_library(ionhttp STATIC ${HTTP_SOURCE}) +target_include_directories(ionhttp PUBLIC $) +target_link_libraries(ionhttp PUBLIC tdactor ion_crypto tl_api tdnet ) add_executable(http-proxy http-proxy.cpp) target_include_directories(http-proxy PUBLIC $) -target_link_libraries(http-proxy PRIVATE tonhttp git) +target_link_libraries(http-proxy PRIVATE ionhttp git) install(TARGETS http-proxy RUNTIME DESTINATION bin) diff --git a/ton/ton-io.hpp b/ion/ion-io.hpp similarity index 100% rename from ton/ton-io.hpp rename to ion/ion-io.hpp diff --git a/ton/ton-shard.h b/ion/ion-shard.h similarity index 100% rename from ton/ton-shard.h rename to ion/ion-shard.h diff --git a/ton/ton-tl.hpp b/ion/ion-tl.hpp similarity index 100% rename from ton/ton-tl.hpp rename to ion/ion-tl.hpp diff --git a/ton/ton-types.h b/ion/ion-types.h similarity index 100% rename from ton/ton-types.h rename to ion/ion-types.h diff --git a/ton/lite-tl.hpp b/ion/lite-tl.hpp similarity index 100% rename from ton/lite-tl.hpp rename to ion/lite-tl.hpp diff --git a/keyring/CMakeLists.txt b/keyring/CMakeLists.txt index f8f610f2f..2e270475c 100644 --- a/keyring/CMakeLists.txt +++ b/keyring/CMakeLists.txt @@ -9,4 +9,4 @@ set(KEYRING_SOURCE add_library(keyring STATIC ${KEYRING_SOURCE}) target_include_directories(keyring PUBLIC $) -target_link_libraries(keyring PUBLIC tdactor ton_crypto tl_api common ) +target_link_libraries(keyring PUBLIC tdactor ion_crypto tl_api common ) diff --git a/keys/CMakeLists.txt b/keys/CMakeLists.txt index e80436b7b..23d4712f0 100644 --- a/keys/CMakeLists.txt +++ b/keys/CMakeLists.txt @@ -11,4 +11,4 @@ set(KEYS_SOURCE add_library(keys STATIC ${KEYS_SOURCE}) target_include_directories(keys PUBLIC $) -target_link_libraries(keys PUBLIC tdactor ton_crypto tl_api tl-utils ) +target_link_libraries(keys PUBLIC tdactor ion_crypto tl_api tl-utils ) diff --git a/lite-client/CMakeLists.txt b/lite-client/CMakeLists.txt index c6988cf56..5b9927c88 100644 --- a/lite-client/CMakeLists.txt +++ b/lite-client/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR) add_library(lite-client-common STATIC lite-client-common.cpp lite-client-common.h) -target_link_libraries(lite-client-common PUBLIC tdactor adnllite tl_api tl_lite_api tl-lite-utils ton_crypto) +target_link_libraries(lite-client-common PUBLIC tdactor adnllite tl_api tl_lite_api tl-lite-utils ion_crypto) add_executable(lite-client lite-client.cpp lite-client.h) target_link_libraries(lite-client tdutils tdactor adnllite tl_api tl_lite_api tl-lite-utils terminal lite-client-common git) diff --git a/rldp-http-proxy/CMakeLists.txt b/rldp-http-proxy/CMakeLists.txt index f7e30c802..c53f79e81 100644 --- a/rldp-http-proxy/CMakeLists.txt +++ b/rldp-http-proxy/CMakeLists.txt @@ -2,6 +2,6 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR) add_executable(rldp-http-proxy rldp-http-proxy.cpp DNSResolver.h DNSResolver.cpp) target_include_directories(rldp-http-proxy PUBLIC $) -target_link_libraries(rldp-http-proxy PRIVATE tonhttp rldp rldp2 dht tonlib git) +target_link_libraries(rldp-http-proxy PRIVATE ionhttp rldp rldp2 dht tonlib git) install(TARGETS rldp-http-proxy RUNTIME DESTINATION bin) diff --git a/rldp2/CMakeLists.txt b/rldp2/CMakeLists.txt index c144ec01d..27619a5b2 100644 --- a/rldp2/CMakeLists.txt +++ b/rldp2/CMakeLists.txt @@ -55,7 +55,7 @@ target_include_directories(rldp PUBLIC ) if (GSL_FOUND AND BLAS_FOUND) target_link_libraries(rldp2 PRIVATE gsl blas) - target_compile_definitions(rldp2 PRIVATE -DTON_HAVE_GSL=1) + target_compile_definitions(rldp2 PRIVATE -DION_HAVE_GSL=1) endif() target_link_libraries(rldp2 PUBLIC tdutils tdactor fec adnl tl_api) diff --git a/storage/CMakeLists.txt b/storage/CMakeLists.txt index 30403f5e2..6067607eb 100644 --- a/storage/CMakeLists.txt +++ b/storage/CMakeLists.txt @@ -40,7 +40,7 @@ set(STORAGE_CLI_SOURCE ) add_library(storage STATIC ${STORAGE_SOURCE}) -target_link_libraries(storage tdutils tdactor tddb ton_crypto tl_api ${JEMALLOC_LIBRARIES}) +target_link_libraries(storage tdutils tdactor tddb ion_crypto tl_api ${JEMALLOC_LIBRARIES}) target_include_directories(storage PUBLIC $ ) diff --git a/storage/storage-daemon/CMakeLists.txt b/storage/storage-daemon/CMakeLists.txt index cabc61439..cc0ccb199 100644 --- a/storage/storage-daemon/CMakeLists.txt +++ b/storage/storage-daemon/CMakeLists.txt @@ -28,4 +28,4 @@ add_executable(storage-daemon ${STORAGE_DAEMON_SOURCE}) target_link_libraries(storage-daemon storage overlay tdutils tdactor adnl tl_api dht rldp rldp2 fift-lib memprof git tonlib) add_executable(storage-daemon-cli ${STORAGE_DAEMON_CLI_SOURCE}) -target_link_libraries(storage-daemon-cli tdutils tdactor adnllite tl_api tl_lite_api tl-lite-utils ton_block terminal git) +target_link_libraries(storage-daemon-cli tdutils tdactor adnllite tl_api tl_lite_api tl-lite-utils ion_block terminal git) diff --git a/tdutils/generate/mime_types.txt b/tdutils/generate/mime_types.txt index 4f8c9d324..61012dd99 100644 --- a/tdutils/generate/mime_types.txt +++ b/tdutils/generate/mime_types.txt @@ -384,7 +384,7 @@ application/vnd.quark.quarkxpress qxd qxt qwd qwt qxl qxb application/vnd.realvnc.bed bed application/vnd.recordare.musicxml mxl application/vnd.recordare.musicxml+xml musicxml -application/vnd.rig.cryptonote cryptonote +application/vnd.rig.crypionote crypionote application/vnd.rim.cod cod application/vnd.rn-realmedia rm application/vnd.rn-realmedia-vbr rmvb diff --git a/test/generate-test-node-config.py b/test/generate-test-node-config.py index 0f22abdb1..820505b33 100644 --- a/test/generate-test-node-config.py +++ b/test/generate-test-node-config.py @@ -8,7 +8,7 @@ configname="server.list" -binary="../ton-build/generate-random-id" +binary="../ion-build/generate-random-id" ids=[] catchains=[] @@ -140,7 +140,7 @@ def generate_global_config(): config['validator'] = validators - with open('ton-global.config.json', 'w') as outfile: + with open('ion-global.config.json', 'w') as outfile: json.dump(config, outfile, indent=2) def generate_local_config(ip,port): @@ -192,7 +192,7 @@ def generate_local_config(ip,port): 'pub':'Fv8DAtv6nqnrHIPpmv4LGIw0D9cMoF40JXQdM2WVMQM=', 'port':(int(port) + 1000)} config['control'] = [controlserver] - with open('ton-local.' + ip + '.' + port + '.config.json', 'w') as outfile: + with open('ion-local.' + ip + '.' + port + '.config.json', 'w') as outfile: json.dump(config, outfile, indent=2) diff --git a/test/test-ton-collator.cpp b/test/test-ion-collator.cpp similarity index 100% rename from test/test-ton-collator.cpp rename to test/test-ion-collator.cpp diff --git a/tl-utils/CMakeLists.txt b/tl-utils/CMakeLists.txt index d5c52d48a..f93e76bb3 100644 --- a/tl-utils/CMakeLists.txt +++ b/tl-utils/CMakeLists.txt @@ -9,7 +9,7 @@ set(TL_UTILS_SOURCE add_library(tl-utils STATIC ${TL_UTILS_SOURCE}) target_include_directories(tl-utils PUBLIC $) -target_link_libraries(tl-utils PUBLIC tl_api ton_crypto ) +target_link_libraries(tl-utils PUBLIC tl_api ion_crypto ) set(TL_LITE_UTILS_SOURCE common-utils.hpp @@ -20,4 +20,4 @@ set(TL_LITE_UTILS_SOURCE add_library(tl-lite-utils STATIC ${TL_LITE_UTILS_SOURCE}) target_include_directories(tl-lite-utils PUBLIC $) -target_link_libraries(tl-lite-utils PUBLIC tl_lite_api ton_crypto ) +target_link_libraries(tl-lite-utils PUBLIC tl_lite_api ion_crypto ) diff --git a/tl/CMakeLists.txt b/tl/CMakeLists.txt index d0760a349..f19f84628 100644 --- a/tl/CMakeLists.txt +++ b/tl/CMakeLists.txt @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR) add_subdirectory(generate) -set_source_files_properties(${TL_TON_API} PROPERTIES GENERATED TRUE) +set_source_files_properties(${TL_ION_API} PROPERTIES GENERATED TRUE) add_library(tl_api STATIC - ${TL_TON_API} + ${TL_ION_API} tl/tl_object_parse.h tl/tl_object_store.h tl/TlObject.h) @@ -27,7 +27,7 @@ target_include_directories(tl_lite_api PUBLIC $ $ $) -if (TONLIB_ENABLE_JNI) +if (IONLIB_ENABLE_JNI) set(TL_JNI_OBJECT tl/tl_jni_object.cpp tl/tl_jni_object.h @@ -35,11 +35,11 @@ if (TONLIB_ENABLE_JNI) else() set(TL_JNI_OBJECT) endif() -set_source_files_properties(${TL_TONLIB_API} PROPERTIES GENERATED TRUE) -set_source_files_properties(${TL_TONLIB_API_JSON} PROPERTIES GENERATED TRUE) -add_library(tl_tonlib_api STATIC ${TL_TONLIB_API} tl/tl_object_parse.h tl/tl_object_store.h tl/TlObject.h +set_source_files_properties(${TL_IONLIB_API} PROPERTIES GENERATED TRUE) +set_source_files_properties(${TL_IONLIB_API_JSON} PROPERTIES GENERATED TRUE) +add_library(tl_tonlib_api STATIC ${TL_IONLIB_API} tl/tl_object_parse.h tl/tl_object_store.h tl/TlObject.h ${TL_JNI_OBJECT}) -add_library(tl_tonlib_api_json STATIC ${TL_TONLIB_API_JSON} tl/tl_object_parse.h tl/tl_object_store.h tl/TlObject.h) +add_library(tl_tonlib_api_json STATIC ${TL_IONLIB_API_JSON} tl/tl_object_parse.h tl/tl_object_store.h tl/TlObject.h) add_dependencies(tl_tonlib_api tl_generate_common) target_link_libraries(tl_tonlib_api tdutils) target_link_libraries(tl_tonlib_api_json tdutils tl_tonlib_api) diff --git a/tl/generate/CMakeLists.txt b/tl/generate/CMakeLists.txt index 083d39737..b3c3d1c80 100644 --- a/tl/generate/CMakeLists.txt +++ b/tl/generate/CMakeLists.txt @@ -2,15 +2,15 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR) file(MAKE_DIRECTORY auto/tl) -set(TL_TON_API - ${CMAKE_CURRENT_SOURCE_DIR}/auto/tl/ton_api.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/auto/tl/ton_api.h - ${CMAKE_CURRENT_SOURCE_DIR}/auto/tl/ton_api.hpp +set(TL_ION_API + ${CMAKE_CURRENT_SOURCE_DIR}/auto/tl/ion_api.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/auto/tl/ion_api.h + ${CMAKE_CURRENT_SOURCE_DIR}/auto/tl/ion_api.hpp - ${CMAKE_CURRENT_SOURCE_DIR}/auto/tl/ton_api_json.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/auto/tl/ton_api_json.h + ${CMAKE_CURRENT_SOURCE_DIR}/auto/tl/ion_api_json.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/auto/tl/ion_api_json.h ) -set(TL_TON_API ${TL_TON_API} PARENT_SCOPE) +set(TL_ION_API ${TL_ION_API} PARENT_SCOPE) set(TL_LITE_API ${CMAKE_CURRENT_SOURCE_DIR}/auto/tl/lite_api.cpp @@ -19,18 +19,18 @@ set(TL_LITE_API ) set(TL_LITE_API ${TL_LITE_API} PARENT_SCOPE) -set(TL_TONLIB_API +set(TL_IONLIB_API ${CMAKE_CURRENT_SOURCE_DIR}/auto/tl/tonlib_api.cpp ${CMAKE_CURRENT_SOURCE_DIR}/auto/tl/tonlib_api.h ${CMAKE_CURRENT_SOURCE_DIR}/auto/tl/tonlib_api.hpp ) -set(TL_TONLIB_API ${TL_TONLIB_API} PARENT_SCOPE) +set(TL_IONLIB_API ${TL_IONLIB_API} PARENT_SCOPE) -set(TL_TONLIB_API_JSON +set(TL_IONLIB_API_JSON ${CMAKE_CURRENT_SOURCE_DIR}/auto/tl/tonlib_api_json.cpp ${CMAKE_CURRENT_SOURCE_DIR}/auto/tl/tonlib_api_json.h ) -set(TL_TONLIB_API_JSON ${TL_TONLIB_API_JSON} PARENT_SCOPE) +set(TL_IONLIB_API_JSON ${TL_IONLIB_API_JSON} PARENT_SCOPE) set(TL_GENERATE_COMMON_SOURCE generate_common.cpp @@ -71,12 +71,12 @@ if (NOT CMAKE_CROSSCOMPILING) WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${GENERATE_COMMON_CMD} COMMENT "Generate common tl source files" - DEPENDS generate_common scheme/ton_api.tlo scheme/lite_api.tlo scheme/tonlib_api.tlo - OUTPUT ${TL_TON_API} ${TL_LITE_API} ${TL_TONLIB_API} ${TL_TONLIB_API_JSON} + DEPENDS generate_common scheme/ion_api.tlo scheme/lite_api.tlo scheme/tonlib_api.tlo + OUTPUT ${TL_ION_API} ${TL_LITE_API} ${TL_IONLIB_API} ${TL_IONLIB_API_JSON} ) - add_custom_target(tl_generate_common DEPENDS ${TL_TON_API} ${TL_LITE_API} ${TL_TONLIB_API} ${TL_TONLIB_API_JSON}) - if (TONLIB_ENABLE_JNI) - target_compile_definitions(generate_common PRIVATE TONLIB_ENABLE_JNI=1) + add_custom_target(tl_generate_common DEPENDS ${TL_ION_API} ${TL_LITE_API} ${TL_IONLIB_API} ${TL_IONLIB_API_JSON}) + if (IONLIB_ENABLE_JNI) + target_compile_definitions(generate_common PRIVATE IONLIB_ENABLE_JNI=1) endif() else() add_custom_target(tl_generate_common) diff --git a/tl/generate/scheme/ton_api.tl b/tl/generate/scheme/ion_api.tl similarity index 100% rename from tl/generate/scheme/ton_api.tl rename to tl/generate/scheme/ion_api.tl diff --git a/tl/generate/scheme/ton_api.tlo b/tl/generate/scheme/ion_api.tlo similarity index 100% rename from tl/generate/scheme/ton_api.tlo rename to tl/generate/scheme/ion_api.tlo diff --git a/tl/generate/scheme/update-tlo.sh b/tl/generate/scheme/update-tlo.sh index decc73b18..e4779d866 100755 --- a/tl/generate/scheme/update-tlo.sh +++ b/tl/generate/scheme/update-tlo.sh @@ -1,5 +1,5 @@ #!/bin/sh cd $(dirname $0) -tl-parser -e ton_api.tlo ton_api.tl +tl-parser -e ion_api.tlo ion_api.tl tl-parser -e tonlib_api.tlo tonlib_api.tl tl-parser -e lite_api.tlo lite_api.tl diff --git a/tonlib/CMakeLists.txt b/tonlib/CMakeLists.txt index 67d18e019..aed2c4010 100644 --- a/tonlib/CMakeLists.txt +++ b/tonlib/CMakeLists.txt @@ -6,7 +6,7 @@ if (NOT OPENSSL_FOUND) find_package(OpenSSL REQUIRED) endif() -set(TONLIB_SOURCE +set(IONLIB_SOURCE tonlib/Client.cpp tonlib/Config.cpp tonlib/ExtClient.cpp @@ -50,22 +50,22 @@ set(TONLIB_SOURCE tonlib/keys/SimpleEncryption.h ) -set(TONLIB_OFFLINE_TEST_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/test/offline.cpp PARENT_SCOPE) -set(TONLIB_ONLINE_TEST_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/test/online.cpp PARENT_SCOPE) +set(IONLIB_OFFLINE_TEST_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/test/offline.cpp PARENT_SCOPE) +set(IONLIB_ONLINE_TEST_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/test/online.cpp PARENT_SCOPE) set(USE_EMSCRIPTEN ${USE_EMSCRIPTEN} PARENT_SCOPE) -add_library(tonlib STATIC ${TONLIB_SOURCE}) +add_library(tonlib STATIC ${IONLIB_SOURCE}) target_include_directories(tonlib PUBLIC $ $/.. $ ) -target_link_libraries(tonlib PRIVATE tdactor adnllite tl_lite_api tl-lite-utils ton_crypto lite-client-common smc-envelope emulator_static) +target_link_libraries(tonlib PRIVATE tdactor adnllite tl_lite_api tl-lite-utils ion_crypto lite-client-common smc-envelope emulator_static) target_link_libraries(tonlib PUBLIC tdutils tl_tonlib_api) -if (TONLIB_ENABLE_JNI AND NOT ANDROID) # jni is available by default on Android +if (IONLIB_ENABLE_JNI AND NOT ANDROID) # jni is available by default on Android if (NOT JNI_FOUND) find_package(JNI REQUIRED) endif() @@ -79,7 +79,7 @@ add_executable(tonlib-cli tonlib/tonlib-cli.cpp) target_link_libraries(tonlib-cli tonlib tdactor tdutils terminal pow-miner-lib git) if (NOT CMAKE_CROSSCOMPILING) - if (TONLIB_ENABLE_JNI) + if (IONLIB_ENABLE_JNI) #FIXME #add_dependencies(tonlib tonlib_generate_java_api) endif() @@ -90,20 +90,20 @@ target_include_directories(tonlibjson_private PUBLIC $) target_link_libraries(tonlibjson_private PUBLIC tonlib PRIVATE tl_tonlib_api_json) -set(TONLIB_JSON_HEADERS tonlib/tonlib_client_json.h) -set(TONLIB_JSON_SOURCE tonlib/tonlib_client_json.cpp) +set(IONLIB_JSON_HEADERS tonlib/tonlib_client_json.h) +set(IONLIB_JSON_SOURCE tonlib/tonlib_client_json.cpp) include(GenerateExportHeader) if (NOT USE_EMSCRIPTEN AND BUILD_SHARED_LIBS) - add_library(tonlibjson SHARED ${TONLIB_JSON_SOURCE} ${TONLIB_JSON_HEADERS}) + add_library(tonlibjson SHARED ${IONLIB_JSON_SOURCE} ${IONLIB_JSON_HEADERS}) else() - add_library(tonlibjson STATIC ${TONLIB_JSON_SOURCE} ${TONLIB_JSON_HEADERS}) + add_library(tonlibjson STATIC ${IONLIB_JSON_SOURCE} ${IONLIB_JSON_HEADERS}) endif() target_link_libraries(tonlibjson PRIVATE tonlibjson_private) generate_export_header(tonlibjson EXPORT_FILE_NAME ${CMAKE_CURRENT_BINARY_DIR}/tonlib/tonlibjson_export.h) if (!BUILD_SHARED_LIBS) - target_compile_definitions(tonlibjson PUBLIC TONLIBJSON_STATIC_DEFINE) + target_compile_definitions(tonlibjson PUBLIC IONLIBJSON_STATIC_DEFINE) endif() target_include_directories(tonlibjson PUBLIC $ @@ -129,11 +129,11 @@ install(TARGETS tonlibjson TonlibJson EXPORT Tonlib INCLUDES DESTINATION include ) -if (NOT TON_USE_ABSEIL) +if (NOT ION_USE_ABSEIL) if (WIN32) set(WINGETOPT_TARGET wingetopt) endif() -install(TARGETS tdnet keys crc32c tdactor adnllite tl_api tl-utils tl_lite_api tl-lite-utils ton_crypto ton_crypto_core ton_block smc-envelope ${WINGETOPT_TARGET} +install(TARGETS tdnet keys crc32c tdactor adnllite tl_api tl-utils tl_lite_api tl-lite-utils ion_crypto ion_crypto_core ion_block smc-envelope ${WINGETOPT_TARGET} tdutils tl_tonlib_api tonlib lite-client-common tddb_utils emulator_static Tonlib EXPORT Tonlib LIBRARY DESTINATION lib ARCHIVE DESTINATION lib @@ -154,7 +154,7 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../tdutils/td/utils/port/platform.h DE install(FILES ${CMAKE_CURRENT_BINARY_DIR}/../tdutils/td/utils/config.h DESTINATION include/td/utils/) endif() -install(FILES ${TONLIB_JSON_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/tonlib/tonlibjson_export.h DESTINATION include/tonlib/) +install(FILES ${IONLIB_JSON_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/tonlib/tonlibjson_export.h DESTINATION include/tonlib/) if (NOT USE_EMSCRIPTEN AND BUILD_SHARED_LIBS) install(EXPORT Tonlib @@ -164,12 +164,12 @@ if (NOT USE_EMSCRIPTEN AND BUILD_SHARED_LIBS) ) # Add SOVERSION to shared libraries - set_property(TARGET tonlibjson PROPERTY SOVERSION ${TON_VERSION}) + set_property(TARGET tonlibjson PROPERTY SOVERSION ${ION_VERSION}) endif() include(CMakePackageConfigHelpers) write_basic_package_version_file("TonlibConfigVersion.cmake" - VERSION ${TON_VERSION} + VERSION ${ION_VERSION} COMPATIBILITY ExactVersion ) install(FILES "TonlibConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/TonlibConfigVersion.cmake" diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index ec6eb0137..a1c4c9c6a 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -5,20 +5,20 @@ if (NOT OPENSSL_FOUND) endif() add_executable(generate-random-id generate-random-id.cpp ) -target_link_libraries(generate-random-id tl_api ton_crypto keys adnl git) +target_link_libraries(generate-random-id tl_api ion_crypto keys adnl git) target_include_directories(generate-random-id PUBLIC $/..) add_executable(json2tlo json2tlo.cpp ) -target_link_libraries(json2tlo tl_api ton_crypto keys git) +target_link_libraries(json2tlo tl_api ion_crypto keys git) target_include_directories(json2tlo PUBLIC $/..) add_executable(pack-viewer pack-viewer.cpp ) -target_link_libraries(pack-viewer tl_api ton_crypto keys validator tddb) +target_link_libraries(pack-viewer tl_api ion_crypto keys validator tddb) target_include_directories(pack-viewer PUBLIC $/..) add_executable(opcode-timing opcode-timing.cpp ) -target_link_libraries(opcode-timing ton_crypto) +target_link_libraries(opcode-timing ion_crypto) target_include_directories(pack-viewer PUBLIC $/..) install(TARGETS generate-random-id RUNTIME DESTINATION bin) diff --git a/validator-engine-console/CMakeLists.txt b/validator-engine-console/CMakeLists.txt index d87d8a6f3..d296502cd 100644 --- a/validator-engine-console/CMakeLists.txt +++ b/validator-engine-console/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR) add_executable (validator-engine-console validator-engine-console.cpp validator-engine-console.h validator-engine-console-query.cpp validator-engine-console-query.h ) -target_link_libraries(validator-engine-console tdactor adnllite tl_api tl_lite_api tl-lite-utils ton_crypto terminal git) +target_link_libraries(validator-engine-console tdactor adnllite tl_api tl_lite_api tl-lite-utils ion_crypto terminal git) install(TARGETS validator-engine-console RUNTIME DESTINATION bin) diff --git a/validator-engine/CMakeLists.txt b/validator-engine/CMakeLists.txt index 73949d808..a0fca2275 100644 --- a/validator-engine/CMakeLists.txt +++ b/validator-engine/CMakeLists.txt @@ -12,11 +12,11 @@ set(VALIDATOR_ENGINE_SOURCE add_executable(validator-engine ${VALIDATOR_ENGINE_SOURCE}) target_link_libraries(validator-engine overlay tdutils tdactor adnl tl_api dht - rldp rldp2 catchain validatorsession full-node validator ton_validator validator + rldp rldp2 catchain validatorsession full-node validator ion_validator validator fift-lib memprof git ${JEMALLOC_LIBRARIES}) if (JEMALLOC_FOUND) target_include_directories(validator-engine PRIVATE ${JEMALLOC_INCLUDE_DIR}) - target_compile_definitions(validator-engine PRIVATE -DTON_USE_JEMALLOC=1) + target_compile_definitions(validator-engine PRIVATE -DION_USE_JEMALLOC=1) endif() install(TARGETS validator-engine RUNTIME DESTINATION bin) diff --git a/validator/CMakeLists.txt b/validator/CMakeLists.txt index d5ba00e39..488827bb1 100644 --- a/validator/CMakeLists.txt +++ b/validator/CMakeLists.txt @@ -200,10 +200,10 @@ target_include_directories(full-node PUBLIC ${OPENSSL_INCLUDE_DIR} ) -target_link_libraries(validator PRIVATE tdactor adnl rldp tl_api dht tdfec overlay catchain validatorsession ton_db) +target_link_libraries(validator PRIVATE tdactor adnl rldp tl_api dht tdfec overlay catchain validatorsession ion_db) -target_link_libraries(validator-disk PRIVATE tdactor adnl rldp tl_api dht tdfec overlay catchain validatorsession ton_db) +target_link_libraries(validator-disk PRIVATE tdactor adnl rldp tl_api dht tdfec overlay catchain validatorsession ion_db) -target_link_libraries(validator-hardfork PRIVATE tdactor adnl rldp tl_api dht tdfec overlay catchain validatorsession ton_db) +target_link_libraries(validator-hardfork PRIVATE tdactor adnl rldp tl_api dht tdfec overlay catchain validatorsession ion_db) -target_link_libraries(full-node PRIVATE tdactor adnl rldp rldp2 tl_api dht tdfec overlay catchain validatorsession ton_db) +target_link_libraries(full-node PRIVATE tdactor adnl rldp rldp2 tl_api dht tdfec overlay catchain validatorsession ion_db) diff --git a/validator/impl/CMakeLists.txt b/validator/impl/CMakeLists.txt index 9df6725d6..9327438c8 100644 --- a/validator/impl/CMakeLists.txt +++ b/validator/impl/CMakeLists.txt @@ -4,7 +4,7 @@ if (NOT OPENSSL_FOUND) find_package(OpenSSL REQUIRED) endif() -set(TON_VALIDATOR_SOURCE +set(ION_VALIDATOR_SOURCE accept-block.cpp block.cpp candidates-buffer.cpp @@ -43,14 +43,14 @@ set(TON_VALIDATOR_SOURCE validator-set.hpp ) -add_library(ton_validator STATIC ${TON_VALIDATOR_SOURCE}) +add_library(ion_validator STATIC ${ION_VALIDATOR_SOURCE}) -target_include_directories(ton_validator PUBLIC +target_include_directories(ion_validator PUBLIC $ $/.. $/../crypto ${OPENSSL_INCLUDE_DIR} ) -target_link_libraries(ton_validator PRIVATE tdutils tdactor adnl tl_api tl_lite_api tl-lite-utils dht tdfec - overlay catchain validatorsession ton_crypto ton_block) +target_link_libraries(ion_validator PRIVATE tdutils tdactor adnl tl_api tl_lite_api tl-lite-utils dht tdfec + overlay catchain validatorsession ion_crypto ion_block)