Commit graph

677 commits

Author SHA1 Message Date
Andrew Poelstra
66474e84c9 Merge 22b6c4ed75 into merged_master (Bitcoin PR #15899) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
3a76b73035 Merge 3689bc83dd into merged_master (Elements PR #657) 2020-11-06 15:20:14 +00:00
Andrew Poelstra
68d9951825 Merge d0f81a96d9 into merged_master (Bitcoin PR #16129) 2020-11-06 15:20:13 +00:00
Andrew Poelstra
738a42292f Merge 52ec4c64e8 into merged_master (Bitcoin PR #16144) 2020-11-06 15:20:12 +00:00
Andrew Poelstra
cb15f46946 Merge 5d37c1bde0 into merged_master (Bitcoin PR #15976) 2020-11-06 15:20:12 +00:00
Andrew Poelstra
11cdf7ebf5 Merge 1b78b9f222 into merged_master (Elements PR #636) 2020-11-06 15:20:12 +00:00
Andrew Poelstra
68a81ca040 Merge c29771437e into merged_master (Elements PR #625) 2020-11-06 15:20:11 +00:00
Andrew Poelstra
45601fb0fb update libsecp256k1-zkp to 5fbc67e108 2020-12-16 20:00:54 +00:00
Andrew Poelstra
5ecb077261 Merge 65c4bbe629 into merged_master (Bitcoin PR #16034) 2020-10-29 21:44:47 +00:00
Andrew Poelstra
03cbb94d6a Merge 12fd4bbd1e into merged_master (Bitcoin PR #16063) 2020-10-29 21:04:50 +00:00
Andrew Poelstra
d8883c3b97 Merge 1c719f78d3 into merged_master (Bitcoin PR #15006) 2020-10-29 18:09:57 +00:00
Andrew Poelstra
c91184f6c2 Merge b2a6b02161 into merged_master (Bitcoin PR #15948) 2020-10-29 02:36:55 +00:00
Andrew Poelstra
9ca74a409b Merge c5ffe8d515 into merged_master (Bitcoin PR #15730) 2020-10-29 02:14:31 +00:00
Andrew Poelstra
3a5a7341ba Merge a3d2d6b067 into merged_master (Bitcoin PR #15930) 2020-10-29 02:14:22 +00:00
Andrew Poelstra
ad0dc00fc2 Merge 3356799ee3 into merged_master (Bitcoin PR #15778) 2020-10-28 23:22:29 +00:00
Andrew Poelstra
c31c6e0d89 Merge 703414994a into merged_master (Bitcoin PR #15784) 2020-10-28 22:37:05 +00:00
Andrew Poelstra
90a5045c3b Merge cd14d210c4 into merged_master (Bitcoin PR #15463) 2020-10-28 22:16:27 +00:00
Andrew Poelstra
1613726319 Merge 2a854a1781 into merged_master (Bitcoin PR #15750) 2020-10-28 16:39:28 +00:00
Andrew Poelstra
1c4e3cbb5f Merge 4f4ef3138b into merged_master (Bitcoin PR #15557)
This restricts the `bumpfee` RPC, when given a feerate target, to unblinded
transactions, because this is the only way I could figure out quickly to
allow adding inputs to an already-created transaction. It appears to be the
strategy used by the `fundrawtransaction` RPC which has similar behaviour.
This should be fixed in a followup PR.
2020-10-28 15:36:05 +00:00
Andrew Poelstra
f3b06ff713 Merge c536dfbcb0 into merged_master (Bitcoin PR #15639)
asp: the point of this PR was to completely decouple libbitcoin_server from
bitcoin_tool; it removes $(LIBBITCOIN_SERVER) from the `elements_wallet_LDADD`.
I put this back in because our additional code related to pegin claiming makes
heavy use of methods from libbitcoin_server.

If we want to morally accept this PR then we need to do a nontrivial refactoring.
2020-10-28 15:00:23 +00:00
Andrew Poelstra
a8581ea138 Merge 6a135fbe5b into merged_master (Bitcoin PR #15638) 2020-10-28 03:16:57 +00:00
Andrew Poelstra
ccc0b0afff Merge db2985651d into merged_master (Bitcoin PR #15747) 2020-10-28 01:43:49 +00:00
Andrew Poelstra
dd652858a0 Merge daef20fb50 into merged_master (Bitcoin PR #15596) 2020-10-28 00:53:40 +00:00
Andrew Poelstra
4ddc27c626 Merge 8dbb2c5e67 into merged_master (Bitcoin PR #15680) 2020-10-28 00:53:05 +00:00
Andrew Poelstra
756aebfdd2 Merge 717fd58c4b into merged_master (Bitcoin PR #15625) 2020-10-28 00:10:51 +00:00
Andrew Poelstra
5f340cc9ac Merge 2607d960a0 into merged_master (Bitcoin PR #10973) 2020-10-28 00:10:27 +00:00
Andrew Poelstra
edfdf46351 Merge 45f434f44d into merged_master (Bitcoin PR #15288) 2020-10-27 21:55:08 +00:00
Andrew Poelstra
b612189f3c Merge 9e3122de05 into merged_master (Bitcoin PR #15492) 2020-10-27 20:46:09 +00:00
MeshCollider
22b6c4ed75
Merge #15899: rpc: Document iswitness flag and fix bug in converttopsbt
fa499b5f02 rpc: bugfix: Properly use iswitness in converttopsbt (MarcoFalke)
fa5c5cd141 rpc: Switch touched RPCs to IsValidNumArgs (MarcoFalke)

Pull request description:

  When a serialized transaction has inputs, there is no risk in only trying to deserialize it with witness allowed. (This is how all transactions from p2p are deserialized.) In fact, it would avoid a common issue where a transaction with inputs can be deserialized in two ways:
  * Fixes #12989
  * Fixes #15872
  * Fixes #15701
  * Fixes #13738
  * ...

  When a serialized transaction has no inputs, there is no risk in only trying to deserialze it with witness disallowed. (A transaction without inputs can't have corresponding witness data)

ACKs for commit fa499b:
  meshcollider:
    utACK https://github.com/bitcoin/bitcoin/pull/15899/commits/fa499b5f027f77c0bf13699852c8c06f78e27bef
  ryanofsky:
    utACK fa499b5f02. Changes since last review: consolidating commits and making iswitness documentation the same across methods.
  PastaPastaPasta:
    utACK fa499b5f02

Tree-SHA512: a64423a3131f3f0222a40da557c8b590c9ff01b45bcd40796f77a1a64ae74c6680a6be9d01ece95c492dfbcc7e2810409d2c2b336c2894af00bb213972fc85c6
2019-06-19 00:52:39 +12:00
Gregory Sanders
408912290a Better explain the 8-decimal asset issuance. 2019-06-07 10:01:36 +02:00
MarcoFalke
d0f81a96d9
Merge #16129: refactor: Remove unused includes
67f4e9c522 Include core_io.h from core_read.cpp (practicalswift)
eca9767673 Make reasoning about dependencies easier by not including unused dependencies (practicalswift)

Pull request description:

  Make reasoning about dependencies easier by not including unused dependencies.

  Please note that the removed headers are _not_ "transitively included" by other still included headers. Thus the removals are real.

  As an added bonus this change means less work for the preprocessor/compiler. At least 51 393 lines of code no longer needs to be processed:

  ```
  $ git diff -u HEAD~1 | grep -E '^\-#include ' | cut -f2 -d"<" | cut -f1 -d">" | \
        sed 's%^%src/%g' | xargs cat | wc -l
  51393
  ```

  Note that 51 393 is the lower bound: the real number is likely much higher when taking into account transitively included headers :-)

ACKs for commit 67f4e9:

Tree-SHA512: 0c8868aac59813f099ce53d5307eed7962dd6f2ff3546768ef9e5c4508b87f8210f1a22c7e826c3c06bebbf28bdbfcf1628ed354c2d0fdb9a31a42cefb8fdf13
2019-06-06 16:41:40 +02:00
Steven Roose
1b78b9f222
Merge #636: have peg-in witness creation strip witness for space savings
7737d29b7 have peg-in witness creation strip witness for space savings (Gregory Sanders)

Pull request description:

  Cheaper peg-in witness for those with segwit transactions in Bitcoin.

  resolves https://github.com/ElementsProject/elements/issues/628

Tree-SHA512: defc4f38b2456c6f45cf2ebd48a3d5f9e39544bd048606257ef6cf90623595c159f61e3df56845fb7a37a44b5019614e692663978a9664dd9b4d01b77bedeb86
2019-06-05 10:46:33 +01:00
Steven Roose
c29771437e
Merge #625: Disallow issuance calls in bitcoin mode
5de1e3f9d Disallow issuance calls in bitcoin mode (Gregory Sanders)

Pull request description:

  Enough people are running `-regtest` and getting confused as to why they cannot issue assets to make some checks worth it even though we don't intend people to run bitcoin mode at all.

Tree-SHA512: cb595839d01a000b5a48be4ae5c7084a687bb5c252be8f812f56455082ed78e66cb15313ab15934941cd403040ae253d8270faf6e85995d5caa0d1a66ccd3c6c
2019-06-05 10:40:15 +01:00
whythat
7860c98bd5 wallet: do not encrypt wallets with disabled private keys 2019-06-04 16:39:34 +03:00
practicalswift
eca9767673 Make reasoning about dependencies easier by not including unused dependencies 2019-06-02 17:15:23 +02:00
Gregory Sanders
7737d29b72 have peg-in witness creation strip witness for space savings 2019-05-28 11:52:57 -04:00
Steven Roose
de81c0d97e
MERGE-FIX: Fix linter (mostly RPC help)
I also moved some RPC methods that were not at the end of the file with
the other ELEMENTS RPC methods. This makes the diff on my machine look
crazy. Let's hope GitHub has more intelligent diffs..
2019-05-27 17:40:16 +01:00
Steven Roose
473e1e9ca1
MERGE-FIX: Fix compatibility functional tests 2019-05-22 16:54:46 +01:00
João Barbosa
be4efb165a rpc: Mention getwalletinfo where a rescan is triggered 2019-05-22 08:24:54 +01:00
Steven Roose
52f6f6905b
WIP: Fix compilation after merge 2019-05-20 16:22:05 +01:00
Gregory Sanders
5de1e3f9d5 Disallow issuance calls in bitcoin mode 2019-05-20 07:45:42 -04:00
Steven Roose
f4889a5253
UPSTREAM MERGE BROKEN: Merge upstream commit '519b0bc5dc' into master 2019-05-17 16:17:09 +01:00
MarcoFalke
fa499b5f02
rpc: bugfix: Properly use iswitness in converttopsbt
Also explain the param in all RPCs
2019-05-16 15:56:04 -04:00
MarcoFalke
fa5c5cd141
rpc: Switch touched RPCs to IsValidNumArgs 2019-05-16 14:15:40 -04:00
Steven Roose
d21e0563c1
Address some linter complaints 2019-05-15 17:30:04 +01:00
Steven Roose
ad3d496d78
Add extra lock check for OSX build
Apparently my upstream checkpoint was in the middle of a series of
commits by ianofsky separating wallet from the main code.  This means
that I have to add this main lock which will be replaced by the
locked_chain interface in a subsequence catchup.
2019-05-15 17:30:02 +01:00
Steven Roose
dc900eb7d7
Merge branch 'master' into catchup 2019-05-14 16:49:18 +01:00
Andrew Chow
662d1171d9 Add option to create an encrypted wallet 2019-05-13 22:49:34 -04:00
Wladimir J. van der Laan
de5af41e35
Merge #15452: Replace CScriptID and CKeyID in CTxDestination with dedicated types
78e407ad0c GetKeyBirthTimes should return key ids, not destinations (Gregory Sanders)
70946e7fee Replace CScriptID and CKeyID in CTxDestination with dedicated types (Gregory Sanders)

Pull request description:

  The current usage seems to be an overloading of meanings. `CScriptID` is used in the wallet as a lookup key, as well as a destination, and `CKeyID` likewise. Instead, have all destinations be dedicated types.

  New types:
  `CScriptID`->`ScriptHash`
  `CKeyID`->`PKHash`

ACKs for commit 78e407:
  ryanofsky:
    utACK 78e407ad0c. Only changes are removing extra CScriptID()s and fixing the test case.
  Sjors:
    utACK 78e407a
  meshcollider:
    utACK https://github.com/bitcoin/bitcoin/pull/15452/commits/78e407ad0c26190a22de1bc8ed900164a44a36c3

Tree-SHA512: 437f59fc3afb83a40540da3351507aef5aed44e3a7f15b01ddad6226854edeee762ff0b0ef336fe3654c4cd99a205cef175211de8b639abe1130c8a6313337b9
2019-05-09 18:54:43 +02:00
Steven Roose
48a82fa993
Make claimpegin fail in the case of a double claim
Currently it will commit to the transaction without it being able to
enter the mempool. This makes the block creation code include the tx
into the block and create an invalid block.
2019-05-08 15:35:58 +01:00