Merge branch 'master' into master

Author: andkononykhin

Jenkinsfile.cd

@@ -45,39 +45,60 @@ def windowsTesting() {
                                 "PATH=$WORKSPACE\\libindy\\prebuilt\\lib;$PATH",
                                 "RUST_BACKTRACE=1"
                         ]) {
+                            bat "cargo build"
                             bat "cargo test --no-run"
 
                             echo "Windows Libindy Test: Run tests"
                             withEnv([
                                     "RUST_TEST_THREADS=1",
-                                    "RUST_LOG=indy::,zmq=trace",
+                                    "RUST_LOG=indy::=debug,zmq=trace",
                                     "TEST_POOL_IP=$INDY_SDK_SERVER_IP"
                             ]) {
                                 bat "cargo test"
                             }
                         }
                     }
 
+                    dir('libnullpay') {
+                        echo "Windows Libnullpay Test: Build"
+                        withEnv([
+                                "RUST_BACKTRACE=1"
+                        ]) {
+                            bat "cargo build"
+                            bat "cargo test --no-run"
+
+                            echo "Windows Libnullpay Test: Run tests"
+                            withEnv([
+                                    "RUST_TEST_THREADS=1",
+                                    "RUST_LOG=indy::=debug,zmq=trace",
+                                    "TEST_POOL_IP=$INDY_SDK_SERVER_IP",
+                                    "PATH=$WORKSPACE\\libindy\\target\\debug;$PATH",
+                            ]) {
+                                bat "cargo test"
+                            }
+                        }
+                    }
+
+                    bat "copy $WORKSPACE\\libnullpay\\target\\debug\\nullpay.dll $WORKSPACE\\cli"
+
                     dir('cli') {
                         bat "sed -i -e \"s/10\\.0\\.0\\.2/${INDY_SDK_SERVER_IP}/g\" docker_pool_transactions_genesis"
 
-                        bat "copy $WORKSPACE\\libindy\\target\\debug\\indy.dll $WORKSPACE\\libindy\\prebuilt\\lib"
-                        bat "copy $WORKSPACE\\libindy\\target\\debug\\indy.lib $WORKSPACE\\libindy\\prebuilt\\lib"
+                        def featuresArgs = '--features "nullpay_plugin"'
 
                         echo "Windows Indy Cli Test: Build"
                         withEnv([
-                                "INDY_DIR=$WORKSPACE\\libindy\\prebuilt",
                                 "RUST_BACKTRACE=1"
                         ]) {
-                            bat "cargo test --no-run"
+                            bat "cargo test $featuresArgs --no-run"
 
                             echo "Windows Indy Cli Test: Run tests"
                             withEnv([
                                     "RUST_TEST_THREADS=1",
-                                    "RUST_LOG=indy::,zmq=trace",
+                                    "RUST_LOG=indy::=debug,zmq=trace",
                                     "TEST_POOL_IP=$INDY_SDK_SERVER_IP"
                             ]) {
-                                bat "cargo test"
+                                bat "cargo test $featuresArgs"
                             }
                         }
                     }
@@ -113,6 +134,7 @@ def macosTesting() {
                     setupRust()
                     setupBrewPackages()
                     sh "cargo build"
+                    sh "cargo test --no-run"
                     // TODO testing
                 }
 
