Merge branch 'master' of https://gitlab.demlabs.net/dapcash/dapcash-node into master

.gitmodules

@@ -9,3 +9,6 @@
     path = cellframe-sdk
     url = ../../cellframe/cellframe-sdk.git
     branch = master
+[submodule "prod_build"]
+	path = prod_build
+	url = ../prod_build_dapcash-node

CMakeLists.txt

@@ -35,9 +35,9 @@ if(UNIX)
 
         SET( CPACK_SYSTEM_TYPE "Debian")
         SET( CPACK_SYSTEM_VERSION "${DEBIAN_OS_VERSION}")
-        SET( CPACK_SYSTEM_ARCH "${OS_ARCH}")
+        SET( CPACK_SYSTEM_ARCH "amd64")
         SET( CPACK_SYSTEM_CODENAME "${DEBIAN_OS_NAME}")
-        SET( CPACK_SYSTEM_NAME "${CPACK_SYSTEM_TYPE}-${CPACK_SYSTEM_CODENAME}-${CPACK_SYSTEM_ARCH}")
+        SET( CPACK_SYSTEM_NAME "${CPACK_SYSTEM_TYPE}-${CPACK_SYSTEM_VERSION}-${CPACK_SYSTEM_ARCH}-${CPACK_SYSTEM_CODENAME}")
         SET( CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}")
         SET( CPACK_DEBIAN_PACKAGE_MAINTAINER "Dmitriy Gerasimov <naeper@demlabs.net>" )
         SET( CPACK_DEBIAN_PACKAGE_DESCRIPTION_SUMMARY "DapCash Node software https://dapcash.org" )

dist/etc/network/dapcash-testnet/bronze.cfg

@@ -13,7 +13,7 @@ is_celled=true
 is_add_directly=true
 datum_add_hashes_count=1
 is_static_genesis_event=true
-static_genesis_event=0xE0CCC6C94FEC3BCA0776DD3F37F287DA3F437887D6AFB61EE1320403F96D0B73
+static_genesis_event=0xB1DF3177A0E764B5B7BF1675AC2D98FFF703BC704E06601A4F401C6F80895DCC
 
 # Proof-of-State consensus config
 [dag-pos]

dist/etc/network/dapcash-testnet/chain-0.cfg

@@ -19,7 +19,8 @@ datum_add_hashes_count=1
 
 # Switched off to false because hash symbols below are not well recognized
 is_static_genesis_event=true
-static_genesis_event=0x3893F021FF4AC718D46ABA6BD66EB143948E1F7E85F332E45DB03F8CE4951DA4
+static_genesis_event=0x1984CF8CF92F626E11D39369183F97A08AA13233E8E1FADB105F455737A21A85
+
 
 [dag-poa]
 auth_certs_prefix=dapcash.testnet.master.cell

prod_build @ 6f13de4a

+Subproject commit 6f13de4a78e4e5aa05c55887dc78d5c07fe8ba10

prod_build/android/conf/environment

-ANDROID_NDK_HOME="/opt/android-ndk-r16b"
-SDKROOT="/opt/android-sdk/bin"
-NDKHOST="linux-x86_64"
-JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64"
-ANDRQT_HOME="/usr/lib/crossdev"
-HOST_DISTR_VERSIONS="stretch"
-HOST_ARCH_VERSIONS="amd64"

prod_build/android/conf/project_props

-RES_PATH=SapNetGui/resources/UltraPad/platforms/android
-WORK_PATH=../sapnet-client-build
-BRAND=UltraPad

prod_build/android/conf/publish

-ARCH_VERSIONS="arm64-v8a armv7 x86 x86_64 arm"
-PACKAGE_PATH=builds/apk/

prod_build/android/conf/version_info

-VERSION_FILE=config.pri
-VERSION_ENTRIES="VER_MAJ VER_MIN VER_PAT VER_CODE"
-VERSION_FORMAT="VER_MAJ.VER_MIN-VER_PAT"

prod_build/general/chroot_wrap.sh

