Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

full renaming haya to daobet #7

Merged
merged 1 commit into from
Oct 2, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ publish-nomral:
- schedules
<<: *docker-login
script:
- docker build -f Docker/Dockerfile -t haya --build-arg registry=${REGISTRY} .
- docker tag haya ${REGISTRY}/haya:${CI_COMMIT_SHA:0:8}
- docker tag haya ${REGISTRY}/haya:${CI_COMMIT_REF_NAME}-latest
- docker tag haya ${REGISTRY}/haya:latest
- docker push ${REGISTRY}/haya
- docker build -f Docker/Dockerfile -t daobet --build-arg registry=${REGISTRY} .
- docker tag daobet ${REGISTRY}/daobet:${CI_COMMIT_SHA:0:8}
- docker tag daobet ${REGISTRY}/daobet:${CI_COMMIT_REF_NAME}-latest
- docker tag daobet ${REGISTRY}/daobet:latest
- docker push ${REGISTRY}/daobet

publish-dev:
stage: publish to gitlab registry dev
Expand All @@ -59,11 +59,11 @@ publish-dev:
- schedules
<<: *docker-login
script:
- docker build -f Docker/dev/Dockerfile -t haya-dev --build-arg registry=${REGISTRY} .
- docker tag haya-dev ${REGISTRY}/haya-dev:${CI_COMMIT_SHA:0:8}
- docker tag haya-dev ${REGISTRY}/haya-dev:${CI_COMMIT_REF_NAME}-latest
- docker tag haya-dev ${REGISTRY}/haya-dev:latest
- docker push ${REGISTRY}/haya-dev
- docker build -f Docker/dev/Dockerfile -t daobet-dev --build-arg registry=${REGISTRY} .
- docker tag daobet-dev ${REGISTRY}/daobet-dev:${CI_COMMIT_SHA:0:8}
- docker tag daobet-dev ${REGISTRY}/daobet-dev:${CI_COMMIT_REF_NAME}-latest
- docker tag daobet-dev ${REGISTRY}/daobet-dev:latest
- docker push ${REGISTRY}/daobet-dev

publish-builder:
stage: publish builder
Expand All @@ -85,8 +85,8 @@ publish-builder:
<<: *docker-login
script:
- cd Docker/builder
- docker build -t haya-builder .
- docker tag haya-builder ${REGISTRY}/haya-builder:${CI_COMMIT_SHA:0:8}
- docker tag haya-builder ${REGISTRY}/haya-builder:${CI_COMMIT_REF_NAME}-latest
- docker tag haya-builder ${REGISTRY}/haya-builder:latest
- docker push ${REGISTRY}/haya-builder
- docker build -t daobet-builder .
- docker tag daobet-builder ${REGISTRY}/daobet-builder:${CI_COMMIT_SHA:0:8}
- docker tag daobet-builder ${REGISTRY}/daobet-builder:${CI_COMMIT_REF_NAME}-latest
- docker tag daobet-builder ${REGISTRY}/daobet-builder:latest
- docker push ${REGISTRY}/daobet-builder
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ jobs:

- cp -r $HOME/.ccache .ccache #copy cache into build context
- docker build --build-arg registry=mixbytes --build-arg build_type=$BUILD_TYPE -t tmp-builder -f Docker/Dockerfile --target builder .
- docker run --rm -v $HOME/.ccache:/out tmp-builder /bin/bash -c "cp -r /haya/.ccache/* /out" #save updated cache
- docker build --build-arg registry=mixbytes --build-arg build_type=$BUILD_TYPE -t mixbytes/haya:$TRAVIS_BRANCH -f Docker/Dockerfile . #build main image
- docker run --rm -v $HOME/.ccache:/out tmp-builder /bin/bash -c "cp -r /daobet/.ccache/* /out" #save updated cache
- docker build --build-arg registry=mixbytes --build-arg build_type=$BUILD_TYPE -t mixbytes/daobet:$TRAVIS_BRANCH -f Docker/Dockerfile . #build main image

- if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ $BUILD_TYPE != "Debug" ]; then docker run tmp-builder /bin/bash -c 'cd /tmp/build && ctest -R "simulator|unit_test"'; fi
- if [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ $BUILD_TYPE != "Debug" ]; then docker run tmp-builder /bin/bash -c 'cd /tmp/build && ctest -R "simulator|unit_test|nodeos_sanity|nodeos_run" -E "mongo"'; fi

- docker push mixbytes/haya:$TRAVIS_BRANCH #push main image to registry
- docker push mixbytes/daobet:$TRAVIS_BRANCH #push main image to registry
- |
if [ $TRAVIS_BRANCH == "master" ]; then
docker tag mixbytes/haya:master mixbytes/haya:latest
docker push mixbytes/haya:latest
docker tag mixbytes/daobet:master mixbytes/daobet:latest
docker push mixbytes/daobet:latest
fi

