aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
Commit message (Collapse)AuthorAgeFilesLines
...
* | estimatefee / estimatepriority RPC methodsGavin Andresen2014-06-061-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New RPC methods: return an estimate of the fee (or priority) a transaction needs to be likely to confirm in a given number of blocks. Mike Hearn created the first version of this method for estimating fees. It works as follows: For transactions that took 1 to N (I picked N=25) blocks to confirm, keep N buckets with at most 100 entries in each recording the fees-per-kilobyte paid by those transactions. (separate buckets are kept for transactions that confirmed because they are high-priority) The buckets are filled as blocks are found, and are saved/restored in a new fee_estiamtes.dat file in the data directory. A few variations on Mike's initial scheme: To estimate the fee needed for a transaction to confirm in X buckets, all of the samples in all of the buckets are used and a median of all of the data is used to make the estimate. For example, imagine 25 buckets each containing the full 100 entries. Those 2,500 samples are sorted, and the estimate of the fee needed to confirm in the very next block is the 50'th-highest-fee-entry in that sorted list; the estimate of the fee needed to confirm in the next two blocks is the 150'th-highest-fee-entry, etc. That algorithm has the nice property that estimates of how much fee you need to pay to get confirmed in block N will always be greater than or equal to the estimate for block N+1. It would clearly be wrong to say "pay 11 uBTC and you'll get confirmed in 3 blocks, but pay 12 uBTC and it will take LONGER". A single block will not contribute more than 10 entries to any one bucket, so a single miner and a large block cannot overwhelm the estimates.
* | Type-safe CFeeRate classGavin Andresen2014-06-061-20/+10
| | | | | | | | | | | | | | | | Use CFeeRate instead of an int64_t for quantities that are fee-per-size. Helps prevent unit-conversion mismatches between the wallet, relaying, and mining code.
* | Merge pull request #4287 from laanwj/2014_06_sideeffectGavin Andresen2014-06-041-1/+2
|\ \ | | | | | | Remove side effect in assertion in ProcessGetData
| * | Remove side effect in assertion in ProcessGetDataWladimir J. van der Laan2014-06-041-1/+2
| |/ | | | | | | | | A side-effect was introduced into an assertion in 7a0e84d. This commit fixes that.
* | Merge pull request #4247 from Diapolo/listenJeff Garzik2014-06-041-2/+2
|\ \ | | | | | | rename fNoListen to fListen and move to net
| * | rename fNoListen to fListen and move to netPhilip Kaufmann2014-05-291-2/+2
| | | | | | | | | | | | | | | - better code readability and it belongs to net - this is a prerequisite for a pull to add -listen to the GUI
* | | Merge pull request #4258Wladimir J. van der Laan2014-06-041-1/+1
|\ \ \ | |_|/ |/| | | | | 7b45d94 Make max number of orphan blocks kept in memory a startup parameter (fixes #4253) (shshshsh)
| * | Make max number of orphan blocks kept in memory a startup parameter (fixes ↵shshshsh2014-06-041-1/+1
| |/ | | | | | | #4253)
* / VerifyDB progressCozz Lovan2014-06-031-1/+13
|/
* Merge pull request #4183Wladimir J. van der Laan2014-05-251-13/+0
|\ | | | | | | | | | | | | | | | | f40dbee remove CPubKey::VerifyCompact( ) which is never used (Kamil Domanski) 28b6c1d remove GetMedianTime( ) which is never used (Kamil Domanski) 5bd4adc remove LookupHostNumeric( ) which is never used (Kamil Domanski) 595f691 remove LogException( ) which is never used (Kamil Domanski) f4057cb remove CTransaction::IsNewerThan which is never used (Kamil Domanski) 0e31e56 remove CWallet::AddReserveKey which is never used (Kamil Domanski)
| * remove GetMedianTime( ) which is never usedKamil Domanski2014-05-201-13/+0
| |
* | Add missing LOCK(cs_main)Pieter Wuille2014-05-201-1/+4
|/
* Merge pull request #4199Wladimir J. van der Laan2014-05-201-1/+1
|\ | | | | | | 0a59723 Remove extraneous c_str (R E Broadley)
| * Remove extraneous c_strR E Broadley2014-05-201-1/+1
| |
* | Merge pull request #4173Wladimir J. van der Laan2014-05-191-1/+19
|\ \ | |/ |/| | | | | 8c93bf4 LoadBlockIndexDB(): Require block db reindex if any blk*.dat files are missing. (Ashley Holman) 7a0e84d ProcessGetData(): abort if a block file is missing from disk (Ashley Holman)
| * LoadBlockIndexDB(): Require block db reindex if any blk*.dat files are missing.Ashley Holman2014-05-121-0/+18
| |
| * ProcessGetData(): abort if a block file is missing from diskAshley Holman2014-05-111-1/+1
| |
* | Merge pull request #4138Wladimir J. van der Laan2014-05-121-11/+11
|\ \ | |/ |/| | | 783b182 Remove dummy PRIszX macros for formatting (Wladimir J. van der Laan)
| * Remove dummy PRIszX macros for formattingWladimir J. van der Laan2014-05-061-11/+11
| | | | | | | | | | | | | | | | | | Size specifiers are no longer needed now that we use typesafe tinyformat for string formatting, instead of the system's sprintf. No functional changes. This continues the work in #3735.
* | Merge pull request #4076Wladimir J. van der Laan2014-05-091-21/+22
|\ \ | | | | | | | | | | | | | | | | | | | | | 397668e Deduplicate uint* comparison operator logic (Pieter Wuille) df9eb5e Move {Get,Set}Compact from bignum to uint256 (Pieter Wuille) a703150 Add multiplication and division to uint160/uint256 (Pieter Wuille) 4d480c8 Exception instead of assigning 0 in case of wrong vector length (Pieter Wuille) eb2cbd7 Deduplicate shared code between uint160 and uint256 (Pieter Wuille)
| * | Move {Get,Set}Compact from bignum to uint256Pieter Wuille2014-05-091-21/+22
| | |
* | | Merge pull request #4134Wladimir J. van der Laan2014-05-091-11/+0
|\ \ \ | |/ / |/| | | | | aa250f0 Remove NumBlocksOfPeers (Wladimir J. van der Laan)
| * | Remove NumBlocksOfPeersWladimir J. van der Laan2014-05-061-11/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Generally useless information. Only updates on connect time, not after that. Peers can easily lie and the median filter is not effective in preventing that. In the past it was used for progress display in the GUI but `CheckPoints::guessVerificationProgress` provides a better way that is now used. It was too easy to mislead it. Peers do lie about it in practice, see issue #4065. From the RPC, `getpeerinfo` gives the peer raw values, which are more useful.
* | Merge pull request #3843Wladimir J. van der Laan2014-05-091-11/+27
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 787ee0c Check redeemScript size does not exceed 520 byte limit (Peter Todd) 4d79098 Increase IsStandard() scriptSig length (Peter Todd) f80cffa Do not trigger a DoS ban if SCRIPT_VERIFY_NULLDUMMY fails (Peter Todd) 6380180 Add rejection of non-null CHECKMULTISIG dummy values (Peter Todd) 29c1749 Let tx (in)valid tests use any SCRIPT_VERIFY flag (Peter Todd) 68f7d1d Create (MANDATORY|STANDARD)_SCRIPT_VERIFY_FLAGS constants (Peter Todd)
| * | Increase IsStandard() scriptSig lengthPeter Todd2014-05-081-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes the limits on number of pubkeys for P2SH CHECKMULTISIG outputs. Previously with the 500 byte scriptSig limit there were odd restrictions where even a 1-of-12 P2SH could be spent in a standard transaction(1), yet multisig scriptPubKey's requiring more signatures quickly ran out of scriptSig space. From a "stuff-data-in-the-blockchain" point of view not much has changed as with the prior commit now only allowing the dummy value to be null the newly allowed scriptSig space can only be used for signatures. In any case, just using more outputs is trivial and doesn't cost much. 1) See 779b519480d8c5346de6e635119c7ee772e97ec872240c45e558f582a37b4b73 Mined by BTC Guild.
| * | Do not trigger a DoS ban if SCRIPT_VERIFY_NULLDUMMY failsPeter Todd2014-05-081-6/+18
| | |
| * | Create (MANDATORY|STANDARD)_SCRIPT_VERIFY_FLAGS constantsPeter Todd2014-05-051-1/+1
| |/
* | Merge pull request #3884Wladimir J. van der Laan2014-05-091-71/+153
|\ \ | | | | | | | | | | | | 942b33a Split AcceptBlockHeader from AcceptBlock. (Pieter Wuille) f457347 Split up CheckBlock in a block and header version (Pieter Wuille)
| * | Split AcceptBlockHeader from AcceptBlock.Pieter Wuille2014-04-251-63/+137
| | | | | | | | | | | | Also modify some connection logic to deal with non-full blocks in the index.
| * | Split up CheckBlock in a block and header versionPieter Wuille2014-04-251-9/+17
| | |
* | | Add missing cs_main lock to VerifyDBWladimir J. van der Laan2014-05-071-0/+1
| |/ |/| | | | | Fixes issue #4139.
* | Merge pull request #4109Wladimir J. van der Laan2014-05-011-44/+45
|\ \ | | | | | | | | | 6b29ccc Correct indentation (R E Broadley)
| * | Correct indentationR E Broadley2014-04-301-44/+45
| |/
* / use standard __func__ instead of __PRETTY_FUNCTION__Philip Kaufmann2014-04-301-4/+4
|/
* Add MESSAGE_START_SIZE from chainparams when loading blocks from external files.Simon de la Rouviere2014-04-241-2/+2
|
* Add missing AssertLockHeld in ConnectBlockWladimir J. van der Laan2014-04-231-0/+1
|
* Solve chainActive-related locking issuesWladimir J. van der Laan2014-04-181-7/+8
| | | | | | | | | | | - In wallet and GUI code LOCK cs_main as well as cs_wallet when necessary - In main.cpp SendMessages move the TRY_LOCK(cs_main) up, to encompass the call to IsInitialBlockDownload. - Make ActivateBestChain, AddToBlockIndex, IsInitialBlockDownload, InitBlockIndex acquire the cs_main lock Fixes #3997
* Add AssertLockHeld for cs_main to ChainActive-using functionsWladimir J. van der Laan2014-04-171-0/+15
| | | | | | | | | | All functions that use ChainActive but do not aquire the cs_main lock themselves, need to be called with the cs_main lock held. This commit adds assertions to all externally callable functions that use chainActive or chainMostWork. This will flag usages when built with -DDEBUG_LOCKORDER.
* Move assert(pindexNew); to above where we dereference pindexNew.Gregory Maxwell2014-04-051-1/+1
|
* Merge pull request #3842 from ditto-b/masterGavin Andresen2014-04-021-1/+6
|\ | | | | Fix for GetBlockValue() after block 13,440,000
| * Fix for GetBlockValue() after block 13,440,000ditto-b2014-03-101-1/+6
| | | | | | | | | | Forces the block reward to zero when right shift in GetBlockValue() is undefined, after 64 reward halvings (block height 13,440,000).
* | Fix `-printblocktree` outputWladimir J. van der Laan2014-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | PrintBlockTree output was broken starting from e010af70. Everything appears on one line. PrintWallet() added the newline after a block, but this functionality was removed and no newline was added. Seemingly, no one noticed. Add a newline after the block information to fix this.
* | minor style cleanupsPhilip Kaufmann2014-03-111-9/+9
| |
* | Merge branch 'match_relay_fee' of git://github.com/mikehearn/bitcoinGavin Andresen2014-03-111-1/+1
|\ \
| * | Make mining fee policy match relay fee policy.Mike Hearn2014-03-101-1/+1
| |/ | | | | | | | | | | This resolves a case in which a mismatch could be used to bloat up the mempool by sending transactions that pay enough fee to relay, but not to be mined, with the default policies.
* | Merge pull request #3696Wladimir J. van der Laan2014-03-111-2/+3
|\ \ | |/ |/| | | | | c4656e0 Add progress to initial display of latest block downloaded. (R E Broadley) 75b8953 Display progress of rescan. (R E Broadley)
| * Add progress to initial display of latest block downloaded.R E Broadley2014-02-191-2/+3
| |
* | Merge pull request #3514Wladimir J. van der Laan2014-03-101-27/+122
|\ \ | | | | | | | | | f59d8f0 Per-peer block download tracking and stalled download detection. (Pieter Wuille)
| * | Per-peer block download tracking and stalled download detection.Pieter Wuille2014-02-081-27/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | Keep track of which block is being requested (and to be requested) from each peer, and limit the number of blocks in-flight per peer. In addition, detect stalled downloads, and disconnect if they persist for too long. This means blocks are never requested twice, and should eliminate duplicate downloads during synchronization.
* | | Merge pull request #3694 from gavinandresen/vfspentGavin Andresen2014-02-281-4/+21
|\ \ \ | | | | | | | | Remove CWalletTx::vfSpent