Merge branch 'master' into android_builds

jovfer · web-flow · commit 17741224db2c · 2018-06-28T14:37:28.000+03:00
diff --git a/Jenkinsfile.cd b/Jenkinsfile.cd
@@ -627,7 +627,7 @@ def publishingRCtoStable() {
                 publishLibindyCliWindowsFilesRCtoStable(libindyVersion)
 
                 echo 'Moving Windows RC artifacts to Stable: libnullpay'
-                publishLibnullpayWindowsFilesRCtoStable(libindyVersion)
+                publishLibnullpayWindowsFilesRCtoStable()
 
                 echo 'Moving Ubuntu RC artifacts to Stable: libnullpay'
                 publishLibnullpayDebRCtoStable(testEnv)
@@ -674,7 +674,7 @@ def publishLibindyCliDebRCtoStable(testEnv, version) {
 
 def publishLibnullpayDebRCtoStable(testEnv) {
     def libnullpayVersion = getSrcVersion("libnullpay")
-    publishDebRCtoStable(testEnv, "libnullpay", "libnullpay", libnullpayVersion, "libindyCliDebs", false)
+    publishDebRCtoStable(testEnv, "libnullpay", "libnullpay", libnullpayVersion, "libnullpayDebs", false)
 }
 
 def publishDebRCtoStable(testEnv, packageName, folder, version, stashName, moveDevArtifacts) {
@@ -683,7 +683,7 @@ def publishDebRCtoStable(testEnv, packageName, folder, version, stashName, moveD
 
         unstash name: stashName
 
-        sh "fakeroot deb-reversion -v $version $packageName/debs/\"$packageName\"_\"$rcFullVersion\"_amd64.deb"
+        sh "fakeroot deb-reversion -v $version $folder/debs/\"$packageName\"_\"$rcFullVersion\"_amd64.deb"
 
         if (moveDevArtifacts) {
             sh "fakeroot deb-reversion -v $version $folder/debs/\"$packageName\"-dev_\"$rcFullVersion\"_amd64.deb"
diff --git a/Specs/libindy-objc/1.5.0/libindy-objc.podspec.json b/Specs/libindy-objc/1.5.0/libindy-objc.podspec.json
@@ -0,0 +1,23 @@
+{
+    "name": "libindy-objc",
+    "version": "1.5.0",
+    "summary": "Summary TODO.",
+    "homepage": "TODO",
+    "license": {
+        "type": "Apache License 2.0",
+        "file": "LICENSE"
+    },
+    "authors": {
+        "Daniel Hardman": "daniel.hardman@evernym.com"
+    },
+    "source": {
+        "http": "https://repo.sovrin.org/ios/libindy/stable/indy-objc/1.5.0/libindy-objc.zip"
+    },
+    "platforms": {
+        "ios": "10.0"
+    },
+    "ios": {
+        "vendored_frameworks": "libindy-objc/Indy.framework"
+    },
+    "module_name": "Indy"
+}
diff --git a/Specs/libindy/1.5.0/libindy.podspec.json b/Specs/libindy/1.5.0/libindy.podspec.json
@@ -0,0 +1,23 @@
+{
+  "name": "libindy",
+  "version": "1.5.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.5.0/libindy.tar.gz"
+  },
+  "source_files": "*.h",
+  "vendored_libraries": "*.a",
+  "requires_arc": false
+}
diff --git a/ci/indy-pool.dockerfile b/ci/indy-pool.dockerfile
@@ -24,9 +24,9 @@ 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.4.406
+ARG indy_plenum_ver=1.4.419
 ARG indy_anoncreds_ver=1.0.32
-ARG indy_node_ver=1.4.463
+ARG indy_node_ver=1.4.480
 ARG python3_indy_crypto_ver=0.4.1
 ARG indy_crypto_ver=0.4.0
 
diff --git a/cli/Cargo.lock b/cli/Cargo.lock
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "indy-cli"
-version = "0.1.0"
+version = "1.5.0"
 authors = ["Vyacheslav Gudkov <vyacheslav.gudkov@dsr-company.com>"]
 
 [features]
diff --git a/cli/debian/changelog b/cli/debian/changelog
@@ -1,4 +1,4 @@
-indy-cli (0.1.0) unstable; urgency=medium
+indy-cli (1.5.0) unstable; urgency=medium
 
   [ Hyperledger ]
   * Created Indy-Cli
diff --git a/libindy/Cargo.lock b/libindy/Cargo.lock
diff --git a/libindy/Cargo.toml b/libindy/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "indy"
-version = "1.4.0"
+version = "1.5.0"
 authors = [
   "Sergej Pupykin <sergej.pupykin@dsr-company.com>",
   "Vyacheslav Gudkov <vyacheslav.gudkov@dsr-company.com>",
diff --git a/libindy/src/commands/anoncreds/tails.rs b/libindy/src/commands/anoncreds/tails.rs
@@ -83,7 +83,7 @@ pub fn store_tails_from_generator(service: Rc<BlobStorageService>,
 
     let version = vec![0u8, TAILS_BLOB_TAG_SZ];
     hasher.process(version.as_slice());
-    service.append(blob_handle, version.as_slice());
+    service.append(blob_handle, version.as_slice())?;
 
     while let Some(tail) = rtg.next()? {
         let tail_bytes = tail.to_bytes()?;
diff --git a/libindy/src/commands/did.rs b/libindy/src/commands/did.rs
@@ -217,7 +217,7 @@ impl DidCommandExecutor {
         let (did, key) = self.crypto_service.create_my_did(&my_did_info)?;
 
         if self.wallet_service.record_exists::<Did>(wallet_handle, &did.did)? {
-            return Err(IndyError::DidError(DidError::AlreadyExistsError("Did already exists".to_string())));
+            return Err(IndyError::DidError(DidError::AlreadyExistsError(did.did)));
         };
 
         self.wallet_service.add_indy_object(wallet_handle, &did.did, &did, &HashMap::new())?;
diff --git a/libindy/tests/demo.rs b/libindy/tests/demo.rs
@@ -567,7 +567,7 @@ fn ledger_demo_works() {
             dest: my_did.clone(),
             type_: "1".to_string(),
         },
-        protocol_version: 1,
+        protocol_version: 2,
         req_id: nym_req_id,
         signature: None,
     };
@@ -602,7 +602,7 @@ fn ledger_demo_works() {
             type_: "105".to_string(),
             dest: my_did.clone(),
         },
-        protocol_version: 1,
+        protocol_version: 2,
     };
 
     let request = serde_json::to_string(&get_nym_txn).unwrap();
diff --git a/libindy/tests/ledger.rs b/libindy/tests/ledger.rs
@@ -159,6 +159,7 @@ mod high_cases {
                             "type":"105",
                             "dest":"Th7MpTaRZVRYnPiabds81Y"
                          },
+                         "protocolVersion":2,
                          "signature":"4o86XfkiJ4e2r3J6Ufoi17UU3W5Zi9sshV6FjBjkVw4sgEQFQov9dxqDEtLbAJAWffCWd5KfAk164QVo7mYwKkiV"}"#;
 
             let resp = LedgerUtils::submit_request(pool_handle, request);
diff --git a/libnullpay/Cargo.lock b/libnullpay/Cargo.lock
diff --git a/libnullpay/Cargo.toml b/libnullpay/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "null-payment-method"
-version = "0.1.0"
+version = "1.5.0"
 authors = ["Nikita Khateev <nikita.khateev@dsr-corporation.com>"]
 build = "build.rs"
 
diff --git a/libnullpay/debian/changelog b/libnullpay/debian/changelog
@@ -1,4 +1,4 @@
-libnullpay (1.0.0) unstable; urgency=medium
+libnullpay (1.5.0) unstable; urgency=medium
 
   [ Hyperledger ]
   * Initial release
diff --git a/wrappers/ios/libindy-pod/Indy-demoTests/Case Tests/Ledger/LedgerSendRequests.mm b/wrappers/ios/libindy-pod/Indy-demoTests/Case Tests/Ledger/LedgerSendRequests.mm
@@ -118,6 +118,7 @@ - (void)testSubmitRequestWorks {
     NSDictionary *request = @{
             @"reqId": @(1491566332010860),
             @"identifier": [TestUtils trusteeDid],
+            @"protocolVersion": @(2),
             @"operation": @{
                     @"type": @"105",
                     @"dest": [TestUtils trusteeDid]
diff --git a/wrappers/java/pom.xml b/wrappers/java/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>org.hyperledger</groupId>
 	<artifactId>indy</artifactId>
 	<packaging>jar</packaging>
-	<version>1.4.0</version>
+	<version>1.5.0</version>
 	<name>indy</name>
 	<description>This is the official SDK for Hyperledger Indy (https://www.hyperledger.org/projects),
 		which provides a distributed-ledger-based foundation for self-sovereign identity (https://sovrin.org).
diff --git a/wrappers/java/src/test/java/org/hyperledger/indy/sdk/ledger/RequestsTest.java b/wrappers/java/src/test/java/org/hyperledger/indy/sdk/ledger/RequestsTest.java
@@ -24,6 +24,7 @@ public void testSubmitRequestWorks() throws Exception {
 				"             \"type\":\"105\",\n" +
 				"             \"dest\":\"Th7MpTaRZVRYnPiabds81Y\"\n" +
 				"          },\n" +
+				"          \"protocolVersion\":2,\n" +
 				"          \"signature\":\"4o86XfkiJ4e2r3J6Ufoi17UU3W5Zi9sshV6FjBjkVw4sgEQFQov9dxqDEtLbAJAWffCWd5KfAk164QVo7mYwKkiV\"}";
 
 		String response = Ledger.submitRequest(pool, request).get();
diff --git a/wrappers/nodejs/package.json b/wrappers/nodejs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "indy-sdk",
-  "version": "0.2.5",
+  "version": "1.5.0",
   "description": "Native bindings for hyperledger indy",
   "author": "hyperledger",
   "license": "Apache-2.0",
diff --git a/wrappers/python/setup.py b/wrappers/python/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='python3-indy',
-    version='1.4.0',
+    version='1.5.0',
     packages=['indy'],
     url='https://github.com/hyperledger/indy-sdk',
     license='MIT/Apache-2.0',
diff --git a/wrappers/python/tests/ledger/test_submit_request.py b/wrappers/python/tests/ledger/test_submit_request.py
@@ -18,6 +18,7 @@ async def test_submit_request_works(pool_handle):
             "type": "105",
             "dest": "Th7MpTaRZVRYnPiabds81Y"
         },
+        "protocolVersion": 2,
         "signature": "4o86XfkiJ4e2r3J6Ufoi17UU3W5Zi9sshV6FjBjkVw4sgEQFQov9dxqDEtLbAJAWffCWd5KfAk164QVo7mYwKkiV"
     }
 