@@ -198,24 +220,40 @@ def linuxTesting(file, env_name, network_name) {
         poolInst = openPool(env_name, network_name)
 
         def testEnv
+        def libindyFeatures = "--features sodium_static"
 
         dir('libindy') {
             echo "${env_name} Libindy Test: Build docker image"
             testEnv = dockerBuild('libindy', file)
 
             testEnv.inside("--ip=\"10.0.0.3\" --network=${network_name}") {
                 echo "${env_name} Libindy Test: Build"
-                sh "cargo build"
+                sh "cargo build $libindyFeatures"
             }
         }
 
         sh "cp libindy/target/debug/libindy.so wrappers/java/lib"
         sh "cp libindy/target/debug/libindy.so wrappers/python"
+        sh "cp libindy/target/debug/libindy.so wrappers/nodejs"
         sh "cp libindy/target/debug/libindy.so cli"
+        sh "cp libindy/target/debug/libindy.so libnullpay"
+
+        dir('libnullpay') {
+            echo "${env_name} Libnullpay Test: Build docker image"
+
+            testEnv.inside("--ip=\"10.0.0.3\" --network=${network_name}") {
+                echo "${env_name} Libnullpay Test: Build"
+                sh "LIBRARY_PATH=./ cargo build"
+            }
+        }
+
+        sh "cp libnullpay/target/debug/libnullpay.so cli"
 
         stash includes: 'wrappers/java/lib/libindy.so', name: "LibindyJavaSO${env_name}"
         stash includes: 'wrappers/python/libindy.so', name: "LibindyPythonSO${env_name}"
+        stash includes: 'wrappers/nodejs/libindy.so', name: "LibindyNodejsSO${env_name}"
         stash includes: 'cli/libindy.so', name: "LibindyCliSO${env_name}"
+        stash includes: 'cli/libnullpay.so', name: "LibnullpayCliSO${env_name}"
 
         parallel([
                 "${env_name}-libindy-test": {
@@ -224,15 +262,29 @@ def linuxTesting(file, env_name, network_name) {
                             echo "${env_name} Libindy Test: Test"
 
                             echo "${env_name} Libindy Test: Build Test"
-                            sh "RUST_BACKTRACE=1 cargo test --no-run"
+                            sh "RUST_BACKTRACE=1 cargo test --no-run $libindyFeatures"
 
                             echo "${env_name} Libindy Test: Run tests"
-                            sh "RUST_BACKTRACE=1 RUST_LOG=indy::,zmq=trace RUST_TEST_THREADS=1 TEST_POOL_IP=10.0.0.2 cargo test"
+                            sh "RUST_BACKTRACE=1 RUST_LOG=indy::=debug,zmq=trace RUST_TEST_THREADS=1 TEST_POOL_IP=10.0.0.2 cargo test $libindyFeatures"
+                        }
+                    }
+                },
+                "${env_name}-libnullpay-test": {
+                    dir('libnullpay') {
+                        testEnv.inside("--network=${network_name}") {
+                            echo "${env_name} Libnullpay Test: Test"
+
+                            echo "${env_name} Libnullpay Test: Build Test"
+                            sh "LIBRARY_PATH=./ RUST_BACKTRACE=1 cargo test --no-run"
+
+                            echo "${env_name} Libnullpay Test: Run tests"
+                            sh 'LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} RUST_BACKTRACE=1 RUST_LOG=indy::=debug,zmq=trace RUST_TEST_THREADS=1 TEST_POOL_IP=10.0.0.2 cargo test'
                         }
                     }
                 },
                 "${env_name}-java-test"   : { linuxModuleTesting(file, env_name, network_name, this.&linuxJavaTesting) },
                 "${env_name}-python-test" : { linuxModuleTesting(file, env_name, network_name, this.&linuxPythonTesting) },
+                "${env_name}-nodejs-test" : { linuxModuleTesting(file, env_name, network_name, this.&linuxNodejsTesting) },
                 "${env_name}-cli-test"    : { linuxModuleTesting(file, env_name, network_name, this.&linuxCLITesting) }
         ])
     }
@@ -270,7 +322,7 @@ def linuxJavaTesting(env_name, network_name, testEnv) {
         testEnv.inside("--network=${network_name}") {
             echo "${env_name} Libindy Test: Test java wrapper"
 
-            sh "RUST_LOG=indy::,zmq=trace TEST_POOL_IP=10.0.0.2 mvn clean test"
+            sh "RUST_LOG=indy::=debug,zmq=trace TEST_POOL_IP=10.0.0.2 mvn clean test"
         }
     }
 }
@@ -283,21 +335,41 @@ def linuxPythonTesting(env_name, network_name, testEnv) {
 
             sh '''
                 python3.5 -m pip install --user -e .
-                LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} RUST_LOG=indy::,zmq=trace TEST_POOL_IP=10.0.0.2 python3.5 -m pytest
+                LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} RUST_LOG=indy::=debug,zmq=trace TEST_POOL_IP=10.0.0.2 python3.5 -m pytest
             '''
         }
     }
 }
 
