Bitcoin Forum

2545c2538: Nanite
<         const char* pszTimestamp = "November 06 2014 - CoinDesk.com - Silk Road 2.0 Seized Alleged Operator Unmasked in FBI Crackdown";
---
>         const char* pszTimestamp = "Oct 11, 2014 - Coindesk.com - Bitcoin’s Killer Apps – A Look Into the Future";
2547c2540: Spark

diff Nanite/src/base58.h Spark/src/base58.h
279c279
<         PUBKEY_ADDRESS = 76, // Start with X
---
>         PUBKEY_ADDRESS = 63,
diff Nanite/src/bitcoinrpc.cpp Spark/src/bitcoinrpc.cpp
46c46
<     return GetBoolArg("-testnet", false) ? 13535 : 23535;
---
>     return GetBoolArg("-testnet", false) ? 26666 : 16666;
222c222
<             "Stop Nanite server (and possibly override the detachdb config value).");
---
>             "Stop Spark server (and possibly override the detachdb config value).");
227c227
<     return "Nanite server stopping";
---
>     return "Spark server stopping";
358c358
<       << "User-Agent: Nanite-json-rpc/" << FormatFullVersion() << "\r\n"
---
>       << "User-Agent: Spark-json-rpc/" << FormatFullVersion() << "\r\n"
389c389
<             "Server: Nanite-json-rpc/%s\r\n"
---
>             "Server: Spark-json-rpc/%s\r\n"
416c416
<             "Server: Nanite-json-rpc/%s\r\n"
---
>             "Server: Spark-json-rpc/%s\r\n"
687c687
<     RenameThread("Nanite-rpclist");
---
>     RenameThread("Spark-rpclist");
791c791
<         string strWhatAmI = "To use Nanited";
---
>         string strWhatAmI = "To use Sparkd";
799c799
<               "rpcuser=Naniterpc\n"
---
>               "rpcuser=Sparkrpc\n"
805c805
<               "for example: alertnotify=echo %%s | mail -s \"Nanite Alert\" admin@foo.com\n"),
---
>               "for example: alertnotify=echo %%s | mail -s \"Spark Alert\" admin@foo.com\n"),
991c991
<     RenameThread("Nanite-rpchand");
---
>     RenameThread("Spark-rpchand");
diff Nanite/src/clientversion.h Spark/src/clientversion.h
10c10
< #define CLIENT_VERSION_MINOR       0
---
> #define CLIENT_VERSION_MINOR       1
diff Nanite/src/init.cpp Spark/src/init.cpp
71c71
<     RenameThread("Nanite-shutoff");
---
>     RenameThread("Spark-shutoff");
99c99
<         printf("Nanite exited\n\n");
---
>         printf("Spark exited\n\n");
154c154
<             std::string strUsage = _("Nanite version") + " " + FormatFullVersion() + "\n\n" +
---
>             std::string strUsage = _("Spark version") + " " + FormatFullVersion() + "\n\n" +
156,159c156,159
<                   "  Nanited [options]                     " + "\n" +
<                   "  Nanited [options] <command> [params]  " + _("Send command to -server or Nanited") + "\n" +
<                   "  Nanited [options] help                " + _("List commands") + "\n" +
<                   "  Nanited [options] help <command>      " + _("Get help for a command") + "\n";
---
>                   "  Sparkd [options]                     " + "\n" +
>                   "  Sparkd [options] <command> [params]  " + _("Send command to -server or Sparkd") + "\n" +
>                   "  Sparkd [options] help                " + _("List commands") + "\n" +
>                   "  Sparkd [options] help <command>      " + _("Get help for a command") + "\n";
169c169
<             if (!IsSwitchChar(argv[i][0]) && !boost::algorithm::istarts_with(argv[i], "Nanite:"))
---
>             if (!IsSwitchChar(argv[i][0]) && !boost::algorithm::istarts_with(argv[i], "Spark:"))
209c209
<     uiInterface.ThreadSafeMessageBox(str, _("Nanite"), CClientUIInterface::OK | CClientUIInterface::MODAL);
---
>     uiInterface.ThreadSafeMessageBox(str, _("Spark"), CClientUIInterface::OK | CClientUIInterface::MODAL);
215c215
<     uiInterface.ThreadSafeMessageBox(str, _("Nanite"), CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION | CClientUIInterface::MODAL);
---
>     uiInterface.ThreadSafeMessageBox(str, _("Spark"), CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION | CClientUIInterface::MODAL);
237,238c237,238
<         "  -conf=<file>           " + _("Specify configuration file (default: Nanite.conf)") + "\n" +
<         "  -pid=<file>            " + _("Specify pid file (default: Nanited.pid)") + "\n" +
---
>         "  -conf=<file>           " + _("Specify configuration file (default: Spark.conf)") + "\n" +
>         "  -pid=<file>            " + _("Specify pid file (default: Sparkd.pid)") + "\n" +
248c248
<         "  -port=<port>           " + _("Listen for connections on <port> (default: 23534 or testnet: 13534)") + "\n" +
---
>         "  -port=<port>           " + _("Listen for connections on <port> (default: 16665 or testnet: 26665)") + "\n" +
294c294
<         "  -rpcport=<port>        " + _("Listen for JSON-RPC connections on <port> (default: 23535 or testnet: 13535)") + "\n" +
---
>         "  -rpcport=<port>        " + _("Listen for JSON-RPC connections on <port> (default: 16666 or testnet: 26666)") + "\n" +
510c510
<         return InitError(strprintf(_("Cannot obtain a lock on data directory %s.  Nanite is probably already running."), strDataDir.c_str()));
---
>         return InitError(strprintf(_("Cannot obtain a lock on data directory %s.  Spark is probably already running."), strDataDir.c_str()));
537c537
<     printf("Nanite version %s (%s)\n", FormatFullVersion().c_str(), CLIENT_DATE.c_str());
---
>     printf("Spark version %s (%s)\n", FormatFullVersion().c_str(), CLIENT_DATE.c_str());
546c546
<         fprintf(stdout, "Nanite server starting\n");
---
>         fprintf(stdout, "Spark server starting\n");
578c578
<             uiInterface.ThreadSafeMessageBox(msg, _("Nanite"), CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION | CClientUIInterface::MODAL);
---
>             uiInterface.ThreadSafeMessageBox(msg, _("Spark"), CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION | CClientUIInterface::MODAL);
797c797
<             uiInterface.ThreadSafeMessageBox(msg, _("Nanite"), CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION | CClientUIInterface::MODAL);
---
>             uiInterface.ThreadSafeMessageBox(msg, _("Spark"), CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION | CClientUIInterface::MODAL);
800c800
<             strErrors << _("Error loading wallet.dat: Wallet requires newer version of Nanite") << "\n";
---
>             strErrors << _("Error loading wallet.dat: Wallet requires newer version of Spark") << "\n";
803c803
<             strErrors << _("Wallet needed to be rewritten: restart Nanite to complete") << "\n";
---
>             strErrors << _("Wallet needed to be rewritten: restart Spark to complete") << "\n";
diff Nanite/src/irc.cpp Spark/src/irc.cpp
184c184
<     RenameThread("Nanite-ircseed");
---
>     RenameThread("Spark-ircseed");
297,298c297,298
<             Send(hSocket, "JOIN #NaniteTEST\r");
<             Send(hSocket, "WHO #NaniteTEST\r");
---
>             Send(hSocket, "JOIN #SparkTEST\r");
>             Send(hSocket, "WHO #SparkTEST\r");
300c300
<             // randomly join #Nanite00-#Nanite05
---
>             // randomly join #Spark00-#Spark05
Common Directories: Nanite/src/json und Spark/src/json.
Common Directories: Nanite/src/leveldb und Spark/src/leveldb.
Common Directories: Nanite/src/lz4 und Spark/src/lz4.
diff Nanite/src/main.cpp Spark/src/main.cpp
75c75
< const string strMessageMagic = "Nanite Signed Message:\n";
---
> const string strMessageMagic = "Spark Signed Message:\n";
977c977
<     nSubsidy = 10000 * COIN;
---
>     nSubsidy = 21600 * COIN;
979c979
< else if (nHeight < 500)
---
> else if (nHeight < 7200)
981c981
<     nSubsidy = 400 * COIN;
---
>     nSubsidy = 200 * COIN;
983c983
< else if (nHeight < 1500)
---
> else
985,993c985
<     nSubsidy = 350 * COIN;
< }
< else if (nHeight < 3000)
< {
<     nSubsidy = 150 * COIN;
< }
< else if (nHeight < 4000)
< {
<     nSubsidy = 225 * COIN;
---
>     nSubsidy = 100 * COIN;
995a988
> 
2450c2443
<         uiInterface.ThreadSafeMessageBox(strMessage, "Nanite", CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION | CClientUIInterface::MODAL);
---
>         uiInterface.ThreadSafeMessageBox(strMessage, "Spark", CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION | CClientUIInterface::MODAL);
2510,2513c2503,2506
<         pchMessageStart[0] = 0xd1;
<         pchMessageStart[1] = 0xe4;
<         pchMessageStart[2] = 0xa0;
<         pchMessageStart[3] = 0xb2;
---
>         pchMessageStart[0] = 0xa3;
>         pchMessageStart[1] = 0xb1;
>         pchMessageStart[2] = 0xd2;
>         pchMessageStart[3] = 0xc0;
2545c2538
<         const char* pszTimestamp = "November 06 2014 - CoinDesk.com - Silk Road 2.0 Seized Alleged Operator Unmasked in FBI Crackdown";
---
>         const char* pszTimestamp = "Oct 11, 2014 - Coindesk.com - Bitcoin’s Killer Apps – A Look Into the Future";
2547c2540
<         txNew.nTime = 1415309483;
---
>         txNew.nTime = 1413065951;
2557c2550
<         block.nTime    = 1415309483;
---
>         block.nTime    = 1413065951;
2559,2560c2552
<         block.nNonce   = 3859946;
< 		
---
>         block.nNonce   = 2670831;
2564c2556
<         assert(block.hashMerkleRoot == uint256("0x42494d7f0a55247abd212c94c82633097f954a1c12a58ac13264f1f7133ba9d0"));
---
>         assert(block.hashMerkleRoot == uint256("0xcde7abae9307fd7db1ba64ad79143609df03a9c614570b1a06eb5e28b1932b24"));
2834c2826
< unsigned char pchMessageStart[4] = { 0xd1, 0xe4, 0xa0, 0xb2 };
---
> unsigned char pchMessageStart[4] = { 0xa3, 0xb1, 0xd2, 0xc0 };
diff Nanite/src/main.h Spark/src/main.h
29,30c29,30
< static const int LAST_POW_BLOCK = 4001; // ~ 10 Days
< static const int POS_START_BLOCK = 3800; // Near End of PoW
---
> static const int LAST_POW_BLOCK = 14400; // ~ 10 Days
> static const int POS_START_BLOCK = 14000; // Near End of PoW
41c41
< static const int64_t COIN_YEAR_REWARD = 200 * CENT; // 200% per year
---
> static const int64_t COIN_YEAR_REWARD = 17.5 * CENT; // 17.5% per year
53,54c53,54
< static const uint256 hashGenesisBlock("0x00000139d0ee73575b0464bc01153a4602eae635916d3602e26dd8bbf89bad38");
< static const uint256 hashGenesisBlockTestNet("0x00000139d0ee73575b0464bc01153a4602eae635916d3602e26dd8bbf89bad38");
---
> static const uint256 hashGenesisBlock("0x000004da60ca5d48823887462af287d466c726eb564a568a6d70d804f6dc2a8a");
> static const uint256 hashGenesisBlockTestNet("0x000004da60ca5d48823887462af287d466c726eb564a568a6d70d804f6dc2a8a");
diff Nanite/src/makefile.bsd Spark/src/makefile.bsd
146c146
< all: Nanited
---
> all: Sparkd
187c187
< Nanited: $(OBJS:obj/%=obj/%)
---
> Sparkd: $(OBJS:obj/%=obj/%)
191c191
< 	-rm -f Nanited
---
> 	-rm -f Sparkd
diff Nanite/src/makefile.linux-mingw Spark/src/makefile.linux-mingw
119c119
< all: Nanited.exe
---
> all: Sparkd.exe
143c143
< Nanited.exe: $(OBJS:obj/%=obj/%)
---
> Sparkd.exe: $(OBJS:obj/%=obj/%)
145c145
< 	$(STRIP) Nanited.exe
---
> 	$(STRIP) Sparkd.exe
156c156
< 	-rm -f Nanited.exe
---
> 	-rm -f Sparkd.exe
diff Nanite/src/makefile.mingw Spark/src/makefile.mingw
117c117
< all: Nanited.exe
---
> all: Sparkd.exe
142c142
< Nanited.exe: $(OBJS:obj/%=obj/%)
---
> Sparkd.exe: $(OBJS:obj/%=obj/%)
146c146
< 	-del /Q Nanited
---
> 	-del /Q Sparkd
diff Nanite/src/makefile.osx Spark/src/makefile.osx
6c6
< # Mac OS X makefile for Nanite
---
> # Mac OS X makefile for Spark
28c28
< # Build STATIC if you are redistributing the Nanited binary
---
> # Build STATIC if you are redistributing the Sparkd binary
138c138
< all: Nanited
---
> all: Sparkd
178c178
< Nanited: $(OBJS:obj/%=obj/%)
---
> Sparkd: $(OBJS:obj/%=obj/%)
182c182
< 	-rm -f Nanited
---
> 	-rm -f Sparkd
diff Nanite/src/makefile.unix Spark/src/makefile.unix
166c166
< all: Nanited
---
> all: Sparkd
214c214
< Nanited: $(OBJS:obj/%=obj/%)
---
> Sparkd: $(OBJS:obj/%=obj/%)
218c218
< 	-rm -f Nanited
---
> 	-rm -f Sparkd
diff Nanite/src/miner.cpp Spark/src/miner.cpp
524c524
<     RenameThread("Nanite-miner");
---
>     RenameThread("Spark-miner");
diff Nanite/src/net.cpp Spark/src/net.cpp
383c383
<                      "User-Agent: Nanite\r\n"
---
>                      "User-Agent: Spark\r\n"
402c402
<                      "User-Agent: Nanite\r\n"
---
>                      "User-Agent: Spark\r\n"
419c419
<     RenameThread("Nanite-ext-ip");
---
>     RenameThread("Spark-ext-ip");
644c644
<     RenameThread("Nanite-net");
---
>     RenameThread("Spark-net");
998c998
<     RenameThread("Nanite-UPnP");
---
>     RenameThread("Spark-UPnP");
1059c1059
<         string strDesc = "Nanite " + FormatFullVersion();
---
>         string strDesc = "Spark " + FormatFullVersion();
1149c1149,1150
<     {"104.236.34.234", "104.236.34.234"},
---
>     {"getsparkcoin.com", "178.62.47.198"},
>     {"seed.getsparkcoin.com", "seed.getsparkcoin.com"},
1155c1156
<     RenameThread("Nanite-dnsseed");
---
>     RenameThread("Spark-dnsseed");
1249c1250
<     RenameThread("Nanite-adrdump");
---
>     RenameThread("Spark-adrdump");
1264c1265
<     RenameThread("Nanite-opencon");
---
>     RenameThread("Spark-opencon");
1445c1446
<     RenameThread("Nanite-opencon");
---
>     RenameThread("Spark-opencon");
1576c1577
<     RenameThread("Nanite-msghand");
---
>     RenameThread("Spark-msghand");
1744c1745
<             strError = strprintf(_("Unable to bind to %s on this computer. Nanite is probably already running."), addrBind.ToString().c_str());
---
>             strError = strprintf(_("Unable to bind to %s on this computer. Spark is probably already running."), addrBind.ToString().c_str());
1827c1828
<     RenameThread("Nanite-start");
---
>     RenameThread("Spark-start");
Common Directories: Nanite/src/obj und Spark/src/obj.
Common Directories: Nanite/src/obj-test und Spark/src/obj-test.
diff Nanite/src/protocol.h Spark/src/protocol.h
21c21
<     return testnet ? 13534 : 23534;
---
>     return testnet ? 26665 : 16665;
Common Directories: Nanite/src/qt und Spark/src/qt.
diff Nanite/src/rpcdump.cpp Spark/src/rpcdump.cpp
112c112
<             "importprivkey <Naniteprivkey> [label]\n"
---
>             "importprivkey <Sparkprivkey> [label]\n"
239,240c239,240
<             "dumpprivkey <Naniteaddress>\n"
<             "Reveals the private key corresponding to <Naniteaddress>.");
---
>             "dumpprivkey <Sparkaddress>\n"
>             "Reveals the private key corresponding to <Sparkaddress>.");
247c247
<         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Nanite address");
---
>         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Spark address");
291c291
<     file << strprintf("# Wallet dump created by Nanite %s (%s)\n", CLIENT_BUILD.c_str(), CLIENT_DATE.c_str());
---
>     file << strprintf("# Wallet dump created by Spark %s (%s)\n", CLIENT_BUILD.c_str(), CLIENT_DATE.c_str());
diff Nanite/src/rpcmining.cpp Spark/src/rpcmining.cpp
108c108
<         throw JSONRPCError(-9, "Nanite is not connected!");
---
>         throw JSONRPCError(-9, "Spark is not connected!");
111c111
<         throw JSONRPCError(-10, "Nanite is downloading blocks...");
---
>         throw JSONRPCError(-10, "Spark is downloading blocks...");
243c243
<         throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Nanite is not connected!");
---
>         throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Spark is not connected!");
246c246
<         throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Nanite is downloading blocks...");
---
>         throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Spark is downloading blocks...");
388c388
<         throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Nanite is not connected!");
---
>         throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Spark is not connected!");
391c391
<         throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Nanite is downloading blocks...");
---
>         throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Spark is downloading blocks...");
diff Nanite/src/rpcrawtransaction.cpp Spark/src/rpcrawtransaction.cpp
169c169
<                 throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Nanite address: ")+input.get_str());
---
>                 throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Spark address: ")+input.get_str());
261c261
<             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Nanite address: ")+s.name_);
---
>             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Spark address: ")+s.name_);
diff Nanite/src/rpcsmessage.cpp Spark/src/rpcsmessage.cpp
2c2
< // Copyright (c) 2014 The Nanite developers
---
> // Copyright (c) 2014 The Spark developers
diff Nanite/src/rpcwallet.cpp Spark/src/rpcwallet.cpp
150c150
<             "Returns a new Nanite address for receiving payments.  "
---
>             "Returns a new Spark address for receiving payments.  "
217c217
<             "Returns the current Nanite address for receiving payments to this account.");
---
>             "Returns the current Spark address for receiving payments to this account.");
235c235
<             "setaccount <Naniteaddress> <account>\n"
---
>             "setaccount <Sparkaddress> <account>\n"
240c240
<         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Nanite address");
---
>         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Spark address");
265c265
<             "getaccount <Naniteaddress>\n"
---
>             "getaccount <Sparkaddress>\n"
270c270
<         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Nanite address");
---
>         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Spark address");
305c305
<             "sendtoaddress <Naniteaddress> <amount> [comment] [comment-to]\n"
---
>             "sendtoaddress <Sparkaddress> <amount> [comment] [comment-to]\n"
311c311
<         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Nanite address");
---
>         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Spark address");
368c368
<             "signmessage <Naniteaddress> <message>\n"
---
>             "signmessage <Sparkaddress> <message>\n"
403c403
<             "verifymessage <Naniteaddress> <signature> <message>\n"
---
>             "verifymessage <Sparkaddress> <signature> <message>\n"
440,441c440,441
<             "getreceivedbyaddress <Naniteaddress> [minconf=1]\n"
<             "Returns the total amount received by <Naniteaddress> in transactions with at least [minconf] confirmations.");
---
>             "getreceivedbyaddress <Sparkaddress> [minconf=1]\n"
>             "Returns the total amount received by <Sparkaddress> in transactions with at least [minconf] confirmations.");
447c447
<         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Nanite address");
---
>         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Spark address");
668c668
<             "sendfrom <fromaccount> <toNaniteaddress> <amount> [minconf=1] [comment] [comment-to]\n"
---
>             "sendfrom <fromaccount> <toSparkaddress> <amount> [minconf=1] [comment] [comment-to]\n"
675c675
<         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Nanite address");
---
>         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Spark address");
732c732
<             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Nanite address: ")+s.name_);
---
>             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Spark address: ")+s.name_);
776c776
<             "each key is a Nanite address or hex-encoded public key\n"
---
>             "each key is a Spark address or hex-encoded public key\n"
1377c1377
<     RenameThread("Nanite-key-top");
---
>     RenameThread("Spark-key-top");
1385c1385
<     RenameThread("Nanite-lock-wa");
---
>     RenameThread("Spark-lock-wa");
1556c1556
<     return "wallet encrypted; Nanite server stopping, restart to run with encrypted wallet.  The keypool has been flushed, you need to make a new backup.";
---
>     return "wallet encrypted; Spark server stopping, restart to run with encrypted wallet.  The keypool has been flushed, you need to make a new backup.";
1599,1600c1599,1600
<             "validateaddress <Naniteaddress>\n"
<             "Return information about <Naniteaddress>.");
---
>             "validateaddress <Sparkaddress>\n"
>             "Return information about <Sparkaddress>.");
1628,1629c1628,1629
<             "validatepubkey <Nanitepubkey>\n"
<             "Return information about <Nanitepubkey>.");
---
>             "validatepubkey <Sparkpubkey>\n"
>             "Return information about <Sparkpubkey>.");
diff Nanite/src/smessage.cpp Spark/src/smessage.cpp
2c2
< // Copyright (c) 2014 The Nanite developers
---
> // Copyright (c) 2014 The Spark developers
592c592
<     RenameThread("Nanite-smsg"); // Make this thread recognisable
---
>     RenameThread("Spark-smsg"); // Make this thread recognisable
703c703
<     RenameThread("Nanite-smsg-pow"); // Make this thread recognisable
---
>     RenameThread("Spark-smsg-pow"); // Make this thread recognisable
diff Nanite/src/smessage.h Spark/src/smessage.h
2c2
< // Copyright (c) 2014 The Nanite developers
---
> // Copyright (c) 2014 The Spark developers
Common Directories: Nanite/src/test und Spark/src/test.
diff Nanite/src/util.cpp Spark/src/util.cpp
967c967
<     const char* pszModule = "Nanite";
---
>     const char* pszModule = "Spark";
1016,1019c1016,1019
<     // Windows < Vista: C:\Documents and Settings\Username\Application Data\Nanite
<     // Windows >= Vista: C:\Users\Username\AppData\Roaming\Nanite
<     // Mac: ~/Library/Application Support/Nanite
<     // Unix: ~/.Nanite
---
>     // Windows < Vista: C:\Documents and Settings\Username\Application Data\Spark
>     // Windows >= Vista: C:\Users\Username\AppData\Roaming\Spark
>     // Mac: ~/Library/Application Support/Spark
>     // Unix: ~/.Spark
1022c1022
<     return GetSpecialFolderPath(CSIDL_APPDATA) / "Nanite";
---
>     return GetSpecialFolderPath(CSIDL_APPDATA) / "Spark";
1034c1034
<     return pathRet / "Nanite";
---
>     return pathRet / "Spark";
1037c1037
<     return pathRet / ".Nanite";
---
>     return pathRet / ".Spark";
1079c1079
<     boost::filesystem::path pathConfigFile(GetArg("-conf", "Nanite.conf"));
---
>     boost::filesystem::path pathConfigFile(GetArg("-conf", "Spark.conf"));
1110c1110
<     boost::filesystem::path pathPidFile(GetArg("-pid", "Nanited.pid"));
---
>     boost::filesystem::path pathPidFile(GetArg("-pid", "Sparkd.pid"));
1240c1240
<                     string strMessage = _("Warning: Please check that your computer's date and time are correct! If your clock is wrong Nanite will not work properly.");
---
>                     string strMessage = _("Warning: Please check that your computer's date and time are correct! If your clock is wrong Spark will not work properly.");
1243c1243
<                     uiInterface.ThreadSafeMessageBox(strMessage+" ", string("Nanite"), CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION);
---
>                     uiInterface.ThreadSafeMessageBox(strMessage+" ", string("Spark"), CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION);
diff Nanite/src/version.cpp Spark/src/version.cpp
11c11
< const std::string CLIENT_NAME("Nanite");
---
> const std::string CLIENT_NAME("Spark");
diff Nanite/src/walletdb.cpp Spark/src/walletdb.cpp
536c536
<     RenameThread("Nanite-wallet");
---
>     RenameThread("Spark-wallet");
Common Directories: Nanite/src/xxhash und Spark/src/xxhash.
Common Directories: Nanite/src/zerocoin und Spark/src/zerocoin.

