Commit graph

2190 commits

Author SHA1 Message Date
Andrew Poelstra
90e6e0a67b Merge dca80ffb45 into merged_master (Bitcoin PR #20255) 2021-06-11 02:52:30 +00:00
Andrew Poelstra
0533e80b8c Merge 283f22cabb into merged_master (Bitcoin PR #20461) 2021-06-10 22:04:42 +00:00
Andrew Poelstra
0cf76ce682 Merge 335d27d081 into merged_master (Bitcoin PR #20512) 2021-06-10 19:11:03 +00:00
Andrew Poelstra
40cd7deb8b Merge 6f9dac5ede into merged_master (Bitcoin PR #20473) 2021-05-07 19:21:36 +00:00
Andrew Poelstra
0ecb5364be Merge 555b5d1bf9 into merged_master (Bitcoin PR #20419) 2021-05-07 17:59:54 +00:00
Andrew Poelstra
0a5257d126 Merge 86bf3ae3b5 into merged_master (Bitcoin PR #20202) 2021-05-07 17:19:00 +00:00
Andrew Poelstra
a0f440e27a Merge d4159984c3 into merged_master (Bitcoin PR #20223) 2021-05-07 15:22:08 +00:00
Andrew Poelstra
516ffe8400 Merge db58b857f7 into merged_master (Bitcoin PR #20329) 2021-05-06 22:01:12 +00:00
Andrew Poelstra
1d951c2239 Merge ea7926527c into merged_master (Bitcoin PR #20413) 2021-05-06 18:51:59 +00:00
Andrew Poelstra
af4f4ad2db Merge 50e019a97a into merged_master (Bitcoin PR #20414) 2021-05-06 18:40:47 +00:00
Andrew Poelstra
3efc2ffae5 Merge d020e8839f into merged_master (Bitcoin PR #20418) 2021-05-06 18:28:57 +00:00
Andrew Poelstra
b8d53f04fb Merge 4b24c3962f into merged_master (Bitcoin PR #19504) 2021-05-06 16:02:38 +00:00
Steven Roose
4db1799620
Merge ElementsProject/elements#951: Spec for PSET
8e19dfa35b Specify PSET (Andrew Chow)

Pull request description:

  Adds the document specifying the new PSET format that #900 implements.

  Pulled out of #900

Top commit has no ACKs.

Tree-SHA512: 892d27a5735fc581b0963b3e230cc028c08f7750a55c8b4030f9f909dee89910348fdc565739c6ec73ce206b7cfd08d3614ccaf884d5abc43a7470f36368ca43
2021-05-06 15:28:58 +01:00
Andrew Chow
8e19dfa35b Specify PSET 2021-04-20 18:08:17 -04:00
Andrew Poelstra
48dc78db0c Merge 9d35590935 into merged_master (Elements PR #964) 2021-03-26 00:58:03 +00:00
Glenn Willen
2f40d80b01 Further revisions in response to comments 2021-02-26 01:00:16 -08:00
MarcoFalke
dca80ffb45
Merge #20255: util: Add Assume() identity function
faa05854f8 util: Remove probably misleading TODO (MarcoFalke)
fac5efe730 util: Add Assume() identity function (MarcoFalke)
fa861569dc util: Allow Assert(...) to be used in all contexts (practicalswift)

Pull request description:

  This is needed for #20138. Please refer to the added documentation for motivation.

ACKs for top commit:
  practicalswift:
    cr ACK faa05854f8
  jnewbery:
    utACK faa05854f8
  hebasto:
    ACK faa05854f8, I have reviewed the code and it looks OK, I agree it can be merged.

Tree-SHA512: 72165fbd898b92ab9a79b070993fa1faa86c2e3545b6645e72c652bda295d5107bc298d0482bf3aaf0926fc0c3e6418a445c0e073b08568c44231f547f76a688
2020-12-04 11:07:28 +01:00
Andrew Poelstra
7036176700 Merge 0bd4929cd0 into merged_master (Bitcoin PR #20284) 2020-12-02 13:51:39 +00:00
MarcoFalke
283f22cabb
Merge #20461: rpc: Validate -rpcauth arguments
053b4fbad8 doc: Release note regarding -rpcauth validation (João Barbosa)
46001323b1 rpc: Validate -rpcauth arguments (João Barbosa)
d37c813a43 rpc: Refactor to process -rpcauth once (João Barbosa)

Pull request description:

  Invalid `-rpcauth` arguments are currently silently ignored. This make server initialization fail if any `-rpcauth` is invalid.

ACKs for top commit:
  MarcoFalke:
    review ACK 053b4fbad8
  jonatack:
    ACK 053b4fbad8
  ryanofsky:
    Code review ACK 053b4fbad8. Only changes since last review are moving a variable declaration and adding a comment, release notes, and a `const`.

Tree-SHA512: c99923d4a121f0c9f882b07f5402ea53e9b2d9455ad34468a094ffab1d64df26c82e1279734c0d42bc2e113eae7b581fbc3be52f3ed4a2d7450d11793afcf406
2020-12-02 09:37:37 +01:00
Andrew Poelstra
c876734d93 Merge b6a00e76ab into merged_master (Bitcoin PR #20279) 2020-12-01 22:04:54 +00:00
Andrew Poelstra
9ce2c21435 Merge 42b66a6b81 into merged_master (Bitcoin PR #20186) 2020-12-01 20:37:50 +00:00
Andrew Poelstra
f3afbf3d85 Merge f3727fd735 into merged_master (Bitcoin PR #20156) 2020-12-01 18:41:26 +00:00
Andrew Poelstra
d80e17c203 Merge 67d4643a1a into merged_master (Bitcoin PR #20152) 2020-12-01 17:05:26 +00:00
Andrew Poelstra
8258a74157 Merge 4f807348af into merged_master (Bitcoin PR #20185) 2020-12-01 06:49:23 +00:00
Andrew Poelstra
85663c72a3 Merge 82d3596dfe into merged_master (Bitcoin PR #20161) 2020-12-01 04:25:27 +00:00
Andrew Poelstra
943ae42b1a Merge 9855422e65 into merged_master (Bitcoin PR #17428) 2020-12-01 03:53:08 +00:00
Andrew Poelstra
4eeadb7fde Merge 8ed37f6c84 into merged_master (Bitcoin PR #19077) 2020-11-30 20:20:56 +00:00
Andrew Poelstra
f327fa97f2 Merge c2c4dbaebd into merged_master (Bitcoin PR #19988) 2020-11-30 19:05:03 +00:00
Andrew Poelstra
ed77072953 Merge e21b824386 into merged_master (Bitcoin PR #20109) 2020-11-30 18:38:05 +00:00
Andrew Poelstra
c9621a0d4a Merge af22322dab into merged_master (Bitcoin PR #20119) 2020-11-30 17:36:05 +00:00
Andrew Poelstra
4cb66aae97 Merge 0b2abaa666 into merged_master (Bitcoin PR #19954) 2020-11-30 17:12:23 +00:00
Andrew Poelstra
d504893530 Merge 12a1c3ad1a into merged_master (Bitcoin PR #20107) 2020-11-30 17:06:15 +00:00
Andrew Poelstra
d3cbe231b7 Merge 6854dbdc88 into merged_master (Bitcoin PR #20076) 2020-11-30 17:00:03 +00:00
Andrew Poelstra
77c3300ae3 Merge df2129a234 into merged_master (Bitcoin PR #19991)
I had to make up an onion service target port for Liquid and for our custom
params, so I chose 37041 and 37040 to roughly match how signet just adds
30000 to its normal port.
2020-11-30 04:44:21 +00:00
Andrew Poelstra
350d1098f1 Merge a0185d90a7 into merged_master (Bitcoin PR #18309) 2020-11-30 03:53:02 +00:00
Andrew Poelstra
fb606bb6ad Merge 72affcb16c into merged_master (Bitcoin PR #19802) 2020-11-30 03:03:08 +00:00
Andrew Poelstra
33a0d5e270 Merge 301959fa74 into merged_master (Bitcoin PR #20043) 2020-11-30 02:42:44 +00:00
Andrew Poelstra
3a833cdb0e Merge e36aa351a3 into merged_master (Bitcoin PR #19969) 2020-11-29 23:45:31 +00:00
Andrew Poelstra
e20126cae4 Merge 2552702000 into merged_master (Bitcoin PR #15367) 2020-11-29 23:02:09 +00:00
Andrew Poelstra
65b01321e2 Merge 4f45ea1f73 into merged_master (Bitcoin PR #19725) 2020-11-29 22:09:36 +00:00
Andrew Poelstra
a34b91cda7 Merge 8235dca621 into merged_master (Bitcoin PR #19979) 2020-11-29 19:50:32 +00:00
Andrew Poelstra
7a8f77d7ad Merge 9e217f5a6f into merged_master (Bitcoin PR #19572) 2020-11-29 19:44:31 +00:00
Andrew Poelstra
c1f937fe53 Merge 8219893825 into merged_master (Bitcoin PR #19993) 2020-11-29 18:52:06 +00:00
Andrew Poelstra
81a3dda09b Merge c30f79d418 into merged_master (Bitcoin PR #19940) 2020-11-29 14:00:02 +00:00
Andrew Poelstra
a7602fb56d Merge 652c45fdbb into merged_master (Bitcoin PR #15454) 2020-11-29 06:12:28 +00:00
Andrew Poelstra
afd00d41af Merge 5d5e335f96 into merged_master (Bitcoin PR #19903) 2020-11-29 04:39:03 +00:00
Andrew Poelstra
5e62edcf8e Merge ffaac6e614 into merged_master (Bitcoin PR #16378)
Adds a new "send" RPC which I didn't really look at too closely to match
our other RPC modifications. In particular our backport of #17211 adds a
"solving_data" field to other transaction-creation RPCs, but not this
one. (But I checked the current status of #17211 and Andy hasn't updated
upstream either, just passes NullUniValue to FundTransaction from `send`.
So that's what I did here.)
2020-11-29 04:33:22 +00:00
Andrew Poelstra
246b11ff76 Merge dffefda21d into merged_master (Bitcoin PR #19870) 2020-11-29 02:54:55 +00:00
Andrew Poelstra
532e650b1d Merge 23d3ae7acc into merged_master (Bitcoin PR #19405) 2020-11-28 22:56:34 +00:00
Andrew Poelstra
646aa14168 Merge a0a422c34c into merged_master (Bitcoin PR #19754) 2020-11-28 22:31:57 +00:00