Commit graph

2646 commits

Author SHA1 Message Date
Byron Hambly
13fb374543 Merge 8e9801bfc4 into merged_master (Bitcoin PR bitcoin/bitcoin#22818) 2023-04-24 07:13:42 +00:00
Byron Hambly
4756e1f59a Merge 8f022a59b8 into merged_master (Bitcoin PR bitcoin/bitcoin#22993) 2023-04-22 07:54:57 +00:00
James Dorfman
3a4b8b4c29 Merge 1260b7e483 into merged_master (Bitcoin PR bitcoin/bitcoin#23001) 2023-04-22 02:33:35 +00:00
James Dorfman
7e2135c61c Merge 488e745560 into merged_master (Bitcoin PR bitcoin/bitcoin#12677) 2023-04-22 02:01:59 +00:00
James Dorfman
03c7a6f83a Merge 2560b6862b into merged_master (Bitcoin PR bitcoin/bitcoin#23007) 2023-04-21 15:47:44 +00:00
Byron Hambly
d6ad84fe94 Merge 6ef84e0503 into merged_master (Bitcoin PR bitcoin/bitcoin#22420) 2023-04-21 12:59:40 +00:00
Byron Hambly
9bb7d8f8d8 Merge 698b4b8fac into merged_master (Bitcoin PR bitcoin/bitcoin#22930) 2023-04-21 12:26:22 +00:00
Byron Hambly
d5914ae484 Merge 0de84b7328 into merged_master (Bitcoin PR bitcoin/bitcoin#22544) 2023-04-21 12:12:15 +00:00
Byron Hambly
61dd8a3a27 Merge 7709bf46ce into merged_master (Bitcoin PR bitcoin/bitcoin#22970) 2023-04-21 10:45:11 +00:00
Byron Hambly
37568a22f8 Merge 40a9037a1b into merged_master (Bitcoin PR bitcoin/bitcoin#22971) 2023-04-21 08:25:46 +00:00
James Dorfman
4181c95ce0 Merge b05d3e76e7 into merged_master (Bitcoin PR bitcoin/bitcoin#22079) 2023-04-21 04:11:00 +00:00
James Dorfman
cf742769a0 Merge 92aad5303b into merged_master (Bitcoin PR bitcoin/bitcoin#21930) 2023-04-20 22:38:30 +00:00
James Dorfman
3cace2f326 Merge 78d39f8438 into merged_master (Bitcoin PR bitcoin/bitcoin#22861) 2023-04-20 20:38:04 +00:00
Byron Hambly
2334307d42 Merge 245462b66c into merged_master (Bitcoin PR bitcoin/bitcoin#22418) 2023-04-13 12:10:09 +00:00
Byron Hambly
83afe9c298 Merge 77e77e8544 into merged_master (Bitcoin PR bitcoin/bitcoin#22631) 2023-04-13 11:42:02 +00:00
Byron Hambly
e842492351 Merge dc9ffb6bc4 into merged_master (Bitcoin PR bitcoin/bitcoin#22837) 2023-04-13 10:27:58 +00:00
Byron Hambly
6d32af1662 Merge 33707a2a88 into merged_master (Bitcoin PR bitcoin/bitcoin#22782) 2023-04-11 08:18:04 +00:00
Byron Hambly
1acda7580c Merge adccbb380b into merged_master (Bitcoin PR bitcoin/bitcoin#21862) 2023-04-11 08:09:30 +00:00
Byron Hambly
646bf27465 Merge 7740ebcb02 into merged_master (Bitcoin PR bitcoin/bitcoin#22648) 2023-04-11 07:28:14 +00:00
Byron Hambly
1e553ee82d Merge d3169349a9 into merged_master (Bitcoin PR bitcoin/bitcoin#22654) 2023-04-10 11:47:44 +00:00
Byron Hambly
77a48e05ac Merge b784ab10f5 into merged_master (Bitcoin PR bitcoin/bitcoin#22739) 2023-04-10 10:47:23 +00:00
James Dorfman
d1e1320e2c Merge bb9f76a719 into merged_master (Bitcoin PR bitcoin/bitcoin#22523) 2023-04-10 02:53:02 +00:00
James Dorfman
4e5f755996 Merge 8a40b227a6 into merged_master (Bitcoin PR bitcoin/bitcoin#22718) 2023-04-10 01:09:29 +00:00
Byron Hambly
4cc48afd88 Merge 0b5344b0d1 into merged_master (Bitcoin PR bitcoin/bitcoin#22632) 2023-04-09 06:06:34 +00:00
Byron Hambly
e8ca61ce13 Merge 8193294cab into merged_master (Bitcoin PR bitcoin/bitcoin#22642) 2023-04-09 05:19:02 +00:00
James Dorfman
815f4d545d Merge dd981b5e84 into merged_master (Bitcoin PR bitcoin/bitcoin#22618) 2023-04-06 20:54:28 +00:00
Byron Hambly
7082406e7c Merge 2b06af1747 into merged_master (Bitcoin PR bitcoin/bitcoin#22603) 2023-04-06 13:44:32 +00:00
James Dorfman
07b54e7de1 Merge dcd116950f into merged_master (Bitcoin PR bitcoin/bitcoin#22001) 2023-04-04 00:19:52 +00:00
James Dorfman
74c7a26963 Merge efd6f904c7 into merged_master (Bitcoin PR bitcoin/bitcoin#22570) 2023-04-03 23:52:22 +00:00
Byron Hambly
b0856d082c Merge fd9c22ca69 into merged_master (Bitcoin PR bitcoin/bitcoin#22589) 2023-04-03 16:20:21 +02:00
Byron Hambly
c8e1b52e4f Merge 6499928bfb into merged_master (Bitcoin PR bitcoin/bitcoin#22573) 2023-04-03 14:50:56 +02:00
James Dorfman
d5b66ba229 Merge 8f76f9f613 into merged_master (Bitcoin PR bitcoin/bitcoin#22531) 2023-03-31 19:14:51 +00:00
Glenn Willen
4334fce793 Merge 61cefde7a7 into merged_master (Bitcoin PR bitcoin/bitcoin#22006) 2023-03-28 00:12:41 +00:00
Glenn Willen
72a0ba0291 Merge cac38cdd02 into merged_master (Bitcoin PR bitcoin/bitcoin#21832) 2023-03-21 03:59:44 +00:00
James Dorfman
d87f839aab Merge 10eb000409 into merged_master (Bitcoin PR bitcoin/bitcoin#22515) 2023-03-19 17:49:27 +00:00
James Dorfman
c5226be2a5 Merge 458d6ac23b into merged_master (Bitcoin PR bitcoin/bitcoin#22407) 2023-03-17 14:24:43 +00:00
James Dorfman
7ddc9ed58c Merge bb09ec6f10 into merged_master (Bitcoin PR bitcoin/bitcoin#22507) 2023-03-16 14:58:02 +00:00
Glenn Willen
eb5e63b8d5 Merge 1cfcf1c360 into merged_master (Elements PR #1155) 2023-03-01 15:38:39 -08:00
Glenn Willen
de41f79f6f Merge b4935a51c0 into merged_master (Elements PR #1157) 2023-03-01 12:09:22 -08:00
Glenn Willen
fe6c7525fc Merge 3e646d4888 into merged_master (Elements PR #1159) 2023-03-01 10:55:30 -08:00
Glenn Willen
391bb41e14 Merge 03b646930f into merged_master (Elements PR #1154) 2023-03-01 10:45:02 -08:00
Glenn Willen
bc0b708508 Merge c80e926d6e into merged_master (Elements PR ElementsProject/elements#1122) 2023-03-01 00:44:02 -08:00
Glenn Willen
011feab4c4 Fix spelling lints.
For all spelling lints, either fix them in place, or add them to the
ignore list.

I don't understand how these have gotten in here without ever
triggering the linter until now. I'm not sure if it's something about
my test environment or what. But fixing them can't hurt.
2023-02-26 19:30:18 -08:00
Byron Hambly
5d10ff9f52
lint: fix typo in tx-format doc 2022-09-07 14:44:07 +02:00
Pablo Greco
b4935a51c0
Merge pull request #1157 from achow101/explicit-pset-fields
pset: Add input explicit value, assets, and proofs, and issuance blinding flag
2022-09-06 16:00:45 -03:00
Andrew Chow
6291af43f9 doc: Specify flag for blinding issuances 2022-09-06 11:38:03 -04:00
Andrew Chow
172a959c7a doc: Specify input explicit values and assets and their proofs 2022-09-06 11:32:35 -04:00
James Dorfman
6c55d1d53f docs: fix typo in elements-tx-format.md and remove trailing whitespace 2022-09-02 11:26:29 -04:00
James Dorfman
872478b1be
docs: describe elements transaction serialization format (#1148) 2022-09-01 13:24:11 -04:00
Jon Griffiths
28c3836b5c
PSET: docs: Fix constant names to match those actually used 2022-07-05 13:07:43 +12:00