merge

VERSIONS.md

@@ -8,7 +8,11 @@
 ## Version 1.1.0
 ### Features
 - Remove deployment description and move it to the evan.network wiki
+<<<<<<< HEAD
 - add subdomain dapp loading support
+=======
+- add subdomain support
+>>>>>>> release/v1.1.0
 
 ## Version 1.0.2
 ### Features

package.json

@@ -1,5 +1,5 @@
 {
-  "author": "Contractus",
+  "author": "evan GmbH",
   "cordova": {
     "config": {
       "ionic_build_dir": "deployment",
@@ -27,8 +27,8 @@
     }
   },
   "dependencies": {
-    "@evan.network/api-blockchain-core": "^1.0.0",
-    "@evan.network/dbcp": "^1.0.0",
+    "@evan.network/api-blockchain-core": "^1.1.0",
+    "@evan.network/dbcp": "^1.2.0",
     "cordova-android": "~6.4.0",
     "cordova-ios": "4.5.4",
     "cordova-plugin-camera": "^4.0.3",
@@ -61,8 +61,6 @@
     "@angular/core": "^5.1.0",
     "@compodoc/compodoc": "^1.0.5",
     "@compodoc/gulp-compodoc": "0.0.8",
-    "@evan.network/api-blockchain-core": "^1.0.0",
-    "@evan.network/dbcp": "^1.0.0",
     "@ionic-native/camera": "^4.7.0",
     "@ionic-native/file": "^4.7.0",
     "@ionic-native/file-path": "^4.7.0",

src/app/dapp.ts

@@ -109,6 +109,12 @@ function getVersionDBCPHashFromDAppVersion(requiredVersion: string, childENS: st
           break;
         }
 
+        // direct return as valid, if e.g. the minor of the versionToLoad load than the new check
+        // version (1.0.2 is lower than 1.1.0)
+        if (splittedVersion[x] === '*' && versionToLoad[x] < splittedChild[x]) {
+          break;
+        }
+
         // check if a higher * value is selected
         if (splittedVersion[x] === '*' && versionToLoad[x] > splittedChild[x]) {
           isValid = false;