Skip to content

Commit

Permalink
Replace „Litecoin“ with „Machinecoin“ inside files.
Browse files Browse the repository at this point in the history
  • Loading branch information
Codegenieur committed Jan 6, 2014
1 parent 293c818 commit 60cb6c3
Show file tree
Hide file tree
Showing 108 changed files with 4,449 additions and 4,445 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) 2014 Machinecoin 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 Machinecoin

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

See doc/build-*.txt for instructions on building litecoind,
See doc/build-*.txt for instructions on building machinecoind,
the intended-for-services, no-graphical-interface, reference
implementation of Litecoin.
implementation of Machinecoin.
19 changes: 10 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
Litecoin integration/staging tree
Machinecoin integration/staging tree
================================

http://www.litecoin.org
http://machinecoin.de

Copyright (c) 2009-2013 Bitcoin Developers
Copyright (c) 2011-2013 Litecoin Developers
Copyright (c) 2014 Machinecoin Developers

What is Litecoin?
What is Machinecoin?
----------------

Litecoin is a lite version of Bitcoin using scrypt as a proof-of-work algorithm.
Machinecoin is a lite version of Bitcoin using scrypt as a proof-of-work algorithm.
- 2.5 minute block targets
- subsidy halves in 840k blocks (~4 years)
- ~84 million total coins
Expand All @@ -19,12 +20,12 @@ The rest is the same as Bitcoin.
- 2016 blocks to retarget difficulty

For more information, as well as an immediately useable, binary version of
the Litecoin client sofware, see http://www.litecoin.org.
the Machinecoin client sofware, see http://machinecoin.de.

License
-------

Litecoin is released under the terms of the MIT license. See `COPYING` for more
Machinecoin is released under the terms of the MIT license. See `COPYING` for more
information or see http://opensource.org/licenses/MIT.

Development process
Expand All @@ -33,7 +34,7 @@ Development process
Developers work in their own trees, then submit pull requests when they think
their feature or bug fix is ready.

If it is a simple/trivial/non-controversial change, then one of the Litecoin
If it is a simple/trivial/non-controversial change, then one of the Machinecoin
development team members simply pulls it.

If it is a *more complicated or potentially controversial* change, then the patch
Expand All @@ -47,7 +48,7 @@ controversial.

