diff options
| -rw-r--r-- | CONTRIBUTING.md | 28 | ||||
| -rw-r--r-- | COPYING | 2 | ||||
| -rw-r--r-- | INSTALL.md | 14 | ||||
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | README.md | 30 | ||||
| -rw-r--r-- | README_zh_CN.md | 34 | ||||
| -rw-r--r-- | configure.ac | 4 |
7 files changed, 61 insertions, 61 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 20c2b65e5..00d64f801 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,16 +1,16 @@ -# Contributing to Dogecoin Core +# Contributing to Discoin Core -Dogecoin Core is open source software, and we would welcome contributions +Discoin Core is open source software, and we would welcome contributions which improve the state of the software. For those wanting to discuss changes, or look for work that needs doing, please see: * [Help requests](https://github.com/discoin/discoin/labels/help%20wanted) * [Projects](https://github.com/discoin/discoin/projects) -* [Dogecoindev on reddit](https://www.reddit.com/r/discoindev/) +* [Discoindev on reddit](https://www.reddit.com/r/discoindev/) ## Branch Strategy -Dogecoin Core's default branch is intentionally a stable release, so that anyone +Discoin Core's default branch is intentionally a stable release, so that anyone downloading the code and compiling it gets a stable release. Active development occurs on branches named after the version they are targeting, for example the 1.14.4 branch is named `1.14.4-dev`. When raising PRs, please raise against the @@ -102,35 +102,35 @@ in the future, they may be removed. ### Refactoring -Dogecoin Core is a direct fork of Bitcoin Core and therefore benefits from as +Discoin Core is a direct fork of Bitcoin Core and therefore benefits from as little refactoring as possible on code that is created upstream. If you see any structural issues with upstream code, please propose these fixes for -[bitcoin/bitcoin](https://github.com/bitcoin/bitcoin) and future Dogecoin Core +[bitcoin/bitcoin](https://github.com/bitcoin/bitcoin) and future Discoin Core releases will automatically benefit from these. -When refactoring Dogecoin-specific code, please keep refactoring requests short, +When refactoring Discoin-specific code, please keep refactoring requests short, low complexity and easy to verify. ## "Decision Making" Process -The following applies to code changes to Dogecoin Core, and is not to be -confused with overall Dogecoin Network Protocol consensus changes. All consensus +The following applies to code changes to Discoin Core, and is not to be +confused with overall Discoin Network Protocol consensus changes. All consensus changes **must** be ratified by miners; a proposal to implement protocol changes does not guarantee activation on the mainnet, not even when a binary gets released by maintainers. -Whether a pull request is merged into Dogecoin Core rests with the repository +Whether a pull request is merged into Discoin Core rests with the repository maintainers. Maintainers will take into consideration if a patch is in line with the general -principles of Dogecoin; meets the minimum standards for inclusion; and will +principles of Discoin; meets the minimum standards for inclusion; and will take into account the consensus among frequent contributors. In general, all pull requests must: - have a clear use case, fix a demonstrable bug or serve the greater good of - Dogecoin; + Discoin; - be peer reviewed; - have unit tests and functional tests; - follow code style guidelines; @@ -160,11 +160,11 @@ there is consensus to merge a pull request. Maintainers reserve the right to weigh the opinions of peer reviewers using common sense judgement and also may weight based on meritocracy: Those -that have demonstrated a deeper commitment and understanding towards Dogecoin +that have demonstrated a deeper commitment and understanding towards Discoin (over time) or have clear domain expertise may naturally have more weight, as one would expect in all walks of life. -Where a patch set proposes to change the Dogecoin consensus, it must have been +Where a patch set proposes to change the Discoin consensus, it must have been discussed extensively, be accompanied by widely discussed documentation and have a generally widely perceived technical consensus of being a worthwhile change, based on the judgement of the maintainers. @@ -1,7 +1,7 @@ The MIT License (MIT) Copyright (c) 2009-2017 The Bitcoin Core developers -Copyright (c) 2013-2021 The Dogecoin Core developers +Copyright (c) 2013-2021 The Discoin Core 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 diff --git a/INSTALL.md b/INSTALL.md index 5d15c8d68..4790f3def 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,8 +1,8 @@ -# Installing Dogecoin Core +# Installing Discoin Core ### Pre-compiled binaries -The easiest way to install the latest version of the Dogecoin Core software is +The easiest way to install the latest version of the Discoin Core software is by to download the latest precompiled binaries for your platform from the [release page](https://github.com/discoin/discoin/releases). Currently, binaries are released for the following platforms: @@ -19,22 +19,22 @@ regarding that process. ### Compiling using packaged dependencies -It is possible to build your own copy of Dogecoin Core with the exact, tested, +It is possible to build your own copy of Discoin Core with the exact, tested, dependencies, as used for the binary releases, by using the [depends system](depends/description.md). Please refer to the -[depends README](depends/README.md) for instructions to build Dogecoin using +[depends README](depends/README.md) for instructions to build Discoin using these dependencies. ### Compiling using system-provided libraries - The following are developer notes on how to build Dogecoin on your native + The following are developer notes on how to build Discoin on your native platform, using the dependencies as provided by your system's package manager. They are not complete guides, but include notes on the necessary libraries, compile flags, etc. - [Unix Build Notes](doc/build-unix.md) - [Windows Build Notes](doc/build-windows.md) - - [macOS Build Notes](doc/Building-Dogecoin-1.14-for-Mac.md) + - [macOS Build Notes](doc/Building-Discoin-1.14-for-Mac.md) ### Testing @@ -74,7 +74,7 @@ that run in `-regtest` mode. **DEBUG_LOCKORDER** -Dogecoin Core is a multithreaded application, and deadlocks or other multithreading bugs +Discoin Core is a multithreaded application, and deadlocks or other multithreading bugs can be very difficult to track down. Compiling with `-DDEBUG_LOCKORDER` (`configure CXXFLAGS="-DDEBUG_LOCKORDER -g"`) inserts run-time checks to keep track of which locks are held, and adds warnings to the debug.log file if inconsistencies are detected. diff --git a/Makefile.am b/Makefile.am index 0418d4429..9acf8951e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,7 +25,7 @@ BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EX empty := space := $(empty) $(empty) -OSX_APP=Dogecoin-Qt.app +OSX_APP=Discoin-Qt.app OSX_VOLNAME = $(subst $(space),-,$(PACKAGE_NAME)) OSX_DMG = $(OSX_VOLNAME).dmg OSX_BACKGROUND_SVG=background.svg @@ -92,7 +92,7 @@ $(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS) $(MKDIR_P) $(@D) $(INSTALL_DATA) $< $@ -$(OSX_APP)/Contents/MacOS/Dogecoin-Qt: $(BITCOIN_QT_BIN) +$(OSX_APP)/Contents/MacOS/Discoin-Qt: $(BITCOIN_QT_BIN) $(MKDIR_P) $(@D) STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@ @@ -102,7 +102,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/Dogecoin-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings + $(OSX_APP)/Contents/MacOS/Discoin-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings osx_volname: echo $(OSX_VOLNAME) >$@ @@ -127,7 +127,7 @@ $(APP_DIST_DIR)/Applications: @rm -f $@ @cd $(@D); $(LN_S) /Applications $(@F) -$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Dogecoin-Qt +$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Discoin-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 @@ -142,7 +142,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/Dogecoin-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING) +$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Discoin-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) @@ -1,24 +1,24 @@ <h1 align="center"> -Dogecoin Core [DOGE, Ð] +Discoin Core [DOGE, Ð] <br/><br/> </h1> Select language: EN | [CN](./README_zh_CN.md) -Dogecoin is a cryptocurrency like Bitcoin, although it does not use SHA256 as +Discoin is a cryptocurrency like Bitcoin, although it does not use SHA256 as its proof of work (POW). Taking development cues from Tenebrix and Litecoin, -Dogecoin currently employs a simplified variant of scrypt. +Discoin currently employs a simplified variant of scrypt. **Website:** [discoin.com](https://discoin.com) ## Installation 💻 Please see [the installation guide](INSTALL.md) for information about installing -Dogecoin Core. +Discoin Core. ### Such ports -Dogecoin Core by default uses port `22556` for peer-to-peer communication that +Discoin Core by default uses port `22556` for peer-to-peer communication that is needed to synchronize the "mainnet" blockchain and stay informed of new transactions and blocks. Additionally, a JSONRPC port can be opened, which defaults to port `22555` for mainnet nodes. It is strongly recommended to not @@ -31,7 +31,7 @@ expose RPC ports to the public internet. ## Ongoing development - Moon plan 🌒 -Dogecoin Core is an open source and community driven software. The development +Discoin Core is an open source and community driven software. The development process is open and publicly visible; anyone can see, discuss and work on the software. @@ -41,8 +41,8 @@ Main development resources: follow planned and in-progress work for upcoming releases. * [Github Discussion](https://github.com/discoin/discoin/discussions) is used to discuss features, planned and unplanned, related to both the development of - the Dogecoin Core software, the underlying protocols and the DOGE asset. -* [Dogecoindev subreddit](https://www.reddit.com/r/discoindev/) + the Discoin Core software, the underlying protocols and the DOGE asset. +* [Discoindev subreddit](https://www.reddit.com/r/discoindev/) ### Version strategy Version numbers are following ```major.minor.patch``` semantics. @@ -65,7 +65,7 @@ If you find a bug or experience issues with this software, please report it using the [issue system](https://github.com/discoin/discoin/issues/new?assignees=&labels=bug&template=bug_report.md&title=%5Bbug%5D+). Please see [the contribution guide](CONTRIBUTING.md) to see how you can -participate in the development of Dogecoin Core. There are often +participate in the development of Discoin Core. There are often [topics seeking help](https://github.com/discoin/discoin/labels/help%20wanted) where your contributions will have high impact and get very appreciation. wow. @@ -73,23 +73,23 @@ where your contributions will have high impact and get very appreciation. wow. You can join the communities on different social media. To see what's going on, meet people & discuss, find the lastest meme, learn -about Dogecoin, give or ask for help, to share your project. +about Discoin, give or ask for help, to share your project. Here are some places to visit: -* [Dogecoin subreddit](https://www.reddit.com/r/discoin/) -* [Dogeducation subreddit](https://www.reddit.com/r/disducation/) +* [Discoin subreddit](https://www.reddit.com/r/discoin/) +* [Disducation subreddit](https://www.reddit.com/r/disducation/) * [Discord](https://discord.gg/discoin) -* [Dogecoin Twitter](https://twitter.com/discoin) +* [Discoin Twitter](https://twitter.com/discoin) ## Very Much Frequently Asked Questions ❓ -Do you have a question regarding Dogecoin? An answer is perhaps already in the +Do you have a question regarding Discoin? An answer is perhaps already in the [FAQ](doc/FAQ.md) or the [Q&A section](https://github.com/discoin/discoin/discussions/categories/q-a) of the discussion board! ## License - Much license ⚖️ -Dogecoin Core is released under the terms of the MIT license. See +Discoin Core is released under the terms of the MIT license. See [COPYING](COPYING) for more information or see [opensource.org](https://opensource.org/licenses/MIT) diff --git a/README_zh_CN.md b/README_zh_CN.md index 7ee2b3073..6ddf1a957 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -1,6 +1,6 @@ -# 狗狗币核心 （Dogecoin Core） [DOGE, Ð] +# 狗狗币核心 （Discoin Core） [DOGE, Ð] - + [](https://travis-ci.com/discoin/discoin) @@ -53,37 +53,37 @@ RPC界面上还有由Python编写的[回归和整合测试（regression and inte **目前的区块奖励机制:** -1–99,999: 0–1,000,000 Dogecoin +1–99,999: 0–1,000,000 Discoin -100,000–144,999: 0–500,000 Dogecoin +100,000–144,999: 0–500,000 Discoin -145,000–199,999: 250,000 Dogecoin +145,000–199,999: 250,000 Discoin -200,000–299,999: 125,000 Dogecoin +200,000–299,999: 125,000 Discoin -300,000–399,999: 62,500 Dogecoin +300,000–399,999: 62,500 Discoin -400,000–499,999: 31,250 Dogecoin +400,000–499,999: 31,250 Discoin -500,000–599,999: 15,625 Dogecoin +500,000–599,999: 15,625 Discoin -600,000+: 10,000 Dogecoin +600,000+: 10,000 Discoin **原先的区块奖励机制（一分钟区块和四小时难度调整）:** -1–99,999: 0–1,000,000 Dogecoin +1–99,999: 0–1,000,000 Discoin -100,000–199,999: 0–500,000 Dogecoin +100,000–199,999: 0–500,000 Discoin -200,000–299,999: 0–250,000 Dogecoin +200,000–299,999: 0–250,000 Discoin -300,000–399,999: 0–125,000 Dogecoin +300,000–399,999: 0–125,000 Discoin -400,000–499,999: 0–62,500 Dogecoin +400,000–499,999: 0–62,500 Discoin -500,000–599,999: 0–31,250 Dogecoin +500,000–599,999: 0–31,250 Discoin -600,000+: 10,000 Dogecoin +600,000+: 10,000 Discoin ### 请编译我吧 / Wow plz make discoind/discoin-cli/discoin-qt diff --git a/configure.ac b/configure.ac index f811786bc..e0c87384b 100644 --- a/configure.ac +++ b/configure.ac @@ -7,8 +7,8 @@ define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2021) define(_COPYRIGHT_HOLDERS,[The %s developers]) -define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitcoin Core and Dogecoin Core]]) -AC_INIT([Dogecoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/discoin/discoin/issues],[discoin],[https://discoin.com/]) +define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitcoin Core and Discoin Core]]) +AC_INIT([Discoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/discoin/discoin/issues],[discoin],[https://discoin.com/]) AC_CONFIG_SRCDIR([src/validation.cpp]) AC_CONFIG_HEADERS([src/config/bitcoin-config.h]) AC_CONFIG_AUX_DIR([build-aux]) |