Skip to content

Commit

Permalink
name changes (from external-2014-01-17 with names updated)
Browse files Browse the repository at this point in the history
  • Loading branch information
neutrinocoin committed Mar 2, 2014
1 parent a3adc3e commit f03a856
Show file tree
Hide file tree
Showing 95 changed files with 4,310 additions and 4,355 deletions.
1 change: 1 addition & 0 deletions COPYING
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Copyright (c) 2009-2013 Bitcoin Developers
Copyright (c) 2011-2013 Litecoin Developers
Copyright (c) 2013-2014 Neutrinocoin Developers

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
10 changes: 5 additions & 5 deletions INSTALL
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Building Litecoin
Building Neutrinocoin

See doc/readme-qt.rst for instructions on building Litecoin-Qt,
See doc/readme-qt.rst for instructions on building Neutrinocoin-Qt,
the intended-for-end-users, nice-graphical-interface, reference
implementation of Litecoin.
implementation of Neutrinocoin.

See doc/build-*.txt for instructions on building litecoind,
See doc/build-*.txt for instructions on building neutrinocoind,
the intended-for-services, no-graphical-interface, reference
implementation of Litecoin.
implementation of Neutrinocoin.
6 changes: 3 additions & 3 deletions bitcoin-qt.pro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
TEMPLATE = app
TARGET = litecoin-qt
macx:TARGET = "Litecoin-Qt"
TARGET = neutrinocoin-qt
macx:TARGET = "Neutrinocoin-Qt"
VERSION = 0.8.6.1
INCLUDEPATH += src src/json src/qt
QT += core gui network
Expand Down Expand Up @@ -319,7 +319,7 @@ SOURCES += src/qt/test/test_main.cpp \
HEADERS += src/qt/test/uritests.h
DEPENDPATH += src/qt/test
QT += testlib
TARGET = litecoin-qt_test
TARGET = neutrinocoin-qt_test
DEFINES += BITCOIN_QT_TEST
macx: CONFIG -= app_bundle
}
Expand Down
19 changes: 2 additions & 17 deletions contrib/debian/manpages/bitcoin-qt.1
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ Set database cache size in megabytes (default: 25)
\fB\-timeout=\fR<n>
Specify connection timeout in milliseconds (default: 5000)
.TP
\fB\-proxy=\fR<ip:port>
Connect through socks proxy
.TP
\fB\-socks=\fR<n>
Select the version of socks proxy to use (4\-5, default: 5)
.TP
Expand Down Expand Up @@ -61,23 +58,11 @@ Connect to a node to retrieve peer addresses, and disconnect
\fB\-externalip=\fR<ip>
Specify your own public address
.TP
\fB\-onlynet=\fR<net>
Only connect to nodes in network <net> (IPv4, IPv6 or Tor)
.TP
\fB\-discover\fR
Discover own IP address (default: 1 when listening and no \fB\-externalip\fR)
.TP
\fB\-checkpoints\fR
Only accept block chain matching built\-in checkpoints (default: 1)
.TP
\fB\-listen\fR
Accept connections from outside (default: 1 if no \fB\-proxy\fR or \fB\-connect\fR)
.TP
\fB\-bind=\fR<addr>
Bind to given address and always listen on it. Use [host]:port notation for IPv6
.TP
\fB\-dnsseed\fR
Find peers using DNS lookup (default: 1 unless \fB\-connect\fR)
\fB\-onionseed\fR
Find peers using .onion seed nodes (default: 1 unless \fB\-connect\fR)
.TP
\fB\-banscore=\fR<n>
Threshold for disconnecting misbehaving peers (default: 100)
Expand Down
3 changes: 0 additions & 3 deletions contrib/debian/manpages/bitcoind.1
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ Start minimized
\fB\-datadir=\fR<dir>
Specify data directory
.TP
\fB\-proxy=\fR<ip:port>
Connect through socks4 proxy
.TP
\fB\-addnode=\fR<ip>
Add a node to connect to
.TP
Expand Down
40 changes: 5 additions & 35 deletions doc/Tor.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,7 @@ outgoing connections be anonimized, but more is possible.
but SOCKS4 does not support this. (SOCKS4a does, but isn't
implemented).

-proxy=ip:port Set the proxy server. If SOCKS5 is selected (default), this proxy
server will be used to try to reach .onion addresses as well.

-tor=ip:port Set the proxy server to use for tor hidden services. You do not
need to set this if it's the same as -proxy. You can use -notor
to explicitly disable access to hidden service.

