From 828b6d38a1d1f8462c2deae6acc7928c735411ef Mon Sep 17 00:00:00 2001 From: vertoe Date: Tue, 9 Dec 2014 23:19:26 +0100 Subject: [PATCH] Update strings. --- .gitignore | 10 ++++++++++ TODO.md | 22 ++++++++++++++-------- src/base58.h | 2 +- src/bignum.h | 4 ++-- src/chainparams.h | 2 +- src/coins.h | 2 +- src/rpcclient.h | 4 ++-- src/rpcprotocol.h | 4 ++-- src/rpcserver.h | 2 +- src/script.h | 2 +- 10 files changed, 35 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 85ddf3871f..1a8af370bd 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,11 @@ src/bitcoind src/bitcoin-cli src/test/test_bitcoin 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 aclocal.m4 @@ -37,6 +42,7 @@ src/qt/test/moc*.cpp *.o-* *.patch .bitcoin +.darkcoin *.a *.pb.cc *.pb.h @@ -52,11 +58,14 @@ src/qt/test/moc*.cpp *.qm Makefile bitcoin-qt +darkcoin-qt Bitcoin-Qt.app +Darkcoin-Qt.app # Unit-tests Makefile.test bitcoin-qt_test +darkcoin-qt_test # Resources cpp qrc_*.cpp @@ -72,6 +81,7 @@ build *.gcno /*.info test_bitcoin.coverage/ +test_darkcoin.coverage/ total.coverage/ coverage_percent.txt diff --git a/TODO.md b/TODO.md index c4c8d66751..aa2546607c 100644 --- a/TODO.md +++ b/TODO.md @@ -29,16 +29,22 @@ DONE: MANDATORY: ---------- -- Fix mining protocol to include correct pow and masternodes -- Add masternode payment checks a.k.a. enforcement (based on blockheight) +- Check rpcminer (should be working though) -OPTIONAL: ---------- +BUGS: +----- -- Include Evan's public key for msg signing -- Darksend, Instant Transactions, Atomic Transfers, etc. pp. -- Include centralized checkpoint syncing (peercoin style) -- Remove Bitcoin dead weight (SHA256, hardcoded keys, nodes) +- Daemon and CLI tool can't connect to testnet/regtest instances (wrong port?) +- Daemon and CLI tool can't authenticate via RPC (uh-oh?) +- Qt wallet can't find the config file in testnet mode (wrong path?) + + +ADDITIONAL: +----------- + +- Include trusted public key for message signing +- Masternodes, Enforcement, Darksend, InstantX, Atomic Transfers, ... +- Remove Bitcoin dead weight (SHA256, hardcoded keys, seednodes, ...) - Update strings - Write tests diff --git a/src/base58.h b/src/base58.h index 70681f589a..ae430e5199 100644 --- a/src/base58.h +++ b/src/base58.h @@ -92,7 +92,7 @@ public: 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). * The data vector contains RIPEMD160(SHA256(pubkey)), where pubkey is the serialized public key. * Script-hash-addresses have version 5 (or 196 testnet). diff --git a/src/bignum.h b/src/bignum.h index 0259338b31..9b553491c9 100644 --- a/src/bignum.h +++ b/src/bignum.h @@ -136,7 +136,7 @@ public: 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, // we instead increment the negative integer by 1, convert it, then increment the (now positive) unsigned integer by 1 to compensate n = -(sn + 1); @@ -284,7 +284,7 @@ public: // and 0xc0de000000 is compact (0x0600c0de) // (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 // complexities of the sign bit and using base 256 are probably an // implementation accident. diff --git a/src/chainparams.h b/src/chainparams.h index 542afeaf92..0f9e723ac9 100644 --- a/src/chainparams.h +++ b/src/chainparams.h @@ -26,7 +26,7 @@ struct CDNSSeedData { /** * 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 * a regression test mode which is intended for private networks only. It has * minimal difficulty to ensure that blocks can be found instantly. diff --git a/src/coins.h b/src/coins.h index 0ad28524a1..99d4b37a6b 100644 --- a/src/coins.h +++ b/src/coins.h @@ -334,7 +334,7 @@ public: // Calculate the size of the cache (in number of transactions) 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, so may not be able to calculate this. diff --git a/src/rpcclient.h b/src/rpcclient.h index e101d22ec5..3af87c7ec6 100644 --- a/src/rpcclient.h +++ b/src/rpcclient.h @@ -14,11 +14,11 @@ int CommandLineRPC(int argc, char *argv[]); json_spirit::Array RPCConvertValues(const std::string &strMethod, const std::vector &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 * (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); diff --git a/src/rpcprotocol.h b/src/rpcprotocol.h index 8b3df19621..52d1eaccf7 100644 --- a/src/rpcprotocol.h +++ b/src/rpcprotocol.h @@ -30,7 +30,7 @@ enum HTTPStatusCode HTTP_INTERNAL_SERVER_ERROR = 500, }; -// Bitcoin RPC error codes +// Darkcoin RPC error codes enum RPCErrorCode { // Standard JSON-RPC 2.0 errors @@ -54,7 +54,7 @@ enum RPCErrorCode RPC_TRANSACTION_ALREADY_IN_CHAIN= -27, // Transaction already in chain // 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_NODE_ALREADY_ADDED = -23, // Node is already added RPC_CLIENT_NODE_NOT_ADDED = -24, // Node has not been added before diff --git a/src/rpcserver.h b/src/rpcserver.h index 1092c691be..d633e17699 100644 --- a/src/rpcserver.h +++ b/src/rpcserver.h @@ -63,7 +63,7 @@ public: }; /** - * Bitcoin RPC command dispatcher. + * Darkcoin RPC command dispatcher. */ class CRPCTable { diff --git a/src/script.h b/src/script.h index 1742ce81f8..93520310da 100644 --- a/src/script.h +++ b/src/script.h @@ -641,7 +641,7 @@ public: 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: // CHECKMULTISIGs serialized in scriptSigs are // counted more accurately, assuming they are of the form