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 #1690 from Artemkaaas/feature/indy-1.10.0
Browse files Browse the repository at this point in the history
IS-1290: Indy 1.10.0
  • Loading branch information
jovfer authored Jul 1, 2019
2 parents 7602857 + 8c8fd80 commit 2b39980
Show file tree
Hide file tree
Showing 202 changed files with 11,528 additions and 5,402 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# Changelog

## 1.10.0 - 2019-07-1
* Added new *EXPERIMENTAL* functions to Libindy Anoncreds API to configure what tags to build on credential storage in prover wallet:
* `indy_prover_set_credential_attr_tag_policy` to set credential attribute tagging policy.
* `indy_prover_get_credential_attr_tag_policy` to get credential attribute tagging policy by credential definition id.
* Added `indy_build_auth_rules_request` function to Libindy Ledger API to change multiple ledger auth rules.
Added correspondent `ledger auth-rules` command to Indy CLI.
* Bugfixes:
* Allowed offline signing of transactions in Indy-CLI.
* others minor bugfixes

## 1.9.0 - 2019-05-31
* Added a set of functions to support work with `Transaction Author Agreement` concept.
This guarantees that every write transaction author agree that the information they submit
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile.cd
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ def linuxPythonTesting(env_name, network_name, testEnv, stashBuildResults) {
echo "${env_name} Libindy Test: Test python wrapper"

sh '''
python3.5 -m pip install --user -e .
python3.5 -m pip install --user -e .[test]
LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} RUST_LOG=indy::=debug TEST_POOL_IP=10.0.0.2 python3.5 -m pytest
'''
}
Expand Down
17 changes: 16 additions & 1 deletion Jenkinsfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ def windowsTesting() {
bat "cargo build --features fatal_warnings"
bat "cargo test --no-run"

echo "Windows Libindy before Test: Deleting %TEMP\\indy_client"
bat "DEL /S /Q /F %TEMP%\\indy_client"
bat "DEL /S /Q /F %UserProfile%\\.indy_client"

echo "Windows Libindy Test: Run tests"
withEnv([
"RUST_TEST_THREADS=1",
Expand All @@ -90,6 +94,11 @@ def windowsTesting() {
]) {
bat "cargo test"
}

echo "Windows Libindy after Test: Deleting %TEMP\\indy_client"
bat "DEL /S /Q /F %TEMP%\\indy_client"
bat "DEL /S /Q /F %UserProfile%\\.indy_client"

}
}

Expand Down Expand Up @@ -164,6 +173,12 @@ def windowsTesting() {
//TODO wrappers testing

} finally {
try {
echo "Windows Libindy after Test: Deleting %TEMP\\indy_client"
bat "DEL /S /Q /F %TEMP%\\indy_client"
bat "DEL /S /Q /F %UserProfile%\\.indy_client"
} catch (ignore) {
}
try {
bat "docker -H $INDY_SDK_SERVER_IP stop indy_pool"
} catch (ignore) {
Expand Down Expand Up @@ -604,7 +619,7 @@ def linuxPythonTesting(env_name, network_name, testEnv) {
echo "${env_name} Libindy Test: Test python wrapper"

sh '''
python3.5 -m pip install --user -e .
python3.5 -m pip install --user -e .[test]
LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} TEST_POOL_IP=10.0.0.2 python3.5 -m pytest
'''
}
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -310,13 +310,15 @@ details.
* An explanation of how to install the official command line interface for that provides commands to manage wallets and interactions with the ledger: [Indy CLI](cli/README.md)

## How to migrate
The documents that provide necessary information for Libindy migration. This document is written for developers using Libindy 1.3.0 to provide necessary information and
to simplify their transition to API of Libindy 1.4.0.
The documents that provide necessary information for Libindy migrations.
* [v1.3.0 → v1.4.0](docs/migration-guides/migration-guide-1.3.0-1.4.0.md)
* [v1.4.0 → v1.5.0](docs/migration-guides/migration-guide-1.4.0-1.5.0.md)
* [v1.5.0 → v1.6.x](docs/migration-guides/migration-guide-1.5.0-1.6.0.md)
* [v1.6.0 → v1.7.x](docs/migration-guides/migration-guide-1.6.0-1.7.0.md)
* [v1.7.0 → v1.8.x](docs/migration-guides/migration-guide-1.7.0-1.8.0.md)
* [v1.8.0 → v1.9.x](docs/migration-guides/migration-guide-1.8.0-1.9.0.md)
* [v1.9.0 → v1.10.x](docs/migration-guides/migration-guide-1.9.0-1.10.0.md)

## How to Contribute
* We'd love your help; see these [instructions on how to contribute](http://bit.ly/2ugd0bq).
Expand Down
23 changes: 23 additions & 0 deletions Specs/libindy-objc/1.10.0/libindy-objc.podspec.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"name": "libindy-objc",
"version": "1.10.0",
"summary": "Summary TODO.",
"homepage": "TODO",
"license": {
"type": "Apache License 2.0",
"file": "LICENSE"
},
"authors": {
"Daniel Hardman": "[email protected]"
},
"source": {
"http": "https://repo.sovrin.org/ios/libindy/stable/indy-objc/1.10.0/libindy-objc.zip"
},
"platforms": {
"ios": "10.0"
},
"ios": {
"vendored_frameworks": "libindy-objc/Indy.framework"
},
"module_name": "Indy"
}
23 changes: 23 additions & 0 deletions Specs/libindy/1.10.0/libindy.podspec.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"name": "libindy",
"version": "1.10.0",
"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.10.0/libindy.tar.gz"
},
"source_files": "*.h",
"vendored_libraries": "*.a",
"requires_arc": false
}
2 changes: 1 addition & 1 deletion Specs/libindy/1.9.0/libindy.podspec.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"ios": "10.0"
},
"source": {
"http": "https://repo.sovrin.org/ios/libindy/master/libindy-core/1.9.0/libindy.tar.gz"
"http": "https://repo.sovrin.org/ios/libindy/stable/libindy-core/1.9.0/libindy.tar.gz"
},
"source_files": "*.h",
"vendored_libraries": "*.a",
Expand Down
4 changes: 2 additions & 2 deletions ci/indy-pool.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ RUN echo "deb https://repo.sovrin.org/deb xenial $indy_stream" >> /etc/apt/sourc