2545c2538: Nanite
<         const char* pszTimestamp = "November 06 2014 - CoinDesk.com - Silk Road 2.0 Seized Alleged Operator Unmasked in FBI Crackdown";
---
>         const char* pszTimestamp = "Oct 11, 2014 - Coindesk.com - Bitcoin’s Killer Apps – A Look Into the Future";
2547c2540: Spark

diff Nanite/src/base58.h Spark/src/base58.h
279c279
<         PUBKEY_ADDRESS = 76, // Start with X
---
>         PUBKEY_ADDRESS = 63,
diff Nanite/src/bitcoinrpc.cpp Spark/src/bitcoinrpc.cpp
46c46
<     return GetBoolArg("-testnet", false) ? 13535 : 23535;
---
>     return GetBoolArg("-testnet", false) ? 26666 : 16666;
222c222
<             "Stop Nanite server (and possibly override the detachdb config value).");
---
>             "Stop Spark server (and possibly override the detachdb config value).");
227c227
<     return "Nanite server stopping";
---
>     return "Spark server stopping";
358c358
<       << "User-Agent: Nanite-json-rpc/" << FormatFullVersion() << "\r\n"
---
>       << "User-Agent: Spark-json-rpc/" << FormatFullVersion() << "\r\n"
389c389
<             "Server: Nanite-json-rpc/%s\r\n"
---
>             "Server: Spark-json-rpc/%s\r\n"
416c416
<             "Server: Nanite-json-rpc/%s\r\n"
---
>             "Server: Spark-json-rpc/%s\r\n"
687c687
<     RenameThread("Nanite-rpclist");
---
>     RenameThread("Spark-rpclist");
791c791
<         string strWhatAmI = "To use Nanited";
---
>         string strWhatAmI = "To use Sparkd";
799c799
<               "rpcuser=Naniterpc\n"
---
>               "rpcuser=Sparkrpc\n"
805c805
<               "for example: alertnotify=echo %%s | mail -s \"Nanite Alert\" admin@foo.com\n"),
---
>               "for example: alertnotify=echo %%s | mail -s \"Spark Alert\" admin@foo.com\n"),
991c991
<     RenameThread("Nanite-rpchand");
---
>     RenameThread("Spark-rpchand");
diff Nanite/src/clientversion.h Spark/src/clientversion.h
10c10
< #define CLIENT_VERSION_MINOR       0
---
> #define CLIENT_VERSION_MINOR       1
diff Nanite/src/init.cpp Spark/src/init.cpp
71c71
<     RenameThread("Nanite-shutoff");
---
>     RenameThread("Spark-shutoff");
99c99
<         printf("Nanite exited\n\n");
---
>         printf("Spark exited\n\n");
154c154
<             std::string strUsage = _("Nanite version") + " " + FormatFullVersion() + "\n\n" +
---
>             std::string strUsage = _("Spark version") + " " + FormatFullVersion() + "\n\n" +
156,159c156,159
<                   "  Nanited [options]                     " + "\n" +
<                   "  Nanited [options] <command> [params]  " + _("Send command to -server or Nanited") + "\n" +
<                   "  Nanited [options] help                " + _("List commands") + "\n" +
<                   "  Nanited [options] help <command>      " + _("Get help for a command") + "\n";
---
>                   "  Sparkd [options]                     " + "\n" +
>                   "  Sparkd [options] <command> [params]  " + _("Send command to -server or Sparkd") + "\n" +
>                   "  Sparkd [options] help                " + _("List commands") + "\n" +
>                   "  Sparkd [options] help <command>      " + _("Get help for a command") + "\n";
169c169
<             if (!IsSwitchChar(argv[i][0]) && !boost::algorithm::istarts_with(argv[i], "Nanite:"))
---
>             if (!IsSwitchChar(argv[i][0]) && !boost::algorithm::istarts_with(argv[i], "Spark:"))
209c209
<     uiInterface.ThreadSafeMessageBox(str, _("Nanite"), CClientUIInterface::OK | CClientUIInterface::MODAL);
---
>     uiInterface.ThreadSafeMessageBox(str, _("Spark"), CClientUIInterface::OK | CClientUIInterface::MODAL);
215c215
<     uiInterface.ThreadSafeMessageBox(str, _("Nanite"), CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION | CClientUIInterface::MODAL);
---
>     uiInterface.ThreadSafeMessageBox(str, _("Spark"), CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION | CClientUIInterface::MODAL);
237,238c237,238
<         "  -conf=<file>           " + _("Specify configuration file (default: Nanite.conf)") + "\n" +
<         "  -pid=<file>            " + _("Specify pid file (default: Nanited.pid)") + "\n" +
---
>         "  -conf=<file>           " + _("Specify configuration file (default: Spark.conf)") + "\n" +
>         "  -pid=<file>            " + _("Specify pid file (default: Sparkd.pid)") + "\n" +
248c248
<         "  -port=<port>           " + _("Listen for connections on <port> (default: 23534 or testnet: 13534)") + "\n" +
---
>         "  -port=<port>           " + _("Listen for connections on <port> (default: 16665 or testnet: 26665)") + "\n" +
294c294
<         "  -rpcport=<port>        " + _("Listen for JSON-RPC connections on <port> (default: 23535 or testnet: 13535)") + "\n" +
---
>         "  -rpcport=<port>        " + _("Listen for JSON-RPC connections on <port> (default: 16666 or testnet: 26666)") + "\n" +
510c510
<         return InitError(strprintf(_("Cannot obtain a lock on data directory %s.  Nanite is probably already running."), strDataDir.c_str()));
---
>         return InitError(strprintf(_("Cannot obtain a lock on data directory %s.  Spark is probably already running."), strDataDir.c_str()));
537c537
<     printf("Nanite version %s (%s)\n", FormatFullVersion().c_str(), CLIENT_DATE.c_str());
---
>     printf("Spark version %s (%s)\n", FormatFullVersion().c_str(), CLIENT_DATE.c_str());
546c546
<         fprintf(stdout, "Nanite server starting\n");
---
>         fprintf(stdout, "Spark server starting\n");
578c578
<             uiInterface.ThreadSafeMessageBox(msg, _("Nanite"), CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION | CClientUIInterface::MODAL);
---
>             uiInterface.ThreadSafeMessageBox(msg, _("Spark"), CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION | CClientUIInterface::MODAL);
797c797
<             uiInterface.ThreadSafeMessageBox(msg, _("Nanite"), CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION | CClientUIInterface::MODAL);
---
>             uiInterface.ThreadSafeMessageBox(msg, _("Spark"), CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION | CClientUIInterface::MODAL);
800c800
<             strErrors << _("Error loading wallet.dat: Wallet requires newer version of Nanite") << "\n";
---
>             strErrors << _("Error loading wallet.dat: Wallet requires newer version of Spark") << "\n";
803c803
<             strErrors << _("Wallet needed to be rewritten: restart Nanite to complete") << "\n";
---
>             strErrors << _("Wallet needed to be rewritten: restart Spark to complete") << "\n";
diff Nanite/src/irc.cpp Spark/src/irc.cpp
184c184
<     RenameThread("Nanite-ircseed");
---
>     RenameThread("Spark-ircseed");
297,298c297,298
<             Send(hSocket, "JOIN #NaniteTEST\r");
<             Send(hSocket, "WHO #NaniteTEST\r");
---
>             Send(hSocket, "JOIN #SparkTEST\r");
>             Send(hSocket, "WHO #SparkTEST\r");
300c300
<             // randomly join #Nanite00-#Nanite05
---
>             // randomly join #Spark00-#Spark05
Common Directories: Nanite/src/json und Spark/src/json.
Common Directories: Nanite/src/leveldb und Spark/src/leveldb.
Common Directories: Nanite/src/lz4 und Spark/src/lz4.
diff Nanite/src/main.cpp Spark/src/main.cpp
75c75
< const string strMessageMagic = "Nanite Signed Message:\n";
---
> const string strMessageMagic = "Spark Signed Message:\n";
977c977
<     nSubsidy = 10000 * COIN;
---
>     nSubsidy = 21600 * COIN;
979c979
< else if (nHeight < 500)
---
> else if (nHeight < 7200)
981c981
<     nSubsidy = 400 * COIN;
---
>     nSubsidy = 200 * COIN;
983c983
< else if (nHeight < 1500)
---
> else
985,993c985
<     nSubsidy = 350 * COIN;
< }
< else if (nHeight < 3000)
< {
<     nSubsidy = 150 * COIN;
< }
< else if (nHeight < 4000)
< {
<     nSubsidy = 225 * COIN;
---
>     nSubsidy = 100 * COIN;
995a988
> 
2450c2443
<         uiInterface.ThreadSafeMessageBox(strMessage, "Nanite", CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION | CClientUIInterface::MODAL);
---
>         uiInterface.ThreadSafeMessageBox(strMessage, "Spark", CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION | CClientUIInterface::MODAL);
2510,2513c2503,2506
<         pchMessageStart[0] = 0xd1;
<         pchMessageStart[1] = 0xe4;
<         pchMessageStart[2] = 0xa0;
<         pchMessageStart[3] = 0xb2;
---
>         pchMessageStart[0] = 0xa3;
>         pchMessageStart[1] = 0xb1;
>         pchMessageStart[2] = 0xd2;
>         pchMessageStart[3] = 0xc0;
2545c2538
<         const char* pszTimestamp = "November 06 2014 - CoinDesk.com - Silk Road 2.0 Seized Alleged Operator Unmasked in FBI Crackdown";
---
>         const char* pszTimestamp = "Oct 11, 2014 - Coindesk.com - Bitcoin’s Killer Apps – A Look Into the Future";
2547c2540
<         txNew.nTime = 1415309483;
---
>         txNew.nTime = 1413065951;
2557c2550
<         block.nTime    = 1415309483;
---
>         block.nTime    = 1413065951;
2559,2560c2552
<         block.nNonce   = 3859946;
< 		
---
>         block.nNonce   = 2670831;
2564c2556
<         assert(block.hashMerkleRoot == uint256("0x42494d7f0a55247abd212c94c82633097f954a1c12a58ac13264f1f7133ba9d0"));
---
>         assert(block.hashMerkleRoot == uint256("0xcde7abae9307fd7db1ba64ad79143609df03a9c614570b1a06eb5e28b1932b24"));
2834c2826
< unsigned char pchMessageStart[4] = { 0xd1, 0xe4, 0xa0, 0xb2 };
---
> unsigned char pchMessageStart[4] = { 0xa3, 0xb1, 0xd2, 0xc0 };
diff Nanite/src/main.h Spark/src/main.h
29,30c29,30
< static const int LAST_POW_BLOCK = 4001; // ~ 10 Days
< static const int POS_START_BLOCK = 3800; // Near End of PoW
---
> static const int LAST_POW_BLOCK = 14400; // ~ 10 Days
> static const int POS_START_BLOCK = 14000; // Near End of PoW
41c41
< static const int64_t COIN_YEAR_REWARD = 200 * CENT; // 200% per year
---
> static const int64_t COIN_YEAR_REWARD = 17.5 * CENT; // 17.5% per year
53,54c53,54
< static const uint256 hashGenesisBlock("0x00000139d0ee73575b0464bc01153a4602eae635916d3602e26dd8bbf89bad38");
< static const uint256 hashGenesisBlockTestNet("0x00000139d0ee73575b0464bc01153a4602eae635916d3602e26dd8bbf89bad38");
---
> static const uint256 hashGenesisBlock("0x000004da60ca5d48823887462af287d466c726eb564a568a6d70d804f6dc2a8a");
> static const uint256 hashGenesisBlockTestNet("0x000004da60ca5d48823887462af287d466c726eb564a568a6d70d804f6dc2a8a");
diff Nanite/src/makefile.bsd Spark/src/makefile.bsd
146c146
< all: Nanited
---
> all: Sparkd
187c187
< Nanited: $(OBJS:obj/%=obj/%)
---
> Sparkd: $(OBJS:obj/%=obj/%)
191c191
< 	-rm -f Nanited
---
> 	-rm -f Sparkd
diff Nanite/src/makefile.linux-mingw Spark/src/makefile.linux-mingw
119c119
< all: Nanited.exe
---
> all: Sparkd.exe
143c143
< Nanited.exe: $(OBJS:obj/%=obj/%)
---
> Sparkd.exe: $(OBJS:obj/%=obj/%)
145c145
< 	$(STRIP) Nanited.exe
---
> 	$(STRIP) Sparkd.exe
156c156
< 	-rm -f Nanited.exe
---
> 	-rm -f Sparkd.exe
diff Nanite/src/makefile.mingw Spark/src/makefile.mingw
117c117
< all: Nanited.exe
---
> all: Sparkd.exe
142c142
< Nanited.exe: $(OBJS:obj/%=obj/%)
---
> Sparkd.exe: $(OBJS:obj/%=obj/%)
146c146
< 	-del /Q Nanited
---
> 	-del /Q Sparkd
diff Nanite/src/makefile.osx Spark/src/makefile.osx
6c6
< # Mac OS X makefile for Nanite
---
> # Mac OS X makefile for Spark
28c28
< # Build STATIC if you are redistributing the Nanited binary
---
> # Build STATIC if you are redistributing the Sparkd binary
138c138
< all: Nanited
---
> all: Sparkd
178c178
< Nanited: $(OBJS:obj/%=obj/%)
---
> Sparkd: $(OBJS:obj/%=obj/%)
182c182
< 	-rm -f Nanited
---
> 	-rm -f Sparkd
diff Nanite/src/makefile.unix Spark/src/makefile.unix
166c166
< all: Nanited
---
> all: Sparkd
214c214
< Nanited: $(OBJS:obj/%=obj/%)
---
> Sparkd: $(OBJS:obj/%=obj/%)
218c218
< 	-rm -f Nanited
---
> 	-rm -f Sparkd
diff Nanite/src/miner.cpp Spark/src/miner.cpp
524c524
<     RenameThread("Nanite-miner");
---
>     RenameThread("Spark-miner");
diff Nanite/src/net.cpp Spark/src/net.cpp
383c383
<                      "User-Agent: Nanite\r\n"
---
>                      "User-Agent: Spark\r\n"
402c402
<                      "User-Agent: Nanite\r\n"
---
>                      "User-Agent: Spark\r\n"
419c419
<     RenameThread("Nanite-ext-ip");
---
>     RenameThread("Spark-ext-ip");
644c644
<     RenameThread("Nanite-net");
---
>     RenameThread("Spark-net");
998c998
<     RenameThread("Nanite-UPnP");
---
>     RenameThread("Spark-UPnP");
1059c1059
<         string strDesc = "Nanite " + FormatFullVersion();
---
>         string strDesc = "Spark " + FormatFullVersion();
1149c1149,1150
<     {"104.236.34.234", "104.236.34.234"},
---
>     {"getsparkcoin.com", "178.62.47.198"},
>     {"seed.getsparkcoin.com", "seed.getsparkcoin.com"},
1155c1156
<     RenameThread("Nanite-dnsseed");
---
>     RenameThread("Spark-dnsseed");
1249c1250
<     RenameThread("Nanite-adrdump");
---
>     RenameThread("Spark-adrdump");
1264c1265
<     RenameThread("Nanite-opencon");
---
>     RenameThread("Spark-opencon");
1445c1446
<     RenameThread("Nanite-opencon");
---
>     RenameThread("Spark-opencon");
1576c1577
<     RenameThread("Nanite-msghand");
---
>     RenameThread("Spark-msghand");
1744c1745
<             strError = strprintf(_("Unable to bind to %s on this computer. Nanite is probably already running."), addrBind.ToString().c_str());
---
>             strError = strprintf(_("Unable to bind to %s on this computer. Spark is probably already running."), addrBind.ToString().c_str());
1827c1828
<     RenameThread("Nanite-start");
---
>     RenameThread("Spark-start");
Common Directories: Nanite/src/obj und Spark/src/obj.
Common Directories: Nanite/src/obj-test und Spark/src/obj-test.
diff Nanite/src/protocol.h Spark/src/protocol.h
21c21
<     return testnet ? 13534 : 23534;
---
>     return testnet ? 26665 : 16665;
Common Directories: Nanite/src/qt und Spark/src/qt.
diff Nanite/src/rpcdump.cpp Spark/src/rpcdump.cpp
112c112
<             "importprivkey <Naniteprivkey> [label]\n"
---
>             "importprivkey <Sparkprivkey> [label]\n"
239,240c239,240
<             "dumpprivkey <Naniteaddress>\n"
<             "Reveals the private key corresponding to <Naniteaddress>.");
---
>             "dumpprivkey <Sparkaddress>\n"
>             "Reveals the private key corresponding to <Sparkaddress>.");
247c247
<         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Nanite address");
---
>         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Spark address");
291c291
<     file << strprintf("# Wallet dump created by Nanite %s (%s)\n", CLIENT_BUILD.c_str(), CLIENT_DATE.c_str());
---
>     file << strprintf("# Wallet dump created by Spark %s (%s)\n", CLIENT_BUILD.c_str(), CLIENT_DATE.c_str());
diff Nanite/src/rpcmining.cpp Spark/src/rpcmining.cpp
108c108
<         throw JSONRPCError(-9, "Nanite is not connected!");
---
>         throw JSONRPCError(-9, "Spark is not connected!");
111c111
<         throw JSONRPCError(-10, "Nanite is downloading blocks...");
---
>         throw JSONRPCError(-10, "Spark is downloading blocks...");
243c243
<         throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Nanite is not connected!");
---
>         throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Spark is not connected!");
246c246
<         throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Nanite is downloading blocks...");
---
>         throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Spark is downloading blocks...");
388c388
<         throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Nanite is not connected!");
---
>         throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Spark is not connected!");
391c391
<         throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Nanite is downloading blocks...");
---
>         throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Spark is downloading blocks...");
diff Nanite/src/rpcrawtransaction.cpp Spark/src/rpcrawtransaction.cpp
169c169
<                 throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Nanite address: ")+input.get_str());
---
>                 throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Spark address: ")+input.get_str());
261c261
<             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Nanite address: ")+s.name_);
---
>             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Spark address: ")+s.name_);
diff Nanite/src/rpcsmessage.cpp Spark/src/rpcsmessage.cpp
2c2
< // Copyright (c) 2014 The Nanite developers
---
> // Copyright (c) 2014 The Spark developers
diff Nanite/src/rpcwallet.cpp Spark/src/rpcwallet.cpp
150c150
<             "Returns a new Nanite address for receiving payments.  "
---
>             "Returns a new Spark address for receiving payments.  "
217c217
<             "Returns the current Nanite address for receiving payments to this account.");
---
>             "Returns the current Spark address for receiving payments to this account.");
235c235
<             "setaccount <Naniteaddress> <account>\n"
---
>             "setaccount <Sparkaddress> <account>\n"
240c240
<         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Nanite address");
---
>         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Spark address");
265c265
<             "getaccount <Naniteaddress>\n"
---
>             "getaccount <Sparkaddress>\n"
270c270
<         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Nanite address");
---
>         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Spark address");
305c305
<             "sendtoaddress <Naniteaddress> <amount> [comment] [comment-to]\n"
---
>             "sendtoaddress <Sparkaddress> <amount> [comment] [comment-to]\n"
311c311
<         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Nanite address");
---
>         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Spark address");
368c368
<             "signmessage <Naniteaddress> <message>\n"
---
>             "signmessage <Sparkaddress> <message>\n"
403c403
<             "verifymessage <Naniteaddress> <signature> <message>\n"
---
>             "verifymessage <Sparkaddress> <signature> <message>\n"
440,441c440,441
<             "getreceivedbyaddress <Naniteaddress> [minconf=1]\n"
<             "Returns the total amount received by <Naniteaddress> in transactions with at least [minconf] confirmations.");
---
>             "getreceivedbyaddress <Sparkaddress> [minconf=1]\n"
>             "Returns the total amount received by <Sparkaddress> in transactions with at least [minconf] confirmations.");
447c447
<         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Nanite address");
---
>         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Spark address");
668c668
<             "sendfrom <fromaccount> <toNaniteaddress> <amount> [minconf=1] [comment] [comment-to]\n"
---
>             "sendfrom <fromaccount> <toSparkaddress> <amount> [minconf=1] [comment] [comment-to]\n"
675c675
<         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Nanite address");
---
>         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Spark address");
732c732
<             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Nanite address: ")+s.name_);
---
>             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Spark address: ")+s.name_);
776c776
<             "each key is a Nanite address or hex-encoded public key\n"
---
>             "each key is a Spark address or hex-encoded public key\n"
1377c1377
<     RenameThread("Nanite-key-top");
---
>     RenameThread("Spark-key-top");
1385c1385
<     RenameThread("Nanite-lock-wa");
---
>     RenameThread("Spark-lock-wa");
1556c1556
<     return "wallet encrypted; Nanite server stopping, restart to run with encrypted wallet.  The keypool has been flushed, you need to make a new backup.";
---
>     return "wallet encrypted; Spark server stopping, restart to run with encrypted wallet.  The keypool has been flushed, you need to make a new backup.";
1599,1600c1599,1600
<             "validateaddress <Naniteaddress>\n"
<             "Return information about <Naniteaddress>.");
---
>             "validateaddress <Sparkaddress>\n"
>             "Return information about <Sparkaddress>.");
1628,1629c1628,1629
<             "validatepubkey <Nanitepubkey>\n"
<             "Return information about <Nanitepubkey>.");
---
>             "validatepubkey <Sparkpubkey>\n"
>             "Return information about <Sparkpubkey>.");
diff Nanite/src/smessage.cpp Spark/src/smessage.cpp
2c2
< // Copyright (c) 2014 The Nanite developers
---
> // Copyright (c) 2014 The Spark developers
592c592
<     RenameThread("Nanite-smsg"); // Make this thread recognisable
---
>     RenameThread("Spark-smsg"); // Make this thread recognisable
703c703
<     RenameThread("Nanite-smsg-pow"); // Make this thread recognisable
---
>     RenameThread("Spark-smsg-pow"); // Make this thread recognisable
diff Nanite/src/smessage.h Spark/src/smessage.h
2c2
< // Copyright (c) 2014 The Nanite developers
---
> // Copyright (c) 2014 The Spark developers
Common Directories: Nanite/src/test und Spark/src/test.
diff Nanite/src/util.cpp Spark/src/util.cpp
967c967
<     const char* pszModule = "Nanite";
---
>     const char* pszModule = "Spark";
1016,1019c1016,1019
<     // Windows < Vista: C:\Documents and Settings\Username\Application Data\Nanite
<     // Windows >= Vista: C:\Users\Username\AppData\Roaming\Nanite
<     // Mac: ~/Library/Application Support/Nanite
<     // Unix: ~/.Nanite
---
>     // Windows < Vista: C:\Documents and Settings\Username\Application Data\Spark
>     // Windows >= Vista: C:\Users\Username\AppData\Roaming\Spark
>     // Mac: ~/Library/Application Support/Spark
>     // Unix: ~/.Spark
1022c1022
<     return GetSpecialFolderPath(CSIDL_APPDATA) / "Nanite";
---
>     return GetSpecialFolderPath(CSIDL_APPDATA) / "Spark";
1034c1034
<     return pathRet / "Nanite";
---
>     return pathRet / "Spark";
1037c1037
<     return pathRet / ".Nanite";
---
>     return pathRet / ".Spark";
1079c1079
<     boost::filesystem::path pathConfigFile(GetArg("-conf", "Nanite.conf"));
---
>     boost::filesystem::path pathConfigFile(GetArg("-conf", "Spark.conf"));
1110c1110
<     boost::filesystem::path pathPidFile(GetArg("-pid", "Nanited.pid"));
---
>     boost::filesystem::path pathPidFile(GetArg("-pid", "Sparkd.pid"));
1240c1240
<                     string strMessage = _("Warning: Please check that your computer's date and time are correct! If your clock is wrong Nanite will not work properly.");
---
>                     string strMessage = _("Warning: Please check that your computer's date and time are correct! If your clock is wrong Spark will not work properly.");
1243c1243
<                     uiInterface.ThreadSafeMessageBox(strMessage+" ", string("Nanite"), CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION);
---
>                     uiInterface.ThreadSafeMessageBox(strMessage+" ", string("Spark"), CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION);
diff Nanite/src/version.cpp Spark/src/version.cpp
11c11
< const std::string CLIENT_NAME("Nanite");
---
> const std::string CLIENT_NAME("Spark");
diff Nanite/src/walletdb.cpp Spark/src/walletdb.cpp
536c536
<     RenameThread("Nanite-wallet");
---
>     RenameThread("Spark-wallet");
Common Directories: Nanite/src/xxhash und Spark/src/xxhash.
Common Directories: Nanite/src/zerocoin und Spark/src/zerocoin.