-listen When using -proxy, listening is disabled by default. If you want
to run a hidden service (see next section), you'll need to enable
it explicitly.
-tor=ip:port Set the proxy server to use for tor hidden services.

-connect=X When behind a Tor proxy, you can specify .onion addresses instead
-addnode=X of IP addresses or hostnames in these parameters. It requires
Expand All @@ -39,7 +30,7 @@ outgoing connections be anonimized, but more is possible.

In a typical situation, this suffices to run behind a Tor proxy:

./litecoind -proxy=127.0.0.1:9050
./litecoind -tor=127.0.0.1:9050


2. Run a litecoin hidden server
Expand All @@ -49,7 +40,7 @@ If you configure your Tor system accordingly, it is possible to make your node a
reachable from the Tor network. Add these lines to your /etc/tor/torrc (or equivalent
config file):

HiddenServiceDir /var/lib/tor/liteecoin-service/
HiddenServiceDir /var/lib/tor/litecoin-service/
HiddenServicePort 8777 127.0.0.1:8777

The directory can be different of course, but (both) port numbers should be equal to
Expand All @@ -63,30 +54,9 @@ your litecoind's P2P listen port (8777 by default).
coming from unroutable addresses (such as 127.0.0.1, where the
Tor proxy typically runs).

-listen You'll need to enable listening for incoming connections, as this
is off by default behind a proxy.

-discover When -externalip is specified, no attempt is made to discover local
IPv4 or IPv6 addresses. If you want to run a dual stack, reachable
from both Tor and IPv4 (or IPv6), you'll need to either pass your
other addresses using -externalip, or explicitly enable -discover.
Note that both addresses of a dual-stack system may be easily
linkable using traffic analysis.

In a typical situation, where you're only reachable via Tor, this should suffice:

./litecoind -proxy=127.0.0.1:9050 -externalip=57qr3yd1nyntf5k.onion -listen

(obviously, replace the Onion address with your own). If you don't care too much
about hiding your node, and want to be reachable on IPv4 as well, additionally
specify:

./litecoind ... -discover

and open port 9333 on your firewall (or use -upnp).

If you only want to use Tor to reach onion addresses, but not use it as a proxy
for normal IPv4/IPv6 communication, use:
./litecoind -tor=127.0.0.1:9050 -externalip=57qr3yd1nyntf5k.onion

./litecoind -tor=127.0.0.1:9050 -externalip=57qr3yd1nyntf5k.onion -discover
(obviously, replace the Onion address with your own).

8 changes: 4 additions & 4 deletions share/qt/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleExecutable</key>
<string>Litecoin-Qt</string>
<string>Neutrinocoin-Qt</string>
<key>CFBundleIdentifier</key>
<string>org.litecoin.Litecoin-Qt</string>
<string>org.neutrinocoin.Neutrinocoin-Qt</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleURLName</key>
<string>org.litecoin.LitecoinPayment</string>
<string>org.neutrinocoin.NeutrinocoinPayment</string>
<key>CFBundleURLSchemes</key>
<array>
<string>litecoin</string>
<string>neutrinocoin</string>
</array>
</dict>
</array>
Expand Down
44 changes: 22 additions & 22 deletions share/setup.nsi
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Name Litecoin
Name Neutrinocoin

RequestExecutionLevel highest
SetCompressor /SOLID lzma

# General Symbol Definitions
!define REGKEY "SOFTWARE\$(^Name)"
!define VERSION 0.8.6.1
!define COMPANY "Litecoin project"
!define URL http://www.litecoin.org/
!define COMPANY "Neutrinocoin Foundation"
!define URL http://www.neutrinocoin.org/

# MUI Symbol Definitions
!define MUI_ICON "../share/pixmaps/bitcoin.ico"
Expand All @@ -19,8 +19,8 @@ SetCompressor /SOLID lzma
!define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM
!define MUI_STARTMENUPAGE_REGISTRY_KEY ${REGKEY}
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME StartMenuGroup
!define MUI_STARTMENUPAGE_DEFAULTFOLDER Litecoin
!define MUI_FINISHPAGE_RUN $INSTDIR\litecoin-qt.exe
!define MUI_STARTMENUPAGE_DEFAULTFOLDER Neutrinocoin
!define MUI_FINISHPAGE_RUN $INSTDIR\neutrinocoin-qt.exe
!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
!define MUI_UNWELCOMEFINISHPAGE_BITMAP "../share/pixmaps/nsis-wizard.bmp"
!define MUI_UNFINISHPAGE_NOAUTOCLOSE
Expand All @@ -45,14 +45,14 @@ Var StartMenuGroup
!insertmacro MUI_LANGUAGE English

