From a2272d81961944a0ef1067ec7a5474d6de56ed9d Mon Sep 17 00:00:00 2001 From: "artem.ivanov" Date: Thu, 29 Aug 2019 16:37:32 +0300 Subject: [PATCH 1/2] ST-622 Sovtoken 1.0.2 Signed-off-by: artem.ivanov --- CHANGELOG.md | 5 ++++- devops/Makefile | 2 +- devops/aws-codebuild/Jenkinsfile.cd | 4 ++-- devops/aws-codebuild/Jenkinsfile.ci | 4 ++-- devops/docker/base/xenial/Dockerfile | 6 +++--- devops/docker/ci/xenial/Dockerfile | 10 +++++----- devops/indy-pool/Dockerfile | 8 ++++---- libsovtoken/Cargo.toml | 6 +++--- .../android/libsovtoken/libsovtoken.dependencies.txt | 2 +- libsovtoken/build_scripts/ios/mac/shared.functions.sh | 2 +- 10 files changed, 26 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee91e56a4..7d05c9421 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,10 @@ * Added `verify_with_address_handler` function to verify a signature with a payment address. * bugfixes -## 1.0.0 +## 1.0.2 +* bugfixes + +## 1.0.1 * bugfixes ## 0.10.0 diff --git a/devops/Makefile b/devops/Makefile index ccf4c040d..da7782f16 100644 --- 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.11.0) +FPM_P_DEPENDS = libindy(>=1.11.1~85) 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 index 57d46183c..65b9f0632 100644 --- 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.11.0" +LIBINDY_STREAM = "rc" +LIBINDY_VERSION = "1.11.1-85" def downloadPackagingUtils() { git branch: sovrinPackagingBranch, credentialsId: gitHubUserCredId, url: sovrinPackagingRepo diff --git a/devops/aws-codebuild/Jenkinsfile.ci b/devops/aws-codebuild/Jenkinsfile.ci index 7ea8ec452..d90e01643 100644 --- 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.11.0" +LIBINDY_STREAM = "rc" +LIBINDY_VERSION = "1.11.1-85" def nodeLabels = [ codeBuild: env.LIBSOVTOKEN_CODEBUILD_NODE_LABEL ?: 'codebuild', diff --git a/devops/docker/base/xenial/Dockerfile b/devops/docker/base/xenial/Dockerfile index 82713f330..66bf0274a 100644 --- 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.11.0 +ENV LIBINDY_VERSION=1.11.1~85 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.33.0 +ENV LIBSOVTOKEN_BASE_ENV_VERSION=0.35.0 diff --git a/devops/docker/ci/xenial/Dockerfile b/devops/docker/ci/xenial/Dockerfile index 1a2dd1a68..1032099f1 100644 --- a/devops/docker/ci/xenial/Dockerfile +++ b/devops/docker/ci/xenial/Dockerfile @@ -1,4 +1,4 @@ -FROM sovrin/libsovtoken:base-xenial-0.33.0 +FROM sovrin/libsovtoken:base-xenial-0.35.0 # TODO LABEL maintainer="Name " ARG LIBINDY_CRYPTO_VERSION @@ -35,9 +35,9 @@ 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~dev836} -ENV INDY_NODE_VERSION ${INDY_NODE_VERSION:-1.9.0~dev1028} -ENV TOKEN_VER ${TOKEN_VER:-1.0.0~dev65} +ENV INDY_PLENUM_VERSION ${INDY_PLENUM_VERSION:-1.9.2~dev876} +ENV INDY_NODE_VERSION ${INDY_NODE_VERSION:-1.9.2~dev1069} +ENV TOKEN_VER ${TOKEN_VER:-1.0.2~dev81} 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 \ && apt-get update && apt-get install -y --no-install-recommends \ @@ -66,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.723.0 +ENV LIBSOVTOKEN_CI_ENV_VERSION=0.725.0 diff --git a/devops/indy-pool/Dockerfile b/devops/indy-pool/Dockerfile index 73bd48dee..89e60183f 100644 --- a/devops/indy-pool/Dockerfile +++ b/devops/indy-pool/Dockerfile @@ -22,12 +22,12 @@ ARG uid=1000 ARG indy_stream=master -ARG indy_plenum_ver=1.9.0~dev836 -ARG indy_node_ver=1.9.0~dev1028 +ARG indy_plenum_ver=1.9.2~dev876 +ARG indy_node_ver=1.9.2~dev1069 ARG python3_indy_crypto_ver=0.4.5 ARG indy_crypto_ver=0.4.5 -ARG token_ver=1.0.0~dev65 -ARG fees_ver=1.0.0~dev65 +ARG token_ver=1.0.2~dev81 +ARG fees_ver=1.0.2~dev81 # Install environment RUN apt-get update -y && apt-get install -y \ diff --git a/libsovtoken/Cargo.toml b/libsovtoken/Cargo.toml index a539c57bb..d5a051f02 100644 --- a/libsovtoken/Cargo.toml +++ b/libsovtoken/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "libsovtoken" -version = "1.0.1" +version = "1.0.2" authors = [ "Matt Raffel Date: Fri, 30 Aug 2019 15:37:19 +0300 Subject: [PATCH 2/2] ST-622 Sovtoken 1.0.2 Signed-off-by: artem.ivanov --- devops/Makefile | 2 +- devops/aws-codebuild/Jenkinsfile.cd | 4 ++-- devops/aws-codebuild/Jenkinsfile.ci | 4 ++-- devops/docker/base/xenial/Dockerfile | 6 +++--- devops/docker/ci/xenial/Dockerfile | 8 ++++---- devops/indy-pool/Dockerfile | 4 ++-- libsovtoken/Cargo.toml | 4 ++-- .../android/libsovtoken/libsovtoken.dependencies.txt | 2 +- libsovtoken/build_scripts/ios/mac/shared.functions.sh | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/devops/Makefile b/devops/Makefile index da7782f16..e4134bddc 100644 --- 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.11.1~85) +FPM_P_DEPENDS = libindy(>=1.11.1) 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 index 65b9f0632..af429bdd2 100644 --- 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 = "rc" -LIBINDY_VERSION = "1.11.1-85" +LIBINDY_STREAM = "stable" +LIBINDY_VERSION = "1.11.1" def downloadPackagingUtils() { git branch: sovrinPackagingBranch, credentialsId: gitHubUserCredId, url: sovrinPackagingRepo diff --git a/devops/aws-codebuild/Jenkinsfile.ci b/devops/aws-codebuild/Jenkinsfile.ci index d90e01643..287b494fe 100644 --- 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 = "rc" -LIBINDY_VERSION = "1.11.1-85" +LIBINDY_STREAM = "stable" +LIBINDY_VERSION = "1.11.1" def nodeLabels = [ codeBuild: env.LIBSOVTOKEN_CODEBUILD_NODE_LABEL ?: 'codebuild', diff --git a/devops/docker/base/xenial/Dockerfile b/devops/docker/base/xenial/Dockerfile index 66bf0274a..bb32d1172 100644 --- 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.11.1~85 +ENV LIBINDY_VERSION=1.11.1 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88 \ - && echo "deb https://repo.sovrin.org/sdk/deb xenial rc" >> /etc/apt/sources.list \ + && echo "deb https://repo.sovrin.org/sdk/deb xenial stable" >> /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.35.0 +ENV LIBSOVTOKEN_BASE_ENV_VERSION=0.36.0 diff --git a/devops/docker/ci/xenial/Dockerfile b/devops/docker/ci/xenial/Dockerfile index 1032099f1..4b5bd5204 100644 --- a/devops/docker/ci/xenial/Dockerfile +++ b/devops/docker/ci/xenial/Dockerfile @@ -1,4 +1,4 @@ -FROM sovrin/libsovtoken:base-xenial-0.35.0 +FROM sovrin/libsovtoken:base-xenial-0.36.0 # TODO LABEL maintainer="Name " ARG LIBINDY_CRYPTO_VERSION @@ -35,8 +35,8 @@ 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.2~dev876} -ENV INDY_NODE_VERSION ${INDY_NODE_VERSION:-1.9.2~dev1069} +ENV INDY_PLENUM_VERSION ${INDY_PLENUM_VERSION:-1.9.2~dev875} +ENV INDY_NODE_VERSION ${INDY_NODE_VERSION:-1.9.2~dev1067} ENV TOKEN_VER ${TOKEN_VER:-1.0.2~dev81} 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 \ @@ -66,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.725.0 +ENV LIBSOVTOKEN_CI_ENV_VERSION=0.727.0 diff --git a/devops/indy-pool/Dockerfile b/devops/indy-pool/Dockerfile index 89e60183f..b164012ea 100644 --- a/devops/indy-pool/Dockerfile +++ b/devops/indy-pool/Dockerfile @@ -22,8 +22,8 @@ ARG uid=1000 ARG indy_stream=master -ARG indy_plenum_ver=1.9.2~dev876 -ARG indy_node_ver=1.9.2~dev1069 +ARG indy_plenum_ver=1.9.2~dev875 +ARG indy_node_ver=1.9.2~dev1067 ARG python3_indy_crypto_ver=0.4.5 ARG indy_crypto_ver=0.4.5 ARG token_ver=1.0.2~dev81 diff --git a/libsovtoken/Cargo.toml b/libsovtoken/Cargo.toml index d5a051f02..a087f921e 100644 --- a/libsovtoken/Cargo.toml +++ b/libsovtoken/Cargo.toml @@ -28,8 +28,8 @@ libc = "0.2.41" log = "0.4.6" openssl = "0.10.20" rand = "0.3" -indy-sys = "=1.11.1-rc-85" -indy = "=1.11.1-rc-85" +indy-sys = "=1.11.1" +indy = "=1.11.1" serde = "1.0.89" serde_derive = "1.0.89" serde_json = "1.0.39" diff --git a/libsovtoken/build_scripts/android/libsovtoken/libsovtoken.dependencies.txt b/libsovtoken/build_scripts/android/libsovtoken/libsovtoken.dependencies.txt index 290bbaee1..a733b4865 100644 --- a/libsovtoken/build_scripts/android/libsovtoken/libsovtoken.dependencies.txt +++ b/libsovtoken/build_scripts/android/libsovtoken/libsovtoken.dependencies.txt @@ -1 +1 @@ -libindy=1.11.1-85=rc +libindy=1.11.1=stable diff --git a/libsovtoken/build_scripts/ios/mac/shared.functions.sh b/libsovtoken/build_scripts/ios/mac/shared.functions.sh index 77cbf0b33..ea1694533 100644 --- 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.11.1-85/libindy.tar.gz" +export LIBINDY_IOS_BUILD_URL="https://repo.sovrin.org/ios/libindy/stable/libindy-core/1.11.1/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