DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
7,071 Commits 6 Branches 7 Tags
6d3ab8564c3d4cd03e3f193d9029a4e271131edc
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wladimir J. van der Laan 6d3ab8564c qt: English translation update after 0a08aa8 2014-10-21 14:55:45 +02:00
Wladimir J. van der Laan 5f3ea3362a Merge pull request #5076 
c0195b1 Bugfix: Remove default from -zapwallettxes description (inaccurate) (Luke Dashjr)
0a08aa8 Parameterise command line option defaults, so translations are independent of them (Luke Dashjr)
 2014-10-21 14:53:55 +02:00
Wladimir J. van der Laan b88cb1a96e Merge pull request #5105 
a96d113 Rename CWalletInterface to CValidationInterface (Pieter Wuille)
 2014-10-21 11:56:10 +02:00
Wladimir J. van der Laan d0b19b5805 Merge pull request #5098 
1d66bbc Add buildenv.py to gitignore (Michael Ford)
 2014-10-21 11:28:54 +02:00
Wladimir J. van der Laan 64ffc995d6 Merge pull request #5095 
d4746d5 Add a SECURE style flag for ThreadSafeMessageBox, which indicates that the message contains sensitive information. This keeps the message from being output to the debug log by bitcoind. Fixes a possible security risk when starting bitcoind in server mode without the 'rpcpassword' option configured, resulting in the "suggested" password being output to the debug log. (Mark Friedenbach)
 2014-10-20 11:36:40 +02:00
Wladimir J. van der Laan 84d13eef88 Merge pull request #4468 
e11b2ce Fix large reorgs (Pieter Wuille)
afc32c5 Fix rebuild-chainstate feature and improve its performance (Pieter Wuille)
16d5194 Skip reindexed blocks individually (Pieter Wuille)
ad96e7c Make -reindex cope with out-of-order blocks (Wladimir J. van der Laan)
e17bd58 Rename setBlockIndexValid to setBlockIndexCandidates (Pieter Wuille)
1af838b Add height to "Requesting block" debug (R E Broadley)
1bcee67 Better logging of stalling (R E Broadley)
4c93322 Improve getheaders (sending) logging (R E Broadley)
f244c99 Remove CheckMinWork, as we always know all parent headers (Pieter Wuille)
ad6e601 RPC additions after headers-first (Pieter Wuille)
341735e Headers-first synchronization (Pieter Wuille)
 2014-10-17 12:30:54 +02:00
Wladimir J. van der Laan 8e9a665f55 doc: Add historical release notes for 0.9.3 2014-10-17 11:13:35 +02:00
Wladimir J. van der Laan 971a3b46a3 Merge pull request #5092 
6f155bd Add LIBTOOLFLAGS CXX tag to qt makefile include (Michael Ford)
 2014-10-17 10:24:56 +02:00
Wladimir J. van der Laan 494ff05a4c Merge pull request #4804 from jtimon/chainparams3 
Remove CBaseChainParams::NetworkID()
 2014-10-17 08:47:11 +02:00
Wladimir J. van der Laan ad96e7ccd9 Make -reindex cope with out-of-order blocks 
Remember out-of-order block headers along with disk positions. This is
likely the simplest and least-impact way to make -reindex work with
headers first.

Based on top of #4468.
 2014-10-14 15:42:01 -07:00
Wladimir J. van der Laan 992ab87114 Merge pull request #4942 
9406471 Write fee estimate and peers files only when initialized (Wladimir J. van der Laan)
 2014-10-14 11:35:17 +02:00
Wladimir J. van der Laan 2e4f6127bf Merge pull request #5074 
005b5af rpc-tests: don't spew non-errors to stdout (Cory Fields)
 2014-10-14 10:50:22 +02:00
Wladimir J. van der Laan d7e1950483 Merge pull request #4937 
ccca27a [Wallet] Watch-only fixes (Cozz Lovan)
 2014-10-13 13:57:07 +02:00
Wladimir J. van der Laan f98bd4eae1 Merge pull request #5073 
d5fd094 build: fix qt test build when libprotobuf is in a non-standard path (Cory Fields)
a7d1f03 build: fix dynamic boost check when --with-boost= is used (Cory Fields)
 2014-10-11 10:48:35 +02:00
