Pieter Wuille
7388b74cd2
Merge pull request #4911
...
611116d
2014-09-16 04:12:52 +02:00
Pieter Wuille
765f398436
Merge pull request #4875
...
f7e3637ec7eb0f
2014-09-16 03:21:21 +02:00
Wladimir J. van der Laan
327dcfece7
Merge pull request #4869
...
6050ab6
2014-09-15 17:25:12 +02:00
Suhas Daftuar
f7e36370f3
Eliminate extra assignment
2014-09-15 09:56:10 -04:00
ENikS
ec91092df8
Fixing compiler warning C4101
...
Github-Pull: #4856
2014-09-15 14:35:32 +02:00
Wladimir J. van der Laan
c362c57568
Merge pull request #4798
...
d920f7d
2014-09-15 10:32:59 +02:00
Pieter Wuille
2ec82e94e6
Merge pull request #4817
...
c26649f
2014-09-15 07:29:04 +02:00
Jeff Garzik
a0a8700bc8
Merge pull request #4909
2014-09-14 19:27:22 -04:00
Philip Kaufmann
611116d4e3
header include cleanup
...
- ensures alphabetical ordering for includes etc. in source file headers
2014-09-14 12:43:56 +02:00
Philip Kaufmann
2d79bba36b
cleanup new script files (no code changes)
...
- add missing header end comments
- ensure alphabetical ordering
- update copyright year and license
2014-09-14 12:25:38 +02:00
Luke Dashjr
a65e320747
bitcoin-util-test: Test bitcoin-tx with null scriptPubKey
2014-09-14 06:28:22 +00:00
Luke Dashjr
15ef1b905b
Bugfix: bitcoin-tx: scriptPubKey may be null, so accept outscript=<n>:
2014-09-14 05:28:41 +00:00
jtimon
6dcfda2dc4
Don't pass nHashType to EvalScript nor CheckSig
2014-09-12 20:04:31 +02:00
jtimon
2b23a87599
Don't pass nHashType to VerifyScript
2014-09-12 20:04:31 +02:00
jtimon
ce3649fb61
Remove CScriptCheck::nHashType (was always 0)
2014-09-12 20:03:03 +02:00
jtimon
358562b651
Remove unused function main:VerifySignature
2014-09-12 20:03:03 +02:00
Pieter Wuille
b9307d2f55
Merge pull request #4876
...
6022b5d
2014-09-12 18:33:02 +02:00
Pieter Wuille
efad808aae
Avoid reject message feedback loops
2014-09-12 17:50:31 +02:00
Wladimir J. van der Laan
3fa1c81b94
Merge pull request #4885
...
aa3c697c74332c
2014-09-11 14:46:27 +02:00
Gavin Andresen
aa3c697e90
Store fewer orphan tx by default, add -maxorphantx option
...
There is no reason to store thousands of orphan transactions;
normally an orphan's parents will either be broadcast or
mined reasonably quickly.
This pull drops the maximum number of orphans from 10,000 down
to 100, and adds a command-line option (-maxorphantx) that is
just like -maxorphanblocks to override the default.
2014-09-10 14:09:40 -04:00
Gavin Andresen
c74332c678
Stricter handling of orphan transactions
...
Prevent denial-of-service attacks by banning
peers that send us invalid orphan transactions
and only storing orphan transactions given to
us by a peer while the peer is connected.
2014-09-10 14:09:40 -04:00
Suhas Daftuar
ec7eb0fa80
When reindexing check for file before trying to open (refactored)
2014-09-10 13:51:53 -04:00
Adam Weiss
e982b574a5
Use explicit fflush() instead of setvbuf()
...
Flushing after every line when printing to console is desirable when
running with systemd but setvbuf() has slightly different semantics
on Windows that causes warnings. Just do an explicit fflush() after
each line print to console instead.
2014-09-10 12:48:13 -04:00
Gavin Andresen
def2fdb4b9
Fix crashing bug caused by orphan(s) with duplicate prevout.hash
2014-09-10 16:53:54 +02:00
Wladimir J. van der Laan
d6af9856b0
Merge pull request #4878
...
540ac45d4168c8
2014-09-10 16:52:57 +02:00
Wladimir J. van der Laan
f23869e14b
Merge pull request #4623
...
e84843c
2014-09-10 15:07:58 +02:00
jtimon
c1e433b717
Rename scriptutils.o to wallet_ismine.o
2014-09-10 12:48:35 +02:00
jtimon
8b59a3d366
Move CAffectedKeysVisitor to wallet.cpp (remove ExtractAffectedKeys)
2014-09-10 12:44:43 +02:00
jtimon
0d2fa14a34
Move scriptutils.o to wallet
2014-09-10 12:42:56 +02:00
Wladimir J. van der Laan
6050ab6855
netbase: Make SOCKS5 negotiation interruptible
...
Avoids that SOCKS5 negotiation will hold up the shutdown process.
- Sockets can stay in non-blocking mode, no need to switch it on/off
anymore
- Adds a timeout (20 seconds) on SOCK5 negotiation. This should be
enough for even Tor to get a connection to a hidden service, and
avoids blocking the opencon thread indefinitely on a hanging proxy.
Fixes #2954 .
2014-09-10 11:33:13 +02:00
Wladimir J. van der Laan
4e8cc3cb86
Merge pull request #4867
...
a95b119
2014-09-10 10:28:47 +02:00
Pieter Wuille
f7cdcb80ab
Merge pull request #4822
...
629d75f
2014-09-10 01:44:30 +02:00
Pieter Wuille
4ebd80298d
Merge pull request #4882
...
faadbe1
2014-09-10 01:37:46 +02:00
Philip Kaufmann
faadbe1733
remove unneeded cast in rpcmisc.cpp
2014-09-09 19:23:29 +02:00
Pieter Wuille
1575c5171f
Merge pull request #4868
...
2c2cc5df7d0a86
2014-09-09 16:43:06 +02:00
Philip Kaufmann
2c2cc5dac1
Remove some unnecessary c_strs() in logging and the GUI
...
Includes `core: remove unneeded c_str() / Qt: replace c_str() with Qt code`
by P. Kaufmann.
2014-09-09 11:31:17 +02:00
Jeff Garzik
540ac4514d
Avoid returning many "inv" orphans
2014-09-09 09:26:52 +02:00
Wladimir J. van der Laan
d4168c82be
Limit CNode::mapAskFor
...
Tighten resource constraints on CNode.
2014-09-09 09:19:15 +02:00
Wladimir J. van der Laan
8bc0a0173e
Merge pull request #4873
...
89d91f6
2014-09-09 09:16:22 +02:00
Pieter Wuille
6022b5dc6b
Make script_{valid,invalid}.json validation flags configurable
2014-09-08 22:38:26 +02:00
jtimon
e088d65acb
Separate script/sign
2014-09-08 20:21:35 +02:00
jtimon
9294a4bbe7
Separate CScriptCompressor
2014-09-08 20:21:35 +02:00
jtimon
c4408a6c85
Separate script/standard
2014-09-08 20:21:35 +02:00
jtimon
da03e6ed7c
Separate script/interpreter
2014-09-08 20:21:33 +02:00
jtimon
cbd22a50c4
Move CScript class and dependencies to script/script
2014-09-08 20:19:31 +02:00
jtimon
86dbeea2cd
Rename script.h/.cpp to scriptutils.h/.cpp (plus remove duplicated includes)
2014-09-08 20:19:31 +02:00
Wladimir J. van der Laan
89d91f6aa7
Avoid repeated lookups in mapOrphanTransactions and mapOrphanTransactionsByPrev
2014-09-08 17:38:43 +02:00
Alex Morcos
c26649f9ed
Track modified size in TxMemPoolEntry so that we can correctly compute priority.
2014-09-08 11:28:46 -04:00
Pieter Wuille
df623d83da
Merge pull request #4865
...
8e44f2e
2014-09-08 15:13:55 +02:00
Wladimir J. van der Laan
f7d0a86bf6
netbase: Use .data() instead of .c_str() on binary string
...
`.c_str()` is only guaranteed to return the data up to the first NUL
character.
2014-09-08 12:20:50 +02:00
Wladimir J. van der Laan
bb4ef1e9dc
Merge pull request #4712
...
80daee0
2014-09-08 12:00:08 +02:00
Wladimir J. van der Laan
297998808a
Merge pull request #4697
...
da2ede2
2014-09-08 11:07:00 +02:00
Wladimir J. van der Laan
a95b1199db
qt: Remove thousands separators after decimal point
...
Revert thousands separators after decimal point, as introduced in #4167 .
2014-09-08 10:46:52 +02:00
Peter Todd
8e44f2e00a
Clarify 'compressed nor uncompressed' error message
2014-09-07 22:32:57 -04:00
Andreas Schildbach
45a4baf100
Add testnet DNS seed of Andreas Schildbach.
...
It runs sipas crawler, but rather than using its custom nameserver implementation it serves a generated zonefile via bind9. The zone always contains 25 IPv4 and 25 IPv6 peers. FWIW, the zone is secured using DNSSEC.
2014-09-07 11:16:10 +02:00
ENikS
8d657a6517
Fixing compiler warning C4800: 'type' forcing value to bool 'true' or 'false'
2014-09-06 15:59:59 -04:00
Pieter Wuille
93193c8ffd
Merge pull request #4851
...
41ef558
2014-09-06 21:10:13 +02:00
Wladimir J. van der Laan
6eb427ed6e
Merge pull request #4839
...
346193b
2014-09-06 11:05:50 +02:00
R E Broadley
346193bd93
Cleanup messy error messages
2014-09-06 14:18:32 +07:00
Pieter Wuille
0c558288cb
Merge pull request #4849
...
a264e44
2014-09-05 22:54:03 +02:00
Wladimir J. van der Laan
41ef558aa9
univalue: make spaceStr thread-safe
...
Simply add spaces to the existing string instead of using a
temporary.
Fixes #4756 .
2014-09-05 14:42:22 +02:00
Philip Kaufmann
2605b94d73
[Qt] update form files for setting autoDefault explicitly to false
...
- also fixes indentation in one file (auto fixed by Qt Designer)
- removes several default parameters, which are not needed in the files
- related to #4840 (but not intended as fix for a no-bug)
2014-09-05 13:54:16 +02:00
Teran McKinney
f79323b0dd
Improve readability of CAddrInfo::IsTerrible
...
- Replaced 86400 with 24*60*60
- Remove references to specific timespans in comments
Github-Pull: #4724
2014-09-05 13:49:08 +02:00
Philip Kaufmann
1ffb99b07f
[Qt] copyright, style and indentation cleanup of Qt tests
2014-09-05 13:23:21 +02:00
Philip Kaufmann
a264e445ff
remove dup include of foreach.hpp in script.cpp
2014-09-05 09:49:57 +02:00
Pieter Wuille
af9c3b0cff
Merge pull request #4838
...
1e4f87f8a41e1e145d5bea0dbe43
2014-09-04 23:49:35 +02:00
Wladimir J. van der Laan
b4cd0975fb
Merge pull request #4783
...
fbe0fca
2014-09-04 16:44:39 +02:00
Wladimir J. van der Laan
65b529ba93
Merge pull request #4833
...
bbda402
2014-09-04 13:31:15 +02:00
Wladimir J. van der Laan
f2cc1ee439
Merge pull request #4790
...
9189f5f
2014-09-04 13:30:34 +02:00
Pieter Wuille
1e4f87f5a1
Use memcmp for uint256 equality/inequality
2014-09-04 02:27:04 +02:00
Pieter Wuille
8a41e1edd4
Use boost::unordered_map for mapBlockIndex
2014-09-04 02:05:20 +02:00
Pieter Wuille
145d5be896
Introduce BlockMap type for mapBlockIndex
2014-09-04 02:04:51 +02:00
Pieter Wuille
a0dbe433bd
checkpoints.cpp depends on main, it can use mapBlockIndex directly
2014-09-04 02:01:10 +02:00
Pieter Wuille
961c4a04c2
Merge pull request #4808
...
3f6540a47eb765
2014-09-03 21:01:39 +02:00
Pieter Wuille
52c1deb745
Merge pull request #4820
...
910526d
2014-09-03 20:50:57 +02:00
Pieter Wuille
629d75faac
Combine CCoinsViewCache's HaveCoins and const GetCoins into AccessCoins.
...
The efficient version of CCoinsViewCache::GetCoins only works for known-to-exist
cache entries, requiring a separate HaveCoins call beforehand. This is
inefficient as both perform a hashtable lookup.
Replace the non-mutable GetCoins with AccessCoins, which returns a potentially-NULL
pointer. This also decreases the overloading of GetCoins.
Also replace some copying (inefficient) GetCoins calls with equivalent AccessCoins,
decreasing the copying.
2014-09-03 14:24:52 +02:00
Wladimir J. van der Laan
bbda40226b
net: Remove MilliSleep from StopNode
...
I don't understand why it would be there in the first place. This looks
like voodoo, not programming.
2014-09-03 12:23:34 +02:00
Matt Corallo
550d4fa7a7
Remove DNS Seeds run by entities which were never well-established.
2014-09-03 00:41:54 -07:00
phantomcircuit
9189f5fe4d
remove useless millisleep
...
reduces time to service requests improving performance
2014-09-02 21:25:53 -07:00
Pieter Wuille
910526d848
Use OR of respective block flags for masks
2014-09-02 18:57:43 +02:00
Pieter Wuille
b8d92236f6
Merge pull request #4812
...
53efb098d5e510
2014-09-02 15:11:55 +02:00
Pieter Wuille
3f6540ad8f
Rename IMPLEMENT_SERIALIZE to ADD_SERIALIZE_METHODS
2014-09-02 09:58:09 +02:00
jtimon
53efb09e4c
Discover some missing includes
2014-09-02 02:27:03 +02:00
jtimon
8d5e5102f6
Remove unused function StackString() and class CCoins;
2014-09-02 02:27:03 +02:00
ENikS
c0f5d4aba5
Fixing Compiler Error C2466
2014-09-01 19:51:25 -04:00
Pieter Wuille
47eb76597e
Serializer simplifications after IMPLEMENT_SERIALIZE overhaul
2014-09-01 22:00:19 +02:00
Pieter Wuille
2e731f24b5
Merge pull request #4737
...
31e9a8384881f85d96b4a3d796f8
2014-09-01 21:23:01 +02:00
Wladimir J. van der Laan
f6a8105037
Merge pull request #4779
...
093303a
2014-09-01 15:35:09 +02:00
Wladimir J. van der Laan
107922663b
Merge pull request #4767
...
b144a74f6281279f7f504
2014-09-01 10:28:33 +02:00
Wladimir J. van der Laan
01113f7b43
Merge pull request #4780
...
4d04492
2014-09-01 10:26:48 +02:00
Wladimir J. van der Laan
6f5d33b3d2
Update translations after update script improvements
2014-09-01 10:10:21 +02:00
Wladimir J. van der Laan
93f97aab62
Merge pull request #4768
...
2e28031
2014-09-01 09:42:10 +02:00
Cozz Lovan
d920f7dcf8
Move g_signals.SetBestChain(..) below SyncWithWallets
2014-08-31 16:17:39 +02:00
Pieter Wuille
31e9a8384a
Use CSizeComputer to avoid counting sizes in SerializationOp
2014-08-31 02:18:42 +02:00
Kamil Domanski
84881f8c47
rework overhauled serialization methods to non-static
...
Thanks to Pieter Wuille for most of the work on this commit.
I did not fixup the overhaul commit, because a rebase conflicted
with "remove fields of ser_streamplaceholder".
I prefer not to risk making a mistake while resolving it.
2014-08-31 02:16:17 +02:00
Kamil Domanski
5d96b4ae01
remove fields of ser_streamplaceholder
...
The nType and nVersion fields of stream objects are never accessed
from outside the class (or perhaps from the inside too, I haven't checked).
Thus no need to have them in a placeholder, whose only purpose is to
fill the "Stream" template parameter in serialization implementation.
2014-08-31 02:16:10 +02:00
Kamil Domanski
3d796f8996
overhaul serialization code
...
The implementation of each class' serialization/deserialization is no longer
passed within a macro. The implementation now lies within a template of form:
template <typename T, typename Stream, typename Operation>
inline static size_t SerializationOp(T thisPtr, Stream& s, Operation ser_action, int nType, int nVersion) {
size_t nSerSize = 0;
/* CODE */
return nSerSize;
}
In cases when codepath should depend on whether or not we are just deserializing
(old fGetSize, fWrite, fRead flags) an additional clause can be used:
bool fRead = boost::is_same<Operation, CSerActionUnserialize>();
The IMPLEMENT_SERIALIZE macro will now be a freestanding clause added within
class' body (similiar to Qt's Q_OBJECT) to implement GetSerializeSize,
Serialize and Unserialize. These are now wrappers around
the "SerializationOp" template.
2014-08-31 02:14:20 +02:00
Daniel Kraft
4b0deb3b2d
Clean up CMerkleTx::SetMerkleBranch.
...
The case SetMerkleBranch(NULL) was never actually used, and thus the
involved code (loading the block from disk) can be removed and the
implementation simplified.
2014-08-30 18:00:55 +02:00
Ross Nicoll
e84843c0db
Broken addresses on command line no longer trigger testnet.
...
When passing a bitcoin: URI on the command line, invalid addresses do not incorrectly send the
user to the test network.
2014-08-30 09:39:59 +01:00
Kamil Domanski
9f3d476779
changed field types in some structures to equivalent unambiguous types
...
Conflicts:
src/core.cpp
Rebased-By: Wladimir J. van der Laan
Github-Pull: #4180
2014-08-30 06:27:34 +02:00
