Merge pull request #393 from Artemkaaas/feature/libsovtoken-1.0.0

Libsovtoken 1.0.0
sovrin-foundation · Jul 3, 2019 · e4f0aaa · e4f0aaa
2 parents 3ea8041 + ebe754a
commit e4f0aaa
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.0.0
+* bugfixes
+
 ## 0.10.0
 * Updated `build_set_txn_fees_handler` function to accept any aliases.
 * Updated `build_payment_req_handler` function to accept and to handle `Transaction Author Agreement` passed inside `extra_json`.

diff --git a/devops/Makefile b/devops/Makefile
@@ -45,7 +45,7 @@ FPM_P_VENDOR := Sovrin
 FPM_P_DESCRIPTION := libsovtoken written in Rust
 FPM_P_NAME = $(PACKAGE_NAME)
 FPM_P_VERSION ?= $(SRC_VERSION)
-FPM_P_DEPENDS = libindy(>=1.9.0~1130)
+FPM_P_DEPENDS = libindy(>=1.10.0~77)
 FPM_P_OUTPUT_DIR = $(LIB_TARGET_DIR)
 FPM_ARGS = $(LIB_DYNAMIC)=/usr/lib/
 

diff --git a/devops/aws-codebuild/Jenkinsfile.cd b/devops/aws-codebuild/Jenkinsfile.cd
@@ -15,8 +15,8 @@ String srcVersion
 gitHubUserCredId = env.GITHUB_BOT_USER ?: 'sovbot-github'
 sovrinPackagingRepo = env.SOVRIN_PACKAGING_REPO ?: 'https://github.com/sovrin-foundation/sovrin-packaging'
 sovrinPackagingBranch = env.SOVRIN_PACKAGING_BRANCH ?: 'master'
