Skip to content

Commit

Permalink
QBC Renaming
Browse files Browse the repository at this point in the history
  • Loading branch information
HarukaMa committed May 13, 2019
1 parent 51dda2a commit 2ea0401
Show file tree
Hide file tree
Showing 95 changed files with 498 additions and 517 deletions.
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE.md
@@ -1,9 +1,9 @@
<!-- This issue tracker is only for technical issues related to Myriadcoin Core.
<!-- This issue tracker is only for technical issues related to Quebecoin Core.
General myriadcoin questions and/or support requests are best directed to the Myriadcoin Reddit at https://www.reddit.com/r/myriadcoin.
General quebecoin questions and/or support requests are best directed to the Quebecoin Reddit at https://www.reddit.com/r/quebecoin.
For reporting security issues, please email (preferably all of the following):
8bitcoder: info@myriadcoin.org
8bitcoder: info@quebecoin.org
cryptapus: info@cryptapus.org, various other contact methods are available at https://cryptapus.org.
If the node is "stuck" during sync or giving "block checksum mismatch" errors, please ensure your hardware is stable by running memtest and observe CPU temperature with a load-test tool such as linpack before creating an issue! -->
Expand All @@ -15,7 +15,7 @@ If the node is "stuck" during sync or giving "block checksum mismatch" errors, p

<!--- How reliably can you reproduce the issue, what are the steps to do so? -->

<!-- What version of Myriadcoin Core are you using, where did you get it (website, self-compiled, etc)? -->
<!-- What version of Quebecoin Core are you using, where did you get it (website, self-compiled, etc)? -->

<!-- What type of machine are you observing the error on (OS/CPU and disk type)? -->

Expand Down
20 changes: 10 additions & 10 deletions .gitignore
@@ -1,13 +1,13 @@
*.tar.gz

*.exe
src/myriadcoin
src/myriadcoind
src/myriadcoin-cli
src/myriadcoin-tx
src/test/test_myriadcoin
src/test/test_myriadcoin_fuzzy
src/qt/test/test_myriadcoin-qt
src/quebecoin
src/quebecoind
src/quebecoin-cli
src/quebecoin-tx
src/test/test_quebecoin
src/test/test_quebecoin_fuzzy
src/qt/test/test_quebecoin-qt

# autoreconf
Makefile.in
Expand Down Expand Up @@ -80,13 +80,13 @@ src/qt/bitcoin-qt.includes
# Compilation and Qt preprocessor part
*.qm
Makefile
myriadcoin-qt
Myriadcoin-Qt.app
quebecoin-qt
Quebecoin-Qt.app
background.tiff*

# Unit-tests
Makefile.test
myriadcoin-qt_test
quebecoin-qt_test

