Commit graph

536 commits

Author SHA1 Message Date
Andrew Poelstra
4f50591181 Merge 0d2832a6d1 into merged_master (Elements PR #741)
To resolve the `ConstructTransaction` conflict I reverted to the existing code
then manually applied the diff (it adds a parameter then adds a giant pile of
code to the input loop).
2020-11-09 21:20:40 +00:00
Andrew Poelstra
2f310a3a3e Merge 029c65e04c into merged_master (Bitcoin PR #17141) 2020-11-09 21:20:39 +00:00
Andrew Poelstra
6823c31c7c Merge d6f304a462 into merged_master (Elements PR #684)
This PR reduced the minrelayfee for Elements, but also brought in some
changes from upstream which I mostly just didn't take (since we've
already brought them in, in earlier parts of this rebase).
2020-11-09 21:20:39 +00:00
Andrew Poelstra
5574cf1730 Merge 6c7da0736d into merged_master (Bitcoin PR #17108) 2020-11-09 21:20:38 +00:00
Andrew Poelstra
55b110cabc Merge c08bf2b574 into merged_master (Bitcoin PR #15437) 2020-11-09 21:20:35 +00:00
Andrew Poelstra
e73c3f2c3f Merge 866fd2888f into merged_master (Bitcoin PR #17030) 2020-11-09 21:20:34 +00:00
Andrew Poelstra
0fbbfe35c3 Merge a689c11907 into merged_master (Bitcoin PR #16524) 2020-11-09 21:20:33 +00:00
Andrew Poelstra
eab90a6495 Merge 13377b7a69 into merged_master (Bitcoin PR #16918) 2020-11-09 21:20:27 +00:00
Andrew Poelstra
98c5244de1 Merge a73775e4d5 into merged_master (Bitcoin PR #16917) 2020-11-09 21:20:27 +00:00
Andrew Poelstra
b24be4b1a7 Merge 59c138d2f1 into merged_master (Bitcoin PR #16898) 2020-11-09 21:20:27 +00:00
Andrew Poelstra
8b487a91fb Merge 3c8aacee72 into merged_master (Elements PR #712) 2020-11-09 21:20:24 +00:00
Andrew Poelstra
e413b2ebbb Merge ca97d292ce into merged_master (Bitcoin PR #16551) 2020-11-09 21:20:24 +00:00
Andrew Poelstra
bc7f2f6de6 Merge 04d9939f46 into merged_master (Bitcoin PR #16850) 2020-11-09 21:20:23 +00:00
Andrew Poelstra
8fa52e84b0 Merge 8af835a72d into merged_master (Bitcoin PR #16796) 2020-11-09 21:20:23 +00:00
Andrew Poelstra
9cc26a716a Merge 5b2fe5563b into merged_master (Elements PR #642)
FIXME: we disable standardness checks for the non-PAK node in the PAK tests.
This is because of a bug in Elements which causes non-PAK nodes to reject
pegouts for standardness reasons. Need to fix it after the rebase.
2020-11-09 21:20:21 +00:00
Andrew Poelstra
2cdfea1aa4 Merge cbde2bc806 into merged_master (Bitcoin PR #16804) 2020-11-09 21:20:21 +00:00
Andrew Poelstra
39d8aa865c Merge cc40b55da7 into merged_master (Bitcoin PR #16726) 2020-11-09 21:20:18 +00:00
Andrew Poelstra
9343f1e349 Merge 6dfa9efa3f into merged_master (Bitcoin PR #16656) 2020-11-09 21:20:17 +00:00
Andrew Poelstra
e62e563c84 Merge 27ee0cc5a6 into merged_master (Bitcoin PR #16646) 2020-11-09 21:20:16 +00:00
Andrew Poelstra
5f280a6068 Merge 1bf2ff2bf8 into merged_master (Bitcoin PR #16060) 2020-11-09 21:20:15 +00:00
Andrew Poelstra
a825f2c9ef Merge 8bd5e0af99 into merged_master (Bitcoin PR #16465) 2020-11-09 21:20:14 +00:00
Andrew Poelstra
d081803d89 Merge 67be6d7a17 into merged_master (Bitcoin PR #16248) 2020-11-09 21:20:14 +00:00
Andrew Poelstra
0d445414a6 Merge 05ccbe9a29 into merged_master (Bitcoin PR #16598) 2020-11-09 21:20:13 +00:00
Andrew Poelstra
d576fc5aeb Merge 62117f9f36 into merged_master (Bitcoin PR #16363) 2020-11-09 21:20:12 +00:00
Andrew Poelstra
a93a689a14 Merge d5ea8f4bf3 into merged_master (Bitcoin PR #16509) 2020-11-09 21:20:12 +00:00
Andrew Poelstra
3dbeccf1c9 Merge 79816278e2 into merged_master (Bitcoin PR #16470) 2020-11-09 21:20:11 +00:00
Andrew Poelstra
62ce823f8f Merge c67ef2938c into merged_master (Elements PR #600)
Also uncommented a bunch of PSBT functional tests (had to add a fee output
to one transaction, update `find_output` to skip CT outputs, and change two
constant checks at the end of the commented-out section).
2020-11-09 21:20:10 +00:00
Andrew Poelstra
dcd3f9fd69 Merge 59ce537a49 into merged_master (Bitcoin PR #16152) 2020-11-09 21:20:07 +00:00
Andrew Poelstra
3a0de44d90 Merge 0822b44d8a into merged_master (Bitcoin PR #15282) 2020-11-09 21:20:06 +00:00
Andrew Poelstra
046cf94f99 Merge d9bafca20c into merged_master (Bitcoin PR #15982) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
bbc59975b0 Merge 4858d36163 into merged_master (Elements PR #639) 2020-11-06 15:20:11 +00:00
Andrew Poelstra
0eedc2c45b Merge 63b9efa73d into merged_master (Bitcoin PR #16042) 2020-10-29 22:39:10 +00:00
Andrew Poelstra
b8e90ed29c Merge df7addc4c6 into merged_master (Bitcoin PR #15990) 2020-10-29 18:38:42 +00:00
Andrew Poelstra
c3cd785c26 Merge 3503a69ba2 into merged_master (Bitcoin PR #15963) 2020-10-29 17:09:46 +00:00
Andrew Poelstra
13b3e5bcc3 Merge c459c5f701 into merged_master (Bitcoin PR #15664) 2020-10-29 04:36:59 +00:00
Andrew Poelstra
0929a00ac5 Merge 8ec7121a45 into merged_master (Bitcoin PR #15927) 2020-10-29 02:32:33 +00:00
Andrew Poelstra
30390b2eba Merge ce6762030f into merged_master (Bitcoin PR #15897) 2020-10-29 02:05:13 +00:00
Andrew Poelstra
f3ba240a58 Merge f73a3c618b into merged_master (Bitcoin PR #15895) 2020-10-28 22:34:16 +00:00
Andrew Poelstra
7655f06251 Merge 08bd21a3bd into merged_master (Bitcoin PR #15826) 2020-10-28 20:54:52 +00:00
Andrew Poelstra
041d9ca6c3 Merge 0e9cb2d24d into merged_master (Bitcoin PR #15773) 2020-10-28 15:28:06 +00:00
Andrew Poelstra
8b4b800d49 Merge f9f6c11a74 into merged_master (Bitcoin PR #15771) 2020-10-28 02:12:01 +00:00
Andrew Poelstra
c8a4572c1f Merge f3ecf3025f into merged_master (Bitcoin PR #15772) 2020-10-28 02:02:37 +00:00
Andrew Poelstra
b10d0a931c Merge 327d2746fb into merged_master (Bitcoin PR #15495) 2020-10-28 00:55:06 +00:00
Andrew Poelstra
66d440750b Merge 68520597cc into merged_master (Bitcoin PR #15631) 2020-10-28 00:11:06 +00:00
Andrew Poelstra
7d93f137a0 Merge c033c4b5ce into merged_master (Bitcoin PR #13541) 2020-10-28 00:09:04 +00:00
Andrew Poelstra
67d718b048 Merge a74d588f21 into merged_master (Bitcoin PR #14954) 2020-10-27 22:32:24 +00:00
Andrew Poelstra
91b410a694 Merge 8f470ecc53 into merged_master (Bitcoin PR #15419) 2020-10-27 18:04:26 +00:00
Gregory Sanders
0d2832a6d1
Merge #741: Allow specifying peg-in data in createrawtransaction
5a4d61169 Test raw transaction peg-in (Andrew Chow)
ac6f052a6 Have find_vout_for_address only get non-confidential address when using elements chain (Andrew Chow)
cefe40767 Allow specifying peg-in info in raw transaction RPC inputs (Andrew Chow)
42babb81f Refactor peg-in input construction into its own function in rpc/rawtransaction.cpp (Andrew Chow)
a90d1521c Refactor peg-in witness construction to it's own function (Andrew Chow)

Pull request description:

  Adds to `createrawtransaction` the fields `pegin_bitcoin_tx`, `pegin_txout_proof`, and `pegin_claim_script` so that raw transactions can contain peg-in inputs too.

  Since `ConstructTransaction` is used by `createpsbt` and `walletcreatefundedpsbt` but those should not support peg-ins yet (the peg-in data should go into PSBT fields for peg-ins but those don't exist yet), an argument is added to it to optionally reject peg-in data.

Tree-SHA512: fcf3e4be87f92bfc5b00321bec405001d98615cefb76118345e0c759c6bfcb90b6050735960b6fbdbe26479fa11c9273f9963873a8adc1fbad9ed31dc7953ee0
2019-10-16 10:16:25 -04:00
Andrew Chow
ac6f052a6d Have find_vout_for_address only get non-confidential address when using elements chain 2019-10-15 15:22:10 -04:00
John Newbery
eebcdfa86a [test] rename SegwitVersion1SignatureHash()
The function implementing segwit v0 signature hash was originally named
SegwitVersion1SignatureHash() (presumably before segwit v0 was named
segwit v0). Rename it to SegwitV0SignatureHash().

Also rename SignatureHash() to LegacySignatureHash() for disambiguation.
2019-10-14 17:13:05 -04:00