-LIBINDY_STREAM = "master"
-LIBINDY_VERSION = "1.9.0-1130"
+LIBINDY_STREAM = "rc"
+LIBINDY_VERSION = "1.10.0-77"
 
 def downloadPackagingUtils() {
     git branch: sovrinPackagingBranch, credentialsId: gitHubUserCredId, url: sovrinPackagingRepo

diff --git a/devops/aws-codebuild/Jenkinsfile.ci b/devops/aws-codebuild/Jenkinsfile.ci
@@ -7,8 +7,8 @@ def sovLibrary = library(identifier: 'sovrin-aws-codebuild@master', retriever: m
 logger = sovLibrary.Logger.new(this)
 notifier = sovLibrary.Notifier.new(this)
 logger.setGlobalLevel('TRACE')
-LIBINDY_STREAM = "master"
-LIBINDY_VERSION = "1.9.0-1130"
+LIBINDY_STREAM = "rc"
+LIBINDY_VERSION = "1.10.0-77"
 
 def nodeLabels = [
         codeBuild: env.LIBSOVTOKEN_CODEBUILD_NODE_LABEL ?: 'codebuild',

diff --git a/devops/docker/base/xenial/Dockerfile b/devops/docker/base/xenial/Dockerfile
@@ -21,9 +21,9 @@ RUN cd /tmp \
 # need for libsodium to be reachable via pkg-config (sodiumoxide uses it)
 ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:$PKG_CONFIG_PATH # TODO ??? is it really needed
 
-ENV LIBINDY_VERSION=1.9.0~1130
+ENV LIBINDY_VERSION=1.10.0~77
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88 \
-    && echo "deb https://repo.sovrin.org/sdk/deb xenial master" >> /etc/apt/sources.list \
+    && echo "deb https://repo.sovrin.org/sdk/deb xenial rc" >> /etc/apt/sources.list \
     && apt-get update && apt-get install -y --no-install-recommends \
         libssl-dev \
         libindy=${LIBINDY_VERSION} \
@@ -47,4 +47,4 @@ RUN cd /tmp/libsovtoken \
 # TODO CMD ENTRYPOINT ...
 
 
-ENV LIBSOVTOKEN_BASE_ENV_VERSION=0.25.0
+ENV LIBSOVTOKEN_BASE_ENV_VERSION=0.26.0
diff --git a/devops/docker/ci/xenial/Dockerfile b/devops/docker/ci/xenial/Dockerfile
@@ -1,10 +1,9 @@
-FROM sovrin/libsovtoken:base-xenial-0.25.0
+FROM sovrin/libsovtoken:base-xenial-0.26.0
 # TODO LABEL maintainer="Name <email-address>"
 
 ARG LIBINDY_CRYPTO_VERSION
 ARG PYTHON3_INDY_CRYPTO_VERSION
 ARG INDY_PLENUM_VERSION
-ARG INDY_ANONCREDS_VERSION
 ARG INDY_NODE_VERSION
 
 ARG SOVRIN_REPO_IP
@@ -36,17 +35,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 #         or python3-rocksdb are not specified here)
 ENV LIBINDY_CRYPTO_VERSION ${LIBINDY_CRYPTO_VERSION:-0.4.5}
 ENV PYTHON3_INDY_CRYPTO_VERSION ${PYTHON3_INDY_CRYPTO_VERSION:-0.4.5}
-ENV INDY_PLENUM_VERSION ${INDY_PLENUM_VERSION:-1.9.0~dev808}
-ENV INDY_ANONCREDS_VERSION ${INDY_ANONCREDS_VERSION:-1.0.32}
-ENV INDY_NODE_VERSION ${INDY_NODE_VERSION:-1.9.0~dev987}
-ENV TOKEN_VER  ${TOKEN_VER:-0.9.13~41}
+ENV INDY_PLENUM_VERSION ${INDY_PLENUM_VERSION:-1.9.0}
+ENV INDY_NODE_VERSION ${INDY_NODE_VERSION:-1.9.0~rc3}
+ENV TOKEN_VER  ${TOKEN_VER:-1.0.0~rc13}
 RUN echo "deb https://repo.sovrin.org/sdk/deb xenial master" >> /etc/apt/sources.list
-RUN echo "deb https://repo.sovrin.org/deb xenial master" >> /etc/apt/sources.list \
+RUN echo "deb https://repo.sovrin.org/deb xenial rc" >> /etc/apt/sources.list \
     && apt-get update && apt-get install -y --no-install-recommends \
         libindy-crypto=${LIBINDY_CRYPTO_VERSION} \
         python3-indy-crypto=${PYTHON3_INDY_CRYPTO_VERSION} \
         indy-plenum=${INDY_PLENUM_VERSION} \
-        indy-anoncreds=${INDY_ANONCREDS_VERSION} \
         indy-node=${INDY_NODE_VERSION} \
         sovtoken=${TOKEN_VER} \
         sovtokenfees=${TOKEN_VER} \
@@ -69,4 +66,4 @@ COPY libsovtoken-ci-entrypoint.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/libsovtoken-ci-entrypoint.sh
 ENTRYPOINT ["libsovtoken-ci-entrypoint.sh"]
 
-ENV LIBSOVTOKEN_CI_ENV_VERSION=0.61.0
+ENV LIBSOVTOKEN_CI_ENV_VERSION=0.66.0
diff --git a/devops/indy-pool/Dockerfile b/devops/indy-pool/Dockerfile
@@ -19,16 +19,15 @@ FROM camparra/ubuntu16.04-rocksdb
 
 ARG uid=1000
 
-ARG indy_stream=master
+ARG indy_stream=rc
 
 
-ARG indy_plenum_ver=1.9.0~dev808
-ARG indy_node_ver=1.9.0~dev987
-ARG indy_anoncreds_ver=1.0.32
+ARG indy_plenum_ver=1.9.0
+ARG indy_node_ver=1.9.0~rc3
 ARG python3_indy_crypto_ver=0.4.5
 ARG indy_crypto_ver=0.4.5
-ARG token_ver=0.9.13~41
-ARG fees_ver=0.9.13~41
+ARG token_ver=1.0.0~rc13
+ARG fees_ver=1.0.0~rc13
 
 # Install environment
 RUN apt-get update -y && apt-get install -y \

diff --git a/libsovtoken/Cargo.toml b/libsovtoken/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "libsovtoken"
 
-version = "0.10.0"
+version = "1.0.0"
 
 authors = [
   "Matt Raffel <[email protected]",
@@ -28,8 +28,8 @@ libc = "0.2.41"
 log = "0.4.6"
 openssl = "0.10.20"
 rand = "0.3"
-indy-sys = "=1.9.0-dev-1130"
-indy = "=1.9.0-dev-1130"
+indy-sys = "=1.10.0-rc-77"
+indy = "=1.10.0-rc-77"
 serde = "1.0.89"
 serde_derive = "1.0.89"
 serde_json = "1.0.39"

diff --git a/libsovtoken/build_scripts/android/libsovtoken/build.nondocker.sh b/libsovtoken/build_scripts/android/libsovtoken/build.nondocker.sh
@@ -39,8 +39,9 @@ download_libindy(){
     #$1 Branch
     #$2 Version
     #$3 Arch
+    base_version=$(cut -d'-' -f1 <<< $2)
     command pushd ${PREBUILT} > /dev/null
-        curl -sSLO https://repo.sovrin.org/android/libindy/$1/$2/libindy_android_$3_$2.zip
+        curl -sSLO https://repo.sovrin.org/android/libindy/$1/$2/libindy_android_$3_$base_version.zip
         unzip -o -qq "libindy_android_$3_$2.zip"
         rm "libindy_android_$3_$2.zip"
     command popd > /dev/null

diff --git a/libsovtoken/build_scripts/android/libsovtoken/libsovtoken.dependencies.txt b/libsovtoken/build_scripts/android/libsovtoken/libsovtoken.dependencies.txt
@@ -1 +1 @@
-libindy=1.9.0=stable
+libindy=1.10.0-77=rc
diff --git a/libsovtoken/build_scripts/ios/mac/shared.functions.sh b/libsovtoken/build_scripts/ios/mac/shared.functions.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export LIBINDY_IOS_BUILD_URL="https://repo.sovrin.org/ios/libindy/rc/libindy-core/1.9.0-75/libindy.tar.gz"
+export LIBINDY_IOS_BUILD_URL="https://repo.sovrin.org/ios/libindy/rc/libindy-core/1.10.0-77/libindy.tar.gz"
 export LIBINDY_FILE=$(basename ${LIBINDY_IOS_BUILD_URL})
 export LIBINDY_VERSION=$(basename $(dirname ${LIBINDY_IOS_BUILD_URL}))
 export BUILD_CACHE=~/.build_libvxc/ioscache