Skip to content
This repository has been archived by the owner on Feb 29, 2024. It is now read-only.

Commit

Permalink
Merge pull request #2019 from Artemkaaas/indy-1.14.1
Browse files Browse the repository at this point in the history
Indy 1.14.1
  • Loading branch information
jovfer authored Dec 30, 2019
2 parents bb8c666 + a965ec7 commit e02532a
Show file tree
Hide file tree
Showing 24 changed files with 84 additions and 47 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
23 changes: 23 additions & 0 deletions Specs/libindy/1.14.1/libindy.podspec.json
Original file line number Diff line number Diff line change
@@ -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": "[email protected]"
},
"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
}
10 changes: 5 additions & 5 deletions cli/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "indy-cli"
version = "1.14.0"
version = "1.14.1"
authors = ["Hyperledger Indy Contributors <[email protected]>"]
edition = "2018"

Expand Down Expand Up @@ -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/" }
5 changes: 4 additions & 1 deletion cli/debian/changelog
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions cli/src/commands/ledger.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<Option<(String, String, String)>, ()> {
pub fn get_active_transaction_author_agreement(_pool_handle: i32) -> Result<Option<(String, String, Option<String>)>, ()> {
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))?;
Expand All @@ -2293,7 +2293,7 @@ pub fn get_active_transaction_author_agreement(_pool_handle: i32) -> Result<Opti

match (text, version, digest) {
(Some(text), _, _) if text.is_empty() => 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)
}
}
Expand Down
4 changes: 3 additions & 1 deletion cli/src/commands/pool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
12 changes: 6 additions & 6 deletions libindy/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion libindy/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "libindy"
version = "1.14.0"
version = "1.14.1"
authors = ["Hyperledger Indy Contributors <[email protected]>"]
edition = "2018"

Expand Down
5 changes: 4 additions & 1 deletion libindy/debian/changelog
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
10 changes: 5 additions & 5 deletions libnullpay/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions libnullpay/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "null-payment-method"
version = "1.14.0"
version = "1.14.1"
authors = ["Hyperledger Indy Contributors <[email protected]>"]
build = "build.rs"

Expand All @@ -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"
2 changes: 1 addition & 1 deletion libnullpay/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
libnullpay (1.14.0) unstable; urgency=medium
libnullpay (1.14.1) unstable; urgency=medium

[ Hyperledger ]
* Initial release
12 changes: 6 additions & 6 deletions vcx/libvcx/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions vcx/libvcx/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]

name = "libvcx"
version = "0.6.0"
version = "0.6.1"
authors = ["Hyperledger Indy Contributors <[email protected]>"]
publish = false
description = "This is the official SDK for Evernym's VCX"
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down
5 changes: 4 additions & 1 deletion vcx/libvcx/debian/changelog
Original file line number Diff line number Diff line change
@@ -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).
Expand Down
2 changes: 1 addition & 1 deletion vcx/wrappers/java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ test {
}

static def versionMajor() {
return '0.6.0'
return '0.6.1'
}

static def version() {
Expand Down
2 changes: 1 addition & 1 deletion vcx/wrappers/node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion vcx/wrappers/python3/setup.py
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
2 changes: 1 addition & 1 deletion wrappers/java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>org.hyperledger</groupId>
<artifactId>indy</artifactId>
<packaging>jar</packaging>
<version>1.14.0</version>
<version>1.14.1</version>
<name>indy</name>
<description>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).
Expand Down
2 changes: 1 addition & 1 deletion wrappers/nodejs/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion wrappers/python/setup.py
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
Loading

0 comments on commit e02532a

Please sign in to comment.