RUN useradd -ms /bin/bash -u $uid indy

ARG indy_plenum_ver=1.8.0~dev802
ARG indy_node_ver=1.8.0~dev982
ARG indy_plenum_ver=1.9.0~dev826
ARG indy_node_ver=1.9.0~dev1009
ARG python3_indy_crypto_ver=0.4.5
ARG indy_crypto_ver=0.4.5

Expand Down
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.9.0"
version = "1.10.0"
authors = ["Vyacheslav Gudkov <[email protected]>"]

[features]
Expand Down Expand Up @@ -28,4 +28,4 @@ serde_json = "1.0"
serde_derive = "1.0"
term = "0.4.6"
rpassword = "1.0.0"
indy = { version = "1.9.0", path = "../wrappers/rust/" }
indy = { version = "1.10.0", path = "../wrappers/rust/" }
7 changes: 6 additions & 1 deletion cli/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
indy-cli (1.9.0) unstable; urgency=medium
indy-cli (1.10.0) unstable; urgency=medium

[ Hyperledger ]

## 1.10.0
* Added `ledger auth-rules` command to change multiple auth rules.
* Allowed offline signing of transactions.
* Handle `exit` command within a batch mode.

## 1.9.0
* Updated Indy-CLI to use session based approach to support work with `Transaction Author Agreement` concept.
* user will be asked if he would like to accept TAA on `pool open` command.
Expand Down
20 changes: 19 additions & 1 deletion cli/src/command_executor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ pub struct CommandContext {
string_values: RefCell<HashMap<&'static str, String>>,
plugins: RefCell<HashMap<String, libloading::Library>>,
taa_acceptance_mechanism: RefCell<String>,
is_batch_mode: RefCell<bool>,
}

impl CommandContext {
Expand All @@ -167,6 +168,7 @@ impl CommandContext {
string_values: RefCell::new(HashMap::new()),
plugins: RefCell::new(HashMap::new()),
taa_acceptance_mechanism: RefCell::new(String::new()),
is_batch_mode: RefCell::new(false),
}
}

Expand Down Expand Up @@ -251,6 +253,18 @@ impl CommandContext {
pub fn get_taa_acceptance_mechanism(&self) -> String {
self.taa_acceptance_mechanism.borrow().to_string()
}

pub fn set_batch_mode(&self) {
*self.is_batch_mode.borrow_mut() = true;
}

pub fn set_not_batch_mode(&self) {
*self.is_batch_mode.borrow_mut() = false;
}

pub fn is_batch_mode(&self) -> bool {
*self.is_batch_mode.borrow()
}
}

pub type CommandParams = HashMap<&'static str, String>;
Expand Down Expand Up @@ -871,7 +885,11 @@ impl CommandExecutorGroupBuilder {
}

// TODO: think about better place
pub fn wait_for_user_reply() -> bool {
pub fn wait_for_user_reply(ctx: &CommandContext) -> bool {
if ctx.is_batch_mode() {
return true;
}

let mut reader = Reader::new("User Reply Reader").unwrap();

while let Ok(ReadResult::Input(line)) = reader.read_line() {
Expand Down
Loading

0 comments on commit 2b39980

Please sign in to comment.