DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Merge branch 'dev' of https://github.com/veruscoin/veruscoin into dev

Browse Source
This commit is contained in:
miketout
2018-08-30 19:40:44 -07:00
parent ffda33998f 9c2d3570d3
commit 09345b2f0f
7 changed files with 64 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+58 -39
View File
@@ -4,14 +4,11 @@ stages:
- deploy - deploy
variables: variables:
VERSION: 0.3.12 VERSION: 0.3.13
AGAMA_ARTIFACTS_LINUX: linux64.tar.gz VERUS_CLI_LINUX: "verus-cli-linux-v${VERSION}-beta.tar.gz"
AGAMA_ARTIFACTS_MACOS: osx.tar.gz VERUS_CLI_WINDOWS: "verus-cli-windows-v${VERSION}-beta.zip"
AGAMA_ARTIFACTS_WINDOWS: win64.zip VERUS_CLI_MACOS: "verus-cli-mac-v${VERSION}-beta.tar.gz"
VERUS_CLI_LINUX: verus-cli-linux-v$VERSION-beta.tar.gz POST_COMMENT: "Branch: ${CI_COMMIT_REF_NAME} Commit: ${CI_COMMIT_SHA}"
VERUS_CLI_WINDOWS: verus-cli-windows-v$VERSION-beta.zip
VERUS_CLI_MACOS: verus-cli-mac-v$VERSION-beta.tar.gz
build:linux: build:linux:
image: asherd/veruscoin-cross-compiler:linux image: asherd/veruscoin-cross-compiler:linux
@@ -25,14 +22,12 @@ build:linux:
- zcutil/build.sh -j4 - zcutil/build.sh -j4
- cp src/komodod src/komodo-cli kmd/linux/verus-cli - cp src/komodod src/komodo-cli kmd/linux/verus-cli
- chmod +x kmd/linux/verus-cli/komodod - chmod +x kmd/linux/verus-cli/komodod
- chmod +x kmd/linux/verus-cli/komodo-cli kmd/linux/verus-cli/komodo-cli
- chmod +x kmd/linux/verus-cli/verus kmd/linux/verus-cli/verus
- chmod +x kmd/linux/verus-cli/verusd kmd/linux/verus-cli/verusd
- chmod +x kmd/linux/verus-cli/fetch-params kmd/linux/verus-cli/fetch-params
- dos2unix kmd/linux/verus-cli/README.txt - dos2unix kmd/linux/verus-cli/README.txt
- tar -C kmd/linux/ -czvf $VERUS_CLI_LINUX verus-cli ./ - tar -C kmd/linux/ -czvf $VERUS_CLI_LINUX verus-cli ./
- mv kmd/linux/verus-cli kmd/linux/linux64
- tar -C kmd/linux/ -czvf $AGAMA_ARTIFACTS_LINUX linux64 ./
after_script: after_script:
- mv /root/.ccache ./ || true - mv /root/.ccache ./ || true
cache: cache:
@@ -43,7 +38,6 @@ build:linux:
artifacts: artifacts:
paths: paths:
- $VERUS_CLI_LINUX - $VERUS_CLI_LINUX
- $AGAMA_ARTIFACTS_LINUX
expire_in: 1 week expire_in: 1 week
@@ -65,18 +59,13 @@ build:windows:
- mkdir .cargo || echo .cargo exists - mkdir .cargo || echo .cargo exists
- ln -s $PWD/.cargo /root/.cargo - ln -s $PWD/.cargo /root/.cargo
script: script:
- zcutil/build-win.sh - zcutil/build-win.sh -j4
- cp src/komodod.exe src/komodo-cli.exe src/komodo-tx.exe kmd/windows/verus-cli - cp src/komodod.exe src/komodo-cli.exe src/komodo-tx.exe kmd/windows/verus-cli
- cd kmd/windows/ - cd kmd/windows/
- zip -r $VERUS_CLI_WINDOWS verus-cli - zip -r $VERUS_CLI_WINDOWS verus-cli
- mv $VERUS_CLI_WINDOWS ../.. - mv $VERUS_CLI_WINDOWS ../..
- mv verus-cli win64
- zip -r $AGAMA_ARTIFACTS_WINDOWS win64
- mv $AGAMA_ARTIFACTS_WINDOWS ../..
artifacts: artifacts:
paths: paths: [$VERUS_CLI_WINDOWS]
- $VERUS_CLI_WINDOWS
- $AGAMA_ARTIFACTS_WINDOWS
expire_in: 1 week expire_in: 1 week
@@ -90,19 +79,15 @@ build:mac:
script: script:
- brew bundle - brew bundle
- zcutil/build-mac.sh | xcpretty - zcutil/build-mac.sh | xcpretty
- ./makeReleaseMac.sh - ./makeReleaseMac.sh -j6
- dos2unix kmd/mac/verus-cli/README.txt - dos2unix kmd/mac/verus-cli/README.txt
- tar -C kmd/mac/ -czvf $VERUS_CLI_MACOS verus-cli ./ - tar -C kmd/mac/ -czvf $VERUS_CLI_MACOS verus-cli ./
- mv kmd/mac/verus-cli kmd/mac/osx
- tar -C kmd/mac/ -czvf $AGAMA_ARTIFACTS_MACOS osx ./
artifacts: artifacts:
paths: paths: [$VERUS_CLI_MACOS]
- $VERUS_CLI_MACOS
- $AGAMA_ARTIFACTS_MACOS
expire_in: 1 week expire_in: 1 week
.code_quality: code_quality:
image: docker:stable image: docker:stable
variables: variables:
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
@@ -120,7 +105,7 @@ build:mac:
paths: [gl-code-quality-report.json] paths: [gl-code-quality-report.json]
.sast: sast:
image: docker:stable image: docker:stable
variables: variables:
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
@@ -139,7 +124,7 @@ build:mac:
.license_management: license_management:
image: docker:stable image: docker:stable
variables: variables:
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
@@ -155,17 +140,24 @@ build:mac:
paths: [gl-license-management-report.json] paths: [gl-license-management-report.json]
.ubuntu:xenial: ubuntu:xenial:
image: ubuntu:xenial image: ubuntu:xenial
variables: variables:
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
stage: test stage: test
before_script: before_script:
- apt update && apt install -y wget g++-multilib libcurl3 python - apt update && apt install -y wget g++-multilib libcurl3 python
- rm -rf /root/.komodo || true
- mv .komodo /root/ || true
script: script:
- tar -xzvf $VERUS_CLI_LINUX - tar -xzvf $VERUS_CLI_LINUX
- export PATH=$PATH:$CI_PROJECT_DIR/verus-cli - export PATH=$PATH:$CI_PROJECT_DIR/verus-cli
- python qa/verus-cli-tests/verus-cli-tester.py - python qa/verus-cli-tests/verus-cli-tester.py
after_script:
- mv /root/.komodo ./ || true
cache:
key: ${CI_JOB_NAME}
paths: [.komodo]
artifacts: artifacts:
paths: [log.txt] paths: [log.txt]
expire_in: 1 week expire_in: 1 week
@@ -173,17 +165,24 @@ build:mac:
- build:linux - build:linux
.ubuntu:bionic: ubuntu:bionic:
image: ubuntu:bionic image: ubuntu:bionic
variables: variables:
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
stage: test stage: test
before_script: before_script:
- apt update && apt install -y wget g++-multilib libcurl3 python - apt update && apt install -y wget g++-multilib libcurl3 python
- rm -rf /root/.komodo || true
- mv .komodo /root/ || true
script: script:
- tar -xzvf $VERUS_CLI_LINUX - tar -xzvf $VERUS_CLI_LINUX
- export PATH=$PATH:$CI_PROJECT_DIR/verus-cli - export PATH=$PATH:$CI_PROJECT_DIR/verus-cli
- python qa/verus-cli-tests/verus-cli-tester.py - python qa/verus-cli-tests/verus-cli-tester.py
after_script:
- mv /root/.komodo ./ || true
cache:
key: ${CI_JOB_NAME}
paths: [.komodo]
artifacts: artifacts:
paths: [log.txt] paths: [log.txt]
expire_in: 1 week expire_in: 1 week
@@ -243,15 +242,35 @@ deploy:
- build:windows - build:windows
- build:mac - build:mac
script: script:
- curl -F file=@"$VERUS_CLI_LINUX"
-F channels="$CLI_POST_CHANNEL"
-F initial_comment="${POST_COMMENT}"
-H "${SLACK_BOT_AUTH}"
"https://slack.com/api/files.upload"
- curl -F file=@"$VERUS_CLI_WINDOWS"
-F channels="$CLI_POST_CHANNEL"
-F initial_comment="${POST_COMMENT}"
-H "${SLACK_BOT_AUTH}"
"https://slack.com/api/files.upload"
- curl -F file=@"$VERUS_CLI_MACOS"
-F channels="$CLI_POST_CHANNEL"
-F initial_comment="${POST_COMMENT}"
-H "${SLACK_BOT_AUTH}"
"https://slack.com/api/files.upload"
- mkdir Windows - mkdir Windows
- mkdir Linux - mkdir Linux
- mkdir MacOS - mkdir MacOS
- mv $VERUS_CLI_WINDOWS $AGAMA_ARTIFACTS_WINDOWS Windows - mv $VERUS_CLI_WINDOWS Windows
- mv $VERUS_CLI_LINUX $AGAMA_ARTIFACTS_LINUX Linux - mv $VERUS_CLI_LINUX Linux
- mv $VERUS_CLI_MACOS $AGAMA_ARTIFACTS_MACOS MacOS - mv $VERUS_CLI_MACOS MacOS
- echo "$AUTH_KEY" > AUTH_KEY.json - echo "$AUTH_KEY" > AUTH_KEY.json
- gcloud auth activate-service-account --key-file AUTH_KEY.json - gcloud auth activate-service-account
--key-file AUTH_KEY.json
- gsutil cp -r Windows Linux MacOS $STAGING/VerusCoin/$CI_COMMIT_REF_NAME/ - gsutil cp -r Windows Linux MacOS $STAGING/VerusCoin/$CI_COMMIT_REF_NAME/
- curl -X POST -F token=$CI_JOB_TOKEN --form ref=$CI_COMMIT_REF_NAME https://gitlab.com/api/v4/projects/8018638/trigger/pipeline - curl -X POST
-F token="$CI_JOB_TOKEN"
-F ref=master
-F variables\[CLI_VERSION\]="$VERSION"
-F variables\[AGAMA_VERSION\]="$VERSION"
"https://gitlab.com/api/v4/projects/8018638/trigger/pipeline"
README.md
+2 -2
View File
@@ -1,10 +1,10 @@
## VerusCoin version 0.3.12a-beta ## VerusCoin version 0.3.13-beta
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). 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).
- [VerusCoin web site https://veruscoin.io/ Wallets and CLI tools](https://veruscoin.io/) - [VerusCoin web site https://veruscoin.io/ Wallets and CLI tools](https://veruscoin.io/)
- [VerusCoin Explorer](https://explorer.veruscoin.io/) - [VerusCoin Explorer](https://explorer.veruscoin.io/)
Version 0.3.12-beta has portable mining working. Version 0.3.13-beta has portable mining working.
## Komodo with Bitcore ## Komodo with Bitcore
This version of Komodo contains Bitcore support for komodo and all its assetchains. This version of Komodo contains Bitcore support for komodo and all its assetchains.
kmd/linux/verus-cli/README.txt
+1 -1
View File
@@ -1,4 +1,4 @@
VerusCoin Command Line Tools v0.3.12a-beta VerusCoin Command Line Tools v0.3.13-beta
Contents: Contents:
komodod - VerusCoin's enhanced Komodo daemon komodod - VerusCoin's enhanced Komodo daemon
kmd/mac/verus-cli/README.txt
+1 -1
View File
@@ -1,4 +1,4 @@
VerusCoin Command Line Tools v0.3.12a-beta VerusCoin Command Line Tools v0.3.13-beta
Contents: Contents:
komodod - VerusCoin's enhanced Komodo daemon. komodod - VerusCoin's enhanced Komodo daemon.
komodo-cli - VerusCoin's enhanced Komodo command line utility. komodo-cli - VerusCoin's enhanced Komodo command line utility.
kmd/windows/verus-cli/README.txt
+1 -1
View File
@@ -1,4 +1,4 @@
VerusCoin Command Line Tools v0.3.12a-beta VerusCoin Command Line Tools v0.3.13-beta
Contents: Contents:
komodod.exe - VerusCoin's enhanced Komodo daemon komodod.exe - VerusCoin's enhanced Komodo daemon
komodo-cli.exe - VerusCoin's Komodo command line utility komodo-cli.exe - VerusCoin's Komodo command line utility
makeReleaseWindows.sh
-3
View File
@@ -1,3 +0,0 @@
#!/bin/sh
cp src/komodod.exe src/komodo-cli.exe src/komodo-tx.exe kmd/windows/verus-cli
src/rpcmisc.cpp
+1 -1
View File
@@ -56,7 +56,7 @@ uint32_t komodo_segid32(char *coinaddr);
int64_t komodo_coinsupply(int64_t *zfundsp,int32_t height); int64_t komodo_coinsupply(int64_t *zfundsp,int32_t height);
int32_t notarizedtxid_height(char *dest,char *txidstr,int32_t *kmdnotarized_heightp); int32_t notarizedtxid_height(char *dest,char *txidstr,int32_t *kmdnotarized_heightp);
#define KOMODO_VERSION "0.1.1" #define KOMODO_VERSION "0.1.1"
#define VERUS_VERSION "0.3.12" #define VERUS_VERSION "0.3.13"
extern uint16_t ASSETCHAINS_P2PPORT,ASSETCHAINS_RPCPORT; extern uint16_t ASSETCHAINS_P2PPORT,ASSETCHAINS_RPCPORT;
extern uint32_t ASSETCHAINS_CC; extern uint32_t ASSETCHAINS_CC;
extern uint32_t ASSETCHAINS_MAGIC; extern uint32_t ASSETCHAINS_MAGIC;