Wladimir J. van der Laan
9bd55b1bfc
Merge #7603 : Build System: Use PACKAGE_TARNAME in NSIS script
...
0528e30
Remove wxwidgets references from NSIS script. (JeremyRand)
26880c3
build: Use PACKAGE_TARNAME and new bin names in NSIS script. (JeremyRand)
0dbf6e4
build: define base filenames for use elsewhere in the buildsystem (Cory Fields)
2017-12-20 17:25:02 +01:00
Wladimir J. van der Laan
6c7d133801
Merge #7518 : Add multiple options to fundrawtransaction
...
f2d0944
Add lockUnspents option to fundrawtransaction (João Barbosa)
af4fe7f
Add change options to fundrawtransaction (João Barbosa)
41e835d
Add strict flag to RPCTypeCheckObj (João Barbosa)
2017-12-20 17:25:02 +01:00
Wladimir J. van der Laan
f1197476ab
Merge #7870 : [contrib] Add MarcoFalke key and move all keys to contrib/gitian-keys
...
faf4c83
[gitian] Move keys to contrib/gitian-keys (MarcoFalke)
fa93936
[gitian] Add marcofalke-key.pgp (MarcoFalke)
2017-12-20 17:25:02 +01:00
Wladimir J. van der Laan
24f8c248f5
Merge #7856 : Only send one GetAddr response per connection.
...
66b0724
Only send one GetAddr response per connection. (Gregory Maxwell)
2017-12-20 17:25:02 +01:00
Wladimir J. van der Laan
b2eabb0974
Merge #7809 : depends: some base fixes/changes
...
11d9f6b
depends: qt/cctools: fix checksum checksum tests (Cory Fields)
bb717f4
depends: fix "unexpected operator" error during "make download" (Cory Fields)
fe740f1
depends: fix fallback downloads (Cory Fields)
dc4ec6d
depends: create a hostid and buildid and add option for salts (Cory Fields)
2017-12-20 17:25:02 +01:00
Wladimir J. van der Laan
60159eb2f4
Merge #7798 : [travis] Print the commit which was evaluated
...
fac9ca2
[travis] echo $TRAVIS_COMMIT_RANGE (MarcoFalke)
faef3b7
[travis] Print the commit which was evaluated (MarcoFalke)
2017-12-20 17:25:02 +01:00
Alexander Block
d532f22d3b
Use BIP32_EXTKEY_SIZE instead of fixed constant
...
This was missed in previous backports.
2017-12-20 17:25:02 +01:00
Wladimir J. van der Laan
7080c27dd6
Merge #7878 : [test] bctest.py: Revert faa41ee
...
fa7abe0
[test] bctest.py: Revert faa41ee
(MarcoFalke)
2017-12-20 17:25:02 +01:00
Wladimir J. van der Laan
ac53190bfe
Add missing changes from Bitcoin #7853
...
Missed due to conflict resolution in out-of-order backports
2017-12-20 17:24:57 +01:00
Wladimir J. van der Laan
c176f6c5b5
Merge #7812 : Tiny refactor of IsRBFOptIn
, avoid exception
...
4f7c959
Refactor IsRBFOptIn, avoid exception (Jonas Schnelli)
2017-12-20 14:58:27 +01:00
Wladimir J. van der Laan
f1f3fa327a
Merge #7846 : Clean up lockorder data of destroyed mutexes
...
5eeb913
Clean up lockorder data of destroyed mutexes (Pieter Wuille)
2017-12-20 14:58:27 +01:00
Wladimir J. van der Laan
116b14b5f0
Merge #7849 : tests: add varints_bitpatterns test
...
4521f00
tests: add varints_bitpatterns test (Wladimir J. van der Laan)
2017-12-20 14:58:27 +01:00
Wladimir J. van der Laan
1ac85586c9
Merge #7847 : doc: add arch linux build example
...
fe53a2a
doc: add arch linux setup and build example [skip ci] (mruddy)
2017-12-20 14:58:27 +01:00
Wladimir J. van der Laan
cc3a06bf53
Merge #7863 : getblockchaininfo: make bip9_softforks an object, not an array.
...
d12760b
rpc-tests: handle KeyError nicely in test_framework.py (Rusty Russell)
85c807c
getblockchaininfo: make bip9_softforks an object, not an array. (Rusty Russell)
2017-12-20 14:58:27 +01:00
Wladimir J. van der Laan
5b1ad12d10
Merge #7855 : [doc] gitian: Replace precise with trusty
...
fa6399d
[doc] gitian: Replace precise with trusty (MarcoFalke)
2017-12-20 14:58:27 +01:00
Wladimir J. van der Laan
20cb9aa21d
Merge #7796 : [amount] Add support for negative fee rates
...
facf5a4
[amount] tests: Fix off-by-one mistake (MarcoFalke)
fa2da2c
[amount] Add support for negative fee rates (MarcoFalke)
11114a6
[amount] test negative fee rates and full constructor (MarcoFalke)
2017-12-20 14:58:27 +01:00
Wladimir J. van der Laan
e48f46c806
Merge #7838 : [Doc] Update gitian build guide to debian 8.4.0
...
4a1d5c1
[Doc] Update gitian build guide to debian 8.4.0 (fanquake)
2017-12-20 14:58:27 +01:00
Pieter Wuille
d983f1d785
Merge #7828 : Trivial: Globals: Explicitly pass const CChainParams& to ProcessMessage()
...
bf477bc
Trivial: Globals: Explicitly pass const CChainParams& to ProcessMessage() (Jorge Timón)
2017-12-20 14:58:27 +01:00
Wladimir J. van der Laan
2a7971010d
Merge #7786 : Doc: Update isStandardTx comment
...
03c77fd
Doc: Update isStandardTx comment (Matthew English)
2017-12-20 14:45:12 +01:00
Wladimir J. van der Laan
b2d659f199
Merge #7570 : Net: Add IPv6 Link-Local Address Support
...
eda3d92
Net: Add IPv6 Link-Local Address Support (mruddy)
2017-12-20 14:45:12 +01:00
Wladimir J. van der Laan
a8aeff143b
Merge #7801 : [qa] Remove misleading "errorString syntax"
...
ffff866
[qa] Remove misleading "errorString syntax" (MarcoFalke)
2017-12-20 14:45:12 +01:00
Wladimir J. van der Laan
738e1c51c0
Merge #7793 : [doxygen] Fix member comments
...
fada0c4
[doc] Fix doxygen comments for members (MarcoFalke)
2017-12-20 14:45:12 +01:00
Alexander Block
cd9c6994c2
Implement named devnets ( #1791 )
...
* Initial devnet
* Move genesis block adding into its own method
* Introduce -allowprivatenet to lift limitation on RFC1918 addresses
Normally, RFC1918 (192.168.x.x/10.x.x.x/...) addresses are not allowed
to be relayed. Also, masternodes won't start when the address is considered
invalid.
This is needed to test local devnet or regtest based networks.
* Lift the requirement of minimum MN age for regtest/devnet
* Implement named devnets
This allows the creation of multiple independent devnets. Each one is
identified by a name which is hardened into a "devnet genesis" block,
which is automatically positioned at height 1. Validation rules will
ensure that a node from devnet=test1 never be able to accept blocks
from devnet=test2. This is done by checking the expected devnet genesis
block.
The genesis block of the devnet is the same as the one from regtest. This
starts the devnet with a very low difficulty, allowing us to fill up
needed balances for masternodes very fast.
Also, the devnet name is put into the sub-version of the VERSION message.
If a node connects to the wrong network, it will immediately be disconnected.
* Allow to select multiple addresses from the same group in devnet/regtest
The selection code normally only allows to select addresses from the same
group (e.g. 192.168.x.x) once. This results in connecting to only a single
node in devnet/regtest.
* Show the devnet name in the title bar and on the loading screen
* Add AllowMultipleAddressesFromGroup to chainparams and use it in net.cpp
* Remove unused/unneeded scripts from devnet geneses creation
1. OP_RETURN not needed in input script of devnet genesis
2. genesisOutputScript was unused
* Fix copy/paste error in -allowprivatenet description
* Improve -devnet parameter error handling
- Only allow one of -devnet, -regtest or -testnet
- Only allow -devnet=name to be specified once
* Use different datadir for each devnet
* Fix `devnet-devnet` issue
* Fix devnet splashscreen (should use testnet img)
* Avoid passing devNetName around (most of the time)
* Remove nMaxTipAge from CDevNetParams
Not present anymore after rebase on develop
2017-12-20 14:45:01 +03:00
UdjinM6
41850d0368
Merge pull request #1790 from codablock/pr_backport_bitcoin_0.13-2
...
Backport missing PRs from Bitcoin 0.13 - Part 2
2017-12-20 14:43:53 +03:00
Wladimir J. van der Laan
1f8ca7546e
depends: mac deploy Py3 compatibility
...
This fixes the gitian MacOSX build, it was broken in #7723 .
The patch to `native_mac_alias` should probably make it upstream.
2017-12-20 08:49:46 +01:00
Alexander Block
e5b82075ac
Fix no-wallet build after backports refactored RPCs
2017-12-20 08:39:44 +01:00
Alexander Block
f235b6a6ac
Apply review suggestions/fixes
2017-12-20 07:51:20 +01:00
Wladimir J. van der Laan
6a515e5e20
Merge #7788 : Use relative paths instead of absolute paths in protoc calls
...
0087f26
Use relative paths instead of absolute paths (Pavel Janík)
2017-12-19 13:42:36 +01:00
Wladimir J. van der Laan
d5f1b5ae88
Merge #7791 : Doc: change Precise to Trusty in gitian-building.md
...
190c1e2
Doc: change Precise to Trusty in gitian-building.md (JeremyRand)
2017-12-19 13:42:36 +01:00
Wladimir J. van der Laan
e7d9ffa5d7
Merge #7774 : RPC: add versionHex in getblock and getblockheader JSON results
...
92107d5
RPC: add versionHex in getblock and getblockheader JSON results; expand data in getblockchaininfo bip9_softforks field. (mruddy)
2017-12-19 13:42:36 +01:00
Wladimir J. van der Laan
1cd653cc54
Merge #7781 : devtools: Auto-set branch to merge to in github-merge
...
10d3ae1
devtools: Auto-set branch to merge to in github-merge (Wladimir J. van der Laan)
2017-12-19 13:42:36 +01:00
Wladimir J. van der Laan
c86717a599
Merge #7813 : [doc] Update port in tor.md
...
3373c43
[doc] Update port in tor.md (Adam Brown)
2017-12-19 13:42:36 +01:00
Wladimir J. van der Laan
7ba8612b58
Merge #7797 : RPC: fix generatetoaddress failing to parse address
...
60361ca
RPC: fix generatetoaddress failing to parse address and add unit test (mruddy)
2017-12-19 13:42:36 +01:00
Wladimir J. van der Laan
a7514a8e60
Merge #7789 : [Doc] Add note about using the Qt official binary installer.
...
4b9dfd6
Add note about using the Qt official binary installer. (Pavel Janík)
2017-12-19 13:42:36 +01:00
Alexander Block
9dbda86cb1
HDWallet error/warning message fixes
2017-12-19 13:42:36 +01:00
Wladimir J. van der Laan
298224b3b7
Merge #7691 : [Wallet] refactor wallet/init interaction
...
25340b7
[Wallet] refactor wallet/init interaction (Jonas Schnelli)
2017-12-19 13:42:36 +01:00
Wladimir J. van der Laan
a5505e7e8c
Merge #7711 : [build-aux] Update Boost & check macros to latest serials
...
cf5c786
[build-aux] Update Boost & check macros to latest serials (fanquake)
2017-12-19 13:42:36 +01:00
Wladimir J. van der Laan
21b23d1ec1
Merge #7785 : Trivial: Fix typo: Optimizaton -> Optimization [skip ci]
...
a22bde9
Fix typo: Optimizaton -> Optimization (paveljanik)
2017-12-19 13:42:36 +01:00
Wladimir J. van der Laan
960cb014d3
Merge #7477 : Fix quoting of copyright holders in configure.ac.
...
72fd008
Fix quoting of copyright holders in configure.ac. (Daniel Kraft)
2017-12-19 13:42:36 +01:00
Wladimir J. van der Laan
0956f3d67c
Merge #7763 : Put hex-encoded version in UpdateTip
...
eff736e
Reformat version in UpdateTip and other messages (Pieter Wuille)
2017-12-19 13:42:36 +01:00
Wladimir J. van der Laan
644240157a
Merge #7766 : rpc: Register calls where they are defined
...
fb8a8cf
rpc: Register calls where they are defined (Wladimir J. van der Laan)
2017-12-19 13:42:35 +01:00
Wladimir J. van der Laan
18da34e295
Merge #7761 : [Qt] remove trailing output-index from transaction-id
...
7d5e31a
[Qt] remove trailing output-index from transaction-id (Jonas Schnelli)
2017-12-19 13:18:30 +01:00
Wladimir J. van der Laan
1c84417780
Merge #7573 : P2P: add maxtimeadjustment command line option
...
e1523ce
P2P: add maxtimeadjustment command line option (mruddy)
2017-12-19 13:18:30 +01:00
Wladimir J. van der Laan
a9a209f586
Merge #7723 : build: python 3 compatibility
...
18f05c7
build: python 3 compatibility (Wladimir J. van der Laan)
2017-12-19 13:18:30 +01:00
Wladimir J. van der Laan
ba65eb1ac3
Merge #7764 : [qa] Don't run pruning.py twice
...
faa9f01
[qa] Don't run pruning.py twice (MarcoFalke)
2017-12-19 13:18:30 +01:00
Alexander Block
a309bf372e
Clear setInternalKeyPool and setExternalKeyPool instead of setKeyPool
...
Due to out of order backporting this was missed in the past
2017-12-19 13:18:30 +01:00
Wladimir J. van der Laan
e2fefa539d
Merge #7558 : [RPC] Add import/removeprunedfunds rpc call
...
f1bb13c
Added companion removeprunedfunds call. (instagibbs)
7eb7029
Add importprunedfunds rpc call (instagibbs)
2017-12-19 13:18:30 +01:00
Wladimir J. van der Laan
ca33635ef7
Merge #7742 : [Wallet][RPC] add missing abandon status documentation
...
cef8bdf
[Wallet][RPC] add missing abandon status documentation (Jonas Schnelli)
2017-12-19 13:18:30 +01:00
Wladimir J. van der Laan
34701da5cb
Merge #7737 : devtools: make github-merge.py use py3
...
f11c5a3
devtools: make github-merge.py use py3 (Wladimir J. van der Laan)
2017-12-19 13:18:30 +01:00
Wladimir J. van der Laan
a4911c383b
Merge #7646 : Fix lockunspent help message
...
df9e923
Fix lockunspents help message (João Barbosa)
2017-12-19 13:18:30 +01:00