12 changes: 6 additions & 6 deletions Docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,28 @@ services:
nodeosd:
build:
context: .
image: registry.gitlab.com/cyberos/infrastructure/haya:latest
command: /opt/haya/bin/haya-node.sh --data-dir /opt/haya/bin/data-dir -e --http-alias=nodeosd:8888 --http-alias=127.0.0.1:8888 --http-alias=localhost:8888
image: registry.gitlab.com/cyberos/infrastructure/daobet:latest
command: /opt/daobet/bin/daobet-node.sh --data-dir /opt/daobet/bin/data-dir -e --http-alias=nodeosd:8888 --http-alias=127.0.0.1:8888 --http-alias=localhost:8888
hostname: nodeosd
ports:
- 8888:8888
- 9876:9876
expose:
- "8888"
volumes:
- nodeos-data-volume:/opt/haya/bin/data-dir
- nodeos-data-volume:/opt/daobet/bin/data-dir
cap_add:
- IPC_LOCK
stop_grace_period: 10m

keosd:
image: registry.gitlab.com/cyberos/infrastructure/haya:latest
command: /opt/haya/bin/haya-wallet --wallet-dir /opt/haya/bin/data-dir --http-server-address=127.0.0.1:8900 --http-alias=keosd:8900 --http-alias=localhost:8900
image: registry.gitlab.com/cyberos/infrastructure/daobet:latest
command: /opt/daobet/bin/daobet-wallet --wallet-dir /opt/daobet/bin/data-dir --http-server-address=127.0.0.1:8900 --http-alias=keosd:8900 --http-alias=localhost:8900
hostname: keosd
links:
- nodeosd
volumes:
- keosd-data-volume:/opt/haya/bin/data-dir
- keosd-data-volume:/opt/daobet/bin/data-dir
stop_grace_period: 10m

volumes:
Expand Down
8 changes: 4 additions & 4 deletions debian/postinst
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

set -e

PACKAGE="haya"
USER="haya"
PACKAGE="daobet"
USER="daobet"
GROUP=${USER}

# summary of how this script can be called:
Expand Down Expand Up @@ -40,8 +40,8 @@ case "$1" in
chown ${USER}:${GROUP} /var/lib/${PACKAGE}
chown ${USER}:${GROUP} /etc/${PACKAGE}
chown ${USER}:${GROUP} /etc/${PACKAGE}/node_00
chown ${USER} /usr/bin/haya-node
chmod u+s /usr/bin/haya-node
chown ${USER} /usr/bin/daobet-node
chmod u+s /usr/bin/daobet-node
;;

abort-upgrade|abort-remove|abort-deconfigure)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @file
* @copyright defined in haya/LICENSE
* @copyright defined in daobet/LICENSE
*/
#pragma once
#include <appbase/application.hpp>
Expand Down
2 changes: 1 addition & 1 deletion plugins/telemetry_plugin/telemetry_plugin.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @file
* @copyright defined in haya/LICENSE
* @copyright defined in daobet/LICENSE
*/
#include <eosio/telemetry_plugin/telemetry_plugin.hpp>
#include <fc/exception/exception.hpp>
Expand Down
4 changes: 2 additions & 2 deletions programs/daobet-launcher/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,7 @@ launcher_def::initialize (const variables_map &vmap) {
}
}

