Commit Graph

6056 Commits

Author SHA1 Message Date
Darkcoin
f8c907d806 Merge pull request #104 from UdjinM6/110x_dsbalance
add darksend balance to getinfo
2015-01-11 10:56:45 -07:00
UdjinM6
560b06fc38 no need to get conf file in function call 2015-01-11 20:28:28 +03:00
UdjinM6
515841eb1e Merge branch 'v0.11.0.x' of https://github.com/darkcoin/darkcoin into v0.11.0.x 2015-01-11 00:21:21 +03:00
Wladimir J. van der Laan
b8ac476890
gitian: bump revision for OSX qt
Not necessary for windows or linux, as the intermedate build result
doesn't change.
However for OSX on 0.9 the builds for the intermediates are not
deterministic, so this cannot be assessed. Bump the dep version just in
case.
2015-01-10 11:48:02 +01:00
Wladimir J. van der Laan
65a1dda254
doc: Update release process for openssl bump 2015-01-10 11:19:47 +01:00
Wladimir J. van der Laan
60c51f1c38
fail immediately on an empty signature
Github-Pull: #5634
Rebased-From: 8dccba6a45
2015-01-10 08:58:47 +01:00
Wladimir J. van der Laan
f047dfa7df
gitian: openssl-1.0.1i.tar.gz -> openssl-1.0.1k.tar.gz 2015-01-10 08:57:25 +01:00
Cory Fields
b8e81b7ccd
consensus: guard against openssl's new strict DER checks
New versions of OpenSSL will reject non-canonical DER signatures. However,
it'll happily decode them. Decode then re-encode before verification in order
to ensure that it is properly consumed.

Github-Pull: #5634
Rebased-From: 488ed32f2a
2015-01-10 08:31:14 +01:00
Evan Duffield
6814d137fd check ports in masternode.conf 2015-01-09 12:45:41 -07:00
Evan Duffield
c1fde4da39 version bump - 11.4 2015-01-08 15:22:33 -07:00
Evan Duffield
a3416f9441 fixed display issues for Darksend transaction 2015-01-08 15:21:05 -07:00
Evan Duffield
6bd5ec15b3 Unlock coins when using Darksend reset button 2015-01-08 14:16:17 -07:00
Evan Duffield
e73403b5ac Merge branch 'v-1.11.0.x' of https://github.com/darkcoin/darkcoin into v0.11.0.x 2015-01-08 14:11:41 -07:00
Evan Duffield
9ad42576e9 schedule masternode payments to turn on 1/9/2015 2015-01-08 14:11:05 -07:00
UdjinM6
eb7abd8ba7 add darksend balance to getinfo 2015-01-08 21:19:39 +01:00
Darkcoin
4a6d17ef18 Merge pull request #103 from crowning-/patch-3
Non-void function should always return something.
2015-01-08 11:12:37 -07:00
Evan Duffield
caa4fc37af Updated getblocktemplate for mining support 2015-01-08 11:02:10 -07:00
Evan Duffield
3c553cc4a7 Fixed start-many issue with multiple output tx
masternode.conf was broken when any index other than 0 was
used. This fixes it and allows the correct input to be selected
and the masternode to be started successfully.
2015-01-08 09:05:59 -07:00
crowning-
371a16a924 Non-void function should always return something. 2015-01-06 22:05:39 +01:00
Evan Duffield
6df70d30b1 Fixed progress bar / Improve GetDenominatedBalance
- Fixed a few issues when calculating progress including some variables that should be limited to 1 (a and b). GetDenominatedBalance also seemed to be giving bad results so I rewrote it to be cleaner, not sure if that was a part of the problem.
- Progress bar is only recalculated when all inputs in wallet have been confirmed (will stop the progress from jumping around)
2015-01-02 15:20:30 -07:00
vertoe
81a2f6c0ff Version bump. 2015-01-02 22:19:51 +01:00
Evan Duffield
8ab351a594 configure.ac version bump and documentation 2015-01-02 11:45:40 -07:00
Evan Duffield
b5933d165d Merge branch 'v0.11.0.x' of https://github.com/darkcoin/darkcoin into v0.11.0.x 2015-01-02 09:54:31 -07:00
Evan Duffield
12bac4a862 gitian changes, tooltips and version bump 2015-01-02 09:54:13 -07:00
Darkcoin
51a2f6f693 Merge pull request #100 from nightlydarkcoin/v0.11.0.x
typo
2015-01-02 09:29:42 -07:00
Evan Duffield
00ef788f86 Merge branch 'v0.11.0.x' of https://github.com/darkcoin/darkcoin into v0.11.0.x 2015-01-02 09:12:36 -07:00
Holger Schinzel
bac0dc7efa typo 2015-01-02 17:00:04 +01:00
Darkcoin
cfba0c88d8 Merge pull request #99 from nightlydarkcoin/v0.11.0.x
fixed gitian builds
2015-01-02 08:55:42 -07:00
Holger Schinzel
e27cb1a655 revert hotfix 2015-01-02 16:53:08 +01:00
Evan Duffield
58b8f19d2d updated to v2 2015-01-02 08:35:31 -07:00
Darkcoin
ec6877bd18 Merge pull request #98 from vertoe/devel-0.9
Update pixmaps
2015-01-02 08:31:44 -07:00
Holger Schinzel
a9c8f5f18e fixed gitian build 2015-01-02 16:03:27 +01:00
Evan Duffield
899063acf8 Fixed windows crashing issues
Crash was caused by Params() usage in CDarkSendPool::CDarkSendPool upon wallet start. I've moved init of the collateral address outside of the class to CDarkSendPool.InitCollateralAddress() instead.
2015-01-02 07:49:44 -07:00
vertoe
295b7294e6 Update wallet name to Darkcoin 2015-01-02 14:58:25 +01:00
Holger Schinzel
3ea603e537 Merge remote-tracking branch 'remotes/darkcoil/devel-0.9' into v0.11.0.x 2015-01-02 13:48:42 +01:00
Holger Schinzel
9fcd256482 fixed gitian builds 2015-01-02 13:42:55 +01:00
vertoe
f57574172f Update pixmaps 2015-01-02 12:49:11 +01:00
Evan Duffield
4e5cf9919c Merge branch 'v-1.11.0.x' of https://github.com/darkcoin/darkcoin into v0.11.0.x 2015-01-01 13:47:23 -07:00
Evan Duffield
3a6403ae33 Gitian updates 2015-01-01 13:46:35 -07:00
Darkcoin
71a529e78a Merge pull request #95 from crowning-/patch-1
Exclude localnet addresses
2015-01-01 13:32:07 -07:00
crowning-
6a93a7c47b Exclude localnet addresses
127.0.0.* addresses shouldn't show up in "masternode list"
2015-01-01 20:18:23 +01:00
Francis Reynders
bdb50539de Implemented KeePass Integration
More info regarding KeePass: http://keepass.info/

