Commit Graph

18612 Commits

Author SHA1 Message Date
J62 c8c7fe6ac2
Update chainparams.cpp 2018-10-24 22:17:57 -07:00
J62 2a9d0c8c4e
Update transaction.h 2018-10-24 22:16:50 -07:00
Jon Layton 9d72497c27
Merge pull request #99 from ch4ot1c/fixup/network-difficulty-merge
Fix segfaults by using chain tip header
2018-10-24 18:48:07 -05:00
Jon Layton 07b3316d6d Fix segfaults by using chain tip header 2018-10-24 16:58:23 -05:00
Jon Layton 321d5075fb
Merge pull request #98 from ch4ot1c/fixup/network-difficulty-merge
[rpc] Fixup for network difficulty merge
2018-10-23 12:15:35 -05:00
Jon Layton 7227a8180a [rpc] Fixup for network difficulty merge 2018-10-23 11:44:22 -05:00
Jon Layton 52b7943105
Merge pull request #94 from ch4ot1c/feature/difficulty
[mining] Update difficulty - Add Bitcoin Private's adjustment schedule
2018-10-23 01:09:58 -05:00
Jon Layton 81d5a1439e
Merge branch 'master' into feature/difficulty 2018-10-23 01:09:21 -05:00
Jon Layton de75d4c9c8
Merge pull request #97 from ch4ot1c/upstream-merge
Upstream merge (0.17.x master)
2018-10-23 01:07:02 -05:00
Jon Layton 6d40dee1d5 Fix assertion with side-effects in libsnark/common/profiling.cpp 2018-10-17 02:41:07 -05:00
Jon Layton 45922222ac [init] Add mempooltxinputlimit and paymentdisclosure gArgs 2018-10-17 02:26:21 -05:00
Jon Layton e5364a42d6 [bip9] Combine csv and segwit into one, as the enum establishes 2018-10-17 01:09:14 -05:00
Jon Layton 9f33304274 [fixup] Fix remaining mismatched method signatures for forkid 2018-10-17 01:08:39 -05:00
Jon Layton 63b60917c0 [mining] Nonce arith_uint256 fixup 2018-10-17 01:08:01 -05:00
Jon Layton e9d907ebae [build] Remove CreateJoinSplit for now due to failing linkage 2018-10-17 01:07:04 -05:00
Jon Layton 59971d2b4b [depends] Univalue: push_back(Pair()) -> pushKV() in AsyncRPCOperation* 2018-10-16 22:32:28 -05:00
Jon Layton 2a63c34936 Merge remote-tracking branch 'btc/master' into upstream-merge 2018-10-16 22:27:53 -05:00
J62 708d97b73c
Merge pull request #95 from ch4ot1c/docs/build
[doc] Add universal doc/build.md with both global and local configs
2018-10-16 18:03:30 -07:00
Jon Layton f467b32b29 [doc] Add universal doc/build.md with both global and local (depends) build configurations 2018-10-16 19:27:29 -05:00
Jon Layton dd8c6df535 [mining] Update difficulty - Add Bitcoin Private's adjustment schedule; display GetNetworkDifficulty in info rpcs 2018-10-16 15:38:35 -05:00
Wladimir J. van der Laan 23419e4c49
Merge #14335: net: refactor: cleanup ThreadSocketHandler
032488e6e7 Move SocketHandler logic to private method. (Patrick Strateman)
2af9cff11a Move InactivityCheck logic to private method. (Patrick Strateman)
7479b63d91 Move DisconnectNodes logic to private method. (Patrick Strateman)
edb5350c32 Move NotifyNumConnectionsChanged logic to private method. (Patrick Strateman)

Pull request description:

  Working towards using poll() on unix like systems.

  A number of small changes designed to separate the actual socket handling from the rest of the logic in ThreadSocketHandler.

  This is a simpler version of #14147

Tree-SHA512: 72f35c8ef7649019dcbfe19537d8c9f7e3d0fc5854dc691a70c5573352230fc31c3f55565820c632e9b8cb3c55b878bed19e0ad9423100762197ac35967d8067
2018-10-16 17:20:34 +02:00
Wladimir J. van der Laan 2468471e13
Merge #14403: qt: Revert "Force TLS1.0+ for SSL connections"
7d173c4cd1 qt: Revert "Force TLS1.0+ for SSL connections" (Tim Ruffing)

