Merge branch 'release/v0.7.1'

evannetwork · Jan 15, 2019 · 5541606 · 5541606
2 parents 91fc73c + df4d61e
commit 5541606
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/VERSIONS.md b/VERSIONS.md
@@ -5,6 +5,11 @@
 ### Fixes
 ### Deprecations
 
+## Version 1.7.1
+### Fixes
+- add ignoring of missing keys when decrypting unencrypted data
+
+
 ## Version 1.7.0
 ### Features
 - update `setClaims` to use issuers identity for setting claims on subject

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "author": "evan GmbH",
   "dependencies": {
     "@evan.network/dbcp": "^1.5.0",
-    "@evan.network/smart-contracts-core": "^1.5.0",
+    "@evan.network/smart-contracts-core": "^1.5.2",
     "@types/node": "8.0.53",
     "ajv": "^5.5.1",
     "babel-plugin-transform-es3-property-literals": "^6.22.0",
@@ -79,5 +79,5 @@
     "testunitbrk": "env-cmd ./.env.local npm run build && env-cmd ./.env.local mocha --exit --inspect-brk -r ts-node/register $*"
   },
   "types": "./dist/index.d.ts",
-  "version": "1.7.0"
+  "version": "1.7.1"
 }
diff --git a/src/bundles/bcc/dbcp.json b/src/bundles/bcc/dbcp.json
@@ -3,13 +3,13 @@
     "author": "evan GmbH",
     "dapp": {
       "dependencies": {
-        "smartcontracts": "^1.5.0"
+        "smartcontracts": "^1.5.2"
       },
       "entrypoint": "bcc.js",
       "files": [
         "bcc.js"
       ],
-      "origin": "QmZtiWW4EWYHd8ZF4dcCFUJi3UNpZuFSKBodpwN8VY9NhA",
+      "origin": "QmVMZHZhZhDAcJ47KDqnmTp1rtyXowXcyEN8sAkqGN1ozs",
       "type": "library"
     },
     "dbcpVersion": 2,
@@ -24,7 +24,7 @@
       "dapp",
       "library"
     ],
-    "version": "1.7.0",
+    "version": "1.7.1",
     "versions": {
       "0.1.0": "QmTsY7ASbvxATLnEemHZQ8oQha64ujYe9VXbDCouDk7Xtp",
       "0.9.0": "Qmbw3yX82TVN9WhsRyeaRpd89M9XXL1pds9GgqJL29ohar",
@@ -39,7 +39,8 @@
       "1.4.0": "QmVv35DzcryDQnbmTVHJChD1enG459cUGKmqZj6xE74nHX",
       "1.5.0": "QmQnmbZJcUf6j6u6nsJh5jiqxwAfsBybZWPk65tVN8HZ3P",
       "1.6.0": "QmTHvUrZEKUQ3KkoHVs6SmnPFw437bPpXuSqji5Pb67gJg",
-      "1.7.0": "QmfCYbQHhafqtvTNb8PisTaBBB52pQ4UEuzMHptv1SWdQm"
+      "1.7.0": "QmfCYbQHhafqtvTNb8PisTaBBB52pQ4UEuzMHptv1SWdQm",
+      "1.7.1": "QmRKPeiy2krB6tztUme6FhdobNjCgw9LQUpyMDthoAQWaf"
     }
   }
 }
diff --git a/src/contracts/data-contract/data-contract.ts b/src/contracts/data-contract/data-contract.ts
@@ -253,7 +253,7 @@ export class DataContract extends BaseContract {
     if (envelope.cryptoInfo) {
       const cryptor = this.options.cryptoProvider.getCryptorByCryptoInfo(envelope.cryptoInfo);
       const contentKey = await this.options.sharing.getKey(dataContract.options.address, accountId, propertyName, envelope.cryptoInfo.block);
-      if (!contentKey) {
+      if (!contentKey && envelope.cryptoInfo.algorithm !== 'unencrypted') {
         throw new Error(`no content key found for contract "${dataContract.options.address}" and account "${accountId}"`);
       }
       const decryptedBuffer = await cryptor.decrypt(