Skip to content

Commit

Permalink
Renamed lux (PIVX forked)
Browse files Browse the repository at this point in the history
  • Loading branch information
216k155 committed Dec 19, 2017
1 parent 9e009fe commit 26aacc5
Show file tree
Hide file tree
Showing 83 changed files with 803 additions and 803 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -85,7 +85,7 @@ src/qt/test/moc*.cpp
*.qm
Makefile
pivx-qt
PIVX-Qt.app
LUXX-Qt.app

# Unit-tests
Makefile.test
Expand Down
6 changes: 3 additions & 3 deletions configure.ac
Expand Up @@ -19,9 +19,9 @@ BITCOIN_TX_NAME=lux-tx

AC_CANONICAL_HOST

AH_TOP([#ifndef PIV_CONFIG_H])
AH_TOP([#define PIV_CONFIG_H])
AH_BOTTOM([#endif //PIV_CONFIG_H])
AH_TOP([#ifndef LUX_CONFIG_H])
AH_TOP([#define LUX_CONFIG_H])
AH_BOTTOM([#endif //LUX_CONFIG_H])

dnl faketime breaks configure and is only needed for make. Disable it here.
unset FAKETIME
Expand Down
2 changes: 1 addition & 1 deletion contrib/debian/examples/lux.conf
Expand Up @@ -101,7 +101,7 @@
# both prior transactions and several dozen future transactions.
#keypool=100

# Pay an optional transaction fee every time you send PIVs. Transactions with fees
# Pay an optional transaction fee every time you send LUXs. Transactions with fees
# are more likely than free transactions to be included in generated blocks, so may
# be validated sooner.
#paytxfee=0.00
Expand Down
2 changes: 1 addition & 1 deletion contrib/debian/manpages/lux-qt.1
@@ -1,4 +1,4 @@
.TH PIV-QT "1" "February 2017" "lux-qt 1"
.TH LUX-QT "1" "February 2017" "lux-qt 1"
.SH NAME
lux-qt \- peer-to-peer network based digital currency
.SH DESCRIPTION
Expand Down
8 changes: 4 additions & 4 deletions contrib/debian/manpages/lux.conf.5
@@ -1,4 +1,4 @@
.TH PIV.CONF "5" "January 2011" "lux.conf 3.19"
.TH LUX.CONF "5" "January 2011" "lux.conf 3.19"
.SH NAME
lux.conf \- lux configuration file
.SH SYNOPSIS
Expand Down Expand Up @@ -59,16 +59,16 @@ Acceptable ciphers (default: TLSv1+HIGH:\:!SSLv2:\:!aNULL:\:!eNULL:\:!AH:\:!3DES
.SH MISCELLANEOUS OPTIONS
.TP
\fBgen=\fR[\fI'0'\fR|\fI'1'\fR]
Enable or disable attempt to generate PIVs.
Enable or disable attempt to generate LUXs.
.TP
\fB4way=\fR[\fI'0'\fR|\fI'1'\fR]
Enable or disable use SSE instructions to try to generate PIVs faster.
Enable or disable use SSE instructions to try to generate LUXs faster.
.TP
\fBkeypool=\fR\fI'100'\fR
Pre-generate this many public/private key pairs, so wallet backups will be valid for both prior transactions and several dozen future transactions.
.TP
\fBpaytxfee=\fR\fI'0.00'\fR
Pay an optional transaction fee every time you send PIVs. Transactions with fees are more likely than free transactions to be included in generated blocks, so may be validated sooner.
Pay an optional transaction fee every time you send LUXs. Transactions with fees are more likely than free transactions to be included in generated blocks, so may be validated sooner.
.TP
\fBallowreceivebyip=\fR\fI'1'\fR
Allow direct connections for the 'pay via IP address' feature.
Expand Down
6 changes: 3 additions & 3 deletions contrib/debian/manpages/luxd.1
@@ -1,4 +1,4 @@
.TH PIVD "1" "February 2017" "luxd 2.1.4.1"
.TH LUXD "1" "February 2017" "luxd 2.1.4.1"
.SH NAME
Lux \- peer-to-peer network based digital currency
.SH SYNOPSIS
Expand Down Expand Up @@ -112,7 +112,7 @@ Returns the number of connections to other nodes.
Returns the proof-of-work difficulty as a multiple of the minimum difficulty.
.TP
\fBgetgenerate\fR
Returns boolean true if server is trying to generate PIV, false otherwise.
Returns boolean true if server is trying to generate LUX, false otherwise.
.TP
\fBsetgenerate 'generate' ['genproclimit']\fR
Generation is limited to ['genproclimit'] processors, \-1 is unlimited.
Expand Down Expand Up @@ -183,7 +183,7 @@ Returns a list of the last ['count'] transactions for 'account' \- for all accou
Moves funds between accounts.
.TP
\fBsendfrom* <'account'> <'luxaddress'> <'amount'> ['minconf=1'] ['comment'] ['comment-to']\fR
Sends amount from account's balance to 'luxaddress'. This method will fail if there is less than amount PIV with ['minconf'] confirmations in the account's balance (unless account is the empty-string-named default account; it behaves like the *sendtoaddress* method). Returns transaction ID on success.
Sends amount from account's balance to 'luxaddress'. This method will fail if there is less than amount LUX with ['minconf'] confirmations in the account's balance (unless account is the empty-string-named default account; it behaves like the *sendtoaddress* method). Returns transaction ID on success.
.TP
\fBsendtoaddress 'luxaddress' 'amount' ['comment'] ['comment-to']\fR
Sends amount from the server's available balance to 'luxaddress'. amount is a real and is rounded to the nearest 0.01. Returns transaction id on success.
Expand Down
6 changes: 3 additions & 3 deletions contrib/spendfrom/spendfrom.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
# Use the raw transactions API to spend PIVs received on particular addresses,
# Use the raw transactions API to spend LUXs received on particular addresses,
# and send any change back to that same address.
#
# Example usage:
Expand Down Expand Up @@ -221,9 +221,9 @@ def main():

parser = optparse.OptionParser(usage="%prog [options]")
parser.add_option("--from", dest="fromaddresses", default=None,
help="addresses to get PIVs from")
help="addresses to get LUXs from")
parser.add_option("--to", dest="to", default=None,
help="address to get send PIVs to")
help="address to get send LUXs to")
parser.add_option("--amount", dest="amount", default=None,
help="amount to send")
parser.add_option("--fee", dest="fee", default="0.0",
Expand Down
2 changes: 1 addition & 1 deletion doc/developer-notes.md
Expand Up @@ -118,7 +118,7 @@ to see it.

**testnet mode**

Run with the -testnet option to run with "play PIVs (tPIV)" on the test network, if you
Run with the -testnet option to run with "play LUXs (tLUX)" on the test network, if you
are testing multi-machine code that needs to operate across the internet.

**DEBUG_LOCKORDER**
Expand Down
6 changes: 3 additions & 3 deletions doc/release-notes.md
Expand Up @@ -40,10 +40,10 @@ frequently tested on them.
Notable Changes
===============

Zerocoin (zPIV) Protocol
Zerocoin (zLUX) Protocol
---------------------

At long last, the zPIV release is here and the zerocoin protocol has been fully implemented! This allows users to send transactions with 100% fungible coins and absolutely zero history or link-ability to their previous owners.
At long last, the zLUX release is here and the zerocoin protocol has been fully implemented! This allows users to send transactions with 100% fungible coins and absolutely zero history or link-ability to their previous owners.

Full and comprehensive details about the process and the use will be posted here during the days between Oct 6 and Oct 13.

Expand All @@ -65,7 +65,7 @@ the code changes and accompanying discussion, both the pull request and
git merge commit are mentioned.

### Broad Features
- #264 `15e84e5` zPIV is here! (Fuzzbawls Mrs-X Presstab Spock LUX)
- #264 `15e84e5` zLUX is here! (Fuzzbawls Mrs-X Presstab Spock LUX)

### P2P Protocol and Network Code
- #242 `0ecd77f` [P2P] Improve TOR service connectivity (Fuzzbawls)
Expand Down
18 changes: 9 additions & 9 deletions doc/release-notes/release-notes-4.0.0.md
Expand Up @@ -12,9 +12,9 @@ Please report bugs using the issue tracker at github:
Recommended Update
==============

LUX Core v4.0.0 is a recommended, semi-mandatory update for all users. This release contains transaction creation bug fixes for zPIV spends, automint calculation adjustments, and other various updates/fixes.
LUX Core v4.0.0 is a recommended, semi-mandatory update for all users. This release contains transaction creation bug fixes for zLUX spends, automint calculation adjustments, and other various updates/fixes.

zPIV spending requires this update.
zLUX spending requires this update.

How to Upgrade
==============
Expand Down Expand Up @@ -45,21 +45,21 @@ Notable Changes

Auto Wallet Backup
---------------------
In addition to the automatic wallet backup that is done at each start of the client, a new automatic backup function has been added that will, by default, create a backup of the wallet file during each zPIV mint operation (zPIV spends which re-mint their change are also included in this). This functionality is controlled by the `-backupzlux` command-line option, which defaults to `1` (enabled, auto-backup).
In addition to the automatic wallet backup that is done at each start of the client, a new automatic backup function has been added that will, by default, create a backup of the wallet file during each zLUX mint operation (zLUX spends which re-mint their change are also included in this). This functionality is controlled by the `-backupzlux` command-line option, which defaults to `1` (enabled, auto-backup).

Users that wish to prevent this behavior (not recommended) can pass `-backupzlux=0` at the command-line when starting the client, or add `backupzlux=0` to their `lux.conf` file.

zPIV Automint Calculations
zLUX Automint Calculations
---------------------
A bug in the automint calculations was made apparent on mainnet when block times exceeded expectations, resulting in zPIV mint transactions that were in an unconfirmed state to still be treated as if they had never been minted. This caused automint to effectively mint more than what was intended.
A bug in the automint calculations was made apparent on mainnet when block times exceeded expectations, resulting in zLUX mint transactions that were in an unconfirmed state to still be treated as if they had never been minted. This caused automint to effectively mint more than what was intended.

zPIV Spending Fix
zLUX Spending Fix
---------------------
The size of zPIV spend transactions is knowingly larger than normal transactions, and while this was expected, a much stricter check against the scriptsig size is used for mainnet, causing the transactions to be rejected by the mempool, and thus not being packaged into any blocks.
The size of zLUX spend transactions is knowingly larger than normal transactions, and while this was expected, a much stricter check against the scriptsig size is used for mainnet, causing the transactions to be rejected by the mempool, and thus not being packaged into any blocks.

zPIV Transaction Recovery
zLUX Transaction Recovery
---------------------
Due to the aforementioned issue with zPIV spending, users may find that their attempted spends are now conflicted and zPIV balances are not represented as expected. "Recovery" of these transactions can be done using the following methods:
Due to the aforementioned issue with zLUX spending, users may find that their attempted spends are now conflicted and zLUX balances are not represented as expected. "Recovery" of these transactions can be done using the following methods:

1. GUI:

Expand Down
4 changes: 2 additions & 2 deletions src/activemasternode.h
Expand Up @@ -33,7 +33,7 @@ class CActiveMasternode
/// Register any Masternode
bool Register(CTxIn vin, CService service, CKey key, CPubKey pubKey, CKey keyMasternode, CPubKey pubKeyMasternode, std::string& errorMessage);

/// Get 10000 PIV input that can be used for the Masternode
/// Get 10000 LUX input that can be used for the Masternode
bool GetMasterNodeVin(CTxIn& vin, CPubKey& pubkey, CKey& secretKey, std::string strTxHash, std::string strOutputIndex);
bool GetVinFromOutput(COutput out, CTxIn& vin, CPubKey& pubkey, CKey& secretKey);

Expand Down Expand Up @@ -61,7 +61,7 @@ class CActiveMasternode
/// Register remote Masternode
bool Register(std::string strService, std::string strKey, std::string strTxHash, std::string strOutputIndex, std::string& errorMessage);

/// Get 10000 PIV input that can be used for the Masternode
/// Get 10000 LUX input that can be used for the Masternode
bool GetMasterNodeVin(CTxIn& vin, CPubKey& pubkey, CKey& secretKey);
vector<COutput> SelectCoinsMasternode();

Expand Down
2 changes: 1 addition & 1 deletion src/amount.cpp
Expand Up @@ -27,5 +27,5 @@ CAmount CFeeRate::GetFee(size_t nSize) const

std::string CFeeRate::ToString() const
{
return strprintf("%d.%08d PIV/kB", nSatoshisPerK / COIN, nSatoshisPerK % COIN);
return strprintf("%d.%08d LUX/kB", nSatoshisPerK / COIN, nSatoshisPerK % COIN);
}
12 changes: 6 additions & 6 deletions src/chainparams.cpp
@@ -1,7 +1,7 @@
// Copyright (c) 2010 Satoshi Nakamoto
// Copyright (c) 2009-2014 The Bitcoin developers
// Copyright (c) 2014-2015 The Dash developers
// Copyright (c) 2015-2017 The PIVX developers
// Copyright (c) 2015-2017 The LUXX developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand Down Expand Up @@ -109,15 +109,15 @@ class CMainParams : public CChainParams
pchMessageStart[3] = 0x3l;
vAlertPubKey = ParseHex("042d13c016ed91528241bcff222989769417eb10cdb679228c91e26e26900eb9fd053cd9f16a9a2894ad5ebbd551be1a4bd23bd55023679be17f0bd3a16e6fbeba");
nDefaultPort = 28666;
bnProofOfWorkLimit = ~uint256(0) >> 20; // PIVX starting difficulty is 1 / 2^12
bnProofOfWorkLimit = ~uint256(0) >> 20; // LUXX starting difficulty is 1 / 2^12
nSubsidyHalvingInterval = 210000;
nMaxReorganizationDepth = 100;
nEnforceBlockUpgradeMajority = 750;
nRejectBlockOutdatedMajority = 950;
nToCheckBlockUpgradeMajority = 1000;
nMinerThreads = 0;
nTargetTimespan = 1 * 60; // PIVX: 1 day
nTargetSpacing = 1 * 60; // PIVX: 1 minute
nTargetTimespan = 1 * 60; // LUXX: 1 day
nTargetSpacing = 1 * 60; // LUXX: 1 minute
nMaturity = 100;
nMasternodeCountDrift = 20;
nMaxMoneyOut = 21000000 * COIN;
Expand Down Expand Up @@ -239,8 +239,8 @@ class CTestNetParams : public CMainParams
nRejectBlockOutdatedMajority = 75;
nToCheckBlockUpgradeMajority = 100;
nMinerThreads = 0;
nTargetTimespan = 1 * 60; // PIVX: 1 day
nTargetSpacing = 1 * 60; // PIVX: 1 minute
nTargetTimespan = 1 * 60; // LUXX: 1 day
nTargetSpacing = 1 * 60; // LUXX: 1 minute
nLastPOWBlock = 200;
nMaturity = 15;
nMasternodeCountDrift = 4;
Expand Down
6 changes: 3 additions & 3 deletions src/config/lux-config.h
@@ -1,9 +1,9 @@
/* src/config/lux-config.h. Generated from lux-config.h.in by configure. */
/* src/config/lux-config.h.in. Generated from configure.ac by autoheader. */

#ifndef PIV_CONFIG_H
#ifndef LUX_CONFIG_H

#define PIV_CONFIG_H
#define LUX_CONFIG_H

/* Define if building universal (internal helper macro) */
/* #undef AC_APPLE_UNIVERSAL_BUILD */
Expand Down Expand Up @@ -340,4 +340,4 @@
/* Define for large files, on AIX-style hosts. */
/* #undef _LARGE_FILES */

#endif //PIV_CONFIG_H
#endif //LUX_CONFIG_H
6 changes: 3 additions & 3 deletions src/config/lux-config.h.in
@@ -1,8 +1,8 @@
/* src/config/lux-config.h.in. Generated from configure.ac by autoheader. */

#ifndef PIV_CONFIG_H
#ifndef LUX_CONFIG_H

#define PIV_CONFIG_H
#define LUX_CONFIG_H

/* Define if building universal (internal helper macro) */
#undef AC_APPLE_UNIVERSAL_BUILD
Expand Down Expand Up @@ -339,4 +339,4 @@
/* Define for large files, on AIX-style hosts. */
#undef _LARGE_FILES

#endif //PIV_CONFIG_H
#endif //LUX_CONFIG_H
20 changes: 10 additions & 10 deletions src/init.cpp
Expand Up @@ -333,7 +333,7 @@ std::string HelpMessage(HelpMessageMode mode)
#endif
strUsage += HelpMessageOpt("-reindex", _("Rebuild block chain index from current blk000??.dat files") + " " + _("on startup"));
strUsage += HelpMessageOpt("-reindexaccumulators", _("Reindex the accumulator database") + " " + _("on startup"));
strUsage += HelpMessageOpt("-reindexmoneysupply", _("Reindex the PIV and zPIV money supply statistics") + " " + _("on startup"));
strUsage += HelpMessageOpt("-reindexmoneysupply", _("Reindex the LUX and zLUX money supply statistics") + " " + _("on startup"));
strUsage += HelpMessageOpt("-resync", _("Delete blockchain folders and resync from scratch") + " " + _("on startup"));
#if !defined(WIN32)
strUsage += HelpMessageOpt("-sysperms", _("Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)"));
Expand Down Expand Up @@ -386,9 +386,9 @@ std::string HelpMessage(HelpMessageMode mode)
strUsage += HelpMessageOpt("-disablewallet", _("Do not load the wallet and disable wallet RPC calls"));
strUsage += HelpMessageOpt("-keypool=<n>", strprintf(_("Set key pool size to <n> (default: %u)"), 100));
if (GetBoolArg("-help-debug", false))
strUsage += HelpMessageOpt("-mintxfee=<amt>", strprintf(_("Fees (in PIV/Kb) smaller than this are considered zero fee for transaction creation (default: %s)"),
strUsage += HelpMessageOpt("-mintxfee=<amt>", strprintf(_("Fees (in LUX/Kb) smaller than this are considered zero fee for transaction creation (default: %s)"),
FormatMoney(CWallet::minTxFee.GetFeePerK())));
strUsage += HelpMessageOpt("-paytxfee=<amt>", strprintf(_("Fee (in PIV/kB) to add to transactions you send (default: %s)"), FormatMoney(payTxFee.GetFeePerK())));
strUsage += HelpMessageOpt("-paytxfee=<amt>", strprintf(_("Fee (in LUX/kB) to add to transactions you send (default: %s)"), FormatMoney(payTxFee.GetFeePerK())));
strUsage += HelpMessageOpt("-rescan", _("Rescan the block chain for missing wallet transactions") + " " + _("on startup"));
strUsage += HelpMessageOpt("-salvagewallet", _("Attempt to recover private keys from a corrupt wallet.dat") + " " + _("on startup"));
strUsage += HelpMessageOpt("-sendfreetransactions", strprintf(_("Send transactions as zero-fee transactions if possible (default: %u)"), 0));
Expand Down Expand Up @@ -450,7 +450,7 @@ std::string HelpMessage(HelpMessageMode mode)
strUsage += HelpMessageOpt("-relaypriority", strprintf(_("Require high priority for relaying free or low-fee transactions (default:%u)"), 1));
strUsage += HelpMessageOpt("-maxsigcachesize=<n>", strprintf(_("Limit size of signature cache to <n> entries (default: %u)"), 50000));
}
strUsage += HelpMessageOpt("-minrelaytxfee=<amt>", strprintf(_("Fees (in PIV/Kb) smaller than this are considered zero fee for relaying (default: %s)"), FormatMoney(::minRelayTxFee.GetFeePerK())));
strUsage += HelpMessageOpt("-minrelaytxfee=<amt>", strprintf(_("Fees (in LUX/Kb) smaller than this are considered zero fee for relaying (default: %s)"), FormatMoney(::minRelayTxFee.GetFeePerK())));
strUsage += HelpMessageOpt("-printtoconsole", strprintf(_("Send trace/debug info to console instead of debug.log file (default: %u)"), 0));
if (GetBoolArg("-help-debug", false)) {
strUsage += HelpMessageOpt("-printpriority", strprintf(_("Log transaction priority and fee per kB when mining blocks (default: %u)"), 0));
Expand Down Expand Up @@ -487,7 +487,7 @@ std::string HelpMessage(HelpMessageMode mode)
strUsage += HelpMessageOpt("-preferredDenom=<n>", strprintf(_("Preferred Denomination for automatically minted Zerocoin (1/5/10/50/100/500/1000/5000), 0 for no preference. default: %u)"), 0));
strUsage += HelpMessageOpt("-backupzlux=<n>", strprintf(_("Enable automatic wallet backups triggered after each zLux minting (0-1, default: %u)"), 1));

// strUsage += " -anonymizeluxamount=<n> " + strprintf(_("Keep N PIV anonymized (default: %u)"), 0) + "\n";
// strUsage += " -anonymizeluxamount=<n> " + strprintf(_("Keep N LUX anonymized (default: %u)"), 0) + "\n";
// strUsage += " -liquidityprovider=<n> " + strprintf(_("Provide liquidity to Obfuscation by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees)"), 0) + "\n";

strUsage += HelpMessageGroup(_("SwiftX options:"));
Expand Down Expand Up @@ -1358,10 +1358,10 @@ bool AppInit2(boost::thread_group& threadGroup)
// Recalculate money supply for blocks that are impacted by accounting issue after zerocoin activation
if (GetBoolArg("-reindexmoneysupply", false)) {
if (chainActive.Height() > Params().Zerocoin_StartHeight()) {
RecalculateZPIVMinted();
RecalculateZPIVSpent();
RecalculateZLUXMinted();
RecalculateZLUXSpent();
}
RecalculatePIVSupply(1);
RecalculateLUXSupply(1);
}

// Force recalculation of accumulators.
Expand Down Expand Up @@ -1743,8 +1743,8 @@ bool AppInit2(boost::thread_group& threadGroup)
is convertable to another.
For example:
1PIV+1000 == (.1PIV+100)*10
10PIV+10000 == (1PIV+1000)*10
1LUX+1000 == (.1LUX+100)*10
10LUX+10000 == (1LUX+1000)*10
*/
obfuScationDenominations.push_back((10000 * COIN) + 10000000);
obfuScationDenominations.push_back((1000 * COIN) + 1000000);
Expand Down

0 comments on commit 26aacc5

Please sign in to comment.