Pull request description:

  This reverts commit 15e26a6a9a, whose
  purpose was to tweak the Qt configuration to force TLS, i.e., to
  disable SSLv3, in Qt versions >= 5.5. However, the default behavior
  of Qt >= 5.4 is to disable SSLv3 anyway [1], so the configuration
  tweak is redundant.

  With Qt 5.11.2, the configuration tweak is not only redundant but in
  fact provokes a deadlock due to a bug in Qt 5.11.2. Since the deadlock
  occurs at the early startup stage of bitcoin-qt, it renders bitcoin-qt
  entirely non-functional when compiled against Qt 5.11.2 (and maybe
  other Qt versions).

  Fixes #14359.

  [1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=3fd2d9eff8c1f948306ee5fbfe364ccded1c4b84

Tree-SHA512: 9dd86557b8d265dfa56592924778a736590f2e6a0b2acf77d4f9f4200206a9edaa79b144b0085ea59ac0cc1bc66d9740402fd02f9298ff74c8d6f526f3f725d6
2018-10-16 07:04:22 +02:00
Wladimir J. van der Laan 9bd3ff430b
Merge #14383: qt: Clean system tray icon menu for '-disablewallet' mode
36323e2ac6 Clean systray icon menu for -disablewallet mode (Hennadii Stepanov)

Pull request description:

  There is a `Debug window` leftover in the system tray icon menu after #3392 merging.
  This PR makes both the app menu and the systray icon menu consistent.

Tree-SHA512: c9ef58785fe2a54bc6f778140a16001748ed8c46da948656822b86fdc2e224203cd467857f71d00ce56fc73ff2590c46d8c234a54c261c1141d83039de6fee1e
2018-10-16 06:54:07 +02:00
J62 34a717c976
Merge pull request #93 from interbiznw/master
changes for temporary testnet
2018-10-15 17:19:58 -07:00
J62 2237bd90d4
Update chainparams.cpp 2018-10-15 17:16:02 -07:00
J62 5b682bf399
disable fCoinbaseMustBeProtected for temp testnet
disable fCoinbaseMustBeProtected for temp testnet and change peermagic
2018-10-15 17:10:51 -07:00
Jonas Schnelli 2a2cac7873
Merge #14424: Stop requiring imported pubkey to sign non-PKH schemes
2f6b466ae Stop requiring imported pubkey to sign non-PKH schemes (Pieter Wuille)

Pull request description:

  ...

  This is a fix for #14415

Tree-SHA512: 113b4ddfbdfcce7dbaa15c565ac7ec68d16127aa4d47628e0801f2437cbe369e0fa8beb0de191d43dcb2f8cbb6f1bf8d79a5db0f4e352f38fe7280124475710a
2018-10-15 12:50:02 +02:00
J62 336b94773f
Merge pull request #92 from interbiznw/master
change back to testnet seeder
2018-10-15 00:05:51 -07:00
J62 0cef2bfe6a
change back to testnet seeder 2018-10-15 00:05:22 -07:00
J62 e3425b6909
Merge pull request #90 from interbiznw/master
added temp testnet nodes until seeder is working
2018-10-14 20:26:42 -07:00
J62 1387d7d2c8
Merge branch 'master' into master 2018-10-14 20:26:30 -07:00
J62 ab8809b4f0
added temp testnet nodes until seeder is working 2018-10-14 20:25:26 -07:00
Jon Layton 1f4ea0a623
Merge pull request #85 from ch4ot1c/feature/rpc-getblocksubsidy
[rpc] Add getblocksubsidy method, originally from BitcoinPrivate
2018-10-14 22:24:11 -05:00
Jon Layton e8c510915d
Merge pull request #89 from ch4ot1c/feature/bip34-oddity
Activate BIP34 for testnet and regtest
2018-10-14 22:20:05 -05:00
Jon Layton 4e10a6272e Activate BIP34 at block 17 for test networks, the smallest value possibly for a CScriptNum to be represented as expected 2018-10-14 22:06:35 -05:00
J62 7eb177e846
Merge pull request #88 from interbiznw/master
Change nForkStartHeight & nForkHeightRange to 0
2018-10-14 19:55:35 -07:00
J62 3d951ae387
Change nForkStartHeight & nForkHeightRange to 0 2018-10-14 19:55:16 -07:00
Jon Layton 3b88401dea Mainnet init redirects user to -testnet and -regtest 2018-10-14 21:15:40 -05:00
Jon Layton 5d342bfd8f Remove pow/tromp/* for Travis err 'No rule to make target 'pow/tromp/equi_miner.h'' 2018-10-14 20:49:12 -05:00
Jon Layton ac2b364c0c Remove test/zcash from Makefile.am, since seen in Travis errlog 2018-10-14 19:54:18 -05:00
Jon Layton 2f16797886 [rpc] Add getblocksubsidy method, originally from BitcoinPrivate 2018-10-14 06:11:32 -05:00
Jon Layton 3e241d08a5
Merge pull request #83 from ch4ot1c/disable-mainnet
Disable mainnet for now
2018-10-14 05:19:22 -05:00
J62 d830d321af
Update chainparams.cpp 2018-10-14 00:45:31 -07:00
J62 278978bca2
Merge pull request #84 from interbiznw/master
tweak rebase-testnet network magic
2018-10-14 00:05:39 -07:00
J62 61a6bb0c7e
tweak network magic 2018-10-14 00:05:05 -07:00
J62 20242ac165
Merge pull request #82 from interbiznw/master
prep dnsseed entry for rebase-testnet seeder
2018-10-13 23:43:39 -07:00
J62 e762a0b28d
Update chainparams.cpp 2018-10-13 22:07:01 -07:00
Jon Layton da316c8118 Disable mainnet for now 2018-10-13 22:30:01 -05:00
J62 537eed78cc
prep dnsseed entry for rebase-testnet seeder 2018-10-13 19:43:29 -07:00
J62 2a8e6a29f8
Update chainparams.cpp 2018-10-13 19:38:05 -07:00