Commit graph

363 commits

Author SHA1 Message Date
Andrew Poelstra
9813c3e74a wallet: fix "cannot unblind IsMine output" check in SignPSBT 2021-09-30 21:54:40 +00:00
Andrew Chow
b2a7007961 pset: verify blind value and asset proofs when signing 2021-09-11 21:02:26 -04:00
MarcoFalke
0896d0a278 util: Properly handle -noincludeconf on command line
This bug was introduced in commit
fad0867d6a.

Unit test
Co-Authored-By: Russell Yanofsky <russ@yanofsky.org>
2021-06-21 14:08:34 +00:00
MarcoFalke
5f18d337d4 Cleanup -includeconf error message
Remove the erroneous trailing newline '\n'. Also, print only the first
value to remove needless redundancy in the error message.
2021-06-19 02:40:20 +00:00
MarcoFalke
99b86594df Fix crash when parsing command line with -noincludeconf=0 2021-06-19 02:39:07 +00:00
Andrew Poelstra
2f5c624b18 ci: eliminate a bunch of build warnings
Includes removing some variables from qt/intro.cpp that've been
unused since #13216 and ought to have been removed in the 0.17
rebase, but our linters were not so agressive then. Similarly
fix the BITCOIN_PID_FILE, whose value was incorrectly changed
in the 0.18 rebase.
2021-03-26 17:33:05 +00:00
Andrew Poelstra
5b89a9fc92 Merge 80e32e120e into merged_master (Bitcoin PR #20305) 2020-12-02 17:53:59 +00:00
Andrew Poelstra
02fc69464f Merge 5a6f3c5a01 into merged_master (Bitcoin PR #20080) 2020-12-01 21:02:21 +00:00
Andrew Poelstra
dad417577a Merge 4769942d90 into merged_master (Bitcoin PR #19624) 2020-12-01 06:42:52 +00:00
Andrew Poelstra
43ebfe681c Merge 283a73d7ea into merged_master (Bitcoin PR #20092) 2020-11-30 16:07:45 +00:00
Andrew Poelstra
ab283556b0 Merge db88db4727 into merged_master (Bitcoin PR #19339)
Changes API for AcceptToMemoryPool to no longer check maximum fee; we remove
this check from interfaces::CChain::testPeginClaimAcceptance. This is fine,
the check never should have been there (this method's job is to notice double
claim attempts and provide a more helpful message to the user; other mempool
failures should be caught later in the `claimrawpegin` logic when we call
`pwallet->commitTransaction` which actually subits to the mempool). It was
only checking fees because the API made it easier to do so than to not.
2020-11-30 15:50:18 +00:00
Andrew Poelstra
850b0e367b Merge 655937ebcb into merged_master (Bitcoin PR #19845) 2020-11-29 23:08:29 +00:00
Andrew Poelstra
455f61c0db Merge 8c5f68118c into merged_master (Bitcoin PR #18267)
This commit adds signet support, which is a little bit silly/redundant for us :)
Was a surprisingly easy merge to handle, and hopefully in future Core is more
mindful of signed blocks when they are changing code architecture.

I had to change a couple lines of src/signet.cpp to add blank assets to the
CTxOuts and to find transaction input scriptWitnesses. No need to add any
other tx witness data (and the CAsset()s that I did add to make things compile
won't be used..) because signet will always have g_con_elementsmode off.
2020-11-29 16:57:55 +00:00
Andrew Poelstra
a3ff560ad9 Merge 0adb80fe63 into merged_master (Bitcoin PR #19803) 2020-11-28 17:09:11 +00:00
Andrew Poelstra
2a04500584 Merge a12d9e5fd2 into merged_master (Bitcoin PR #19687) 2020-11-28 13:35:24 +00:00
Andrew Poelstra
19dc3ee256 Merge 8d6224fefe into merged_master (Bitcoin PR #19628) 2020-11-28 12:24:29 +00:00
Andrew Poelstra
69eb9b4129 Merge 8e0f341779 into merged_master (Bitcoin PR #15704) 2020-11-28 04:49:15 +00:00
Andrew Poelstra
c366a5890a Merge e9b3012654 into merged_master (Bitcoin PR #19750) 2020-11-28 01:21:34 +00:00
Andrew Poelstra
419fd4f90d Merge b75f2ad72d into merged_master (Bitcoin PR #19660) 2020-11-27 04:05:36 +00:00
Andrew Poelstra
1e421d01f4 Merge e3272ff290 into merged_master (Bitcoin PR #19614) 2020-11-27 02:23:43 +00:00
Andrew Poelstra
519f434cd7 Merge e4df534c60 into merged_master (Bitcoin PR #15382) 2020-11-27 01:48:55 +00:00
Andrew Poelstra
e377f4f773 Merge f4cfa6d019 into merged_master (Bitcoin PR #15935) 2020-11-26 18:11:36 +00:00
Andrew Poelstra
3894f4419c Merge 3d57015aa2 into merged_master (Bitcoin PR #19491) 2020-11-26 04:25:00 +00:00
Andrew Poelstra
aef7078adf Merge 107b8559c5 into merged_master (Bitcoin PR #18638) 2020-11-26 01:09:23 +00:00
Andrew Poelstra
7fabb1de9a Merge 5ec19df687 into merged_master (Bitcoin PR #19277) 2020-11-26 01:09:19 +00:00
Andrew Poelstra
c473bf0bce Merge bb588669f9 into merged_master (Bitcoin PR #19331) 2020-11-26 01:09:16 +00:00
Andrew Poelstra
a2b426f3f9 Merge f32f7e907a into merged_master (Bitcoin PR #11413) 2020-11-26 01:09:13 +00:00
Andrew Poelstra
4839db857d Merge c27330897d into merged_master (Bitcoin PR #18027) 2020-11-26 01:09:11 +00:00
Andrew Poelstra
3aaeae55ea Merge f8364df250 into merged_master (Bitcoin PR #19176) 2020-11-26 01:09:02 +00:00
Andrew Poelstra
c817786377 Merge 9573d2b55b into merged_master (Bitcoin PR #19194) 2020-11-26 01:09:01 +00:00
Andrew Poelstra
b8d665f61a Merge b46fb5cb10 into merged_master (Bitcoin PR #19131) 2020-11-26 01:08:58 +00:00
Andrew Poelstra
5b9754580e Merge 55b4c65bd1 into merged_master (Bitcoin PR #16127) 2020-11-26 01:08:51 +00:00
Andrew Poelstra
51965ad1e6 Merge 25ad2c623a into merged_master (Bitcoin PR #18740) 2020-11-26 01:08:47 +00:00
Andrew Poelstra
947570a389 Merge 51825aea7f into merged_master (Bitcoin PR #18922) 2020-11-26 01:08:43 +00:00
Andrew Poelstra
f32fd217a5 Merge ec4d27fa8b into merged_master (Bitcoin PR #18216) 2020-11-26 01:08:40 +00:00
Andrew Poelstra
1d1a32e637 Merge 5b24f6084e into merged_master (Bitcoin PR #16224) 2020-11-26 01:08:40 +00:00
Andrew Poelstra
d7f7c1089d Merge f763283b65 into merged_master (Bitcoin PR #18512) 2020-11-26 01:08:39 +00:00
Andrew Poelstra
d4711bdf91 Merge 23c926d859 into merged_master (Bitcoin PR #18699) 2020-11-26 01:08:37 +00:00
Andrew Poelstra
7ba9c3d6ea Merge 63d5ed2fc4 into merged_master (Bitcoin PR #18437) 2020-11-26 01:08:34 +00:00
Andrew Poelstra
1ea940a2e2 Merge 4f802e59a0 into merged_master (Bitcoin PR #17509) 2020-11-26 01:08:28 +00:00
Andrew Poelstra
627184ba0d Merge c4c3f110eb into merged_master (Bitcoin PR #18190) 2020-11-26 01:08:26 +00:00
Andrew Poelstra
fd37b7c5d6 Merge 54f812d9d2 into merged_master (Bitcoin PR #18673) 2020-11-26 01:08:23 +00:00
Andrew Poelstra
e6c67f94cc Merge 969ee85494 into merged_master (Bitcoin PR #18662) 2020-11-26 01:08:22 +00:00
Andrew Poelstra
e978e137dd Merge 4eb1eeb02c into merged_master (Bitcoin PR #18504) 2020-11-26 01:08:16 +00:00
Andrew Poelstra
5f6fe9e521 Merge 5c1ba3a10a into merged_master (Bitcoin PR #18358) 2020-11-26 01:08:07 +00:00
Andrew Poelstra
55ce6456ed Merge 1668c80bdc into merged_master (Bitcoin PR #18449) 2020-11-26 01:08:04 +00:00
Andrew Poelstra
aeae0e2742 Merge 0dc6218c79 into merged_master (Bitcoin PR #18270) 2020-11-26 01:08:03 +00:00
Andrew Poelstra
5b3e849748 Merge 2e97d80017 into merged_master (Bitcoin PR #18134) 2020-11-26 01:08:02 +00:00
Andrew Poelstra
5b9f316537 Merge dcf2ccbfde into merged_master (Bitcoin PR #18115)
I really like this PR, but it wound up being pretty nontrivial to merge.
The crux is that it pulls PSBT signing logic into scriptpubkey manager,
which is where it belongs, but for us this means reasoning about pegins
inside script/sign.cpp.

However, sign.cpp is part of libbitcoin_common, which does not include
anything for reasoning about PoW or RPC (lol) or anything heavy about
that. This means that some pegin validation had to remain split between
the wallet/rpc layer and sign.cpp. I added a new file script/pegins.cpp
which has the (one) method we actually need in sign.cpp.

Aside from that, this diff is very large but is mostly just moving our
code changes to wallet/psbtwallet.* into wallet/wallet.* where those
functions now live. As far as review, it's probably not worthwhile to
spend too much too much time on this since it's going to be change
again in #16528 and others. The test coverage is pretty extensive.
2020-11-26 01:07:51 +00:00
Andrew Poelstra
cc668250eb Merge 97aadf98d0 into merged_master (Bitcoin PR #16117) 2020-11-26 01:07:50 +00:00