+def linuxNodejsTesting(env_name, network_name, testEnv) {
+    unstash name: "LibindyNodejsSO${env_name}"
+    testEnv.inside("--network=${network_name}") {
+        echo "${env_name} Libindy Test: Test nodejs wrapper"
+
+        sh '''
+                cd wrappers/nodejs
+                npm run prepare
+                npm install
+                LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} RUST_LOG=trace TEST_POOL_IP=10.0.0.2 npm test
+            '''
+    }
+}
+
 def linuxCLITesting(env_name, network_name, testEnv) {
+    if (env_name == "RedHat"){ // TODO: Delete it IS-702
+        return;
+    }
+
     unstash name: "LibindyCliSO${env_name}"
+    unstash name: "LibnullpayCliSO${env_name}"
+
     dir('cli') {
         testEnv.inside("--network=${network_name}") {
             echo "${env_name} Indy Cli Test: Build"
-            sh "LIBRARY_PATH=./ RUST_BACKTRACE=1 cargo test --no-run"
+            sh 'LIBRARY_PATH=./ RUST_BACKTRACE=1 cargo test --features "nullpay_plugin" --no-run'
 
             echo "${env_name} Indy Cli Test: Run tests"
-            sh 'LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} RUST_BACKTRACE=1 RUST_LOG=indy::,zmq=trace RUST_TEST_THREADS=1 TEST_POOL_IP=10.0.0.2 cargo test'
+            sh 'LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} RUST_BACKTRACE=1 RUST_LOG=indy::=debug,zmq=trace RUST_TEST_THREADS=1 TEST_POOL_IP=10.0.0.2 cargo test --features "nullpay_plugin"'
         }
     }
 }
@@ -368,7 +440,7 @@ def closePool(env_name, network_name, poolInst) {
 }
 
 def setupRust() {
-    sh "rustup default 1.25.0"
+    sh "rustup default 1.26.0"
 }
 
 def setupRustIOS() {
@@ -379,5 +451,4 @@ def setupBrewPackages() {
     sh "brew switch libsodium 1.0.12"
     sh "brew switch openssl 1.0.2l"
     sh "brew switch zeromq 4.2.3"
-}
-
+}

Jenkinsfile.ci

@@ -115,6 +115,11 @@ After successfully compiling `libindy`, you will need to add the path containing
 * [Windows](doc/windows-build.md)
 * [MacOS](doc/mac-build.md)
 
+**Note:**
+By default `cargo build` produce debug artifacts with a large amount of run-time checks.
+It's good for development, but this build can be in 100+ times slower for some math calculation.
+If you would like to analyse CPU performance of libindy for your use case, you have to use release artifacts (`cargo build --release`). 
+
 ## How to start local nodes pool with docker
 To test the SDK codebase with a virtual Indy node network, you can start a pool of local nodes using docker:
 
@@ -171,14 +176,15 @@ Docker machine needs to be rebooted after these changes.
 ## Wrappers documentation
 
 The following wrappers are tested and complete. There is also active work
-on wrappers for Go and node.js; visit
+on a wrapper for Go; visit
 [#indy-sdk on Rocket.Chat](https://chat.hyperledger.org/channel/indy-sdk) for
 details.
 
 * [.Net](wrappers/dotnet/README.md)
 * [Java](wrappers/java/README.md)
 * [Python](wrappers/python/README.md)
 * [iOS](wrappers/ios/README.md)
+* [NodeJS](wrappers/nodejs/README.md)
 
 ## Indy CLI documentation
 * 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)

README.md

@@ -0,0 +1,23 @@
+{
+  "name": "libindy",
+  "version": "1.4.0-1",
+  "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/master/libindy-core/1.4.0-1/libindy.tar.gz"
+  },
+  "source_files": "*.h",
+  "vendored_libraries": "*.a",
+  "requires_arc": false
+}

Specs/libindy/1.4.0-1/libindy.podspec.json

