TVM Upgrade (ton-blockchain#686)

* New TVM instructions * Remove PREVBLOCKS * Separate target ton_crypto into TVM-related and -unrelared code * Add fine for failed "send message"; rework SENDMSG * Fix include * Fix bugs, improve action fines * Disable fines for special accounts * Handle msg_balance_remaining.grams == null in transaction.cpp * Bugfixes in SENDMSG * Fix fee calculation in SENDMSG * Fix CellStorageStat and transaction.cpp after merge * SETBOUNCEONACTIONPHASEFAIL instruction * ADDDIVMOD instructions * RUNVM, RUNVMX instructions * Changes in RUNVM * Tests for adddiv and runvm * HASHEXT instruction * Improve opcode-timing More iterations Don't measure preliminary run Remove logs and other excessive operations Add "error" to output * Increase RUNVM gas price * Optimize HASHEXT, adjust gas price * Add "bounce of action fail" flag to actions * Stack operations with unlimited arguments * Ristretto255 instructions * Adjust gas consumption * Optional fixed number of return values in RUNVM, fix exception handling * Adjust gas consumption * Simplify gas consumption logic * Support of secp256k1 and sodium libraries in builds (ton-blockchain#11) * add support of secp256k1 library to the builds (linux, win) * add support of secp256k1 library to the builds (linux, win) * install secp256k1 via brew * install libsodium via brew; change sodium to upper case in FindSodium.cmake * install libsodium via brew; change sodium to upper case in FindSodium.cmake * simplify FindSodium.cmake * bug fixing * bug fixing * bug fixing * add macro SODIUM_STATIC * adjust build command for windows * put back original FindSodium.cmake * put back original FindSodium.cmake * fix sodium unzipped path for windows; add ninja * fix sodium unzipped path for windows; add ninja * fix sodium unzipped path for windows; add ninja * Win32 github build for secp256k1 * x64 architecture github build for secp256k1 * fix sodium linking on linux * enable docker buildx arm64 builds from forked repos * enable docker buildx arm64 builds from forked repos * enable docker buildx arm64 builds from forked repos * adjust mac builds for secp2561k and sodium * fix tonlib jni generation * minor fix * sync fixes across platforms * add libsodium build script for android and precompiled static libraries * build tonlib for android (fails) * FindSodium uppercase * remove system libsodium for android, use precompiled instead; specify SECP256K1_INCLUDE_DIR fir mac 12.6 * uppercase sodium * simplify FindSodium * fix windows build sodium path; use ninja for windows * simplify sodium 2 * adjust windows sodium paths; add paths to android jni * add ninja build windows * add ninja build windows * add ninja build windows 2 * remove win ninja * fix 1 * fix 2 * fix win 3 * fix linux compile 3 * fix jni 1 * fix jni 2 and mac * fix jni 3 * fix jni 4 * fix jni 5 * fix mac 6 * fix mac 7 and jni paths * fix jni 8 * rework sodium for android * rework sodium for android * rework sodium for android 2 * fixed sodium for android 2 * fixed sodium for android 3 * static secp256k1 for android * add precompiled arm secp256k1 * add precompiled arm secp256k1 * build native-lib with secp256k1 x86-64 (non arm) * update precompiled with NDK libsecp256k1.a * update precompiled with NDK libsecp256k1.a * update precompiled with NDK libsecp256k1.a * refactor llvm-strip location * refactor llvm-strip location * add native-lib.so for armv7a, armv8a * add native-lib.so for armv7a, armv8a * test armv7a, armv8a * armv7a - fails linking on sodium, test -> armv8a * works x86-64, armv7a - fails linking on sodium, armv8a - fails linking secp256k1 (incompatible with aarch64linux) * update libpsec256k1, sodium static libs * test x86 android native-lib * test armv7 android native-lib * test armv8 android native-lib * x86_64 and arm64 android native-lib works * x86_64 and arm64 android native-lib works * x86_64 and arm64 android native-lib works * test armv7 android native-lib * test all android native-libs * test all android native-libs * test all android native-libs * test all android native-libs - without SodiumAndroid * test all android native-libs - with FindSodiumAndroid.cmake * win, with Sodium via SODIUM_DIR * win, with Sodium via SODIUM_DIR env * win, with Sodium via SODIUM_DIR env * win, with Sodium via SODIUM_DIR env and SODIUM_USE_STATIC_LIBS * win, with Sodium via SODIUM_DIR, SODIUM_USE_STATIC_LIBS and SODIUM_INCLUDE_DIR * android, with FindSodium * android, with FindSodium with SODIUM_USE_STATIC_LIBS * remove if not apple * target_link_libraries(ton_crypto_core PUBLIC secp256k1) * android SECP256K1_INCLUDE_DIRS * android SECP256K1_INCLUDE_DIR * add libsecp256k1.a/so pre-compiled with ubuntu 22 x86-64 * add libsecp256k1.a/so pre-compiled with ubuntu 22 x86-64 * sodium dirs * sodium dirs * sodium dirs * remove NOT APPLE and SodiumAndroid * add NOT APPLE and remove SodiumAndroid * add NOT APPLE and remove SodiumAndroid * remove build scripts for 18.04, reduce CMakeLists.txt * remove build scripts for 18.04, reduce CMakeLists.txt * Fix cas consumption during library load * Fix fetch_config_params after merge * Add all ADDDIVMOD ops to Asm.fif * Save unpaid storage fee to due_payment * Add "set prev blocks info" to emulator * Adjusted builds (ton-blockchain#13) * Update flake.nix Add libsodium * add libsecp256k1-dev and libsodium-dev into wasm build * make back emulator a shared library; put emulator to artifacts; compile wasm artifacts with sodium and secp256k1. * add secp256k1 to nix * compile emulator statically with nix * compile emulator statically with nix * compile emulator lib statically with nix * compile emulator lib statically with nix * add libemulator to artifacts * add shared libemulator library to artifacts * minor release fix * update set-output commands; add recent_changelog.md * releases fixes * releases fixes, multiline * releases fixes, multiline * releases fixes, multiline * put back multiline changelog * put back multiline changelog * ConfigParam 19 (global-id) and GLOBALID instruction * Fix gas consumption in HASHEXT * Add blst library * Add bls instructions * Allow passing long code to opcode-timing * Add bls testcase * More BLS instructions * Fix tests, add bls tests * Add more bls tests * Improve some bls operations * Adjust some BLS gas prices * Adjust BLS gas prices * Enable __BLST_PORTABLE__ flag only if PORTABLE flag is set * Add tests for BLS_PAIRING * GASCONSUMED instruction * Fix compilation against docker with blst library; (ton-blockchain#14) * fix compilation against docker with blst library; add precompiled libblst.a to android builds * minor fix * Adjust BLKSWX gas * Fix comparison with NAN * Allow arbitrary integers for scalars in ristretto multiplication, fix test * Adjust nix builds according to PR 694 (ton-blockchain#15) * integrate and test PR-694 * integrate and test PR-694, test 2 * Add P256_CHKSIGN (secp256r1) --------- Co-authored-by: SpyCheese <[email protected]> Co-authored-by: neodiX42 <[email protected]>
zjg555543 · May 24, 2023 · 9f93888 · 9f93888
1 parent d6b11d9
commit 9f93888
Show file tree

Hide file tree

Showing 374 changed files with 25,799 additions and 386 deletions.
diff --git a/.github/script/amd64-20.04.Dockerfile b/.github/script/amd64-20.04.Dockerfile
@@ -2,13 +2,13 @@ FROM ubuntu:20.04
 
 RUN apt update
 RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata
-RUN apt install -y build-essential cmake clang openssl libssl-dev zlib1g-dev gperf wget git curl libreadline-dev ccache libmicrohttpd-dev ninja-build pkg-config
+RUN apt install -y build-essential cmake clang openssl libssl-dev zlib1g-dev gperf wget git curl libreadline-dev ccache libmicrohttpd-dev ninja-build libsecp256k1-dev libsodium-dev pkg-config
 
 WORKDIR /
 
 ARG BRANCH
 ARG REPO
-RUN git clone --recurse-submodules https://github.com/$REPO && cd ton && git checkout $BRANCH
+RUN git clone --recurse-submodules https://github.com/$REPO ton && cd ton && git checkout $BRANCH && git submodule update
 
 WORKDIR /ton
 RUN mkdir /ton/build

diff --git a/.github/script/amd64-22.04.Dockerfile b/.github/script/amd64-22.04.Dockerfile
@@ -2,13 +2,13 @@ FROM ubuntu:22.04
 
 RUN apt update
 RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata
-RUN apt install -y build-essential cmake clang openssl libssl-dev zlib1g-dev gperf wget git curl libreadline-dev ccache libmicrohttpd-dev ninja-build pkg-config
+RUN apt install -y build-essential cmake clang openssl libssl-dev zlib1g-dev gperf wget git curl libreadline-dev ccache libmicrohttpd-dev ninja-build libsecp256k1-dev libsodium-dev pkg-config
 
 WORKDIR /
 
 ARG BRANCH
 ARG REPO
-RUN git clone --recurse-submodules https://github.com/$REPO && cd ton && git checkout $BRANCH
+RUN git clone --recurse-submodules https://github.com/$REPO ton && cd ton && git checkout $BRANCH && git submodule update
 
 WORKDIR /ton
 RUN mkdir /ton/build

diff --git a/.github/script/arm64-20.04.Dockerfile b/.github/script/arm64-20.04.Dockerfile
@@ -2,13 +2,13 @@ FROM ubuntu:20.04
 
 RUN apt update
 RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata
-RUN apt install -y build-essential cmake clang openssl libssl-dev zlib1g-dev gperf wget git curl libreadline-dev ccache libmicrohttpd-dev ninja-build pkg-config
+RUN apt install -y build-essential cmake clang openssl libssl-dev zlib1g-dev gperf wget git curl libreadline-dev ccache libmicrohttpd-dev ninja-build libsecp256k1-dev libsodium-dev pkg-config
 
 WORKDIR /
 
 ARG BRANCH
 ARG REPO
-RUN git clone --recurse-submodules https://github.com/$REPO && cd ton && git checkout $BRANCH
+RUN git clone --recurse-submodules https://github.com/$REPO ton && cd ton && git checkout $BRANCH && git submodule update
 
 WORKDIR /ton
 RUN mkdir /ton/build

diff --git a/.github/script/arm64-22.04.Dockerfile b/.github/script/arm64-22.04.Dockerfile
@@ -2,13 +2,13 @@ FROM ubuntu:22.04
 
 RUN apt update
 RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata
-RUN apt install -y build-essential cmake clang openssl libssl-dev zlib1g-dev gperf wget git curl libreadline-dev ccache libmicrohttpd-dev ninja-build pkg-config
+RUN apt install -y build-essential cmake clang openssl libssl-dev zlib1g-dev gperf wget git curl libreadline-dev ccache libmicrohttpd-dev ninja-build libsecp256k1-dev libsodium-dev pkg-config
 
 WORKDIR /
 
 ARG BRANCH
 ARG REPO
-RUN git clone --recurse-submodules https://github.com/$REPO && cd ton && git checkout $BRANCH
+RUN git clone --recurse-submodules https://github.com/$REPO ton && cd ton && git checkout $BRANCH && git submodule update
 
 WORKDIR /ton
 RUN mkdir /ton/build

diff --git a/.github/script/fift-func-wasm-build-ubuntu.sh b/.github/script/fift-func-wasm-build-ubuntu.sh
@@ -8,7 +8,7 @@ export CXX=$(which clang++)
 export CCACHE_DISABLE=1
 
 cd ../..
-rm -rf openssl zlib emsdk build
+rm -rf openssl zlib emsdk secp256k1 libsodium build
 echo `pwd`
 
 git clone https://github.com/openssl/openssl.git
@@ -24,13 +24,23 @@ cd zlib
 ZLIB_DIR=`pwd`
 cd ..
 
+git clone https://github.com/bitcoin-core/secp256k1.git
+cd secp256k1
+./autogen.sh
+SECP256K1_DIR=`pwd`
+cd ..
+
+git clone https://github.com/jedisct1/libsodium --branch stable
+cd libsodium
+SODIUM_DIR=`pwd`
+cd ..
+
 mkdir build
 cd build
 cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DZLIB_LIBRARY=/usr/lib/x86_64-linux-gnu/libz.so -DZLIB_INCLUDE_DIR=$ZLIB_DIR -DOPENSSL_ROOT_DIR=$OPENSSL_DIR -DOPENSSL_INCLUDE_DIR=$OPENSSL_DIR/include -DOPENSSL_CRYPTO_LIBRARY=$OPENSSL_DIR/libcrypto.so -DOPENSSL_SSL_LIBRARY=$OPENSSL_DIR/libssl.so -DTON_USE_ABSEIL=OFF ..
 
 test $? -eq 0 || { echo "Can't configure TON build"; exit 1; }
 
-
 ninja fift smc-envelope
 
 test $? -eq 0 || { echo "Can't compile fift "; exit 1; }
@@ -50,13 +60,6 @@ export CC=$(which emcc)
 export CXX=$(which em++)
 export CCACHE_DISABLE=1
 
-cd ../zlib
-
-emconfigure ./configure --static
-emmake make -j16
-test $? -eq 0 || { echo "Can't compile zlib with emmake "; exit 1; }
-ZLIB_DIR=`pwd`
-
 cd ../openssl
 
 make clean
@@ -67,11 +70,30 @@ sed -i 's/-O3/-Os/g' Makefile
 emmake make depend
 emmake make -j16
 test $? -eq 0 || { echo "Can't compile OpenSSL with emmake "; exit 1; }
+
+cd ../zlib
+
+emconfigure ./configure --static
+emmake make -j16
+test $? -eq 0 || { echo "Can't compile zlib with emmake "; exit 1; }
+ZLIB_DIR=`pwd`
+
+cd ../secp256k1
+
+emconfigure ./configure --enable-module-recovery
+emmake make -j16
+test $? -eq 0 || { echo "Can't compile secp256k1 with emmake "; exit 1; }
+
+cd ../libsodium
+
+emconfigure ./configure --disable-ssp
+emmake make -j16
+test $? -eq 0 || { echo "Can't compile libsodium with emmake "; exit 1; }
+
 cd ../build
 
-emcmake cmake -DUSE_EMSCRIPTEN=ON -DCMAKE_BUILD_TYPE=Release -DZLIB_LIBRARY=$ZLIB_DIR/libz.a -DZLIB_INCLUDE_DIR=$ZLIB_DIR -DOPENSSL_ROOT_DIR=$OPENSSL_DIR -DOPENSSL_INCLUDE_DIR=$OPENSSL_DIR/include -DOPENSSL_CRYPTO_LIBRARY=$OPENSSL_DIR/libcrypto.a -DOPENSSL_SSL_LIBRARY=$OPENSSL_DIR/libssl.a -DCMAKE_TOOLCHAIN_FILE=$EMSDK_DIR/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake -DCMAKE_CXX_FLAGS="-sUSE_ZLIB=1" ..
+emcmake cmake -DUSE_EMSCRIPTEN=ON -DCMAKE_BUILD_TYPE=Release -DZLIB_LIBRARY=$ZLIB_DIR/libz.a -DZLIB_INCLUDE_DIR=$ZLIB_DIR -DOPENSSL_ROOT_DIR=$OPENSSL_DIR -DOPENSSL_INCLUDE_DIR=$OPENSSL_DIR/include -DOPENSSL_CRYPTO_LIBRARY=$OPENSSL_DIR/libcrypto.a -DOPENSSL_SSL_LIBRARY=$OPENSSL_DIR/libssl.a -DCMAKE_TOOLCHAIN_FILE=$EMSDK_DIR/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake -DCMAKE_CXX_FLAGS="-sUSE_ZLIB=1" -DSECP256K1_INCLUDE_DIR=$SECP256K1_DIR/include -DSECP256K1_LIBRARY=$SECP256K1_DIR/.libs/libsecp256k1.a -DSODIUM_INCLUDE_DIR=$SODIUM_DIR/src/libsodium/include -DSODIUM_LIBRARY_RELEASE=$SODIUM_DIR/src/libsodium/.libs/libsodium.a -DSODIUM_LIBRARY_DEBUG=$SODIUM_DIR/src/libsodium/.libs/libsodium.a -DSODIUM_USE_STATIC_LIBS=ON ..
 test $? -eq 0 || { echo "Can't configure TON with with emmake "; exit 1; }
 cp -R ../crypto/smartcont ../crypto/fift/lib crypto
 
 emmake make -j16 funcfiftlib func fift tlbc emulator-emscripten
-
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -359,7 +359,7 @@ jobs:
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: artifacts/ton-x86_64-linux-binaries/libtonlibjson.so.0.5
+          file: artifacts/ton-x86_64-linux-binaries/libtonlibjson.so
           asset_name: tonlibjson-linux-x86_64.so
           tag: ${{ steps.tag.outputs.TAG }}
 

diff --git a/.github/workflows/macos-11.7-compile.yml b/.github/workflows/macos-11.7-compile.yml
@@ -23,12 +23,12 @@ jobs:
       - name: Build all
         run: |
           export NONINTERACTIVE=1
-          brew install ninja libmicrohttpd pkg-config
+          brew install ninja secp256k1 libsodium libmicrohttpd pkg-config
           rootPath=`pwd`
           mkdir build
           cd build
           cmake -GNinja -DOPENSSL_FOUND=1 -DOPENSSL_INCLUDE_DIR=$rootPath/openssl_1_1_1/include -DOPENSSL_CRYPTO_LIBRARY=$rootPath/openssl_1_1_1/libcrypto.a -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=11.7 -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DCMAKE_BUILD_TYPE=Release ..
-          ninja storage-daemon storage-daemon-cli blockchain-explorer fift func tonlib tonlibjson tonlib-cli validator-engine 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
+          ninja storage-daemon storage-daemon-cli blockchain-explorer fift func tonlib tonlibjson tonlib-cli validator-engine 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
 
       - name: Find & copy binaries
         run: |
@@ -42,7 +42,7 @@ jobs:
           cp build/crypto/tlbc artifacts/
           cp build/validator-engine-console/validator-engine-console artifacts/ 
           cp build/tonlib/tonlib-cli artifacts/
-          cp build/tonlib/libtonlibjson.0.5.dylib artifacts/ 
+          cp build/tonlib/libtonlibjson.0.5.dylib artifacts/libtonlibjson.dylib  
           cp build/http/http-proxy artifacts/
           cp build/rldp-http-proxy/rldp-http-proxy artifacts/
           cp build/dht-server/dht-server artifacts/
@@ -51,6 +51,7 @@ jobs:
           cp build/utils/generate-random-id artifacts/
           cp build/utils/json2tlo artifacts/
           cp build/adnl/adnl-proxy artifacts/
+          cp build/emulator/*emulator.* artifacts/
           chmod +x artifacts/*
           rsync -r crypto/smartcont artifacts/
           rsync -r crypto/fift/lib artifacts/

diff --git a/.github/workflows/macos-12.6-compile.yml b/.github/workflows/macos-12.6-compile.yml
@@ -14,12 +14,23 @@ jobs:
           submodules: 'recursive'
       - name: Compile OpenSSL
         run: |
+          export NONINTERACTIVE=1
+          brew install ninja libsodium automake
           git clone https://github.com/openssl/openssl openssl_1_1_1
           cd openssl_1_1_1
           git checkout OpenSSL_1_1_1-stable
           ./Configure --prefix=/usr/local/macos darwin64-x86_64-cc -static -mmacosx-version-min=12.6
           make build_libs -j4
 
+      - name: Compile Secp256k1
+        run: |
+          git clone https://github.com/libbitcoin/secp256k1.git
+          cd secp256k1
+          ./autogen.sh
+          ./configure --enable-module-recovery
+          make
+          make install
+
       - name: Build all
         run: |
           export NONINTERACTIVE=1
@@ -28,7 +39,7 @@ jobs:
           mkdir build
           cd build
           cmake -GNinja -DOPENSSL_FOUND=1 -DOPENSSL_INCLUDE_DIR=$rootPath/openssl_1_1_1/include -DOPENSSL_CRYPTO_LIBRARY=$rootPath/openssl_1_1_1/libcrypto.a -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=12.6 -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DCMAKE_BUILD_TYPE=Release ..
-          ninja storage-daemon storage-daemon-cli blockchain-explorer fift func tonlib tonlibjson tonlib-cli validator-engine 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
+          ninja storage-daemon storage-daemon-cli blockchain-explorer fift func tonlib tonlibjson tonlib-cli validator-engine 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
 
       - name: Find & copy binaries
         run: |
@@ -42,7 +53,7 @@ jobs:
           cp build/crypto/tlbc artifacts/
           cp build/validator-engine-console/validator-engine-console artifacts/ 
           cp build/tonlib/tonlib-cli artifacts/
-          cp build/tonlib/libtonlibjson.0.5.dylib artifacts/ 
+          cp build/tonlib/libtonlibjson.0.5.dylib artifacts/libtonlibjson.dylib 
           cp build/http/http-proxy artifacts/
           cp build/rldp-http-proxy/rldp-http-proxy artifacts/
           cp build/dht-server/dht-server artifacts/
@@ -51,6 +62,7 @@ jobs:
           cp build/utils/generate-random-id artifacts/
           cp build/utils/json2tlo artifacts/
           cp build/adnl/adnl-proxy artifacts/
+          cp build/emulator/*emulator.* artifacts/
           chmod +x artifacts/*
           rsync -r crypto/smartcont artifacts/
           rsync -r crypto/fift/lib artifacts/

diff --git a/.github/workflows/ton-aarch64-linux.yml b/.github/workflows/ton-aarch64-linux.yml
@@ -30,7 +30,8 @@ jobs:
         mkdir artifacts
         cp $PWD/result-aarch64-linux/bin/* artifacts/
         chmod +x artifacts/*
-        cp $PWD/result-aarch64-linux/lib/libtonlibjson.so.0.5 artifacts/
+        cp $PWD/result-aarch64-linux/lib/libtonlibjson.so.0.5 artifacts/libtonlibjson.so
+        cp $PWD/result-aarch64-linux/lib/libemulator.so artifacts/
         cp -R crypto/smartcont artifacts/
         cp -R crypto/fift/lib artifacts/
 

diff --git a/.github/workflows/ton-aarch64-macos.yml b/.github/workflows/ton-aarch64-macos.yml
@@ -28,6 +28,7 @@ jobs:
         cp $PWD/result-aarch64-darwin/bin/* artifacts/
         chmod +x artifacts/*
         cp $PWD/result-aarch64-darwin/lib/libtonlibjson* artifacts/
+        cp $PWD/result-aarch64-darwin/lib/libemulator* artifacts/
         cp -R crypto/smartcont artifacts/
         cp -R crypto/fift/lib artifacts/
 

diff --git a/.github/workflows/ton-ccpcheck.yml b/.github/workflows/ton-ccpcheck.yml
@@ -1,4 +1,4 @@
-name: TON ccpcheck
+name: TON Ccpcheck
 
 on: [push,workflow_dispatch,workflow_call]
 

diff --git a/.github/workflows/ton-wasm-emscripten.yml b/.github/workflows/ton-wasm-emscripten.yml
@@ -15,7 +15,7 @@ jobs:
     - name: Install libraries
       run: |
         sudo apt update
-        sudo apt install -y build-essential git make cmake ninja-build clang libgflags-dev zlib1g-dev libssl-dev libreadline-dev libmicrohttpd-dev pkg-config libgsl-dev python3 python3-dev python3-pip nodejs
+        sudo apt install -y build-essential git make cmake ninja-build clang libgflags-dev zlib1g-dev libssl-dev libreadline-dev libmicrohttpd-dev pkg-config libgsl-dev python3 python3-dev python3-pip nodejs libsecp256k1-dev libsodium-dev
 
     - name: Configure & Build
       run: |

diff --git a/.github/workflows/ton-x86-64-linux.yml b/.github/workflows/ton-x86-64-linux.yml
@@ -29,7 +29,8 @@ jobs:
         mkdir artifacts
         cp $PWD/result-x86_64/bin/* artifacts/
         chmod +x artifacts/*
-        cp $PWD/result-x86_64/lib/libtonlibjson.so.0.5 artifacts/
+        cp $PWD/result-x86_64/lib/libtonlibjson.so.0.5 artifacts/libtonlibjson.so
+        cp $PWD/result-x86_64/lib/libemulator.so artifacts/
         cp -R crypto/smartcont artifacts/
         cp -R crypto/fift/lib artifacts/
 

diff --git a/.github/workflows/ton-x86-64-macos.yml b/.github/workflows/ton-x86-64-macos.yml
@@ -26,6 +26,7 @@ jobs:
         cp $PWD/result-x86_64-darwin/bin/* artifacts/
         chmod +x artifacts/*
         cp $PWD/result-x86_64-darwin/lib/libtonlibjson.dylib artifacts/
+        cp $PWD/result-x86_64-darwin/lib/libemulator.dylib artifacts/
         cp -R crypto/smartcont artifacts/
         cp -R crypto/fift/lib artifacts/
 

diff --git a/.github/workflows/tonlib-android-jni.yml b/.github/workflows/tonlib-android-jni.yml
@@ -29,18 +29,23 @@ jobs:
         export JAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux
         
         export ANDROID_NDK_ROOT=$(pwd)/android-ndk-r25b
+        export NDK_PLATFORM="android-21"
+        export ANDROID_PLATFORM="android-21"
         export OPENSSL_DIR=$(pwd)/example/android/third_party/crypto
         
         rm -rf example/android/src/drinkless/org/ton/TonApi.java
         cd example/android/
-        cmake -GNinja -DTON_ONLY_TONLIB=ON . 
+
+        sudo apt install -y libtool autoconf libsodium-dev libsecp256k1-dev
+             
+        cmake -GNinja -DTON_ONLY_TONLIB=ON .
+        
         ninja prepare_cross_compiling
+
+        sudo apt remove -y libsodium-dev libsecp256k1-dev
+
         rm CMakeCache.txt
         ./build-all.sh
-        ../../android-ndk-r25b/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip libs/x86/libnative-lib.so
-        ../../android-ndk-r25b/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip libs/x86_64/libnative-lib.so
-        ../../android-ndk-r25b/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip libs/armeabi-v7a/libnative-lib.so
-        ../../android-ndk-r25b/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip libs/arm64-v8a/libnative-lib.so
         find . -name "*.debug" -type f -delete
 
     - name: Find & copy binaries
@@ -52,5 +57,5 @@ jobs:
     - name: Upload artifacts
       uses: actions/upload-artifact@master
       with:
-        name: Tonlib JNI libraries for Android
+        name: tonlib-android-jni
         path: artifacts
diff --git a/.github/workflows/ubuntu-22.04-compile.yml b/.github/workflows/ubuntu-22.04-compile.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Install libraries
       run: |
         sudo apt update
-        sudo apt install -y build-essential git make cmake clang libgflags-dev zlib1g-dev libssl-dev libreadline-dev libmicrohttpd-dev pkg-config libgsl-dev python3 python3-dev ninja-build
+        sudo apt install -y build-essential git make cmake clang libgflags-dev zlib1g-dev libssl-dev libreadline-dev libmicrohttpd-dev pkg-config libgsl-dev python3 python3-dev ninja-build libsecp256k1-dev libsodium-dev
 
     - name: Show CPU flags
       run: |
@@ -40,12 +40,12 @@ jobs:
         cd build
         
         cmake -GNinja -DOPENSSL_FOUND=1 -DOPENSSL_INCLUDE_DIR=$rootPath/openssl_1_1_1/include -DOPENSSL_CRYPTO_LIBRARY=$rootPath/openssl_1_1_1/libcrypto.a -DCMAKE_BUILD_TYPE=Release -DPORTABLE=1 -DTON_ARCH= -DCMAKE_CXX_FLAGS="-mavx2" ..
-        ninja storage-daemon storage-daemon-cli fift func tonlib tonlibjson tonlib-cli validator-engine lite-client pow-miner validator-engine-console generate-random-id json2tlo dht-server http-proxy rldp-http-proxy adnl-proxy create-state
+        ninja storage-daemon storage-daemon-cli fift func tonlib tonlibjson tonlib-cli validator-engine lite-client pow-miner validator-engine-console generate-random-id json2tlo dht-server http-proxy rldp-http-proxy adnl-proxy create-state emulator
 
     - name: Find & copy binaries
       run: |
         mkdir artifacts
-        cp  build/storage/storage-daemon/storage-daemon build/storage/storage-daemon/storage-daemon-cli build/crypto/fift build/crypto/tlbc build/crypto/func build/crypto/create-state build/validator-engine-console/validator-engine-console build/tonlib/tonlib-cli build/tonlib/libtonlibjson.so.0.5 build/http/http-proxy build/rldp-http-proxy/rldp-http-proxy build/dht-server/dht-server build/lite-client/lite-client build/validator-engine/validator-engine build/utils/generate-random-id build/utils/json2tlo build/adnl/adnl-proxy artifacts
+        cp  build/storage/storage-daemon/storage-daemon build/storage/storage-daemon/storage-daemon-cli build/crypto/fift build/crypto/tlbc build/crypto/func build/crypto/create-state build/validator-engine-console/validator-engine-console build/tonlib/tonlib-cli build/tonlib/libtonlibjson.so.0.5 build/http/http-proxy build/rldp-http-proxy/rldp-http-proxy build/dht-server/dht-server build/lite-client/lite-client build/validator-engine/validator-engine build/utils/generate-random-id build/utils/json2tlo build/adnl/adnl-proxy build/emulator/libemulator.* artifacts
         chmod +x artifacts/*
         cp -R crypto/smartcont artifacts/
         cp -R crypto/fift/lib artifacts/