diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aaf3d0428..81cb62ac8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,37 +1,38 @@ stages: - build - test + - deploy variables: - VERSION: "0.3.7" + VERSION: "0.3.9" + AGAMA_ARTIFACTS_LINUX: "linux64.tar.gz" + AGAMA_ARTIFACTS_MACOS: "osx.tar.gz" + AGAMA_ARTIFACTS_WINDOWS: "win64.zip" + VERUS_CLI_DEBIAN: "verus-cli-v${VERSION}-beta-amd64.deb" + VERUS_CLI_LINUX_PORTABLE: "verus-cli-linux-v$VERSION-beta.tar.gz" + VERUS_CLI_WINDOWS_PORTABLE: "verus-cli-windows-v$VERSION-beta.zip" + VERUS_CLI_MACOS_PORTABLE: "verus-cli-mac-v$VERSION-beta.tar.gz" build:linux: image: asherd/veruscoin-cross-compiler:linux variables: DOCKER_DRIVER: overlay2 stage: build - cache: - key: ${CI_JOB_NAME} - paths: - - depends/built - - .ccache - - .zcash-params - before_script: - - mkdir .ccache || echo ccache exists - - ln -s $PWD/.ccache /root/.ccache - - mkdir .zcash-params || echo zcash-params exists - - ln -s $PWD/.zcash-params /root/.zcash-params - script: - - "./zcutil/fetch-params.sh" - "./zcutil/build.sh" + ##- "./zcutil/build-debian-package.sh" - "./makeReleaseLinux.sh" - - "cd kmd/linux/" - - "tar -czvf verus-cli-linux-v$VERSION-beta.tar.gz verus-cli" - - "mv verus-cli-linux-v$VERSION-beta.tar.gz ../.." + - "cd kmd/linux" + - "tar -czvf $VERUS_CLI_LINUX_PORTABLE verus-cli" + - "mv $VERUS_CLI_LINUX_PORTABLE ../.." + - "mv verus-cli linux64" + - "tar -czvf $AGAMA_ARTIFACTS_LINUX linux64" + - "mv $AGAMA_ARTIFACTS_LINUX ../.." artifacts: paths: - - verus-cli-linux-v$VERSION-beta.tar.gz + - $VERUS_CLI_LINUX_PORTABLE + ## - $VERUS_CLI_DEBIAN + - $AGAMA_ARTIFACTS_LINUX expire_in: 1 week build:windows: @@ -45,7 +46,6 @@ build:windows: - depends/built - .ccache - .cargo - - .zcash-params before_script: - mkdir .ccache || echo ccache exists - ln -s $PWD/.ccache /root/.ccache @@ -54,15 +54,18 @@ build:windows: - mkdir .cargo || echo .cargo exists - ln -s $PWD/.cargo /root/.cargo script: - - "./zcutil/fetch-params.sh" - "./zcutil/build-win.sh" - "./makeReleaseWindows.sh" - "cd kmd/windows/" - - "zip verus-cli-windows-v$VERSION-beta.zip verus-cli" - - "mv verus-cli-windows-v$VERSION-beta.zip ../.." + - "zip -r $VERUS_CLI_WINDOWS_PORTABLE verus-cli" + - "mv $VERUS_CLI_WINDOWS_PORTABLE ../.." + - "mv verus-cli win64" + - "zip -r $AGAMA_ARTIFACTS_WINDOWS win64" + - "mv $AGAMA_ARTIFACTS_WINDOWS ../.." artifacts: paths: - - verus-cli-windows-v$VERSION-beta.zip + - $VERUS_CLI_WINDOWS_PORTABLE + - $AGAMA_ARTIFACTS_WINDOWS expire_in: 1 week build:mac: @@ -74,18 +77,21 @@ build:mac: - depends/built script: - - "./zcutil/fetch-params.sh" - "./zcutil/build-mac.sh | xcpretty" - "./makeReleaseMac.sh" - "cd kmd/mac/" - - "tar -czvf verus-cli-mac-v$VERSION-beta.tar.gz verus-cli" + - "tar -czvf $VERUS_CLI_MACOS_PORTABLE verus-cli" - "mv verus-cli-mac-v$VERSION-beta.tar.gz ../.." + - "mv verus-cli osx" + - "tar -czvf $AGAMA_ARTIFACTS_MACOS osx" + - "mv $AGAMA_ARTIFACTS_MACOS ../.." artifacts: paths: - - verus-cli-mac-v$VERSION-beta.tar.gz + - $VERUS_CLI_MACOS_PORTABLE + - $AGAMA_ARTIFACTS_MACOS expire_in: 1 week -code_quality: +.code_quality: image: docker:stable variables: DOCKER_DRIVER: overlay2 @@ -102,7 +108,7 @@ code_quality: artifacts: paths: [gl-code-quality-report.json] -sast: +.sast: image: docker:stable variables: DOCKER_DRIVER: overlay2 @@ -118,3 +124,24 @@ sast: "registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code artifacts: paths: [gl-sast-report.json] + +deploy: + stage: deploy + image: google/cloud-sdk:alpine + variables: + DOCKER_DRIVER: overlay2 + dependencies: + - build:linux + - build:windows + - build:mac + script: + - "mkdir $CI_COMMIT_REF_NAME" + - "cd $CI_COMMIT_REF_NAME" + - "mkdir Windows && mkdir Linux @&& mkdir MacOS" + - "cd .." + - "mv $VERUS_CLI_WINDOWS_PORTABLE $AGAMA_ARTIFACTS_WINDOWS $CI_COMMIT_REF_NAME/Windows" + - "mv $VERUS_CLI_LINUX_PORTABLE $AGAMA_ARTIFACTS_LINUX $CI_COMMIT_REF_NAME/Linux" + - "mv $AGAMA_ARTIFACTS_MACOS $VERUS_CLI_MACOS_PORTABLE $CI_COMMIT_REF_NAME/MacOS" + - 'echo "$AUTH_KEY" > AUTH_KEY.json' + - "gcloud auth activate-service-account --key-file AUTH_KEY.json" + - "gsutil rsync -r $CI_COMMIT_REF_NAME/ $STAGING/VerusCoin/$CI_COMMIT_REF_NAME/" \ No newline at end of file diff --git a/contrib/debian/control b/contrib/debian/control index b0c220cf0..c2921790c 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -1,21 +1,22 @@ -Source: zcash +Source: VerusCoin Section: utils Priority: optional -Maintainer: Zcash Company -Homepage: https://z.cash +Maintainer: VerusCoin +Homepage: https://veruscoin.io Build-Depends: autoconf, automake, bsdmainutils, build-essential, git, g++-multilib, libc6-dev, libtool, m4, ncurses-dev, pkg-config, python, unzip, wget, zlib1g-dev -Vcs-Git: https://github.com/zcash/zcash.git -Vcs-Browser: https://github.com/zcash/zcash +Vcs-Git: https://github.com/VeruscCoin/VerusCoin.git +Vcs-Browser: https://github.com/VerusCoin/VerusCoin -Package: zcash +Package: Verus-CLI Architecture: amd64 Depends: ${shlibs:Depends} -Description: HTTPS for money. - Based on Bitcoin's code, it intends to offer a far higher standard - of privacy and anonymity through a sophisticiated zero-knowledge - proving scheme which preserves confidentiality of transaction metadata. - This package provides the daemon, zcashd, and the CLI tool, - zcash-cli, to interact with the daemon. +Description: VerusCoin is a new, mineable and stakeable cryptocurrency. +It is a live fork of Komodo that retains its Zcash lineage and improves it. +VerusCoin will leverage the Komodo platform and dPoW notarization for enhanced security and cross-chain interoperability. +We have added a variation of a zawy12, lwma difficulty algorithm, a new CPU-optimized hash algorithm and a new algorithm for fair proof of stake. +We describe these changes and vision going forward in a [our Phase I white paper](http://185.25.51.16/papers/VerusPhaseI.pdf) and +[our Vision](http://185.25.51.16/papers/VerusVision.pdf). + diff --git a/contrib/debian/zcash.install b/contrib/debian/zcash.install index b39eaeeb3..917d319b8 100644 --- a/contrib/debian/zcash.install +++ b/contrib/debian/zcash.install @@ -1,3 +1,3 @@ -usr/bin/zcashd -usr/bin/zcash-cli +usr/bin/komodod +usr/bin/komodo-cli usr/bin/zcash-fetch-params diff --git a/kmd/linux/verus-cli/README.txt b/kmd/linux/verus-cli/README.txt index f1b04c504..7c5f2d047 100644 --- a/kmd/linux/verus-cli/README.txt +++ b/kmd/linux/verus-cli/README.txt @@ -1,12 +1,12 @@ -VerusCoin Command Line Tools v0.3.8-beta +VerusCoin Command Line Tools v0.3.9-beta Contents: komodod - VerusCoin's enhanced Komodo daemon komodo-cli - VerusCoin's Komodo command line utility verus - wrapper for komodo-cli that applies the command to the VRSC coin verusd - wrapper for komodod that sets the VerusCoin parameters to defaults properly -The first time on a new system you will need to run ./zcash-fetch-params.sh before using komodod or verusd. +The first time on a new system you will need to run ./fetch-params.sh before using komodod or verusd. -Run verusd to launch komodod, and use verus to run commands such as: -verus stop +Run ./verusd to launch komodod, and use verus to run commands such as: +./verus stop Which signals komodod (if it is running) to stop running. diff --git a/kmd/linux/verus-cli/update-verus-agama.sh b/kmd/linux/verus-cli/update-verus-agama.sh deleted file mode 100755 index e2af80386..000000000 --- a/kmd/linux/verus-cli/update-verus-agama.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -if [ $# -eq 0 ] - then - echo "Usage: ./update-verus-agama.sh path/to/agama/directory." - echo "No arguments supplied, no updates applied." - exit 1 -fi - -PASSED=$1 - -if [ -d "${PASSED}" ] ; then - if [ -f "${PASSED}/resources/app/assets/bin/linux64/komodod" ] ; then - cp komodod ${PASSED}/resources/app/assets/bin/linux64/ - cp komodo-cli ${PASSED}/resources/app/assets/bin/linux64/ - exit 0 - else - echo "No komodod found in ${PASSED}/resources/app/assets/bin/linux64/" - echo "Copying komodod and komodo-cli anyway" - cp komodod ${PASSED}/resources/app/assets/bin/linux64/ - cp komodo-cli ${PASSED}/resources/app/assets/bin/linux64/ - exit 0 - fi -else - echo "Pass the Agama-linux-x64 directory on the command line." - echo "${PASSED} is not a valid directory."; - exit 1 -fi - diff --git a/kmd/mac/verus-cli/README.txt b/kmd/mac/verus-cli/README.txt index a94b2e761..ddc238d80 100644 --- a/kmd/mac/verus-cli/README.txt +++ b/kmd/mac/verus-cli/README.txt @@ -1,4 +1,4 @@ -VerusCoin Command Line Tools v0.3.8-beta +VerusCoin Command Line Tools v0.3.9-beta Contents: komodod - VerusCoin's enhanced Komodo daemon. komodo-cli - VerusCoin's enhanced Komodo command line utility. @@ -10,7 +10,7 @@ lib*.dylib - assorted dynamic libraries, dependencies needed by fetch-params.sh, Command line tools are run from the terminal. You can launch the terminal on a Mac by using the Finder, selecting Applications and from that select Utilities, finally selecting Terminal from the Utilities folder. You will need to switch to the directory you extracted the verus-cl into. If you extracted it in the Download folder then the change directory command is cd ~/Downloads/verus-cli -The first time on a new system you will need to run ./zcash-fetch-params before using komodod or verusd. +The first time on a new system you will need to run ./fetch-params before using komodod or verusd. Run ./verusd to launch komodod, and use verus to run commands such as: ./verus stop diff --git a/kmd/windows/verus-cli/README.txt b/kmd/windows/verus-cli/README.txt index 03bff2e94..4d530dfdc 100644 --- a/kmd/windows/verus-cli/README.txt +++ b/kmd/windows/verus-cli/README.txt @@ -9,7 +9,7 @@ You need to run a command prompt, for example hit and type cmd