Skip to content
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.

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

[WIP] Merging bitcoin upstream changes from 27.x #172

Open
wants to merge 478 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
478 commits
Select commit Hold shift + click to select a range
9124c73
opt: Tiebreak UTXOs by weight for CoinGrinder
murchandamus Jan 8, 2024
5248e2a
opt: Skip heavier UTXOs with same effective value
murchandamus Feb 1, 2024
1edd2ba
opt: Cut if last addition was minimal weight
murchandamus Jan 8, 2024
b7672c7
opt: Skip checking max_weight separately
murchandamus Jan 8, 2024
13161ec
opt: Skip over barren combinations of tiny UTXOs
murchandamus Jan 8, 2024
83b7628
wallet: batch and simplify ZapSelectTx process
furszy Jul 16, 2023
9a3c5c8
scripted-diff: rename ZapSelectTx to RemoveTxs
furszy Feb 9, 2024
1d334d8
Merge bitcoin/bitcoin#27877: wallet: Add CoinGrinder coin selection a…
achow101 Feb 9, 2024
7143d43
Merge bitcoin/bitcoin#28948: v3 transaction policy for anti-pinning
achow101 Feb 10, 2024
9e68a82
Merge bitcoin-core/gui#752: Modify command line help to show support …
hebasto Feb 11, 2024
6868474
Merge bitcoin-core/gui#780: Fix: Ensure 'Transaction View' remains di…
hebasto Feb 11, 2024
7d837b5
Merge bitcoin/bitcoin#29399: test: Fix utxo set hash serialisation si…
fanquake Feb 12, 2024
2afbacc
Merge bitcoin-core/gui#658: Intro: Never change the prune checkbox af…
hebasto Feb 12, 2024
e3c1711
Merge bitcoin-core/gui#758: Update Node window title with the chain type
hebasto Feb 12, 2024
63b62e1
[doc] fix docs and comments from v3
glozow Feb 9, 2024
a934642
[test] PackageV3Checks with inheritance violation in mempool ancestor
glozow Feb 12, 2024
5c998a6
[refactor] use MAX_PUBKEYS_PER_MULTISIG instead of magic numbers in test
glozow Feb 12, 2024
6b161cb
[test] second child of a v3 tx can be replaced individually
glozow Feb 12, 2024
bf5662c
test: enable v2 for python p2p depending on global --v2transport flag
mzumsande Nov 20, 2023
c6398c6
Merge bitcoin-core/gui#773: Check for private keys disabled before at…
hebasto Feb 12, 2024
6ff0aa0
Merge bitcoin/bitcoin#28987: wallet: simplify and batch zap wallet tx…
achow101 Feb 12, 2024
cf4d72a
wallet: db, introduce 'RunWithinTxn()' helper function
furszy Feb 8, 2024
3375781
wallet: bdb batch 'ErasePrefix', do not create txn internally
furszy Feb 6, 2024
77331aa
wallet: simplify EraseRecords by using 'ErasePrefix'
furszy Feb 6, 2024
44d1153
test: fix intermittent failure in wallet_reorgrestore.py
mzumsande Feb 12, 2024
3d1bb1a
qt: Update translation source file for v27.0 string freeze
hebasto Feb 13, 2024
3054416
Merge bitcoin/bitcoin#29425: test: fix intermittent failure in wallet…
fanquake Feb 13, 2024
37fdf5a
Merge bitcoin/bitcoin#29424: v3 followups
fanquake Feb 13, 2024
f83565d
Merge bitcoin/bitcoin#29394: test, assumeutxo: Add test to ensure fai…
fanquake Feb 13, 2024
d7dabdb
Merge bitcoin/bitcoin#29413: fuzz: increase length of string used for…
fanquake Feb 13, 2024
128b4a8
Merge bitcoin/bitcoin#29403: wallet: batch erase procedures and impro…
achow101 Feb 13, 2024
9d1dbbd
scripted-diff: Fix bitcoin_config_h includes
TheCharlatan Feb 13, 2024
baed5ed
Merge bitcoin-core/gui#793: Update translation source file for v27.0 …
hebasto Feb 13, 2024
fa0ff66
rpc: Implement RPCHelpMan::ArgValue<> for UniValue
Feb 14, 2024
3b0ec06
doc: Update translation_process.md
pablomartin4btc Feb 9, 2024
fade94d
rpc: Add ParseFeeRate helper
Feb 14, 2024
fa2a4fd
rpc: Fixed signed integer overflow for large feerates
Feb 14, 2024
dddd7be
doc: Clarify maxfeerate help
Feb 15, 2024
dfff8ee
Merge bitcoin/bitcoin#29414: doc: Update translation process guide
fanquake Feb 16, 2024
3cbc8cb
Merge bitcoin/bitcoin#28037: rpc: Drop migratewallet experimental war…
fanquake Feb 16, 2024
fa91bf2
ci: Skip git install if it is already installed
Jan 18, 2024
b276825
bench: Add a benchmark for ismine
achow101 Feb 2, 2024
99a0cdd
wallet: Introduce a callback called after TopUp completes
achow101 Feb 2, 2024
3723233
wallet: Cache scriptPubKeys for all DescriptorSPKMs
achow101 Feb 2, 2024
edf4e73
wallet: Use scriptPubKey cache in IsMine
achow101 Feb 2, 2024
b410f68
wallet: Use scriptPubKey cache in GetScriptPubKeyMans
achow101 Feb 2, 2024
39640dd
wallet: Use scriptPubKeyCache in GetSolvingProvider
achow101 Feb 2, 2024
e041ed9
wallet: Retrieve ID from loaded DescSPKM directly
achow101 Feb 15, 2024
0fbf051
depends: fix BDB compilation on OpenBSD
theStack Feb 18, 2024
4c9db9b
qt, test: Recognize dialog object by name
hebasto Feb 19, 2024
0d3e18b
doc: document that BIP324 on by default for v27.0
fanquake Feb 19, 2024
ddf1d72
Merge bitcoin/bitcoin#29452: doc: document that BIP324 on by default …
glozow Feb 19, 2024
c265aad
Merge bitcoin/bitcoin#29434: rpc: Fixed signed integer overflow for l…
achow101 Feb 19, 2024
b1a46b2
Merge bitcoin/bitcoin#26008: wallet: cache IsMine scriptPubKeys to im…
fanquake Feb 20, 2024
bdddf36
Merge bitcoin/bitcoin#29441: ci: Avoid CI failures from temp env file…
fanquake Feb 20, 2024
5402829
docs: ci multi-arch requires qemu
m3dwards Feb 20, 2024
d301c99
Merge bitcoin-core/gui#797: test: Recognize dialog object by name
hebasto Feb 20, 2024
45b2a91
Merge bitcoin/bitcoin#29404: refactor: bitcoin-config.h includes cleanup
fanquake Feb 20, 2024
fa10051
lint: Add get_subtrees() helper
Feb 8, 2024
fa770fd
doc: Add missing RUST_BACKTRACE=1
Feb 9, 2024
fa63b0e
lint: Make lint error easier to spot in output
Feb 11, 2024
fa31908
lint: Check for missing or redundant bitcoin-config.h includes
Feb 8, 2024
fa58ae7
refactor: Add missing include for USE_BDB, USE_SQLITE to bench/wallet…
Feb 20, 2024
345169a
test: assert rpc error for addnode v2transport not enabled
kevkevinpal Feb 21, 2024
46d2616
Merge bitcoin/bitcoin#29456: docs: ci multi-arch requires qemu
fanquake Feb 21, 2024
2ac41ef
Merge bitcoin/bitcoin#29460: test: assert rpc error for addnode v2tra…
fanquake Feb 21, 2024
84388c9
ci: avoid running git diff after patching
ryanofsky Feb 21, 2024
88b1229
Merge bitcoin/bitcoin#29400: test: Fix SegwitV0SignatureMsg nLockTime…
achow101 Feb 21, 2024
9dae3b9
[fuzz] Avoid partial negative result
murchandamus Feb 21, 2024
1ac627c
Merge bitcoin/bitcoin#29462: [fuzz] Avoid partial negative result
achow101 Feb 22, 2024
faeed91
test: Fix intermittent issue in interface_rest.py
Feb 22, 2024
eb5d78c
doc: document preference for list-initialization
andrewtoth Feb 23, 2024
b03b206
Fix CI-detected codespell warnings
Feb 23, 2024
5f240ab
test: Add option to skip unit tests for the test runner
mzumsande Feb 23, 2024
bd1c66f
Merge bitcoin/bitcoin#29461: ci: avoid running git diff after patching
fanquake Feb 26, 2024
eaede27
Merge bitcoin/bitcoin#29408: lint: Check for missing bitcoin-config.h…
fanquake Feb 26, 2024
edefcd5
Merge bitcoin/bitcoin#29470: test: Add option to skip python unit tests
fanquake Feb 26, 2024
d0a9e33
Merge bitcoin/bitcoin#29469: doc: document preference for list-initia…
fanquake Feb 26, 2024
ba90b05
Merge bitcoin/bitcoin#29345: rpc: Do not wait for headers inside load…
fanquake Feb 26, 2024
19b7f2b
Merge bitcoin/bitcoin#29471: doc: Fix CI-detected codespell warnings
fanquake Feb 26, 2024
ac19235
Merge bitcoin/bitcoin#29443: depends: fix BDB compilation on OpenBSD
fanquake Feb 26, 2024
60b6ff5
Merge bitcoin/bitcoin#29467: test: Fix intermittent issue in interfac…
fanquake Feb 26, 2024
d2fe905
test: Drop `x` modifier in `fsbridge::fopen` call for mingw builds
hebasto Jan 31, 2024
fccfdb2
doc: Update OpenBSD build docs to 7.4
jessebarton Feb 26, 2024
52f9bba
crypto: replace non-standard CLZ builtins with c++20's bit_width
theuni Dec 8, 2023
297367b
crypto: replace CountBits with std::bit_width
theuni Dec 12, 2023
4d7d7fd
Merge bitcoin/bitcoin#29357: test: Drop `x` modifier in `fsbridge::fo…
fanquake Feb 26, 2024
ee7e4b0
Merge bitcoin/bitcoin#28178: fuzz: Generate with random libFuzzer set…
fanquake Feb 27, 2024
5c6d900
Merge bitcoin/bitcoin#29358: test: use v2 everywhere for P2PConnectio…
fanquake Feb 27, 2024
b052b2d
build: remove -Wdocumentation conditional
fanquake Jul 17, 2023
6a7ed5e
Merge bitcoin/bitcoin#29481: doc: Update OpenBSD build docs for 7.4
fanquake Feb 27, 2024
95bddb9
[validation] Isolate merkle root checks
dergoegge Jan 19, 2024
e7669e1
[refactor] Cleanup merkle root checks
dergoegge Feb 22, 2024
66abce1
[validation] Introduce IsBlockMutated
dergoegge Jan 19, 2024
2d8495e
[validation] Merkle root malleation should be caught by IsBlockMutated
dergoegge Feb 6, 2024
49257c0
[net processing] Don't process mutated blocks
dergoegge Jan 19, 2024
5bf4f5b
[test] Add regression test for #27608
dergoegge Feb 2, 2024
1ec6bbe
[validation] Cache merkle root and witness commitment checks
dergoegge Feb 6, 2024
1ed2c98
Add transaction_identifier::size to allow Span conversion
dergoegge Feb 27, 2024
d8087ad
[test] IsBlockMutated unit tests
dergoegge Feb 23, 2024
51bc1c7
test: Remove Windows-specific code from `system_tests/run_command`
hebasto Feb 27, 2024
5d45552
Squashed 'src/crc32c/' changes from 0bac72c455..b60d2b7334
fanquake Feb 27, 2024
359a8d9
Update crc32c subtree to latest upstream master
fanquake Feb 27, 2024
ad7584d
serialization: replace char-is-int8_t autoconf detection with c++20 c…
theuni Feb 26, 2024
6fa61e3
doc: Fix Broken Links
justindhillon Feb 27, 2024
ba907f9
Merge bitcoin/bitcoin#29475: doc: Fix Broken Links
fanquake Feb 27, 2024
367bb7a
wallet: Avoid updating `ReserveDestination::nIndex` when `GetReserved…
UdjinM6 Feb 28, 2024
e073f1d
test: make sure keypool sizes do not change on `getrawchangeaddress`/…
UdjinM6 Feb 28, 2024
432b18c
serialization: detect byteswap builtins without autoconf tests
theuni Feb 27, 2024
86b7f28
serialization: use internal endian conversion functions
theuni Feb 27, 2024
1484998
ci: print python version on win64 native job
m3dwards Feb 28, 2024
f3a612f
gui: guard accessing a nullptr 'clientModel'
furszy Feb 28, 2024
7859f4e
Merge bitcoin/bitcoin#29486: build: remove -Wdocumentation conditional
fanquake Feb 28, 2024
bbfddb3
Merge bitcoin/bitcoin#29484: serialization: replace char-is-int8_t au…
fanquake Feb 28, 2024
d752831
Merge bitcoin/bitcoin#29493: subtree: update crc32c subtree
fanquake Feb 28, 2024
dfbad09
Merge bitcoin/bitcoin#29489: test: Remove Windows-specific code from …
fanquake Feb 28, 2024
8e894be
Merge bitcoin/bitcoin#29504: ci: print python version on win64 native…
fanquake Feb 28, 2024
2649e65
Merge bitcoin/bitcoin#29412: p2p: Don't process mutated blocks
achow101 Feb 28, 2024
0487f91
test: Fix intermittent failure in rpc_net.py --v2transport
stratospher Feb 29, 2024
6ee3997
test: removes unnecessary check from validation_tests
sr-gi Feb 29, 2024
25eab52
fuzz: add target for local addresses
brunoerg Feb 26, 2024
b7aa717
refactor: gui, simplify boost signals disconnection
furszy Feb 28, 2024
61aa981
Merge bitcoin/bitcoin#29511: test: Fix intermittent failure in rpc_ne…
achow101 Feb 29, 2024
22a5ccf
Merge bitcoin/bitcoin#29510: wallet: `getrawchangeaddress` and `getne…
achow101 Feb 29, 2024
376f0f6
build: remove confusing and inconsistent disable-asm option
theuni Feb 7, 2024
f8a06f7
doc: remove references to disable-asm option now that it's gone
theuni Feb 26, 2024
9057598
Merge bitcoin/bitcoin#29516: test: removes unnecessary check from val…
fanquake Feb 29, 2024
efb70cd
doc: correct function name in AssumeUTXO design docs
jrakibi Feb 29, 2024
be5399e
Merge bitcoin/bitcoin#29390: test: speedup bip324_cipher.py unit test
achow101 Feb 29, 2024
dfc35c9
Merge bitcoin/bitcoin#29407: build: remove confusing and inconsistent…
fanquake Feb 29, 2024
a1fbde0
p2p: Don't consider blocks mutated if they don't connect to known pre…
instagibbs Feb 29, 2024
3c49e69
test: fix weight estimates in functional tests
m3dwards Mar 1, 2024
e67ab17
test: fix flaky wallet_send functional test
m3dwards Mar 1, 2024
d72cf82
Merge bitcoin/bitcoin#29518: doc: correct function name in AssumeUTXO…
fanquake Mar 1, 2024
ae4165f
Merge bitcoin/bitcoin#29495: fuzz: add target for local address stuff
fanquake Mar 1, 2024
8da62a1
Merge bitcoin/bitcoin#29263: serialization: c++20 endian/byteswap/clz…
fanquake Mar 1, 2024
5216933
build: move sha256_sse4 into libbitcoin_crypto_base
fanquake Mar 1, 2024
6962c66
build, msvc: Do not compile redundant sources
hebasto Mar 1, 2024
57e6e22
ci: Fix functional tests step for pull requests in Windows GHA job
hebasto Mar 2, 2024
fce53f1
Merge bitcoin/bitcoin#29528: build: move sha256_sse4 into libbitcoin_…
fanquake Mar 2, 2024
217c0ce
test: remove file-wide interpreter.cpp ubsan suppression
fanquake Nov 15, 2023
990b348
doc: update signet faucet link in offline-signing-tutorial.md
spicyzboss Mar 3, 2024
632b69f
qt: 27.0 translations update
hebasto Mar 4, 2024
e60804f
Merge bitcoin/bitcoin#29524: p2p: Don't consider blocks mutated if th…
fanquake Mar 4, 2024
776d48d
Merge bitcoin-core/gui#801: Fix nullptr clientModel access during shu…
hebasto Mar 4, 2024
98f57cd
Merge bitcoin/bitcoin#29533: build, msvc: Do not compile redundant so…
fanquake Mar 4, 2024
af78d31
kernel: update nMinimumChainWork & defaultAssumeValid for 27.x
fanquake Mar 4, 2024
1611aa1
kernel: update chainTxData for 27.x
fanquake Mar 4, 2024
d9f30b0
kernel: chainparams updates for 27.x
fanquake Mar 4, 2024
6e5eda8
doc: remove rel note fragments
fanquake Mar 4, 2024
3329b35
Merge bitcoin/bitcoin#29546: qt: 27.0 translations update
fanquake Mar 4, 2024
98005b6
Merge bitcoin/bitcoin#29548: doc: remove rel note fragments
fanquake Mar 4, 2024
a8ec9ee
makeseeds: Update PATTERN_AGENT
achow101 Mar 4, 2024
9701bc4
makeseeds: Check i2p seeds too
achow101 Mar 5, 2024
34a233b
seeds: Update mainnet seeds
achow101 Mar 5, 2024
7ab5439
seeds: Update testnet seeds
achow101 Mar 5, 2024
2b260ea
Merge bitcoin/bitcoin#29502: test: modify weight estimate in function…
fanquake Mar 5, 2024
53ffd5a
docs: Fix broken reference to CI setup in test/lint/README.md
naiyoma Mar 5, 2024
3763f20
Merge bitcoin/bitcoin#29567: doc: fix broken reference to CI setup in…
fanquake Mar 5, 2024
ba1bf53
Merge bitcoin/bitcoin#29544: doc: update signet faucet link in offlin…
fanquake Mar 5, 2024
11a1db8
Merge bitcoin/bitcoin#29547: kernel: chainparams updates for 27.x
fanquake Mar 5, 2024
faff279
Merge bitcoin/bitcoin#29541: test: remove file-wide interpreter.cpp u…
fanquake Mar 5, 2024
0fa9f17
Merge bitcoin/bitcoin#29535: ci: Fix functional tests step for pull r…
fanquake Mar 5, 2024
312f338
fuzz: restrict fopencookie usage to Linux & FreeBSD
fanquake Mar 1, 2024
6c77dbf
Merge bitcoin/bitcoin#29529: fuzz: restrict fopencookie usage to Linu…
fanquake Mar 6, 2024
55bd5d8
Merge bitcoin/bitcoin#29561: Fixed seeds update for 27.0
fanquake Mar 6, 2024
7589ce3
build: bump version to v27.0rc1
fanquake Mar 6, 2024
b4fd211
doc: generate manual pages for v27.0rc1
fanquake Mar 6, 2024
8f1b7e5
doc: generate example bitcoin.conf for v27.0rc1
fanquake Mar 6, 2024
b6ff9c5
doc: point release-notes.md to the dev wiki
fanquake Mar 6, 2024
c255fcb
Merge bitcoin/bitcoin#29580: [27.x] Bump version to v27.0rc1
fanquake Mar 6, 2024
f4be4d7
serfloat: do not test encode(bits)=bits anymore
sipa Jan 5, 2024
5d381cf
serfloat: improve/simplify tests
sipa Jan 5, 2024
603f036
ci: Add workaround for Homebrew's python link error
hebasto Mar 10, 2024
05f69b3
ci, macos: Use `--break-system-packages` with Homebrew's python
hebasto Mar 10, 2024
a7116c8
ci: Bump msan to llvm-18
Mar 19, 2024
b3cd952
Merge bitcoin/bitcoin#29693: [27.x] Further Backports
fanquake Mar 26, 2024
c4da61b
doc: Suggest installing dev packages for debian/ubuntu qt5 build
laanwj Mar 29, 2024
753c68d
ci: Pull in qtbase5-dev instead of seperate low-level libraries
laanwj Mar 29, 2024
bde54b7
ci: Print tsan errors to stderr
Mar 26, 2024
fe51ace
Update the developer mailing list address.
edilmedeiros Apr 1, 2024
9442ea8
doc: import release notes from devwiki
fanquake Apr 9, 2024
2d2a0a3
build: bump version to v27.0 final
fanquake Apr 9, 2024
910e3e8
doc: update manual pages for v27.0
fanquake Apr 9, 2024
d822839
Merge bitcoin/bitcoin#29780: [27.x] More backports and finalize
fanquake Apr 15, 2024
a6862c5
depends: fix mingw-w64 Qt DEBUG=1 build
fanquake Mar 27, 2024
20e6e8d
Change Luke Dashjr seed to dashjr-list-of-p2p-nodes.us
luke-jr Mar 21, 2024
602cfd5
ci: Bump s390x to ubuntu:24.04
Apr 11, 2024
897e5af
[rpc, bugfix] Enforce maximum value for setmocktime
dergoegge Apr 15, 2024
5c09791
doc: archive 27.0 release notes
fanquake Apr 16, 2024
9277793
test: Fix failing univalue float test
Apr 16, 2024
364bf01
build: Fix false positive `CHECK_ATOMIC` test for clang-15
hebasto Apr 12, 2024
a6a59cf
rpc: Reword SighashFromStr error message
Apr 15, 2024
ae9a2ed
sign: don't assume we are parsing a sane Miniscript
darosior Apr 11, 2024
0fcceef
Fix #29767, set m_synced = true after Commit()
nanlour Apr 1, 2024
a995902
depends: Fix build of Qt for 32-bit platforms
laanwj Apr 28, 2024
475aac4
doc: add LLVM instruction for macOS < 13
Sjors Apr 29, 2024
bd5860b
[WIP] doc: release notes for 27.x
fanquake Apr 17, 2024
c7885ec
Merge bitcoin/bitcoin#29888: [27.x] Backports
fanquake May 13, 2024
d1289a1
gui: fix create unsigned transaction fee bump
furszy Mar 29, 2024
dedf319
gui: don't permit port in proxy IP option
willcl-ark Apr 4, 2024
0ba11cf
rpc: move UniValue in blockToJSON
willcl-ark May 10, 2024
3c26058
crypto: disable asan for sha256_sse4 with clang and -O0
theuni May 13, 2024
9cdb9ed
p2p, bugfix: detect addnode cjdns peers in GetAddedNodeInfo()
jonatack Aug 11, 2023
31adcfa
test: add GetAddedNodeInfo() CJDNS regression unit test
jonatack Nov 15, 2023
77b2321
depends: Fetch miniupnpc sources from an alternative website
hebasto May 22, 2024
423bd6d
windeploy: Renew certificate
achow101 May 22, 2024
80032d6
qt: 27.1rc1 translations update
hebasto May 27, 2024
9b4640c
doc: update release-notes.md for 27.1
fanquake May 13, 2024
9e91907
build: bump version to 27.1rc1
fanquake May 22, 2024
22701a4
doc: update manual pages for 27.1rc1
fanquake May 22, 2024
fccd32e
Merge bitcoin/bitcoin#30092: [27.x] Backports and rc1
fanquake May 29, 2024
ba35920
build: Fix building `fuzz` binary on on SunOS / illumos
hebasto Jun 2, 2024
f2e05cd
depends: Update Boost download link
hebasto Jun 3, 2024
fcf1241
doc: update release notes for v27.1 final
fanquake Jun 4, 2024
93bb18f
build: bump version to v27.1 final
fanquake Jun 10, 2024
d756a38
doc: update manual pages for 27.1
fanquake Jun 10, 2024
1088a98
Merge bitcoin/bitcoin#30222: [27.1] Finalize
fanquake Jun 11, 2024
43c40dd
ci: add IPV6 network to ci container
m3dwards Jun 7, 2024
0d524b1
ci: move Asan / LSan / USDT job to Github Actions
m3dwards Jun 7, 2024
f34e446
ci: remove unused bcc variable from workflow
m3dwards Jun 18, 2024
6338f92
upnp: add compatibility for miniupnpc 2.2.8
theuni Jun 13, 2024
b3093eb
doc: Update rel notes for 27.x
fanquake Jun 19, 2024
b6440f2
Merge bitcoin/bitcoin#30305: [27.x] More backports
fanquake Jun 24, 2024
fa90989
psbt: Check non witness utxo outpoint early
achow101 Apr 11, 2024
0933cf5
net: fix race condition in self-connect detection
theStack Jul 4, 2024
064f214
net: prevent sending messages in `NetEventsInterface::InitializeNode`
theStack Jul 9, 2024
ab42206
Reapply "test: p2p: check that connecting to ourself leads to disconn…
theStack Jul 4, 2024
05192ba
init: change shutdown order of load block thread and scheduler
mzumsande Jul 12, 2024
f22b9ca
wallet: fix FillPSBT errantly showing as complete
willcl-ark Jun 28, 2024
54bb9b0
test: add test for modififed walletprocesspsbt calls
willcl-ark Jun 28, 2024
4f23c86
[WIP] doc: update release notes for 27.x
fanquake Jul 17, 2024
0cbdc6b
Merge bitcoin/bitcoin#30467: [27.x] More backports
fanquake Jul 24, 2024
500bba0
test: fix constructor of msg_tx
mzumsande Jul 30, 2024
ccff378
add missing #include <cstdint> for GCC 15
whitslack Aug 8, 2024
57de0f5
policy/feerate.h: avoid constraint self-dependency
whitslack Aug 8, 2024
b06c4c6
[WIP] doc: update release notes for 27.x
fanquake Aug 6, 2024
84df309
Merge bitcoin/bitcoin#30558: [27.x] Even more backports
fanquake Aug 23, 2024
c338e43
build: bump version to 27.2rc1
fanquake Oct 16, 2024
693403b
doc: update manual pages for 27.2rc1
fanquake Oct 16, 2024
0cdfb7e
doc: update for 27.2rc1
fanquake Oct 16, 2024
882e0d7
Merge bitcoin/bitcoin#31101: [27.x] Prep for 27.2
fanquake Oct 22, 2024
c838ce5
doc: use proper doxygen formatting for CTxMemPool::cs
vasild Jul 23, 2024
6c09325
doc: finalise release notes for 27.2
fanquake Oct 25, 2024
f42fcf6
build: bump version to v27.2 final
fanquake Oct 30, 2024
dd1bf8b
doc: update manual pages for 27.2
fanquake Oct 30, 2024
bf03c45
Merge bitcoin/bitcoin#31154: [27.x] rc2 or final
fanquake Oct 31, 2024
61e8cb7
Merge remote-tracking branch 'bitcoin/27.x'
mxaddict Nov 25, 2024
da3901a
Removed extra #include for conf
mxaddict Nov 25, 2024
34fc262
Merge branch 'master' into btc-27.x
mxaddict Dec 2, 2024
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
Prev Previous commit
Next Next commit
[refactor] use MAX_PUBKEYS_PER_MULTISIG instead of magic numbers in test
  • Loading branch information
