Commit 84c26ca7 authored by infernoman's avatar infernoman
Browse files

change dash-cli -> crown-cli

change dash-tx -> crown-tx

change dash-config.h

change das
h- -> crown-

change dashrpc->crownrpc

change dash_qt -> crown_qt

change dash_cli -> crown_cli

chang
e dash_tx -> crown_tx

change test_dash -> test_crown


Former-commit-id: f22ef63258e4b6b7ae790be64ba079162262415f
parent 7b0eec00
Showing with 73 additions and 73 deletions
+73 -73
......@@ -7,11 +7,11 @@ reset-files.bash
*.exe
src/dash
src/dashd
src/dash-cli
src/dash-tx
src/test/test_dash
src/qt/test/test_dash-qt
src/crownd
src/crown-cli
src/crown-tx
src/test/test_crown
src/qt/test/test_crown-qt
# autoreconf
Makefile.in
......@@ -34,8 +34,8 @@ config.log
config.status
configure
libtool
src/config/dash-config.h
src/config/dash-config.h.in
src/config/crown-config.h
src/config/crown-config.h.in
src/config/stamp-h1
share/setup.nsi
share/qt/Info.plist
......@@ -79,12 +79,12 @@ src/qt/test/moc*.cpp
# Compilation and Qt preprocessor part
*.qm
Makefile
dash-qt
crown-qt
Crown-Qt.app
# Unit-tests
Makefile.test
dash-qt_test
crown-qt_test
src/test/buildenv.py
# Resources cpp
......@@ -100,7 +100,7 @@ build
#lcov
*.gcno
/*.info
test_dash.coverage/
test_crown.coverage/
total.coverage/
coverage_percent.txt
......
......@@ -18,7 +18,7 @@ env:
- CCACHE_TEMPDIR=/tmp/.ccache-temp
- CCACHE_COMPRESS=1
- BASE_OUTDIR=$TRAVIS_BUILD_DIR/out
- SDK_URL=https://dash.org/depends-sources/sdks
- SDK_URL=https://crown.tech/depends-sources/sdks
cache:
apt: true
ccache: true
......@@ -34,7 +34,7 @@ matrix:
apt:
packages:
- g++-arm-linux-gnueabihf
- compiler: ": dashd"
- compiler: ": crownd"
env: HOST=x86_64-unknown-linux-gnu DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1" RUN_TESTS=false GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat CPPFLAGS=-DDEBUG_LOCKORDER"
addons:
apt:
......@@ -99,12 +99,12 @@ script:
- test -n "$USE_SHELL" && eval '"$USE_SHELL" -c "./autogen.sh"' || ./autogen.sh
- ./configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
- make distdir PACKAGE=dash VERSION=$HOST
- cd dash-$HOST
- cd crown-$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
- if [ "$RUN_TESTS" = "true" -a "$WINE" != "true" ]; then make check; fi
- if [ "$RUN_TESTS" = "true" -a "$WINE" = "true" ]; then wine src/test/test_dash.exe && wine src/qt/test/test_dash-qt.exe ; fi
- if [ "$RUN_TESTS" = "true" -a "$WINE" = "true" ]; then wine src/test/test_crown.exe && wine src/qt/test/test_crown-qt.exe ; fi
- if [ "$RUN_TESTS" = "true" ]; then qa/pull-tester/rpc-tests.sh; fi
after_script:
- if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then (echo "Upload goes here. Something like: scp -r $BASE_OUTDIR server" || echo "upload failed"); fi
......@@ -7,7 +7,7 @@ Use the autogen script to prepare the build environment.
make
Precompiled binaries are available at github, see
https://github.com/dashproject/dash-binaries
https://github.com/dashproject/crown-binaries
Always verify the signatures and checksums.
......
......@@ -6,7 +6,7 @@ GZIP_ENV="-9n"
BITCOIND_BIN=$(top_builddir)/src/crownd$(EXEEXT)
BITCOIN_QT_BIN=$(top_builddir)/src/qt/crown-qt$(EXEEXT)
BITCOIN_CLI_BIN=$(top_builddir)/src/dash-cli$(EXEEXT)
BITCOIN_CLI_BIN=$(top_builddir)/src/crown-cli$(EXEEXT)
BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
OSX_APP=Crown-Qt.app
......@@ -31,9 +31,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_dash_filtered.info total_coverage.info \
leveldb_baseline.info test_crown_filtered.info total_coverage.info \
baseline_filtered.info block_test_filtered.info \
leveldb_baseline_filtered.info test_dash_coverage.info test_dash.info
leveldb_baseline_filtered.info test_crown_coverage.info test_crown.info
dist-hook:
-$(MAKE) -C $(top_distdir)/src/leveldb clean
......@@ -147,16 +147,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_dash.info: baseline_filtered_combined.info
test_crown.info: baseline_filtered_combined.info
$(MAKE) -C src/ check
$(LCOV) -c -d $(abs_builddir)/src -t test_dash -o $@
$(LCOV) -c -d $(abs_builddir)/src -t test_crown -o $@
$(LCOV) -z -d $(abs_builddir)/src
$(LCOV) -z -d $(abs_builddir)/src/leveldb
test_dash_filtered.info: test_dash.info
test_crown_filtered.info: test_crown.info
$(LCOV) -r $< "/usr/include/*" -o $@
block_test.info: test_dash_filtered.info
block_test.info: test_crown_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 $@
......@@ -166,13 +166,13 @@ block_test.info: test_dash_filtered.info
block_test_filtered.info: block_test.info
$(LCOV) -r $< "/usr/include/*" -o $@
test_dash_coverage.info: baseline_filtered_combined.info test_dash_filtered.info
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_dash_filtered.info -o $@
test_crown_coverage.info: baseline_filtered_combined.info test_crown_filtered.info
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_crown_filtered.info -o $@
total_coverage.info: baseline_filtered_combined.info test_dash_filtered.info block_test_filtered.info
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_dash_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_crown_filtered.info block_test_filtered.info
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_crown_filtered.info -a block_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
test_dash.coverage/.dirstamp: test_dash_coverage.info
test_crown.coverage/.dirstamp: test_crown_coverage.info
$(GENHTML) -s $< -o $(@D)
@touch $@
......@@ -180,7 +180,7 @@ total.coverage/.dirstamp: total_coverage.info
$(GENHTML) -s $< -o $(@D)
@touch $@
cov: test_dash.coverage/.dirstamp total.coverage/.dirstamp
cov: test_crown.coverage/.dirstamp total.coverage/.dirstamp
endif
......@@ -199,4 +199,4 @@ CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)
.INTERMEDIATE: $(COVERAGE_INFO)
clean-local:
rm -rf test_dash.coverage/ total.coverage/ $(OSX_APP)
rm -rf test_crown.coverage/ total.coverage/ $(OSX_APP)
......@@ -76,7 +76,7 @@ Translations are periodically pulled from Transifex and merged into the git repo
**Important**: We do not accept translation changes as GitHub pull requests because the next
pull from Transifex would automatically overwrite them again.
Translators should also subscribe to the [mailing list](https://groups.google.com/forum/#!forum/dash-translators). ***TODO***
Translators should also subscribe to the [mailing list](https://groups.google.com/forum/#!forum/crown-translators). ***TODO***
Development tips and tricks
---------------------------
......
......@@ -8,7 +8,7 @@ define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2016)
AC_INIT([Crown Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@crown.tech],[dash])
AC_CONFIG_SRCDIR([src/main.cpp])
AC_CONFIG_HEADERS([src/config/dash-config.h])
AC_CONFIG_HEADERS([src/config/crown-config.h])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([build-aux/m4])
......@@ -173,7 +173,7 @@ CPPFLAGS="$CPPFLAGS -DBOOST_SPIRIT_THREADSAFE -DHAVE_BUILD_INFO -D__STDC_FORMAT_
AC_ARG_WITH([utils],
[AS_HELP_STRING([--with-utils],
[build dash-cli crown-tx (default=yes)])],
[build crown-cli crown-tx (default=yes)])],
[build_bitcoin_utils=$withval],
[build_bitcoin_utils=yes])
......@@ -363,7 +363,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 dash-config.h, but
# The following macro will add the necessary defines to crown-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
......@@ -723,7 +723,7 @@ AC_MSG_CHECKING([whether to build crownd])
AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes])
AC_MSG_RESULT($build_bitcoind)
AC_MSG_CHECKING([whether to build utils (dash-cli crown-tx)])
AC_MSG_CHECKING([whether to build utils (crown-cli crown-tx)])
AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes])
AC_MSG_RESULT($build_bitcoin_utils)
......@@ -832,7 +832,7 @@ if test x$bitcoin_enable_qt != xno; then
fi
fi
AC_MSG_CHECKING([whether to build test_dash])
AC_MSG_CHECKING([whether to build test_crown])
if test x$use_tests = xyes; then
AC_MSG_RESULT([yes])
BUILD_TEST="test"
......
......@@ -78,7 +78,7 @@ HEADERS += src/activethrone.h \
src/crypter.h \
src/darksend-relay.h \
src/darksend.h \
src/dash-config.h \
src/crown-config.h \
src/db.h \
src/eccryptoverify.h \
src/ecwrapper.h \
......@@ -131,7 +131,7 @@ HEADERS += src/activethrone.h \
src/wallet_ismine.h \
src/walletdb.h \
src/compat/sanity.h \
src/config/dash-config.h \
src/config/crown-config.h \
src/crypto/common.h \
src/crypto/hmac_sha256.h \
src/crypto/hmac_sha512.h \
......@@ -374,7 +374,7 @@ SOURCES += src/activethrone.cpp \
src/crypter.cpp \
src/darksend-relay.cpp \
src/darksend.cpp \
src/dash-cli.cpp \
src/crown-cli.cpp \
src/crown-tx.cpp \
src/crownd.cpp \
src/db.cpp \
......@@ -550,7 +550,7 @@ SOURCES += src/activethrone.cpp \
src/test/sighash_tests.cpp \
src/test/sigopcount_tests.cpp \
src/test/skiplist_tests.cpp \
src/test/test_dash.cpp \
src/test/test_crown.cpp \
src/test/timedata_tests.cpp \
src/test/transaction_tests.cpp \
src/test/uint256_tests.cpp \
......
# bash programmable completion for crownd(1) and dash-cli(1)
# bash programmable completion for crownd(1) and crown-cli(1)
# Copyright (c) 2012,2014 Christian von Roques <roques@mti.ag>
# Distributed under the MIT/X11 software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
......@@ -133,7 +133,7 @@ _crownd() {
esac
}
complete -F _crownd crownd dash-cli
complete -F _crownd crownd crown-cli
}
# Local variables:
......
......@@ -40,7 +40,7 @@ Description: peer-to-peer network based digital currency - daemon
requires 1+ GB of space, slowly growing.
.
This package provides the daemon, crownd, and the CLI tool
dash-cli to interact with the daemon.
crown-cli to interact with the daemon.
Package: crown-qt
Architecture: any
......
usr/local/bin/crownd usr/bin
usr/local/bin/dash-cli usr/bin
usr/local/bin/crown-cli usr/bin
#!/usr/bin/make -f
# -*- mode: makefile; coding: utf-8 -*-
#DEB_MAKE_CHECK_TARGET = test_dash
#DEB_MAKE_CHECK_TARGET = test_crown
#build/bitcoind::
# $(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),,src/test_dash)
# $(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),,src/test_crown)
DEB_INSTALL_EXAMPLES_bitcoind += debian/examples/*
DEB_INSTALL_MANPAGES_bitcoind += debian/manpages/*
......@@ -13,7 +13,7 @@ DEB_INSTALL_MANPAGES_bitcoind += debian/manpages/*
override_dh_auto_clean:
if [ -f Makefile ]; then $(MAKE) distclean; fi
rm -rf Makefile.in aclocal.m4 configure src/Makefile.in src/dash-config.h.in src/build-aux src/qt/Makefile.in src/qt/test/Makefile.in src/test/Makefile.in
rm -rf Makefile.in aclocal.m4 configure src/Makefile.in src/crown-config.h.in src/build-aux src/qt/Makefile.in src/qt/test/Makefile.in src/test/Makefile.in
# Yea, autogen should be run on the source archive, but I like doing git archive
override_dh_auto_configure:
......
......@@ -64,10 +64,10 @@ If only supported symbols are used the return value will be 0 and the output wil
If there are 'unsupported' symbols, the return value will be 1 a list like this will be printed:
.../64/test_dash: symbol memcpy from unsupported version GLIBC_2.14
.../64/test_dash: symbol __fdelt_chk from unsupported version GLIBC_2.15
.../64/test_dash: symbol std::out_of_range::~out_of_range() from unsupported version GLIBCXX_3.4.15
.../64/test_dash: symbol _ZNSt8__detail15_List_nod from unsupported version GLIBCXX_3.4.15
.../64/test_crown: symbol memcpy from unsupported version GLIBC_2.14
.../64/test_crown: symbol __fdelt_chk from unsupported version GLIBC_2.15
.../64/test_crown: symbol std::out_of_range::~out_of_range() from unsupported version GLIBCXX_3.4.15
.../64/test_crown: symbol _ZNSt8__detail15_List_nod from unsupported version GLIBCXX_3.4.15
update-translations.py
=======================
......
---
name: "dash-linux-0.12"
name: "crown-linux-0.12"
enable_cache: true
suites:
- "precise"
......@@ -73,13 +73,13 @@ script: |
./autogen.sh
./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`
make dist
SOURCEDIST=`echo dash-*.tar.gz`
SOURCEDIST=`echo crown-*.tar.gz`
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
# Correct tar file order
mkdir -p temp
pushd temp
tar xf ../$SOURCEDIST
find dash-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
find crown-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
popd
ORIGPATH="$PATH"
......
---
name: "dash-dmg-signer"
name: "crown-dmg-signer"
suites:
- "precise"
architectures:
......@@ -10,7 +10,7 @@ packages:
reference_datetime: "2016-01-01 00:00:00"
remotes: []
files:
- "dash-osx-unsigned.tar.gz"
- "crown-osx-unsigned.tar.gz"
- "signature.tar.gz"
script: |
WRAP_DIR=$HOME/wrapped
......@@ -28,8 +28,8 @@ script: |
chmod +x ${WRAP_DIR}/${prog}
done
UNSIGNED=dash-osx-unsigned.tar.gz
SIGNED=dash-osx-signed.dmg
UNSIGNED=crown-osx-unsigned.tar.gz
SIGNED=crown-osx-signed.dmg
tar -xf ${UNSIGNED}
./detached-sig-apply.sh ${UNSIGNED} signature.tar.gz
......
---
name: "dash-osx-0.12"
name: "crown-osx-0.12"
enable_cache: true
suites:
- "precise"
......@@ -83,14 +83,14 @@ script: |
./autogen.sh
./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`
make dist
SOURCEDIST=`echo dash-*.tar.gz`
SOURCEDIST=`echo crown-*.tar.gz`
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
# Correct tar file order
mkdir -p temp
pushd temp
tar xf ../$SOURCEDIST
find dash-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
find crown-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
popd
ORIGPATH="$PATH"
......
---
name: "dash-raspberry-0.12"
name: "crown-raspberry-0.12"
enable_cache: true
suites:
- "precise"
......@@ -78,13 +78,13 @@ script: |
./autogen.sh
./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`
make NO_QT=1 dist
SOURCEDIST=`echo dash-*.tar.gz`
SOURCEDIST=`echo crown-*.tar.gz`
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
# Correct tar file order
mkdir -p temp
pushd temp
tar xf ../$SOURCEDIST
find dash-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
find crown-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
popd
ORIGPATH="$PATH"
......
---
name: "dash-win-0.12"
name: "crown-win-0.12"
enable_cache: true
suites:
- "precise"
......@@ -76,14 +76,14 @@ script: |
./autogen.sh
./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`
make dist
SOURCEDIST=`echo dash-*.tar.gz`
SOURCEDIST=`echo crown-*.tar.gz`
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
# Correct tar file order
mkdir -p temp
pushd temp
tar xf ../$SOURCEDIST
find dash-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
find crown-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
popd
ORIGPATH="$PATH"
......@@ -100,7 +100,7 @@ script: |
make ${MAKEOPTS}
make deploy
make install-strip
cp -f dash-*setup*.exe $OUTDIR/
cp -f crown-*setup*.exe $OUTDIR/
cd installed
mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/
find . -name "lib*.la" -delete
......
......@@ -16,7 +16,7 @@ With arguments, sends coins received by the `FROMADDRESS` addresses to the `TOAD
### Notes ###
- You may explicitly specify how much fee to pay (a fee more than 1% of the amount
will fail, though, to prevent dash-losing accidents). Spendfrom may fail if
will fail, though, to prevent crown-losing accidents). Spendfrom may fail if
it thinks the transaction would never be confirmed (if the amount being sent is
too small, or if the transaction is too many bytes for the fee).
......
......@@ -110,7 +110,7 @@ def list_available(crownd):
vout = rawtx["vout"][output['vout']]
pk = vout["scriptPubKey"]
# This code only deals with ordinary pay-to-dash-address
# This code only deals with ordinary pay-to-crown-address
# or pay-to-script-hash outputs right now; anything exotic is ignored.
if pk["type"] != "pubkeyhash" and pk["type"] != "scripthash":
continue
......
......@@ -104,7 +104,7 @@ Creating a release build
------------------------
You can ignore this section if you are building `crownd` for your own use.
crownd/dash-cli binaries are not included in the Crown-Qt.app bundle.
crownd/crown-cli binaries are not included in the Crown-Qt.app bundle.
If you are building `crownd` or `Crown-Qt` for others, your build machine should be set up
as follows for maximum compatibility:
......@@ -127,7 +127,7 @@ directory. We have to first create the RPC configuration file, though.
Run `./crownd` to get the filename where it should be put, or just try these
commands:
echo -e "rpcuser=dashrpc\nrpcpassword=$(xxd -l 16 -p /dev/urandom)" > "/Users/${USER}/Library/Application Support/Crown/dash.conf"
echo -e "rpcuser=crownrpc\nrpcpassword=$(xxd -l 16 -p /dev/urandom)" > "/Users/${USER}/Library/Application Support/Crown/dash.conf"
chmod 600 "/Users/${USER}/Library/Application Support/Crown/dash.conf"
The next time you run it, it will start downloading the blockchain, but it won't
......@@ -140,5 +140,5 @@ Other commands:
-------
./crownd -daemon # to start the dash daemon.
./dash-cli --help # for a list of command-line options.
./dash-cli help # When the daemon is running, to get a list of RPC commands
./crown-cli --help # for a list of command-line options.
./crown-cli help # When the daemon is running, to get a list of RPC commands
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