Merge branch 'master' into py-tutorial3

Author: jovfer

ci/indy-pool.dockerfile

@@ -19,14 +19,14 @@ RUN pip3 install -U \
 	setuptools
 
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88
-ARG indy_stream=master
+ARG indy_stream=stable
 RUN echo "deb https://repo.sovrin.org/deb xenial $indy_stream" >> /etc/apt/sources.list
 
 RUN useradd -ms /bin/bash -u $uid indy
 
-ARG indy_plenum_ver=1.4.419
-ARG indy_anoncreds_ver=1.0.32
-ARG indy_node_ver=1.4.480
+ARG indy_plenum_ver=1.4.45
+ARG indy_anoncreds_ver=1.0.11
+ARG indy_node_ver=1.4.66
 ARG python3_indy_crypto_ver=0.4.1
 ARG indy_crypto_ver=0.4.0
 

cli/src/commands/ledger.rs

@@ -357,6 +357,10 @@ pub mod get_validator_info_command {
         };
 
         for (node, response) in responses {
+            if response.eq("timeout") {
+                println_err!("Restart pool node {} timeout.", node);
+                continue
+            }
             let response = serde_json::from_str::<Response<serde_json::Value>>(&response)
                 .map_err(|err| println_err!("Invalid data has been received: {:?}", err))?;
             println_succ!("Get validator info response for node {}:", node);
@@ -687,6 +691,11 @@ pub mod pool_restart_command {
         };
 
         for (node, response) in responses {
+            if response.eq("timeout") {
+                println_err!("Restart pool node {} timeout.", node);
+                continue
+            }
+
             let response = serde_json::from_str::<Response<serde_json::Value>>(&response)
                 .map_err(|err| println_err!("Invalid data has been received: {:?}", err))?;
 

cli/src/commands/mod.rs

@@ -117,6 +117,13 @@ pub fn get_object_param<'a>(name: &'a str, params: &'a CommandParams) -> Result<
     }
 }
 
+pub fn get_opt_object_param<'a>(name: &'a str, params: &'a CommandParams) -> Result<Option<serde_json::Value>, ()> {
+    match params.get(name) {
+        Some(_) => Ok(Some(get_object_param(name, params)?)),
+        None => Ok(None)
+    }
+}
+
 fn extract_array_tuples<'a>(param: &'a str) -> Vec<String> {
     let re = Regex::new(r#"\(([^\(\)]+)\),?"#).unwrap();
     re.captures_iter(param).map(|c| c[1].to_string()).collect::<Vec<String>>()

cli/src/commands/wallet.rs

@@ -171,6 +171,9 @@ pub enum ErrorCode
 
     // Insufficient funds on inputs
     PaymentInsufficientFundsError = 702,
+
+    // No such source on a ledger
+    PaymentSourceDoesNotExistError = 703
 }
 
 impl ErrorCode {
@@ -229,6 +232,7 @@ impl ErrorCode {
             PaymentUnknownMethodError => "Unknown payment method was given",
             PaymentIncompatibleMethodsError => "Multiple different payment methods were specified",
             PaymentInsufficientFundsError => "Insufficient funds on inputs",
+            PaymentSourceDoesNotExistError => "No such source found",
         }
     }
 }

cli/src/libindy/mod.rs

@@ -2,59 +2,42 @@ use super::ErrorCode;
 
 use libc::c_char;
 use std::ffi::CString;