Wladimir J. van der Laan 023690c0f2 Merge pull request #4802 
6fd546d Remove CChainParams::NetworkID() (jtimon)
cc97210 Add fTestnetToBeDeprecatedFieldRPC to CChainParams (jtimon)
e11712d Move checkpoint data selection to chainparams (jtimon)
6de50c3 qt: add network-specific style object (Wladimir J. van der Laan)
 2014-10-10 11:56:58 +02:00
Wladimir J. van der Laan 6de50c3c9a qt: add network-specific style object 
Mainly cleanups: Gets rid of isTestNet everywhere, by keeping track
of network-specific theming in a central place.

Also makes GUI no longer dependent on the network ID enumeration, which
alleviates concerns about #4802.
 2014-10-10 11:00:59 +02:00
Wladimir J. van der Laan 11d486d23f Merge pull request #5072 
caecb42 Travis: Descriptive build names (Luke Dashjr)
 2014-10-10 08:30:09 +02:00
Wladimir J. van der Laan fe36e031cd Merge pull request #5032 
4bd1185 Qt: allow "emergency" shutdown during startup (Philip Kaufmann)
 2014-10-09 18:10:29 +02:00
Wladimir J. van der Laan 97a34c28d5 Merge pull request #5051 
aedc74d contrib: make linearize-data.py cope with out-of-order blocks (Wladimir J. van der Laan)
 2014-10-08 09:47:41 +02:00
Wladimir J. van der Laan 6860a55ea0 Merge pull request #4979 
de10efd add -timeout default as constant and use them (Philip Kaufmann)
 2014-10-08 09:16:19 +02:00
Wladimir J. van der Laan ad9cd64d3b Merge pull request #5055 
2c930d9 Prettify JSON tests and minimize diffs (Pieter Wuille)
 2014-10-08 09:12:39 +02:00
Wladimir J. van der Laan fb5fa86bb4 Merge pull request #5050 
772ab0e contrib: use batched JSON-RPC in linarize-hashes (Wladimir J. van der Laan)
 2014-10-08 08:54:18 +02:00
Wladimir J. van der Laan 7c6cbff0e5 Merge pull request #4976 
27c3e91 qt: add proxy to options overridden if necessary. (Cory Fields)
 2014-10-07 12:33:45 +02:00
Wladimir J. van der Laan 2b5261c636 Merge pull request #5041 
1f9be98 Disable App Nap on OSX 10.9+ (Michael Ford)
 2014-10-07 10:17:55 +02:00
Wladimir J. van der Laan 3eaa9462f8 Merge pull request #5047 
3e61eb9 minor txindex documentation improvement (Cozz Lovan)
 2014-10-07 10:17:05 +02:00
Wladimir J. van der Laan cd3269e38e contrib: revert changes to github-merge.sh in #5038 2014-10-07 10:00:12 +02:00
Wladimir J. van der Laan ca067dc937 Merge pull request #5053 
27368e7 Homebrew lang fix (Dominyk Tiller)
 2014-10-07 09:58:21 +02:00
Wladimir J. van der Laan d4b571a5d3 Merge pull request #5038 
0b17964 Bugfix: Replace bashisms with standard sh in tests/tools (Luke Dashjr)
ab72068 Bugfix: Replace bashisms with standard sh in gitian descriptors (Luke Dashjr)
b77b4ed Bugfix: Replace bashisms with standard sh to fix build on non-BASH systems (Luke Dashjr)
d6b0539 travis: add non-default shell testing to travis. (Cory Fields)
 2014-10-07 08:53:07 +02:00
Wladimir J. van der Laan 953f16cb4e Merge pull request #4954 
9d7cd4c Don't return an address for invalid pubkeys (Andy Alness)
 2014-10-07 08:51:20 +02:00
