aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Add logic to track pubkeys as watch-only, not just scriptsMatt Corallo2015-07-206-10/+49
|
* Add have-pubkey distinction to ISMINE flagsMatt Corallo2015-07-204-10/+18
| | | | | | | This indicates that, eg, we have a public key for a key which may be used as a pay-to-pubkey-hash. It generally means that we can create a valid scriptSig except for missing private key(s) with which to create signatures.
* Update importaddress help to push its use to script-onlyMatt Corallo2015-07-201-6/+7
|
* Add importpubkey method to import a watch-only pubkeyMatt Corallo2015-07-204-0/+60
|
* Add p2sh option to importaddress to import redeemScriptsMatt Corallo2015-07-202-6/+21
|
* Split up importaddress into helper functionsMatt Corallo2015-07-201-33/+34
|
* Also remove pay-2-pubkey from watch when adding a priv keyMatt Corallo2015-07-203-0/+9
|
* Merge pull request #6408Wladimir J. van der Laan2015-07-205-20/+11
|\ | | | | | | dca6040 [Qt] remove std namespace polution from code (Philip Kaufmann)
| * [Qt] remove std namespace polution from codePhilip Kaufmann2015-07-165-20/+11
| |
* | Separate core memory usage computation in core_memusage.hPieter Wuille2015-07-2011-99/+76
| |
* | Fix warning introduced by #6412Wladimir J. van der Laan2015-07-201-1/+1
| | | | | | | | SOCKET are defined as unsigned integers, thus always >=0.
* | Merge pull request #6412Wladimir J. van der Laan2015-07-203-0/+29
|\ \ | | | | | | | | | d422f9b Test whether created sockets are select()able (Pieter Wuille)
| * | Test whether created sockets are select()ablePieter Wuille2015-07-103-0/+29
| | |
* | | Merge pull request #6447Wladimir J. van der Laan2015-07-201-2/+1
|\ \ \ | | | | | | | | | | | | 2cb8ee9 remove unused inv from ConnectTip() (Pavel Vasin)
| * | | remove unused inv from ConnectTip()Pavel Vasin2015-07-161-2/+1
| | |/ | |/|
* / | Documenting pruned, pruneheight and softforks in getblockchaininfoSimon Males2015-07-191-0/+2
|/ /
* | Merge pull request #6438Wladimir J. van der Laan2015-07-151-0/+8
|\ \ | | | | | | | | | d4b1d5a openssl: avoid config file load/race (Cory Fields)
| * | openssl: avoid config file load/raceCory Fields2015-07-141-0/+8
| | |
* | | qt: update forgotten emit to Q_EMIT in macdockiconhandler.mmWladimir J. van der Laan2015-07-151-1/+1
| | | | | | | | | | | | Leftover from #6433
* | | qt: define QT_NO_KEYWORDSWladimir J. van der Laan2015-07-1566-184/+184
| | | | | | | | | | | | | | | | | | | | | | | | QT_NO_KEYWORDS prevents Qt from defining the `foreach`, `signals`, `slots` and `emit` macros. Avoid overlap between Qt macros and boost - for example #undef hackiness in #6421.
* | | rpc: Implement random-cookie based authenticationWladimir J. van der Laan2015-07-134-27/+105
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | When no `-rpcpassword` is specified, use a special 'cookie' file for authentication. This file is generated with random content when the daemon starts, and deleted when it exits. Read access to this file controls who can access through RPC. By default this file is stored in the data directory but it be overriden with `-rpccookiefile`. This is similar to Tor CookieAuthentication: see https://www.torproject.org/docs/tor-manual.html.en Alternative to #6258. Like that pull, this allows running bitcoind without any manual configuration. However, daemons should ideally never write to their configuration files, so I prefer this solution.
* | Merge pull request #6398Wladimir J. van der Laan2015-07-133-7/+1
|\ \ | | | | | | | | | 85ee55b rpc: Remove chain-specific RequireRPCPassword (Wladimir J. van der Laan)
| * | rpc: Remove chain-specific RequireRPCPasswordWladimir J. van der Laan2015-07-103-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've never liked the chain-specific exception to having to set a password. It gives issues with #6388 which makes it valid to set no password in every case (as it enables random cookie authentication). This pull removes the flag, so that all chains are regarded the same. It also removes the username==password test, which doesn't provide any substantial extra security.
* | | Merge pull request #6410Wladimir J. van der Laan2015-07-118-2/+110
|\ \ \ | | | | | | | | | | | | 5098c47 Implement accurate memory accounting for mempool (Pieter Wuille)
| * | | Implement accurate memory accounting for mempoolPieter Wuille2015-07-108-2/+110
| | |/ | |/|
* | | Merge pull request #6370Wladimir J. van der Laan2015-07-103-13/+2
|\ \ \ | | | | | | | | | | | | 6ebac07 Remove ChainParams::DefaultMinerThreads (Wladimir J. van der Laan)
| * | | Remove ChainParams::DefaultMinerThreadsWladimir J. van der Laan2015-07-033-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | No longer relevant after #5957. This hack existed because of another hack where the numthreads parameter, on regtest, doubled as how many blocks to generate.
* | | | Merge pull request #6379Wladimir J. van der Laan2015-07-105-1/+215
|\ \ \ \ | |_|/ / |/| | | | | | | 9cc9152 rpc: Accept scientific notation for monetary amounts in JSON (Wladimir J. van der Laan)
| * | | rpc: Accept scientific notation for monetary amounts in JSONWladimir J. van der Laan2015-07-105-1/+215
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a function `ParseFixedPoint` that parses numbers according to the JSON number specification and returns a 64-bit integer. Then this in `AmountFromValue`, rather than `ParseMoney`. Also add lots of tests (thanks to @jonasschnelli for some of them). Fixes issue #6297.
* | | Merge pull request #5486Wladimir J. van der Laan2015-07-102-6/+15
|\ \ \ | | | | | | | | | | | | c45c7ea [REST] add JSON support for /rest/headers/ (Jonas Schnelli)
| * | | [REST] add JSON support for /rest/headers/Jonas Schnelli2015-07-052-6/+15
| |/ /
* | | Merge pull request #5288Wladimir J. van der Laan2015-07-103-12/+69
|\ \ \ | | | | | | | | | | | | e3cae52 Added -whiteconnections=<n> option (Josh Lehan)
| * | | Added -whiteconnections=<n> optionJosh Lehan2015-06-143-11/+68
| | | | | | | | | | | | | | | | | | | | | | | | This sets aside a number of connection slots for whitelisted peers, useful for ensuring your local users and miners can always get in, even if your limit on inbound connections has already been reached.
* | | | Merge pull request #6384Wladimir J. van der Laan2015-07-101-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | 15e26a6 qt: Force TLS1.0+ for SSL connections (Wladimir J. van der Laan)
| * | | | qt: Force TLS1.0+ for SSL connectionsWladimir J. van der Laan2015-07-061-0/+8
| | | | |
* | | | | Merge pull request #6368Wladimir J. van der Laan2015-07-091-0/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | cb54d17 CLTV: Add more tests to improve coverage (Esteban Ordano)
| * | | | | CLTV: Add more tests to improve coverageEsteban Ordano2015-07-061-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Four cases included: * The CLTV operand type mismatches the tx locktime. In the script it is 1 (interpreted as block height), but in the tx is 500000000 (interpreted as date) * The stack is empty when executing OP_CLTV * The tx is final by having only one input with MAX_INT sequence number * The operand for CLTV is negative (after OP_0 OP_1 OP_SUB)
* | | | | | Merge pull request #6378Wladimir J. van der Laan2015-07-094-14/+9
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | 5e058e7 [Qt] constify foreach uses where possible (Philip Kaufmann)
| * | | | | [Qt] constify foreach uses where possiblePhilip Kaufmann2015-07-074-14/+9
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | - this doesn't replace BOOST_FOREACH, it just makes used arguments const where possible
* | | | | Merge pull request #6387Wladimir J. van der Laan2015-07-081-0/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 65ce021 [bitcoin-cli] improve error output (Jonas Schnelli)
| * | | | | [bitcoin-cli] improve error outputJonas Schnelli2015-07-071-0/+9
| | |_|/ / | |/| | |
* / | | | tests: Fix bitcoin-tx signing testcaseWladimir J. van der Laan2015-07-072-2/+2
|/ / / / | | | | | | | | | | | | | | | | Fixes wrong scriptPubkey problem, which caused the transaction to not actually be signed.
* | | | Merge pull request #6365Wladimir J. van der Laan2015-07-064-12/+12
|\ \ \ \ | | | | | | | | | | | | | | | 5a7304b Move recently introduced CTransAction::IsEquivalentTo to CWalletTx (Wladimir J. van der Laan)
| * | | | Move recently introduced CTransAction::IsEquivalentTo to CWalletTxWladimir J. van der Laan2015-07-024-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CTransAction::IsEquivalentTo was introduced in #5881. This functionality is only useful to the wallet, and should never have been added to the primitive transaction type.
* | | | | Merge pull request #6335Wladimir J. van der Laan2015-07-0616-214/+250
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | 9238ecb Policy: MOVEONLY: 3 functions to policy.o: (Luke Dashjr) 627b9de Policy: MOVEONLY: Create policy/policy.h with some constants (Jorge Timón)
| * | | | Policy: MOVEONLY: 3 functions to policy.o:Luke Dashjr2015-06-269-184/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - [script/standard.o] IsStandard - [main.o] IsStandardTx - [main.o] AreInputsStandard Also, don't use namespace std in policy.cpp
| * | | | Policy: MOVEONLY: Create policy/policy.h with some constantsJorge Timón2015-06-2612-30/+52
| | | | |
* | | | | Merge pull request #6329Wladimir J. van der Laan2015-07-033-2/+10
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | 0c37634 acceptnonstdtxn option to skip (most) "non-standard transaction" checks, for testnet/regtest only (Luke Dashjr)
| * | | | acceptnonstdtxn option to skip (most) "non-standard transaction" checks, for ↵Luke Dashjr2015-07-033-2/+10
| | | | | | | | | | | | | | | | | | | | testnet/regtest only
* | | | | Adding CSubNet constructor over a single CNetAddrJonas Schnelli2015-07-024-2/+23
| | | | |