TVM instructions: SECP256K1_XONLY_PUBKEY_TWEAK_ADD, SETCONTCTRMANY(X) (#1404)

* TVM instructions: SECP256K1_XONLY_PUBKEY_TWEAK_ADD, SETCONTCTRMANY(X) * Add tests for xonly_pubkey_tweak_add * added secp256k1 as submodule, since we need extrakeys feature of secp256k1 * cleanup * add ton_crypto_core secp256k1 dependency * adjust Dockerfile, android and wasm builds * adjust nix build * test windows build with SECP256K1_ENABLE_MODULE_EXTRAKEYS * test windows build with SECP256K1_ENABLE_MODULE_EXTRAKEYS * adjust android build * adjust emscripten build * adjust emscripten build * try macos-13 * emscripten build adjustments * windows build adjustments * final corrections --------- Co-authored-by: neodix <neodix@ton.org>
2025-03-09 15:40:10 +00:00 · 2024-11-26 17:23:17 +04:00 · 2024-11-26 17:23:17 +04:00 · 25b4c6794a
commit 25b4c6794a
parent 954a96a077
56 changed files with 2112 additions and 502 deletions
--- a/assembly/android/build-android-tonlib.sh
+++ b/assembly/android/build-android-tonlib.sh
@ -8,14 +8,19 @@ while getopts 'a' flag; do
  esac
 done

+export CC=$(which clang-16)
+export CXX=$(which clang++-16)
+export CCACHE_DISABLE=1
+
 if [ ! -d android-ndk-r25b ]; then
  rm android-ndk-r25b-linux.zip
+  echo "Downloading https://dl.google.com/android/repository/android-ndk-r25b-linux.zip"
  wget -q https://dl.google.com/android/repository/android-ndk-r25b-linux.zip
  unzip -q android-ndk-r25b-linux.zip
  test $? -eq 0 || { echo "Can't unzip android-ndk-r25b-linux.zip"; exit 1; }
-  echo Android NDK extracted
+  echo "Android NDK extracted"
 else
-  echo Using extracted Android NDK
+  echo "Using extracted Android NDK"
 fi

 export JAVA_AWT_LIBRARY=NotNeeded
--- a/assembly/native/build-macos-portable.sh
+++ b/assembly/native/build-macos-portable.sh
@ -52,21 +52,6 @@ else
  echo "Using compiled lz4"
 fi

-if [ ! -d "secp256k1" ]; then
-git clone https://github.com/bitcoin-core/secp256k1.git
-cd secp256k1
-secp256k1Path=`pwd`
-git checkout v0.3.2
-./autogen.sh
-./configure --enable-module-recovery --enable-static --disable-tests --disable-benchmark --with-pic
-make -j12
-test $? -eq 0 || { echo "Can't compile secp256k1"; exit 1; }
-cd ..
-else
-  secp256k1Path=$(pwd)/secp256k1
-  echo "Using compiled secp256k1"
-fi
-
 if [ ! -d "libsodium" ]; then
  export LIBSODIUM_FULL_BUILD=1
  git clone https://github.com/jedisct1/libsodium.git
@ -135,9 +120,6 @@ cmake -GNinja .. \
 -DZLIB_FOUND=1 \
 -DZLIB_INCLUDE_DIR=$zlibPath \
 -DZLIB_LIBRARIES=$zlibPath/libz.a \
-DSECP256K1_FOUND=1 \
-DSECP256K1_INCLUDE_DIR=$secp256k1Path/include \
-DSECP256K1_LIBRARY=$secp256k1Path/.libs/libsecp256k1.a \
 -DSODIUM_FOUND=1 \
 -DSODIUM_INCLUDE_DIR=$sodiumPath/src/libsodium/include \
 -DSODIUM_LIBRARY_RELEASE=$sodiumPath/src/libsodium/.libs/libsodium.a \
--- a/assembly/native/build-macos-shared.sh
+++ b/assembly/native/build-macos-shared.sh
@ -36,21 +36,6 @@ else
 fi
 export CCACHE_DISABLE=1

-if [ ! -d "secp256k1" ]; then
-  git clone https://github.com/bitcoin-core/secp256k1.git
-  cd secp256k1
-  secp256k1Path=`pwd`
-  git checkout v0.3.2
-  ./autogen.sh
-  ./configure --enable-module-recovery --enable-static --disable-tests --disable-benchmark
-  make -j12
-  test $? -eq 0 || { echo "Can't compile secp256k1"; exit 1; }
-  cd ..
-else
-  secp256k1Path=$(pwd)/secp256k1
-  echo "Using compiled secp256k1"
-fi
-
 if [ ! -d "lz4" ]; then
  git clone https://github.com/lz4/lz4
  cd lz4
@ -70,9 +55,6 @@ brew unlink openssl@3 &&  brew link --overwrite openssl@3

 cmake -GNinja -DCMAKE_BUILD_TYPE=Release .. \
 -DCMAKE_CXX_FLAGS="-stdlib=libc++" \
-DSECP256K1_FOUND=1 \
-DSECP256K1_INCLUDE_DIR=$secp256k1Path/include \
-DSECP256K1_LIBRARY=$secp256k1Path/.libs/libsecp256k1.a \
 -DLZ4_FOUND=1 \
 -DLZ4_LIBRARIES=$lz4Path/lib/liblz4.a \
 -DLZ4_INCLUDE_DIRS=$lz4Path/lib
--- a/assembly/native/build-ubuntu-portable.sh
+++ b/assembly/native/build-ubuntu-portable.sh
@ -43,23 +43,6 @@ else
  echo "Using compiled lz4"
 fi

-if [ ! -d "secp256k1" ]; then
-git clone https://github.com/bitcoin-core/secp256k1.git
-cd secp256k1
-secp256k1Path=`pwd`
-git checkout v0.3.2
-./autogen.sh
-./configure --enable-module-recovery --enable-static --disable-tests --disable-benchmark --with-pic
-make -j12
-test $? -eq 0 || { echo "Can't compile secp256k1"; exit 1; }
-cd ..
-# ./.libs/libsecp256k1.a
-# ./include
-else
-  secp256k1Path=$(pwd)/secp256k1
-  echo "Using compiled secp256k1"
-fi
-
 if [ ! -d "libsodium" ]; then
  export LIBSODIUM_FULL_BUILD=1
  git clone https://github.com/jedisct1/libsodium.git
@ -126,9 +109,6 @@ cmake -GNinja .. \
 -DZLIB_FOUND=1 \
 -DZLIB_INCLUDE_DIR=$zlibPath \
 -DZLIB_LIBRARIES=$zlibPath/libz.a \
-DSECP256K1_FOUND=1 \
-DSECP256K1_INCLUDE_DIR=$secp256k1Path/include \
-DSECP256K1_LIBRARY=$secp256k1Path/.libs/libsecp256k1.a \
 -DSODIUM_FOUND=1 \
 -DSODIUM_INCLUDE_DIR=$sodiumPath/src/libsodium/include \
 -DSODIUM_LIBRARY_RELEASE=$sodiumPath/src/libsodium/.libs/libsodium.a \
--- a/assembly/native/build-windows-2019.bat
+++ b/assembly/native/build-windows-2019.bat
@ -58,26 +58,6 @@ cd ..\..\..\..
 echo Using lz4...
 )

