Merge branch 'master' into master

Author: jovfer

doc/contributor-resources.md

@@ -0,0 +1,43 @@
+# Contributing to Indy SDK
+
+
+Before contributing to Indy SDK, there are a couple steps that will help your process go much more smoothly.
+
+First, please take a look at our contributing guidelines: [how to contribute to Hyperledger Indy](http://bit.ly/2ugd0bq).
+
+If you are looking for how to sign current or previous commits, go here: [signing your commits](signing-commits.md)
+
+## Connect with the Community
+
+Hyperledger Indy has a vibrant and active community of developers willing to help you answer questions, learn more about self-sovereign identity, and get involved.
+
+You will find the best and most update resources on chat board here: [Hyperledger Rocket Chat](https://chat.hyperledger.org/home)
+
+\#indy-sdk, \#indy-node, and \#indy are the some of the best channels to get started. Please introduce yourself and let us know what you want to accomplish!
+
+## How to Start Working with the Code
+
+1. Fork the indy-sdk repository on Github to your personal account.
+
+1. Add the hyperledger/indy-sdk as the remote upstream:  
+   `git remote add upstream https://github.com/hyperledger/indy-sdk.git`
+
+1. Set up Developer Certificate of Origin and learn how to [sign your commits](signing-commits.md)  
+
+1. Take a look at our [release workflow](release-workflow.md)
+
+## How to send a PR
+
+- Do not create big PRs; send a PR for one feature or bug fix only.
+ If a feature is too big, consider splitting a big PR to a number of small ones.
+- Consider sending a design doc into `design` folder (as markdown or PlantUML diagram) for a new feature  before implementing it
+- Make sure that a new feature or fix is covered by tests (try following TDD)
+- Make sure that documentation is updated according to your changes
+- Provide a full description of changes in the PR including Jira ticket number if any  
+- Make sure that all your commits have a DCO sign-off from the author. (add the `-s` flag to all commits)
+- Put the link to the PR into `#indy-pr-review` channel in Rocket.Chat
+- A reviewer needs to start your tests first (add `test this please` comment to the PR)
+- You need to make sure that all the tests pass
+- A reviewer needs to review the code and approve the PR. If there are review comments, they will be put into the PR itself.
+- You must process them (feel free to reply in the PR threads, or have a discussion in Rocket.Chat if needed)
+- A reviewer or maintainer will merge the PR

doc/design/002-anoncreds/README.md

@@ -0,0 +1,18 @@
+## Wallet Query Language
+
+This language will be used to define queries in Non-secrets, Anoncreds search APIs.
+
+```Rust
+query = {subquery}
+subquery = {subquery, ..., subquery} - WHERE subquery AND ... AND subquery
+subquery = $or: [{subquery},..., {subquery}] - WHERE subquery OR ... OR subquery
+subquery = $not: {subquery} - Where NOT (subquery)
+subquery = "tagName": tagValue - WHERE tagName == tagValue
+subquery = "tagName": {$neq: tagValue} - WHERE tagName != tagValue
+subquery = "tagName": {$gt: tagValue} - WHERE tagName > tagValue
+subquery = "tagName": {$gte: tagValue} - WHERE tagName >= tagValue
+subquery = "tagName": {$lt: tagValue} - WHERE tagName < tagValue
+subquery = "tagName": {$lte: tagValue} - WHERE tagName <= tagValue
+subquery = "tagName": {$like: tagValue} - WHERE tagName LIKE tagValue
+subquery = "tagName": {$in: [tagValue, ..., tagValue]} - WHERE tagName IN (tagValue, ..., tagValue)
+```

doc/design/011-wallet-query-language/README.md

@@ -30,4 +30,4 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88 \
 
 USER indy
 
-EXPOSE 8888
+EXPOSE 8888

doc/getting-started/getting-started.dockerfile

@@ -0,0 +1,25 @@
+# Signing commits
+
+If you are here because you forgot to sign your commits, fear not. Check out [how to sign previous commits](#how-to-sign-previous-commits)
+
+We use developer certificate of origin (DCO) in all hyperledger repositories, so to get your pull requests accepted, you must certify your commits by signing off on each commit.
+
+## Signing your current commit
+  - `$ git commit -s -m "your commit message"`
+  - To see if your commits have been signed off, run `$ git log --show-signature`
+  - If you need to re-sign the most current commit, use `$ git commit --amend --no-edit -s`.
+
+The `-s` flag signs the commit message with your name and email.
+
+## How to Sign Previous Commits
+   1. Use `git log --show-signature` to see which commits need to be signed.
+   1. Go into interactive rebase mode using `$ git rebase -i HEAD~X` where X is the number of commits up to the most current commit you would like to see.
+   1. You will see a list of the commits in a text file. **On the line after each commit you need to sign**, add `exec git commit --amend --no-edit -s` with the lowercase `-s` adding a text signature in the commit body. Example that signs both commits:
+      ```
+      pick 12345 commit message
+      exec git commit --amend --no-edit -s
+      pick 67890 commit message
+      exec git commit --amend --no-edit -s
+      ```
+    1. If you need to re-sign a bunch of previous commits at once, find the earliest unsigned commit using `git log --show-signature` and use that the HASH of the commit before it in this command: `git rebase --exec 'git commit --amend --no-edit -n -s' -i HASH`. This will sign every commit from most recent to right before the HASH.
+    1. You will probably need to do a force push `git push -f` if you had previously pushed unsigned commits to remote.

doc/signing-commits.md

@@ -4,21 +4,21 @@
 
 1. Setup a windows virtual machine. Free images are available at [here](https://developer.microsoft.com/en-us/microsoft-edge/tools/vms/)
 1. Launch the virtual machine 
-1. Download Visual Studio Community Edition 2017
+1. Download Visual Studio Community Edition 2017 (these instructions also work with Visual Studio Professional 2017)
 1. Check the boxes for the _Desktop development with C++_ and _Linux Development with C++_
 1. In the summary portion on the right hand side also check _C++/CLI support_
 1. Click install
 1. Download git-scm for windows [here](https://git-scm.com/downloads/win)
 1. Install git for windows using:
-  1. _Use Git from Git Bash Only_ so it doesn't change any path settings of the command prompt
-  1. _Checkout as is, commit Unix-style line endings_. You shouldn't be commiting anything anyway but just in case
-  1. _Use MinTTY_
-  1. Check all the boxes for:
-    1. Enable file system caching
-    1. Enable Git Credential Manager
-    1. Enable symbolic links
+   1. _Use Git from Git Bash Only_ so it doesn't change any path settings of the command prompt
+   1. _Checkout as is, commit Unix-style line endings_. You shouldn't be commiting anything anyway but just in case
+   1. _Use MinTTY_
+   1. Check all the boxes for:
+      1. Enable file system caching
+      1. Enable Git Credential Manager
+      1. Enable symbolic links
 1. Download rust for windows [here](https://www.rust-lang.org/en-US/install.html)
-  1. Choose installation option *1*
+   1. Choose installation option *1*
 
 ## Get/build dependencies
 
@@ -56,19 +56,19 @@ git clone https://github.com/hyperledger/indy-sdk.git
 
 Download http://www.sqlite.org/2017/sqlite-amalgamation-3180000.zip
 
-Create empty static library project and add sqlite.c file and 2 headers from extracted
+Create an empty static library project in Visual Studio and add `sqlite.c` file and 2 headers from extracted
 archive. Then just build it.
 
 ### Build libzmq
 
-Follow to https://http://zeromq.org/intro.
+Follow to http://zeromq.org/intro.
 - Download sources from last stable release for Windows. 
-- launch zeromq-x.x.x/builds/msvc/vs2015/libzmq.sln.
-- if necessary change solution platforms on x64(if you are working on x64 arch).
-- on main menu bar choose build->build libzmq.
-- if build project was succeed, in path zeromq-x.x.x/bin/x64/Debug/vXXX/dynamic has appeared
-    two files libzmq.dll and libzmq.lib.
-- rename libzmq.lib to zmq.lib.
+- Open `zeromq-x.x.x/builds/msvc/vs2015/libzmq.sln` with Visual Studio
+- If necessary change solution platforms on x64(if you are working on x64 arch).
+- On main menu bar choose build->build libzmq.
+- If build project was successful, two files `libzmq.dll` and `libzmq.lib` should appear 
+  in path `zeromq-x.x.x/bin/x64/Debug/vXXX/dynamic`.
+- rename `libzmq.lib` to `zmq.lib`.
 
 ## Build
 
@@ -82,18 +82,19 @@ Follow to https://http://zeromq.org/intro.
   ```
 
   Note that depending on the version of Visual Studio placement of vcvars64.bat can be different. For example, it can be
-  `C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat`  
-- execute "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+  `"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat"`  
+- Execute `"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"`
 - Point path to this directory using environment variables:
-  - set INDY_PREBUILT_DEPS_DIR=C:\BIN\x64
-  - set INDY_CRYPTO_PREBUILT_DEPS_DIR=C:\BIN\x64
-  - set MILAGRO_DIR=C:\BIN\x64
-  - set LIBZMQ_PREFIX=C:\BIN\x64
-  - set SODIUM_LIB_DIR=C:\BIN\x64
-  - set OPENSSL_DIR=C:\BIN\x64
-- set PATH to find .dlls:
-  - set PATH=C:\BIN\x64\lib;%PATH%
-- change dir to indy-sdk/libindy and run cargo (you may want to add --release --target x86_64-pc-windows-msvc keys to cargo)
+  - `set INDY_PREBUILT_DEPS_DIR=C:\BIN\x64`
+  - `set INDY_CRYPTO_PREBUILT_DEPS_DIR=C:\BIN\x64`
+  - `set MILAGRO_DIR=C:\BIN\x64`
+  - `set LIBZMQ_PREFIX=C:\BIN\x64`
+  - `set SODIUM_LIB_DIR=C:\BIN\x64`
+  - `set OPENSSL_DIR=C:\BIN\x64`
+- Set PATH to find .dlls:
+  - `set PATH=C:\BIN\x64\lib;%PATH%`
+- change dir to `indy-sdk/libindy` and run `cargo build` (you may want to add `--release --target x86_64-pc-windows-msvc`
+  keys to cargo)
 
 ## openssl-sys workaround
 
@@ -109,7 +110,7 @@ and add
   println!("cargo:rustc-link-lib=dylib=gdi32");
 ```
 
-to the end of main() function.
+to the end of `main()` function.
 
 Then try to rebuild whole project.
 

doc/windows-build.md

@@ -147,8 +147,42 @@ extern "C" {
                                                                          indy_error_t  err,
                                                                          const char*   credentials_json)
                                                     );
-    
-    
+
+    extern indy_error_t indy_prover_get_credential(indy_handle_t command_handle,
+                                                   indy_handle_t wallet_handle,
+                                                   const char *  cred_id,
+
+                                                   void           (*cb)(indy_handle_t xcommand_handle,
+                                                                        indy_error_t  err,
+                                                                        const char*   credential_json)
+                                                   );
+
+    extern indy_error_t indy_prover_search_credentials(indy_handle_t command_handle,
+                                                       indy_handle_t wallet_handle,
+                                                       const char *  query_json,
+
+                                                       void           (*cb)(indy_handle_t xcommand_handle,
+                                                                            indy_error_t  err,
+                                                                            indy_handle_t search_handle,
+                                                                            indy_u32_t    total_count)
+                                                       );
+
+    extern indy_error_t indy_prover_fetch_credentials(indy_handle_t command_handle,
+                                                      indy_handle_t search_handle,
+                                                      indy_u32_t    count,
+
+                                                      void           (*cb)(indy_handle_t xcommand_handle,
+                                                                           indy_error_t  err,
+                                                                           const char*   credentials_json)
+                                                      );
+
+    extern indy_error_t indy_prover_close_credentials_search(indy_handle_t command_handle,
+                                                             indy_handle_t search_handle,
+
+                                                             void           (*cb)(indy_handle_t xcommand_handle,
+                                                                                  indy_error_t  err)
+                                                             );
+
     extern indy_error_t indy_prover_get_credentials_for_proof_req(indy_handle_t command_handle,
                                                                   indy_handle_t wallet_handle,
                                                                   const char *  proof_request_json,
@@ -158,7 +192,34 @@ extern "C" {
                                                                                        const char*   credentials_json)
                                                                   );
 
-    
+
+    extern indy_error_t indy_prover_search_credentials_for_proof_req(indy_handle_t command_handle,
+                                                                     indy_handle_t wallet_handle,
+                                                                     const char *  proof_request_json,
+                                                                     const char *  extra_query_json,
+
+                                                                     void           (*cb)(indy_handle_t xcommand_handle,
+                                                                                          indy_error_t  err,
+                                                                                          indy_handle_t search_handle)
+                                                                     );
+
+    extern indy_error_t indy_prover_fetch_credentials_for_proof_req(indy_handle_t command_handle,
+                                                                    indy_handle_t search_handle,
+                                                                    const char*   item_referent,
+                                                                    indy_u32_t    count,
+
+                                                                    void           (*cb)(indy_handle_t xcommand_handle,
+                                                                                         indy_error_t  err,
+                                                                                         const char*   credentials_json)
+                                                                    );
+
+    extern indy_error_t indy_prover_close_credentials_search_for_proof_req(indy_handle_t command_handle,
+                                                                           indy_handle_t search_handle,
+
+                                                                           void           (*cb)(indy_handle_t xcommand_handle,
+                                                                                                indy_error_t  err)
+                                                                           );
+
     extern indy_error_t indy_prover_create_proof(indy_handle_t command_handle,
                                                  indy_handle_t wallet_handle,
                                                  const char *  proof_req_json,