Byron Hambly
f0478dd601
Merge 38d06e1561 into merged_master (Bitcoin PR bitcoin/bitcoin#26383 )
2025-03-03 13:44:12 +02:00
Byron Hambly
4b3a34be93
Merge 85892f77c9 into merged_master (Bitcoin PR bitcoin/bitcoin#25900 )
2025-03-03 13:42:05 +02:00
Byron Hambly
8b9d41f8e7
Merge 1ef498f75b into merged_master (Bitcoin PR bitcoin/bitcoin#26520 )
2025-03-03 13:37:59 +02:00
Byron Hambly
ecb98c6680
Merge 164027f824 into merged_master (Bitcoin PR bitcoin/bitcoin#26100 )
2025-03-03 13:37:56 +02:00
Byron Hambly
2ff59e9636
Merge 7eeae5c023 into merged_master (Bitcoin PR bitcoin/bitcoin#26553 )
2025-03-03 13:37:53 +02:00
Byron Hambly
b5a75af14a
Merge 1b680948d4 into merged_master (Bitcoin PR bitcoin/bitcoin#26292 )
2025-03-03 13:37:42 +02:00
Byron Hambly
ef4fa0936a
Merge 542a2b567d into merged_master (Bitcoin PR bitcoin/bitcoin#26376 )
2025-03-03 12:12:31 +02:00
Byron Hambly
194211ebe7
Merge 60a00889b0 into merged_master (Bitcoin PR bitcoin/bitcoin#26545 )
2025-03-03 12:10:32 +02:00
Byron Hambly
8e3be5f7b4
Merge 01a66e21ef into merged_master (Bitcoin PR bitcoin/bitcoin#26546 )
2025-03-03 12:10:30 +02:00
Byron Hambly
7fe321f93a
Merge 0968c51401 into merged_master (Bitcoin PR bitcoin/bitcoin#26497 )
2025-03-03 12:10:27 +02:00
Byron Hambly
483d59e533
Merge df2f16666c into merged_master (Bitcoin PR bitcoin/bitcoin#26508 )
2025-03-03 12:10:24 +02:00
Byron Hambly
c66623d5d0
Merge 295f617988 into merged_master (Bitcoin PR bitcoin/bitcoin#26505 )
2025-03-03 12:10:21 +02:00
Byron Hambly
da8b6f2f7f
Merge d0b1f613c2 into merged_master (Bitcoin PR bitcoin/bitcoin#17786 )
2025-03-03 11:12:31 +02:00
Byron Hambly
e7850e19b3
Merge aeb395dcdb into merged_master (Bitcoin PR bitcoin/bitcoin#25315 )
2025-03-03 09:50:21 +02:00
Byron Hambly
b1c4442e53
Merge 256120d2da into merged_master (Bitcoin PR bitcoin/bitcoin#26519 )
2025-03-03 09:49:24 +02:00
Byron Hambly
fd4160ae71
Merge b3c76ab757 into merged_master (Bitcoin PR bitcoin/bitcoin#26524 )
2025-03-03 09:49:16 +02:00
Byron Hambly
8c3a9aea6f
Merge cfee93f68a into merged_master (Bitcoin PR bitcoin/bitcoin#26487 )
2025-03-03 09:49:14 +02:00
Byron Hambly
71535c907e
Merge fb01af6c77 into merged_master (Bitcoin PR bitcoin-core/gui#680 )
2025-03-03 09:49:10 +02:00
Byron Hambly
28e384494e
Merge 82fe672ea0 into merged_master (Bitcoin PR bitcoin-core/gui#681 )
2025-03-03 09:49:07 +02:00
Byron Hambly
89cb20a432
Merge 6863ad79a6 into merged_master (Bitcoin PR bitcoin/bitcoin#25112 )
2025-03-03 09:48:51 +02:00
Byron Hambly
349f4d2778
Merge f0c646f026 into merged_master (Bitcoin PR bitcoin/bitcoin#25730 )
...
This merge was already done and resolved, but then I had to fix a
previous commit. I then cherry-picked this resolved merge, did the
outstanding PRs from the Elements side, confusing the merge ancestors
and having to "redo" this merge - which just means this one is empty.
2025-03-03 09:40:12 +02:00
Byron Hambly
6b82cfa0aa
Merge df4e99dca3 into merged_master (Elements PR #1423 )
2025-02-28 15:25:43 +02:00
Byron Hambly
5c10c048e6
Merge 7ed2768dca into merged_master (Elements PR #1421 )
2025-02-28 15:02:20 +02:00
Byron Hambly
c9bfabff20
Merge 1ded38874e into merged_master (Elements PR #1420 )
2025-02-28 14:34:34 +02:00
Byron Hambly
d97db2851f
Merge f0c646f026 into merged_master (Bitcoin PR bitcoin/bitcoin#25730 )
2025-02-28 14:25:06 +02:00
Byron Hambly
014fe79a37
Merge 5602cc7ccf into merged_master (Bitcoin PR bitcoin/bitcoin#16981 )
2025-02-28 14:24:51 +02:00
Byron Hambly
f92dc0ec3c
Merge 547a963628 into merged_master (Bitcoin PR bitcoin/bitcoin#26489 )
2025-02-27 15:22:57 +02:00
Byron Hambly
7ea69ff0d8
Merge UP TO 48174c0f28 into merged_master (UP TO Bitcoin PR bitcoin/bitcoin#26240 )
...
FIXME in wallet_taproot.py functional test
1668424146 2022-11-14T12:09:06+01:00 48174c0f28bitcoin/bitcoin#26240 : rpc: Adjust RPCTypeCheckObj error string
1668417474 2022-11-14T10:17:54+01:00 59e00c7e03bitcoin/bitcoin#25714 : univalue: Avoid std::string copies
1668111238 2022-11-10T15:13:58-05:00 7ef730ca84bitcoin/bitcoin#26483 : test: Don't pass add_to_wallet option to walletcreatefundedpsbt
1668004459 2022-11-09T15:34:19+01:00 9dce30194bbitcoin/bitcoin#26472 : test: add missing bech32m / BIP86 test-cases to wallet_descriptor.py
1667992471 2022-11-09T12:14:31+01:00 44ca5d5e87bitcoin/bitcoin#26473 : test: Avoid collision with valid path names in `getarg_tests/logargs`
1667640759 2022-11-05T10:32:39+01:00 50422b770abitcoin/bitcoin#26419 : log: mempool: log removal reason in validation interface
1667636699 2022-11-05T09:24:59+01:00 ce57dbac90bitcoin/bitcoin#26449 : rpc: doc: add missing option "bech32m" for `change_type` parameters
1667577253 2022-11-04T15:54:13+00:00 ae6bb6e71ebitcoin/bitcoin#26418 : Fix signing of multi_a and rawtr scripts with wallets that only have corresponding keys
2025-02-27 15:15:49 +02:00
Byron Hambly
b83abdf89a
Merge UP TO e42ba134f4 into merged_master (UP TO Bitcoin PR bitcoin/bitcoin#26448 )
...
1667577042 2022-11-04T16:50:42+01:00 e42ba134f4bitcoin/bitcoin#26448 : test: fix intermittent failure in p2p_sendtxrcncl.py
1667576919 2022-11-04T15:48:39+00:00 83cf055befbitcoin/bitcoin#26443 : doc: mention BIP86 in doc/bips.md
1667478613 2022-11-03T13:30:13+01:00 28653a596abitcoin/bitcoin#26445 : .python-version: bump patch version to 3.6.15
1667471345 2022-11-03T10:29:05+00:00 2a7c9984dbbitcoin/bitcoin#25248 : refactor: Add LIFETIMEBOUND / -Wdangling-gsl to Assert()
1667397640 2022-11-02T15:00:40+01:00 5274f32437bitcoin/bitcoin#26417 : test: fix intermittent failure in feature_index_prune.py
1667372848 2022-11-02T08:07:28+01:00 39f026b1ecbitcoin/bitcoin#26396 : net: Avoid SetTxRelay for feeler connections
1667316369 2022-11-01T16:26:09+01:00 bf0cb43990bitcoin/bitcoin#26437 : test: remove unused `CHANGE_{XPRV,XPUB}` constants
1667300957 2022-11-01T11:09:17+00:00 5668ccec1dbitcoin/bitcoin#25548 : gui: Check for readlink buffer overflow and handle gracefully
1667297563 2022-11-01T10:12:43+00:00 c041d8f2c9bitcoin/bitcoin#26360 : build: remove threadinterrupt from libbitcoinkernel
1667297149 2022-11-01T10:05:49+00:00 27e76afe24bitcoin/bitcoin#26294 : build: move util/url to common/url
1667291397 2022-11-01T08:29:57+00:00 d08b63baa0bitcoin/bitcoin#26373 : Update minisketch subtree to latest upstream
1667230521 2022-10-31T15:35:21+00:00 43e813cab2bitcoin/bitcoin#26387 : p2p: TryLowWorkHeadersSync follow-ups
1667217075 2022-10-31T11:51:15+00:00 4766cd1981bitcoin/bitcoin#24051 : Bugfix: configure: bitcoin-{cli,tx,util} don't need UPnP, NAT-PMP, or ZMQ
1667213203 2022-10-31T11:46:43+01:00 2856dee808bitcoin/bitcoin#26402 : doc: Fix typos
1667202170 2022-10-31T08:42:50+01:00 c75c0d8e11bitcoin/bitcoin#26424 : doc: correct deriveaddresses RPC name
1667034850 2022-10-29T11:14:10+02:00 4f270d2b63bitcoin/bitcoin#26404 : test: fix intermittent failure in rpc_getblockfrompeer.py
1667030363 2022-10-29T09:59:23+02:00 984a01589bbitcoin/bitcoin#26408 : test: Remove spam from debug log
1666985837 2022-10-28T15:37:17-04:00 8b050762b1bitcoin/bitcoin#26409 : refactor: Silence GCC Wmissing-field-initializers in ChainstateManagerOpts
1666949533 2022-10-28T11:32:13+02:00 1bad29fe02bitcoin/bitcoin#26377 : test: Make `system_tests/run_command` test locale and platform agnostic
2025-02-27 13:40:17 +02:00
Byron Hambly
7c5f4914fb
Merge f37bd15d47 into merged_master (Bitcoin PR bitcoin/bitcoin#25685 )
...
FIXME introduces a new regression test to reproduce the issue commented
out in the confidential transaction functional test
2025-02-27 09:55:45 +02:00
Byron Hambly
df4e99dca3
Merge pull request #1423 from psgreco/master-win64-fixassert
...
Fix Assert crash in win64 native builds
2025-02-26 14:50:20 +02:00
Pablo Greco
59c30c0779
Blinding: update change_position after calling fillBlindDetails
2025-02-25 14:57:10 -08:00
Pablo Greco
4058bd114b
Remove extra ; in confidential.h
2025-02-25 14:57:10 -08:00
Byron Hambly
7ed2768dca
Merge pull request #1421 from psgreco/master-fixlock
...
Fix tests and build warnings
2025-02-24 15:58:18 +02:00
Pablo Greco
b92a3ceda2
TSAN: Avoid unlocked access to pindexBestHeader
2025-02-23 14:34:19 -08:00
Pablo Greco
38065e1159
Fix warning about mixing enum and int
2025-02-23 14:34:19 -08:00
Pablo Greco
d973e36ffa
Win64 Native: Fix PACKAGE_NAME and bug report url
2025-02-23 14:34:19 -08:00
Pablo Greco
73c542ea58
Fix error reading cookie file on windows when path contains UTF-8
2025-02-23 14:34:19 -08:00
Pablo Greco
fe04483875
Avoid concatenating default path when mainchainrpccookiefile is an absolute path
2025-02-23 14:34:19 -08:00
Pablo Greco
258d9d3c87
feature_fedpeg: Use os.join instead of hardcoded separator
2025-02-23 10:19:51 -08:00
Pablo Greco
305de6d265
feature_confidential_transactions: Use system temp dir instead of hardcoded /tmp
2025-02-23 09:24:05 -08:00
Pablo Greco
cd67236c12
feature_discount_ct: some txs can return 2 different weights, adapt the test to it
2025-02-22 09:05:56 -08:00
Byron Hambly
1ded38874e
Merge pull request #1420 from ElementsProject/simplicity
...
Simplicity
2025-02-19 10:01:05 +02:00
Russell O'Connor
c211d1a4d9
Merge commit ' 37adf7d72d' into simplicity
2025-02-18 13:11:04 -05:00
Russell O'Connor
37adf7d72d
Squashed 'src/simplicity/' changes from 4858b89526..b549192109
...
b549192109 codespell: fix typos
git-subtree-dir: src/simplicity
git-subtree-split: b5491921095b28bc554c325a7d05274690483a6f
2025-02-18 13:11:04 -05:00
Byron Hambly
c49d1e5211
Merge 12c586a3bf into merged_master (Elements PR #1417 )
2025-02-18 16:51:52 +02:00
Byron Hambly
a5ed028a9a
Merge c9c21cf7df into merged_master (Elements PR #1416 )
2025-02-18 16:51:48 +02:00
Byron Hambly
ed487fc096
Merge e343610b99 into merged_master (Elements PR #1414 )
2025-02-18 16:51:36 +02:00
Byron Hambly
12c586a3bf
Merge pull request #1417 from psgreco/master-fix-win64native
...
Fix Win64 native unit test
2025-02-18 16:05:44 +02:00
Byron Hambly
c9c21cf7df
Merge pull request #1416 from apoelstra/2025-02--psbt-fix
...
pset: fix NULL pointer dereference when deserializing malformed PSETs over RPC
2025-02-18 15:06:38 +02:00