config_dir_base = "etc/haya";
config_dir_base = "etc/daobet";
data_dir_base = "var/lib";
next_node = 0;
++prod_nodes; // add one for the bios node
Expand Down Expand Up @@ -1511,7 +1511,7 @@ launcher_def::launch (eosd_def &instance, string &gts) {
node_rt_info info;
info.remote = !host->is_local();

string eosdcmd = "programs/haya-node/haya-node ";
string eosdcmd = "programs/daobet-node/daobet-node ";
if (skip_transaction_signatures) {
eosdcmd += "--skip-transaction-signatures ";
}
Expand Down
28 changes: 14 additions & 14 deletions scripts/daobet_build.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
##########################################################################
# This is the EOSIO automated install script for Linux and Mac OS.
# This file was downloaded from https://github.com/EOSIO/eos
# This file was downloaded from https://github.com/DaoCasino/DAObet
#
# Copyright (c) 2017, Respective Authors all rights reserved.
#
Expand All @@ -27,7 +27,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
#
# https://github.com/EOSIO/eos/blob/master/LICENSE
# https://github.com/DaoCasino/DAObet/blob/master/LICENSE
##########################################################################

VERSION=2.1 # Build script version
Expand Down Expand Up @@ -165,7 +165,7 @@ fi

if [ ! -d "${REPO_ROOT}/.git" ]; then
printf "\\nThis build script only works with sources cloned from git\\n"
printf "Please clone a new haya directory with 'git clone https://github.com/mixbytes/haya --recursive'\\n"
printf "Please clone a new daobet directory with 'git clone https://github.com/DaoCasino/DAObet --recursive'\\n"
exit 1
fi

Expand Down Expand Up @@ -208,38 +208,38 @@ if [ "$ARCH" == "Linux" ]; then
fi
case "$OS_NAME" in
"Amazon Linux AMI"|"Amazon Linux")
FILE="${REPO_ROOT}/scripts/haya_build_amazon.sh"
FILE="${REPO_ROOT}/scripts/daobet_build_amazon.sh"
CXX_COMPILER=g++
C_COMPILER=gcc
;;
"CentOS Linux")
FILE="${REPO_ROOT}/scripts/haya_build_centos.sh"
FILE="${REPO_ROOT}/scripts/daobet_build_centos.sh"
CXX_COMPILER=g++
C_COMPILER=gcc
;;
"elementary OS")
FILE="${REPO_ROOT}/scripts/haya_build_ubuntu.sh"
FILE="${REPO_ROOT}/scripts/daobet_build_ubuntu.sh"
CXX_COMPILER=clang++-4.0
C_COMPILER=clang-4.0
;;
"Fedora")
export CPATH=/usr/include/llvm4.0:$CPATH # llvm4.0 for fedora package path inclusion
FILE="${REPO_ROOT}/scripts/haya_build_fedora.sh"
FILE="${REPO_ROOT}/scripts/daobet_build_fedora.sh"
CXX_COMPILER=g++
C_COMPILER=gcc
;;
"Linux Mint")
FILE="${REPO_ROOT}/scripts/haya_build_ubuntu.sh"
FILE="${REPO_ROOT}/scripts/daobet_build_ubuntu.sh"
CXX_COMPILER=clang++-4.0
C_COMPILER=clang-4.0
;;
"Ubuntu")
FILE="${REPO_ROOT}/scripts/haya_build_ubuntu.sh"
FILE="${REPO_ROOT}/scripts/daobet_build_ubuntu.sh"
CXX_COMPILER=clang++-4.0
C_COMPILER=clang-4.0
;;
"Debian GNU/Linux")
FILE="${REPO_ROOT}/scripts/haya_build_ubuntu.sh"
FILE="${REPO_ROOT}/scripts/daobet_build_ubuntu.sh"
CXX_COMPILER=clang++-4.0
C_COMPILER=clang-4.0
;;
Expand All @@ -256,7 +256,7 @@ if [ "$ARCH" == "Darwin" ]; then
# opt/gettext: cleos requires Intl, which requires gettext; it's keg only though and we don't want to force linking: https://github.com/EOSIO/eos/issues/2240#issuecomment-396309884
# HOME/lib/cmake: mongo_db_plugin.cpp:25:10: fatal error: 'bsoncxx/builder/basic/kvp.hpp' file not found
LOCAL_CMAKE_FLAGS="-DCMAKE_PREFIX_PATH=/usr/local/opt/gettext;$HOME/lib/cmake ${LOCAL_CMAKE_FLAGS}"
FILE="${REPO_ROOT}/scripts/haya_build_darwin.sh"
FILE="${REPO_ROOT}/scripts/daobet_build_darwin.sh"
CXX_COMPILER=clang++
C_COMPILER=clang
OPENSSL_ROOT_DIR=/usr/local/opt/openssl
Expand All @@ -282,7 +282,7 @@ $CMAKE -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" -DCMAKE_CXX_COMPILER="${CXX_COMP
-DCMAKE_C_COMPILER="${C_COMPILER}" -DCORE_SYMBOL_NAME="${CORE_SYMBOL_NAME}" \
-DOPENSSL_ROOT_DIR="${OPENSSL_ROOT_DIR}" -DBUILD_MONGO_DB_PLUGIN=true \
-DENABLE_COVERAGE_TESTING="${ENABLE_COVERAGE_TESTING}" -DBUILD_DOXYGEN="${DOXYGEN}" \
-DCMAKE_INSTALL_PREFIX=$OPT_LOCATION/haya -DENABLE_TX_SPONSORSHIP=1 $LOCAL_CMAKE_FLAGS "${REPO_ROOT}"
-DCMAKE_INSTALL_PREFIX=$OPT_LOCATION/daobet -DENABLE_TX_SPONSORSHIP=1 $LOCAL_CMAKE_FLAGS "${REPO_ROOT}"
if [ $? -ne 0 ]; then exit -1; fi
make -j"${JOBS}"
if [ $? -ne 0 ]; then exit -1; fi
Expand All @@ -301,13 +301,13 @@ printf "| | | | | | | | | | | | | |\n"
printf "| | | | | | | | ______/ | | | | |\n"
printf "|_| |_| |_| |_| \______/ |_| |_|\n\n${txtrst}"

printf "\\HAYA has been successfully built. %02d:%02d:%02d\\n" $(($TIME_END/3600)) $(($TIME_END%3600/60)) $(($TIME_END%60))
printf "\\daobet has been successfully built. %02d:%02d:%02d\\n" $(($TIME_END/3600)) $(($TIME_END%3600/60)) $(($TIME_END%60))
printf "==============================================================================================\\n${bldred}"
printf "(Optional) Testing Instructions:\\n"
print_instructions
printf "${BIN_LOCATION}/mongod --dbpath ${MONGODB_DATA_LOCATION} -f ${MONGODB_CONF} --logpath ${MONGODB_LOG_LOCATION}/mongod.log &\\n"
printf "cd ./build && PATH=\$PATH:$HOME/opt/mongodb/bin make test\\n" # PATH is set as currently 'mongo' binary is required for the mongodb test
printf "${txtrst}==============================================================================================\\n"
printf "For more information:\\n"
printf "Haya Github: https://github.com/mixbytes/haya\\n"
printf "daobet Github: https://github.com/DaoCasino/DAObet\\n"

2 changes: 1 addition & 1 deletion scripts/daobet_build_darwin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ while read -r name tester testee brewname uri; do
DISPLAY="${DISPLAY}${COUNT}. ${name}\\n"
printf " - %s ${bldred}NOT${txtrst} found.\\n" "${name}"
(( COUNT++ ))
done < "${REPO_ROOT}/scripts/haya_build_darwin_deps"
done < "${REPO_ROOT}/scripts/daobet_build_darwin_deps"
IFS="${var_ifs}"

if [ ! -d /usr/local/Frameworks ]; then
Expand Down
16 changes: 8 additions & 8 deletions scripts/daobet_install.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
##########################################################################
# This is the EOSIO automated install script for Linux and Mac OS.
# This file was downloaded from https://github.com/mixbytes/haya
# This file was downloaded from https://github.com/DaoCasino/dc-blockchain
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dc-blockchain -> daobet

#
# Copyright (c) 2017, Respective Authors all rights reserved.
#
Expand All @@ -27,7 +27,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
#
# https://github.com/mixbytes/haya/blob/master/LICENSE.txt
# https://github.com/mixbytes/daobet/blob/master/LICENSE.txt
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mixbytes -> daocasino

##########################################################################

SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
Expand All @@ -41,15 +41,15 @@ mkdir -p $LIB_LOCATION

CMAKE_BUILD_TYPE=Release
TIME_BEGIN=$( date -u +%s )
INSTALL_PREFIX=$OPT_LOCATION/haya
INSTALL_PREFIX=$OPT_LOCATION/daobet
VERSION=1.2

txtbld=$(tput bold)
bldred=${txtbld}$(tput setaf 1)
txtrst=$(tput sgr0)

if [ ! -d $BUILD_DIR ]; then
printf "\\nError, haya_build.sh has not ran. Please run ./haya_build.sh first!\\n\\n"
printf "\\nError, daobet_build.sh has not ran. Please run ./daobet_build.sh first!\\n\\n"
exit -1
fi

Expand All @@ -59,7 +59,7 @@ if ! pushd "${BUILD_DIR}" &> /dev/null;then
fi

if ! make install; then
printf "\\nMAKE installing EOSIO has exited with the above error.\\n\\n"
printf "\\nMAKE installing DAOBET has exited with the above error.\\n\\n"
exit -1
fi
popd &> /dev/null
Expand All @@ -75,8 +75,8 @@ printf "| | | | | | | | ______/ | | | | |\n"
printf "|_| |_| |_| |_| \______/ |_| |_|\n\n${txtrst}"

printf "==============================================================================================\\n"
printf "HAYA has been installed into ${OPT_LOCATION}/haya/bin!\\n"
printf "If you need to, you can fully uninstall using haya_uninstall.sh && scripts/clean_old_install.sh.\\n"
printf "daobet has been installed into ${OPT_LOCATION}/daobet/bin!\\n"
printf "If you need to, you can fully uninstall using daobet_uninstall.sh && scripts/clean_old_install.sh.\\n"
printf "==============================================================================================\\n\\n"

printf "Haya Github: https://github.com/mixbytes/haya\\n"
printf "daobet Github: https://github.com/DaoCasino/dc-blockchain\\n"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dc-blockchain -> daobet

Loading