Merge pull request #1999 from Artemkaaas/indy-1.14.0

IS-1454: Release Indy SDK 1.14.0

CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 1.14.0 - 2019-12-27
+* LibVCX Aries support:
+    * Implemented Trust Ping RFC (IS-1435)
+    * Implemented Discover Features RFC (IS-1155)
+    * Implemented Service Decorator RFC (IS-1449)
+* Transaction author agreement changes (IS-1427):
+    * Extended the definition of `indy_build_txn_author_agreement_request` function to accept new parameters:
+        * `ratification_ts` - the date (timestamp) of TAA ratification by network government.
+        * `retirement_ts` - the date (timestamp) of TAA retirement.
+    * Added a new function `indy_build_disable_all_txn_author_agreements_request` to disable all Transaction Author Agreement on the ledger.
+    * new Indy-CLI commands:
+        * `ledger disable-all-txn-author-agreements` - to disable All Transaction Author Agreements on the ledger. 
+        * `ledger get-acceptance-mechanisms` - to get a list of acceptance mechanisms set on the ledger.
+* Bugfixes
+    * Added validation for `nonce` field in the proof request message. Now it must be a decimal number only represented as a string. It is highly recommended to use `indy_generate_nonce` function to generate a correct nonce.
+    * others minor bugfixes
+
+
 ## 1.13.0 - 2019-12-03
 * LibVCX Aries support:
     * Implemented Connection RFC (IS-1180)

Jenkinsfile.cd

@@ -27,6 +27,8 @@ sovrinPackagingRepo = env.SOVRIN_PACKAGING_REPO ?: 'https://github.com/sovrin-fo
 sovrinPackagingBranch = env.SOVRIN_PACKAGING_BRANCH ?: 'master'
 mavenDeployAddOptions = env.MAVEN_DEPLOY_ADD_OPTIONS ?: ''
 
