Commit graph

38967 commits

Author SHA1 Message Date
Byron Hambly
bca2e65e0e Merge c2d46d7434 (Bitcoin PR bitcoin/bitcoin#26333) 2023-09-24 07:48:32 +00:00
James Dorfman
4491e23760 Merge 45c9f4afa4 (Bitcoin PR bitcoin/bitcoin#25828) 2023-09-24 05:26:25 +00:00
James Dorfman
fbb5257424 Merge 313ea18e5e (Bitcoin PR bitcoin/bitcoin#25799) 2023-09-24 05:26:23 +00:00
James Dorfman
ac61a4e916 Merge c3936cc53d (Bitcoin PR bitcoin/bitcoin#25241) 2023-09-24 03:10:59 +00:00
James Dorfman
d9f4560cbe Merge dabac355c8 (Bitcoin PR bitcoin/bitcoin#24843) 2023-09-24 02:33:09 +00:00
James Dorfman
7c2b14fe41 Merge 1ea76767d0 (Bitcoin PR bitcoin/bitcoin#24755) 2023-09-24 01:33:56 +00:00
James Dorfman
01b3a91bae Merge e089c68aa1 (Bitcoin PR bitcoin/bitcoin#24725) 2023-09-24 01:33:51 +00:00
James Dorfman
07d701997b Merge c243e08351 (Bitcoin PR bitcoin/bitcoin#24512) 2023-09-24 01:33:13 +00:00
James Dorfman
c444e79177 Merge 7d03cf632d (Bitcoin PR bitcoin/bitcoin#24596) 2023-09-22 17:06:06 +00:00
James Dorfman
eff86ee250 Merge 55a60b9718 (Bitcoin PR bitcoin/bitcoin#24593) 2023-09-22 16:02:10 +00:00
James Dorfman
c1fa58eb4f Merge 2bd5fdbced (Bitcoin PR bitcoin/bitcoin#24514) 2023-09-22 16:00:57 +00:00
James Dorfman
81b5b69fea Merge 430808ab13 into merged_master (Bitcoin PR bitcoin/bitcoin#24511) 2023-09-22 16:00:26 +00:00
James Dorfman
3340e67c23 Merge cbdfb46b55 (Bitcoin PR bitcoin/bitcoin#24485) 2023-09-22 15:52:22 +00:00
Pablo Greco
33f2f6b1fd
Merge pull request #1262 from delta1/merged-master
Merges up to Bitcoin Core v23 branch point
2023-09-21 12:34:32 -07:00
Pablo Greco
ae023ea98d
Merge pull request #1217 from delta1/block-header-format
docs: add block header serialization doc and examples
2023-09-14 15:00:23 -07:00
James Dorfman
5dc85e0214
build: add dependencies to Makefile.am for libbitcoinkernel 2023-09-13 11:49:11 +02:00
James Dorfman
dabea18f29
rpc: fix bug in 'utxo_size_inc' calculation 2023-09-13 09:27:52 +02:00
Byron Hambly
3ead0ce841
test: fix node_fastmerkle exception in interface_zmq.py 2023-09-08 09:57:28 +02:00
James Dorfman
1bfa980258
chain: make an implicit static cast explicit 2023-09-08 09:25:22 +02:00
James Dorfman
82a2555ad3
build: fix further ASAN issues in CI 2023-09-08 09:24:32 +02:00
Byron Hambly
69e09aa2ea
fix: comment out unused variable until tests are fixed 2023-09-07 16:06:03 +02:00
Byron Hambly
54660d006f
ci: fix unused member function warning in checkqueue.cpp 2023-09-07 13:32:06 +02:00
James Dorfman
0497d1f894 build: fix additional ASAN issues in CI 2023-09-07 05:07:50 +00:00
Byron Hambly
1af35c21de
fixup! docs: add block header serialization doc and examples 2023-09-06 16:35:26 +02:00
James Dorfman
8783a30631
build: fix further ASAN issues in CI 2023-09-06 15:03:51 +02:00
Byron Hambly
860b2c3e4b
fix: move BlindDetails and IssuanceDetails to wallet.h
resolves the newly introduced circular dependencies correctly
2023-09-05 14:38:03 +02:00
Byron Hambly
4671addbe0
build: fix forward declaration of CRecipient 2023-09-01 18:13:19 +02:00
Byron Hambly
591749d9f1
build: fix issues from ASAN in CI 2023-09-01 17:17:44 +02:00
Byron Hambly
3911e7e2b3
build: fix compilation warnings 2023-09-01 16:39:08 +02:00
Byron Hambly
c2c7d08de6
lint: add new circular dep to lint-circular-dependencies.sh 2023-09-01 16:38:38 +02:00
Byron Hambly
b59e244da3
lint: fix issues from lint-python.sh 2023-09-01 16:04:39 +02:00
Pablo Greco
3dfd7a4e9f Linter fixes 2023-08-31 14:47:07 -07:00
Pablo Greco
310efc3f2e Fix extra changes in secp repo 2023-08-31 09:33:00 -07:00
Byron Hambly
463109056c
build: fix calls to TRACE5 in coins.cpp
This fixes a compilation issue in coins.cpp when tracing is enabled.
2023-08-31 16:10:44 +02:00
Byron Hambly
f8ec35233a
ci: fix qa-assets branch name for unit test data 2023-08-31 16:10:34 +02:00
Byron Hambly
b72895919c Merge 93cc036edf into merged_master (Elements PR #1248)
All conflicts were resolved by taking the "incoming" changes by using
`git checkout --theirs src/secp256k1` during conflict resolution.
2023-08-29 12:25:09 +00:00
Byron Hambly
1e1030496e Merge 7d9dade900 into merged_master (Elements PR #1256) 2023-08-29 11:32:50 +00:00
James Dorfman
0b913592b2 Merge f20016d1ab into merged_master (Elements PR #1252) 2023-08-29 04:36:30 +00:00
James Dorfman
3843f6f724 Merge c30f30b6da into merged_master (Elements PR #1260) 2023-08-29 04:21:47 +00:00
James Dorfman
d457ef7dbe Merge 6802564be5 into merged_master (Elements PR #1246) 2023-08-29 04:21:31 +00:00
Pablo Greco
93cc036edf
Merge pull request #1248 from delta1/secp256k1-zkp-update
build(deps): update secp256k1-zkp
2023-08-24 17:51:08 -03:00
Jeff Frontz
7d9dade900
Merge pull request #1256 from psgreco/master-trim-v2-prep
Small fixes in preparation for trim_headers version 2
2023-08-23 19:42:07 -04:00
Jeff Frontz
f20016d1ab
Merge pull request #1252 from delta1/lint
lint: fix codespell and python utf8 encoding lint issues (redux)
2023-08-23 16:11:56 -04:00
Byron Hambly
c30f30b6da
Merge pull request #1260 from psgreco/master-fix-linter
Whitespace fixes to calm down the linter
2023-08-23 19:52:41 +00:00
Pablo Greco
7923ea782f Fix linter issues 2023-08-23 09:57:01 -07:00
Byron Hambly
048984aca4
build: fix windows build by including SECP256K1_STATIC in configure.ac
introduced in https://github.com/BlockstreamResearch/secp256k1-zkp/pull/259
2023-08-23 10:38:47 +02:00
James Dorfman
bb30fa363d Fix feature_taproot functional test which has been failing since
the merge of bitcoin/bitcoin#23394 in 1beaa601b4

Co-authored-by: Sanket Kanjalkar <sanket1729@gmail.com>
2023-08-11 16:39:14 +00:00
Pablo Greco
88c3b6f8cf Make trim checks inline 2023-08-08 09:28:13 -07:00
Pablo Greco
d02efe889f Avoid assert flushing to disk with trim_headers enabled 2023-08-08 09:28:13 -07:00
Pablo Greco
c87c8acabe Rename dynafed_block method for clarity 2023-08-08 09:28:13 -07:00