Steven Roose
4db1799620
Merge ElementsProject/elements#951 : Spec for PSET
...
8e19dfa35b#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
Andrew Poelstra
7036176700
Merge 0bd4929cd0 into merged_master (Bitcoin PR #20284 )
2020-12-02 13:51:39 +00: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
Andrew Poelstra
b28ab82f99
Merge 3a3e21dafb into merged_master (Bitcoin PR #14687 )
2020-11-28 20:23:56 +00:00
Andrew Poelstra
b306593374
Merge bab4cce1b0 into merged_master (Bitcoin PR #19668 )
2020-11-28 19:57:58 +00:00
Andrew Poelstra
afe472121a
Merge a1d14f522c into merged_master (Bitcoin PR #19671 )
2020-11-28 19:48:53 +00:00
Andrew Poelstra
5f6eb8ee3f
Merge f98872f127 into merged_master (Bitcoin PR #18244 )
2020-11-28 18:55:44 +00:00
Andrew Poelstra
19dc3ee256
Merge 8d6224fefe into merged_master (Bitcoin PR #19628 )
2020-11-28 12:24:29 +00:00
Andrew Poelstra
33ae4adbbd
Merge 7f609f68d8 into merged_master (Bitcoin PR #19731 )
2020-11-28 04:26:09 +00:00
Andrew Poelstra
c3a261adfa
Merge 27eeb0337b into merged_master (Bitcoin PR #19550 )
2020-11-28 01:58:59 +00:00
Andrew Poelstra
ddd9b819bb
Merge a2a250c7d0 into merged_master (Bitcoin PR #19743 )
2020-11-28 00:53:18 +00:00
Andrew Poelstra
e10dd69c55
Merge a0e75bd31d into merged_master (Bitcoin PR #15937 )
2020-11-27 20:39:27 +00:00
Andrew Poelstra
6ae18f374c
Merge 6d5a9fec2d into merged_master (Bitcoin PR #19605 )
2020-11-27 05:29:59 +00:00
Andrew Poelstra
f92a3d1ed4
Merge 6ea7348122 into merged_master (Bitcoin PR #19638 )
2020-11-27 03:15:08 +00:00
Andrew Poelstra
d124975ffd
Merge 82127d27c9 into merged_master (Bitcoin PR #19667 )
2020-11-27 02:41:18 +00:00
Andrew Poelstra
519f434cd7
Merge e4df534c60 into merged_master (Bitcoin PR #15382 )
2020-11-27 01:48:55 +00:00
Andrew Poelstra
66b52025b1
Merge 8443fb11ad into merged_master (Bitcoin PR #19637 )
2020-11-26 23:37:01 +00:00
