Merge pull request #1596 from Artemkaaas/indy-1.8.3

RC IndySDK 1.8.3

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.8.3 - 2019-04-30
+* Bugfixes:
+    * Fixed behavior of `auth_rule` and `get_auth_rule` request builders. 
+    * Extended windows packages to contain *.dll.lib file.
+    * Fixed `boolean` datatype representation for FFI.
+    * others minor bugfixes
+
 ## 1.8.2 - 2019-03-26
 * Added new functions to Libindy Ledger API:
     * `indy_build_auth_rule_request` to change an existing ledger auth rule.
@@ -21,6 +28,7 @@ Added `protocol_type` field to VCX provisioning config with indicates A2A messag
         * [Message Threading](https://github.com/hyperledger/indy-hipe/tree/master/text/0027-message-id-and-threading)
         * [Wire Message](https://github.com/hyperledger/indy-hipe/tree/master/text/0028-wire-message-format).
 * Set default freshness threshold to 600 seconds.
+* Send GET requests to two Nodes.
 * Bugfixes:
     * Restart catchup in case of outdated pool cache.
     * Fixed publishing of nodejs package for VCX wrapper.

Jenkinsfile.cd

@@ -402,7 +402,7 @@ def linuxVcxBuild(file, env_name, network_name, stashBuildResults) {
         testEnv.inside("--network=${network_name}") {
             sh '''
                 cd vcx/dummy-cloud-agent
-                LIBRARY_PATH=./ LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} RUST_BACKTRACE=1 RUST_LOG=indy=info cargo run sample-config.json &
+                LIBRARY_PATH=./ LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} RUST_BACKTRACE=1 RUST_LOG=indy=info cargo run config/sample-config.json &
             '''
 
             echo "${env_name} Libvcx Test: Run tests"
@@ -415,8 +415,8 @@ def linuxVcxBuild(file, env_name, network_name, stashBuildResults) {
         testEnv.inside("--network=${network_name}") {
             sh '''
                 cd vcx/dummy-cloud-agent
-                sed -i 's/\\("protocol_type": "\\)1.0/\\12.0/' sample-config.json
-                LIBRARY_PATH=./ LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} RUST_BACKTRACE=1 RUST_LOG=indy=info cargo run sample-config.json &
+                sed -i 's/\\("protocol_type": "\\)1.0/\\12.0/' config/sample-config.json
+                LIBRARY_PATH=./ LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} RUST_BACKTRACE=1 RUST_LOG=indy=info cargo run config/sample-config.json &
             '''
 
             echo "${env_name} Libvcx Test: Run vcx demo test for protocol version 2.0"
@@ -590,7 +590,7 @@ def windowsTesting() {
                                 bat "cargo test --release"
                             }
                         }
-                        stash includes: 'target/release/*.dll', name: 'LibindyWindowsBuildResult'
+                        stash includes: 'target/release/*.dll,target/release/*.dll.lib', name: 'LibindyWindowsBuildResult'
                     }
 
                     dir('libnullpay') {
@@ -612,7 +612,7 @@ def windowsTesting() {
                             }
                         }
 
-                        stash includes: 'target/release/*.dll', name: 'LibnullpayWindowsBuildResult'
+                        stash includes: 'target/release/*.dll,target/release/*.dll.lib', name: 'LibnullpayWindowsBuildResult'
                     }
 
                     bat "PowerShell.exe \"Copy-Item $WORKSPACE/libnullpay/target/release/nullpay.dll -Destination $WORKSPACE/cli\""
@@ -672,7 +672,7 @@ def windowsTesting() {
                             }
                         }
 
-                        stash includes: 'target/release/*.dll', name: 'LibvcxWindowsBuildResult'
+                        stash includes: 'target/release/*.dll,target/release/*.dll.lib', name: 'LibvcxWindowsBuildResult'
                     }
 
                     //TODO wrappers testing
@@ -1386,24 +1386,21 @@ def publishLibnullpayDebRCtoStable(testEnv) {
 
 def publishLibvcxDebRCtoStable(testEnv) {
     def libvcxVersion = getSrcVersion("vcx/libvcx")
-    def libindyVersion = getSrcVersion("libindy")
-    def rcFullVersion = "$libvcxVersion~$env.BUILD_NUMBER"
-
-    testEnv.inside {
-        unstash name: "libvcxDebs"
-        sh "fpm -s deb -t deb --version $rcFullVersion --no-auto-depends --depends 'libindy = $libindyVersion' -f -p vcx/libvcx/debs vcx/libvcx/debs/libvcx_\"$rcFullVersion\"_amd64.deb"
-        stash includes: "vcx/libvcx/debs/*", name: "libvcxDebs"
-    }
 
     publishDebRCtoStable(testEnv, "libvcx", "vcx/libvcx", libvcxVersion, "libvcxDebs", false)
 }
 
 def publishDebRCtoStable(testEnv, packageName, folder, version, stashName, moveDevArtifacts) {
     testEnv.inside {
-        rcFullVersion = "${version}~${env.BUILD_NUMBER}"
+        def rcFullVersion = "${version}~${env.BUILD_NUMBER}"
 
         unstash name: stashName
 
+        if (packageName != "libindy") {
+            def libindyVersion = getSrcVersion("libindy")
+            sh "fpm -s deb -t deb --version $rcFullVersion --no-auto-depends --depends 'libindy = $libindyVersion' -f -p $folder/debs $folder/debs/\"$packageName\"_\"$rcFullVersion\"_amd64.deb"
+        }
+
         sh "fakeroot deb-reversion -v $version $folder/debs/\"$packageName\"_\"$rcFullVersion\"_amd64.deb"
 
         if (moveDevArtifacts) {

Jenkinsfile.ci

@@ -523,7 +523,7 @@ def linuxVcxBuild(file, env_name, network_name) {
         testEnv.inside("--network=${network_name}") {
             sh '''
                 cd vcx/dummy-cloud-agent
-                LIBRARY_PATH=./ LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} RUST_BACKTRACE=1 RUST_LOG=indy=info cargo run sample-config.json &
+                LIBRARY_PATH=./ LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} RUST_BACKTRACE=1 RUST_LOG=indy=info cargo run config/sample-config.json &
             '''
 
             echo "${env_name} Libvcx Test: Run tests"
@@ -536,8 +536,8 @@ def linuxVcxBuild(file, env_name, network_name) {
         testEnv.inside("--network=${network_name}") {
             sh '''
                 cd vcx/dummy-cloud-agent
-                sed -i 's/\\("protocol_type": "\\)1.0/\\12.0/' sample-config.json
-                LIBRARY_PATH=./ LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} RUST_BACKTRACE=1 RUST_LOG=indy=info cargo run sample-config.json &
+                sed -i 's/\\("protocol_type": "\\)1.0/\\12.0/' config/sample-config.json
+                LIBRARY_PATH=./ LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} RUST_BACKTRACE=1 RUST_LOG=indy=info cargo run config/sample-config.json &
             '''
 
             echo "${env_name} Libvcx Test: Run tests"

Specs/libindy/1.8.1/libindy.podspec.json

@@ -15,7 +15,7 @@
     "ios": "10.0"
   },
   "source": {
-    "http": "https://repo.sovrin.org/ios/libindy/stable/libindy-core/1.8.1.libindy.tar.gz"
+    "http": "https://repo.sovrin.org/ios/libindy/stable/libindy-core/1.8.1/libindy.tar.gz"
   },
   "source_files": "*.h",
   "vendored_libraries": "*.a",

Specs/libindy/1.8.2/libindy.podspec.json

@@ -15,7 +15,7 @@
     "ios": "10.0"
   },
   "source": {
-    "http": "https://repo.sovrin.org/ios/libindy/stable/libindy-core/1.8.2.libindy.tar.gz"
+    "http": "https://repo.sovrin.org/ios/libindy/stable/libindy-core/1.8.2/libindy.tar.gz"
   },
   "source_files": "*.h",
   "vendored_libraries": "*.a",

Specs/libindy/1.8.3/libindy.podspec.json

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

ci/indy-pool.dockerfile

@@ -24,15 +24,13 @@ RUN echo "deb https://repo.sovrin.org/deb xenial $indy_stream" >> /etc/apt/sourc
 
 RUN useradd -ms /bin/bash -u $uid indy
 
-ARG indy_plenum_ver=1.6.726
-ARG indy_anoncreds_ver=1.0.32
-ARG indy_node_ver=1.6.862
+ARG indy_plenum_ver=1.7.0~dev766
+ARG indy_node_ver=1.7.0~dev896
 ARG python3_indy_crypto_ver=0.4.5
 ARG indy_crypto_ver=0.4.5
 
 RUN apt-get update -y && apt-get install -y \
         indy-plenum=${indy_plenum_ver} \
-        indy-anoncreds=${indy_anoncreds_ver} \
         indy-node=${indy_node_ver} \
         python3-indy-crypto=${python3_indy_crypto_ver} \
         libindy-crypto=${indy_crypto_ver} \

ci/ios-build.sh

@@ -14,6 +14,7 @@ package="$1"
 
 export PKG_CONFIG_ALLOW_CROSS=1
 export POD_FILE_NAME=${package}.tar.gz
+export LIBINDY_POD_VERSION=1.8.2
 
 if [ -z "${OPENSSL_DIR}" ]; then
     export OPENSSL_DIR=/usr/local/Cellar/openssl/1.0.2q

ci/win-zip-and-upload.sh

@@ -31,6 +31,7 @@ if [ ${package_type} = "lib" ] ; then
   mkdir ${TEMP_ARCH_DIR}/lib
   cp -r ${folder}/include ${TEMP_ARCH_DIR}
   cp ./target/release/*.dll ${TEMP_ARCH_DIR}/lib/
+  cp ./target/release/*.dll.lib ${TEMP_ARCH_DIR}/lib/
 elif [ ${package_type} = "executable" ] ; then
   cp ./target/release/*.dll ${TEMP_ARCH_DIR}/
   cp ./target/release/${package}.exe ${TEMP_ARCH_DIR}/

cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "indy-cli"
-version = "1.8.2"
+version = "1.8.3"
 authors = ["Vyacheslav Gudkov <[email protected]>"]
 
 [features]
@@ -28,4 +28,4 @@ serde_json = "1.0"
 serde_derive = "1.0"
 term = "0.4.6"
 rpassword = "1.0.0"
-indy = { version = "1.8.2", path = "../wrappers/rust/" }
+indy = { version = "1.8.3", path = "../wrappers/rust/" }

cli/debian/changelog

@@ -1,7 +1,10 @@
-indy-cli (1.8.2) unstable; urgency=medium
+indy-cli (1.8.3) unstable; urgency=medium
 
 [ Hyperledger ]
 
+## 1.8.3
+* Updated `ledger auth-rule` and `ledger get-auth-rule` commands.
+
 ## 1.8.2
 * Added new commands to work with ledger auth rules:
     * `ledger auth-rule` to change an existing.