-if not exist "secp256k1" (
-git clone https://github.com/bitcoin-core/secp256k1.git
-cd secp256k1
-git checkout v0.3.2
-cmake -G "Visual Studio 16 2019" -A x64 -S . -B build -DSECP256K1_ENABLE_MODULE_RECOVERY=ON -DBUILD_SHARED_LIBS=OFF
-IF %errorlevel% NEQ 0 (
-  echo Can't configure secp256k1
-  exit /b %errorlevel%
-)
-cmake --build build --config Release
-IF %errorlevel% NEQ 0 (
-  echo Can't install secp256k1
-  exit /b %errorlevel%
-)
-cd ..
-) else (
-echo Using secp256k1...
-)
-
-
 curl --retry 5 --retry-delay 10 -Lo libsodium-1.0.18-stable-msvc.zip https://download.libsodium.org/libsodium/releases/libsodium-1.0.18-stable-msvc.zip
 IF %errorlevel% NEQ 0 (
  echo Can't download libsodium
@ -131,9 +111,6 @@ cd build
 cmake -GNinja  -DCMAKE_BUILD_TYPE=Release ^
 -DPORTABLE=1 ^
 -DSODIUM_USE_STATIC_LIBS=1 ^
-DSECP256K1_FOUND=1 ^
-DSECP256K1_INCLUDE_DIR=%root%\secp256k1\include ^
-DSECP256K1_LIBRARY=%root%\secp256k1\build\src\Release\libsecp256k1.lib ^
 -DLZ4_FOUND=1 ^
 -DLZ4_INCLUDE_DIRS=%root%\lz4\lib ^
 -DLZ4_LIBRARIES=%root%\lz4\build\VS2017\liblz4\bin\x64_Release\liblz4_static.lib ^
--- a/assembly/native/build-windows.bat
+++ b/assembly/native/build-windows.bat
@ -26,6 +26,8 @@ IF %errorlevel% NEQ 0 (
  exit /b %errorlevel%
 )

+rd /s /q ".\third-party\secp256k1\build"
+
 if not exist "zlib" (
 git clone https://github.com/madler/zlib.git
 cd zlib
@ -58,26 +60,6 @@ cd ..\..\..\..
 echo Using lz4...
 )

-if not exist "secp256k1" (
-git clone https://github.com/bitcoin-core/secp256k1.git
-cd secp256k1
-git checkout v0.3.2
-cmake -G "Visual Studio 17 2022" -A x64 -S . -B build -DSECP256K1_ENABLE_MODULE_RECOVERY=ON -DBUILD_SHARED_LIBS=OFF
-IF %errorlevel% NEQ 0 (
-  echo Can't configure secp256k1
-  exit /b %errorlevel%
-)
-cmake --build build --config Release
-IF %errorlevel% NEQ 0 (
-  echo Can't install secp256k1
-  exit /b %errorlevel%
-)
-cd ..
-) else (
-echo Using secp256k1...
-)
-
-
 if not exist "libsodium" (
 curl  -Lo libsodium-1.0.18-stable-msvc.zip https://download.libsodium.org/libsodium/releases/libsodium-1.0.18-stable-msvc.zip
 IF %errorlevel% NEQ 0 (
@ -132,9 +114,6 @@ cd build
 cmake -GNinja  -DCMAKE_BUILD_TYPE=Release ^
 -DPORTABLE=1 ^
 -DSODIUM_USE_STATIC_LIBS=1 ^
-DSECP256K1_FOUND=1 ^
-DSECP256K1_INCLUDE_DIR=%root%\secp256k1\include ^
-DSECP256K1_LIBRARY=%root%\secp256k1\build\src\Release\libsecp256k1.lib ^
 -DLZ4_FOUND=1 ^
 -DLZ4_INCLUDE_DIRS=%root%\lz4\lib ^
 -DLZ4_LIBRARIES=%root%\lz4\build\VS2017\liblz4\bin\x64_Release\liblz4_static.lib ^
--- a/assembly/wasm/fift-func-wasm-build-ubuntu.sh
+++ b/assembly/wasm/fift-func-wasm-build-ubuntu.sh
@ -2,7 +2,7 @@
 # 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 libsecp256k1-dev libsodium-dev automake libtool
+#                    nodejs libsodium-dev automake libtool libjemalloc-dev

 # wget https://apt.llvm.org/llvm.sh
 # chmod +x llvm.sh
@ -26,13 +26,14 @@ export CCACHE_DISABLE=1

 echo `pwd`
 if [ "$scratch_new" = true ]; then
-  echo Compiling openssl zlib lz4 emsdk secp256k1 libsodium emsdk ton
-  rm -rf openssl zlib lz4 emsdk secp256k1 libsodium build
+  echo Compiling openssl zlib lz4 emsdk libsodium emsdk ton
+  rm -rf openssl zlib lz4 emsdk libsodium build openssl_em
 fi


 if [ ! -d "openssl" ]; then
  git clone https://github.com/openssl/openssl.git
+  cp -r openssl openssl_em
  cd openssl
  git checkout openssl-3.1.4
  ./config
@ -47,21 +48,20 @@ fi
 if [ ! -d "build" ]; then
  mkdir build
  cd build
-  cmake -GNinja -DCMAKE_BUILD_TYPE=Release \
-  -DCMAKE_CXX_STANDARD=17 \
-  -DOPENSSL_FOUND=1 \
+  cmake -GNinja -DTON_USE_JEMALLOC=ON .. \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DOPENSSL_ROOT_DIR=$OPENSSL_DIR \
  -DOPENSSL_INCLUDE_DIR=$OPENSSL_DIR/include \
-  -DOPENSSL_CRYPTO_LIBRARY=$OPENSSL_DIR/libcrypto.so \
-  -DTON_USE_ABSEIL=OFF ..
+  -DOPENSSL_CRYPTO_LIBRARY=$OPENSSL_DIR/libcrypto.so

  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; }
-  rm -rf *
+  rm -rf * .ninja* CMakeCache.txt
  cd ..
 else
  echo cleaning build...
-  rm -rf build/*
+  rm -rf build/* build/.ninja* build/CMakeCache.txt
 fi

 if [ ! -d "emsdk" ]; then
@ -71,8 +71,8 @@ echo
 fi

 cd emsdk
-./emsdk install 3.1.19
-./emsdk activate 3.1.19
+./emsdk install 3.1.40
+./emsdk activate 3.1.40
 EMSDK_DIR=`pwd`

 . $EMSDK_DIR/emsdk_env.sh
@ -82,9 +82,8 @@ export CCACHE_DISABLE=1

 cd ..

-if [ ! -f "openssl/openssl_em" ]; then
-  cd openssl
-  make clean
+if [ ! -f "openssl_em/openssl_em" ]; then
+  cd openssl_em
  emconfigure ./Configure linux-generic32 no-shared no-dso no-engine no-unit-test no-tests no-fuzz-afl no-fuzz-libfuzzer
  sed -i 's/CROSS_COMPILE=.*/CROSS_COMPILE=/g' Makefile
  sed -i 's/-ldl//g' Makefile
@ -92,10 +91,12 @@ if [ ! -f "openssl/openssl_em" ]; then
  emmake make depend
  emmake make -j16
  test $? -eq 0 || { echo "Can't compile OpenSSL with emmake "; exit 1; }
+  OPENSSL_DIR=`pwd`
  touch openssl_em
  cd ..
 else
-  echo Using compiled openssl with emscripten
+  OPENSSL_DIR=`pwd`/openssl_em
+  echo Using compiled with empscripten openssl at $OPENSSL_DIR
 fi

 if [ ! -d "zlib" ]; then
@ -125,21 +126,6 @@ else
  echo Using compiled lz4 with emscripten at $LZ4_DIR
 fi

-if [ ! -d "secp256k1" ]; then
-  git clone https://github.com/bitcoin-core/secp256k1.git
-  cd secp256k1
-  git checkout v0.3.2
-  ./autogen.sh
-  SECP256K1_DIR=`pwd`
-  emconfigure ./configure --enable-module-recovery
-  emmake make -j16
-  test $? -eq 0 || { echo "Can't compile secp256k1 with emmake "; exit 1; }
-  cd ..
-else
-  SECP256K1_DIR=`pwd`/secp256k1
-  echo Using compiled secp256k1 with emscripten at $SECP256K1_DIR
-fi
-
 if [ ! -d "libsodium" ]; then
  git clone https://github.com/jedisct1/libsodium
  cd libsodium
@ -168,9 +154,9 @@ emcmake cmake -DUSE_EMSCRIPTEN=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAK
 -DOPENSSL_CRYPTO_LIBRARY=$OPENSSL_DIR/libcrypto.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_FOUND=1 \
 -DSODIUM_INCLUDE_DIR=$SODIUM_DIR/src/libsodium/include \
+-DSODIUM_USE_STATIC_LIBS=1 \
 -DSODIUM_LIBRARY_RELEASE=$SODIUM_DIR/src/libsodium/.libs/libsodium.a \
 ..

@ -194,5 +180,3 @@ if [ "$with_artifacts" = true ]; then
  cp -R crypto/smartcont artifacts
  cp -R crypto/fift/lib artifacts
 fi
-
-