KeePass integration will use KeePassHttp (https://github.com/pfn/keepasshttp/) to facilitate communications between the client and KeePass. KeePassHttp is a plugin for KeePass 2.x and provides a secure means of exposing KeePass entries via HTTP for clients to consume.

The implementation is dependent on the following:
- crypter.h for AES encryption helper functions.
- rpcprotocol.h for handling RPC communications. Could only be used partially however due some static values in the code.
- OpenSSL for base64 encoding. regular util.h libraries were not used for base64 encoding/decoding since they do not use secure allocation.
- JSON Spirit for reading / writing RPC communications

The following changes were made:
- Added CLI options in help
- Added RPC commands: keepass <genkey|init|setpassphrase>
- Added keepass.h and keepass.cpp which hold the integration routines
- Modified rpcwallet.cpp to support RPC commands

The following new options are available for darkcoind and darkcoin-qt:
  -keepass               Use KeePass 2 integration using KeePassHttp plugin (default: 0)
  -keepassport=<port>    Connect to KeePassHttp on port <port> (default: 19455)
  -keepasskey=<key>      KeePassHttp key for AES encrypted communication with KeePass
  -keepassid=<name>      KeePassHttp id for the established association
  -keepassname=<name>    Name to construct url for KeePass entry that stores the wallet passphrase

The following rpc commands are available:
- keepass genkey: generates a base64 encoded 256 bit AES key that can be used for the communication with KeePassHttp. Only necessary for manual configuration. Use init for automatic configuration.
- keepass init: sets up the association between darkcoind and keepass by generating an AES key and sending an association message to KeePassHttp. This will trigger KeePass to ask for an Id for the association. Returns the association and the base64 encoded string for the AES key.
- keepass setpassphrase <passphrase>: updates the passphrase in KeePassHttp to a new value. This should match the passphrase you intend to use for the wallet. Please note that the standard RPC commands walletpassphrasechange and the wallet encrption from the QT GUI already send the updates to KeePassHttp, so this is only necessary for manual manipulation of the password.

Sample initialization flow from darkcoin-qt console (this needs to be done only once to set up the association):
- Have KeePass running with an open database
- Start darkcoin-qt
- Open console
- type: "keepass init" in darkcoin-qt console
- (keepass pops up and asks for an association id, fill that in). Example: mydrkwallet
- response: Association successful. Id: mydrkwalletdarkcoin - Key: AgQkcs6cI7v9tlSYKjG/+s8wJrGALHl3jLosJpPLzUE=
- Edit darkcoin.conf and fill in these values
    keepass=1
    keepasskey=AgQkcs6cI7v9tlSYKjG/+s8wJrGALHl3jLosJpPLzUE=
    keepassid=mydrkwallet
    keepassname=testwallet
- Restart darkcoin-qt

At this point, the association is made. The next action depends on your particular situation:
- current wallet is not yet encrypted. Encrypting the wallet will trigger the integration and stores the password in KeePass (Under the 'KeePassHttp Passwords' group, named after keepassname.
- current wallet is already encrypted: use "keepass setpassphrase <passphrase>" to store the passphrase in KeePass.

At this point, the passphrase is stored in KeePassHttp. When Unlocking the wallet, one can use keepass as the passphrase to trigger retrieval of the password. This works from the RPC commands as well as the GUI.
2015-01-01 20:06:24 +01:00
Darkcoin
9cb9b166a9 Merge pull request #94 from vertoe/devel-0.9
Update release notes for 0.11
2015-01-01 11:18:01 -07:00
Evan Duffield
4eb14d271b Change minversion to 70046 2015-01-01 11:15:24 -07:00
vertoe
9cc07aec1c Hotfix for version.h 2015-01-01 19:03:25 +01:00
vertoe
bb31919f9c Merge branch 'v0.11.0.x' of https://github.com/darkcoin/darkcoin into devel-0.9 2015-01-01 19:02:51 +01:00
Evan Duffield
f46ec0db80 Change minversion to 70046 2015-01-01 10:46:18 -07:00
Evan Duffield
2ad2b57c12 Fix for gitian windows compiling 2015-01-01 09:47:45 -07:00
Evan Duffield
447ae896c0 Merge branch 'v0.11.0.x' of https://github.com/darkcoin/darkcoin into v0.11.0.x 2015-01-01 09:12:53 -07:00
Evan Duffield
b87c2fe9dc Fix for gitian windows compiling 2015-01-01 09:12:28 -07:00