# Installer attributes
OutFile litecoin-0.8.6.1-win32-setup.exe
InstallDir $PROGRAMFILES\Litecoin
OutFile neutrinocoin-0.8.6.1-win32-setup.exe
InstallDir $PROGRAMFILES\Neutrinocoin
CRCCheck on
XPStyle on
BrandingText " "
ShowInstDetails show
VIProductVersion 0.8.6.1
VIAddVersionKey ProductName Litecoin
VIAddVersionKey ProductName Neutrinocoin
VIAddVersionKey ProductVersion "${VERSION}"
VIAddVersionKey CompanyName "${COMPANY}"
VIAddVersionKey CompanyWebsite "${URL}"
Expand All @@ -66,18 +66,18 @@ ShowUninstDetails show
Section -Main SEC0000
SetOutPath $INSTDIR
SetOverwrite on
File ../release/litecoin-qt.exe
File ../release/neutrinocoin-qt.exe
File /oname=COPYING.txt ../COPYING
File /oname=readme.txt ../doc/README_windows.txt
SetOutPath $INSTDIR\daemon
File ../src/litecoind.exe
File ../src/neutrinocoind.exe
SetOutPath $INSTDIR\src
File /r /x *.exe /x *.o ../src\*.*
SetOutPath $INSTDIR
WriteRegStr HKCU "${REGKEY}\Components" Main 1

# Remove old wxwidgets-based-bitcoin executable and locales:
Delete /REBOOTOK $INSTDIR\litecoin.exe
Delete /REBOOTOK $INSTDIR\neutrinocoin.exe
RMDir /r /REBOOTOK $INSTDIR\locale
SectionEnd

Expand All @@ -87,8 +87,8 @@ Section -post SEC0001
WriteUninstaller $INSTDIR\uninstall.exe
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
CreateDirectory $SMPROGRAMS\$StartMenuGroup
CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Litecoin.lnk" $INSTDIR\litecoin-qt.exe
CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall Litecoin.lnk" $INSTDIR\uninstall.exe
CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Neutrinocoin.lnk" $INSTDIR\neutrinocoin-qt.exe
CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall Neutrinocoin.lnk" $INSTDIR\uninstall.exe
!insertmacro MUI_STARTMENU_WRITE_END
WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)"
WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayVersion "${VERSION}"
Expand All @@ -98,10 +98,10 @@ Section -post SEC0001
WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" UninstallString $INSTDIR\uninstall.exe
WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoModify 1
WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1
WriteRegStr HKCR "litecoin" "URL Protocol" ""
WriteRegStr HKCR "litecoin" "" "URL:Litecoin"
WriteRegStr HKCR "litecoin\DefaultIcon" "" $INSTDIR\litecoin-qt.exe
WriteRegStr HKCR "litecoin\shell\open\command" "" '"$INSTDIR\litecoin-qt.exe" "%1"'
WriteRegStr HKCR "neutrinocoin" "URL Protocol" ""
WriteRegStr HKCR "neutrinocoin" "" "URL:Neutrinocoin"
WriteRegStr HKCR "neutrinocoin\DefaultIcon" "" $INSTDIR\neutrinocoin-qt.exe
WriteRegStr HKCR "neutrinocoin\shell\open\command" "" '"$INSTDIR\neutrinocoin-qt.exe" "%1"'
SectionEnd

# Macro for selecting uninstaller sections
Expand All @@ -119,7 +119,7 @@ done${UNSECTION_ID}:

# Uninstaller sections
Section /o -un.Main UNSEC0000
Delete /REBOOTOK $INSTDIR\litecoin-qt.exe
Delete /REBOOTOK $INSTDIR\neutrinocoin-qt.exe
Delete /REBOOTOK $INSTDIR\COPYING.txt
Delete /REBOOTOK $INSTDIR\readme.txt
RMDir /r /REBOOTOK $INSTDIR\daemon
Expand All @@ -129,17 +129,17 @@ SectionEnd