@@ -0,0 +1,23 @@
+{
+  "name": "libindy",
+  "version": "1.4.0-2",
+  "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/master/libindy-core/1.4.0-2/libindy.tar.gz"
+  },
+  "source_files": "*.h",
+  "vendored_libraries": "*.a",
+  "requires_arc": false
+}

Specs/libindy/1.4.0-2/libindy.podspec.json

@@ -0,0 +1,30 @@
+#!/bin/bash -xe
+
+if [ "$1" = "--help" ] ; then
+  echo "Usage: <package> <version> <key> <type> <suffix> <repo> <host> <key>"
+  return
+fi
+
+package="$1"
+version="$2"
+type="$3"
+suffix="$4"
+repo="$5"
+host="$6"
+key="$7"
+
+[ -z $package ] && exit 1
+[ -z $version ] && exit 2
+[ -z $type ] && exit 3
+[ -z $suffix ] && exit 4
+[ -z $repo ] && exit 5
+[ -z $host ] && exit 6
+[ -z $key ] && exit 7
+
+sed -i -E -e 'H;1h;$!d;x' -e "s/$package ([(,),0-9,.]+)/$package ($version$suffix)/" debian/changelog
+
+dpkg-buildpackage -tc
+
+mkdir debs &&  mv ../*.deb ./debs/
+
+./sovrin-packaging/upload_debs.py ./debs $repo $type --host $host --ssh-key $key

cli/ci/.gitattributes renamed to ci/.gitattributes

@@ -19,16 +19,16 @@ RUN pip3 install -U \
 	setuptools
 
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88
-ARG indy_stream=rc
+ARG indy_stream=master
 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.2.38
-ARG indy_anoncreds_ver=1.0.11
-ARG indy_node_ver=1.3.56
-ARG python3_indy_crypto_ver=0.2.0
-ARG indy_crypto_ver=0.1.6
+ARG indy_plenum_ver=1.2.369
+ARG indy_anoncreds_ver=1.0.32
+ARG indy_node_ver=1.3.425
+ARG python3_indy_crypto_ver=0.4.1
+ARG indy_crypto_ver=0.4.0
 
 RUN apt-get update -y && apt-get install -y \
         indy-plenum=${indy_plenum_ver} \

ci/deb-build-and-upload.sh

@@ -0,0 +1,44 @@
+#!/bin/bash -xe
+
+if [ "$1" = "--help" ] ; then
+  echo "Usage: <package> <package_type> <version> <key> <type> <number>"
+  return
+fi
+
+package="$1"
+package_type="$2"
+version="$3"
+key="$4"
+type="$5"
+number="$6"
+
+[ -z $package ] && exit 1
+[ -z $package_type ] && exit 2
+[ -z $version ] && exit 3
+[ -z $key ] && exit 4
+[ -z $type ] && exit 5
+[ -z $number ] && exit 6
+
+TEMP_ARCH_DIR=./${package}-zip
+mkdir ${TEMP_ARCH_DIR}
+
+if [ ${package_type} = "lib" ] ; then
+  mkdir ${TEMP_ARCH_DIR}/lib
+  cp -r ./include ${TEMP_ARCH_DIR}
+  cp ./target/release/*.dll ${TEMP_ARCH_DIR}/lib/
+elif [ ${package_type} = "executable" ] ; then
+  cp ./target/release/*.dll ${TEMP_ARCH_DIR}/
+  cp ./target/release/${package}.exe ${TEMP_ARCH_DIR}/
+else
+  exit 2
+fi
+
+powershell.exe -nologo -noprofile -command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::CreateFromDirectory('${TEMP_ARCH_DIR}', '${package}_${version}.zip'); }"
+rm -rf ${TEMP_ARCH_DIR}
+
+cat <<EOF | sftp -v -oStrictHostKeyChecking=no -i $key [email protected]
+mkdir /var/repository/repos/windows/$package/$type/$version-$number
+cd /var/repository/repos/windows/$package/$type/$version-$number
+put -r ${package}_"${version}".zip
+ls -l /var/repository/repos/windows/$package/$type/$version-$number
+EOF