Merge branch 'master' into test/node-wrapper-nonsecrets

Jenkinsfile.cd

@@ -1766,7 +1766,7 @@ def shell(command) {
 }
 
 def setupRust() {
-    shell("rustup default 1.39.0")
+    shell("rustup default 1.46.0")
 }
 
 def androidPublishing() {

Jenkinsfile.ci

@@ -866,7 +866,7 @@ def shell(command) {
 }
 
 def setupRust() {
-    shell("rustup default 1.39.0")
+    shell("rustup default 1.46.0")
 }
 
 def setupBrewPackages() {

README.md

@@ -60,7 +60,6 @@ Indy SDK provides libindy wrappers for the following programming languages and p
 [Libnullpay](/libnullpay/README.md) is a libindy plugin that can be used for development of applications that use the Payments API of Indy SDK.
 
 ### Libvcx
-
 [Libvcx](/vcx/README.md) is a c-callable library built on top of libindy that provides a high-level
 credential exchange protocol. It simplifies creation of agent applications and provides
 better agent-2-agent interoperability for [Hyperledger Indy](https://www.hyperledger.org/projects/hyperledger-indy)
@@ -82,16 +81,19 @@ Indy SDK provides libvcx wrappers for the following programming languages and pl
 These wrappers are currently in **experimental** state and it is not part of official releases.
 
 ##### Example use
-For the main workflow example check [VCX Python demo](https://github.com/hyperledger/indy-sdk/tree/master/vcx/wrappers/python3/demo).
-
-### Dummy Cloud Agent
-[Dummy Cloud Agent](/vcx/dummy-cloud-agent/README.md) is simple implementation of VCX compatible Cloud Agent.
+- For the main workflow example check [VCX Python demo](https://github.com/hyperledger/indy-sdk/tree/master/vcx/wrappers/python3/demo).
+- Another libvcx example is available as [VCX NodeJS demo](https://github.com/hyperledger/indy-sdk/tree/master/vcx/wrappers/node#run-demo).
+- For mobile see [iOS Demo project](https://github.com/sktston/vcx-demo-ios) 
+
+### LibVCX Agency
+LibVCX can be used with 
+[mediator agency](https://github.com/hyperledger/aries-rfcs/blob/master/concepts/0046-mediators-and-relays/README.md)
+which enables asynchronous communication between 2 parties. 
+- [Dummy Cloud Agent](/vcx/dummy-cloud-agent/README.md) is simple implementation of VCX compatible Cloud Agent.
 The main purpose of this implementation is VCX testing, demos and documentation of VCX protocol.
-There is an parallel work on providing reference implementation of Agent2Agent protocol in indy-agent repo.
-We plan to migrate to this protocol and implementation soon.
+- [NodeVCXAgency](https://github.com/AbsaOSS/vcxagencynode) is alternative implementation in NodeJS.
 
 ## How-To Tutorials
-
 Short, simple tutorials that demonstrate how to accomplish common tasks
 are also available. See the [docs/how-tos](docs/how-tos) folder.
 

cli/src/command_executor.rs

@@ -7,7 +7,6 @@ use unescape::unescape;
 use std::cell::RefCell;
 use std::collections::BTreeMap;
 use std::collections::HashMap;
-use std::error::Error;
 
 use linefeed::{Reader, ReadResult};
 
@@ -868,7 +867,7 @@ impl CommandExecutor {
                         }
                     }
                     Err(err) => {
-                        println_err!("{}", err.description().to_string());
+                        println_err!("{}", err.to_string());
                         println!("Please enter value for {}:", param);
                     }
                 }

cli/src/utils/logger.rs

@@ -2,15 +2,14 @@ extern crate log4rs;
 extern crate log;
 extern crate libc;
 
-use std::error::Error;
 use indy;
 
 pub struct  IndyCliLogger;
 
 impl IndyCliLogger {
     pub fn init(path: &str) -> Result<(), String> {
         log4rs::init_file(path, Default::default())
-            .map_err(|err| format!("Cannot init Indy CLI logger: {}", err.description()))?;
+            .map_err(|err| format!("Cannot init Indy CLI logger: {}", err.to_string()))?;
 
         indy::logger::set_logger(log::logger())
             .map_err(|_| "Cannot init Libindy logger".to_string())

docs/build-guides/mac-build.md

@@ -5,10 +5,10 @@ Automated build: clone the repo and run `mac.build.sh` in the `libindy` folder.
 ## Manual steps
 
 1. Install Rust and rustup (https://www.rust-lang.org/install.html).
-2. Install required native libraries and utilities (libsodium is added with URL to homebrew since version<1.0.15 is required)
+2. Install required native libraries and utilities
    ```
    brew install pkg-config
-   brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/65effd2b617bade68a8a2c5b39e1c3089cc0e945/Formula/libsodium.rb   
+   brew install libsodium   
    brew install automake 
    brew install autoconf
    brew install cmake

docs/configuration.md

@@ -266,11 +266,15 @@ Almost all of them are optional and depend on the way you use Vcx (with agency o
 
 * `threadpool_size` - size of thread pool used for command execution (8 by default). 
 
-* `protocol_version` - message protocol to use for agent to agency and agent to agent communication. 
+* `protocol_type` - message protocol to use for agent to agency and agent to agent communication. 
 Can be one of:
     * "1.0" - use bundled messages, auth/anon cryptography.
     * "2.0" - use aries cross domain message format, pack/unpack functions. 
-    * "3.0" - use aries cross domain message format, pack/unpack functions and aries communication protocols (is alternative to the combination of settings "protocol_version":"2.0" and "communication_method":"aries"). 
+    * "3.0" - use aries cross domain message format, pack/unpack functions and aries communication protocols 
+    (is alternative to the combination of settings "protocol_version":"2.0" and "communication_method":"aries"). 
+    Functions return messages in the `proprietary` format.
+    * "4.0" - use aries cross domain message format, pack/unpack functions and aries communication protocols. 
+    Functions return messages in the `aries` format.
     
 * `author_agreement` - accept and use transaction author agreement data containing the following fields:
     * `acceptanceMechanismType` - (string) mechanism how user has accepted the TAA 

experimental/plugins/postgres_storage/src/postgres_storage.rs

@@ -146,7 +146,7 @@ const _CREATE_SCHEMA: [&str; 12] = [
             ON UPDATE CASCADE
     )",
     "CREATE INDEX IF NOT EXISTS ix_tags_encrypted_name ON tags_encrypted(name)",
-    "CREATE INDEX IF NOT EXISTS ix_tags_encrypted_value ON tags_encrypted(value)",
+    "CREATE INDEX IF NOT EXISTS ix_tags_encrypted_value ON tags_encrypted(sha256(value))",
     "CREATE INDEX IF NOT EXISTS ix_tags_encrypted_item_id ON tags_encrypted(item_id)",
     "CREATE TABLE IF NOT EXISTS tags_plaintext(
         name BYTEA NOT NULL,

libindy/Cargo.toml

@@ -27,9 +27,9 @@ only_high_cases = []
 fatal_warnings = []
 
 [dependencies]
-env_logger = "0.6.2"
+env_logger = "0.7"
 etcommon-rlp = "0.2.4"
-failure = "0.1.6"
+failure = "0.1.7"
 hex = "0.3.2"
 libc = "0.2.66"
 log = "0.4.8"
@@ -55,7 +55,7 @@ regex = "1.2.1"
 indy-api-types = { path = "./indy-api-types"}
 indy-utils = { path = "./indy-utils"}
 indy-wallet = { path = "./indy-wallet"}
-quote = "=1.0.2"
+quote = "=1.0.7"
 
 [dependencies.uuid]
 version = "0.7.4"

libindy/ci/centos.dockerfile

@@ -39,7 +39,7 @@ RUN wget https://repos.fedorapeople.org/repos/dchen/apache-maven/epel-apache-mav
 RUN sed -i s/\$releasever/6/g /etc/yum.repos.d/epel-apache-maven.repo
 RUN yum install -y apache-maven
 
-ENV RUST_ARCHIVE=rust-1.39.0-x86_64-unknown-linux-gnu.tar.gz
+ENV RUST_ARCHIVE=rust-1.46.0-x86_64-unknown-linux-gnu.tar.gz
 ENV RUST_DOWNLOAD_URL=https://static.rust-lang.org/dist/$RUST_ARCHIVE
 
 RUN mkdir -p /rust

libindy/ci/ubuntu.dockerfile

@@ -62,7 +62,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN useradd -ms /bin/bash -u $uid indy
 USER indy
 
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.39.0
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.46.0
 ENV PATH /home/indy/.cargo/bin:$PATH
 
 RUN cargo install cargo-deb

libindy/ci/ubuntu18.dockerfile

@@ -43,7 +43,7 @@ RUN apt-get install -y wget
 RUN useradd -ms /bin/bash -u $uid indy
 USER indy
 
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.39.0
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.46.0
 ENV PATH /home/indy/.cargo/bin:$PATH
 
 RUN cargo install cargo-deb

libindy/include/indy_non_secrets.h

@@ -155,7 +155,7 @@ extern "C" {
     ///  {
     ///    retrieveType: (optional, false by default) Retrieve record type,
     ///    retrieveValue: (optional, true by default) Retrieve record value,
-    ///    retrieveTags: (optional, true by default) Retrieve record tags
+    ///    retrieveTags: (optional, false by default) Retrieve record tags
     ///  }
     /// #Returns
     /// wallet record json:
@@ -199,7 +199,7 @@ extern "C" {
     ///    retrieveTotalCount: (optional, false by default) Calculate total count,
     ///    retrieveType: (optional, false by default) Retrieve record type,
     ///    retrieveValue: (optional, true by default) Retrieve record value,
-    ///    retrieveTags: (optional, true by default) Retrieve record tags,
+    ///    retrieveTags: (optional, false by default) Retrieve record tags,
     ///  }
     /// #Returns
     /// search_handle: Wallet search handle that can be used later
@@ -226,7 +226,7 @@ extern "C" {
     ///  {
     ///    retrieveType: (optional, false by default) Retrieve record type,
     ///    retrieveValue: (optional, true by default) Retrieve record value,
-    ///    retrieveTags: (optional, true by default) Retrieve record tags
+    ///    retrieveTags: (optional, false by default) Retrieve record tags
     ///  }
     /// #Returns
     /// wallet record json:

libindy/indy-api-types/src/lib.rs

@@ -417,7 +417,7 @@ pub mod wallet {
     ///  {
     ///    retrieveType: (optional, false by default) Retrieve record type,
     ///    retrieveValue: (optional, true by default) Retrieve record value,
-    ///    retrieveTags: (optional, true by default) Retrieve record tags
+    ///    retrieveTags: (optional, false by default) Retrieve record tags
     ///  }
     /// record_handle_p: pointer to store retrieved record handle
     pub type WalletGetRecord = extern fn(storage_handle: StorageHandle,
@@ -537,7 +537,7 @@ pub mod wallet {
     ///    retrieveTotalCount: (optional, false by default) Calculate total count,
     ///    retrieveType: (optional, false by default) Retrieve record type,
     ///    retrieveValue: (optional, true by default) Retrieve record value,
-    ///    retrieveTags: (optional, true by default) Retrieve record tags,
+    ///    retrieveTags: (optional, false by default) Retrieve record tags,
     ///  }
     /// search_handle_p: pointer to store wallet search handle
     pub type WalletSearchRecords = extern fn(storage_handle: StorageHandle,

libindy/indy-wallet/src/lib.rs

@@ -12,7 +12,7 @@ extern crate serde;
 extern crate serde_derive;
 
 use std::cell::RefCell;
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};
 use std::fs;
 use std::io::BufReader;
 use std::path::PathBuf;
@@ -47,6 +47,7 @@ mod wallet;
 pub struct WalletService {
     storage_types: RefCell<HashMap<String, Box<dyn WalletStorageType>>>,
     wallets: RefCell<HashMap<WalletHandle, Box<Wallet>>>,
+    wallet_ids: RefCell<HashSet<String>>,
     pending_for_open: RefCell<HashMap<WalletHandle, (String /* id */, Box<dyn WalletStorage>, Metadata, Option<KeyDerivationData>)>>,
     pending_for_import: RefCell<HashMap<WalletHandle, (BufReader<::std::fs::File>, chacha20poly1305_ietf::Nonce, usize, Vec<u8>, KeyDerivationData)>>,
 }
@@ -62,6 +63,7 @@ impl WalletService {
         WalletService {
             storage_types,
             wallets: RefCell::new(HashMap::new()),
+            wallet_ids: RefCell::new(HashSet::new()),
             pending_for_open: RefCell::new(HashMap::new()),
             pending_for_import: RefCell::new(HashMap::new()),
         }
@@ -152,7 +154,7 @@ impl WalletService {
     pub fn delete_wallet_prepare(&self, config: &Config, credentials: &Credentials) -> IndyResult<(Metadata, KeyDerivationData)> {
         trace!("delete_wallet >>> config: {:?}, credentials: {:?}", config, secret!(credentials));
 
-        if self.wallets.borrow_mut().values().any(|ref wallet| wallet.get_id() == WalletService::_get_wallet_id(config)) {
+        if self.wallet_ids.borrow_mut().contains(&WalletService::_get_wallet_id(config)) {
             return Err(err_msg(IndyErrorKind::InvalidState, format!("Wallet has to be closed before deleting: {:?}", WalletService::_get_wallet_id(config))));
         }
 
@@ -217,10 +219,12 @@ impl WalletService {
             storage.set_storage_metadata(&metadata)?;
         }
 
-        let wallet = Wallet::new(id, storage, Rc::new(keys));
+        let wallet = Wallet::new(id.clone(), storage, Rc::new(keys));
 
         let mut wallets = self.wallets.borrow_mut();
         wallets.insert(wallet_handle, Box::new(wallet));
+        let mut wallet_ids = self.wallet_ids.borrow_mut();
+        wallet_ids.insert(id.to_string());
 
         trace!("open_wallet <<< res: {:?}", wallet_handle);
         Ok(wallet_handle)
@@ -241,7 +245,10 @@ impl WalletService {
         trace!("close_wallet >>> handle: {:?}", handle);
 
         match self.wallets.borrow_mut().remove(&handle) {
-            Some(mut wallet) => wallet.close(),
+            Some(mut wallet) => {
+                self.wallet_ids.borrow_mut().remove(wallet.get_id());
+                wallet.close()
+            },
             None => Err(err_msg(IndyErrorKind::InvalidWalletHandle, "Unknown wallet handle"))
         }?;
 
@@ -536,7 +543,8 @@ impl WalletService {
     }
 
     fn _is_id_from_config_not_used(&self, config: &Config) -> IndyResult<()> {
-        if self.wallets.borrow_mut().values().any(|ref wallet| wallet.get_id() == WalletService::_get_wallet_id(config)) {
+        let id = WalletService::_get_wallet_id(config);
+        if self.wallet_ids.borrow_mut().contains(&id) {
             return Err(err_msg(IndyErrorKind::WalletAlreadyOpened, format!("Wallet {} already opened", WalletService::_get_wallet_id(config))));
         }
 

libindy/mac.build.sh

@@ -41,10 +41,7 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
     export CARGO_INCREMENTAL=1
     export RUST_LOG=indy=trace
     export RUST_TEST_THREADS=1
-    for version in `ls -t /usr/local/Cellar/openssl/`; do
-        export OPENSSL_DIR=/usr/local/Cellar/openssl/$version
-        break
-    done
+    export OPENSSL_DIR=/usr/local/opt/`ls /usr/local/opt/ | grep openssl | sort | tail -1`
     cargo build
     export LIBRARY_PATH=$(pwd)/target/debug
     cd ../cli

libindy/src/services/anoncreds/helpers.rs

@@ -113,7 +113,10 @@ pub fn parse_cred_rev_id(cred_rev_id: &str) -> IndyResult<u32> {
 pub fn get_non_revoc_interval(global_interval: &Option<NonRevocedInterval>, local_interval: &Option<NonRevocedInterval>) -> Option<NonRevocedInterval> {
     trace!("get_non_revoc_interval >>> global_interval: {:?}, local_interval: {:?}", global_interval, local_interval);
 
-    let interval = local_interval.clone().or_else(|| global_interval.clone().or(None));
+    let interval = local_interval
+        .clone()
+        .or_else(|| global_interval.clone().or(None))
+        .filter(|x| x.to.is_some() || x.from.is_some());
 
     trace!("get_non_revoc_interval <<< interval: {:?}", interval);
 
@@ -178,6 +181,12 @@ mod tests {
         assert_eq!(None, res);
     }
 
+    #[test]
+    fn get_non_revoc_interval_for_empty_interval() {
+        let res = get_non_revoc_interval(&Some(NonRevocedInterval { from: None, to: None }), &None);
+        assert_eq!(None, res);
+    }
+
     mod to_unqualified {
         use super::*;
 

vcx/ci/ubuntu.dockerfile

@@ -60,7 +60,7 @@ ARG uid=1000
 RUN useradd -ms /bin/bash -u $uid vcx
 USER vcx
 
-ARG RUST_VER="1.39.0"
+ARG RUST_VER="1.46.0"
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUST_VER
 ENV PATH /home/vcx/.cargo/bin:$PATH
 

vcx/dummy-cloud-agent/src/actors/agent.rs

@@ -402,6 +402,7 @@ impl Agent {
             A2AMessageV2::UpdateConfigs(msg) => self.handle_update_configs_v2(msg),
             A2AMessageV2::GetConfigs(msg) => self.handle_get_configs_v2(msg),
             A2AMessageV2::RemoveConfigs(msg) => self.handle_remove_configs_v2(msg),
+            A2AMessageV2::UpdateComMethod(msg) => self.handle_update_com_method_v2(msg),
             _ => err_act!(self, err_msg("Unsupported message"))
         }
             .and_then(move |msg, slf, _|
@@ -697,6 +698,18 @@ impl Agent {
         ok_act!(self,  messages)
     }
 
+    fn handle_update_com_method_v2(&mut self, msg: UpdateComMethod) -> ResponseActFuture<Self, A2AMessageV2, Error> {
+        trace!("UpdateComMethodV2 (msg={:?})", msg);
+        match msg.com_method.e_type {
+            ComMethodType::Webhook => {
+                self.configs.insert(String::from("notificationWebhookUrl"), String::from(msg.com_method.value));
+            }
+            _ => warn!("Agent was trying to handle unsupported communication type {:?}", msg.com_method.e_type)
+        };
+        let message = A2AMessageV2::ComMethodUpdated(ComMethodUpdated { id: msg.com_method.id });
+        ok_act!(self, message)
+    }
+
     fn handle_update_configs_v1(&mut self, msg: UpdateConfigs) -> ResponseActFuture<Self, Vec<A2AMessage>, Error> {
         self.handle_update_configs(msg)
             .map(|_, _, _| {