Merge pull request #9 from borgvin/v4.1

v4.1 (slippage support)
haven-protocol-org · Oct 11, 2024 · 5b926a6 · 5b926a6
2 parents 5b7d2cd + 50d553d
commit 5b926a6
Show file tree

Hide file tree

Showing 19 changed files with 1,361 additions and 5,923 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -72,7 +72,7 @@ jobs:
         source ./emsdk/emsdk_env.sh
         ./bin/build_ci.sh
     - name: Upload artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: libs
         path: dist/*

diff --git a/bin/build_ci.sh b/bin/build_ci.sh
@@ -17,8 +17,6 @@
 # build haven offshore translations directory
 cd ./external/haven-web-cpp/external/haven || exit 1
 
-sed -i '33s/auto/cn/' src/crypto/wallet/CMakeLists.txt
-
 mkdir -p build/release
 cd build/release
 cmake ../..

diff --git a/bin/build_openssl_emscripten.sh b/bin/build_openssl_emscripten.sh
@@ -67,7 +67,7 @@ cd "$SRC_PATH"
 
 perl ./Configure \
 	linux-generic32 \
-	-no-asm no-ssl2 no-ssl3 no-comp no-engine no-deprecated no-tests no-dso no-shared no-threads disable-shared \
+	-no-asm no-ssl3 no-comp no-engine no-tests no-dso no-shared no-threads disable-shared \
 	--prefix="$INSTALL_PATH" \
 	--openssldir="$INSTALL_PATH" \
 	2>&1

diff --git a/bin/download_deps.sh b/bin/download_deps.sh
@@ -73,7 +73,7 @@ get_openssl_github() {
     && {
       (
         cd "${SDK_PATH}/openssl-sdk"
-        git checkout OpenSSL_1_1_1-stable
+        git checkout tags/openssl-3.0.15
       )
     } \
     || {
@@ -181,7 +181,7 @@ get_openssl_source() {
   [ -d ${SDK_PATH} ] || { echo "get_openssl_source: Missing directory: ${SDK_PATH}"; return 1; }
 
   local DL_URL="https://github.com/openssl/openssl/archive"
-  local DL_FILE="OpenSSL_1_1_1q.tar.gz"
+  local DL_FILE="openssl-3.0.15.tar.gz"
 
   check_archive "${SDK_PATH}/${DL_FILE}" \
   && {
@@ -193,7 +193,7 @@ get_openssl_source() {
   }
 
   mkdir ${SDK_PATH}/openssl-sdk
-  tar -C ${SDK_PATH}/openssl-sdk --strip-components=1 -xvf ${SDK_PATH}/OpenSSL_1_1_1q.tar.gz || return 1
+  tar -C ${SDK_PATH}/openssl-sdk --strip-components=1 -xvf ${SDK_PATH}/${DL_FILE} || return 1
 
   return 0
 }
diff --git a/bin/update_submodules.sh b/bin/update_submodules.sh
@@ -2,3 +2,6 @@
 
 # initialize submodules recursively
 git submodule update --init --recursive
+
+# hack for building after difficulty drift fix
+sed -i 's/long double/double/g' external/haven-web-cpp/external/haven/src/cryptonote_basic/difficulty.cpp
diff --git a/external/haven-web-cpp b/external/haven-web-cpp