Commit dff8eb1d authored by barrystyle's avatar barrystyle Committed by GitHub

Merge pull request #1 from minerric/master

Cleanup files to compile mac
parents 3d010fe0 cdabf3f0
description "PIVX Core Daemon"
description "MERGE Core Daemon"
start on runlevel [2345]
stop on starting rc RUNLEVEL=[016]
......
#!/bin/bash
#
# MERGEd The PIVX core server.
# MERGEd The MERGE core server.
#
#
# chkconfig: 345 80 20
......
......@@ -16,8 +16,8 @@ BITCOIND_USER=${BITCOIND_USER:-MERGE}
BITCOIND_GROUP=${BITCOIND_GROUP:-MERGE}
BITCOIND_BIN=${BITCOIND_BIN:-/usr/bin/MERGEd}
name="PIVX Core Daemon"
description="PIVX crypto-currency p2p network daemon"
name="MERGE Core Daemon"
description="MERGE crypto-currency p2p network daemon"
command="/usr/bin/MERGEd"
command_args="-pid=\"${BITCOIND_PIDFILE}\" \
......
[Unit]
Description=PIVX's distributed currency daemon
Description=MERGE's distributed currency daemon
After=network.target
[Service]
......
......@@ -54,7 +54,7 @@ ds['.']['icvp'] = icvp
ds['.']['vSrn'] = ('long', 1)
ds['Applications']['Iloc'] = (370, 156)
ds['PIVX-Qt.app']['Iloc'] = (128, 156)
ds['MERGE-Qt.app']['Iloc'] = (128, 156)
ds.flush()
ds.close()
......@@ -155,7 +155,7 @@ class FrameworkInfo(object):
class ApplicationBundleInfo(object):
def __init__(self, path):
self.path = path
appName = "PIVX-Qt"
appName = "MERGE-Qt"
self.binaryPath = os.path.join(path, "Contents", "MacOS", appName)
if not os.path.exists(self.binaryPath):
raise RuntimeError("Could not find bundle binary for " + path)
......@@ -604,7 +604,7 @@ else:
# ------------------------------------------------
target = os.path.join("dist", "PIVX-Qt.app")
target = os.path.join("dist", "MERGE-Qt.app")
if verbose >= 2:
print("+ Copying source bundle +")
......
......@@ -26,7 +26,7 @@ import collections
PATTERN_IPV4 = re.compile(r"^((\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})):(\d+)$")
PATTERN_IPV6 = re.compile(r"^\[([0-9a-z:]+)\]:(\d+)$")
PATTERN_ONION = re.compile(r"^([abcdefghijklmnopqrstuvwxyz234567]{16}\.onion):(\d+)$")
PATTERN_AGENT = re.compile(r"^(/PIVXCore:2.2.(0|1|99)/)$")
PATTERN_AGENT = re.compile(r"^(/MERGECore:2.2.(0|1|99)/)$")
def parseline(line):
sline = line.split()
......
......@@ -35,9 +35,9 @@ def check_json_precision():
def determine_db_dir():
"""Return the default location of The Merge data directory"""
if platform.system() == "Darwin":
return os.path.expanduser("~/Library/Application Support/PIVX/")
return os.path.expanduser("~/Library/Application Support/MERGE/")
elif platform.system() == "Windows":
return os.path.join(os.environ['APPDATA'], "PIVX")
return os.path.join(os.environ['APPDATA'], "MERGE")
return os.path.expanduser("~/.MERGE")
def read_bitcoin_config(dbdir):
......
......@@ -29,7 +29,7 @@
<string>????</string>
<key>CFBundleExecutable</key>
<string>PIVX-Qt</string>
<string>MERGE-Qt</string>
<key>CFBundleIdentifier</key>
<string>io.MERGE.Merge-Qt</string>
......
......@@ -11,38 +11,38 @@ TEST_QT_H = \
qt/test/paymentrequestdata.h \
qt/test/paymentservertests.h
qt_test_test_pivx_qt_CPPFLAGS = $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \
qt_test_test_merge_qt_CPPFLAGS = $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \
$(QT_INCLUDES) $(QT_TEST_INCLUDES) $(PROTOBUF_CFLAGS)
qt_test_test_pivx_qt_SOURCES = \
qt_test_test_merge_qt_SOURCES = \
qt/test/test_main.cpp \
qt/test/uritests.cpp \
$(TEST_QT_H)
if ENABLE_WALLET
qt_test_test_pivx_qt_SOURCES += \
qt_test_test_merge_qt_SOURCES += \
qt/test/paymentservertests.cpp
endif
nodist_qt_test_test_pivx_qt_SOURCES = $(TEST_QT_MOC_CPP)
nodist_qt_test_test_merge_qt_SOURCES = $(TEST_QT_MOC_CPP)
qt_test_test_pivx_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_SERVER)
qt_test_test_merge_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_SERVER)
if ENABLE_WALLET
qt_test_test_pivx_qt_LDADD += $(LIBBITCOIN_WALLET)
qt_test_test_merge_qt_LDADD += $(LIBBITCOIN_WALLET)
endif
if ENABLE_ZMQ
qt_test_test_pivx_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
qt_test_test_merge_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
endif
qt_test_test_pivx_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBBITCOIN_ZEROCOIN) $(LIBLEVELDB) \
qt_test_test_merge_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBBITCOIN_ZEROCOIN) $(LIBLEVELDB) \
$(LIBMEMENV) $(BOOST_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) $(QT_LIBS) \
$(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \
$(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
qt_test_test_pivx_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
qt_test_test_merge_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
CLEAN_BITCOIN_QT_TEST = $(TEST_QT_MOC_CPP) qt/test/*.gcda qt/test/*.gcno
CLEANFILES += $(CLEAN_BITCOIN_QT_TEST)
test_pivx_qt : qt/test/test_merge-qt$(EXEEXT)
test_merge_qt : qt/test/test_merge-qt$(EXEEXT)
test_pivx_qt_clean: FORCE
rm -f $(CLEAN_BITCOIN_QT_TEST) $(qt_test_test_pivx_qt_OBJECTS)
test_merge_qt_clean: FORCE
rm -f $(CLEAN_BITCOIN_QT_TEST) $(qt_test_test_merge_qt_OBJECTS)
......@@ -2,8 +2,8 @@
// Copyright (c) 2018 The Merge developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef PIVX_ACCUMULATORMAP_H
#define PIVX_ACCUMULATORMAP_H
#ifndef MERGE_ACCUMULATORMAP_H
#define MERGE_ACCUMULATORMAP_H
#include "libzerocoin/Accumulator.h"
#include "libzerocoin/Coin.h"
......@@ -21,5 +21,4 @@ public:
uint256 GetCheckpoint();
void Reset();
};
#endif //PIVX_ACCUMULATORMAP_H
#endif //MERGE_ACCUMULATORMAP_H
......@@ -3,8 +3,8 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef PIVX_ACCUMULATORS_H
#define PIVX_ACCUMULATORS_H
#ifndef MERGE_ACCUMULATORS_H
#define MERGE_ACCUMULATORS_H
#include "libzerocoin/Accumulator.h"
#include "libzerocoin/Denominations.h"
......@@ -23,5 +23,4 @@ uint32_t ParseChecksum(uint256 nChecksum, libzerocoin::CoinDenomination denomina
uint32_t GetChecksum(const CBigNum &bnValue);
bool InvalidCheckpointRange(int nHeight);
#endif //PIVX_ACCUMULATORS_H
#endif //MERGE_ACCUMULATORS_H
......@@ -2,8 +2,8 @@
// Copyright (c) 2018 The Merge developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef PIVX_ZEROCOIN_H
#define PIVX_ZEROCOIN_H
#ifndef MERGE_ZEROCOIN_H
#define MERGE_ZEROCOIN_H
#include <amount.h>
#include <limits.h>
......@@ -82,7 +82,7 @@ public:
{
return this->GetValue() == other.GetValue();
}
// Copy another CZerocoinMint
inline CZerocoinMint& operator=(const CZerocoinMint& other) {
denomination = other.GetDenomination();
......@@ -94,7 +94,7 @@ public:
isUsed = other.IsUsed();
return *this;
}
// why 6 below (SPOCK)
inline bool checkUnused(int denom, int Height) const {
if (IsUsed() == false && GetDenomination() == denomination && GetRandomness() != 0 && GetSerialNumber() != 0 && GetHeight() != -1 && GetHeight() != INT_MAX && GetHeight() >= 1 && (GetHeight() + 6 <= Height)) {
......@@ -160,7 +160,7 @@ public:
uint256 GetHash() const;
void SetMintCount(int nMintsAdded) { this->nMintCount = nMintsAdded; }
int GetMintCount() const { return nMintCount; }
ADD_SERIALIZE_METHODS;
template <typename Stream, typename Operation>
......@@ -190,5 +190,4 @@ public:
int GetNeededSpends();
};
#endif //PIVX_ZEROCOIN_H
#endif //MERGE_ZEROCOIN_H
......@@ -8,7 +8,7 @@
#else
#define UNUSED
#endif
static const char UNUSED *pivx_strings[] = {
static const char UNUSED *merge_strings[] = {
QT_TRANSLATE_NOOP("MERGE-core", " mints deleted\n"),
QT_TRANSLATE_NOOP("MERGE-core", " mints updated, "),
QT_TRANSLATE_NOOP("MERGE-core", " unconfirmed transactions removed\n"),
......
......@@ -153,7 +153,7 @@ void OptionsModel::Init()
if (settings.contains("nPreferredDenom"))
SoftSetArg("-preferredDenom", settings.value("nPreferredDenom").toString().toStdString());
if (settings.contains("nAnonymizeMergeAmount"))
SoftSetArg("-anonymizepivxamount", settings.value("nAnonymizeMergeAmount").toString().toStdString());
SoftSetArg("-anonymizeMergeamount", settings.value("nAnonymizeMergeAmount").toString().toStdString());
language = settings.value("language").toString();
}
......@@ -428,4 +428,3 @@ bool OptionsModel::isRestartRequired()
QSettings settings;
return settings.value("fRestartRequired", false).toBool();
}
......@@ -3,8 +3,8 @@
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef PIVX_CSPORKDB_H
#define PIVX_CSPORKDB_H
#ifndef MERGE_CSPORKDB_H
#define MERGE_CSPORKDB_H
#include <boost/filesystem/path.hpp>
#include "leveldbwrapper.h"
......@@ -26,5 +26,4 @@ public:
};
#endif //PIVX_CSPORKDB_H
#endif //MERGE_CSPORKDB_H
......@@ -38,7 +38,7 @@ struct TestingSetup {
#ifdef ENABLE_WALLET
bitdb.MakeMock();
#endif
pathTemp = GetTempPath() / strprintf("test_pivx_%lu_%i", (unsigned long)GetTime(), (int)(GetRand(100000)));
pathTemp = GetTempPath() / strprintf("test_merge_%lu_%i", (unsigned long)GetTime(), (int)(GetRand(100000)));
boost::filesystem::create_directories(pathTemp);
mapArgs["-datadir"] = pathTemp.string();
pblocktree = new CBlockTreeDB(1 << 20, true);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment