Update strings.

This commit is contained in:
vertoe 2014-12-09 23:19:26 +01:00
parent 8003eb484e
commit 828b6d38a1
10 changed files with 35 additions and 19 deletions

10
.gitignore vendored
View File

@ -6,6 +6,11 @@ src/bitcoind
src/bitcoin-cli src/bitcoin-cli
src/test/test_bitcoin src/test/test_bitcoin
src/qt/test/test_bitcoin-qt src/qt/test/test_bitcoin-qt
src/darkcoin
src/darkcoind
src/darkcoin-cli
src/test/test_darkcoin
src/qt/test/test_darkcoin-qt
Makefile.in Makefile.in
aclocal.m4 aclocal.m4
@ -37,6 +42,7 @@ src/qt/test/moc*.cpp
*.o-* *.o-*
*.patch *.patch
.bitcoin .bitcoin
.darkcoin
*.a *.a
*.pb.cc *.pb.cc
*.pb.h *.pb.h
@ -52,11 +58,14 @@ src/qt/test/moc*.cpp
*.qm *.qm
Makefile Makefile
bitcoin-qt bitcoin-qt
darkcoin-qt
Bitcoin-Qt.app Bitcoin-Qt.app
Darkcoin-Qt.app
# Unit-tests # Unit-tests
Makefile.test Makefile.test
bitcoin-qt_test bitcoin-qt_test
darkcoin-qt_test
# Resources cpp # Resources cpp
qrc_*.cpp qrc_*.cpp
@ -72,6 +81,7 @@ build
*.gcno *.gcno
/*.info /*.info
test_bitcoin.coverage/ test_bitcoin.coverage/
test_darkcoin.coverage/
total.coverage/ total.coverage/
coverage_percent.txt coverage_percent.txt

22
TODO.md
View File

@ -29,16 +29,22 @@ DONE:
MANDATORY: MANDATORY:
---------- ----------
- Fix mining protocol to include correct pow and masternodes - Check rpcminer (should be working though)
- Add masternode payment checks a.k.a. enforcement (based on blockheight)
OPTIONAL: BUGS:
--------- -----
- Include Evan's public key for msg signing - Daemon and CLI tool can't connect to testnet/regtest instances (wrong port?)
- Darksend, Instant Transactions, Atomic Transfers, etc. pp. - Daemon and CLI tool can't authenticate via RPC (uh-oh?)
- Include centralized checkpoint syncing (peercoin style) - Qt wallet can't find the config file in testnet mode (wrong path?)
- Remove Bitcoin dead weight (SHA256, hardcoded keys, nodes)
ADDITIONAL:
-----------
- Include trusted public key for message signing
- Masternodes, Enforcement, Darksend, InstantX, Atomic Transfers, ...
- Remove Bitcoin dead weight (SHA256, hardcoded keys, seednodes, ...)
- Update strings - Update strings
- Write tests - Write tests

View File

@ -92,7 +92,7 @@ public:
bool operator> (const CBase58Data& b58) const { return CompareTo(b58) > 0; } bool operator> (const CBase58Data& b58) const { return CompareTo(b58) > 0; }
}; };
/** base58-encoded Bitcoin addresses. /** base58-encoded Darkcoin addresses.
* Public-key-hash-addresses have version 0 (or 111 testnet). * Public-key-hash-addresses have version 0 (or 111 testnet).
* The data vector contains RIPEMD160(SHA256(pubkey)), where pubkey is the serialized public key. * The data vector contains RIPEMD160(SHA256(pubkey)), where pubkey is the serialized public key.
* Script-hash-addresses have version 5 (or 196 testnet). * Script-hash-addresses have version 5 (or 196 testnet).

View File

@ -136,7 +136,7 @@ public:
if (sn < (int64_t)0) if (sn < (int64_t)0)
{ {
// Since the minimum signed integer cannot be represented as positive so long as its type is signed, // Since the minimum signed integer cannot be represented as positive so long as its type is signed,
// and it's not well-defined what happens if you make it unsigned before negating it, // and it's not well-defined what happens if you make it unsigned before negating it,
// we instead increment the negative integer by 1, convert it, then increment the (now positive) unsigned integer by 1 to compensate // we instead increment the negative integer by 1, convert it, then increment the (now positive) unsigned integer by 1 to compensate
n = -(sn + 1); n = -(sn + 1);
@ -284,7 +284,7 @@ public:
// and 0xc0de000000 is compact (0x0600c0de) // and 0xc0de000000 is compact (0x0600c0de)
// (0x05c0de00) would be -0x40de000000 // (0x05c0de00) would be -0x40de000000
// //
// Bitcoin only uses this "compact" format for encoding difficulty // Darkcoin only uses this "compact" format for encoding difficulty
// targets, which are unsigned 256bit quantities. Thus, all the // targets, which are unsigned 256bit quantities. Thus, all the
// complexities of the sign bit and using base 256 are probably an // complexities of the sign bit and using base 256 are probably an
// implementation accident. // implementation accident.

View File

@ -26,7 +26,7 @@ struct CDNSSeedData {
/** /**
* CChainParams defines various tweakable parameters of a given instance of the * CChainParams defines various tweakable parameters of a given instance of the
* Bitcoin system. There are three: the main network on which people trade goods * Darkcoin system. There are three: the main network on which people trade goods
* and services, the public test network which gets reset from time to time and * and services, the public test network which gets reset from time to time and
* a regression test mode which is intended for private networks only. It has * a regression test mode which is intended for private networks only. It has
* minimal difficulty to ensure that blocks can be found instantly. * minimal difficulty to ensure that blocks can be found instantly.

View File

@ -334,7 +334,7 @@ public:
// Calculate the size of the cache (in number of transactions) // Calculate the size of the cache (in number of transactions)
unsigned int GetCacheSize(); unsigned int GetCacheSize();
/** Amount of bitcoins coming in to a transaction /** Amount of darkcoins coming in to a transaction
Note that lightweight clients may not know anything besides the hash of previous transactions, Note that lightweight clients may not know anything besides the hash of previous transactions,
so may not be able to calculate this. so may not be able to calculate this.

View File

@ -14,11 +14,11 @@ int CommandLineRPC(int argc, char *argv[]);
json_spirit::Array RPCConvertValues(const std::string &strMethod, const std::vector<std::string> &strParams); json_spirit::Array RPCConvertValues(const std::string &strMethod, const std::vector<std::string> &strParams);
/** Show help message for bitcoin-cli. /** Show help message for darkcoin-cli.
* The mainProgram argument is used to determine whether to show this message as main program * The mainProgram argument is used to determine whether to show this message as main program
* (and include some common options) or as sub-header of another help message. * (and include some common options) or as sub-header of another help message.
* *
* @note the argument can be removed once bitcoin-cli functionality is removed from bitcoind * @note the argument can be removed once darkcoin-cli functionality is removed from darkcoind
*/ */
std::string HelpMessageCli(bool mainProgram); std::string HelpMessageCli(bool mainProgram);

