aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* WIN32 Seed Cleanup: Move nLastPerfmon behind win32 ifdef.21E142015-02-251-3/+4
| | | | | Code to avoid calling Perfmon too often is only needed when perfmon is actually going to get called. This is not intended to make any functional difference in the addition of entropy to the random pool.
* Merge #5706: fix crash: RPC \Wladimir J. van der Laan2015-02-201-0/+2
|\ | | | | | | e5d9d77 fix crash: createmultisig and addmultisigaddress (fsb4000)
| * fix crash: createmultisig and addmultisigaddressfsb40002015-01-251-0/+2
| |
* | Merge #5689: openssl: abstract out OPENSSL_cleanseWladimir J. van der Laan2015-02-1913-17/+44
|\ \ | | | | | | | | | 1630219 openssl: abstract out OPENSSL_cleanse (Cory Fields)
| * | openssl: abstract out OPENSSL_cleanseCory Fields2015-02-1513-17/+44
| | | | | | | | | | | | | | | | | | This makes it easier for us to replace it if desired, since it's now only in one spot. Also, it avoids the openssl include from allocators.h, which essentially forced openssl to be included from every compilation unit.
* | | Merge #5366: No longer check osx compatibility in RenameThreadWladimir J. van der Laan2015-02-181-6/+1
|\ \ \ | | | | | | | | | | | | 850c570 No longer check osx compatibility in RenameThread (Michael Ford)
| * | | No longer check osx compatibility in RenameThreadMichael Ford2014-11-251-6/+1
| | | | | | | | | | | | | | | | 10.5 support has been dropped for some time now.
* | | | Merge #5799: Rename Interval() to DifficultyAdjustmentInterval()Wladimir J. van der Laan2015-02-183-6/+6
|\ \ \ \ | | | | | | | | | | | | | | | e5ece05 Rename Interval() to DifficultyAdjustmentInterval() (Shaul Kfir)
| * | | | Rename Interval() to DifficultyAdjustmentInterval()Shaul Kfir2015-02-173-6/+6
| | | | |
* | | | | Merge #5784: Fix usage of NegateSignatureS in script_testsWladimir J. van der Laan2015-02-183-4/+20
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | 78c6bed Add test for DER-encoding edge case (Suhas Daftuar) 6f50dbd Fix NegateSignatureS to not duplicate last byte of S (Suhas Daftuar)
| * | | | Add test for DER-encoding edge caseSuhas Daftuar2015-02-103-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix to NegateSignatureS caused a test which had been failing in IsValidSignatureEncoding to then fail in IsLowDERSignature. Add new test so the original check remains exercised.
| * | | | Fix NegateSignatureS to not duplicate last byte of SSuhas Daftuar2015-02-103-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NegateSignatureS is called with a signature without a hashtype, so do not save the last byte and append it after S negation. Updates the two tests which were affected by this bug.
* | | | | Merge #5710: Add more information to errors in ReadBlockFromDiskPieter Wuille2015-02-162-4/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | f5791c6 Add more information to errors in ReadBlockFromDisk (Wladimir J. van der Laan)
| * | | | | Add more information to errors in ReadBlockFromDiskWladimir J. van der Laan2015-02-052-4/+11
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | A lot of times, disk corruption problems appear here. To facilitate debugging and troubleshooting, add position information to the error messages.
* | | | | Merge #5548: [REST] add /rest/chaininfosWladimir J. van der Laan2015-02-101-3/+30
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | 2c0f901 [REST] rest/chaininfos add documentation (Jonas Schnelli) 59582c8 [REST] add /rest/chaininfos (Jonas Schnelli)
| * | | | [REST] add /rest/chaininfosJonas Schnelli2014-12-291-3/+30
| | | | |
* | | | | Merge #5629: [Qt] prevent amount overflow problem with payment requestsWladimir J. van der Laan2015-02-094-0/+69
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | a651668 [Qt] prevent amount overflow problem with payment requests (Philip Kaufmann)
| * | | | | [Qt] prevent amount overflow problem with payment requestsPhilip Kaufmann2015-02-044-0/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bitcoin amounts are stored as uint64 in the protobuf messages (see paymentrequest.proto), but CAmount is defined as int64_t. Because of that we need to verify that single and accumulated amounts are in a valid range and no variable overflow has happened. - fixes #5624 (#5622) Thanks @SergioDemianLerner for reporting that issue and also supplying us with a possible solution. - add static verifyAmount() function to PaymentServer and move the logging on error into the function - also add a unit test to paymentservertests.cpp
* | | | | | Merge #5699: Split logic to undo txin's off DisconnectBlock.Wladimir J. van der Laan2015-02-091-24/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | eb1c2cd Split logic to undo txin's off DisconnectBlock. (Daniel Kraft)
| * | | | | | Split logic to undo txin's off DisconnectBlock.Daniel Kraft2015-02-031-24/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead, create a separate function that applies the undo operation of a CTxInUndo object onto a CCoinsViewCache. This method is used from DisconnectBlock.
* | | | | | | Merge #5679: Get rid of DetectShutdownThreadWladimir J. van der Laan2015-02-091-13/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 28ee7e8 Get rid of DetectShutdownThread (Wladimir J. van der Laan)
| * | | | | | | Get rid of DetectShutdownThreadWladimir J. van der Laan2015-01-191-13/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The main thread spends time waiting for the DetectShutdownThread. So why not just run this waiting loop function in the main thread? One thread-stack less saves 4MB of virtual memory on 32-bit, and 8MB on 64-bit.
* | | | | | | | Merge pull request #5739Wladimir J. van der Laan2015-02-091-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | f4b2078 Replace difficulty readjustment blocks with Interval() (Shaul Kfir)
| * | | | | | | | Replace difficulty readjustment blocks with Interval()Shaul Kfir2015-02-021-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #5753Wladimir J. van der Laan2015-02-092-0/+83
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d67a642 [Qt] add bitcoin logo to about screen (Jonas Schnelli)
| * | | | | | | | | [Qt] add bitcoin logo to about screenJonas Schnelli2015-02-042-0/+83
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Sanitize command strings before logging them.Gregory Maxwell2015-02-083-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normally bitcoin core does not display any network originated strings without sanitizing or hex encoding. This wasn't done for strcommand in many places. This could be used to play havoc with a terminal displaying the logs, especially with printtoconsole in use. Thanks to Evil-Knievel for reporting this issue.
* | | | | | | | | Merge pull request #5721Wladimir J. van der Laan2015-02-061-4/+8
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | cf008ac Acquire CCheckQueue's lock to avoid race condition (Suhas Daftuar)
| * | | | | | | | Acquire CCheckQueue's lock to avoid race conditionSuhas Daftuar2015-02-031-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a potential race condition in the CCheckQueueControl constructor, which was looking directly at data in CCheckQueue without acquiring its lock. Remove the now-unnecessary friendship for CCheckQueueControl
* | | | | | | | | fix getblocktemplate lock issueJonas Schnelli2015-02-041-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getblocktemplate didn't have a wallet lock before #5711 and IMO there is no need for LEAVE/ENTER critical section.
* | | | | | | | | Merge pull request #5319Wladimir J. van der Laan2015-02-042-25/+17
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | 35f7227 Clean up wallet encryption code. (Daniel Kraft)
| * | | | | | | | Clean up wallet encryption code.Daniel Kraft2014-12-042-25/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new method DecryptKey in crypter.cpp, that combines the logic for decrypting, initialising and validating a CKey object. This was previously duplicated.
* | | | | | | | | Merge pull request #5509Wladimir J. van der Laan2015-02-046-526/+531
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7f991e3 c++11: These look like user-defined literals. (Cory Fields) 5a6155c c++11: don't forward-declare types used in maps (Cory Fields) 3447cf8 c++11: MOVEONLY: break circular dependency in wallet (Cory Fields) bbacd88 c++11: MOVEONLY: move function definitions out of the header (Cory Fields) a2b04dd build: fix newer boost build with c++11 (Cory Fields)
| * | | | | | | | | c++11: These look like user-defined literals.Cory Fields2015-02-031-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a space to keep the compiler happy
| * | | | | | | | | c++11: don't forward-declare types used in mapsCory Fields2015-02-032-5/+2
| | | | | | | | | |
| * | | | | | | | | c++11: MOVEONLY: break circular dependency in walletCory Fields2015-02-031-325/+323
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c++11 (libc++'s stdlib implementation anyway) doesn't allow for map types to be forward-declared. for example: class foo; std::map<int, foo> bar; // error, foo has not been defined. class foo{}; Since CWallet and CWalletTx are inter-dependent, but only std::map<*,CWalletTx> is used, forward-declare CWallet instead and define CWalletTx first. Despite the mangled git diff, this change only amounts to moving ~320 lines in a single chunk.
| * | | | | | | | | c++11: MOVEONLY: move function definitions out of the headerCory Fields2015-02-032-185/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These need to be moved out of the header in order to resolve a circular dependency between CWallet and CTxWallet. See next commit.
| * | | | | | | | | build: fix newer boost build with c++11Cory Fields2015-02-031-10/+10
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #5711Wladimir J. van der Laan2015-02-0411-125/+308
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | 5ebe095 Trim RPC command table (Wladimir J. van der Laan) 4401b2d Removed main.h dependency from rpcserver.cpp (Eric Lombrozo)
| * | | | | | | | Trim RPC command tableWladimir J. van der Laan2015-01-282-87/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - invalidateblock and reconsiderblock were defined doubly - remove no-longer-used threadSafe, as locks have been pushed down
| * | | | | | | | Removed main.h dependency from rpcserver.cppEric Lombrozo2015-01-2811-38/+224
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rebased by @laanwj: - update for RPC methods added since 84d13ee: setmocktime, invalidateblock, reconsiderblock. Only the first, setmocktime, required a change, the other two are thread safe.
* | | | | | | | | Merge pull request #5286Wladimir J. van der Laan2015-02-032-5/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 44e9a6b Update the 'test_IsStandard' unit test (Flavien Charlon) a930658 Change the default maximum OP_RETURN size to 80 bytes (Flavien Charlon)
| * | | | | | | | | Update the 'test_IsStandard' unit testFlavien Charlon2014-11-161-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The maximum length for the payload of an OP_RETURN output is now 80 bytes, and unit tests must be modified to account for the change.
| * | | | | | | | | Change the default maximum OP_RETURN size to 80 bytesFlavien Charlon2014-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The value can be changed through the '-datacarriersize' option, this is modifying the default value for that option.
* | | | | | | | | | Merge pull request #5732Wladimir J. van der Laan2015-02-037-12/+12
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1371e6f Change "insane" to "absurd" (referring to high fees) in text strings and identifiers. (Daira Hopwood)
| * | | | | | | | | | Change "insane" to "absurd" (referring to high fees) in text strings and ↵Daira Hopwood2015-01-317-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | identifiers. Note that this will also require translation changes in Transifex for the key "A fee higher than %1 is considered an insanely high fee." which is now "A fee higher than %1 is considered an absurdly high fee." Signed-off-by: Daira Hopwood <[email protected]>
* | | | | | | | | | | Merge pull request #5647Wladimir J. van der Laan2015-02-031-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3ff735c Increase block download timeout base from 10 to 20 minutes. (Gregory Maxwell)
| * | | | | | | | | | | Increase block download timeout base from 10 to 20 minutes.Gregory Maxwell2015-01-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This harmonizes the block fetch timeout with the existing ping timeout and eliminates a guaranteed eventual failure from congestion collapse for a network operating right at its limit. It's unlikely that we wouldn't suffer other failures if we were really anywhere near the network's limit, and a complete avoidance of congestion collapse risk requires (I think) an exponential back-off. So this isn't a major concern, but I think it's also useful for reducing the complexity of understanding out timeouts.
* | | | | | | | | | | | Merge pull request #5675Wladimir J. van der Laan2015-02-031-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2d9b0b7 Fix priority calculation in CreateTransaction (Alex Morcos)
| * | | | | | | | | | | | Fix priority calculation in CreateTransactionAlex Morcos2015-01-161-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make this projection of priority in 1 block match the calculation in the low priority reject code.