Wladimir J. van der Laan aedc74dfa6 contrib: make linearize-data.py cope with out-of-order blocks 
Make it possible to read blocks in any order. This will be required
after headers-first (#4468), so should be merged before that.

- Read block header. For expected blocks, continue, else skip.
- For in-order blocks: copy block contents directly. Write prior
  out-of-order blocks if this connects a consecutive span.
- For out-of-order blocks, store extents of block data for later
  retrieval. Cache out-of-order blocks in memory up to 100MB
  (configurable).
 2014-10-06 18:30:12 +02:00
Wladimir J. van der Laan 772ab0ea98 contrib: use batched JSON-RPC in linarize-hashes 
Batch up to 10000 requests for a ~30x speedup.
 2014-10-06 13:27:13 +02:00
Wladimir J. van der Laan 5505a1b13f Merge pull request #5036 
eb6b3b2 Update English translation (Wladimir J. van der Laan)
b9b2e3f Don't translate state.Abort() messages (Wladimir J. van der Laan)
 2014-10-06 04:42:09 +02:00
Wladimir J. van der Laan 5f1aee066a Merge pull request #4890 
e790c37 Replace SCRIPT_VERIFY_NOCACHE by flag directly to checker (Pieter Wuille)
5c1e798 Make signature cache optional (Pieter Wuille)
c7829ea Abstract out SignatureChecker (Pieter Wuille)
 2014-10-06 04:39:17 +02:00
Wladimir J. van der Laan 5bf029603c Merge pull request #5035 
c9c51cb Make comptool more deterministic (Matt Corallo)
 2014-10-04 08:51:56 +02:00
Wladimir J. van der Laan cd91ed4f5f Merge pull request #4982 
b5ec5fe update getnetworkinfo help with subversion (Philip Kaufmann)
 2014-10-03 15:27:58 +02:00
Wladimir J. van der Laan 29f96e8bc6 Merge pull request #4994 
54510f2 DRY: Avoid repetitions in script_test (jtimon)
 2014-10-02 22:41:54 +02:00
Wladimir J. van der Laan 0e64566a82 Merge pull request #4978 
938bcce CAutoFile: make file private (Philip Kaufmann)
0c35486 CBufferedFile: add explicit close function (Philip Kaufmann)
c9fb27d CBufferedFile: convert into a non-refcounted RAII wrapper (Philip Kaufmann)
 2014-10-02 22:35:36 +02:00
Wladimir J. van der Laan eb6b3b245c Update English translation 2014-10-02 22:20:23 +02:00
Wladimir J. van der Laan b9b2e3fabd Don't translate state.Abort() messages 
There is only one message passed to AbortNode() that makes sense to
translate to the user specifically: Disk space is low. For the others
show a generic message and refer to debug.log for details.

Reduces the number of confusing jargon translation messages.
 2014-10-02 22:20:16 +02:00
Wladimir J. van der Laan 6faee79426 Merge pull request #5034 
609adc7 depends: disable unused bdb replication manager. Fixes new mingw builds (Cory Fields)
 2014-10-02 20:00:59 +02:00
Wladimir J. van der Laan 20a4b69360 Merge pull request #4985 
bc470c4 Changed mixed indentation to four spaces (Eric Shaw)
31d6390 Fixed setaccount accepting foreign address (Eric Shaw)
 2014-10-02 19:31:50 +02:00
Wladimir J. van der Laan 45c41c05a0 Merge pull request #5030 
fbd36d8 Avoid introducing a virtual into CChainParams (Wladimir J. van der Laan)
f0fd00c Switch testing framework from MAIN to new UNITTEST network (SergioDemianLerner)
 2014-10-02 15:28:27 +02:00
Wladimir J. van der Laan fbd36d8fb5 Avoid introducing a virtual into CChainParams 
Treat fSkipProofOfWorkCheck the same as other parameters.
 2014-10-02 13:54:26 +02:00
Wladimir J. van der Laan 2dc37e7a49 Merge pull request #4991 
0dcb0a5 doc: Add instructions for consistent Mac OS X build names (Saivann)
 2014-10-02 12:07:13 +02:00
Wladimir J. van der Laan b76a767906 Merge pull request #5031 
e2efdf3 amount.h: update license, add header end comment + rem from util.h (Philip Kaufmann)
 2014-10-02 11:48:38 +02:00
Wladimir J. van der Laan 8d132431b4 Revert merge of pull #4845 
It breaks the new mingw tests!

See

- https://travis-ci.org/bitcoin/bitcoin/jobs/36845581
- https://travis-ci.org/bitcoin/bitcoin/jobs/36845582

This reverts commit 4705902777, 5e2e7fcb99, a25fd6be13.
 2014-10-02 10:39:55 +02:00
Wladimir J. van der Laan ad51e14583 Merge pull request #4845 
4705902 Avoid introducing a virtual into CChainParams (Wladimir J. van der Laan)
5e2e7fc Suggested corrections on comments, variable names. Also new test case testing the PoW skip in UNITTEST. (SergioDemianLerner)
a25fd6b Switch testing framework from MAIN to new UNITTEST network (SergioDemianLerner)
 2014-10-02 09:47:54 +02:00
Wladimir J. van der Laan 3b390723c1 Merge pull request #5025 
5ad450a travis: If the comparison-tool fails, dump the tail of the debug log (Cory Fields)
 2014-10-02 09:08:33 +02:00
Wladimir J. van der Laan 00eef5d6e9 Merge pull request #5017 
f74fc9b Print input index when signature validation fails, to aid debugging. (Mark Friedenbach)
217a5c9 When transaction outputs exceed inputs, show the offending amounts so as to aid debugging. (Mark Friedenbach)
 2014-10-02 08:44:08 +02:00
Wladimir J. van der Laan 90aa73e900 Merge pull request #5027 
0f78a0a Upgrade comparison tool further (Pieter Wuille)
 2014-10-02 08:29:23 +02:00
Wladimir J. van der Laan 1fbccda8d0 Merge pull request #4940 
62e5f8f CMessageHeader sanity changes (Wladimir J. van der Laan)
 2014-10-01 13:28:16 +02:00
Wladimir J. van der Laan a41943df58 Merge pull request #5023 
e9f3fa7 travis: enable windows tests (Cory Fields)
 2014-10-01 13:21:32 +02:00
Wladimir J. van der Laan a419f82670 Merge pull request #5022 
c375b5c remove dead/unused code in walletdb.cpp (Philip Kaufmann)
 2014-10-01 12:56:11 +02:00
Wladimir J. van der Laan 3fd192f8b4 Merge pull request #4234 
c122f55 qt: Register CAmount metatype (Wladimir J. van der Laan)
a372168 Use a typedef for monetary values (Mark Friedenbach)
 2014-10-01 11:28:55 +02:00
Wladimir J. van der Laan c122f5528c qt: Register CAmount metatype 
This allows sending the type over queued connections.
Also normalize signal/slot names.
 2014-10-01 11:06:41 +02:00
Wladimir J. van der Laan b25551101c Merge pull request #5008 
41020eb Fix formatting in  init.md (Whit J)
 2014-10-01 09:07:42 +02:00
Wladimir J. van der Laan 437634a79e Merge pull request #5005 
af0bd5e osx: fix signing to make Gatekeeper happy (again) (Cory Fields)
 2014-10-01 09:00:45 +02:00
Wladimir J. van der Laan 211d2939fd Merge pull request #5018 
347a3a3 Update build-unix.md (JL2035)
 2014-10-01 08:56:53 +02:00
Wladimir J. van der Laan a6f3e9d843 Merge pull request #5014 
41d67c7 tests: fix python test-runner for windows (Cory Fields)
 2014-10-01 08:55:34 +02:00
Wladimir J. van der Laan 28fb5f388d doc: update gpg command line for SHA256SUMS.asc in release process 2014-09-29 16:58:49 +02:00
Wladimir J. van der Laan 4705902777 Avoid introducing a virtual into CChainParams 
Treat fSkipProofOfWorkCheck the same as other parameters.
 2014-09-29 13:13:47 +02:00
Wladimir J. van der Laan 41150d601d Merge pull request #4970 
93e24dd travis: use debug for one build (Cory Fields)
be6d87a script: don't read past the end (Cory Fields)
a94496f tests: don't split an empty string (Cory Fields)
00522cd depends: disable reduced exports for debug builds (Cory Fields)
1f7fff2 depends: add docs for debug (Cory Fields)
dc66ff5 depends: make LDFLAGS act like the other flags (Cory Fields)
b1efba8 depends: give miniupnpc cppflags (Cory Fields)
1d154db depends: teach qt to honor debug/release (Cory Fields)
3b63df5 depends: boost: build for debug or release as requested (Cory Fields)
7e99df7 depends: make sure openssl sees cppflags (Cory Fields)
f397304 depends: add debug/release flags for linux/osx/win (Cory Fields)
2027ad3 depends: add the debug/release concept to depends (Cory Fields)
 2014-09-29 09:36:54 +02:00
Wladimir J. van der Laan 76182e7cb6 Merge pull request #4999 
775b7b8 LLu is standard, but not portable. use ULL (sinetek)
 2014-09-29 09:35:47 +02:00
Wladimir J. van der Laan a38eaea082 doc: Update SHA256SUMS.asc step in release-process.md 
- The Hash: header is prepended by gpg, and states the hashing used by
  gpg, not what is used to hash the files

- Add more detailed steps
 2014-09-27 15:58:55 +02:00
Wladimir J. van der Laan 2c45f49cde Merge pull request #4987 
0866948 Add 0.9.3 and fix control (Matt Corallo)
 2014-09-27 15:47:24 +02:00
Wladimir J. van der Laan 4b2b78b9f2 Merge pull request #4969 
cda45b5 Reinitializing list's begin iterator after few elements were erased from the head (ENikS)
 2014-09-25 15:58:56 +02:00
Wladimir J. van der Laan f66f986a25 Merge pull request #4823 
1e73504 Fixing C4146 warning (ENikS)
 2014-09-25 15:25:32 +02:00
Wladimir J. van der Laan d14d7deff0 SanitizeString: allow '(' and ')' 
'(' and ')' are valid in user agent strings, so should be reported
as such in RPC `getpeerinfo`.

Fixes #4537.
 2014-09-25 12:45:46 +02:00
Wladimir J. van der Laan b50e5fe099 Merge pull request #4968 
219372f script: Fix reference into empty vector run time exception (ENikS)
 2014-09-25 11:48:33 +02:00
Wladimir J. van der Laan 375cb4c253 Merge pull request #4959 
bb26e2c [Qt] minor changes in splashscreen.cpp (Philip Kaufmann)
 2014-09-25 11:31:53 +02:00
Wladimir J. van der Laan 8152f4efd8 Merge pull request #4967 
459a2d2 Avoiding referencing elements of an empty vector (ENikS)
 2014-09-25 11:31:10 +02:00
Wladimir J. van der Laan 82e370b4b0 Merge pull request #4782 
2e5361b remove code below asserts in limitedmap.h (fixes a ToDo) (Philip Kaufmann)
 2014-09-25 11:21:43 +02:00
Wladimir J. van der Laan 35e5b5329a Merge pull request #4946 
c65cc8c build: fix release name strings for gitian builds (Cory Fields)
 2014-09-25 10:54:54 +02:00
Wladimir J. van der Laan 29a9d4483e Merge pull request #4966 
c8063b5 Fixing out of bounds asses error (ENikS)
 2014-09-25 10:21:01 +02:00
Wladimir J. van der Laan 58d4b23284 Merge pull request #4914 
ff36cbe RPC getnetworkinfo: export local node's client sub-version string (Jeff Garzik)
 2014-09-25 10:17:29 +02:00
Wladimir J. van der Laan c4998661e4 Merge pull request #4958 
e6beedc [Qt] add more NULL pointer checks in bitcoingui (Philip Kaufmann)
 2014-09-25 09:47:01 +02:00
Wladimir J. van der Laan 35ee2dac67 Merge pull request #4949 
c8589bf Add actual signature tests (Pieter Wuille)
76ec867 Use actually valid transactions for script tests (Pieter Wuille)
 2014-09-23 13:14:19 +02:00
Wladimir J. van der Laan bfe527ea86 Merge pull request #4962 
6f3ae9b Fixing out of bounds error in GetKey() (ENikS)
 2014-09-23 10:53:05 +02:00
Wladimir J. van der Laan cb9871194a Merge pull request #4765 
e2a98d2 Update obsolete AC macros. (randy-waterhouse)
e543811 Add warnings for autogen.sh. Fix AC_CONFIG_SRCDIR. (randy-waterhouse)
 2014-09-22 18:31:00 +02:00
Wladimir J. van der Laan 27fc5277f7 build: change cdrkit location in build-process.md 
The cdrkit.org domain expired.
Thanks to gdm85 on IRC for reporting this.
 2014-09-22 16:40:49 +02:00
Wladimir J. van der Laan 3cdae61aa2 Merge pull request #4787 
4b0deb3 Clean up CMerkleTx::SetMerkleBranch. (Daniel Kraft)
 2014-09-22 14:18:54 +02:00
Wladimir J. van der Laan 565da68ed0 Merge pull request #4852 
5e83bc4 [Qt] include and file header cleanup (Philip Kaufmann)
 2014-09-22 12:20:36 +02:00
Wladimir J. van der Laan 321fd7dbee Merge pull request #4947 
6134b43 Fixing condition 'sabotaging' MSVC build (ENikS)
 2014-09-22 10:34:12 +02:00
Wladimir J. van der Laan aa340a8f07 Merge pull request #4951 
d6712db Also create pid file in non-daemon mode (Wladimir J. van der Laan)
 2014-09-22 10:32:21 +02:00
Wladimir J. van der Laan cfc5cfb0f0 qt: Make splash and shutdown window ignore close events 
It's strange to be able to close these windows while there is work
in progress.

Also set Qt::WA_DeleteOnClose on both windows to make sure that they
are deleted eventually, no matter what happens.
 2014-09-22 10:13:52 +02:00
Wladimir J. van der Laan 6b09bc45b1 Merge pull request #4941 
a49f11d qt: Change splash screen to normal window (Wladimir J. van der Laan)
 2014-09-22 09:33:34 +02:00
Wladimir J. van der Laan 5547f08ec7 Merge pull request #4952 
01c2807 Add warning about the merkle-tree algorithm duplicate txid flaw (Peter Todd)
 2014-09-22 09:03:59 +02:00
Wladimir J. van der Laan ae9966ed85 Merge pull request #4950 
33a2771 test: Fix DoS tests after c74332c (Wladimir J. van der Laan)
 2014-09-21 21:25:25 +02:00
Wladimir J. van der Laan d6712db354 Also create pid file in non-daemon mode 
Always make a pid file, not only when `-daemon` specified.

This is useful for troubleshooting, for attaching debuggers and loggers
and such.

- Write the pid file only after the datadir lock was acquired
- Don't create or remove a pid file on WIN32, and also don't show the option
 2014-09-20 11:03:59 +02:00
Wladimir J. van der Laan 33a27716fc test: Fix DoS tests after c74332c 
Fix data structure mismatch ... The mind boggles that they were still passing at all.
 2014-09-20 09:55:14 +02:00
Wladimir J. van der Laan 94064710b9 Write fee estimate and peers files only when initialized 
Fixes #4669.

Move the loading of addresses to StartNode() to make it more
self-contained.
 2014-09-18 14:20:18 +02:00
Wladimir J. van der Laan a49f11d9ed qt: Change splash screen to normal window 
Makes it possible to move, minimize, unminimize the window while
Bitcoin Core is initializing.
 2014-09-18 13:21:26 +02:00
Wladimir J. van der Laan 7fd8813675 Merge pull request #4667 
bbad683 [Qt] simplify return code and return values in txtablemodel (Philip Kaufmann)
21f1516 [Qt] add all used colors in txtablemodel to guiconstants (Philip Kaufmann)
 2014-09-18 12:08:46 +02:00
Wladimir J. van der Laan 0db24bf5c3 Merge pull request #4939 
d547ebf Remove mention of MacPorts from OSX build docs (Wladimir J. van der Laan)
 2014-09-18 11:50:28 +02:00
Wladimir J. van der Laan 62e5f8f961 CMessageHeader sanity changes 
- Remove spurious `pchCommand[1] = 1` in CMessageHeader()
- Make sure that pchCommand is zero-padded if length is shorter than
  COMMAND_SIZE
- Use strnlen to determine length of pcmCommand in GetCommand
 2014-09-18 10:15:48 +02:00
Wladimir J. van der Laan d547ebf56e Remove mention of MacPorts from OSX build docs 2014-09-18 10:12:08 +02:00
Wladimir J. van der Laan c14bfea8ee Merge pull request #4936 
c15e483 typo fix of booleamn to boolean (imharrywu)
 2014-09-18 09:50:21 +02:00
Wladimir J. van der Laan e9870c5ed4 Merge pull request #4931 
93f84d0 cleanup class private and public areas in walletdb (Philip Kaufmann)
22d7e70 prefer const string& over char* in CDB and CWalletDB constructor (Philip Kaufmann)
 2014-09-18 09:39:11 +02:00
Wladimir J. van der Laan 438c7e4cd2 Merge pull request #4555 
6dcfda2 Don't pass nHashType to EvalScript nor CheckSig (jtimon)
2b23a87 Don't pass nHashType to VerifyScript (jtimon)
ce3649fb Remove CScriptCheck::nHashType (was always 0) (jtimon)
358562b Remove unused function main:VerifySignature (jtimon)
 2014-09-17 13:44:22 +02:00
Wladimir J. van der Laan 5b9d1e10a8 Merge pull request #4863 
1a61396 fix missing gettransaction entries in rpcclient (Benedict Chan)
57e1716 update rpc help message for gettransaction to add includeWatchonly param (Benedict Chan)
 2014-09-17 13:05:41 +02:00