Skip to content

Commit

Permalink
[Rename]
Browse files Browse the repository at this point in the history
- update files
  • Loading branch information
elliotproject committed Mar 30, 2018
1 parent 9c1fc76 commit b745ee3
Show file tree
Hide file tree
Showing 283 changed files with 4,685 additions and 4,689 deletions.
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE.md
@@ -1,7 +1,7 @@
<!--- Remove this description and sections that do not apply -->

This issue tracker is only for technical issues related to PIVX Core.
General PIVX questions and/or support requests and are best directed to the [PIVX Discord](https://discord.pivx.org).
This issue tracker is only for technical issues related to ELLI Core.
General ELLI questions and/or support requests and are best directed to the [ELLI Discord](https://discord.gg/cE4Nefv).

### Describe the issue

Expand All @@ -20,7 +20,7 @@ Tell us what happens instead
### Screenshots.
If the issue is related to the GUI, screenshots can be added to this issue via drag & drop.

### What version of PIVX Core are you using?
### What version of ELLI Core are you using?
List the version number/commit ID, and if it is an official binary, self compiled or a distribution package.

### Machine specs:
Expand Down
5 changes: 1 addition & 4 deletions .travis.yml
Expand Up @@ -29,7 +29,7 @@ env:
- HOST=i686-pc-linux-gnu PACKAGES="g++-multilib bc python3-zmq" DEP_OPTS="NO_QT=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" USE_SHELL="/bin/dash" PYZMQ=true
# Win64
- HOST=x86_64-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine1.6 bc" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports"
# pivxd
# ellid
- HOST=x86_64-unknown-linux-gnu PACKAGES="bc python3-zmq" DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports CPPFLAGS=-DDEBUG_LOCKORDER" PYZMQ=true
# No wallet
# - HOST=x86_64-unknown-linux-gnu PACKAGES="python3" DEP_OPTS="NO_WALLET=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
Expand Down Expand Up @@ -69,6 +69,3 @@ script:
after_script:
- echo $TRAVIS_COMMIT_RANGE
- echo $TRAVIS_COMMIT_LOG
notifications:
slack:
secure: w22XjHoG/3xplxWzddS9Ma7i99Q/hq4FA3Q56xS+RtO2vlFgDT+eDzCppstdx96mn2/4e+/V1aiQ4E6GVEvJMeldqSUhPv9OBnKR0KJVAOwu4haNXt+0ZeQFt8lIndKB5cMVyOJkoq6peGoHNXslClM0lGuBn7g7VC2QPQYNWrJNrrGL7IiVb6fNOIKHWcC4URkzSvXAhO/WIqSSlmKxAAx0B2oEsM8LhdAbcjbp7Sm7zH87TIVGBZ7iTVuMc6B9+SfClbE8bBuRtvjTX57Q4UUZzn0zDtKdPdCte0oXdaQF4RdVim9mDodBGIpDo+avW4WL7EE+AK33fs94pwH5bu0LEandR/aeEvVpbSpQ2XsEKSe+6woizgl5i4GXFVZduJF62y/o1f+S/zC3qW9lIEEpiZc4PpX7pDy30X3p6S5nMrW7T/zNh+SjLhS1VP6XKdQtpD3WRCY4GKZYammZhk5RbOy3jTXAahIXuttWdhl/Q3Rb5VqfFJWlrG/qQXt73qOk2/DgJnABxXE6gnWO4MpHAq+kdomNR+nod4HeXI3DOk1wRuQRVoW1rSjiqQd6Db+TP56RKYgt4M4csOD0DG9G+W0AOtZkuKHTeoEtmQfkKFPZLYAQumv41cDN2UE9gKIECmvJSevj4sMCDTWtozKWqay/W4n2+cmhbzmGflY=
20 changes: 10 additions & 10 deletions CONTRIBUTING.md
@@ -1,7 +1,7 @@
Contributing to PIVX Core
Contributing to ELLI Core
============================

The PIVX Core project operates an open contributor model where anyone is
The ELLI Core project operates an open contributor model where anyone is
welcome to contribute towards development in the form of peer review, testing
and patches. This document explains the practical process and guidelines for
contributing.
Expand Down Expand Up @@ -57,12 +57,12 @@ the pull request affects. Valid areas as:

- *Consensus* for changes to consensus critical code
- *Docs* for changes to the documentation
- *Qt* for changes to pivx-qt
- *Qt* for changes to elli-qt
- *Minting* for changes to the minting code
- *Net* or *P2P* for changes to the peer-to-peer network code
- *RPC/REST* for changes to the RPC or REST APIs
- *Scripts and tools* for changes to the scripts and tools
- *Tests* for changes to the pivx unit tests or QA tests
- *Tests* for changes to the elli unit tests or QA tests
- *Trivial* should **only** be used for PRs that do not change generated
executable code. Notably, refactors (change of function arguments and code
reorganization) and changes in behavior should **not** be marked as trivial.
Expand Down Expand Up @@ -157,10 +157,10 @@ where possible keep them short, un-complex and easy to verify.
"Decision Making" Process
-------------------------

The following applies to code changes to the PIVX Core project, and is not to be
confused with overall PIVX Network Protocol consensus changes.
The following applies to code changes to the ELLI Core project, and is not to be
confused with overall ELLI Network Protocol consensus changes.

Whether a pull request is merged into PIVX Core rests with the project merge
Whether a pull request is merged into ELLI Core rests with the project merge
maintainers and ultimately the project lead.

Maintainers will take into consideration if a patch is in line with the general
Expand All @@ -174,7 +174,7 @@ In general, all pull requests must:
- be well peer reviewed;
- follow code style guidelines;

Patches that change PIVX consensus rules are considerably more involved than
Patches that change ELLI consensus rules are considerably more involved than
normal because they affect the entire ecosystem and so must be preceded by
extensive discussions and clear detailing. While each case will be different,
one should be prepared to expend more time and effort than for other kinds of
Expand Down Expand Up @@ -214,7 +214,7 @@ higher in terms of discussion and peer review requirements, keeping in mind that
mistakes could be very costly to the wider community. This includes refactoring
of consensus critical code.

Where a patch set proposes to change the PIVX consensus, it must have been
Where a patch set proposes to change the ELLI consensus, it must have been
discussed extensively on the forums and Slack, be accompanied by a widely
discussed Proposal and have a generally widely perceived technical consensus of being
a worthwhile change based on the judgement of the maintainers.
Expand Down Expand Up @@ -254,7 +254,7 @@ about:
Release Policy
--------------

The project leader is the release manager for each PIVX Core release.
The project leader is the release manager for each ELLI Core release.

Copyright
---------
Expand Down
1 change: 1 addition & 0 deletions COPYING
@@ -1,6 +1,7 @@
Copyright (c) 2009-2015 Bitcoin Developers
Copyright (c) 2014-2015 Dash Developers
Copyright (c) 2015-2017 PIVX Developers
Copyright (c) 2017-2018 ELLI 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
6 changes: 3 additions & 3 deletions INSTALL
@@ -1,4 +1,4 @@
Building PIVX
Building ELLI

Use the autogen script to prepare the build environment.

Expand All @@ -8,6 +8,6 @@ Use the autogen script to prepare the build environment.

Always verify the signatures and checksums.

See doc/build-*.md for instructions on building pivxd,
See doc/build-*.md for instructions on building ellid,
the intended-for-services, no-graphical-interface, reference
implementation of PIVX.
implementation of ELLI.
36 changes: 18 additions & 18 deletions Makefile.am
Expand Up @@ -21,7 +21,7 @@ BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EX
empty :=
space := $(empty) $(empty)

OSX_APP=PIVX-Qt.app
OSX_APP=ELLI-Qt.app
OSX_VOLNAME = $(subst $(space),-,$(PACKAGE_NAME))
OSX_DMG = $(OSX_VOLNAME).dmg
OSX_BACKGROUND_SVG=background.svg
Expand All @@ -48,9 +48,9 @@ OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \
$(top_srcdir)/contrib/macdeploy/detached-sig-create.sh

COVERAGE_INFO = baseline_filtered_combined.info baseline.info block_test.info \
leveldb_baseline.info test_pivx_filtered.info total_coverage.info \
leveldb_baseline.info test_elli_filtered.info total_coverage.info \
baseline_filtered.info block_test_filtered.info \
leveldb_baseline_filtered.info test_pivx_coverage.info test_pivx.info
leveldb_baseline_filtered.info test_elli_coverage.info test_elli.info

dist-hook:
-$(MAKE) -C $(top_distdir)/src/leveldb clean
Expand Down Expand Up @@ -90,7 +90,7 @@ $(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS)
$(MKDIR_P) $(@D)
$(INSTALL_DATA) $< $@

$(OSX_APP)/Contents/MacOS/PIVX-Qt: $(BITCOIN_QT_BIN)
$(OSX_APP)/Contents/MacOS/ELLI-Qt: $(BITCOIN_QT_BIN)
$(MKDIR_P) $(@D)
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@

Expand All @@ -100,7 +100,7 @@ $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings:

OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \
$(OSX_APP)/Contents/Resources/bitcoin.icns $(OSX_APP)/Contents/Info.plist \
$(OSX_APP)/Contents/MacOS/PIVX-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings
$(OSX_APP)/Contents/MacOS/ELLI-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings

osx_volname:
echo $(OSX_VOLNAME) >$@
Expand All @@ -125,7 +125,7 @@ $(APP_DIST_DIR)/Applications:
@rm -f $@
@cd $(@D); $(LN_S) /Applications $(@F)

$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/PIVX-Qt
$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/ELLI-Qt

$(OSX_DMG): $(APP_DIST_EXTRAS)
$(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -apple -o $@ dist
Expand All @@ -140,7 +140,7 @@ $(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE): $(OSX_BACKGROUND_IMAGE_DPIF
$(APP_DIST_DIR)/.DS_Store: $(OSX_DSSTORE_GEN)
$(PYTHON) $< "$@" "$(OSX_VOLNAME)"

$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/PIVX-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/ELLI-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -translations-dir=$(QT_TRANSLATION_DIR) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2

deploydir: $(APP_DIST_EXTRAS)
Expand Down Expand Up @@ -180,16 +180,16 @@ leveldb_baseline_filtered.info: leveldb_baseline.info
baseline_filtered_combined.info: leveldb_baseline_filtered.info baseline_filtered.info
$(LCOV) -a leveldb_baseline_filtered.info -a baseline_filtered.info -o $@

test_pivx.info: baseline_filtered_combined.info
test_elli.info: baseline_filtered_combined.info
$(MAKE) -C src/ check
$(LCOV) -c -d $(abs_builddir)/src -t test_pivx -o $@
$(LCOV) -c -d $(abs_builddir)/src -t test_elli -o $@
$(LCOV) -z -d $(abs_builddir)/src
$(LCOV) -z -d $(abs_builddir)/src/leveldb

test_pivx_filtered.info: test_pivx.info
test_elli_filtered.info: test_elli.info
$(LCOV) -r $< "/usr/include/*" -o $@

block_test.info: test_pivx_filtered.info
block_test.info: test_elli_filtered.info
$(MKDIR_P) qa/tmp
-@TIMEOUT=15 qa/pull-tester/run-bitcoind-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool 0
$(LCOV) -c -d $(abs_builddir)/src --t BitcoinJBlockTest -o $@
Expand All @@ -199,21 +199,21 @@ block_test.info: test_pivx_filtered.info
block_test_filtered.info: block_test.info
$(LCOV) -r $< "/usr/include/*" -o $@

test_pivx_coverage.info: baseline_filtered_combined.info test_pivx_filtered.info
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_pivx_filtered.info -o $@
test_elli_coverage.info: baseline_filtered_combined.info test_elli_filtered.info
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_elli_filtered.info -o $@

total_coverage.info: baseline_filtered_combined.info test_pivx_filtered.info block_test_filtered.info
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_pivx_filtered.info -a block_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
total_coverage.info: baseline_filtered_combined.info test_elli_filtered.info block_test_filtered.info
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_elli_filtered.info -a block_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt

test_pivx.coverage/.dirstamp: test_pivx_coverage.info
test_elli.coverage/.dirstamp: test_elli_coverage.info
$(GENHTML) -s $< -o $(@D)
@touch $@

total.coverage/.dirstamp: total_coverage.info
$(GENHTML) -s $< -o $(@D)
@touch $@

cov: test_pivx.coverage/.dirstamp total.coverage/.dirstamp
cov: test_elli.coverage/.dirstamp total.coverage/.dirstamp

endif

Expand All @@ -226,4 +226,4 @@ CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)
.INTERMEDIATE: $(COVERAGE_INFO)

clean-local:
rm -rf test_pivx.coverage/ total.coverage/ $(OSX_APP)
rm -rf test_elli.coverage/ total.coverage/ $(OSX_APP)
44 changes: 21 additions & 23 deletions README.md
@@ -1,56 +1,54 @@
PIVX Core integration/staging repository
ELLI Core integration/staging repository
=====================================

[![Build Status](https://travis-ci.org/PIVX-Project/PIVX.svg?branch=master)](https://travis-ci.org/PIVX-Project/PIVX) [![GitHub version](https://badge.fury.io/gh/PIVX-Project%2FPIVX.svg)](https://badge.fury.io/gh/PIVX-Project%2FPIVX)

PIVX is an open source crypto-currency focused on fast private transactions with low transaction fees & environmental footprint. It utilizes a custom Proof of Stake protocol for securing its network and uses an innovative variable seesaw reward mechanism that dynamically balances 90% of its block reward size between masternodes and staking nodes and 10% dedicated for budget proposals. The goal of PIVX is to achieve a decentralized sustainable crypto currency with near instant full-time private transactions, fair governance and community intelligence.
- Anonymized transactions using the [_Zerocoin Protocol_](http://www.pivx.org/zpiv).
ELLI is an open source crypto-currency focused on fast private transactions with low transaction fees & environmental footprint. It utilizes a custom Proof of Stake protocol for securing its network and uses an innovative variable seesaw reward mechanism that dynamically balances 90% of its block reward size between masternodes and staking nodes and 10% dedicated for budget proposals. The goal of ELLI is to achieve a decentralized sustainable crypto currency with near instant full-time private transactions, fair governance and community intelligence.
- Anonymized transactions using the [_Zerocoin Protocol_](http://www.elli.org/zelli).
- Fast transactions featuring guaranteed zero confirmation transactions, we call it _SwiftX_.
- Decentralized blockchain voting utilizing Masternode technology to form a DAO. The blockchain will distribute monthly treasury funds based on successful proposals submitted by the community and voted on by the DAO.

More information at [pivx.org](http://www.pivx.org) Visit our ANN thread at [BitcoinTalk](http://www.bitcointalk.org/index.php?topic=1262920)
More information at [elli.org](http://www.elli.org) Visit our ANN thread at [BitcoinTalk](http://www.bitcointalk.org)

### Coin Specs
<table>
<tr><td>Algo</td><td>Quark</td></tr>
<tr><td>Block Time</td><td>60 Seconds</td></tr>
<tr><td>Difficulty Retargeting</td><td>Every Block</td></tr>
<tr><td>Max Coin Supply (PoW Phase)</td><td>43,199,500 PIV</td></tr>
<tr><td>Max Coin Supply (PoW Phase)</td><td>43,199,500 ELLI</td></tr>
<tr><td>Max Coin Supply (PoS Phase)</td><td>Infinite</td></tr>
<tr><td>Premine</td><td>60,000 PIV*</td></tr>
<tr><td>Premine</td><td>60,000 ELLI*</td></tr>
</table>

*60,000 PIV Premine was burned in block [279917](http://www.presstab.pw/phpexplorer/PIVX/block.php?blockhash=206d9cfe859798a0b0898ab00d7300be94de0f5469bb446cecb41c3e173a57e0)
*60,000 ELLI Premine was burned in block [279917](http://www.presstab.pw/phpexplorer/ELLI/block.php?blockhash=206d9cfe859798a0b0898ab00d7300be94de0f5469bb446cecb41c3e173a57e0)

### Reward Distribution

<table>
<th colspan=4>Genesis Block</th>
<tr><th>Block Height</th><th>Reward Amount</th><th>Notes</th></tr>
<tr><td>1</td><td>60,000 PIV</td><td>Initial Pre-mine, burnt in block <a href="http://www.presstab.pw/phpexplorer/PIVX/block.php?blockhash=206d9cfe859798a0b0898ab00d7300be94de0f5469bb446cecb41c3e173a57e0">279917</a></td></tr>
<tr><td>1</td><td>60,000 ELLI</td><td>Initial Pre-mine, burnt in block <a href="http://www.presstab.pw/phpexplorer/ELLI/block.php?blockhash=206d9cfe859798a0b0898ab00d7300be94de0f5469bb446cecb41c3e173a57e0">279917</a></td></tr>
</table>

### PoW Rewards Breakdown

<table>
<th>Block Height</th><th>Masternodes</th><th>Miner</th><th>Budget</th>
<tr><td>2-43200</td><td>20% (50 PIV)</td><td>80% (200 PIV)</td><td>N/A</td></tr>
<tr><td>43201-151200</td><td>20% (50 PIV)</td><td>70% (200 PIV)</td><td>10% (25 PIV)</td></tr>
<tr><td>151201-259200</td><td>45% (22.5 PIV)</td><td>45% (22.5 PIV)</td><td>10% (5 PIV)</td></tr>
<tr><td>2-43200</td><td>20% (50 ELLI)</td><td>80% (200 ELLI)</td><td>N/A</td></tr>
<tr><td>43201-151200</td><td>20% (50 ELLI)</td><td>70% (200 ELLI)</td><td>10% (25 ELLI)</td></tr>
<tr><td>151201-259200</td><td>45% (22.5 ELLI)</td><td>45% (22.5 ELLI)</td><td>10% (5 ELLI)</td></tr>
</table>

### PoS Rewards Breakdown

<table>
<th>Phase</th><th>Block Height</th><th>Reward</th><th>Masternodes & Stakers</th><th>Budget</th>
<tr><td>Phase 1</td><td>259201-302399</td><td>50 PIV</td><td>90% (45 PIV)</td><td>10% (5 PIV)</td></tr>
<tr><td>Phase 2</td><td>302400-345599</td><td>45 PIV</td><td>90% (40.5 PIV)</td><td>10% (4.5 PIV)</td></tr>
<tr><td>Phase 3</td><td>345600-388799</td><td>40 PIV</td><td>90% (36 PIV)</td><td>10% (4 PIV)</td></tr>
<tr><td>Phase 4</td><td>388800-431999</td><td>35 PIV</td><td>90% (31.5 PIV)</td><td>10% (3.5 PIV)</td></tr>
<tr><td>Phase 5</td><td>432000-475199</td><td>30 PIV</td><td>90% (27 PIV)</td><td>10% (3 PIV)</td></tr>
<tr><td>Phase 6</td><td>475200-518399</td><td>25 PIV</td><td>90% (22.5 PIV)</td><td>10% (2.5 PIV)</td></tr>
<tr><td>Phase 7</td><td>518400-561599</td><td>20 PIV</td><td>90% (18 PIV)</td><td>10% (2 PIV)</td></tr>
<tr><td>Phase 8</td><td>561600-604799</td><td>15 PIV</td><td>90% (13.5 PIV)</td><td>10% (1.5 PIV)</td></tr>
<tr><td>Phase 9</td><td>604800-647999</td><td>10 PIV</td><td>90% (9 PIV)</td><td>10% (1 PIV)</td></tr>
<tr><td>Phase X</td><td>648000-Infinite</td><td>5 PIV</td><td>90% (4.5 PIV)</td><td>10% (0.5 PIV)</td></tr>
<tr><td>Phase 1</td><td>259201-302399</td><td>50 ELLI</td><td>90% (45 ELLI)</td><td>10% (5 ELLI)</td></tr>
<tr><td>Phase 2</td><td>302400-345599</td><td>45 ELLI</td><td>90% (40.5 ELLI)</td><td>10% (4.5 ELLI)</td></tr>
<tr><td>Phase 3</td><td>345600-388799</td><td>40 ELLI</td><td>90% (36 ELLI)</td><td>10% (4 ELLI)</td></tr>
<tr><td>Phase 4</td><td>388800-431999</td><td>35 ELLI</td><td>90% (31.5 ELLI)</td><td>10% (3.5 ELLI)</td></tr>
<tr><td>Phase 5</td><td>432000-475199</td><td>30 ELLI</td><td>90% (27 ELLI)</td><td>10% (3 ELLI)</td></tr>
<tr><td>Phase 6</td><td>475200-518399</td><td>25 ELLI</td><td>90% (22.5 ELLI)</td><td>10% (2.5 ELLI)</td></tr>
<tr><td>Phase 7</td><td>518400-561599</td><td>20 ELLI</td><td>90% (18 ELLI)</td><td>10% (2 ELLI)</td></tr>
<tr><td>Phase 8</td><td>561600-604799</td><td>15 ELLI</td><td>90% (13.5 ELLI)</td><td>10% (1.5 ELLI)</td></tr>
<tr><td>Phase 9</td><td>604800-647999</td><td>10 ELLI</td><td>90% (9 ELLI)</td><td>10% (1 ELLI)</td></tr>
<tr><td>Phase X</td><td>648000-Infinite</td><td>5 ELLI</td><td>90% (4.5 ELLI)</td><td>10% (0.5 ELLI)</td></tr>
</table>
4 changes: 2 additions & 2 deletions build-aux/m4/bitcoin_qt.m4
Expand Up @@ -7,7 +7,7 @@ dnl Output: If qt version is auto, set bitcoin_enable_qt to false. Else, exit.
AC_DEFUN([BITCOIN_QT_FAIL],[
if test "x$bitcoin_qt_want_version" = xauto && test "x$bitcoin_qt_force" != xyes; then
if test "x$bitcoin_enable_qt" != xno; then
AC_MSG_WARN([$1; pivx-qt frontend will not be built])
AC_MSG_WARN([$1; elli-qt frontend will not be built])
fi
bitcoin_enable_qt=no
bitcoin_enable_qt_test=no
Expand Down Expand Up @@ -54,7 +54,7 @@ AC_DEFUN([BITCOIN_QT_INIT],[
dnl enable qt support
AC_ARG_WITH([gui],
[AS_HELP_STRING([--with-gui@<:@=no|qt4|qt5|auto@:>@],
[build pivx-qt GUI (default=auto, qt5 tried first)])],
[build elli-qt GUI (default=auto, qt5 tried first)])],
[
bitcoin_qt_want_version=$withval
if test "x$bitcoin_qt_want_version" = xyes; then
Expand Down

0 comments on commit b745ee3

Please sign in to comment.