GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-18 13:17:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
29954 commits 49 branches 359 tags 252 MiB
Commit graph

2190 commits

Author SHA1 Message Date
Andrew Poelstra
808c6ab0f0 Merge 1063fc9cf9 into merged_master (Bitcoin PR #16536) 2020-11-09 21:20:12 +00:00
Andrew Poelstra
db933991ff Merge 6841b01340 into merged_master (Bitcoin PR #16394) 2020-11-09 21:20:11 +00:00
Andrew Poelstra
2d781b0565 Merge 25f0edd59f into merged_master (Bitcoin PR #16448) 2020-11-09 21:20:11 +00:00
Andrew Poelstra
039e455324 Merge 3f288a1c05 into merged_master (Bitcoin PR #16504) 2020-11-09 21:20:10 +00:00
Andrew Poelstra
8dfba71046 Merge b21acab82f into merged_master (Bitcoin PR #15993) 
Just kept our version of Travis since I couldn't test it. We'll fix this after the fact.
 2020-11-09 21:20:09 +00:00
Andrew Poelstra
bfd57fbd09 Merge 29220250c1 into merged_master (Bitcoin PR #16441) 2020-11-09 21:20:09 +00:00
Andrew Poelstra
e29f1987af Merge fe001925f8 into merged_master (Bitcoin PR #16455) 2020-11-09 21:20:08 +00:00
Andrew Poelstra
431c7dce23 Merge ad4391ca38 into merged_master (Bitcoin PR #16430) 2020-11-09 21:20:07 +00:00
Andrew Poelstra
dcd3f9fd69 Merge 59ce537a49 into merged_master (Bitcoin PR #16152) 2020-11-09 21:20:07 +00:00
Andrew Poelstra
b57516e11a Merge 24dbcf3808 into merged_master (Bitcoin PR #15891) 
Disabled a test that `-acceptnonstdtxn` is disabled on mainnet, because
I couldn't figure out how to make the test jig choose mainnet.
 2020-11-09 21:20:06 +00:00
Andrew Poelstra
a50b652932 Merge 735d6b57e7 into merged_master (Bitcoin PR #16227) 2020-11-09 03:58:21 +00:00
Andrew Poelstra
473365d335 Merge d1fc827300 into merged_master (Bitcoin PR #16270) 2020-11-09 03:58:21 +00:00
Andrew Poelstra
b1bb63f321 Merge 5859b7dc6f into merged_master (Bitcoin PR #16338) 2020-11-09 03:58:21 +00:00
Andrew Poelstra
843c77a2ff Merge 983c84844c into merged_master (Bitcoin PR #16352) 2020-11-09 03:58:20 +00:00
Andrew Poelstra
8e3404b818 Merge e1a8d76aff into merged_master (Bitcoin PR #16347) 2020-11-09 03:58:20 +00:00
Andrew Poelstra
1d9458e988 Merge 2b465195e0 into merged_master (Bitcoin PR #16339) 2020-11-09 03:58:20 +00:00
Andrew Poelstra
2687bdb94a Merge 584168c7f9 into merged_master (Bitcoin PR #16326) 2020-11-09 03:58:19 +00:00
Andrew Poelstra
969b50e413 Merge 1212808762 into merged_master (Bitcoin PR #16257) 2020-11-09 03:58:17 +00:00
Andrew Poelstra
14df5ad8c2 Merge fd925e9b1c into merged_master (Bitcoin PR #16313) 2020-11-09 03:58:17 +00:00
Andrew Poelstra
b42145117d Merge 04710b6d8c into merged_master (Bitcoin PR #15964) 2020-11-09 03:58:17 +00:00
Andrew Poelstra
ac51ef6930 Merge 2cbcc55ba6 into merged_master (Bitcoin PR #16239) 2020-11-06 15:20:17 +00:00
Andrew Poelstra
f36e4b9cba Merge 32e9453818 into merged_master (Bitcoin PR #16256) 2020-11-06 15:20:16 +00:00
Andrew Poelstra
4a70305bf8 Merge 44d8172323 into merged_master (Bitcoin PR #13756) 
This PR introduces a `avoid_reuse` flag to the `getnewaddress` `sendtoaddress` `getbalance`
RPCs, which we've also added some asset-specific stuff. Since both changes have default
values they aren't individually breaking, but together they are since some existing
asset-related RPC workflows now require the user to jam a `False` in there to make
the new avoid-reuse stuff go away.
 2020-11-06 15:20:16 +00:00
Andrew Poelstra
83f93df4d0 Merge e2182b02b5 into merged_master (Bitcoin PR #16171) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
9e2fd1df5e Merge f3855781fd into merged_master (Bitcoin PR #16196) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
413732c74d Merge 47d981e827 into merged_master (Bitcoin PR #16186) 2020-11-06 15:20:14 +00:00
Andrew Poelstra
19b3c672cb Merge 8cbeaedee0 into merged_master (Bitcoin PR #16213) 2020-11-06 15:20:14 +00:00
Andrew Poelstra
371b96ff51 Merge 8a503a6c6d into merged_master (Bitcoin PR #16164) 2020-11-06 15:20:13 +00:00
Andrew Poelstra
1f80abfc06 Merge 36fb968825 into merged_master (Bitcoin PR #15461) 2020-11-06 15:20:13 +00:00
Andrew Poelstra
683556d5e3 Merge 51858c57f0 into merged_master (Bitcoin PR #16139) 2020-11-06 15:20:11 +00:00
Andrew Poelstra
a28d8df974 Merge abcce46a33 into merged_master (Bitcoin PR #16039) 2020-11-06 15:20:11 +00:00
Jon Atack
e5f3e95a8e
doc: fix getchaintxstats fields in release-process.md 
also:

- use the getblockheader (and getblockhash) RPCs instead of getblockchaininfo
  for updating the nMinimumChainWork and defaultAssumeValid consensus params

- use "RPC" consistently

- update the example PR from 17002 to 20263

- improve a link with a named anchor tag
 2020-11-01 22:19:24 +01:00
Andrew Poelstra
2788d4330e Merge 411e5f1547 into merged_master (Bitcoin PR #16047) 2020-10-29 23:29:14 +00:00
Andrew Poelstra
89c96d832d Merge fe47ae168b into merged_master (Bitcoin PR #16080) 2020-10-29 21:48:45 +00:00
Andrew Poelstra
6afd6a2a04 Merge 277abed604 into merged_master (Bitcoin PR #15922) 2020-10-29 19:21:34 +00:00
Andrew Poelstra
b929383aac Merge fd7d97decb into merged_master (Bitcoin PR #15820) 2020-10-29 18:55:12 +00:00
Andrew Poelstra
b8e90ed29c Merge df7addc4c6 into merged_master (Bitcoin PR #15990) 2020-10-29 18:38:42 +00:00
Andrew Poelstra
d8883c3b97 Merge 1c719f78d3 into merged_master (Bitcoin PR #15006) 2020-10-29 18:09:57 +00:00
Andrew Poelstra
5cb1c16c7d Merge d5931f3676 into merged_master (Bitcoin PR #15870) 2020-10-29 18:02:26 +00:00
Andrew Poelstra
2abb7abbd9 Merge e79bbb73e0 into merged_master (Bitcoin PR #15607) 2020-10-29 16:42:01 +00:00
Andrew Poelstra
332ae826ae Merge e2371f842f into merged_master (Bitcoin PR #14802) 2020-10-29 16:38:07 +00:00
Andrew Poelstra
0360ec8cc1 Merge 79046d5749 into merged_master (Bitcoin PR #15939) 2020-10-29 15:24:41 +00:00
MarcoFalke
42b66a6b81
Merge #20186: wallet: Make -wallet setting not create wallets 
01476a88a6 wallet: Make -wallet setting not create wallets (Russell Yanofsky)

Pull request description:

  This changes `-wallet` setting to only load existing wallets, not create new ones.

  - Fixes settings.json corner cases reported by sjors & promag: https://github.com/bitcoin-core/gui/issues/95, https://github.com/bitcoin/bitcoin/pull/19754#issuecomment-685858578, https://github.com/bitcoin/bitcoin/pull/19754#issuecomment-685858578

  - Prevents accidental creation of wallets reported most recently by jb55 http://www.erisian.com.au/bitcoin-core-dev/log-2020-09-14.html#l-355

  - Simplifies behavior after #15454. #15454 took the big step of disabling creation of the default wallet. This PR extends it to avoid creating other wallets as well. With this change, new wallets just aren't created on startup, instead of sometimes being created, sometimes not. #15454 release notes are updated here and are simpler.

  This change should be targeted for 0.21.0. It's a bug fix and simplifies behavior of the #15937 / #19754 / #15454 features added in 0.21.0.

  ---

  This PR is implementing the simplest, most basic alternative listed in https://github.com/bitcoin-core/gui/issues/95#issuecomment-694236940. Other improvements mentioned there can build on top of this.

ACKs for top commit:
  achow101:
    ACK 01476a88a6
  hebasto:
    re-ACK 01476a88a6
  MarcoFalke:
    review ACK 01476a88a6 🏂

Tree-SHA512: 0d50f4e5dfbd04a2efd9fd66c02085a0ed705807bdec1cf5770d0ae8cb6af07080fb81306349937bf66acdb713d03fb35636f6442b650d0820e66cbae09c2f87
 2020-10-29 15:01:39 +01:00
Wladimir J. van der Laan
f3727fd735
Merge #20156: build: Make sqlite support optional (compile-time) 
bbb42a6896 RPC: createwallet: Nicer error message if descriptor wallet requested and sqlite support not compiled in (Luke Dashjr)
6608fec332 GUI: Create Wallet: Nicely disable descriptor wallet checkbox if sqlite support not compiled in (Luke Dashjr)
7b54d768e1 Make sqlite support optional (compile-time) (Luke Dashjr)

Pull request description:

  As a new requirement, sqlite support should be optional. This PR aims to be only minimum/blocker changes for 0.21.

  Potential follow-up PRs after this:
  * Make BDB support optional
  * Nicer error messages when user tries to load an unsupported wallet
  * Don't compile descriptor wallet code if sqlite disabled

ACKs for top commit:
  jonasschnelli:
    Tested ACK bbb42a6896
  achow101:
    ACK bbb42a6896
  Sjors:
    re-utACK bbb42a6896
  hebasto:
    ACK bbb42a6896, tested on Linux Mint 20 (x86_64, Qt 5.12.8).

Tree-SHA512: 500209dd1971310fab8ae51543343ce0ba91f088ccccff6109b4cc27547cd5532289dca6cb7dac2a7d7c59cdf3c8f5aacc31e9b0f912e38cea52ec26b97100bd
 2020-10-29 12:03:36 +01: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
6bf38bd282 Merge bfaa7270c4 into merged_master (Bitcoin PR #15947) 
Original commit was 773e16f919, I had to add some extra commits to restore
the accidentally(?) deleted manpage that this PR enables.
 2020-10-29 02:12:33 +00:00
Andrew Poelstra
0bd7450281 Merge 24dfcf3a56 into merged_master (Bitcoin PR #15941) 2020-10-29 02:07:32 +00:00
Andrew Poelstra
cf22dd0930 Merge 12aa2ac988 into merged_master (Bitcoin PR #15323) 2020-10-29 02:07:08 +00:00
Andrew Poelstra
44e5901b98 Merge 2c35fe6238 into merged_master (Bitcoin PR #15849) 2020-10-29 02:06:12 +00:00