View File

@ -30,7 +30,7 @@ enum HTTPStatusCode
HTTP_INTERNAL_SERVER_ERROR = 500, HTTP_INTERNAL_SERVER_ERROR = 500,
}; };
// Bitcoin RPC error codes // Darkcoin RPC error codes
enum RPCErrorCode enum RPCErrorCode
{ {
// Standard JSON-RPC 2.0 errors // Standard JSON-RPC 2.0 errors
@ -54,7 +54,7 @@ enum RPCErrorCode
RPC_TRANSACTION_ALREADY_IN_CHAIN= -27, // Transaction already in chain RPC_TRANSACTION_ALREADY_IN_CHAIN= -27, // Transaction already in chain
// P2P client errors // P2P client errors
RPC_CLIENT_NOT_CONNECTED = -9, // Bitcoin is not connected RPC_CLIENT_NOT_CONNECTED = -9, // Darkcoin is not connected
RPC_CLIENT_IN_INITIAL_DOWNLOAD = -10, // Still downloading initial blocks RPC_CLIENT_IN_INITIAL_DOWNLOAD = -10, // Still downloading initial blocks
RPC_CLIENT_NODE_ALREADY_ADDED = -23, // Node is already added RPC_CLIENT_NODE_ALREADY_ADDED = -23, // Node is already added
RPC_CLIENT_NODE_NOT_ADDED = -24, // Node has not been added before RPC_CLIENT_NODE_NOT_ADDED = -24, // Node has not been added before

View File

@ -63,7 +63,7 @@ public:
}; };
/** /**
* Bitcoin RPC command dispatcher. * Darkcoin RPC command dispatcher.
*/ */
class CRPCTable class CRPCTable
{ {

View File

@ -641,7 +641,7 @@ public:
return nFound; return nFound;
} }
// Pre-version-0.6, Bitcoin always counted CHECKMULTISIGs // Pre-version-0.6, Darkcoin always counted CHECKMULTISIGs
// as 20 sigops. With pay-to-script-hash, that changed: // as 20 sigops. With pay-to-script-hash, that changed:
// CHECKMULTISIGs serialized in scriptSigs are // CHECKMULTISIGs serialized in scriptSigs are
// counted more accurately, assuming they are of the form // counted more accurately, assuming they are of the form