Commit graph

295 commits

Author SHA1 Message Date
Byron Hambly
2a1d79e0f0 Merge 679f825ba3 into merged_master (Bitcoin PR bitcoin/bitcoin#27479) 2025-06-28 09:46:07 +02:00
Byron Hambly
dfbd5fc4d5 Merge a106a86c46 into merged_master (Bitcoin PR bitcoin/bitcoin#27696) 2025-06-20 21:48:29 +02:00
Byron Hambly
ab2c05e2a1 Merge fc4bee3f19 into merged_master (Bitcoin PR bitcoin/bitcoin#27687) 2025-06-20 21:31:35 +02:00
Byron Hambly
552e758437 Merge 87d6f6c29d into merged_master (Bitcoin PR bitcoin/bitcoin#27615) 2025-06-20 16:28:12 +02:00
Byron Hambly
8b9efdd41d Merge d02df7db6b into merged_master (Bitcoin PR bitcoin/bitcoin#26715) 2025-06-20 15:44:24 +02:00
Byron Hambly
d42ed18d6e Merge 26cb32c02d into merged_master (Bitcoin PR bitcoin/bitcoin#27580) 2025-05-16 11:10:14 +02:00
Byron Hambly
80eade60f7 Merge 06fb95b51b into merged_master (Bitcoin PR bitcoin/bitcoin#27335) 2025-04-12 13:30:54 +02:00
Tom Trevethan
8a132ad63c Merge 2ec97825e7 into merged_master (Bitcoin PR bitcoin/bitcoin#26771) 2025-04-01 10:09:32 +00:00
Byron Hambly
b4405ba453 Merge e9262ea32a into merged_master (Bitcoin PR bitcoin/bitcoin#26750) 2025-03-31 16:37:52 +02:00
Byron Hambly
7041b83eea Merge 19baf0178b into merged_master (Bitcoin PR bitcoin/bitcoin#26498) 2025-03-03 15:12:05 +02:00
Byron Hambly
5c10c048e6
Merge 7ed2768dca into merged_master (Elements PR #1421) 2025-02-28 15:02:20 +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 e42ba134f4 Bitcoin Merge bitcoin/bitcoin#26448: test: fix intermittent failure in p2p_sendtxrcncl.py
1667576919 2022-11-04T15:48:39+00:00 83cf055bef Bitcoin Merge bitcoin/bitcoin#26443: doc: mention BIP86 in doc/bips.md
1667478613 2022-11-03T13:30:13+01:00 28653a596a Bitcoin Merge bitcoin/bitcoin#26445: .python-version: bump patch version to 3.6.15
1667471345 2022-11-03T10:29:05+00:00 2a7c9984db Bitcoin Merge bitcoin/bitcoin#25248: refactor: Add LIFETIMEBOUND / -Wdangling-gsl to Assert()
1667397640 2022-11-02T15:00:40+01:00 5274f32437 Bitcoin Merge bitcoin/bitcoin#26417: test: fix intermittent failure in feature_index_prune.py
1667372848 2022-11-02T08:07:28+01:00 39f026b1ec Bitcoin Merge bitcoin/bitcoin#26396: net: Avoid SetTxRelay for feeler connections
1667316369 2022-11-01T16:26:09+01:00 bf0cb43990 Bitcoin Merge bitcoin/bitcoin#26437: test: remove unused `CHANGE_{XPRV,XPUB}` constants
1667300957 2022-11-01T11:09:17+00:00 5668ccec1d Bitcoin Merge bitcoin/bitcoin#25548: gui: Check for readlink buffer overflow and handle gracefully
1667297563 2022-11-01T10:12:43+00:00 c041d8f2c9 Bitcoin Merge bitcoin/bitcoin#26360: build: remove threadinterrupt from libbitcoinkernel
1667297149 2022-11-01T10:05:49+00:00 27e76afe24 Bitcoin Merge bitcoin/bitcoin#26294: build: move util/url to common/url
1667291397 2022-11-01T08:29:57+00:00 d08b63baa0 Bitcoin Merge bitcoin/bitcoin#26373: Update minisketch subtree to latest upstream
1667230521 2022-10-31T15:35:21+00:00 43e813cab2 Bitcoin Merge bitcoin/bitcoin#26387: p2p: TryLowWorkHeadersSync follow-ups
1667217075 2022-10-31T11:51:15+00:00 4766cd1981 Bitcoin Merge bitcoin/bitcoin#24051: Bugfix: configure: bitcoin-{cli,tx,util} don't need UPnP, NAT-PMP, or ZMQ
1667213203 2022-10-31T11:46:43+01:00 2856dee808 Bitcoin Merge bitcoin/bitcoin#26402: doc: Fix typos
1667202170 2022-10-31T08:42:50+01:00 c75c0d8e11 Bitcoin Merge bitcoin/bitcoin#26424: doc: correct deriveaddresses RPC name
1667034850 2022-10-29T11:14:10+02:00 4f270d2b63 Bitcoin Merge bitcoin/bitcoin#26404: test: fix intermittent failure in rpc_getblockfrompeer.py
1667030363 2022-10-29T09:59:23+02:00 984a01589b Bitcoin Merge bitcoin/bitcoin#26408: test: Remove spam from debug log
1666985837 2022-10-28T15:37:17-04:00 8b050762b1 Bitcoin Merge bitcoin/bitcoin#26409: refactor: Silence GCC Wmissing-field-initializers in ChainstateManagerOpts
1666949533 2022-10-28T11:32:13+02:00 1bad29fe02 Bitcoin Merge bitcoin/bitcoin#26377: test: Make `system_tests/run_command` test locale and platform agnostic
2025-02-27 13:40:17 +02:00
Pablo Greco
d973e36ffa Win64 Native: Fix PACKAGE_NAME and bug report url 2025-02-23 14:34:19 -08:00
Byron Hambly
caa50f1920
Merge 077ae2d91a into merged_master (Elements PR #1408) 2025-02-13 11:10:23 +02:00
Pablo Greco
e3011270b8 Win64: set the right TargetName in native builds 2025-02-12 11:16:14 -08:00
Byron Hambly
c8eb5b8cc1
Merge bd551ad186 into merged_master (Elements PR #1393) 2025-02-11 15:50:38 +02:00
Pablo Greco
d1a9ff3478 Win64 native: fix build with simplicity 2025-02-07 13:09:38 -08:00
Pablo Greco
0b40e25beb Win64 native: fix build before simplicity 2025-02-07 13:09:24 -08:00
Pablo Greco
5194a62393 Win64 native: disable psbt_wallet_test just like in Makefile 2025-02-07 05:03:14 -08:00
Byron Hambly
ca0a68b350
Merge UP TO 551c8e9526 into merged_master (UP TO bitcoin/bitcoin#26349)
Includes FIXMEs for a few functional tests
2025-02-05 09:50:17 +02:00
Byron Hambly
8499b13762
lint: fix lint issues 2024-12-03 14:02:33 +02:00
Byron Hambly
d78604da4c Merge 2534141e19 into merged_master (Elements PR ElementsProject/elements#1219) 2024-12-02 08:51:39 +02:00
Byron Hambly
e5b0d80b21 Merge d480586ecb into merged_master (Bitcoin PR bitcoin/bitcoin#25808) 2024-11-04 11:25:04 +02:00
Byron Hambly
ab0a256d56 Merge cd230f3281 into merged_master (Bitcoin PR bitcoin/bitcoin#25816) 2024-11-01 13:55:01 +02:00
Byron Hambly
8669e19b82 Merge b3c7c023b6 into merged_master (Bitcoin PR bitcoin/bitcoin#25719) 2024-10-24 13:30:57 +02:00
James Dorfman
bf5189aa76 Merge c30b3e90f0 into merged_master (Bitcoin PR bitcoin/bitcoin#25472) 2024-10-16 05:44:43 +00:00
Russell O'Connor
6c6925322c Add MSVC build configuration for libelementssimplicity 2024-10-07 14:39:09 -04:00
James Dorfman
458c33f39c Merge 72d6469ab4 into merged_master (Bitcoin PR bitcoin/bitcoin#25496) 2024-09-19 16:22:59 +00:00
James Dorfman
c5575cc85d Merge fe5911ee04 into merged_master (Bitcoin PR bitcoin/bitcoin#25460) 2024-09-16 05:25:36 +00:00
James Dorfman
e78152d6fb Merge 26ec2f2d6b into merged_master (Bitcoin PR bitcoin-core/gui#618) 2024-09-10 20:09:35 +00:00
James Dorfman
e3a248b168 Merge 39ddd522c3 into merged_master (Bitcoin PR bitcoin/bitcoin#24531) 2024-09-06 19:31:35 +00:00
James Dorfman
a64661d051 Merge 012d33f70b into merged_master (Bitcoin PR bitcoin/bitcoin#24847) 2024-07-30 17:50:26 +00:00
James Dorfman
b4d7a023e5 Merge 15220ec903 into merged_master (Bitcoin PR bitcoin/bitcoin#24775) 2024-07-08 20:49:44 +00:00
James Dorfman
fd72f4863c Merge 52f0f7a1bb into merged_master (Bitcoin PR bitcoin/bitcoin#24668) 2024-07-08 15:28:11 +00:00
James Dorfman
125e6630d8 Merge f4fba57829 into merged_master (Bitcoin PR bitcoin/bitcoin#24704) 2024-05-24 00:02:31 +00:00
Byron Hambly
4765c2a4c8 Merge 05957a888d into merged_master (Bitcoin PR bitcoin/bitcoin#24516) 2023-10-14 11:15:45 +00:00
Byron Hambly
ccdc1ab80b Merge 47bbd3ff4f into merged_master (Bitcoin PR bitcoin/bitcoin#24498) 2023-10-14 10:46:50 +00:00
James Dorfman
8bf9c630ce ci: add missing dependencies to native win64 build 2023-10-09 21:17:40 +00:00
dhruv
cb434320b6 build: fix MSVC build after subtree update
Co-authored-by: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Co-authored-by: Aaron Clauson <aaron@sipsorcery.com>
2023-10-09 21:17:40 +00:00
Byron Hambly
99ed6e1bee msvc secp modules 2023-10-09 21:17:40 +00:00
James Dorfman
5af45ea185 add mising deps to libbitcoinconsensus windows exe build 2023-10-09 20:33:33 +00:00
Pablo Greco
950c4ff0d3 Partial cherry-pick of 5080c9c25f to fix
windows builds
2023-10-09 20:33:25 +00:00
Pieter Wuille
d6fdbf80ca Disable certain false positive warnings for libsecp256k1 msvc build
(cherry picked from commit cabb566123)
2023-10-09 20:32:54 +00:00
James Dorfman
3ed8c96194
update package info constants to be elements-specific 2023-08-01 10:28:19 +02:00
Byron Hambly
207c1ce338 Merge e0367e84b3 into merged_master (Bitcoin PR bitcoin/bitcoin#24301) 2023-06-30 15:43:32 +00:00
Byron Hambly
f33b892090 Merge b23e037961 into merged_master (Bitcoin PR bitcoin/bitcoin#24268) 2023-06-30 09:00:18 +00:00
Byron Hambly
4988afcbc2 Merge 3ace3a17c9 into merged_master (Bitcoin PR bitcoin/bitcoin#20744) 2023-06-30 07:38:29 +00:00
dhruv
42239f8390 Enable ellswift module in libsecp256k1 2023-06-23 14:15:49 -04:00
Byron Hambly
97d15a5e44 Merge ddcc518cbd into merged_master (Bitcoin PR bitcoin/bitcoin#23828) 2023-06-15 12:18:15 +00:00
Byron Hambly
47626b5a64 Merge 623745ca74 into merged_master (Bitcoin PR bitcoin/bitcoin#23912) 2023-06-14 15:44:11 +00:00