Skip to content

Commit

Permalink
intitial commit
Browse files Browse the repository at this point in the history
  • Loading branch information
flyinghuman committed Aug 13, 2018
1 parent 94530d3 commit ccfaa12
Show file tree
Hide file tree
Showing 264 changed files with 4,205 additions and 3,859 deletions.
20 changes: 10 additions & 10 deletions CONTRIBUTING.md
@@ -1,7 +1,7 @@
Contributing to XDNA Core
Contributing to UCC Core
============================

The XDNA Core project operates an open contributor model where anyone is
The UCC 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 xdna-qt
- *Qt* for changes to ucc-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 xdna unit tests or QA tests
- *Tests* for changes to the ucc 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 XDNA Core project, and is not to be
confused with overall XDNA Network Protocol consensus changes.
The following applies to code changes to the UCC Core project, and is not to be
confused with overall UCC Network Protocol consensus changes.

Whether a pull request is merged into XDNA Core rests with the project merge
Whether a pull request is merged into UCC 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 XDNA consensus rules are considerably more involved than
Patches that change UCC 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 XDNA consensus, it must have been
Where a patch set proposes to change the UCC 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 XDNA Core release.
The project leader is the release manager for each UCC Core release.

Copyright
---------
Expand Down
6 changes: 3 additions & 3 deletions INSTALL
@@ -1,4 +1,4 @@
Building XDNA
Building UCC

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 xdnad,
See doc/build-*.md for instructions on building uccd,
the intended-for-services, no-graphical-interface, reference
implementation of XDNA.
implementation of UCC.
44 changes: 22 additions & 22 deletions Makefile.am
Expand Up @@ -17,7 +17,7 @@ BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EX
empty :=
space := $(empty) $(empty)

OSX_APP=XDNA-Qt.app
OSX_APP=UCC-Qt.app
OSX_VOLNAME = $(subst $(space),-,$(PACKAGE_NAME))
OSX_DMG = $(OSX_VOLNAME).dmg
OSX_BACKGROUND_SVG=background.svg
Expand All @@ -26,13 +26,13 @@ OSX_BACKGROUND_IMAGE_DPIS=36 72
OSX_DSSTORE_GEN=$(top_srcdir)/contrib/macdeploy/custom_dsstore.py
OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist
OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/xdna.icns
OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/ucc.icns
OSX_PLIST=$(top_srcdir)/share/qt/Info.plist #not installed
OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW

DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md)

WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/xdna.ico \
WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/ucc.ico \
$(top_srcdir)/share/pixmaps/nsis-header.bmp \
$(top_srcdir)/share/pixmaps/nsis-wizard.bmp \
$(top_srcdir)/doc/README_windows.txt
Expand All @@ -44,9 +44,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_xdna_filtered.info total_coverage.info \
leveldb_baseline.info test_ucc_filtered.info total_coverage.info \
baseline_filtered.info block_test_filtered.info \
leveldb_baseline_filtered.info test_xdna_coverage.info test_xdna.info
leveldb_baseline_filtered.info test_ucc_coverage.info test_ucc.info

dist-hook:
-$(MAKE) -C $(top_distdir)/src/leveldb clean
Expand Down Expand Up @@ -82,11 +82,11 @@ $(OSX_APP)/Contents/Info.plist: $(OSX_PLIST)
$(MKDIR_P) $(@D)
$(INSTALL_DATA) $< $@

$(OSX_APP)/Contents/Resources/xdna.icns: $(OSX_INSTALLER_ICONS)
$(OSX_APP)/Contents/Resources/ucc.icns: $(OSX_INSTALLER_ICONS)
$(MKDIR_P) $(@D)
$(INSTALL_DATA) $< $@

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

Expand All @@ -95,8 +95,8 @@ $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings:
echo '{ CFBundleDisplayName = "$(PACKAGE_NAME)"; CFBundleName = "$(PACKAGE_NAME)"; }' > $@

OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \
$(OSX_APP)/Contents/Resources/xdna.icns $(OSX_APP)/Contents/Info.plist \
$(OSX_APP)/Contents/MacOS/XDNA-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings
$(OSX_APP)/Contents/Resources/ucc.icns $(OSX_APP)/Contents/Info.plist \
$(OSX_APP)/Contents/MacOS/UCC-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings

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

$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/XDNA-Qt
$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/UCC-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 @@ -136,7 +136,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/XDNA-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/UCC-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 @@ -176,16 +176,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_xdna.info: baseline_filtered_combined.info
test_ucc.info: baseline_filtered_combined.info
$(MAKE) -C src/ check
$(LCOV) -c -d $(abs_builddir)/src -t test_xdna -o $@
$(LCOV) -c -d $(abs_builddir)/src -t test_ucc -o $@
$(LCOV) -z -d $(abs_builddir)/src
$(LCOV) -z -d $(abs_builddir)/src/leveldb

test_xdna_filtered.info: test_xdna.info
test_ucc_filtered.info: test_ucc.info
$(LCOV) -r $< "/usr/include/*" -o $@

