hyperledger-iroha · lebdron · May 6, 2019 · Apr 18, 2019 · Apr 17, 2019 · Apr 17, 2019
diff --git a/.github/issue_template.md b/.github/issue_template.md
@@ -0,0 +1,7 @@
+## Hello! 
+
+It is great that you've decided to contribute to Hyperledger Iroha by telling us more about the issue you've encountered!
+The thing is that we now create and store issues only in [Hyperledger JIRA](https://jira.hyperledger.org/projects/IR) so we would kindly ask you to create your issue there. 
+That way you will be able to track it in JIRA with your [LFID](https://www.youtube.com/watch?v=EEc4JRyaAoA) account. 
+
+Still, if it is more convenient for you to create an issue on GitHub, our Yozhik Bot will carefully transfer it to JIRA and close the issue here. 
diff --git a/cmake/Modules/Finded25519.cmake b/cmake/Modules/Finded25519.cmake
@@ -53,6 +53,12 @@ set_target_properties(ed25519 PROPERTIES
     IMPORTED_LOCATION ${ed25519_LIBRARY}
     )
 
+if (MSVC)
+  set_target_properties(ed25519 PROPERTIES
+      INTERFACE_LINK_LIBRARIES bcrypt
+      )
+endif()
+
 if(ENABLE_LIBS_PACKAGING)
   add_install_step_for_lib(${ed25519_LIBRARY})
 endif()
diff --git a/cmake/Modules/Findpq.cmake b/cmake/Modules/Findpq.cmake
@@ -41,22 +41,24 @@ if (NOT pq_FOUND)
       GIT_REPOSITORY  ${URL}
       GIT_TAG         ${VERSION}
       CONFIGURE_COMMAND
-                      ./configure --without-readline
+                      ./configure --without-readline --prefix=${EP_PREFIX}
                       CC=${CMAKE_C_COMPILER}
 
       BUILD_IN_SOURCE 1
       BUILD_COMMAND ${MAKE} COPT=${CMAKE_C_FLAGS} -C ./src/bin/pg_config &&
-                    ${MAKE} COPT=${CMAKE_C_FLAGS} -C ./src/interfaces/libpq
-      BUILD_BYPRODUCTS ${EP_PREFIX}/src/postgres_postgres/src/interfaces/libpq/libpq.a
-      INSTALL_COMMAND "" # remove install step
+                    ${MAKE} COPT=${CMAKE_C_FLAGS} -C ./src/interfaces/libpq &&
+                    ${MAKE} COPT=${CMAKE_C_FLAGS} -C ./src/backend ../../src/include/utils/fmgroids.h
+      BUILD_BYPRODUCTS ${EP_PREFIX}/lib/libpq.a
+      INSTALL_COMMAND make -C src/bin/pg_config install &&
+                      make -C src/interfaces/libpq install &&
+                      make -C src/include install
       TEST_COMMAND "" # remove test step
       UPDATE_COMMAND "" # remove update step
       )
-  externalproject_get_property(postgres_postgres source_dir)
-  set(postgres_INCLUDE_DIR ${source_dir}/src/include)
-  set(pq_INCLUDE_DIR ${source_dir}/src/interfaces/libpq)
-  set(pq_LIBRARY ${source_dir}/src/interfaces/libpq/libpq.a)
-  set(pg_config_EXECUTABLE ${source_dir}/src/bin/pg_config/pg_config)
+  set(postgres_INCLUDE_DIR ${EP_PREFIX}/include)
+  set(pq_INCLUDE_DIR ${EP_PREFIX}/include)
+  set(pq_LIBRARY ${EP_PREFIX}/lib/libpq.a)
+  set(pg_config_EXECUTABLE ${EP_PREFIX}/bin/pg_config)
   file(MAKE_DIRECTORY ${pq_INCLUDE_DIR} ${postgres_INCLUDE_DIR})
 
   add_dependencies(pg_config postgres_postgres)

diff --git a/cmake/Modules/Findrxcpp.cmake b/cmake/Modules/Findrxcpp.cmake
@@ -9,7 +9,7 @@ find_package_handle_standard_args(rxcpp DEFAULT_MSG
 
 
 set(URL https://github.com/Reactive-Extensions/rxcpp.git)
-set(VERSION 795587fa311fa41050111a830d91b183d8e53ff9)
+set(VERSION f38fb8e3c30b01b07c57e08039b2942f1685224d)
 set_target_description(rxcpp "Library for reactive programming" ${URL} ${VERSION})
 
 

diff --git a/cmake/Modules/Findsoci.cmake b/cmake/Modules/Findsoci.cmake
@@ -14,14 +14,14 @@ mark_as_advanced(SOCI_INCLUDE_DIRS)
 
 find_library(
     SOCI_LIBRARY
-    NAMES soci_core soci_core_3_2
+    NAMES soci_core soci_core_4_0
     HINTS ${SOCI_INCLUDE_DIR}/..
     PATH_SUFFIXES lib${LIB_SUFFIX})
 mark_as_advanced(SOCI_LIBRARY)
 
 find_library(
     SOCI_postgresql_PLUGIN
-    NAMES soci_postgresql soci_postgresql_3_2
+    NAMES soci_postgresql soci_postgresql_4_0
     HINTS ${SOCI_INCLUDE_DIR}/..
     PATH_SUFFIXES lib${LIB_SUFFIX})
 mark_as_advanced(SOCI_postgresql_PLUGIN)
@@ -33,7 +33,7 @@ include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(soci DEFAULT_MSG ${_SOCI_REQUIRED_VARS})
 
 set(URL https://github.com/SOCI/soci)
-set(VERSION 111b50af8c3876ea392367640b4bd83b4f903ab8) # 3.2.3
+set(VERSION 1f2343e32822549df85660c0eb7acea3f0e5ed8d)
 set_target_description(soci "The C++ Database Access Library" ${URL} ${VERSION})
 
 if (NOT soci_FOUND)
@@ -43,7 +43,7 @@ if (NOT soci_FOUND)
       GIT_TAG         ${VERSION}
       CONFIGURE_COMMAND ${CMAKE_COMMAND}
                       -G${CMAKE_GENERATOR}
-                      -H${EP_PREFIX}/src/soci_soci/src
+                      -H${EP_PREFIX}/src/soci_soci
                       -B${EP_PREFIX}/src/soci_soci-build
                       -DCMAKE_INCLUDE_PATH=${pq_INCLUDE_DIR}
                       -DCMAKE_LIBRARY_PATH=${pq_INCLUDE_DIR}
@@ -53,6 +53,9 @@ if (NOT soci_FOUND)
                       -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
                       -DCMAKE_CXX_FLAGS=${CMAKE_CXX_SOCI_FLAGS}
                       -DCMAKE_INSTALL_PREFIX=${EP_PREFIX}
+                      -DSOCI_CXX_C11=ON
+                      -DSOCI_TESTS=OFF
+                      -DSOCI_EMPTY=OFF
                       -DWITH_BOOST=ON
                       -DWITH_DB2=OFF
                       -DWITH_FIREBIRD=OFF

diff --git a/deploy/ansible/ansible.cfg b/deploy/ansible/ansible.cfg
@@ -0,0 +1,196 @@
+# Configuration file for Ansible 2.2
+# Documentation: http://docs.ansible.com/ansible/intro_configuration.html
+
+[defaults]
+
+
+########################################
+# Display settings
+########################################
+
+# Output display
+force_color		= 1
+nocows			= 1
+
+
+# Note: http://docs.ansible.com/ansible/intro_configuration.html#ansible-managed
+ansible_managed		= Ansible managed - ansible-skel
+#ansible_managed	= Ansible managed
+#ansible_managed	= Ansible managed - {file} on {host}
+
+
+# Warn when ansible think it is better to use module.
+# Note: http://docs.ansible.com/ansible/intro_configuration.html#id88
+command_warnings = True
+
+# Enable this to debug tasks calls
+display_args_to_stdout = False
+display_skipped_hosts	= false
+
+
+########################################
+# Playbook settings
+########################################
+
+
+# Default strategy
+strategy		= free
+
+# Make some actions faster with loops
+#squash_actions = apk,apt,dnf,homebrew,package,pacman,pkgng,yum,zypper
+
+# Set it to replace or merge 
+hash_behaviour		= replace
+#hash_behaviour		= merge, but prefer use combine filter
+
+# Polling
+poll_interval		= 15
+internal_poll_interval=0.001
+
+# Number of hosts processed in parallel
+forks = 20
+
+# This shouldn't be touched, but could be useful
+error_on_undefined_vars = True
+force_handlers		= False
+
+
+
+########################################
+# Behaviour settings
+########################################
+
+
+# Make role variables private
+retry_files_enabled = True
+
+# Fact options
+gathering = smart
+#gathering = !all
+#gathering = smart,network,hardware,virtual,ohai,facter
+#gathering = network,!hardware,virtual,!ohai,!facter
+
+# Locales
+module_set_locale	= True
+module_lang		= en_US.UTF-8
+
+# Enable or disable logs :
+# Note put to false in prod
+no_log = False
+
+# TODO Deprecated option ?
+no_target_syslog = True
+
+
+########################################
+# Common destinations
+########################################
+
+inventory		= inventory/default.ini
+hostfile		= inventory/default.ini
+roles_path		= roles:roles/local
+retry_files_save_path	= config/tmp/retry/
+log_path		= config/tmp/ansible.log
+#vault_password_file	= config/vault_password
+
+
+########################################
+# Plugins paths
+########################################
+
+action_plugins		= plugins/action:~/.ansible/plugins/action_plugins/:/usr/share/ansible_plugins/action_plugins
+callback_plugins	= plugins/callback:~/.ansible/plugins/callback_plugins/:/usr/share/ansible_plugins/callback_plugins
+connection_plugins	= plugins/connection:~/.ansible/plugins/connection_plugins/:/usr/share/ansible_plugins/connection_plugins
+filter_plugins		= plugins/filter:~/.ansible/plugins/filter_plugins/:/usr/share/ansible_plugins/filter_plugins
+lookup_plugins		= plugins/lookup:~/.ansible/plugins/lookup_plugins/:/usr/share/ansible_plugins/lookup_plugins
+vars_plugins		= plugins/vars:~/.ansible/plugins/vars_plugins/:/usr/share/ansible_plugins/vars_plugins
+strategy_plugins	= plugins/strategy:~/.ansible/plugins/strategy_plugins/:/usr/share/ansible_plugins/strategy_plugins
+library			= plugins/modules:/usr/share/ansible
+
+
+########################################
+# Escalation settings
+########################################
+
+# Escalation
+#become = False
+#become_method = su
+## su, pbrun, pfexec, doas, ksu
+#become_user = root
+become_ask_pass = True
+#become_allow_same_user	= False
+
+
+# Sudo settings
+#sudo_exe = sudo
+#sudo_flags=-H -S -n
+#sudo_user = root
+
+
+########################################
+# SSH settings
+########################################
+
+# if your private key has different name,
+# you can either change its name here, either set it
+# ansible-playbook -i <inventory> --private-key <key name> <playbook name>
+private_key_file	= ~/.ssh/id_rsa
+
+host_key_checking	= False            # do not ask for ssh fingerprint
+remote_port		= 22
+remote_user		= root
+
+timeout = 5
+transport = smart
+#transport = jail,ssh,local,chroot,paramiko,...
+
+
+
+[ssh_connection]
+# Note: when using "sudo:" operations you must first disable ‘requiretty’ in /etc/sudoers on all managed hosts
+pipelining	= True
+
+# Enable only on old systems
+# Note: http://docs.ansible.com/ansible/playbooks_acceleration.html
+scp_if_ssh = False
+
+[paramiko_connection] 
+record_host_keys = True
+proxy_command = ssh -W "%h:%p" bastion
+
+
+
+########################################
+# Accelerate mode
+########################################
+#[accelerate]
+#accelerate_port = 5099
+#accelerate_timeout = 30
+#accelerate_connect_timeout = 1.0
+#accelerate_daemon_timeout = 30
+#accelerate_multi_key = yes
+
+
+########################################
+# Various
+########################################
+
+[selinux]
+show_custom_stats	= True
+
+
+
+########################################
+# Color settings: TODO DEPRECATEDS ?
+########################################
+
+[colors]
+#verbose = blue
+#warn = bright purple
+#error = red
+#debug = dark gray
+#deprecate = purple
+#skip = cyan
+#unreachable = red
+#ok = green
+#changed = yellow
diff --git a/deploy/ansible/kubespray b/deploy/ansible/kubespray
diff --git a/deploy/ansible/roles/iroha-docker/README.md b/deploy/ansible/roles/iroha-docker/README.md
@@ -1,4 +1,4 @@
-##### Description
+# Description
 [This role](https://github.com/hyperledger/iroha/tree/master/deploy/ansible/roles/iroha-docker) deploys multiple replicas of Iroha containers (one Iroha peer per container) on remote hosts. Each Iroha peer can communicate with others in two ways:
   - using public IP addresses or hostnames set in inventory list OR
   - using private IP addresses of the Docker overlay network
@@ -7,11 +7,11 @@ The first one is easier to implement since it does not require preliminary confi
 
 This option is enabled by default.
 
-The second one can be used when there exists an overlay network between the hosts. In short, overlay network allows for Docker containers to communicate using a single subnet. Such that each container would have a unique IP address in that subnet. Learn more in official Docker documentation (https://docs.docker.com/network/overlay). We recommend to use Calico for setting up Docker overlay network since it can be used as a network plugin (https://docs.projectcalico.org/v1.5/getting-started/docker/tutorials/basic).
+The second one can be used when there exists an overlay network between the hosts. In short, overlay network allows for Docker containers to communicate using a single subnet. Such that each container would have a unique IP address in that subnet. Learn more in official Docker documentation (https://docs.docker.com/network/overlay). Overlay network can be created if your instance is part of a Swarm cluster. Another method does not involve creating a Swarm cluster but requires a distributed key-value storage. [There is a guide](https://docker-k8s-lab.readthedocs.io/en/latest/docker/docker-etcd.html) on how to create such overlay network.
 
-The second way is also suitable for local-only deployments.
+This method is also suitable for local-only deployments and does not require any key-value storage.
 
-##### Requirements
+# Requirements
   Tested on Ubuntu 16.04, 18.04
   - Local:
     - python3, python3-dev
@@ -26,7 +26,7 @@ The second way is also suitable for local-only deployments.
 **Note:**
 > `docker.io` package from Ubuntu repos will not work. Either use Ansible role or install Docker following official instructions for your OS flavor.
 
-##### Quick Start
+# Quick Start
 1. Install Ansible
     ```
     pip3 install ansible
@@ -49,11 +49,11 @@ It will also install Docker along with required python modules. If you want to s
 **Note:**
 > This command escalates privileges on a remote host during the run. It is required to be able to spin up Docker containers. We recommend to run the playbook using a passwordless remote sudo user.
 
-##### Initial configuration
+# Initial configuration
 
 See `defaults/main.yml` file to get more details about available configuration options.
 
-##### Examples
+# Examples
 **Example 1**
 <!-- TODO: Cover more example cases -->
 Deploying 6 Iroha peers on two remote hosts communicating using public IP addresses. With 2 and 4 replicas on each host respectively.
@@ -77,12 +77,12 @@ Deploying 6 Iroha peers on two remote hosts communicating using public IP addres
 
     **192.168.122.109.yml**
     ```
-    replicas: 2
+    iroha_replicas: 2
     ```
 
     **192.168.122.30.yml**
     ```
-    replicas: 4
+    iroha_replicas: 4
     ```
 
 4. Run the playbook
@@ -95,5 +95,9 @@ Deploying 6 Iroha peers on two remote hosts communicating over overlay network (
 
 **TBD**
 
-##### Caveats
-1. If `/usr/bin/python` does not exist on a remote host, Ansible will fail with the misleading message: `... Make sure this host can be reached over ssh`. This usually happens when Ansible uses Python 3. On Ubuntu systems `/usr/bin/python3` is not symlinked to `/usr/bin/python` which Ansible expects to find. The problem can be solved by setting `ansible_python_interpreter` variable to `/usr/bin/python3`.
+**Caveats**
+
+> If `/usr/bin/python` does not exist on a remote host, Ansible will fail with the misleading message: `... Make sure this host can be reached over ssh`.
+This usually happens when Ansible uses Python 3.
+On Ubuntu systems `/usr/bin/python3` is not symlinked to `/usr/bin/python` which Ansible expects to find.
+The problem can be solved by setting `ansible_python_interpreter` variable to `/usr/bin/python3`.