sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-30 14:25:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
13,995 Commits 24 Branches 554 Tags 581 MiB
1d620d1f9b
Commit Graph

13995 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
UdjinM6
1d620d1f9b
Fix calls to AcceptToMemoryPool in PS submodules (#1823) 2017-12-30 01:05:33 +03:00
UdjinM6
1448506570
Switch KeePassHttp integration to new AES lib, add tests and a note about KeePassHttp security (#1818) 
* Add a note about KeePassHttp security

* Use new AES lib instead of OpenSSL for KeePassHttp encryption/decryption

* Add tests to make sure new AES lib works corrctly for KeePassHttp encryption/decryption and produces the same results as OpenSSL did
 2017-12-29 01:10:34 +03:00
UdjinM6
1274cd306f
Merge pull request #1821 from codablock/pr_backport_bitcoin_0.13-6 
Backport missing PRs from Bitcoin 0.13 - Part 6
 2017-12-29 01:09:54 +03:00
Alexander Block
9c2e970858 Fix review nits 2017-12-28 15:53:17 +01:00
Alexander Block
f61a754020 Disable free transactions in TestPackageSelection 
Dash allows free transactions by default, mixing up the expected ordering
of transactions in TestPackageSelection
 2017-12-28 11:44:59 +01:00
Alexander Block
f8a7a2c88d Move bitcoin.ico/png and bitcoin_testnet.ico/png one dir up 
This also overwrites/dashifies icons/bitcoin_testnet.ico which was
introduced in Bitcoin #8285.

The icons were previously located in the drkblue theme directory while the
path used in dash.qrc was poining to the non-theme icons directory. Also,
the icons were never ported to the other themes. This commit moves them one
level up until someone actually ports these to the other themes (if ever
needed).
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
a9f0aedb34 Merge #8320: Fix 0.12 release notes on block relaying 
d6dc1bc Fix 0.12 release notes on block relaying (Krzysztof Jurewicz)
 2017-12-28 11:44:59 +01:00
Alexander Block
6a993236be Remove SegWit related checks added by backporting of Bitcoin #8295 
Also remove nBlockMinSize check from addPackageTxs. Removed by SegWit
related commits in Bitcoin.
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
f9f3b8d938 Merge #8295: Mining-related fixups for 0.13.0 
c1d61fb Add warning if -blockminsize is used. (Suhas Daftuar)
27362dd Remove -blockminsize option (Suhas Daftuar)
d2e46e1 Remove addScoreTxs() (Suhas Daftuar)
6dd4bc2 Exclude witness transactions in addPackageTxs() pre-segwit activation (Suhas Daftuar)
f15c2cd CreateNewBlock: add support for size-accounting to addPackageTxs (Suhas Daftuar)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
bc257c1a08 Merge #8305: Improve handling of unconnecting headers 
e91cf4b Add test for handling of unconnecting headers (Suhas Daftuar)
96fa953 Improve handling of unconnecting headers (Suhas Daftuar)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
26540aa5d1 Merge #8289: bash-completion: Adapt for 0.12 and 0.13 
1ba3db6 bash-completion: Adapt for 0.12 and 0.13 (Christian von Roques)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
1670472976 Merge #8314: Fix pkg-config issues for 0.13 
b556bed build: fix Windows builds without pkg-config (Cory Fields)
0c928cb build: Fix Qt5PlatformSupport check without pkg-config (Cory Fields)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
e6b071ab0a Merge #8315: gitian: Don't require sudo for Linux. 
099d4b0 gitian: use a wrapped gcc/g++ to avoid the need for a system change (Cory Fields)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
237ba56d9e Merge #8303: [Doc] Update bips.md for CSV softfork. 
ab0c35a [Doc] Update bips.md for CSV softfork. (fanquake)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
7a6febfaae Merge #8310: build: require boost for bench 
cf2ef78 build: require boost for bench (Cory Fields)
 2017-12-28 11:44:59 +01:00
Jonas Schnelli
5ff5474e47 Merge #8304: [travis] Update SDK_URL 
fa6ad56 [travis] Update SDK_URL (MarcoFalke)
 2017-12-28 11:44:59 +01:00
Jonas Schnelli
25627e31dd Merge #8288: qt: Network-specific example address 
4f44cb6 qt: Network-specific example address (Wladimir J. van der Laan)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
355f3724d2 Merge #8298: wallet: Revert input selection post-pruning 
20f3cd7 wallet: Revert input selection post-pruning (Wladimir J. van der Laan)
 2017-12-28 11:44:59 +01:00
MarcoFalke
2c914e8ba2 Merge #8280: Tests: Increase sync_blocks() timeouts in pruning.py 
36f1b9d Tests: Increase sync_blocks() timeouts in pruning.py (Suhas Daftuar)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
dcf36df675 Merge #8285: windows: Add testnet link to installer 
975a41d windows: Add testnet icon for testnet link (Wladimir J. van der Laan)
0ce8e99 windows: Add testnet link to installer (Wladimir J. van der Laan)
 2017-12-28 11:44:59 +01:00
Jonas Schnelli
ba6b369781 Merge #8281: qt: Remove client name from debug window 
a7897c0 qt: Remove client name from debug window (Wladimir J. van der Laan)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
17aa23c884 Merge #8261: The bit field is shown only when status is "started" 
2129fce The bit field is shown only when status is "started" (Pavel Janík)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
7f5b8f1e1d Merge #8258: RPC: Hide softfork if timeout is 0 
409f833 RPC: Hide softfork if timeout is 0 (jl2012)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
f1f1390338 Merge #8252: [trivial] Add aarch64 to depends .gitignore 
f70bcfc [trivial] Add aarch64 to depends .gitignore (fanquake)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
3f7273d009 Merge #8256: BUG: bitcoin-qt crash 
d7828ab check that transactionView->selectionModel()->selectedRows(0) exists (fsb4000)
 2017-12-28 11:44:59 +01:00
MarcoFalke
5a844dcc49 Merge #8254: [doc] Add OSX ZMQ requirement to QA readme 
d241487 [doc] Add OS X ZMQ requirement to QA readme (fanquake)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
b7b5d6ea7b Merge #8246: trivial: capitalize BIP32 in option help 
a1c92c2 trivial: capitalize BIP32 in option help (Wladimir J. van der Laan)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
e51f505449 Merge #8222: Enable mempool consistency checks in unit tests 
3775ff9 Enable mempool consistency checks in unit tests (Pieter Wuille)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
381629c757 Merge #8229: [Doc] Update OS X build notes for 10.11 SDK 
e5a680d [Doc] Update OS X build notes for 10.11 SDK (fanquake)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
e2bcf8ae0c Merge #8216: [qa] assert 'changePosition out of bounds' 
fa58f94 [qa] pull-tester: Start longest test first (MarcoFalke)
fa3b379 [qa] pull-tester: Fix assertion and check for run_parallel (MarcoFalke)
fa32465 [qa] fundrawtransaction: Create get_unspent() (MarcoFalke)
fa8ce3b [qa] assert 'changePosition out of bounds' (MarcoFalke)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
c2dabf8bd8 Merge #8220: Stop trimming when mapTx is empty 
ad0752e Stop trimming when mapTx is empty (Pieter Wuille)
 2017-12-28 11:44:59 +01:00
Alexander Block
36aa554584 Temporarily fix build error cased by out-of-order backporting 
Can be removed when we catch up with backporting. You'll notice it's time
for this when you get conflicts while merging the affected backported PR.
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
808936cc30 Merge #8179: Evict orphans which are included or precluded by accepted blocks. 
54326a6 Increase maximum orphan size to 100,000 bytes. (Gregory Maxwell)
8c99d1b Treat orphans as implicit inv for parents, discard when parents rejected. (Gregory Maxwell)
11cc143 Adds an expiration time for orphan tx. (Gregory Maxwell)
db0ffe8 This eliminates the primary leak that causes the orphan map to  always grow to its maximum size. (Gregory Maxwell)
1b0bcc5 Track orphan by prev COutPoint rather than prev hash (Pieter Wuille)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
573d9314e8 Merge #7713: Fixes for verify-commits script 
1e9aab0 Remove sipa's old revoked key from verify-commits (Peter Todd)
966151e Add README for verify-commits (Peter Todd)
11164ec Remove keys that are no longer used for merging (Peter Todd)
22421fa Remove pointless warning (Peter Todd)
9523e8a Make verify-commits path-independent (Matt Corallo)
f7d4a25 Make verify-commits POSIX-compliant (Matt Corallo)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
d2c3b7efef Merge #7687: Stop treating importaddress'ed scripts as change 
595b22e Stop treating importaddress'ed scripts as change (Pieter Wuille)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
782745b05b Merge #8066: [qa] test_framework: Use different rpc_auth_pair for each node 
fad1845 [qa] test_framework: Use different rpc_auth_pair for each node (MarcoFalke)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
68757db683 Merge #8210: [Qt] Bump to Qt5.6.1 
2759597 Only pass -lQt5PlatformSupport if >=Qt5.6 (Jonas Schnelli)
59d063d Use runtime linking of QT libdbus, use custom/temp. SDK URL (Jonas Schnelli)
6194d9a Fix bitcoin_qt.m4 and fix-xcb-include-order.patch (Jonas Schnelli)
f6eb4e2 [depends] OpenSSL 1.0.1k - update config_opts (fanquake)
f25209a depends: bump OSX toolchain (Cory Fields)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
05684db6e3 Merge #8203: Clarify documentation for running a tor node 
9e3ec74 Clarify documentation for running a tor node (Nathaniel Mahieu)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
b6d8206c20 Merge #8224: readme: Omit phrasing; 'new' 
7734479 readme: Omit phrasing; 'new' (Will Binns)
 2017-12-28 11:44:59 +01:00
MarcoFalke
46473757ee Merge #8215: [wallet] tests: Don't use floating point 
faa91b1 [wallet] tests: Don't use floating point (MarcoFalke)
 2017-12-28 11:44:59 +01:00
MarcoFalke
6227cfdad5 Merge #8214: [qa] mininode: fail on send_message instead of silent return 
facb6c0 [qa] mininode: fail on send_message instead of silent return (MarcoFalke)
 2017-12-28 11:44:59 +01:00
Pieter Wuille
f362c610e4 Merge #7600: Mining: Select transactions using feerate-with-ancestors 
29fac19 Add unit tests for ancestor feerate mining (Suhas Daftuar)
c82a4e9 Use ancestor-feerate based transaction selection for mining (Suhas Daftuar)
 2017-12-28 11:44:59 +01:00
Alexander Block
79ad5f7682 Bump univalue version 
This was probably missed while backporting Bitcoin PR #7892
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
c783b39ce7 Merge #8171: [RPC] Fix createrawtx sequence number unsigned int parsing 
6fa950a [RPC] Fix createrawtx sequence number unsigned int parsing (Jonas Schnelli)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
402eb55732 Merge #8208: Do not set extra flags for unfiltered DNS seed results 
bc0a895 Do not set extra flags for unfiltered DNS seed results (Pieter Wuille)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
9875ab5353 Merge #8207: [trivial] Add a link to the Bitcoin-Core repository and website to the About Dialog 
fa58e5e [doc] Add website links to about dialog (MarcoFalke)
 2017-12-28 11:44:59 +01:00
Jonas Schnelli
96180a1896 Merge #7636: Add bitcoin address label to request payment QR code 
1c2a1ba Add address label to request payment QR Code (QT) (Francesco 'makevoid' Canessa)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
62852538e1 Merge #8198: [trivial] Sync ax_pthread with upstream draft4 
0e209f9 [trivial] Sync ax_pthread with upstream draft (fanquake)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
61a667fc49 Merge #8194: [gitian] set correct PATH for wrappers 
fa61756 [gitian] set correct PATH for wrappers (MarcoFalke)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
2b4e896f60 Merge #8197: [trivial] Ignore split-debug.sh 
01a9904 [trivial] Ignore split-debug.sh (fanquake)
 2017-12-28 11:44:59 +01:00