glozow committed Feb 12, 2024
commit 5c998a696c7a4ff2a91fe3d8c7177d2b806eb7ac
8 changes: 4 additions & 4 deletions test/functional/mempool_sigoplimit.py
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@
from test_framework.wallet_util import generate_keypair

DEFAULT_BYTES_PER_SIGOP = 20 # default setting

MAX_PUBKEYS_PER_MULTISIG = 20

class BytesPerSigOpTest(BitcoinTestFramework):
def set_test_params(self):
@@ -159,13 +159,13 @@ def create_bare_multisig_tx(utxo_to_spend=None):
# Separately, the parent tx is ok
parent_individual_testres = self.nodes[0].testmempoolaccept([tx_parent.serialize().hex()])[0]
assert parent_individual_testres["allowed"]
# Multisig is counted as MAX_PUBKEYS_PER_MULTISIG = 20 sigops
assert_equal(parent_individual_testres["vsize"], 5000 * 20)
max_multisig_vsize = MAX_PUBKEYS_PER_MULTISIG * 5000
assert_equal(parent_individual_testres["vsize"], max_multisig_vsize)

# But together, it's exceeding limits in the *package* context. If sigops adjusted vsize wasn't being checked
# here, it would get further in validation and give too-long-mempool-chain error instead.
packet_test = self.nodes[0].testmempoolaccept([tx_parent.serialize().hex(), tx_child.serialize().hex()])
expected_package_error = f"package-mempool-limits, package size {2*20*5000} exceeds ancestor size limit [limit: 101000]"
expected_package_error = f"package-mempool-limits, package size {2*max_multisig_vsize} exceeds ancestor size limit [limit: 101000]"
assert_equal([x["package-error"] for x in packet_test], [expected_package_error] * 2)

# When we actually try to submit, the parent makes it into the mempool, but the child would exceed ancestor vsize limits