Merge branch 'master' of github.com:nav-io/navio-core into HEAD

mxaddict · Aug 6, 2024 · b36390d · b36390d
2 parents 77f4383 + 710285f
commit b36390d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 71 deletions.
diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
@@ -276,13 +276,6 @@ mkdir -p "$DISTSRC"
 
     mkdir -p "$OUTDIR"
 
-    # Make the os-specific installers
-    case "$HOST" in
-        *mingw*)
-            make deploy ${V:+V=1} BITCOIN_WIN_INSTALLER="${OUTDIR}/${DISTNAME}-win64-setup-unsigned.exe"
-            ;;
-    esac
-
     # Setup the directory where our Bitcoin Core build for HOST will be
     # installed. This directory will also later serve as the input for our
     # binary tarballs.
@@ -298,26 +291,6 @@ mkdir -p "$DISTSRC"
             ;;
     esac
 
-    case "$HOST" in
-        *darwin*)
-            make osx_volname ${V:+V=1}
-            make deploydir ${V:+V=1}
-            mkdir -p "unsigned-app-${HOST}"
-            cp  --target-directory="unsigned-app-${HOST}" \
-                osx_volname \
-                contrib/macdeploy/detached-sig-create.sh
-            mv --target-directory="unsigned-app-${HOST}" dist
-            (
-                cd "unsigned-app-${HOST}"
-                find . -print0 \
-                    | sort --zero-terminated \
-                    | tar --create --no-recursion --mode='u+rw,go+r-w,a+X' --null --files-from=- \
-                    | gzip -9n > "${OUTDIR}/${DISTNAME}-${HOST}-unsigned.tar.gz" \
-                    || ( rm -f "${OUTDIR}/${DISTNAME}-${HOST}-unsigned.tar.gz" && exit 1 )
-            )
-            make deploy ${V:+V=1} OSX_ZIP="${OUTDIR}/${DISTNAME}-${HOST}-unsigned.zip"
-            ;;
-    esac
     (
         cd installed
 
@@ -398,22 +371,6 @@ mkdir -p "$DISTSRC"
                 ;;
         esac
     )  # $DISTSRC/installed
-
-    case "$HOST" in
-        *mingw*)
-            cp -rf --target-directory=. contrib/windeploy
-            (
-                cd ./windeploy
-                mkdir -p unsigned
-                cp --target-directory=unsigned/ "${OUTDIR}/${DISTNAME}-win64-setup-unsigned.exe"
-                find . -print0 \
-                    | sort --zero-terminated \
-                    | tar --create --no-recursion --mode='u+rw,go+r-w,a+X' --null --files-from=- \
-                    | gzip -9n > "${OUTDIR}/${DISTNAME}-win64-unsigned.tar.gz" \
-                    || ( rm -f "${OUTDIR}/${DISTNAME}-win64-unsigned.tar.gz" && exit 1 )
-            )
-            ;;
-    esac
 )  # $DISTSRC
 
 rm -rf "$ACTUAL_OUTDIR"

diff --git a/depends/packages/gmp.mk b/depends/packages/gmp.mk
@@ -1,30 +1,9 @@
 package=gmp
-$(package)_version=6.2.1
-$(package)_download_path=https://gmplib.org/download/gmp
-$(package)_file_name=gmp-$($(package)_version).tar.bz2
-$(package)_sha256_hash=eae9326beb4158c386e39a356818031bd28f3124cf915f8c5b1dc4c7a36b4d7c
+$(package)_version=6.3.0
+$(package)_download_path=https://mirrors.kernel.org/gnu/gmp/
+$(package)_file_name=gmp-$($(package)_version).tar.xz
+$(package)_sha256_hash=a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898
 
 define $(package)_set_vars
 $(package)_config_opts+=--enable-cxx --enable-fat --with-pic --disable-shared
-$(package)_config_opts_i686_linux+=ABI=32
-$(package)_cflags_armv7l_linux+=-march=armv7-a
-endef
-
-define $(package)_config_cmds
-  CC_FOR_BUILD="$(CC)" \
-    CXX_FOR_BUILD="$(CXX)" \
-    AR="$(AR)" \
-    NM="$(NM)" \
-    RANLIB="$(RANLIB)" \
-    LD="$(LD)" \
-    STRIP="$(STRIP)" \
-    $($(package)_autoconf)
-endef
-
-define $(package)_build_cmds
-  $(MAKE) -j$(JOBS)
-endef
-
-define $(package)_stage_cmds
-  $(MAKE) DESTDIR=$($(package)_staging_dir) install
 endef
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
@@ -692,7 +692,9 @@ static RPCHelpMan getblocktemplate()
                                                                      {RPCResult::Type::STR_HEX, "eta_fiat_shamir", /*optional=*/true, "Only on Proof of Stake"},
                                                                      {RPCResult::Type::NUM, "modifier", /*optional=*/true, "Only on Proof of Stake"},
                                                                      {RPCResult::Type::NUM, "prev_time", /*optional=*/true, "Only on Proof of Stake"},
-                                                                     {RPCResult::Type::OBJ, "staked_commitments", /*optional=*/true, "Only on Proof of Stake"},
+                                                                     {RPCResult::Type::ARR, "staked_commitments", /*optional=*/true, "Only on Proof of Stake", {
+                                                                                                                                                                   {RPCResult::Type::STR_HEX, "", "staked_commitment"},
+                                                                                                                                                               }},
                                                                      {RPCResult::Type::STR_HEX, "default_witness_commitment", /*optional=*/true, "a valid witness commitment for the unmodified block template"},
                                                                  }},
         },

diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
@@ -498,8 +498,10 @@ static void TestWatchOnlyPubKey(LegacyScriptPubKeyMan* spk_man, const CPubKey& a
 // Cryptographically invalidate a PubKey whilst keeping length and first byte
 static void PollutePubKey(CPubKey& pubkey)
 {
-    std::vector<unsigned char> pubkey_raw(pubkey.begin(), pubkey.end());
-    std::fill(pubkey_raw.begin() + 1, pubkey_raw.end(), 0);
+    assert(pubkey.size() >= 1);
+    std::vector<unsigned char> pubkey_raw;
+    pubkey_raw.push_back(pubkey[0]);
+    pubkey_raw.insert(pubkey_raw.end(), pubkey.size() - 1, 0);
     pubkey = CPubKey(pubkey_raw);
     assert(!pubkey.IsFullyValid());
     assert(pubkey.IsValid());