block_test.info: test_xdna_filtered.info
block_test.info: test_ucc_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 @@ -195,21 +195,21 @@ block_test.info: test_xdna_filtered.info
block_test_filtered.info: block_test.info
$(LCOV) -r $< "/usr/include/*" -o $@

test_xdna_coverage.info: baseline_filtered_combined.info test_xdna_filtered.info
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_xdna_filtered.info -o $@
test_ucc_coverage.info: baseline_filtered_combined.info test_ucc_filtered.info
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_ucc_filtered.info -o $@

total_coverage.info: baseline_filtered_combined.info test_xdna_filtered.info block_test_filtered.info
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_xdna_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_ucc_filtered.info block_test_filtered.info
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_ucc_filtered.info -a block_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt

test_xdna.coverage/.dirstamp: test_xdna_coverage.info
test_ucc.coverage/.dirstamp: test_ucc_coverage.info
$(GENHTML) -s $< -o $(@D)
@touch $@

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

cov: test_xdna.coverage/.dirstamp total.coverage/.dirstamp
cov: test_ucc.coverage/.dirstamp total.coverage/.dirstamp

endif

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

clean-local:
rm -rf test_xdna.coverage/ total.coverage/ $(OSX_APP)
rm -rf test_ucc.coverage/ total.coverage/ $(OSX_APP)
18 changes: 9 additions & 9 deletions README.md
@@ -1,29 +1,29 @@
XDNA Core integration/staging repository
UCC Core integration/staging repository
=====================================

XDNA is a brand new digital currency that combines all the positive aspects of successful digital currencies, while taking into account their flaws and weak points.
UCC is a brand new digital currency that combines all the positive aspects of successful digital currencies, while taking into account their flaws and weak points.
The project brings tangible benefits not only to the digital world but also to the real one.


