From 5c839f0b0f42ed939ecac6fd8c03ae6c4c51c895 Mon Sep 17 00:00:00 2001 From: "artem.ivanov" Date: Mon, 30 Dec 2019 14:00:06 +0300 Subject: [PATCH 1/2] Indy-CLI: fixed TAA showing Signed-off-by: artem.ivanov --- cli/src/commands/ledger.rs | 4 ++-- cli/src/commands/pool.rs | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cli/src/commands/ledger.rs b/cli/src/commands/ledger.rs index 5b9224cbc7..c44e2116d9 100644 --- a/cli/src/commands/ledger.rs +++ b/cli/src/commands/ledger.rs @@ -2279,7 +2279,7 @@ fn timestamp_to_datetime(_time: i64) -> String { NaiveDateTime::from_timestamp(_time, 0).to_string() } -pub fn get_active_transaction_author_agreement(_pool_handle: i32) -> Result, ()> { +pub fn get_active_transaction_author_agreement(_pool_handle: i32) -> Result)>, ()> { let response = Ledger::build_get_txn_author_agreement_request(None, None) .and_then(|request| Ledger::submit_request(_pool_handle, &request)) .map_err(|err| handle_indy_error(err, None, None, None))?; @@ -2293,7 +2293,7 @@ pub fn get_active_transaction_author_agreement(_pool_handle: i32) -> Result Ok(None), - (Some(text), Some(version), Some(digest)) => Ok(Some((text.to_string(), version.to_string(), digest.to_string()))), + (Some(text), Some(version), digest) => Ok(Some((text.to_string(), version.to_string(), digest.as_ref().map(|digest_| digest_.to_string())))), _ => Ok(None) } } diff --git a/cli/src/commands/pool.rs b/cli/src/commands/pool.rs index 3c92cd3f21..c414aec4c7 100644 --- a/cli/src/commands/pool.rs +++ b/cli/src/commands/pool.rs @@ -424,7 +424,9 @@ pub fn set_transaction_author_agreement(ctx: &CommandContext, pool_handle: i32, println!("Transaction Author Agreement"); println!("Version: {:?}", version); - println!("Digest: {:?}", digest); + if let Some(digest_) = digest { + println!("Digest: {:?}", digest_); + } println!("Content: \n {:?}", text); accept_transaction_author_agreement(ctx, &text, &version); From a965ec72e01e942620a5cd08d0050fe2918251b7 Mon Sep 17 00:00:00 2001 From: "artem.ivanov" Date: Mon, 30 Dec 2019 14:10:32 +0300 Subject: [PATCH 2/2] Release Indy SDK 1.14.1 Signed-off-by: artem.ivanov --- CHANGELOG.md | 3 +++ Specs/libindy/1.14.1/libindy.podspec.json | 23 +++++++++++++++++++++++ cli/Cargo.lock | 10 +++++----- cli/Cargo.toml | 4 ++-- cli/debian/changelog | 5 ++++- libindy/Cargo.lock | 12 ++++++------ libindy/Cargo.toml | 2 +- libindy/debian/changelog | 5 ++++- libnullpay/Cargo.lock | 10 +++++----- libnullpay/Cargo.toml | 4 ++-- libnullpay/debian/changelog | 2 +- vcx/libvcx/Cargo.lock | 12 ++++++------ vcx/libvcx/Cargo.toml | 8 ++++---- vcx/libvcx/debian/changelog | 5 ++++- vcx/wrappers/java/build.gradle | 2 +- vcx/wrappers/node/package.json | 2 +- vcx/wrappers/python3/setup.py | 2 +- wrappers/java/pom.xml | 2 +- wrappers/nodejs/package.json | 2 +- wrappers/python/setup.py | 2 +- wrappers/rust/Cargo.toml | 4 ++-- wrappers/rust/indy-sys/Cargo.toml | 2 +- 22 files changed, 79 insertions(+), 44 deletions(-) create mode 100644 Specs/libindy/1.14.1/libindy.podspec.json diff --git a/CHANGELOG.md b/CHANGELOG.md index a381e404cf..e483a363cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 1.14.1 - 2019-12-30 +* Bugfixes + ## 1.14.0 - 2019-12-27 * LibVCX Aries support: * Implemented Trust Ping RFC (IS-1435) diff --git a/Specs/libindy/1.14.1/libindy.podspec.json b/Specs/libindy/1.14.1/libindy.podspec.json new file mode 100644 index 0000000000..e496c226e6 --- /dev/null +++ b/Specs/libindy/1.14.1/libindy.podspec.json @@ -0,0 +1,23 @@ +{ + "name": "libindy", + "version": "1.14.1", + "summary": "Summary TODO.", + "description": "Description TODO.", + "homepage": "TODO", + "license": { + "type": "Apache License 2.0", + "file": "LICENSE" + }, + "authors": { + "Daniel Hardman": "daniel.hardman@evernym.com" + }, + "platforms": { + "ios": "10.0" + }, + "source": { + "http": "https://repo.sovrin.org/ios/libindy/stable/libindy-core/1.14.1/libindy.tar.gz" + }, + "source_files": "*.h", + "vendored_libraries": "*.a", + "requires_arc": false +} diff --git a/cli/Cargo.lock b/cli/Cargo.lock index 692799dabb..91081624e8 100644 --- a/cli/Cargo.lock +++ b/cli/Cargo.lock @@ -244,11 +244,11 @@ dependencies = [ [[package]] name = "indy" -version = "1.14.0" +version = "1.14.1" dependencies = [ "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", - "indy-sys 1.14.0", + "indy-sys 1.14.1", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -261,13 +261,13 @@ dependencies = [ [[package]] name = "indy-cli" -version = "1.14.0" +version = "1.14.1" dependencies = [ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "indy 1.14.0", + "indy 1.14.1", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -286,7 +286,7 @@ dependencies = [ [[package]] name = "indy-sys" -version = "1.14.0" +version = "1.14.1" dependencies = [ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 32f2942809..139ba6ce12 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "indy-cli" -version = "1.14.0" +version = "1.14.1" authors = ["Hyperledger Indy Contributors "] edition = "2018" @@ -29,4 +29,4 @@ serde_json = "1.0.40" serde_derive = "1.0.97" term = "0.4.6" rpassword = "1.0.0" -indy = { version = "1.14.0", path = "../wrappers/rust/" } +indy = { version = "1.14.1", path = "../wrappers/rust/" } diff --git a/cli/debian/changelog b/cli/debian/changelog index 3ac6a3f188..79b6f31333 100644 --- a/cli/debian/changelog +++ b/cli/debian/changelog @@ -1,7 +1,10 @@ -indy-cli (1.14.0) unstable; urgency=medium +indy-cli (1.14.1) unstable; urgency=medium [ Hyperledger ] +## 1.14.1 +* Bugfixes + ## 1.14.0 * Added new commands: * `ledger disable-all-txn-author-agreements` - to disable All Transaction Author Agreements on the ledger. diff --git a/libindy/Cargo.lock b/libindy/Cargo.lock index 2eeab61392..6436ccab3c 100644 --- a/libindy/Cargo.lock +++ b/libindy/Cargo.lock @@ -563,11 +563,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "indy" -version = "1.14.0" +version = "1.14.1" dependencies = [ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "indy-sys 1.14.0", + "indy-sys 1.14.1", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -598,7 +598,7 @@ dependencies = [ [[package]] name = "indy-sys" -version = "1.14.0" +version = "1.14.1" dependencies = [ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", @@ -688,7 +688,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libindy" -version = "1.14.0" +version = "1.14.1" dependencies = [ "android_logger 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "backtrace 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -702,9 +702,9 @@ dependencies = [ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "indy 1.14.0", + "indy 1.14.1", "indy-api-types 0.1.0", - "indy-sys 1.14.0", + "indy-sys 1.14.1", "indy-utils 0.1.0", "indy-wallet 0.1.0", "int_traits 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/libindy/Cargo.toml b/libindy/Cargo.toml index a765a1151a..55c5743fbd 100644 --- a/libindy/Cargo.toml +++ b/libindy/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "libindy" -version = "1.14.0" +version = "1.14.1" authors = ["Hyperledger Indy Contributors "] edition = "2018" diff --git a/libindy/debian/changelog b/libindy/debian/changelog index a0005fac85..14f08c8620 100644 --- a/libindy/debian/changelog +++ b/libindy/debian/changelog @@ -1,7 +1,10 @@ -libindy (1.14.0) unstable; urgency=medium +libindy (1.14.1) unstable; urgency=medium [ Hyperledger ] +## 1.14.1 +* Bugfixes + ## 1.14.0 * Transaction author agreement changes (IS-1427): * Extended the definition of `indy_build_txn_author_agreement_request` function to accept new parameters: diff --git a/libnullpay/Cargo.lock b/libnullpay/Cargo.lock index 8882c2fa22..5fd424bd78 100644 --- a/libnullpay/Cargo.lock +++ b/libnullpay/Cargo.lock @@ -259,11 +259,11 @@ dependencies = [ [[package]] name = "indy" -version = "1.14.0" +version = "1.14.1" dependencies = [ "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", - "indy-sys 1.14.0", + "indy-sys 1.14.1", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -276,7 +276,7 @@ dependencies = [ [[package]] name = "indy-sys" -version = "1.14.0" +version = "1.14.1" dependencies = [ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -332,12 +332,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "null-payment-method" -version = "1.14.0" +version = "1.14.1" dependencies = [ "android_logger 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)", - "indy 1.14.0", + "indy 1.14.1", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/libnullpay/Cargo.toml b/libnullpay/Cargo.toml index 950c945e18..aeffa16708 100644 --- a/libnullpay/Cargo.toml +++ b/libnullpay/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "null-payment-method" -version = "1.14.0" +version = "1.14.1" authors = ["Hyperledger Indy Contributors "] build = "build.rs" @@ -26,7 +26,7 @@ serde_derive = "1.0.97" [dev-dependencies] dirs = "1.0.4" -indy = { version="1.14.0", path="../wrappers/rust" } +indy = { version="1.14.1", path="../wrappers/rust" } [target.'cfg(target_os = "android")'.dependencies] android_logger = "0.5" diff --git a/libnullpay/debian/changelog b/libnullpay/debian/changelog index 3977c04be6..4b3f18eab3 100644 --- a/libnullpay/debian/changelog +++ b/libnullpay/debian/changelog @@ -1,4 +1,4 @@ -libnullpay (1.14.0) unstable; urgency=medium +libnullpay (1.14.1) unstable; urgency=medium [ Hyperledger ] * Initial release diff --git a/vcx/libvcx/Cargo.lock b/vcx/libvcx/Cargo.lock index a23b1e2a13..cbc9a6161a 100644 --- a/vcx/libvcx/Cargo.lock +++ b/vcx/libvcx/Cargo.lock @@ -512,11 +512,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "indy" -version = "1.14.0" +version = "1.14.1" dependencies = [ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", - "indy-sys 1.14.0", + "indy-sys 1.14.1", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -529,7 +529,7 @@ dependencies = [ [[package]] name = "indy-sys" -version = "1.14.0" +version = "1.14.1" dependencies = [ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -586,7 +586,7 @@ dependencies = [ [[package]] name = "libvcx" -version = "0.6.0" +version = "0.6.1" dependencies = [ "android_logger 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -595,8 +595,8 @@ dependencies = [ "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)", "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", - "indy 1.14.0", - "indy-sys 1.14.0", + "indy 1.14.1", + "indy-sys 1.14.1", "json 0.11.13 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/vcx/libvcx/Cargo.toml b/vcx/libvcx/Cargo.toml index 17ed537a2f..88196940b5 100644 --- a/vcx/libvcx/Cargo.toml +++ b/vcx/libvcx/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "libvcx" -version = "0.6.0" +version = "0.6.1" authors = ["Hyperledger Indy Contributors "] publish = false description = "This is the official SDK for Evernym's VCX" @@ -47,8 +47,8 @@ rmp-serde = "0.13.7" base64 = "0.8.0" openssl = "0.10" num-traits = "0.2.0" -indy = { version = "1.14.0", path = "../../wrappers/rust/" } -indy-sys = { version = "1.14.0", path = "../../wrappers/rust/indy-sys/" } +indy = { version = "1.14.1", path = "../../wrappers/rust/" } +indy-sys = { version = "1.14.1", path = "../../wrappers/rust/indy-sys/" } log-panics = "2.0.0" tokio-threadpool = "0.1.6" futures = "0.1.23" @@ -75,7 +75,7 @@ dirs = "1.0.4" [package.metadata.deb] maintainer = "Evernym, Inc." copyright = "2018, Evernym Inc." -depends = "$auto, libindy (=1.14.0)" +depends = "$auto, libindy (=1.14.1)" extended-description = """\ This is Evernym's SDK for managing Verifiable Credential eXchange against an Indy network. For specific instructions on building see the README in the corresponding github repo https://github.com/evernym/sdk""" section = "admin" diff --git a/vcx/libvcx/debian/changelog b/vcx/libvcx/debian/changelog index 68a96f024e..ffc1b0ac42 100644 --- a/vcx/libvcx/debian/changelog +++ b/vcx/libvcx/debian/changelog @@ -1,7 +1,10 @@ -libvcx (0.6.0) unstable; urgency=medium +libvcx (0.6.1) unstable; urgency=medium [ Hyperledger ] +## 0.6.1 +* Bugfixes + ## 0.6.0 * LibVCX Aries support: * Implemented Trust Ping RFC (IS-1435). diff --git a/vcx/wrappers/java/build.gradle b/vcx/wrappers/java/build.gradle index 3fab3a23ba..0a5114b6df 100755 --- a/vcx/wrappers/java/build.gradle +++ b/vcx/wrappers/java/build.gradle @@ -25,7 +25,7 @@ test { } static def versionMajor() { - return '0.6.0' + return '0.6.1' } static def version() { diff --git a/vcx/wrappers/node/package.json b/vcx/wrappers/node/package.json index d3ae1aa0f6..c475ebfc70 100644 --- a/vcx/wrappers/node/package.json +++ b/vcx/wrappers/node/package.json @@ -25,7 +25,7 @@ "url": "git+https://github.com/evernym/vcx.git", "type": "git" }, - "version": "0.6.0", + "version": "0.6.1", "dependencies": { "@types/ffi": "0.0.19", "@types/node": "^8.0.47", diff --git a/vcx/wrappers/python3/setup.py b/vcx/wrappers/python3/setup.py index af4f803c5e..4d39f868f8 100755 --- a/vcx/wrappers/python3/setup.py +++ b/vcx/wrappers/python3/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages import os -PKG_VERSION = os.environ.get('PACKAGE_VERSION') or '0.6.0' +PKG_VERSION = os.environ.get('PACKAGE_VERSION') or '0.6.1' PKG_NAME = os.environ.get('PACKAGE_NAME') or 'python3-wrapper-vcx' setup( diff --git a/wrappers/java/pom.xml b/wrappers/java/pom.xml index 1c1e862dbb..7a6f7f1006 100644 --- a/wrappers/java/pom.xml +++ b/wrappers/java/pom.xml @@ -5,7 +5,7 @@ org.hyperledger indy jar - 1.14.0 + 1.14.1 indy This is the official SDK for Hyperledger Indy (https://www.hyperledger.org/projects), which provides a distributed-ledger-based foundation for self-sovereign identity (https://sovrin.org). diff --git a/wrappers/nodejs/package.json b/wrappers/nodejs/package.json index 3f089a8b39..16d07d9a33 100644 --- a/wrappers/nodejs/package.json +++ b/wrappers/nodejs/package.json @@ -1,6 +1,6 @@ { "name": "indy-sdk", - "version": "1.14.0", + "version": "1.14.1", "description": "Native bindings for hyperledger indy", "author": "hyperledger", "license": "Apache-2.0", diff --git a/wrappers/python/setup.py b/wrappers/python/setup.py index 4732002a65..0cc3e0933c 100644 --- a/wrappers/python/setup.py +++ b/wrappers/python/setup.py @@ -1,7 +1,7 @@ from distutils.core import setup import os -PKG_VERSION = os.environ.get('PACKAGE_VERSION') or '1.14.0' +PKG_VERSION = os.environ.get('PACKAGE_VERSION') or '1.14.1' TEST_DEPS = [ 'pytest<3.7', 'pytest-asyncio', 'base58' diff --git a/wrappers/rust/Cargo.toml b/wrappers/rust/Cargo.toml index a5ddfc9040..89d7a34606 100644 --- a/wrappers/rust/Cargo.toml +++ b/wrappers/rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "indy" -version = "1.14.0" +version = "1.14.1" description = "A library for assisting developers using LibIndy API" authors = ["Hyperledger Indy Contributors "] homepage = "https://github.com/hyperledger/indy-sdk" @@ -24,7 +24,7 @@ lazy_static = "1.3" log = { version = "0.4.1", features = ["std"] } num-traits = "0.2" num-derive = "0.2" -indy-sys = { path ="indy-sys", version = "=1.14.0" } +indy-sys = { path ="indy-sys", version = "=1.14.1" } libc = "=0.2.60" serde_json = "1.0.40" serde_derive = "1.0.97" diff --git a/wrappers/rust/indy-sys/Cargo.toml b/wrappers/rust/indy-sys/Cargo.toml index fc9267e9a2..1c21dc2566 100644 --- a/wrappers/rust/indy-sys/Cargo.toml +++ b/wrappers/rust/indy-sys/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "indy-sys" description = "FFI bindings to Libindy C API" -version = "1.14.0" +version = "1.14.1" authors = ["Hyperledger Indy Contributors "] build = "build.rs" links = "indy"