Section -un.post UNSEC0001
DeleteRegKey HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)"
Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall Litecoin.lnk"
Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Litecoin.lnk"
Delete /REBOOTOK "$SMSTARTUP\Litecoin.lnk"
Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall Neutrinocoin.lnk"
Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Neutrinocoin.lnk"
Delete /REBOOTOK "$SMSTARTUP\Neutrinocoin.lnk"
Delete /REBOOTOK $INSTDIR\uninstall.exe
Delete /REBOOTOK $INSTDIR\debug.log
Delete /REBOOTOK $INSTDIR\db.log
DeleteRegValue HKCU "${REGKEY}" StartMenuGroup
DeleteRegValue HKCU "${REGKEY}" Path
DeleteRegKey /IfEmpty HKCU "${REGKEY}\Components"
DeleteRegKey /IfEmpty HKCU "${REGKEY}"
DeleteRegKey HKCR "litecoin"
DeleteRegKey HKCR "neutrinocoin"
RmDir /REBOOTOK $SMPROGRAMS\$StartMenuGroup
RmDir /REBOOTOK $INSTDIR
Push $R0
Expand Down
2 changes: 1 addition & 1 deletion src/base58.h
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ class CBitcoinAddress : public CBase58Data
public:
enum
{
PUBKEY_ADDRESS = 48, // Litecoin addresses start with L
PUBKEY_ADDRESS = 56, // Neutrinocoin addresses start with P
SCRIPT_ADDRESS = 5,
PUBKEY_ADDRESS_TEST = 111,
SCRIPT_ADDRESS_TEST = 196,
Expand Down
16 changes: 8 additions & 8 deletions src/bitcoinrpc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,10 @@ Value stop(const Array& params, bool fHelp)
if (fHelp || params.size() > 1)
throw runtime_error(
"stop\n"
"Stop Litecoin server.");
"Stop Neutrinocoin server.");
// Shutdown will take long enough that the response should get back
StartShutdown();
return "Litecoin server stopping";
return "Neutrinocoin server stopping";
}


Expand Down Expand Up @@ -298,7 +298,7 @@ string HTTPPost(const string& strMsg, const map<string,string>& mapRequestHeader
{
ostringstream s;
s << "POST / HTTP/1.1\r\n"
<< "User-Agent: litecoin-json-rpc/" << FormatFullVersion() << "\r\n"
<< "User-Agent: neutrinocoin-json-rpc/" << FormatFullVersion() << "\r\n"
<< "Host: 127.0.0.1\r\n"
<< "Content-Type: application/json\r\n"
<< "Content-Length: " << strMsg.size() << "\r\n"
Expand Down Expand Up @@ -329,7 +329,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: litecoin-json-rpc/%s\r\n"
"Server: neutrinocoin-json-rpc/%s\r\n"
"WWW-Authenticate: Basic realm=\"jsonrpc\"\r\n"
"Content-Type: text/html\r\n"
"Content-Length: 296\r\n"
Expand All @@ -356,7 +356,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: litecoin-json-rpc/%s\r\n"
"Server: neutrinocoin-json-rpc/%s\r\n"
"\r\n"
"%s",
nStatus,
Expand Down Expand Up @@ -736,7 +736,7 @@ void StartRPCThreads()
{
unsigned char rand_pwd[32];
RAND_bytes(rand_pwd, 32);
string strWhatAmI = "To use litecoind";
string strWhatAmI = "To use neutrinocoind";
if (mapArgs.count("-server"))
strWhatAmI = strprintf(_("To use the %s option"), "\"-server\"");
else if (mapArgs.count("-daemon"))
Expand All @@ -745,13 +745,13 @@ void StartRPCThreads()
_("%s, you must set a rpcpassword in the configuration file:\n"
"%s\n"
"It is recommended you use the following random password:\n"
"rpcuser=litecoinrpc\n"
"rpcuser=neutrinocoinrpc\n"
"rpcpassword=%s\n"
"(you do not need to remember this password)\n"
"The username and password MUST NOT be the same.\n"
"If the file does not exist, create it with owner-readable-only file permissions.\n"
"It is also recommended to set alertnotify so you are notified of problems;\n"
"for example: alertnotify=echo %%s | mail -s \"Litecoin Alert\" admin@foo.com\n"),
"for example: alertnotify=echo %%s | mail -s \"Neutrinocoin Alert\" admin@foo.com\n"),
strWhatAmI.c_str(),
GetConfigFile().string().c_str(),
EncodeBase58(&rand_pwd[0],&rand_pwd[0]+32).c_str()),
Expand Down
Loading

0 comments on commit f03a856

Please sign in to comment.