-#!/bin/bash
-
-PLATFORM_CANDIDATES=$2
-CHROOT_PREFIX="builder"
-CHROOTS_PATH=$1
-PLATFORMS=""
-PKG_FORMAT=$3
-JOB=$4
-
-cd $SRC_PATH
-echo "workdir is $(pwd)"
-. prod_build/general/pre-build.sh
-export_variables "./prod_build/general/conf/*"
-
-IFS=' '
-echo "$PLATFORM_CANDIDATES"
-echo $IMPLEMENTED
-for platform in $PLATFORM_CANDIDATES; do
-	[[ $(echo $IMPLEMENTED | grep $platform) != "" ]] && PLATFORMS="$PLATFORMS$platform " || echo "Platform $platform is not implemented in this project yet. Sorry"
-done
-echo "Platforms are $PLATFORMS"
-
-for platform in $PLATFORMS; do
-	echo "Working with $platform now"
-	export_variables "./prod_build/$platform/conf/*"
-	IFS=' '
-	PKG_TYPE=$(echo $PKG_FORMAT | cut -d ' ' -f1)
-	#Check if chroots are present
-	echo $HOST_DISTR_VERSIONS
-	echo $HOST_ARCH_VERSIONS
-	[ -e prod_build/$platform/scripts/pre-build.sh ] && prod_build/$platform/scripts/pre-build.sh $CHROOT_PREFIX || exit $? #For actions before build not in chroot and in chroot (version update, install missing dependencies(under schroot))
-	for distr in $HOST_DISTR_VERSIONS; do
-		for arch in $HOST_ARCH_VERSIONS; do
-			if [ -e $CHROOTS_PATH/$CHROOT_PREFIX-$distr-$arch ]; then
-				schroot -c $CHROOT_PREFIX-$distr-$arch -- launcher.sh prod_build/$platform/scripts/$JOB.sh $PKG_TYPE || { errcode=$? && unexport_variables "./prod_build/$platform/conf/*"; exit $errcode; }
-#				echo "schroot stub $PKG_TYPE"
-			else
-				echo "chroot $CHROOT_PREFIX-$distr-$arch not found. You should install it first"
-			fi
-		done
-	done
-	echo "workdir before postinstall is $(pwd)"
-	[ -e prod_build/$platform/scripts/post-build.sh ] && prod_build/$platform/scripts/post-build.sh errcode=$? #For post-build actions not in chroot (global publish)
-	PKG_FORMAT=$(echo $PKG_FORMAT | cut -d ' ' -f2-)
-	unexport_variables "./prod_build/$platform/conf/*"
-done
-#[ $(mount | grep "/run/schroot/mount") ] && sudo umount -l /run/schroot/mount && sudo rm -r /run/schroot/mount/* #Removing mountpoint odds.
-
-cd $wd
-
-exit $errcode

prod_build/general/conf/status

-IMPLEMENTED="linux/debian linux/ubuntu"

prod_build/general/conf/version_info

-VERSION_FILE=CMakeLists.txt
-VERSION_ENTRIES="CPACK_PACKAGE_VERSION_MAJOR CPACK_PACKAGE_VERSION_MINOR CPACK_PACKAGE_VERSION_PATCH"
-VERSION_FORMAT="CPACK_PACKAGE_VERSION_MAJOR.CPACK_PACKAGE_VERSION_MINOR-CPACK_PACKAGE_VERSION_PATCH"

prod_build/general/pre-build.sh

-#!/bin/bash
-
-extract_version_number() {
-
-IFS=" "
-local VERSION_STRING=$VERSION_FORMAT
-for entry in $VERSION_ENTRIES; do
-	VERSION_STRING=$(echo $VERSION_STRING | sed "s/$entry/$( cat $VERSION_FILE | grep $entry | grep [0-9] | rev | cut -d ' ' -f1 | cut -d ")" -f2 | rev )/") #Replacing templates with numbers
-done
-echo -e "$VERSION_STRING"
-
-}
-
-extract_gitlog_text() {
-
-borders=$( git log | grep -n 'commit\|Date' | head -n 3 | tail -n 2 | cut -d ':' -f1)
-upb=$(echo $borders | cut -d $'\n' -f1)
-dwnb=$(echo $borders | cut -d $'\n' -f2)
-text=$(git log | head -n $( expr $dwnb - 2 ) | tail -n $( expr $dwnb - $upb - 3 ) )
-echo $text
-
-}
-
-export_variables() {
-
-IFS=$'\n'
-for variable in $(cat $1); do
-	echo "$variable"
-	export $(echo "$variable" | sed 's/\"//g')
-done
-
-}
-
-unexport_variables() {
-
-IFS=$'\n'
-for variable in $(cat $1); do
-	echo "$variable"
-	export -n $(echo $variable | cut -d '=' -f1)
-done
-
-}