-use std::ptr::null;
 
 pub struct Wallet {}
 
 impl Wallet {
-    pub fn create_wallet(pool_name: &str, wallet_name: &str, xtype: Option<&str>, config: Option<&str>, credentials: &str) -> Result<(), ErrorCode> {
+    pub fn create_wallet(config: &str, credentials: &str) -> Result<(), ErrorCode> {
         let (receiver, command_handle, cb) = super::callbacks::_closure_to_cb_ec();
 
-        let pool_name = CString::new(pool_name).unwrap();
-        let wallet_name = CString::new(wallet_name).unwrap();
-        let xtype_str = xtype.map(|s| CString::new(s).unwrap()).unwrap_or(CString::new("").unwrap());
-        let config_str = config.map(|s| CString::new(s).unwrap()).unwrap_or(CString::new("").unwrap());
+        let config = CString::new(config).unwrap();
         let credentials = CString::new(credentials).unwrap();
 
         let err = unsafe {
             indy_create_wallet(command_handle,
-                               pool_name.as_ptr(),
-                               wallet_name.as_ptr(),
-                               if xtype.is_some() { xtype_str.as_ptr() } else { null() },
-                               if config.is_some() { config_str.as_ptr() } else { null() },
+                               config.as_ptr(),
                                credentials.as_ptr(),
                                cb)
         };
 
         super::results::result_to_empty(err, receiver)
     }
 
-    pub fn open_wallet(wallet_name: &str, config: Option<&str>, credentials: &str) -> Result<i32, ErrorCode> {
+    pub fn open_wallet(config: &str, credentials: &str) -> Result<i32, ErrorCode> {
         let (receiver, command_handle, cb) = super::callbacks::_closure_to_cb_ec_i32();
 
-        let wallet_name = CString::new(wallet_name).unwrap();
-        let config_str = config.map(|s| CString::new(s).unwrap()).unwrap_or(CString::new("").unwrap());
+        let config = CString::new(config).unwrap();
         let credentials = CString::new(credentials).unwrap();
 
         let err = unsafe {
             indy_open_wallet(command_handle,
-                             wallet_name.as_ptr(),
-                             if config.is_some() { config_str.as_ptr() } else { null() },
+                             config.as_ptr(),
                              credentials.as_ptr(),
                              cb)
         };
 
         super::results::result_to_int(err, receiver)
     }
 
-    pub fn list_wallets() -> Result<String, ErrorCode> {
-        let (receiver, command_handle, cb) = super::callbacks::_closure_to_cb_ec_string();
-
-        let err = unsafe { indy_list_wallets(command_handle, cb) };
-
-        super::results::result_to_string(err, receiver)
-    }
-
     pub fn delete_wallet(wallet_name: &str, credentials: &str) -> Result<(), ErrorCode> {
         let (receiver, command_handle, cb) = super::callbacks::_closure_to_cb_ec();
 
@@ -95,22 +78,16 @@ impl Wallet {
         super::results::result_to_empty(err, receiver)
     }
 
-    pub fn import_wallet(pool_name: &str, wallet_name: &str, xtype: Option<&str>, config: Option<&str>, credentials: &str, import_config_json: &str) -> Result<(), ErrorCode> {
+    pub fn import_wallet(config: &str, credentials: &str, import_config_json: &str) -> Result<(), ErrorCode> {
         let (receiver, command_handle, cb) = super::callbacks::_closure_to_cb_ec();
 
-        let pool_name = CString::new(pool_name).unwrap();
-        let wallet_name = CString::new(wallet_name).unwrap();
-        let xtype_str = xtype.map(|s| CString::new(s).unwrap()).unwrap_or(CString::new("").unwrap());
-        let config_str = config.map(|s| CString::new(s).unwrap()).unwrap_or(CString::new("").unwrap());
+        let config = CString::new(config).unwrap();
         let credentials = CString::new(credentials).unwrap();
         let import_config_json = CString::new(import_config_json).unwrap();
 
         let err = unsafe {
             indy_import_wallet(command_handle,
-                               pool_name.as_ptr(),
-                               wallet_name.as_ptr(),
-                               if xtype.is_some() { xtype_str.as_ptr() } else { null() },
-                               if config.is_some() { config_str.as_ptr() } else { null() },
+                               config.as_ptr(),
                                credentials.as_ptr(),
                                import_config_json.as_ptr(),
                                cb)
@@ -123,33 +100,24 @@ impl Wallet {
 extern {
     #[no_mangle]
     fn indy_create_wallet(command_handle: i32,
-                          pool_name: *const c_char,
-                          name: *const c_char,
-                          xtype: *const c_char,
                           config: *const c_char,
                           credentials: *const c_char,
                           cb: Option<extern fn(xcommand_handle: i32, err: ErrorCode)>) -> ErrorCode;
 
     #[no_mangle]
     fn indy_open_wallet(command_handle: i32,
-                        name: *const c_char,
-                        runtime_config: *const c_char,
+                        config: *const c_char,
                         credentials: *const c_char,
                         cb: Option<extern fn(xcommand_handle: i32, err: ErrorCode, handle: i32)>) -> ErrorCode;
 
-    #[no_mangle]
-    fn indy_list_wallets(command_handle: i32,
-                         cb: Option<extern fn(xcommand_handle: i32, err: ErrorCode,
-                                              wallets: *const c_char)>) -> ErrorCode;
-
     #[no_mangle]
     fn indy_close_wallet(command_handle: i32,
                          handle: i32,
                          cb: Option<extern fn(xcommand_handle: i32, err: ErrorCode)>) -> ErrorCode;
 
     #[no_mangle]
     fn indy_delete_wallet(command_handle: i32,
-                          name: *const c_char,
+                          config: *const c_char,
                           credentials: *const c_char,
                           cb: Option<extern fn(xcommand_handle: i32, err: ErrorCode)>) -> ErrorCode;
 
@@ -162,9 +130,6 @@ extern {
 
     #[no_mangle]
     fn indy_import_wallet(command_handle: i32,
-                          pool_name: *const c_char,
-                          name: *const c_char,
-                          storage_type: *const c_char,
                           config: *const c_char,
                           credentials: *const c_char,
                           import_config_json: *const c_char,

cli/src/libindy/wallet.rs

@@ -127,7 +127,7 @@ indy> wallet <command>
 #### Wallet create
 Create new wallet with specified name and pool:
 ```
-indy> wallet create <wallet name> pool_name=<pool name> key=<key>
+indy> wallet create <wallet name> key=<key> [storage_type=<storage_type>] [storage_config={config json}]
 ```
 TODO: Think about custom wallet types support. Now we force default wallet security model.. 
 
@@ -166,7 +166,7 @@ indy> wallet export export_path=<path-to-file> export_key=[<export key>]
 Create new wallet and then import content from the specified file.
 
 ```indy-cli
-indy> wallet import <wallet name> pool_name=<pool name> key=<key> export_path=<path-to-file> export_key=<key used for export>
+indy> wallet import <wallet name> key=<key> export_path=<path-to-file> export_key=<key used for export>  [storage_type=<storage_type>] [storage_config=<key1:value1,key2:value2>]
 
 
 ### Pool management commands

doc/design/001-cli/README.md

@@ -20,13 +20,13 @@ RUN pip3 install -U \
 	pip \
 	setuptools \
 	jupyter \
-	python3-indy==1.4.0-dev-586
+	python3-indy==1.5.0
 
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88 \
-    && add-apt-repository "deb https://repo.sovrin.org/sdk/deb xenial master" \
+    && add-apt-repository "deb https://repo.sovrin.org/sdk/deb xenial stable" \
     && apt-get update \
     && apt-get install -y \
-    libindy
+    libindy=1.5.0
 
 USER indy
 

doc/getting-started/getting-started.dockerfile

@@ -20,11 +20,12 @@ path = "src/lib.rs"
 crate-type = ["staticlib","rlib", "cdylib"]
 
 [features]
-default = ["bn_openssl", "box_sodium", "sealedbox_sodium", "base58_rust_base58", "xsalsa20_sodium", "chacha20poly1305_ietf_sodium", "pair_amcl", "hash_openssl", "local_nodes_pool", "revocation_tests", "pwhash_argon2i13_sodium", "hmacsha256_sodium"]
+default = ["bn_openssl", "box_sodium", "sealedbox_sodium", "base58_rust_base58", "base64_rust_base64", "xsalsa20_sodium", "chacha20poly1305_ietf_sodium", "pair_amcl", "hash_openssl", "local_nodes_pool", "revocation_tests", "pwhash_argon2i13_sodium", "hmacsha256_sodium", "memzero_sodium"]
 bn_openssl = ["openssl", "int_traits"]
 box_sodium = ["sodiumoxide"]
 sealedbox_sodium = ["sodiumoxide"]
 base58_rust_base58 = ["rust-base58"]
+base64_rust_base64 = ["base64"]
 xsalsa20_sodium = ["sodiumoxide"]
 chacha20poly1305_ietf_sodium = ["sodiumoxide"]
 pwhash_argon2i13_sodium = ["sodiumoxide"]
@@ -34,12 +35,13 @@ local_nodes_pool = []
 revocation_tests = []
 sodium_static = []
 hmacsha256_sodium = ["sodiumoxide"]
+memzero_sodium = ["sodiumoxide"]
 
 # Causes the build to fail on all warnings
 fatal_warnings = []
 
 [dependencies]
-indy-crypto = { version = "=0.4.1", optional = true }
+indy-crypto = { version = "=0.4.1-dev-50", optional = true }
 int_traits = { version = "0.1.1", optional = true }
 digest = "0.6.2"
 env_logger = "0.5.10"
@@ -55,7 +57,7 @@ rand = "0.3"
 rusqlite = "0.13.0" # Make sure rusqlite for android is also bumped with this. Rusqlite for android is at the bottom of this document.
 libsqlite3-sys = "0.9.1"
 rust-base58 = {version = "0.0.4", optional = true}
-base64 = "0.6.0"
+base64 = {version = "0.6.0", optional = true}
 serde = "1.0"
 serde_json = "1.0"
 serde_derive = "1.0"