Skip to content

Sync 23.2.x with master after #1432 #1434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 45 commits into from
Mar 13, 2025
Merged

Sync 23.2.x with master after #1432 #1434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
33fe2da
guix: use same commit for codesigning time-machine
fanquake Mar 6, 2022
7e7dbad
test: Add tests for GetArg methods / settings.json type coercion
ryanofsky Mar 7, 2022
638095e
guix: use latest signapple
achow101 Mar 9, 2022
141288d
build, mac: Include arch in codesignature tarball
achow101 Mar 9, 2022
b670213
test: set segwit height back to 0 on regtest
mzumsande Mar 10, 2022
608381c
rpc: rename getdeploymentinfo status-next to status_next
jonatack Mar 11, 2022
fd2a5b7
guix: Use $HOST instead of generic osx{64} for macOS artifacts
hebasto Mar 13, 2022
62b5e05
contrib: fix signet miner (sighash mismatch)
theStack Mar 13, 2022
513c001
guix: Drop "-signed" suffix for signed macOS .dmg files
hebasto Mar 16, 2022
45fdd42
fixed tests
Mar 10, 2025
e182058
guix: Use "win64" for Windows artifacts consistently
hebasto Mar 16, 2022
d5746d4
Update signapple for platform identifier fix
achow101 Mar 15, 2022
ccb3a3e
Clarify in -maxtimeadjustment that only outbound peers influence time…
jonatack Mar 18, 2022
e8941f0
rpc: Exclude descriptor when address is excluded
Mar 22, 2022
218360b
fix prefix
Mar 10, 2025
ff3e02f
options: flip listenonion to false if not listening
vasild Mar 23, 2022
ba78a0a
util: add linkat to syscall sandbox (AllowFileSystem)
fanquake Mar 24, 2022
fb88890
tests: Calculate input weight more accurately
achow101 Mar 1, 2022
17562c0
util: Add inotify_rm_watch to syscall sandbox (AllowFileSystem)
hebasto Mar 28, 2022
92a518c
wallet, refactor: Add wallet::NotifyWalletLoaded() function
hebasto Mar 29, 2022
cc323e0
wallet: Postpone NotifyWalletLoaded() for encrypted wallets
hebasto Mar 29, 2022
8bde23c
build: Fix "ERR: Unsigned tarballs do not exist"
hebasto Apr 1, 2022
d572cdf
guix: fix vmov alignment issues with gcc 10.3.0 & mingw-w64
fanquake Apr 1, 2022
7470961
build, qt: bump Qt5 version to 5.15.3
prusnak Mar 25, 2022
ae24ae3
RPC: Switch getblockfrompeer back to standard param name blockhash
luke-jr Feb 9, 2022
0f68c54
guix: fix GCC 10.3.0 + mingw-w64 setjmp/longjmp issues
fanquake Apr 13, 2022
078731c
windeploy: Renewed windows code signing certificate
achow101 May 24, 2022
0a9b960
rpc: Capture potentially large UniValue by ref for rpcdoccheck
mzumsande May 29, 2022
063ab84
rpc: fix inappropriate warning for address type p2sh-segwit in create…
brunoerg May 25, 2022
2f9042a
test: ensure createmultisig and addmultisigaddress are not returning …
brunoerg May 25, 2022
33c7e40
p2p: always set nTime for self-advertisements
mzumsande Jun 8, 2022
ebc2121
build: suppress array-bounds errors in libxkbcommon
fanquake Jun 21, 2022
b682cac
Disallow encryption of watchonly wallets
achow101 Jul 15, 2022
8821acd
bdb: disable Werror for format-security
fanquake Aug 1, 2022
f12ddd1
guix: patch NSIS to remove .reloc sections from install stubs
fanquake Aug 5, 2022
cd457a5
guix: use --build={arch}-guix-linux-gnu in cross toolchain
fanquake Aug 17, 2022
5def1b2
Prevent data race for `pathHandlers`
hebasto Sep 2, 2022
be7b6c7
Revert "build: Use Homebrew's sqlite package if it is available"
fanquake Sep 2, 2022
5a43eac
rpc: fix crash in deriveaddresses when derivation index is 2147483647
Oct 6, 2022
0cb8f11
rpc: add non-regression test about deriveaddresses crash when index i…
Oct 6, 2022
d74af31
use elements regtest address for derive test
Mar 10, 2025
c2694cf
lint: fix trailing windows whitespace in win-codesign.cert
delta1 Sep 27, 2023
9483c0a
Revert "Apply acc06bc91f80ddf4e015dcdf0b984bbdbfcb5ca3 fix also to pi…
Mar 11, 2025
abbc170
Merge pull request #1432 from tomt1664/merged-master_23.x-pick
psgreco Mar 12, 2025
01fdecd
Merge branch 'master' into elements-23.2.x-test
psgreco Mar 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/test/04_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if [[ $QEMU_USER_CMD == qemu-s390* ]]; then
fi

if [ "$CI_OS_NAME" == "macos" ]; then
sudo -H pip3 install --upgrade --break-system-packages pip
sudo -H pip3 install --upgrade pip
# shellcheck disable=SC2086
IN_GETOPT_BIN="$(brew --prefix gnu-getopt)/bin/getopt" ${CI_RETRY_EXE} pip3 install --user $PIP_PACKAGES
fi
Expand Down
2 changes: 1 addition & 1 deletion test/functional/feature_elements_taproot_activation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def test_activation(self, rpc, activation_height):
assert_equal (decode["versionHex"], "20000000")

assert_equal(rpc.getdeploymentinfo()["deployments"]["taproot"]["bip9"]["status"], "defined")
# The 1023rd block does not signal, but changes status-next to "started" from "defined"
# The 1023rd block does not signal, but changes status_next to "started" from "defined"
# bitcoin PR #23508 changed bip9 status to the current block instead of the next block
blocks = self.generatetoaddress(rpc, 1, rpc.getnewaddress())
assert_equal(rpc.getdeploymentinfo()["deployments"]["taproot"]["bip9"]["status"], "defined")
Expand Down