Merge pull request #396 from Artemkaaas/libsovtoken-1.0.0

Libsovtoken 1.0.0
sovrin-foundation · Jul 3, 2019 · e7dde6e · e7dde6e
2 parents e820bba + c50ae9c
commit e7dde6e
Show file tree

Hide file tree

Showing 31 changed files with 895 additions and 572 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/README.md b/README.md
@@ -110,6 +110,41 @@ Adds Sovrin's token functionality to HyperLedger's Indy-SDK.
 
 <a id="how-to-contribute"></a>
 
+## Installing the Sovtoken
+
+### Release channels
+The Sovtoken release process defines the following release channels:
+
+* `master` - development builds for each push to master branch.
+* `stable` - stable releases.
+
+### Ubuntu based distributions (Ubuntu 16.04)
+It is recommended to install the SDK packages with APT:
+
+    sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88
+    sudo add-apt-repository "deb https://repo.sovrin.org/sdk/deb xenial {release channel}"
+    sudo apt-get update
+    sudo apt-get install -y libsovtoken
+
+### Windows
+
+1. Go to `https://repo.sovrin.org/windows/libsovtoken/{release-channel}`
+2. Download last version of libsovtoken.
+3. Unzip archives to the directory where you want to save library.
+
+### iOS
+1. Go to `https://repo.sovrin.org/ios/libsovtoken/{release-channel}/libsovtoken-core/`.
+2. 5 target architecture are supported as of now aarch64-apple-ios, armv7-apple-ios, armv7s-apple-ios, i386-apple-ios, x86_64-apple-ios and universal.
+3. Download latest version of libsovtoken.
+4. Unzip archives to the directory where you want to save library.
+
+### Android
+
+1. Go to `https://repo.sovrin.org/android/libsovtoken/{release-channel}`.
+2. 3 architecture are supported as of now arm,arm64 and x86.
+3. Download latest version of libsovtoken.
+4. Unzip archives to the directory where you want to save library.
+
 ## How To Contribute
 
 Please follow the guide [here](./doc/pull-request.md).

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)
+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/Makefile.android.in b/devops/Makefile.android.in
@@ -20,6 +20,7 @@ ANDROID_NDK_ARCHIVE_NAME := $(ANDROID_NDK_NAME)-$(call to_lower,$(shell uname))-
 
 LIBINDY_DEP_SPEC := $(subst =, ,$(call get_android_dependency,libindy,$(LIBSOVTOKEN_DEPS_FILE)))
 LIBINDY_VERSION ?= $(word 2,$(LIBINDY_DEP_SPEC))
+LIBINDY_VERSION_BASE ?= $(word 1,$(subst -, ,$(LIBINDY_VERSION)))
 LIBINDY_BRANCH ?= $(word 3,$(LIBINDY_DEP_SPEC))
 
 ANDROID_ARCHS ?= arm armv7 arm64 x86 x86_64
@@ -42,17 +43,17 @@ $(ANDROID_PREBUILT_DIR)/openssl_%.zip: | $(ANDROID_PREBUILT_DIR)
 $(ANDROID_PREBUILT_DIR)/libsodium_%.zip: | $(ANDROID_PREBUILT_DIR)
 	cd $(@D) && curl -fLO $(REPO_SOVRIN_ORG_ANDROID_PREBUILT_URL)/deps/sodium/libsodium_$*.zip
 