+androidArchArray = ["arm", "armv7", "x86", "arm64", "x86_64"]
+
 try {
     testing()
     publishing()
@@ -186,7 +188,7 @@ def openPool(env_name, network_name, pool_type = null, pool_ver = null, plenum_v
     echo "${env_name} Test: Build docker image for nodes pool ver. ${pool_ver}"
     echo "${env_name} Test: Building nodes pool for versions: plenum ${plenum_ver}, anoncreds ${anoncreds_ver}, node ${node_ver}"
     verOptions = getBuildPoolVerOptions(pool_type, plenum_ver, anoncreds_ver, node_ver)
-    def poolEnv = dockerHelpers.build("indy_pool_${pool_ver}", 'ci/indy-pool.dockerfile ci',
+    def poolEnv = dockerBuild("indy_pool_${pool_ver}", 'ci/indy-pool.dockerfile ci',
             "--build-arg pool_ip=10.0.0.2 ${verOptions}")
     echo "${env_name} Test: Run nodes pool"
     return poolEnv.run("--ip=\"10.0.0.2\" --network=${network_name}")
@@ -787,7 +789,6 @@ def iosTesting() {
                             rbenv install -s $(cat .ruby-version)
 
                             gem install bundler
-                            bundler exec gem env
 
                             bundler install
                             bundler list
@@ -942,7 +943,7 @@ def centosPublishing() {
                 libindyVersion = getSrcVersion("libindy")
 
                 echo "Publish ${env_name}: Build docker image"
-                def testEnv = dockerHelpers.build('indy-sdk', 'libindy/ci/centos.dockerfile ci')
+                def testEnv = dockerBuild('indy-sdk', 'libindy/ci/centos.dockerfile ci')
 
                 libindyRpmPublishing(testEnv, libindyVersion, env_name)
                 libnullpayRpmPublishing(testEnv, env_name)
@@ -1097,7 +1098,7 @@ def windowsPublishing() {
                 libindyVersion = getSrcVersion("libindy")
 
                 echo 'Publish Windows files: Build docker image'
-                testEnv = dockerHelpers.build('indy-sdk', 'libindy/ci/ubuntu.dockerfile libindy/ci')
+                testEnv = dockerBuild('indy-sdk', 'libindy/ci/ubuntu.dockerfile libindy/ci')
 
                 echo 'Publish Libindy Windows files'
                 windowsPublishArtifact(testEnv, "libindy", "libindy", "lib", libindyVersion, "LibindyWindowsBuildResult")
@@ -1152,7 +1153,7 @@ def iosPublishing() {
                 version = "$libindyVersion-$env.BUILD_NUMBER"
 
                 echo 'Publish iOS files: Build docker image'
-                testEnv = dockerHelpers.build('indy-sdk', 'libindy/ci/ubuntu.dockerfile libindy/ci')
+                testEnv = dockerBuild('indy-sdk', 'libindy/ci/ubuntu.dockerfile libindy/ci')
 
                 echo 'Publish Libindy iOS Pod for aarch64-apple-ios and armv7-apple-ios'
                 publishIOSAtrifacts(testEnv, "libindy", "LibindyMiniIOSPod", version, "libindy-aarch64-armv7.tar.gz")
@@ -1202,7 +1203,7 @@ def macOsPublishing() {
 
                 echo 'Publish MacOS files: Build docker image'
                 def libindyVersion = getSrcVersion("libindy")
-                testEnv = dockerHelpers.build('indy-sdk', 'libindy/ci/ubuntu.dockerfile libindy/ci')
+                testEnv = dockerBuild('indy-sdk', 'libindy/ci/ubuntu.dockerfile libindy/ci')
 
                 echo 'Publish Libindy MacOS Library'
                 publishMacOsArtifact(testEnv, "libindy", "libindy", "LibindyMacosBuildResult", libindyVersion, "lib")
@@ -1440,7 +1441,7 @@ def publishingRCtoStable() {
                 publishLibindyWindowsFilesRCtoStable(libindyVersion)
 
                 echo 'Moving RC artifacts to Stable: Build docker image for wrappers publishing'
-                testEnv = dockerHelpers.build('indy-sdk', 'libindy/ci/ubuntu.dockerfile libindy/ci')
+                testEnv = dockerBuild('indy-sdk', 'libindy/ci/ubuntu.dockerfile libindy/ci')
 
                 echo "Moving ${env_name} RC artifacts to Stable: libindy"
                 publishLibindyDebRCtoStable(testEnv, libindyVersion, env_name)
@@ -1512,7 +1513,7 @@ def publishingRCtoStable() {
                 publishIndyCliMacOSFilesRCtoStable(libindyVersion)
 
                 echo 'Moving RC artifacts to Stable: Build docker image for wrappers publishing'
-                testEnv = dockerHelpers.build('indy-sdk', 'libindy/ci/ubuntu18.dockerfile libindy/ci')
+                testEnv = dockerBuild('indy-sdk', 'libindy/ci/ubuntu18.dockerfile libindy/ci')
 
                 env_name = Ubuntu18
 
@@ -1710,10 +1711,13 @@ def publishDebRCtoStable(testEnv, packageName, folder, version, stashName, moveD
     }
 }
 
-def buildTestEnv(file, env_name) {
+def buildTestEnv(file, env_name, name="libindy", prebuilt_images=[:]) {
     dir('libindy') {
         echo "${env_name} Build test environment"
-        return dockerBuild('libindy', file)
+        for (entry in mapToList(prebuilt_images)) {
+            dockerBuild(entry[0], entry[1])
+        }
+        return dockerBuild(name, file)
     }
 }
 
@@ -1750,7 +1754,7 @@ def androidPublishing() {
 
                 echo 'Publish Android binaries: Building docker image'
 
-                buildEnv = dockerHelpers.build('indy-sdk', 'libindy/ci/ubuntu.dockerfile libindy/ci')
+                buildEnv = dockerBuild('indy-sdk', 'libindy/ci/ubuntu.dockerfile libindy/ci')
 
                 publishAndroid(buildEnv, libindyVersion, 'libindy')
                 publishAndroid(buildEnv, libnullpayVersion, 'libnullpay')
@@ -1767,14 +1771,14 @@ def androidPublishing() {
 
 def buildAndroid(buildEnv, version, name, libIndyVersion = null) {
 
-    for (arch in ["arm", "armv7", "x86", "arm64", "x86_64"]) {
+    for (arch in androidArchArray) {
         androidBuildArtifact(buildEnv, arch, version, name, libIndyVersion)
     }
 }
 
 def publishAndroid(buildEnv, version, name) {
 
-    for (arch in ["arm", "armv7", "x86", "arm64", "x86_64"]) {
+    for (arch in androidArchArray) {
         androidPublishArtifact(buildEnv, arch, version, name)
     }
 }
@@ -1836,7 +1840,7 @@ def linuxModuleTesting(file, env_name, network_name, module_tester) {
     linuxModuleTesting(file, env_name, network_name, module_tester, 'ubuntu')
 }
 
-def linuxModuleTesting(file, env_name, network_name, module_tester, node_label) {
+def linuxModuleTesting(file, env_name, network_name, module_tester, node_label, image_name="libindy", prebuilt_images = [:]) {
     node(node_label) {
         cleanWs()
         def poolInst
@@ -1846,7 +1850,7 @@ def linuxModuleTesting(file, env_name, network_name, module_tester, node_label)
 
             poolInst = openPool(env_name, network_name)
 
-            def testEnv = buildTestEnv(file, env_name)
+            def testEnv = buildTestEnv(file, env_name, image_name, prebuilt_images)
 
             module_tester(env_name, network_name, testEnv)
         } finally {
@@ -1860,7 +1864,7 @@ def androidTesting() {
     network_name = "pool_network"
     parallel([
             "${env_name}-android-test"    : {
-                linuxModuleTesting("ci/ubuntu.dockerfile ci", env_name, network_name, this.&linuxAndroidOnEmulatorTesting, 'android')
+                linuxModuleTesting("ci/android.dockerfile ci", env_name, network_name, this.&linuxAndroidOnEmulatorTesting, 'android', "android", ["libindy": 'ci/ubuntu.dockerfile ci'])
             },
             "${env_name}-android-building": { androidBuildAsTesting() }
     ])
@@ -1879,8 +1883,9 @@ def androidBuildAsTesting() {
                 def libvcxVersion = getSrcVersion("vcx/libvcx")
 
                 echo 'Building android binaries: Building docker image'
-                buildEnv = dockerHelpers.build('indy-sdk', 'libindy/ci/ubuntu.dockerfile libindy/ci')
-                vcxBuildEnv = dockerHelpers.build('indy-sdk', 'libindy/ci/ubuntu.dockerfile libindy/ci')
+                dockerBuild('libindy', 'libindy/ci/ubuntu.dockerfile libindy/ci')
+                buildEnv = dockerBuild('indy-sdk', 'libindy/ci/android.dockerfile libindy/ci')
+                vcxBuildEnv = dockerBuild('indy-sdk', 'libindy/ci/android.dockerfile libindy/ci')
                 sh 'chmod -R 777 libindy/'
                 sh 'chmod -R 777 libindy/ci/'
 
@@ -1901,3 +1906,10 @@ def setupBrewPackages() {
     sh "brew switch openssl 1.0.2q"
     sh "brew switch zeromq 4.2.3"
 }
+
+@NonCPS
+List<List<?>> mapToList(Map map) {
+    return map.collect { it ->
+        [it.key, it.value]
+    }
+}

Jenkinsfile.ci

@@ -20,7 +20,7 @@ def testing() {
                 'android-test': { androidTesting() },
                 'macos-test'  : { macosTesting() },
                 'ios-test'    : { iosTesting() },
-                // 'centos-test' : { centosTesting() },
+                'centos-test' : { centosTesting() },
                 'windows-test': { windowsTesting() }
         ])
     }
@@ -263,7 +263,7 @@ def macosModuleBuildingAndTest(library, testFeatures = "") {
 def androidTesting() {
     env_name = "android_on_linux"
     network_name = "pool_network"
-    linuxModuleTesting("ci/ubuntu.dockerfile ci", env_name, network_name, this.&linuxAndroidOnEmulatorTesting, "android")
+    linuxModuleTesting("ci/android.dockerfile ci", env_name, network_name, this.&linuxAndroidOnEmulatorTesting, "android", "android", ["libindy": 'ci/ubuntu.dockerfile ci'])
 }
 
 def iosTesting() {
@@ -310,7 +310,6 @@ def iosTesting() {
                             rbenv install -s $(cat .ruby-version)
 
                             gem install bundler
-                            bundler exec gem env
 
                             bundler install
                             bundler list
@@ -577,7 +576,7 @@ def linuxModuleTesting(file, env_name, network_name, module_tester) {
     linuxModuleTesting(file, env_name, network_name, module_tester, "ubuntu")
 }
 
-def linuxModuleTesting(file, env_name, network_name, module_tester, node_label) {
+def linuxModuleTesting(file, env_name, network_name, module_tester, node_label, image_name="libindy", prebuilt_images = [:]) {
     node(node_label) {
         cleanWs()
         def poolInst
@@ -587,7 +586,7 @@ def linuxModuleTesting(file, env_name, network_name, module_tester, node_label)
 
             poolInst = openPool(env_name, network_name)
 
-            def testEnv = buildTestEnv(file, env_name)
+            def testEnv = buildTestEnv(file, env_name, image_name, prebuilt_images)
 
             module_tester(env_name, network_name, testEnv)
         } finally {
@@ -760,10 +759,13 @@ def getUserUid() {
     return sh(returnStdout: true, script: 'id -u').trim()
 }
 
-def buildTestEnv(file, env_name) {
+def buildTestEnv(file, env_name, name="libindy", prebuilt_images=[:]) {
     dir('libindy') {
-        echo "${env_name} Build test environment"
-        return dockerBuild('libindy', file)
+        echo "${env_name} Build  test environment"
+        for (entry in mapToList(prebuilt_images)) {
+            dockerBuild(entry[0], entry[1])
+        }
+        return dockerBuild(name, file)
     }
 }
 
@@ -854,3 +856,10 @@ def setupBrewPackages() {
     sh "brew switch openssl 1.0.2q"
     sh "brew switch zeromq 4.2.3"
 }
+
+@NonCPS
+List<List<?>> mapToList(Map map) {
+    return map.collect { it ->
+        [it.key, it.value]
+    }
+}

README.md

@@ -336,6 +336,7 @@ The documents that provide necessary information for Libindy migrations.
 * [v1.10.0 → v1.11.x](docs/migration-guides/migration-guide-1.10.0-1.11.0.md)
 * [v1.11.0 → v1.12.x](docs/migration-guides/migration-guide-1.11.0-1.12.0.md)
 * [v1.12.0 → v1.13.x](docs/migration-guides/migration-guide-1.12.0-1.13.0.md)
+* [v1.13.0 → v1.14.x](docs/migration-guides/migration-guide-1.13.0-1.14.0.md)
 
 ## How to Contribute
 * We'd love your help; see these [HL Indy Wiki](https://wiki.hyperledger.org/display/indy/How+to+Contribute) and [slides on how to contribute](http://bit.ly/2ugd0bq).

Specs/libindy/1.14.0/libindy.podspec.json

@@ -0,0 +1,23 @@
+{
+  "name": "libindy",
+  "version": "1.14.0",
+  "summary": "Summary TODO.",
+  "description": "Description TODO.",
+  "homepage": "TODO",
+  "license": {
+    "type": "Apache License 2.0",
+    "file": "LICENSE"
+  },
+  "authors": {
+    "Daniel Hardman": "daniel.hardman@evernym.com"
+  },
+  "platforms": {
+    "ios": "10.0"
+  },
+  "source": {
+    "http": "https://repo.sovrin.org/ios/libindy/stable/libindy-core/1.14.0/libindy.tar.gz"
+  },
+  "source_files": "*.h",
+  "vendored_libraries": "*.a",
+  "requires_arc": false
+}

ci/indy-pool.dockerfile

@@ -18,14 +18,15 @@ RUN pip3 install -U \
 	pip==9.0.3 \
 	setuptools
 
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 || \
+	apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CE7709D068DB5E88
 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.11.0~dev937
-ARG indy_node_ver=1.11.0~dev1112
+ARG indy_plenum_ver=1.12.1~dev989
+ARG indy_node_ver=1.12.1~dev1172
 ARG python3_indy_crypto_ver=0.4.5
 ARG indy_crypto_ver=0.4.5
 ARG python3_pyzmq_ver=18.1.0

cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "indy-cli"
-version = "1.13.0"
+version = "1.14.0"
 authors = ["Hyperledger Indy Contributors <hyperledger-indy@lists.hyperledger.org>"]
 edition = "2018"
 
@@ -29,4 +29,4 @@ serde_json = "1.0.40"
 serde_derive = "1.0.97"
 term = "0.4.6"
 rpassword = "1.0.0"
-indy = { version = "1.12.0", path = "../wrappers/rust/" }
+indy = { version = "1.14.0", path = "../wrappers/rust/" }

cli/debian/changelog

@@ -1,7 +1,18 @@
-indy-cli (1.13.0) unstable; urgency=medium
+indy-cli (1.14.0) unstable; urgency=medium
 
 [ Hyperledger ]
 
+## 1.14.0
+* Added new commands:
+    * `ledger disable-all-txn-author-agreements` - to disable All Transaction Author Agreements on the ledger.
+    * `ledger get-acceptance-mechanisms` - to get a list of acceptance mechanisms set on the ledger.
+* Updated `ledger txn-author-agreement` command to accept new parameters:
+    * `ratification-timestamp` - the date (timestamp) of TAA ratification by network government.
+    * `retirement-timestamp` - the date (timestamp) of TAA retirement.
+
+## 1.13.0
+* Bugfixes
+
 ## 1.12.0
 * added `qualify` command to `did` to qualify did for some namespace.