More information at [xdna.io](http://www.xdna.io) Visit our ANN thread at [BitcoinTalk](https://bitcointalk.org/index.php?topic=4517612.0), join our group at [Discord] (https://discord.gg/S9adMgS).
More information at [uccnetwork.org](http://www.uccnetwork.org) Visit our ANN thread at [BitcoinTalk](https://bitcointalk.org/index.php?topic=4517612.0), join our group at [Discord] (https://discord.gg/S9adMgS).

### Coin Specs

<table>
<tr><td>Name & ticker</td><td>XDNA</td></tr>
<tr><td>Name & ticker</td><td>UCC</td></tr>
<tr><td>Consensus algorithm</td><td>PoW/POS</td></tr>
<tr><td>POW phase duration</td><td>1440000 blocks</td></tr>
<tr><td>PoW block reward</td><td>Dynamic from 4 to 511 XDNA</td></tr>
<tr><td>PoW block reward</td><td>Dynamic from 4 to 511 UCC</td></tr>
<tr><td>Instamine protection</td><td>First 720 blocks</td></tr>
<tr><td>Hashing algorithm from start</td><td>Keccak</td></tr>
<tr><td>Hashing algorithm from 15.00 GMT 08 Aug 2018 </td><td>HEX</td></tr>
<tr><td>Estimated XDNA supply during POW</td><td>138,000,000</td></tr>
<tr><td>Estimated UCC supply during POW</td><td>138,000,000</td></tr>
<tr><td>POS starting block</td><td>1440001</td></tr>
<tr><td>POS phase duration</td><td>Unlimited</td></tr>
<tr><td>POS block reward</td><td>57 XDNA lowering by 4 coins every 525600 blocks until block reward is 1 XDNA</td></tr>
<tr><td>POS block reward</td><td>57 UCC lowering by 4 coins every 525600 blocks until block reward is 1 UCC</td></tr>
<tr><td>POS block reward distribution</td><td>SeeSaw</td></tr>
<tr><td>Estimated XDNA supply during 15 years of POS</td><td>228,000,000</td></tr>
<tr><td>Premine</td><td>971,712 XDNA (0.7% of POW total supply)</td></tr>
<tr><td>Estimated UCC supply during 15 years of POS</td><td>228,000,000</td></tr>
<tr><td>Premine</td><td>971,712 UCC (0.7% of POW total supply)</td></tr>
<tr><td>Blocksize</td><td>1 MB</td></tr>
<tr><td>Blocktime average</td><td>1 min (DGW3)</td></tr>
<tr><td>Number of transaction confirmations</td><td>6</td></tr>
Expand Down
38 changes: 19 additions & 19 deletions configure.ac
@@ -1,27 +1,27 @@
dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 1)
define(_CLIENT_VERSION_MINOR, 1)
define(_CLIENT_VERSION_REVISION, 1)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_MINOR, 0)
define(_CLIENT_VERSION_REVISION, 0)
define(_CLIENT_VERSION_BUILD, 1)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2018)
AC_INIT([XDNA Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[www.xdna.io],[xdna])
AC_INIT([UCC Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[www.uccnetwork.org],[ucc])
AC_CONFIG_SRCDIR([src/main.cpp])
AC_CONFIG_HEADERS([src/config/xdna-config.h])
AC_CONFIG_HEADERS([src/config/ucc-config.h])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([build-aux/m4])

BITCOIN_DAEMON_NAME=xdnad
BITCOIN_GUI_NAME=xdna-qt
BITCOIN_CLI_NAME=xdna-cli
BITCOIN_TX_NAME=xdna-tx
BITCOIN_DAEMON_NAME=uccd
BITCOIN_GUI_NAME=ucc-qt
BITCOIN_CLI_NAME=ucc-cli
BITCOIN_TX_NAME=ucc-tx

AC_CANONICAL_HOST

AH_TOP([#ifndef XDNA_CONFIG_H])
AH_TOP([#define XDNA_CONFIG_H])
AH_BOTTOM([#endif //XDNA_CONFIG_H])
AH_TOP([#ifndef UCC_CONFIG_H])
AH_TOP([#define UCC_CONFIG_H])
AH_BOTTOM([#endif //UCC_CONFIG_H])

dnl faketime breaks configure and is only needed for make. Disable it here.
unset FAKETIME
Expand Down Expand Up @@ -207,7 +207,7 @@ CPPFLAGS="$CPPFLAGS -DBOOST_SPIRIT_THREADSAFE -DHAVE_BUILD_INFO -D__STDC_FORMAT_

AC_ARG_WITH([utils],
[AS_HELP_STRING([--with-utils],
[build xdna-cli xdna-tx (default=yes)])],
[build ucc-cli ucc-tx (default=yes)])],
[build_bitcoin_utils=$withval],
[build_bitcoin_utils=yes])

Expand All @@ -219,7 +219,7 @@ AC_ARG_WITH([libs],

AC_ARG_WITH([daemon],
[AS_HELP_STRING([--with-daemon],
[build xdnad daemon (default=yes)])],
[build uccd daemon (default=yes)])],
[build_bitcoind=$withval],
[build_bitcoind=yes])

Expand Down Expand Up @@ -412,7 +412,7 @@ AC_C_BIGENDIAN([AC_MSG_ERROR("Big Endian not supported")])
dnl Check for pthread compile/link requirements
AX_PTHREAD

# The following macro will add the necessary defines to xdna-config.h, but
# The following macro will add the necessary defines to ucc-config.h, but
# they also need to be passed down to any subprojects. Pull the results out of
# the cache and add them to CPPFLAGS.
AC_SYS_LARGEFILE
Expand Down Expand Up @@ -860,11 +860,11 @@ LIBS="$LIBS_TEMP"

BITCOIN_QT_PATH_PROGS([PROTOC], [protoc],$protoc_bin_path)

AC_MSG_CHECKING([whether to build xdnad])
AC_MSG_CHECKING([whether to build uccd])
AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes])
AC_MSG_RESULT($build_bitcoind)

AC_MSG_CHECKING([whether to build utils (xdna-cli xdna-tx)])
AC_MSG_CHECKING([whether to build utils (ucc-cli ucc-tx)])
AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes])
AC_MSG_RESULT($build_bitcoin_utils)

Expand Down Expand Up @@ -964,7 +964,7 @@ if test x$bitcoin_enable_qt != xno; then
AC_MSG_WARN("xgettext is required to update qt translations")
fi

AC_MSG_CHECKING([whether to build test_xdna-qt])
AC_MSG_CHECKING([whether to build test_ucc-qt])
if test x$use_tests$bitcoin_enable_qt_test = xyesyes; then
AC_MSG_RESULT([yes])
BUILD_TEST_QT="test"
Expand All @@ -975,7 +975,7 @@ fi

AM_CONDITIONAL([ENABLE_ZMQ], [test "x$use_zmq" = "xyes"])

AC_MSG_CHECKING([whether to build test_xdna])
AC_MSG_CHECKING([whether to build test_ucc])
if test x$use_tests = xyes; then
AC_MSG_RESULT([yes])
BUILD_TEST="test"
Expand Down
16 changes: 8 additions & 8 deletions contrib/debian/README.md
@@ -1,20 +1,20 @@

Debian
====================
This directory contains files used to package xdnad/xdna-qt
for Debian-based Linux systems. If you compile xdnad/xdna-qt yourself, there are some useful files here.
This directory contains files used to package uccd/ucc-qt
for Debian-based Linux systems. If you compile uccd/ucc-qt yourself, there are some useful files here.

## xdna: URI support ##
## ucc: URI support ##


xdna-qt.desktop (Gnome / Open Desktop)
ucc-qt.desktop (Gnome / Open Desktop)
To install:

sudo desktop-file-install xdna-qt.desktop
sudo desktop-file-install ucc-qt.desktop
sudo update-desktop-database

If you build yourself, you will either need to modify the paths in
the .desktop file or copy or symlink your xdnaqt binary to `/usr/bin`
and the `../../share/pixmaps/xdna128.png` to `/usr/share/pixmaps`
the .desktop file or copy or symlink your uccqt binary to `/usr/bin`
and the `../../share/pixmaps/ucc128.png` to `/usr/share/pixmaps`

xdna-qt.protocol (KDE)
ucc-qt.protocol (KDE)

0 comments on commit ccfaa12

Please sign in to comment.