-.PRECIOUS: $(ANDROID_PREBUILT_DIR)/libindy_android_%_$(LIBINDY_VERSION).zip
-$(ANDROID_PREBUILT_DIR)/libindy_android_%_$(LIBINDY_VERSION).zip: | $(ANDROID_PREBUILT_DIR)
-	cd $(@D) && curl -fLO $(REPO_SOVRIN_ORG_ANDROID_PREBUILT_URL)/$(LIBINDY_BRANCH)/$(LIBINDY_VERSION)/libindy_android_$*_$(LIBINDY_VERSION).zip
+.PRECIOUS: $(ANDROID_PREBUILT_DIR)/libindy_android_%_$(LIBINDY_VERSION_BASE).zip
+$(ANDROID_PREBUILT_DIR)/libindy_android_%_$(LIBINDY_VERSION_BASE).zip: | $(ANDROID_PREBUILT_DIR)
+	cd $(@D) && curl -fLO $(REPO_SOVRIN_ORG_ANDROID_PREBUILT_URL)/$(LIBINDY_BRANCH)/$(LIBINDY_VERSION)/libindy_android_$*_$(LIBINDY_VERSION_BASE).zip
 
 .PRECIOUS: $(ANDROID_PREBUILT_DIR)/%
 $(ANDROID_PREBUILT_DIR)/%: $(ANDROID_PREBUILT_DIR)/%.zip
 	unzip -o -qq -d $(<D) $<
 	touch $@
 
 .PRECIOUS: $(ANDROID_PREBUILT_DIR)/libindy_%
-$(ANDROID_PREBUILT_DIR)/libindy_%: $(ANDROID_PREBUILT_DIR)/libindy_android_%_$(LIBINDY_VERSION).zip
+$(ANDROID_PREBUILT_DIR)/libindy_%: $(ANDROID_PREBUILT_DIR)/libindy_android_%_$(LIBINDY_VERSION_BASE).zip
 	unzip -o -qq -d $(<D) $<
 	touch $@
 

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 = "stable"
-LIBINDY_VERSION = "1.9.0"
+LIBINDY_STREAM = "rc"
+LIBINDY_VERSION = "1.10.0-77"
 
 def downloadPackagingUtils() {
     git branch: sovrinPackagingBranch, credentialsId: gitHubUserCredId, url: sovrinPackagingRepo
@@ -460,7 +460,7 @@ def getSuffix() {
 }
 
 
-    pipelineWrapper({
+pipelineWrapper({
     //put code build containers inside a vpc under our dev account
     env.USE_VPC_CONFIG = true
 

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 = "stable"
-LIBINDY_VERSION = "1.9.0"
+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
+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 stable" >> /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.8.0}
-ENV INDY_ANONCREDS_VERSION ${INDY_ANONCREDS_VERSION:-1.0.11}
-ENV INDY_NODE_VERSION ${INDY_NODE_VERSION:-1.8.0}
-ENV TOKEN_VER  ${TOKEN_VER:-0.9.12}
-RUN echo "deb https://repo.sovrin.org/sdk/deb xenial stable" >> /etc/apt/sources.list
-RUN echo "deb https://repo.sovrin.org/deb xenial stable" >> /etc/apt/sources.list \
+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 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.60.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=stable
+ARG indy_stream=rc
 
 
-ARG indy_plenum_ver=1.8.0
-ARG indy_node_ver=1.8.0
-ARG indy_anoncreds_ver=1.0.11
+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.12
-ARG fees_ver=0.9.12
+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 \
@@ -51,7 +50,6 @@ RUN echo "deb https://repo.sovrin.org/deb xenial $indy_stream" >> /etc/apt/sourc
 RUN apt-get update && apt-get install -y --no-install-recommends \
     indy-plenum=${indy_plenum_ver} \
     indy-node=${indy_node_ver} \
-    indy-anoncreds=${indy_anoncreds_ver} \
     python3-indy-crypto=${python3_indy_crypto_ver} \
     libindy-crypto=${indy_crypto_ver} \
     sovtoken=${token_ver} \

diff --git a/devops/windows/win-zip-and-upload.sh b/devops/windows/win-zip-and-upload.sh
@@ -16,7 +16,6 @@ suffix="$4"
 [ -z $version ] && exit 1
 [ -z $key ] && exit 2
 [ -z $type ] && exit 3
-[ -z $suffix ] && exit 4
 
 PACKAGE_NAME="libsovtoken"
 TEMP_ARCH_DIR=./${PACKAGE_NAME}-zip