The `master` branch is regularly built and tested, but is not guaranteed to be
completely stable. [Tags](https://github.com/bitcoin/bitcoin/tags) are created
regularly to indicate new official, stable release versions of Litecoin.
regularly to indicate new official, stable release versions of Machinecoin.

Testing
-------
Expand All @@ -70,5 +71,5 @@ Unit tests for the GUI code are in `src/qt/test/`. To compile and run them:

qmake BITCOIN_QT_TEST=1 -o Makefile.test bitcoin-qt.pro
make -f Makefile.test
./litecoin-qt_test
./machinecoin-qt_test

8 changes: 4 additions & 4 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 = machinecoin-qt
macx:TARGET = "Machinecoin-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 = machinecoin-qt_test
DEFINES += BITCOIN_QT_TEST
macx: CONFIG -= app_bundle
}
Expand Down Expand Up @@ -419,7 +419,7 @@ macx:HEADERS += src/qt/macdockiconhandler.h src/qt/macnotificationhandler.h
macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm src/qt/macnotificationhandler.mm
macx:LIBS += -framework Foundation -framework ApplicationServices -framework AppKit -framework CoreServices
macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0
macx:ICON = src/qt/res/icons/litecoin.icns
macx:ICON = src/qt/res/icons/machinecoin.icns
macx:QMAKE_CFLAGS_THREAD += -pthread
macx:QMAKE_LFLAGS_THREAD += -pthread
macx:QMAKE_CXXFLAGS_THREAD += -pthread
Expand Down
22 changes: 11 additions & 11 deletions contrib/gitian-descriptors/gitian-win32.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: "litecoin"
name: "machinecoin"
suites:
- "precise"
architectures:
Expand All @@ -13,8 +13,8 @@ packages:
- "faketime"
reference_datetime: "2011-01-30 00:00:00"
remotes:
- "url": "https://github.com/litecoin-project/litecoin.git"
"dir": "litecoin"
- "url": "https://github.com/Gitju/machinecoin.git"
"dir": "machinecoin"
files:
- "qt-win32-4.8.3-gitian-r4.zip"
- "boost-win32-1.54.0-gitian-r6.zip"
Expand All @@ -31,7 +31,7 @@ script: |
unzip ../build/bitcoin-deps-win32-gitian-r9.zip
cd $HOME/build/
#
cd litecoin
cd machinecoin
export PATH=$STAGING/host/bin:$PATH
mkdir -p $OUTDIR/src
git archive HEAD | tar -x -C $OUTDIR/src
Expand All @@ -41,19 +41,19 @@ script: |
export FAKETIME=$REFERENCE_DATETIME
export TZ=UTC
ln -s $STAGING $HOME/qt
$HOME/staging/host/bin/qmake -spec unsupported/win32-g++-cross MINIUPNPC_LIB_PATH=$STAGING MINIUPNPC_INCLUDE_PATH=$STAGING BDB_LIB_PATH=$STAGING BDB_INCLUDE_PATH=$STAGING BOOST_LIB_PATH=$STAGING BOOST_INCLUDE_PATH=$STAGING BOOST_LIB_SUFFIX=-mt-s BOOST_THREAD_LIB_SUFFIX=_win32-mt-s OPENSSL_LIB_PATH=$STAGING OPENSSL_INCLUDE_PATH=$STAGING QRENCODE_LIB_PATH=$STAGING QRENCODE_INCLUDE_PATH=$STAGING USE_QRCODE=1 INCLUDEPATH=$STAGING DEFINES=BOOST_THREAD_USE_LIB BITCOIN_NEED_QT_PLUGINS=1 QMAKE_LRELEASE=lrelease QMAKE_CXXFLAGS=-frandom-seed=litecoin USE_BUILD_INFO=1 USE_SSE2=1
$HOME/staging/host/bin/qmake -spec unsupported/win32-g++-cross MINIUPNPC_LIB_PATH=$STAGING MINIUPNPC_INCLUDE_PATH=$STAGING BDB_LIB_PATH=$STAGING BDB_INCLUDE_PATH=$STAGING BOOST_LIB_PATH=$STAGING BOOST_INCLUDE_PATH=$STAGING BOOST_LIB_SUFFIX=-mt-s BOOST_THREAD_LIB_SUFFIX=_win32-mt-s OPENSSL_LIB_PATH=$STAGING OPENSSL_INCLUDE_PATH=$STAGING QRENCODE_LIB_PATH=$STAGING QRENCODE_INCLUDE_PATH=$STAGING USE_QRCODE=1 INCLUDEPATH=$STAGING DEFINES=BOOST_THREAD_USE_LIB BITCOIN_NEED_QT_PLUGINS=1 QMAKE_LRELEASE=lrelease QMAKE_CXXFLAGS=-frandom-seed=machinecoin USE_BUILD_INFO=1 USE_SSE2=1
make $MAKEOPTS
$HOST-strip release/litecoin-qt.exe
cp release/litecoin-qt.exe $OUTDIR/
$HOST-strip release/machinecoin-qt.exe
cp release/machinecoin-qt.exe $OUTDIR/
#
cd src
export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
export FAKETIME=$REFERENCE_DATETIME
export TZ=UTC
make -f makefile.linux-mingw $MAKEOPTS DEPSDIR=$STAGING litecoind.exe USE_UPNP=0 DEBUGFLAGS="-frandom-seed=litecoin" USE_SSE2=1
$HOST-strip litecoind.exe
make -f makefile.linux-mingw $MAKEOPTS DEPSDIR=$STAGING machinecoind.exe USE_UPNP=0 DEBUGFLAGS="-frandom-seed=machinecoin" USE_SSE2=1
$HOST-strip machinecoind.exe
mkdir $OUTDIR/daemon
cp litecoind.exe $OUTDIR/daemon
cp machinecoind.exe $OUTDIR/daemon
cd ..
mkdir nsis
git archive HEAD | tar -x -C nsis
Expand All @@ -62,4 +62,4 @@ script: |
cp ../../release/* ../release/
cp ../../src/*.exe .
makensis ../share/setup.nsi
cp ../share/litecoin-*-win32-setup.exe $OUTDIR/
cp ../share/machinecoin-*-win32-setup.exe $OUTDIR/
14 changes: 7 additions & 7 deletions contrib/gitian-descriptors/gitian.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: "litecoin"
name: "machinecoin"
suites:
- "lucid"
architectures:
Expand All @@ -20,8 +20,8 @@ packages:
- "libpng12-dev"
reference_datetime: "2011-01-30 00:00:00"
remotes:
- "url": "https://github.com/litecoin-project/litecoin.git"
"dir": "litecoin"
- "url": "https://github.com/Gitju/machinecoin.git"
"dir": "machinecoin"
files:
- "miniupnpc-1.6.tar.gz"
- "qrencode-3.2.0.tar.bz2"
Expand All @@ -40,16 +40,16 @@ script: |
make $MAKEOPTS install
cd ..
#
cd litecoin
cd machinecoin
mkdir -p $OUTDIR/src
git archive HEAD | tar -x -C $OUTDIR/src
cp $OUTDIR/src/doc/README.md $OUTDIR
cp $OUTDIR/src/COPYING $OUTDIR
cd src
make -f makefile.unix STATIC=1 OPENSSL_INCLUDE_PATH="$INSTDIR/include" OPENSSL_LIB_PATH="$INSTDIR/lib" $MAKEOPTS litecoind USE_UPNP=0 DEBUGFLAGS= USE_SSE2=1
make -f makefile.unix STATIC=1 OPENSSL_INCLUDE_PATH="$INSTDIR/include" OPENSSL_LIB_PATH="$INSTDIR/lib" $MAKEOPTS machinecoind USE_UPNP=0 DEBUGFLAGS= USE_SSE2=1
mkdir -p $OUTDIR/bin/$GBUILD_BITS
install -s litecoind $OUTDIR/bin/$GBUILD_BITS
install -s machinecoind $OUTDIR/bin/$GBUILD_BITS
cd ..
qmake INCLUDEPATH="$INSTDIR/include" LIBS="-L$INSTDIR/lib" RELEASE=1 USE_QRCODE=1 USE_SSE2=1
make $MAKEOPTS
install litecoin-qt $OUTDIR/bin/$GBUILD_BITS
install machinecoin-qt $OUTDIR/bin/$GBUILD_BITS
2 changes: 1 addition & 1 deletion contrib/macdeploy/fancy.plist
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<integer>370</integer>
<integer>156</integer>
</array>
<key>Litecoin-Qt.app</key>
<key>Machinecoin-Qt.app</key>
<array>
<integer>128</integer>
<integer>156</integer>
Expand Down
2 changes: 1 addition & 1 deletion contrib/macdeploy/macdeployqtplus
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@ if config.dmg is not None:
items_positions.append(itemscript.substitute(params))

params = {
"disk" : "Litecoin-Qt",
"disk" : "Machinecoin-Qt",
"window_bounds" : "300,300,800,620",
"icon_size" : "96",
"background_commands" : "",
Expand Down
2 changes: 1 addition & 1 deletion doc/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ DOXYFILE_ENCODING = UTF-8
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.

PROJECT_NAME = Litecoin
PROJECT_NAME = Machinecoin

# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or
Expand Down
17 changes: 9 additions & 8 deletions doc/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
Litecoin 0.8.x BETA
Machinecoin 0.8.x BETA
====================

Copyright (c) 2009-2013 Bitcoin Developers
Copyright (c) 2011-2013 Litecoin Developers
Copyright (c) 2014 Machinecoin Developers

Distributed under the MIT/X11 software license, see the accompanying
file COPYING or http://www.opensource.org/licenses/mit-license.php.
Expand All @@ -12,25 +13,25 @@ cryptographic software written by Eric Young ([[email protected]](mailto:eay@cry

Intro
---------------------
Litecoin is a free open source peer-to-peer electronic cash system that is
Machinecoin is a free open source peer-to-peer electronic cash system that is
completely decentralized, without the need for a central server or trusted
parties. Users hold the crypto keys to their own money and transact directly
with each other, with the help of a P2P network to check for double-spending.


Setup
---------------------
You need the Qt4 run-time libraries to run Litecoin-Qt. On Debian or Ubuntu:
You need the Qt4 run-time libraries to run Machinecoin-Qt. On Debian or Ubuntu:
`sudo apt-get install libqtgui4`

Unpack the files into a directory and run:

- bin/32/litecoin-qt (GUI, 32-bit)
- bin/32/litecoind (headless, 32-bit)
- bin/64/litecoin-qt (GUI, 64-bit)
- bin/64/litecoind (headless, 64-bit)
- bin/32/machinecoin-qt (GUI, 32-bit)
- bin/32/machinecoind (headless, 32-bit)
- bin/64/machinecoin-qt (GUI, 64-bit)
- bin/64/machinecoind (headless, 64-bit)

See the documentation at the [Litecoin Wiki](http://litecoin.info)
See the documentation at the [Machinecoin Wiki](http://machinecoin.info)
for help and more information.


Expand Down
11 changes: 6 additions & 5 deletions doc/README_windows.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
Litecoin 0.8.x BETA
Machinecoin 0.8.x BETA

Copyright (c) 2009-2013 Bitcoin Developers
Copyright (c) 2011-2013 Litecoin Developers
Copyright (c) 2014 Machinecoin Developers
Distributed under the MIT/X11 software license, see the accompanying
file COPYING or http://www.opensource.org/licenses/mit-license.php.
This product includes software developed by the OpenSSL Project for use in
Expand All @@ -11,18 +12,18 @@ cryptographic software written by Eric Young ([email protected]).

Intro
-----
Litecoin is a free open source peer-to-peer electronic cash system that is
Machinecoin is a free open source peer-to-peer electronic cash system that is
completely decentralized, without the need for a central server or trusted
parties. Users hold the crypto keys to their own money and transact directly
with each other, with the help of a P2P network to check for double-spending.


Setup
-----
Unpack the files into a directory and run litecoin-qt.exe.
Unpack the files into a directory and run machinecoin-qt.exe.

Litecoin-Qt is the original Litecoin client and it builds the backbone of the network.
However, it downloads and stores the entire history of Litecoin transactions;
Machinecoin-Qt is the original Machinecoin client and it builds the backbone of the network.
However, it downloads and stores the entire history of Machinecoin transactions;
depending on the speed of your computer and network connection, the synchronization
process can take anywhere from a few hours to a day or more.

24 changes: 12 additions & 12 deletions doc/Tor.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
TOR SUPPORT IN BITCOIN
======================

It is possible to run Litecoin as a Tor hidden service, and connect to such services.
It is possible to run Machinecoin as a Tor hidden service, and connect to such services.

The following directions assume you have a Tor proxy running on port 9050. Many distributions
default to having a SOCKS proxy listening on port 9050, but others may not.
Expand All @@ -10,10 +10,10 @@ https://www.torproject.org/docs/faq.html.en#TBBSocksPort for how to properly
configure Tor.


1. Run litecoin behind a Tor proxy
1. Run machinecoin behind a Tor proxy
---------------------------------

The first step is running Litecoin behind a Tor proxy. This will already make all
The first step is running Machinecoin behind a Tor proxy. This will already make all
outgoing connections be anonimized, but more is possible.

-socks=5 SOCKS5 supports connecting-to-hostname, which can be used instead
Expand All @@ -39,26 +39,26 @@ 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
./machinecoind -proxy=127.0.0.1:9050


2. Run a litecoin hidden server
2. Run a machinecoin hidden server
------------------------------

If you configure your Tor system accordingly, it is possible to make your node also
reachable from the Tor network. Add these lines to your /etc/tor/torrc (or equivalent
config file):

HiddenServiceDir /var/lib/tor/litecoin-service/
HiddenServiceDir /var/lib/tor/machinecoin-service/
HiddenServicePort 9333 127.0.0.1:9333

The directory can be different of course, but (both) port numbers should be equal to
your litecoind's P2P listen port (9333 by default).
your machinecoind's P2P listen port (9333 by default).

-externalip=X You can tell litecoin about its publicly reachable address using
-externalip=X You can tell machinecoin about its publicly reachable address using
this option, and this can be a .onion address. Given the above
configuration, you can find your onion address in
/var/lib/tor/litecoin-service/hostname. Onion addresses are given
/var/lib/tor/machinecoin-service/hostname. Onion addresses are given
preference for your node to advertize itself with, for connections
coming from unroutable addresses (such as 127.0.0.1, where the
Tor proxy typically runs).
Expand All @@ -75,18 +75,18 @@ your litecoind's P2P listen port (9333 by default).

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
./machinecoind -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
./machinecoind ... -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 -discover
./machinecoind -tor=127.0.0.1:9050 -externalip=57qr3yd1nyntf5k.onion -discover

Loading

0 comments on commit 60cb6c3

Please sign in to comment.