diff --git a/.auto-release.sh b/.auto-release.sh new file mode 100755 index 00000000..c77f8c87 --- /dev/null +++ b/.auto-release.sh @@ -0,0 +1,69 @@ +#!/bin/bash + +repo_slug="mimblewimble/grin-wallet" +token="$GITHUB_TOKEN" +export CHANGELOG_GITHUB_TOKEN="$token" + +tagname=`git describe --tags --exact-match 2>/dev/null || git symbolic-ref -q --short HEAD` + +echo 'make a tarball for the release binary...\n' + +if [[ $TRAVIS_OS_NAME == 'osx' ]]; then + + # Do some custom requirements on OS X + cd target/release ; rm -f *.tgz; tar zcf "grin-wallet-$tagname-$TRAVIS_JOB_ID-osx.tgz" grin + /bin/ls -ls *.tgz | awk '{print $6,$7,$8,$9,$10}' + md5 "grin-wallet-$tagname-$TRAVIS_JOB_ID-osx.tgz" > "grin-wallet-$tagname-$TRAVIS_JOB_ID-osx.tgz"-md5sum.txt + /bin/ls -ls *-md5sum.txt | awk '{print $6,$7,$8,$9,$10}' + cd - > /dev/null; + echo "tarball generated\n" + + # Only generate changelog on Linux platform, to avoid duplication + exit 0 +else + # Do some custom requirements on Linux + cd target/release ; rm -f *.tgz; tar zcf "grin-wallet-$tagname-$TRAVIS_JOB_ID-linux-amd64.tgz" grin-wallet + /bin/ls -ls *.tgz | awk '{print $6,$7,$8,$9,$10}' + md5sum "grin-wallet-$tagname-$TRAVIS_JOB_ID-linux-amd64.tgz" > "grin-wallet-$tagname-$TRAVIS_JOB_ID-linux-amd64.tgz"-md5sum.txt + /bin/ls -ls *-md5sum.txt | awk '{print $6,$7,$8,$9,$10}' + cd - > /dev/null; + echo "tarball generated\n" +fi + +version="$tagname" +branch="`git symbolic-ref -q --short HEAD`" + +# automatic changelog generator +gem install github_changelog_generator + +LAST_REVISION=$(git rev-list --tags --skip=1 --max-count=1) +LAST_RELEASE_TAG=$(git describe --abbrev=0 --tags ${LAST_REVISION}) + +# Generate CHANGELOG.md +github_changelog_generator \ + -u $(cut -d "/" -f1 <<< $repo_slug) \ + -p $(cut -d "/" -f2 <<< $repo_slug) \ + --since-tag ${LAST_RELEASE_TAG} + +body="$(cat CHANGELOG.md)" + +# Overwrite CHANGELOG.md with JSON data for GitHub API +jq -n \ + --arg body "$body" \ + --arg name "$version" \ + --arg tag_name "$version" \ + --arg target_commitish "$branch" \ + '{ + body: $body, + name: $name, + tag_name: $tag_name, + target_commitish: $target_commitish, + draft: false, + prerelease: false + }' > CHANGELOG.md + +release_id="$(curl -0 -XGET -H "Authorization: token $token" https://api.github.com/repos/$repo_slug/releases/tags/$tagname 2>/dev/null | grep id | head -n 1 | sed 's/ *"id": *\(.*\),/\1/')" +echo "Updating release $version for repo: $repo_slug, branch: $branch. release id: $release_id" +curl -H "Authorization: token $token" --request PATCH --data @CHANGELOG.md "https://api.github.com/repos/$repo_slug/releases/$release_id" +echo "auto changelog uploaded.\n" + diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..c730de98 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,83 @@ +language: rust + +git: + depth: false + +dist: trusty +sudo: required + +cache: + cargo: true + timeout: 240 + directories: + - $HOME/.cargo + - $TRAVIS_BUILD_DIR/target + +before_cache: + - rm -rf $TRAVIS_BUILD_DIR/target/tmp + +rust: + - stable + +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-5 + - cmake + - libcurl4-openssl-dev + - libelf-dev + - libdw-dev + - cmake + - gcc + - binutils-dev + +env: + global: + - RUST_BACKTRACE="1" + - RUST_FLAGS="-C debug-assertions" + +matrix: + include: + - os: linux + env: TEST_SUITE=config-libwallet-apiwallet + - os: linux + env: TEST_SUITE=refwallet + - os: osx + env: TEST_SUITE=release + +script: + - IFS='-' read -r -a DIRS <<< "$TEST_SUITE"; DIR=${DIRS[0]}; + echo "start testing on folder $DIR..."; + if [[ -n "$DIR" ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd $DIR && cargo test --release && cd - > /dev/null; fi; + - IFS='-' read -r -a DIRS <<< "$TEST_SUITE"; DIR=${DIRS[1]}; + if [[ -n "$DIR" ]]; then + echo "start testing on folder $DIR..."; + cd $DIR && cargo test --release && cd - > /dev/null; + fi; + - IFS='-' read -r -a DIRS <<< "$TEST_SUITE"; DIR=${DIRS[2]}; + if [[ -n "$DIR" ]]; then + echo "start testing on folder $DIR..."; + cd $DIR && cargo test --release && cd - > /dev/null; + fi; + +before_deploy: + - if [[ "$TEST_SUITE" == "pool-p2p-src" ]]; then + cargo clean && cargo build --release && ./.auto-release.sh; + fi + - if [[ "$TEST_SUITE" == "release" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then + brew update; + cargo clean && cargo build --release && ./.auto-release.sh; + fi + +deploy: + provider: releases + api_key: + secure: PBTFcoUmiQITkDdtFzrBlNR/5OgYHTCw+xVWGYu205xwTlj/ARBgw7DNt8dIdptLx+jOM2V5SbJqSFxs/CJ2ZcOHQZ6ubwpAJlRfuk3xDAi5JmuHYfcY+4SQ9l/0MgHnGfuml093xP7vTIYm2Vwwgdq8fd3jdWmvwgk9zgaGXB4UIXQA0yIs3EzxZpqiLg629Ouv7edMfyffwlG+rgQ1koe6sqeMCxIs0N3p97GCx19kNe0TV4dC7XAN74HreMdHmwxPKAK4xG/jtA1Snm0pMQ50Z0Kizt+0yrGOPMLnWwO9sS38iosBn3Vh1R8HKle2xBGflTtT/LG9lHdQZ5NF572q6681x6t7str4OjJ5bboy1PtNLFxG7RJCVIpp9gbouzdxIaJWRTxIdlk8UNQMrD8ieiNE6V1vZtbHGtJHRSJN1vO/XxsLlQDCyakLhG/nmSKXgiT9wIsu+zj/3oDe+LBt5QetEGYGBrCwUewjaQ7EP1rsT7alQrHTMad5DPjYftJuvfR+yBtz1qbzQwZVJpQC1KY1c476mXPQsaywuUrj56hH92p7P3vl6aMN2OPJZP+zENOVSURHc56KeTsDS55+KKzcRjCMA2L0LR1hP33+V5kavMHgCRrWIkxAkZ4eRqnermalzp8vlzL6EEoGm0VFLzv4mJmzrY1mC1LyCHo= + file_glob: true + file: target/release/grin-*.tgz* + skip_cleanup: true + on: + repo: mimblewimble/grin + tags: true diff --git a/Cargo.lock b/Cargo.lock index 7ebfb1c4..c0c7c649 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -545,17 +545,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "grin_api" -version = "1.1.0" +version = "1.0.1" +source = "git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0#ee4eed71ea7e379f5c7e2ca08179c516c2d4be45" dependencies = [ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_chain 1.1.0", - "grin_core 1.1.0", - "grin_p2p 1.1.0", - "grin_pool 1.1.0", - "grin_store 1.1.0", - "grin_util 1.1.0", + "grin_chain 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", + "grin_core 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", + "grin_p2p 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", + "grin_pool 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", + "grin_store 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", + "grin_util 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", "http 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.12.19 (registry+https://github.com/rust-lang/crates.io-index)", "hyper-rustls 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -578,38 +579,24 @@ dependencies = [ name = "grin_apiwallet" version = "1.1.0" dependencies = [ - "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", - "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_api 1.1.0", - "grin_chain 1.1.0", - "grin_core 1.1.0", - "grin_keychain 1.1.0", + "grin_api 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", + "grin_chain 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", + "grin_core 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", + "grin_keychain 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", "grin_libwallet 1.1.0", - "grin_store 1.1.0", - "grin_util 1.1.0", + "grin_store 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", + "grin_util 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", "grin_wallet_config 1.1.0", - "hyper 0.12.19 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "prettytable-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", - "ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "term 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-retry 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "grin_chain" -version = "1.1.0" +version = "1.0.1" +source = "git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0#ee4eed71ea7e379f5c7e2ca08179c516c2d4be45" dependencies = [ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -617,10 +604,10 @@ dependencies = [ "croaring 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_core 1.1.0", - "grin_keychain 1.1.0", - "grin_store 1.1.0", - "grin_util 1.1.0", + "grin_core 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", + "grin_keychain 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", + "grin_store 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", + "grin_util 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", "lmdb-zero 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -630,7 +617,8 @@ dependencies = [ [[package]] name = "grin_core" -version = "1.1.0" +version = "1.0.1" +source = "git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0#ee4eed71ea7e379f5c7e2ca08179c516c2d4be45" dependencies = [ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -639,8 +627,8 @@ dependencies = [ "enum_primitive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_keychain 1.1.0", - "grin_util 1.1.0", + "grin_keychain 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", + "grin_util 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -655,12 +643,13 @@ dependencies = [ [[package]] name = "grin_keychain" -version = "1.1.0" +version = "1.0.1" +source = "git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0#ee4eed71ea7e379f5c7e2ca08179c516c2d4be45" dependencies = [ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "digest 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_util 1.1.0", + "grin_util 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", "hmac 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -682,10 +671,10 @@ dependencies = [ "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_core 1.1.0", - "grin_keychain 1.1.0", - "grin_store 1.1.0", - "grin_util 1.1.0", + "grin_core 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", + "grin_keychain 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", + "grin_store 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", + "grin_util 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", "grin_wallet_config 1.1.0", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -697,15 +686,16 @@ dependencies = [ [[package]] name = "grin_p2p" -version = "1.1.0" +version = "1.0.1" +source = "git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0#ee4eed71ea7e379f5c7e2ca08179c516c2d4be45" dependencies = [ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "enum_primitive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_core 1.1.0", - "grin_store 1.1.0", - "grin_util 1.1.0", + "grin_core 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", + "grin_store 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", + "grin_util 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", "lmdb-zero 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", @@ -717,14 +707,15 @@ dependencies = [ [[package]] name = "grin_pool" -version = "1.1.0" +version = "1.0.1" +source = "git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0#ee4eed71ea7e379f5c7e2ca08179c516c2d4be45" dependencies = [ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_core 1.1.0", - "grin_keychain 1.1.0", - "grin_store 1.1.0", - "grin_util 1.1.0", + "grin_core 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", + "grin_keychain 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", + "grin_store 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", + "grin_util 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", @@ -740,14 +731,14 @@ dependencies = [ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_api 1.1.0", + "grin_api 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", "grin_apiwallet 1.1.0", - "grin_chain 1.1.0", - "grin_core 1.1.0", - "grin_keychain 1.1.0", + "grin_chain 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", + "grin_core 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", + "grin_keychain 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", "grin_libwallet 1.1.0", - "grin_store 1.1.0", - "grin_util 1.1.0", + "grin_store 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", + "grin_util 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", "grin_wallet_config 1.1.0", "hyper 0.12.19 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -781,15 +772,16 @@ dependencies = [ [[package]] name = "grin_store" -version = "1.1.0" +version = "1.0.1" +source = "git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0#ee4eed71ea7e379f5c7e2ca08179c516c2d4be45" dependencies = [ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "croaring 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_core 1.1.0", - "grin_util 1.1.0", + "grin_core 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", + "grin_util 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", "lmdb-zero 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -800,7 +792,8 @@ dependencies = [ [[package]] name = "grin_util" -version = "1.1.0" +version = "1.0.1" +source = "git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0#ee4eed71ea7e379f5c7e2ca08179c516c2d4be45" dependencies = [ "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -822,41 +815,25 @@ dependencies = [ name = "grin_wallet" version = "1.1.0" dependencies = [ - "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "built 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", "ctrlc 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_api 1.1.0", + "grin_api 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", "grin_apiwallet 1.1.0", - "grin_chain 1.1.0", - "grin_core 1.1.0", - "grin_keychain 1.1.0", + "grin_chain 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", + "grin_core 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", + "grin_keychain 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", "grin_libwallet 1.1.0", "grin_refwallet 1.1.0", - "grin_store 1.1.0", - "grin_util 1.1.0", + "grin_store 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", + "grin_util 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", "grin_wallet_config 1.1.0", - "hyper 0.12.19 (registry+https://github.com/rust-lang/crates.io-index)", "linefeed 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "prettytable-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", - "ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)", "rpassword 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "term 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-retry 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -864,8 +841,8 @@ name = "grin_wallet_config" version = "1.1.0" dependencies = [ "dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_core 1.1.0", - "grin_util 1.1.0", + "grin_core 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", + "grin_util 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)", "pretty_assertions 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2676,7 +2653,15 @@ dependencies = [ "checksum generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ef25c5683767570c2bbd7deba372926a55eaae9982d7726ee2a1050239d45b9d" "checksum git2 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "591f8be1674b421644b6c030969520bc3fa12114d2eb467471982ed3e9584e71" "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" +"checksum grin_api 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)" = "" +"checksum grin_chain 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)" = "" +"checksum grin_core 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)" = "" +"checksum grin_keychain 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)" = "" +"checksum grin_p2p 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)" = "" +"checksum grin_pool 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)" = "" "checksum grin_secp256k1zkp 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "223095ed6108a42855ab2ce368d2056cfd384705f81c494f6d88ab3383161562" +"checksum grin_store 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)" = "" +"checksum grin_util 1.0.1 (git+https://github.com/mimblewimble/grin?branch=milestone/1.1.0)" = "" "checksum h2 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "ddb2b25a33e231484694267af28fec74ac63b5ccf51ee2065a5e313b834d836e" "checksum hmac 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "733e1b3ac906631ca01ebb577e9bb0f5e37a454032b9036b5eaea4013ed6f99a" "checksum http 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "1a10e5b573b9a0146545010f50772b9e8b1dd0a256564cc4307694c68832a2f5" diff --git a/Cargo.toml b/Cargo.toml index 3ce63401..a9f054af 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,39 +22,23 @@ members = ["apiwallet", "config", "libwallet", "refwallet"] clap = { version = "2.31", features = ["yaml"] } rpassword = "2.0.0" ctrlc = { version = "3.1", features = ["termination"] } -blake2-rfc = "0.2" -byteorder = "1" failure = "0.1" failure_derive = "0.1" -futures = "0.1" -hyper = "0.12" prettytable-rs = "0.7" -rand = "0.5" -serde = "1" -serde_derive = "1" -serde_json = "1" log = "0.4" -term = "0.5" linefeed = "0.5" -tokio = "= 0.1.11" -tokio-core = "0.1" -tokio-retry = "0.1" -ring = "0.13" -uuid = { version = "0.6", features = ["serde", "v4"] } -url = "1.7.0" -chrono = { version = "0.4.4", features = ["serde"] } grin_apiwallet = { path = "./apiwallet", version = "1.1.0" } grin_libwallet = { path = "./libwallet", version = "1.1.0" } grin_refwallet = { path = "./refwallet", version = "1.1.0" } grin_wallet_config = { path = "./config", version = "1.1.0" } -grin_api = { path = "../grin/api", version = "1.1.0" } -grin_core = { path = "../grin/core", version = "1.1.0" } -grin_keychain = { path = "../grin/keychain", version = "1.1.0" } -grin_store = { path = "../grin/store", version = "1.1.0" } -grin_util = { path = "../grin/util", version = "1.1.0" } -grin_chain = { path = "../grin/chain", version = "1.1.0" } +grin_core = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" } +grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" } +grin_chain = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" } +grin_util = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" } +grin_api = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" } +grin_store = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" } [build-dependencies] built = "0.3" diff --git a/apiwallet/Cargo.toml b/apiwallet/Cargo.toml index 86d21325..236b0208 100644 --- a/apiwallet/Cargo.toml +++ b/apiwallet/Cargo.toml @@ -2,43 +2,26 @@ name = "grin_apiwallet" version = "1.1.0" authors = ["Grin Developers "] -description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." +description = "Grin Wallet API" license = "Apache-2.0" repository = "https://github.com/mimblewimble/grin" keywords = [ "crypto", "grin", "mimblewimble" ] readme = "README.md" exclude = ["**/*.grin", "**/*.grin2"] -#build = "src/build/build.rs" edition = "2018" [dependencies] -blake2-rfc = "0.2" failure = "0.1" failure_derive = "0.1" -futures = "0.1" -hyper = "0.12" -rand = "0.5" -serde = "1" -serde_derive = "1" -serde_json = "1" log = "0.4" -prettytable-rs = "0.7" -ring = "0.13" -term = "0.5" -tokio = "= 0.1.11" -tokio-core = "0.1" -tokio-retry = "0.1" uuid = { version = "0.6", features = ["serde", "v4"] } -url = "1.7.0" -chrono = { version = "0.4.4", features = ["serde"] } grin_libwallet = { path = "../libwallet", version = "1.1.0" } grin_wallet_config = { path = "../config", version = "1.1.0" } -#grin_refwallet = { path = "../refwallet", version = "1.1.0" } -grin_core = { path = "../../grin/core", version = "1.1.0" } -grin_keychain = { path = "../../grin/keychain", version = "1.1.0" } -grin_chain = { path = "../../grin/chain", version = "1.1.0" } -grin_util = { path = "../../grin/util", version = "1.1.0" } -grin_api = { path = "../../grin/api", version = "1.1.0" } -grin_store = { path = "../../grin/store", version = "1.1.0" } +grin_core = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" } +grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" } +grin_chain = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" } +grin_util = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" } +grin_api = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" } +grin_store = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" } diff --git a/config/Cargo.toml b/config/Cargo.toml index e59af8c3..ee596505 100644 --- a/config/Cargo.toml +++ b/config/Cargo.toml @@ -16,8 +16,8 @@ serde_derive = "1" toml = "0.4" dirs = "1.0.3" -grin_core = { path = "../../grin/core", version = "1.1.0" } -grin_util = { path = "../../grin/util", version = "1.1.0" } +grin_core = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" } +grin_util = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" } [dev-dependencies] pretty_assertions = "0.5.1" diff --git a/libwallet/Cargo.toml b/libwallet/Cargo.toml index cf8b8e7a..26d2b477 100644 --- a/libwallet/Cargo.toml +++ b/libwallet/Cargo.toml @@ -23,10 +23,10 @@ log = "0.4" uuid = { version = "0.6", features = ["serde", "v4"] } chrono = { version = "0.4.4", features = ["serde"] } -grin_store = { path = "../../grin/store", version = "1.1.0" } -grin_core = { path = "../../grin/core", version = "1.1.0" } -grin_keychain = { path = "../../grin/keychain", version = "1.1.0" } -grin_util = { path = "../../grin/util", version = "1.1.0" } +grin_core = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" } +grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" } +grin_util = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" } +grin_store = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" } [dev-dependencies] grin_wallet_config = { path = "../config", version = "1.1.0" } diff --git a/refwallet/Cargo.toml b/refwallet/Cargo.toml index bf56362d..b86c2ce2 100644 --- a/refwallet/Cargo.toml +++ b/refwallet/Cargo.toml @@ -36,9 +36,9 @@ grin_apiwallet = { path = "../apiwallet", version = "1.1.0" } grin_libwallet = { path = "../libwallet", version = "1.1.0" } grin_wallet_config = { path = "../config", version = "1.1.0" } -grin_core = { path = "../../grin/core", version = "1.1.0" } -grin_keychain = { path = "../../grin/keychain", version = "1.1.0" } -grin_chain = { path = "../../grin/chain", version = "1.1.0" } -grin_util = { path = "../../grin/util", version = "1.1.0" } -grin_api = { path = "../../grin/api", version = "1.1.0" } -grin_store = { path = "../../grin/store", version = "1.1.0" } +grin_core = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" } +grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" } +grin_chain = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" } +grin_util = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" } +grin_api = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" } +grin_store = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" }