fix bugs from commit 00f215c

iamunick · May 20, 2014 · 1daa189 · 1daa189
1 parent 18a2c79
commit 1daa189
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
@@ -43,7 +43,7 @@ void ThreadRPCServer3(void* parg);
 
 static inline unsigned short GetDefaultRPCPort()
 {
-    return GetBoolArg("-testnet", false) ? 18385 : 8385;
+    return GetBoolArg("-testnet", false) ? 27278 : 17178;
 }
 
 Object JSONRPCError(int code, const string& message)
@@ -183,12 +183,12 @@ Value stop(const Array& params, bool fHelp)
         throw runtime_error(
             "stop <detach>\n"
             "<detach> is true or false to detach the database or not for this stop only\n"
-            "Stop BottleCaps server (and possibly override the detachdb config value).");
+            "Stop GrowthCoin server (and possibly override the detachdb config value).");
     // Shutdown will take long enough that the response should get back
     if (params.size() > 0)
         bitdb.SetDetach(params[0].get_bool());
     StartShutdown();
-    return "BottleCaps server stopping";
+    return "GrowthCoin server stopping";
 }
 
 
@@ -302,7 +302,7 @@ string HTTPPost(const string& strMsg, const map<string,string>& mapRequestHeader
 {
     ostringstream s;
     s << "POST / HTTP/1.1\r\n"
-      << "User-Agent: BottleCaps-json-rpc/" << FormatFullVersion() << "\r\n"
+      << "User-Agent: GrowthCoin-json-rpc/" << FormatFullVersion() << "\r\n"
       << "Host: 127.0.0.1\r\n"
       << "Content-Type: application/json\r\n"
       << "Content-Length: " << strMsg.size() << "\r\n"
@@ -333,7 +333,7 @@ static string HTTPReply(int nStatus, const string& strMsg, bool keepalive)
     if (nStatus == HTTP_UNAUTHORIZED)
         return strprintf("HTTP/1.0 401 Authorization Required\r\n"
             "Date: %s\r\n"
-            "Server: BottleCaps-json-rpc/%s\r\n"
+            "Server: GrowthCoin-json-rpc/%s\r\n"
             "WWW-Authenticate: Basic realm=\"jsonrpc\"\r\n"
             "Content-Type: text/html\r\n"
             "Content-Length: 296\r\n"
@@ -360,7 +360,7 @@ static string HTTPReply(int nStatus, const string& strMsg, bool keepalive)
             "Connection: %s\r\n"
             "Content-Length: %"PRIszu"\r\n"
             "Content-Type: application/json\r\n"
-            "Server: BottleCaps-json-rpc/%s\r\n"
+            "Server: GrowthCoin-json-rpc/%s\r\n"
             "\r\n"
             "%s",
         nStatus,
@@ -734,7 +734,7 @@ void ThreadRPCServer2(void* parg)
     {
         unsigned char rand_pwd[32];
         RAND_bytes(rand_pwd, 32);
-        string strWhatAmI = "To use BottleCapsd";
+        string strWhatAmI = "To use GrowthCoind";
         if (mapArgs.count("-server"))
             strWhatAmI = strprintf(_("To use the %s option"), "\"-server\"");
         else if (mapArgs.count("-daemon"))

diff --git a/src/bitcoinrpc.h b/src/bitcoinrpc.h
@@ -186,6 +186,7 @@ extern json_spirit::Value resendtx(const json_spirit::Array& params, bool fHelp)
 extern json_spirit::Value makekeypair(const json_spirit::Array& params, bool fHelp);
 extern json_spirit::Value validatepubkey(const json_spirit::Array& params, bool fHelp);
 extern json_spirit::Value getnewpubkey(const json_spirit::Array& params, bool fHelp);
+extern json_spirit::Value getnetworkhashps(const json_spirit::Array& params, bool fHelp);
 
 extern json_spirit::Value getrawtransaction(const json_spirit::Array& params, bool fHelp); // in rcprawtransaction.cpp
 extern json_spirit::Value listunspent(const json_spirit::Array& params, bool fHelp);

diff --git a/src/net.cpp b/src/net.cpp
@@ -1064,7 +1064,7 @@ void ThreadMapPort2(void* parg)
             }
         }
 
-        string strDesc = "BottleCaps " + FormatFullVersion();
+        string strDesc = "GrowthCoin " + FormatFullVersion();
 #ifndef UPNPDISCOVER_SUCCESS
         /* miniupnpc 1.5 */
         r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype,
@@ -1223,7 +1223,6 @@ void ThreadDNSAddressSeed2(void* parg)
 
 unsigned int pnSeed[] =
 {
-    0x58099DD9
 };
 
 void DumpAddresses()
@@ -1751,7 +1750,7 @@ bool BindListenPort(const CService &addrBind, string& strError)
     {
         int nErr = WSAGetLastError();
         if (nErr == WSAEADDRINUSE)
-            strError = strprintf(_("Unable to bind to %s on this computer. BottleCaps is probably already running."), addrBind.ToString().c_str());
+            strError = strprintf(_("Unable to bind to %s on this computer. GrowthCoin is probably already running."), addrBind.ToString().c_str());
         else
             strError = strprintf(_("Unable to bind to %s on this computer (bind returned error %d, %s)"), addrBind.ToString().c_str(), nErr, strerror(nErr));
         printf("%s\n", strError.c_str());

diff --git a/src/scrypt-x86_64.S b/src/scrypt-x86_64.S
@@ -175,7 +175,7 @@
 
 
 	.text
-	.align 32
+    .align 32
 gen_salsa8_core:
 	# 0: %rdx, %rdi, %rcx, %rsi
 	movq	8(%rsp), %rdi
@@ -274,7 +274,7 @@ gen_salsa8_core:
 
 
 	.text
-	.align 32
+    .align 32
 	.globl scrypt_core
 	.globl _scrypt_core
 scrypt_core:
@@ -525,7 +525,7 @@ gen_scrypt_core_loop2:
 	xmm_salsa8_core_doubleround(); \
 
 
-	.align 32
+    .align 32
 xmm_scrypt_core:
 	# shuffle 1st block into %xmm8-%xmm11
 	movl	60(%rdi), %edx
@@ -837,7 +837,7 @@ xmm_scrypt_core_loop2:
 
 
 	.text
-	.align 32
+    .align 32
 	.globl scrypt_best_throughput
 	.globl _scrypt_best_throughput
 scrypt_best_throughput:
@@ -999,7 +999,7 @@ scrypt_best_throughput_exit:
 
 
 	.text
-	.align 32
+    .align 32
 	.globl scrypt_core_2way
 	.globl _scrypt_core_2way
 scrypt_core_2way:
@@ -1461,7 +1461,7 @@ scrypt_core_2way_loop2:
 
 
 	.text
-	.align 32
+    .align 32
 	.globl scrypt_core_3way
 	.globl _scrypt_core_3way
 scrypt_core_3way:
@@ -1828,4 +1828,4 @@ scrypt_core_3way_loop2:
 	popq	%rbx
 	ret
 
-#endif
+#endif