aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Correct comment for 15-of-15 p2sh script sizeMichael Ford2014-06-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The original comment forgets to account for the script push which will need an OP_PUSHDATA2 + 2-bytes for the 513 script bytes. props davecgh fixes #4224
* | | Merge pull request #4425Wladimir J. van der Laan2014-06-281-0/+1
|\ \ \ | | | | | | | | | | | | 6ecf3ed Display unknown commands received. (R E Broadley)
| * | | Display unknown commands received.R E Broadley2014-06-281-0/+1
| | |/ | |/|
* | | Merge pull request #4398Wladimir J. van der Laan2014-06-281-4/+7
|\ \ \ | |_|/ |/| | | | | | | | 86fe1b8 update coding.md to reflect changes by pull (Philip Kaufmann) e10dcf2 ensure clean and consistent "namespace" usage (Philip Kaufmann)
| * | ensure clean and consistent "namespace" usagePhilip Kaufmann2014-06-261-4/+7
| | | | | | | | | | | | | | | | | | - remove some missplaced ; - ensure end of a namespace is clearly visible - use same formatting when using namespace
* | | Show only one zero instead of many when getblocks request received with a ↵R E Broadley2014-06-281-1/+1
| |/ |/| | | | | hashStop of uint256(0)
* | Merge pull request #4365 from gavinandresen/relax_isstandardGavin Andresen2014-06-271-20/+23
|\ \ | | | | | | Relax IsStandard rules for pay-to-script-hash transactions
| * | Relax IsStandard rules for pay-to-script-hash transactionsGavin Andresen2014-06-231-20/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relax the AreInputsStandard() tests for P2SH transactions -- allow any Script in a P2SH transaction to be relayed/mined, as long as it has 15 or fewer signature operations. Rationale: https://gist.github.com/gavinandresen/88be40c141bc67acb247 I don't have an easy way to test this, but the code changes are straightforward and I've updated the AreInputsStandard unit tests.
* | | JSON-RPC method: prioritisetransaction <txid> <priority delta> <priority tx fee>Luke Dashjr2014-06-261-0/+10
| |/ |/| | | | | Accepts the transaction into mined blocks at a higher (or lower) priority
* | Refactor proof of work related functions out of mainjtimon2014-06-231-112/+1
|/
* Code simplifications after CTransaction::GetHash() cachingPieter Wuille2014-06-221-32/+27
|
* Merge pull request #4310Wladimir J. van der Laan2014-06-191-22/+22
|\ | | | | | | 7a9e0b6 Move checkpoint based heuristic checks to AcceptBlockHeader (Pieter Wuille)
| * Move checkpoint based heuristic checks to AcceptBlockHeaderPieter Wuille2014-06-091-22/+22
| |
* | Merge pull request #2784Wladimir J. van der Laan2014-06-121-7/+6
|\ \ | | | | | | | | | f1920e8 Ping automatically every 2 minutes (unconditionally) (Pieter Wuille)
| * | Ping automatically every 2 minutes (unconditionally)Pieter Wuille2014-06-091-7/+6
| | | | | | | | | | | | | | | | | | ... instead of after 30 minutes of no sending, for latency measurement and keep-alive. Also, disconnect if no reply arrives within 20 minutes, instead of 90 of inactivity (for peers supporting the 'pong' message).
* | | small formatting, indentation and comment fixesPhilip Kaufmann2014-06-101-6/+3
|/ / | | | | | | - contains zero code changes
* | Merge pull request #3824Wladimir J. van der Laan2014-06-091-25/+19
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f0a83fc Use Params().NetworkID() instead of TestNet() from the payment protocol (jtimon) 2871889 net.h was using std namespace through chainparams.h included in protocol.h (jtimon) c8c52de Replace virtual methods with static attributes, chainparams.h depends on protocol.h instead of the other way around (jtimon) a3d946e Get rid of TestNet() (jtimon) 6fc0fa6 Add RPCisTestNet chain parameter (jtimon) cfeb823 Add RequireStandard chain parameter (jtimon) 21913a9 Add AllowMinDifficultyBlocks chain parameter (jtimon) d754f34 Move majority constants to chainparams (jtimon) 8d26721 Get rid of RegTest() (jtimon) cb9bd83 Add DefaultCheckMemPool chain parameter (jtimon) 2595b9a Add DefaultMinerThreads chain parameter (jtimon) bfa9a1a Add MineBlocksOnDemand chain parameter (jtimon) 1712adb Add MiningRequiresPeers chain parameter (jtimon)
| * | Add RequireStandard chain parameterjtimon2014-06-041-2/+2
| | |
| * | Add AllowMinDifficultyBlocks chain parameterjtimon2014-06-041-3/+3
| | |
| * | Move majority constants to chainparamsjtimon2014-06-041-20/+14
| | |
* | | Push cs_mains down in ProcessBlockPieter Wuille2014-06-091-11/+17
| | |
* | | Move all post-chaintip-change notifications to ActivateBestChainPieter Wuille2014-06-091-50/+50
| | |
* | | Allow ActivateBestChain to release its lock on cs_mainPieter Wuille2014-06-091-37/+55
| | |
* | | Get rid of the static chainMostWork (optimization)Pieter Wuille2014-06-091-29/+27
| |/ |/|
* | 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
| | |