# Resources cpp
qrc_*.cpp
Expand Down
6 changes: 3 additions & 3 deletions .travis.yml
Expand Up @@ -63,8 +63,8 @@ before_script:
# Start xvfb if needed, as documented at https://docs.travis-ci.com/user/gui-and-headless-browsers/#Using-xvfb-to-Run-Tests-That-Require-a-GUI
- if [ "$NEED_XVFB" = 1 ]; then export DISPLAY=:99.0; /sbin/start-stop-daemon --start --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac; fi
script:
- if [ "$CHECK_DOC" = 1 -a "$TRAVIS_REPO_SLUG" = "myriadteam/myriadcoin" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then while read LINE; do travis_retry gpg --keyserver hkp://subset.pool.sks-keyservers.net --recv-keys $LINE; done < contrib/verify-commits/trusted-keys; fi
- if [ "$CHECK_DOC" = 1 -a "$TRAVIS_REPO_SLUG" = "myriadteam/myriadcoin" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then contrib/verify-commits/verify-commits.sh; fi
- if [ "$CHECK_DOC" = 1 -a "$TRAVIS_REPO_SLUG" = "myriadteam/quebecoin" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then while read LINE; do travis_retry gpg --keyserver hkp://subset.pool.sks-keyservers.net --recv-keys $LINE; done < contrib/verify-commits/trusted-keys; fi
- if [ "$CHECK_DOC" = 1 -a "$TRAVIS_REPO_SLUG" = "myriadteam/quebecoin" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then contrib/verify-commits/verify-commits.sh; fi
- export TRAVIS_COMMIT_LOG=`git log --format=fuller -1`
- if [ -n "$USE_SHELL" ]; then export CONFIG_SHELL="$USE_SHELL"; fi
- OUTDIR=$BASE_OUTDIR/$TRAVIS_PULL_REQUEST/$TRAVIS_JOB_NUMBER-$HOST
Expand All @@ -74,7 +74,7 @@ script:
- mkdir build && cd build
- ../configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
- make distdir VERSION=$HOST
- cd myriadcoin-$HOST
- cd quebecoin-$HOST
- ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
- make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && make $GOAL V=1 ; false )
- export LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib
Expand Down
16 changes: 8 additions & 8 deletions CONTRIBUTING.md
@@ -1,7 +1,7 @@
Contributing to Myriad
============================

Myriadcoin operates an open contributor model where anyone is
Quebecoin 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 myriadcoin-qt
- *Qt* for changes to quebecoin-qt
- *Mining* for changes to the mining code
- *Net* or *P2P* for changes to the peer-to-peer network code
- *RPC/REST/ZMQ* for changes to the RPC, REST or ZMQ APIs
- *Scripts and tools* for changes to the scripts and tools
- *Tests* for changes to the Myriadcoin unit tests or QA tests
- *Tests* for changes to the Quebecoin 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 @@ -169,11 +169,11 @@ workload on reviewing.
"Decision Making" Process
-------------------------

The following applies to code changes to the Myriadcoin project (and related
The following applies to code changes to the Quebecoin project (and related
projects such as libsecp256k1), and is not to be confused with overall Myriad
Network Protocol consensus changes.

Whether a pull request is merged into Myriadcoin rests with the project merge
Whether a pull request is merged into Quebecoin 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 @@ -191,7 +191,7 @@ In general, all pull requests must:
- Where bugs are fixed, where possible, there should be unit tests
demonstrating the bug and also proving the fix. This helps prevent regression.

Patches that change Myriadcoin consensus rules are considerably more involved than
Patches that change Quebecoin consensus rules are considerably more involved than
normal because they affect the entire ecosystem and so must be preceded by
extensive mailing list discussions and have a numbered BIP. While each case will
be different, one should be prepared to expend more time and effort than for
Expand Down Expand Up @@ -232,7 +232,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 Myriadcoin consensus, it must have been
Where a patch set proposes to change the Quebecoin consensus, it must have been
discussed extensively on the mailing list and IRC, be accompanied by a widely
discussed BIP and have a generally widely perceived technical consensus of being
a worthwhile change based on the judgement of the maintainers.
Expand Down Expand Up @@ -272,7 +272,7 @@ about:
Release Policy
--------------

The project leader is the release manager for each Myriadcoin release.
The project leader is the release manager for each Quebecoin release.

Copyright
---------
Expand Down
10 changes: 5 additions & 5 deletions Makefile.am
Expand Up @@ -24,7 +24,7 @@ BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EX
empty :=
space := $(empty) $(empty)

OSX_APP=Myriadcoin-Qt.app
OSX_APP=Quebecoin-Qt.app
OSX_VOLNAME = $(subst $(space),-,$(PACKAGE_NAME))
OSX_DMG = $(OSX_VOLNAME).dmg
OSX_BACKGROUND_SVG=background.svg
Expand Down Expand Up @@ -95,7 +95,7 @@ $(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS)
$(MKDIR_P) $(@D)
$(INSTALL_DATA) $< $@

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

Expand All @@ -105,7 +105,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/Myriadcoin-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings
$(OSX_APP)/Contents/MacOS/Quebecoin-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings

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

$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Myriadcoin-Qt
$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Quebecoin-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 @@ -145,7 +145,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/Myriadcoin-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Quebecoin-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
30 changes: 15 additions & 15 deletions README.md
@@ -1,46 +1,46 @@
Myriadcoin Core integration/staging tree
Quebecoin Core integration/staging tree
=====================================

[![Build Status](https://travis-ci.com/myriadteam/myriadcoin.svg?branch=master)](https://travis-ci.com/myriadteam/myriadcoin)
[![Build Status](https://travis-ci.com/myriadteam/quebecoin.svg?branch=master)](https://travis-ci.com/myriadteam/quebecoin)

http://www.myriadcoin.org
http://www.quebecoin.org

What is Myriadcoin?
What is Quebecoin?
----------------

Myriadcoin is an experimental digital currency that enables instant payments to
anyone, anywhere in the world. Myriadcoin uses peer-to-peer technology to operate
Quebecoin is an experimental digital currency that enables instant payments to
anyone, anywhere in the world. Quebecoin uses peer-to-peer technology to operate
with no central authority: managing transactions and issuing money are carried
out collectively by the network. Myriadcoin Core is the name of open source
out collectively by the network. Quebecoin Core is the name of open source
software which enables the use of this currency.

For more information, as well as an immediately usable, binary version of
the Myriadcoin Core software, see http://www.myriadcoin.org, or read the
the Quebecoin Core software, see http://www.quebecoin.org, or read the
[original Bitcoin whitepaper](https://bitcoincore.org/bitcoin.pdf).

Myriadcoin is distinct from Bitcoin in that it pioneered the use of multiple independent
Quebecoin is distinct from Bitcoin in that it pioneered the use of multiple independent
PoW algorithms on the same chain.

License
-------

Myriadcoin is a fork of Bitcoin Core and inherits the terms of the MIT license. See
Quebecoin is a fork of Bitcoin Core and inherits the terms of the MIT license. See
[COPYING](COPYING) for more information or see https://opensource.org/licenses/MIT.

Development Process
-------------------

The `master` branch is occasionally built and tested, but is not guaranteed to be
completely stable. [Tags](https://github.com/myriadteam/myriadcoin/tags) are created
regularly to indicate new official, stable release versions of Myriadcoin Core.
completely stable. [Tags](https://github.com/myriadteam/quebecoin/tags) are created
regularly to indicate new official, stable release versions of Quebecoin Core.

The contribution workflow is described in [CONTRIBUTING.md](CONTRIBUTING.md).

The developer [subreddit](https://www.reddit.com/r/myriadcoin)
The developer [subreddit](https://www.reddit.com/r/quebecoin)
should be used to discuss complicated or controversial changes before working
on a patch set.

Developer IRC can be found on Freenode at ##myriadcoin.
Developer IRC can be found on Freenode at ##quebecoin.

Testing
-------
Expand Down Expand Up @@ -76,4 +76,4 @@ Translations
Changes to translations as well as new translations are typically handled upstream,
[see bitcoin github](https://github.com/bitcoin/bitcoin/).

Translators should also visit the [myriadcoin subreddit](https://www.reddit.com/r/myriadcoin).
Translators should also visit the [quebecoin subreddit](https://www.reddit.com/r/quebecoin).
12 changes: 6 additions & 6 deletions configure.ac
Expand Up @@ -7,17 +7,17 @@ define(_CLIENT_VERSION_BUILD, 1)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2018)
define(_COPYRIGHT_HOLDERS,[The %s developers])
define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Myriadcoin Core]])
AC_INIT([Myriadcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/myriadteam/myriadcoin/issues],[myriadcoin],[http://www.myriadcoin.org/])
define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Quebecoin Core]])
AC_INIT([Quebecoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/myriadteam/quebecoin/issues],[quebecoin],[http://www.quebecoin.org/])
AC_CONFIG_SRCDIR([src/validation.cpp])
AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([build-aux/m4])

BITCOIN_DAEMON_NAME=myriadcoind
BITCOIN_GUI_NAME=myriadcoin-qt
BITCOIN_CLI_NAME=myriadcoin-cli
BITCOIN_TX_NAME=myriadcoin-tx
BITCOIN_DAEMON_NAME=quebecoind
BITCOIN_GUI_NAME=quebecoin-qt
BITCOIN_CLI_NAME=quebecoin-cli
BITCOIN_TX_NAME=quebecoin-tx

dnl Unless the user specified ARFLAGS, force it to be cr
AC_ARG_VAR(ARFLAGS, [Flags for the archiver, defaults to <cr> if not set])
Expand Down

0 comments on commit 2ea0401

Please sign in to comment.